Changeset 2624

Timestamp:

08/03/07 16:42:50 (6 years ago)

Author:

mickey

Message:

add neod skeleton

Location:

trunk/src/target/OM-2007.2

Files:

• applications/fingerscroll/example.c (modified) (1 diff)
• applications/fingerscroll/moko-finger-scroll.c (modified) (11 diffs)
• applications/fingerscroll/moko-finger-scroll.h (modified) (1 diff)
• daemons (added)
• daemons/neod (added)
• daemons/neod/AUTHORS (added)
• daemons/neod/COPYING (added)
• daemons/neod/ChangeLog (added)
• daemons/neod/Makefile.am (added)
• daemons/neod/NEWS (added)
• daemons/neod/README (added)
• daemons/neod/autogen.sh (added)
• daemons/neod/configure.ac (added)
• daemons/neod/po (added)
• daemons/neod/po/POTFILES.in (added)
• daemons/neod/src (added)
• daemons/neod/src/Makefile.am (added)
• daemons/neod/src/neod-main.c (added)

trunk/src/target/OM-2007.2/applications/fingerscroll/example.c

@@ -114 +114 @@
   
   w = scroll = moko_finger_scroll_new ();
+  g_object_set( G_OBJECT(scroll), "mode", MOKO_FINGER_SCROLL_MODE_PHYSICAL, NULL ); 
   gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
 

trunk/src/target/OM-2007.2/applications/fingerscroll/moko-finger-scroll.c

@@ -1 +1 @@
 
+#include <glib.h>
 #include "moko-finger-scroll.h"
 
@@ -6 +7 @@
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOKO_TYPE_FINGER_SCROLL, MokoFingerScrollPrivate))
 typedef struct _MokoFingerScrollPrivate MokoFingerScrollPrivate;
+
+typedef struct _point point;
+struct _point
+{
+        gdouble x;
+        gdouble y;
+        gint32 time;
+};
 
 struct _MokoFingerScrollPrivate {
@@ -13 +22 @@
         gdouble ex;
         gdouble ey;
+        point prev_values[3];
         gboolean enabled;
         gboolean clicked;
@@ -23 +33 @@
         gdouble vel_x;
         gdouble vel_y;
-        
+;
+
         GtkWidget *align;
         gboolean hscroll;
@@ -38 +49 @@
 };
 
+#define PHYSICAL_MOVE_PERIOD 300
+
+static gint32
+time_diff (gint32 t1, gint32 t2)
+{
+        if (t2 > t1)
+                return t2-t1;
+        else
+                return ((gint64)t2 + 1<<32) - (gint64)t1;
+}
+
+static void
+rough_linear (point p0, point p1, point p2, gdouble *xm, gdouble *ym)
+{
+        /* just calulate two slopes and avarage */
+        *xm = (((p0.x-p1.x) / time_diff(p1.time,p0.time))
+                + ((p0.x-p1.x) / time_diff(p2.time,p0.time))) / 2;
+        *ym = (((p0.y-p1.y) / time_diff(p1.time,p0.time))
+                + ((p0.y-p2.y) / time_diff(p2.time,p0.time))) / 2;
+}
+
 static gboolean
 moko_finger_scroll_button_press_cb (MokoFingerScroll *scroll,
@@ -51 +83 @@
         priv->x = event->x;
         priv->y = event->y;
+        priv->ex = event->x;
+        priv->ey = event->y;
         priv->moved = FALSE;
         priv->clicked = TRUE;
@@ -56 +90 @@
         priv->vel_x = 0;
         priv->vel_y = 0;
-        
+
+        priv->prev_values[0].x = event->x;
+        priv->prev_values[0].y = event->y;
+        priv->prev_values[0].time = event->time;
+        priv->prev_values[1].x = event->x;
+        priv->prev_values[1].y = event->y;
+        priv->prev_values[1].time = event->time;
         return TRUE;
 }
@@ -112 +152 @@
         MokoFingerScrollPrivate *priv = FINGER_SCROLL_PRIVATE (scroll);
         
+        g_debug ("vel_x=%f, vel_y=%fr",priv->vel_x,priv->vel_y);
+
         if ((!priv->enabled) ||
-            (priv->mode != MOKO_FINGER_SCROLL_MODE_ACCEL)) return FALSE;
+            (priv->mode == MOKO_FINGER_SCROLL_MODE_PUSH)) return FALSE;
         if (!priv->clicked) {
                 /* Decelerate gradually when pointer is raised */
@@ -187 +229 @@
                                 (priv->vmax-priv->vmin)) + priv->vmin);
                         break;
+                    case MOKO_FINGER_SCROLL_MODE_PHYSICAL:
+                        /* Scroll by the amount of pixels the cursor has moved
+                         * since the last motion event.
+                         */
+                        moko_finger_scroll_scroll (scroll, x, y, NULL, NULL);
+                        priv->prev_values[1].x = priv->prev_values[0].x;
+                        priv->prev_values[1].y = priv->prev_values[0].y;
+                        priv->prev_values[1].time = priv->prev_values[0].time;
+                        priv->prev_values[0].x = event->x;
+                        priv->prev_values[0].y = event->y;
+                        priv->prev_values[0].time = event->time;
+                        priv->x = event->x;
+                        priv->y = event->y;
+                            
+                        break;
+        
                     default :
                         break;
@@ -273 +331 @@
                 ((GdkEvent *)event)->type = GDK_BUTTON_RELEASE;
                 gdk_event_put ((GdkEvent *)event);
+        }
+        if (priv->moved && priv->mode == MOKO_FINGER_SCROLL_MODE_PHYSICAL) {
+                point p0;
+                gdouble velx, vely;
+                p0.x = event->x;
+                p0.y = event->y;
+                p0.time = event->time;
+                g_debug ("doing physical");
+                /*velx and vely are in pixels/ms..*/
+                rough_linear (p0, priv->prev_values[0], priv->prev_values[1], &velx, &vely);
+                
+                priv->vel_x = (velx * 1000.0) / priv->sps;
+                priv->vel_y = (vely * 1000.0) / priv->sps;
+                g_timeout_add ((gint)(1000.0/(gdouble)priv->sps),
+                        (GSourceFunc)moko_finger_scroll_timeout,
+                        scroll);
         }
 
@@ -514 +588 @@
                         "Change the finger-scrolling mode.",
                         MOKO_FINGER_SCROLL_MODE_PUSH,
-                        MOKO_FINGER_SCROLL_MODE_ACCEL,
-                        MOKO_FINGER_SCROLL_MODE_ACCEL,
+                        MOKO_FINGER_SCROLL_MODE_PHYSICAL,
+                        MOKO_FINGER_SCROLL_MODE_PHYSICAL,
                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 

trunk/src/target/OM-2007.2/applications/fingerscroll/moko-finger-scroll.h

@@ -40 +40 @@
         MOKO_FINGER_SCROLL_MODE_PUSH,
         MOKO_FINGER_SCROLL_MODE_ACCEL,
+        MOKO_FINGER_SCROLL_MODE_PHYSICAL,
 } MokoFingerScrollMode;