xinput 1.4.0

[xorg-xinput] / src / xinput.c

diff --git a/src/xinput.c b/src/xinput.c
index b1cd0a3b2dff0f99b1a9e7142e6c586c2ce12412..1207f9d62cdc988786889b332076b5ad86055b8d 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -53,6 +53,10 @@ static entry drivers[] =
      "<device name> <feedback id> <value>",
      set_integer_feedback
     },
      "<device name> <feedback id> <value>",
      set_integer_feedback
     },

+    {"get-button-map",
+     "<device name>",
+     get_button_map
+    },

     {"set-button-map",
      "<device name> <map button 1> [<map button 2> [...]]",
      set_button_map
     {"set-button-map",
      "<device name> <map button 1> [<map button 2> [...]]",
      set_button_map


@@ -102,6 +106,7 @@ static entry drivers[] =
       "<window> <device>",
       set_clientpointer
     },
       "<window> <device>",
       set_clientpointer
     },

+#endif

     { "list-props",
       "<device> [<device> ...]",
       list_props
     { "list-props",
       "<device> [<device> ...]",
       list_props


@@ -110,6 +115,14 @@ static entry drivers[] =
       "<device> <property> <format (8, 16, 32)> <val> [<val> ...]",
       set_int_prop
     },
       "<device> <property> <format (8, 16, 32)> <val> [<val> ...]",
       set_int_prop
     },

+    { "set-float-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_float_prop
+    },
+    { "set-atom-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_atom_prop
+    },

     { "watch-props",
       "<device>",
       watch_props
     { "watch-props",
       "<device>",
       watch_props


@@ -118,7 +131,6 @@ static entry drivers[] =
       "<device> <property>",
       delete_prop
     },
       "<device> <property>",
       delete_prop
     },

-#endif

     {0, 0, 0
     }
 };
     {0, 0, 0
     }
 };


@@ -232,7 +244,7 @@ main(int argc, char * argv[])
        if (strcmp(driver->func_name, func) == 0) {
            int r = (*driver->func)(display, argc-2, argv+2,
                                    driver->func_name, driver->arg_desc);
        if (strcmp(driver->func_name, func) == 0) {
            int r = (*driver->func)(display, argc-2, argv+2,
                                    driver->func_name, driver->arg_desc);

-           XFlush(display);
+           XSync(display, False);

            return r;
        }
        driver++;
            return r;
        }
        driver++;