gpointing-device-settings r122 - trunk/modules/common

[hiikezoe svn gnome org]

Author: hiikezoe
Date: Fri Mar  6 03:25:39 2009
New Revision: 122
URL: http://svn.gnome.org/viewvc/gpointing-device-settings?rev=122&view=rev

Log:
Added property_type to GpdsTouchpadXInputProperty to support float properties.

Modified:
   trunk/modules/common/gpds-touchpad-xinput.c
   trunk/modules/common/gpds-touchpad-xinput.h

Modified: trunk/modules/common/gpds-touchpad-xinput.c
==============================================================================
--- trunk/modules/common/gpds-touchpad-xinput.c	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.c	Fri Mar  6 03:25:39 2009
@@ -34,37 +34,37 @@
 static const gint n_touchpad_device_names = G_N_ELEMENTS(touchpad_device_names);
 
 static GpdsTouchpadXInputProperty properties[] = {
-    {GPDS_TOUCHPAD_EDGES,                      "Synaptics Edges", 32, 4},
-    {GPDS_TOUCHPAD_FINGER,                     "Synaptics Finger", 32, 3},
-    {GPDS_TOUCHPAD_TAP_TIME,                   "Synaptics Tap Time", 32, 1},
-    {GPDS_TOUCHPAD_TAP_MOVE,                   "Synaptics Tap Move", 32, 1},
-    {GPDS_TOUCHPAD_TAP_DURATIONS,              "Synaptics Tap Durations", 32, 3},
-    {GPDS_TOUCHPAD_TAP_FAST_TAP,               "Synaptics Tap FastTap", 8, 1},
-    {GPDS_TOUCHPAD_MIDDLE_BUTTON_TIMEOUT,      "Synaptics Middle Button Timeout", 32, 1},
-    {GPDS_TOUCHPAD_TWO_FINGER_PRESSURE,        "Synaptics Two-Finger Pressure", 32, 1},
-    {GPDS_TOUCHPAD_SCROLLING_DISTANCE,         "Synaptics Scrolling Distance", 32, 2},
-    {GPDS_TOUCHPAD_EDGE_SCROLLING,             "Synaptics Edge Scrolling", 8, 3},
-    {GPDS_TOUCHPAD_TWO_FINGER_SCROLLING,       "Synaptics Two-Finger Scrolling", 8, 2},
-    {GPDS_TOUCHPAD_SYNAPTICS_PROP_SPEED,       "Synaptics Move Speed", 32, 4},
-    {GPDS_TOUCHPAD_EDGE_MOTION_PRESSURE,       "Synaptics Edge Motion Pressure", 32, 2},
-    {GPDS_TOUCHPAD_EDGE_MOTION_SPEED,          "Synaptics Edge Motion Speed", 32, 2},
-    {GPDS_TOUCHPAD_BUTTON_SCROLLING,           "Synaptics Button Scrolling", 8, 2},
-    {GPDS_TOUCHPAD_BUTTON_SCROLLING_REPEAT,    "Synaptics Button Scrolling Repeat", 8, 2},
-    {GPDS_TOUCHPAD_SCROLLING_TIME,             "Synaptics Button Scrolling Time", 32, 1},
-    {GPDS_TOUCHPAD_OFF,                        "Synaptics Off", 8, 1},
-    {GPDS_TOUCHPAD_GUESTMOUSE_OFF,             "Synaptics Guestmouse Off", 8, 1},
-    {GPDS_TOUCHPAD_LOCKED_DRAGS,               "Synaptics Locked Drags", 8, 1},
-    {GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT,       "Synaptics Locked Drags Timeout", 32, 1},
-    {GPDS_TOUCHPAD_TAP_ACTION,                 "Synaptics Tap Action", 8, 1},
-    {GPDS_TOUCHPAD_CLICK_ACTION,               "Synaptics Click Action", 8, 1},
-    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING,         "Synaptics Circular Scrolling", 8, 1},
-    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING_DISTANCE,"Synaptics Circular Scrolling Distance", 32, 1},
-    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER, "Synaptics Circular Scrolling Trigger", 8, 1},
-    {GPDS_TOUCHPAD_CIRCULAR_PAD,               "Synaptics Circular Pad", 8, 1},
-    {GPDS_TOUCHPAD_PALM_DETECTION,             "Synaptics Palm Detection", 8, 1},
-    {GPDS_TOUCHPAD_PALM_DIMENSIONS,            "Synaptics Palm Dimensions", 32, 2},
-    {GPDS_TOUCHPAD_PRESSURE_MOTION,            "Synaptics Pressure Motion", 32, 2},
-    {GPDS_TOUCHPAD_GRAB_EVENT_DEVICE,          "Synaptics Grab Event Device", 8, 1},
+    {GPDS_TOUCHPAD_EDGES,                      "Synaptics Edges", G_TYPE_INT, 32, 4},
+    {GPDS_TOUCHPAD_FINGER,                     "Synaptics Finger", G_TYPE_INT, 32, 3},
+    {GPDS_TOUCHPAD_TAP_TIME,                   "Synaptics Tap Time", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_TAP_MOVE,                   "Synaptics Tap Move", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_TAP_DURATIONS,              "Synaptics Tap Durations", G_TYPE_INT, 32, 3},
+    {GPDS_TOUCHPAD_TAP_FAST_TAP,               "Synaptics Tap FastTap", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_MIDDLE_BUTTON_TIMEOUT,      "Synaptics Middle Button Timeout", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_TWO_FINGER_PRESSURE,        "Synaptics Two-Finger Pressure", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_SCROLLING_DISTANCE,         "Synaptics Scrolling Distance", G_TYPE_INT, 32, 2},
+    {GPDS_TOUCHPAD_EDGE_SCROLLING,             "Synaptics Edge Scrolling", G_TYPE_INT, 8, 3},
+    {GPDS_TOUCHPAD_TWO_FINGER_SCROLLING,       "Synaptics Two-Finger Scrolling", G_TYPE_INT, 8, 2},
+    {GPDS_TOUCHPAD_SYNAPTICS_PROP_SPEED,       "Synaptics Move Speed", G_TYPE_FLOAT, 0, 4},
+    {GPDS_TOUCHPAD_EDGE_MOTION_PRESSURE,       "Synaptics Edge Motion Pressure", G_TYPE_INT, 32, 2},
+    {GPDS_TOUCHPAD_EDGE_MOTION_SPEED,          "Synaptics Edge Motion Speed", G_TYPE_INT, 32, 2},
+    {GPDS_TOUCHPAD_BUTTON_SCROLLING,           "Synaptics Button Scrolling", G_TYPE_INT, 8, 2},
+    {GPDS_TOUCHPAD_BUTTON_SCROLLING_REPEAT,    "Synaptics Button Scrolling Repeat", G_TYPE_INT, 8, 2},
+    {GPDS_TOUCHPAD_SCROLLING_TIME,             "Synaptics Button Scrolling Time", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_OFF,                        "Synaptics Off", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_GUESTMOUSE_OFF,             "Synaptics Guestmouse Off", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_LOCKED_DRAGS,               "Synaptics Locked Drags", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_LOCKED_DRAGS_TIMEOUT,       "Synaptics Locked Drags Timeout", G_TYPE_INT, 32, 1},
+    {GPDS_TOUCHPAD_TAP_ACTION,                 "Synaptics Tap Action", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_CLICK_ACTION,               "Synaptics Click Action", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING,         "Synaptics Circular Scrolling", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING_DISTANCE,"Synaptics Circular Scrolling Distance", G_TYPE_FLOAT, 0, 1},
+    {GPDS_TOUCHPAD_CIRCULAR_SCROLLING_TRIGGER, "Synaptics Circular Scrolling Trigger", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_CIRCULAR_PAD,               "Synaptics Circular Pad", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_PALM_DETECTION,             "Synaptics Palm Detection", G_TYPE_INT, 8, 1},
+    {GPDS_TOUCHPAD_PALM_DIMENSIONS,            "Synaptics Palm Dimensions", G_TYPE_INT, 32, 2},
+    {GPDS_TOUCHPAD_PRESSURE_MOTION,            "Synaptics Pressure Motion", G_TYPE_INT, 32, 2},
+    {GPDS_TOUCHPAD_GRAB_EVENT_DEVICE,          "Synaptics Grab Event Device", G_TYPE_INT, 8, 1},
 };
 
 static const gint n_properties = G_N_ELEMENTS(properties);

Modified: trunk/modules/common/gpds-touchpad-xinput.h
==============================================================================
--- trunk/modules/common/gpds-touchpad-xinput.h	(original)
+++ trunk/modules/common/gpds-touchpad-xinput.h	Fri Mar  6 03:25:39 2009
@@ -20,7 +20,7 @@
 #ifndef __GPDS_TOUCHPAD_XINPUT_H__
 #define __GPDS_TOUCHPAD_XINPUT_H__
 
-#include <glib.h>
+#include <glib-object.h>
 
 typedef enum {
     GPDS_TOUCHPAD_EDGES,
@@ -79,6 +79,7 @@
 {
     GpdsTouchpadProperty property;
     const gchar *name;
+    GType property_type; /* G_TYPE_INT or G_TYPE_FLOAT */
     gint format_type;
     gint max_value_count;
 };