Merge branch 'master' into xi2

Conflicts:
	src/property.c
	src/xinput.c
	src/xinput.h

diff --git a/configure.ac b/configure.ac
index f2ad4f166a50fe4414a14825f10f2ecd3f706c50..8314a6b6081fcad784afc5b7b78798b8be0f0750 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl  Copyright 2007 Peter Hutterer <peter@cs.unisa.edu.au>
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ([2.57])
-AC_INIT(xinput,[1.4.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
+AC_INIT(xinput,[1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xinput)
 AM_INIT_AUTOMAKE([dist-bzip2])
 AM_MAINTAINER_MODE
 

diff --git a/man/xinput.man b/man/xinput.man
index c9ff46f0ffb069ce8186da0572af4871dab797a6..104cafbd995682165b8ef278982bc016f3f73602 100644 (file)
--- a/man/xinput.man
+++ b/man/xinput.man
@@ -65,6 +65,16 @@ Sets an integer property for the device.  Appropriate values for \fIformat\fP
 are 8, 16, or 32, depending on the property.
 .PP
 .TP 8
+.B xinput set-float-prop \fIdevice_name\fP \fIproperty\fP \fIvalue\fP
+Sets a float property for the device.
+.PP
+.TP 8
+.B xinput set-prop \fIdevice_name\fP \fIproperty\fP \fIvalue\fP
+Set the property to the given value(s). The format and type of the property
+are left as-is and the arguments are interpreted according to the property
+type. This argument can only be used to modify existing properties.
+.PP
+.TP 8
 .B xinput watch-props \fIdevice_name\fP
 Prints to standard out when property changes occur.
 .PP

diff --git a/src/list.c b/src/list.c
index 52e3961eeda648b701f8ac34637106acf62bd4e2..24edc70b43fc9196a11ee74335b61799685ad4c2 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -26,7 +26,7 @@
 #include <X11/extensions/XIproto.h> /* for XI_Device***ChangedNotify */
 
 static void
-print_info(XDeviceInfo *info, Bool shortformat)
+print_info(Display* dpy, XDeviceInfo   *info, Bool shortformat)
 {
     int                        i,j;
     XAnyClassPtr       any;
@@ -62,6 +62,9 @@ print_info(XDeviceInfo        *info, Bool shortformat)
     if (shortformat)
         return;
 
+    if(info->type != None)
+       printf("\tType is %s\n", XGetAtomName(dpy, info->type));
+
     if (info->num_classes > 0) {
        any = (XAnyClassPtr) (info->inputclassinfo);
        for (i=0; i<info->num_classes; i++) {
@@ -120,7 +123,7 @@ static int list_xi1(Display     *display,
         do {
             info = XListInputDevices(display, &num_devices);
             for(loop=0; loop<num_devices; loop++) {
-                print_info(info+loop, shortformat);
+                print_info(display, info+loop, shortformat);
             }
         } while(daemon);
     } else {
@@ -133,7 +136,7 @@ static int list_xi1(Display     *display,
                fprintf(stderr, "unable to find device %s\n", argv[loop]);
                ret = EXIT_FAILURE;
            } else {
-               print_info(info, shortformat);
+               print_info(display, info, shortformat);
            }
        }
        return ret;

diff --git a/src/property.c b/src/property.c
index f30b01b56fcf03b3c81a4c857ece6b17d21869fd..b5f11079dc09c9303ff484279eca61bb2b46ca8c 100644 (file)
--- a/src/property.c
+++ b/src/property.c
@@ -34,6 +34,23 @@
 
 #include "xinput.h"
 
+static Atom parse_atom(Display *dpy, char *name) {
+    Bool is_atom = True;
+    int i;
+
+    for (i = 0; name[i] != '\0'; i++) {
+        if (!isdigit(name[i])) {
+            is_atom = False;
+            break;
+        }
+    }
+
+    if (is_atom)
+        return atoi(name);
+    else
+        return XInternAtom(dpy, name, False);
+}
+
 static void
 print_property(Display *dpy, XDevice* dev, Atom property)
 {
@@ -42,7 +59,7 @@ print_property(Display *dpy, XDevice* dev, Atom property)
     int                 act_format;
     unsigned long       nitems, bytes_after;
     unsigned char       *data, *ptr;
-    int                 j, done = False;
+    int                 j, done = False, size;
 
     name = XGetAtomName(dpy, property);
     printf("\t%s (%ld):\t", name, property);
@@ -51,10 +68,17 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                            AnyPropertyType, &act_type, &act_format,
                            &nitems, &bytes_after, &data) == Success)
     {
-        int float_atom = XInternAtom(dpy, "FLOAT", False);
+        Atom float_atom = XInternAtom(dpy, "FLOAT", True);
 
         ptr = data;
 
+        switch(act_format)
+        {
+            case 8: size = sizeof(char); break;
+            case 16: size = sizeof(short); break;
+            case 32: size = sizeof(long); break;
+        }
+
         for (j = 0; j < nitems; j++)
         {
             switch(act_type)
@@ -63,10 +87,10 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                     switch(act_format)
                     {
                         case 8:
-                            printf("%d", *((int8_t*)ptr));
+                            printf("%d", *((char*)ptr));
                             break;
                         case 16:
-                            printf("%d", *((int16_t*)ptr));
+                            printf("%d", *((short*)ptr));
                             break;
                         case 32:
                             printf("%ld", *((long*)ptr));
@@ -74,17 +98,18 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                     }
                     break;
                 case XA_STRING:
+                    if (act_format != 8)
                     {
-                        int len = 0;
-                        unsigned char *p = ptr;
-                        while(len < nitems)
-                        {
-                            printf("'%s' ", &p[len]);
-                            len += (strlen(&p[len]) + 1);
-                        }
+                        printf("Unknown string format.\n");
                         done = True;
                         break;
                     }
+                    printf("\"%s\"", ptr);
+                    j += strlen((char*)ptr); /* The loop's j++ jumps over the
+                                                terminating 0 */
+                    ptr += strlen((char*)ptr); /* ptr += size below jumps over
+                                                  the terminating 0 */
+                    break;
                 case XA_ATOM:
                     printf("\"%s\"", XGetAtomName(dpy, *(Atom*)ptr));
                     break;
@@ -101,7 +126,7 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                     break;
             }
 
-            ptr += act_format/8;
+            ptr += size;
 
             if (done == True)
                 break;
@@ -172,7 +197,6 @@ set_int_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     Atom         prop;
     char        *name;
     int          i;
-    Bool         is_atom = True;
     char        *data;
     int          format, nelements =  0;
 
@@ -198,17 +222,7 @@ set_int_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
 
     name = argv[1];
 
-    for(i = 0; i < strlen(name); i++) {
-       if (!isdigit(name[i])) {
-            is_atom = False;
-           break;
-       }
-    }
-
-    if (!is_atom)
-        prop = XInternAtom(dpy, name, False);
-    else
-        prop = atoi(name);
+    prop = parse_atom(dpy, name);
 
     nelements = argc - 3;
     format    = atoi(argv[2]);
@@ -218,16 +232,16 @@ set_int_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
         return EXIT_FAILURE;
     }
 
-    data = calloc(nelements, format/8);
+    data = calloc(nelements, sizeof(long));
     for (i = 0; i < nelements; i++)
     {
         switch(format)
         {
             case 8:
-                *(((int8_t*)data) + i) = atoi(argv[3 + i]);
+                *(((char*)data) + i) = atoi(argv[3 + i]);
                 break;
             case 16:
-                *(((int16_t*)data) + i) = atoi(argv[3 + i]);
+                *(((short*)data) + i) = atoi(argv[3 + i]);
                 break;
             case 32:
                 *(((long*)data) + i) = atoi(argv[3 + i]);
@@ -251,8 +265,7 @@ set_float_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     Atom         prop, float_atom;
     char        *name;
     int          i;
-    Bool         is_atom = True;
-    float       *data;
+    long        *data;
     int          nelements =  0;
     char*        endptr;
 
@@ -278,17 +291,7 @@ set_float_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
 
     name = argv[1];
 
-    for(i = 0; i < strlen(name); i++) {
-       if (!isdigit(name[i])) {
-            is_atom = False;
-           break;
-       }
-    }
-
-    if (!is_atom)
-        prop = XInternAtom(dpy, name, False);
-    else
-        prop = atoi(name);
+    prop = parse_atom(dpy, name);
 
     nelements = argc - 2;
 
@@ -306,10 +309,10 @@ set_float_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
        return EXIT_FAILURE;
     }
 
-    data = calloc(nelements, 4);
+    data = calloc(nelements, sizeof(long));
     for (i = 0; i < nelements; i++)
     {
-        *(data + i) = strtod(argv[2 + i], &endptr);
+        *((float*)(data + i)) = strtod(argv[2 + i], &endptr);
        if(endptr == argv[2 + i]){
            fprintf(stderr, "argument %s could not be parsed\n", argv[2 + i]);
            return EXIT_FAILURE;
@@ -376,8 +379,6 @@ int delete_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     XDevice     *dev;
     XDeviceInfo *info;
     char        *name;
-    int         i;
-    Bool        is_atom = True;
     Atom        prop;
 
     info = find_device_info(dpy, argv[0], False);
@@ -396,17 +397,7 @@ int delete_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
 
     name = argv[1];
 
-    for(i = 0; i < strlen(name); i++) {
-       if (!isdigit(name[i])) {
-            is_atom = False;
-           break;
-       }
-    }
-
-    if (!is_atom)
-        prop = XInternAtom(dpy, name, False);
-    else
-        prop = atoi(name);
+    prop = parse_atom(dpy, name);
 
     XDeleteDeviceProperty(dpy, dev, prop);
 
@@ -422,7 +413,7 @@ set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     Atom         prop;
     char        *name;
     int          i, j;
-    Bool         is_atom = True;
+    Bool         is_atom;
     Atom        *data;
     int          nelements =  0;
 
@@ -448,17 +439,7 @@ set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
 
     name = argv[1];
 
-    for(i = 0; i < strlen(name); i++) {
-       if (!isdigit(name[i])) {
-            is_atom = False;
-           break;
-       }
-    }
-
-    if (!is_atom)
-        prop = XInternAtom(dpy, name, False);
-    else
-        prop = atoi(name);
+    prop = parse_atom(dpy, name);
 
     nelements = argc - 2;
     data = calloc(nelements, sizeof(Atom));
@@ -490,4 +471,119 @@ set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     return EXIT_SUCCESS;
 }
 
+int
+set_prop(Display *dpy, int argc, char **argv, char *n, char *desc)
+{
+    XDeviceInfo  *info;
+    XDevice      *dev;
+    Atom          prop;
+    Atom          type;
+    char         *name;
+    int           i;
+    Atom          float_atom;
+    int           format, nelements = 0;
+    unsigned long act_nitems, bytes_after;
+    char         *endptr;
+    union {
+        unsigned char *c;
+        short *s;
+        long *l;
+        Atom *a;
+    } data;
+
+    if (argc < 3)
+    {
+        fprintf(stderr, "Usage: xinput %s %s\n", n, desc);
+        return EXIT_FAILURE;
+    }
+
+    info = find_device_info(dpy, argv[0], False);
+    if (!info)
+    {
+        fprintf(stderr, "unable to find device %s\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    dev = XOpenDevice(dpy, info->id);
+    if (!dev)
+    {
+        fprintf(stderr, "unable to open device %s\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    name = argv[1];
+
+    prop = parse_atom(dpy, name);
+
+    if (prop == None) {
+        fprintf(stderr, "invalid property %s\n", name);
+        return EXIT_FAILURE;
+    }
+
+    float_atom = XInternAtom(dpy, "FLOAT", False);
+
+    nelements = argc - 2;
+    if (XGetDeviceProperty(dpy, dev, prop, 0, 0, False, AnyPropertyType,
+                           &type, &format, &act_nitems, &bytes_after, &data.c)
+            != Success) {
+        fprintf(stderr, "failed to get property type and format for %s\n", name);
+        return EXIT_FAILURE;
+    }
+
+    XFree(data.c);
+
+    if (type == None) {
+        fprintf(stderr, "property %s doesn't exist\n", name);
+        return EXIT_FAILURE;
+    }
+
+    data.c = calloc(nelements, sizeof(long));
+
+    for (i = 0; i < nelements; i++)
+    {
+        if (type == XA_INTEGER) {
+            switch (format)
+            {
+                case 8:
+                    data.c[i] = atoi(argv[2 + i]);
+                    break;
+                case 16:
+                    data.s[i] = atoi(argv[2 + i]);
+                    break;
+                case 32:
+                    data.l[i] = atoi(argv[2 + i]);
+                    break;
+                default:
+                    fprintf(stderr, "unexpected size for property %s", name);
+                    return EXIT_FAILURE;
+            }
+        } else if (type == float_atom) {
+            if (format != 32) {
+                fprintf(stderr, "unexpected format %d for property %s\n",
+                        format, name);
+                return EXIT_FAILURE;
+            }
+            *(float *)(data.l + i) = strtod(argv[2 + i], &endptr);
+            if (endptr == argv[2 + i]) {
+                fprintf(stderr, "argument %s could not be parsed\n", argv[2 + i]);
+                return EXIT_FAILURE;
+            }
+        } else if (type == XA_ATOM) {
+            if (format != 32) {
+                fprintf(stderr, "unexpected format %d for property %s\n",
+                        format, name);
+                return EXIT_FAILURE;
+            }
+            data.a[i] = parse_atom(dpy, argv[2 + i]);
+        } else {
+            fprintf(stderr, "unexpected type for property %s\n", name);
+            return EXIT_FAILURE;
+        }
+    }
 
+    XChangeDeviceProperty(dpy, dev, prop, type, format, PropModeReplace,
+                          data.c, nelements);
+    free(data.c);
+    XCloseDevice(dpy, dev);
+    return EXIT_SUCCESS;
+}

diff --git a/src/xinput.c b/src/xinput.c
index cc85affdea65b1def8bde8f16915f7a0616722f3..da54b480a7ccc14c4d28feaf0c576bf34386f0d1 100644 (file)
--- a/src/xinput.c
+++ b/src/xinput.c
@@ -135,6 +135,10 @@ static entry drivers[] =
       "<device> <property>",
       delete_prop
     },
+    { "set-prop",
+      "<device> <property> <val> [<val> ...]",
+      set_prop
+    },
     {NULL, NULL, NULL
     }
 };
@@ -193,7 +197,7 @@ find_device_info(Display    *display,
                        "Warning: There are multiple devices named \"%s\".\n"
                        "To ensure the correct one is selected, please use "
                        "the device ID instead.\n\n", name);
-                return NULL;
+               return NULL;
            } else {
                found = &devices[loop];
            }

diff --git a/src/xinput.h b/src/xinput.h
index 4b6809048ddab3418ff4831e4c903113cceecd07..c7269b932db9bc2f01ab89c624350b170700c64a 100644 (file)
--- a/src/xinput.h
+++ b/src/xinput.h
@@ -41,47 +41,39 @@
 #define EXIT_FAILURE 0
 #endif
 
-XDeviceInfo*
-find_device_info(
-                Display        *display,
-                char           *name,
-                Bool           only_extended
-                );
-int
-xi2_find_device_id(Display *display, char *name);
 
+XDeviceInfo* find_device_info( Display *display, char *name, Bool only_extended);
+int xi2_find_device_id(Display *display, char *name);
 int xinput_version(Display* display);
 
-#define DECLARE(name) \
-    int (name) ( \
-                Display*       display, \
-                int            argc, \
-                char           *argv[], \
-                char           *prog_name, \
-                char           *prog_desc \
-)
+int get_feedbacks( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_ptr_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int get_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_button_map( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_pointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+int set_mode( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int list( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int test( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int version( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_integer_feedback( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int query_state( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+/* X Input 1.5 */
+int list_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_int_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_float_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_atom_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int watch_props( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int delete_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_prop( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+
+/* X Input 2.0 */
+int create_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int remove_master( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int change_attachment( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int float_device( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int set_clientpointer( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
+int test_xi2( Display* display, int argc, char *argv[], char *prog_name, char *prog_desc);
 
-DECLARE(get_feedbacks);
-DECLARE(set_ptr_feedback);
-DECLARE(get_button_map);
-DECLARE(set_button_map);
-DECLARE(set_pointer);
-DECLARE(set_mode);
-DECLARE(list);
-DECLARE(test);
-DECLARE(version);
-DECLARE(set_integer_feedback);
-DECLARE(query_state);
-DECLARE(create_master);
-DECLARE(remove_master);
-DECLARE(change_attachment);
-DECLARE(float_device);
-DECLARE(set_clientpointer);
-DECLARE(test_xi2);
-DECLARE(list_props);
-DECLARE(set_int_prop);
-DECLARE(set_float_prop);
-DECLARE(set_atom_prop);
-DECLARE(watch_props);
-DECLARE(delete_prop);
 /* end of xinput.h */