xinput 1.5.0

[xorg-xinput] / src / property.c

diff --git a/src/property.c b/src/property.c
index db46059e6edf8ab43b5e0d61448ef55ccfbcc6a5..6cd8e7af19a2da0e036be4c652784c3993fb552b 100644 (file)
--- a/src/property.c
+++ b/src/property.c
@@ -72,6 +72,9 @@ print_property(Display *dpy, XDevice* dev, Atom property)
 
         ptr = data;
 
 
         ptr = data;
 

+        if (nitems == 0)
+            printf("<no items>");
+

         switch(act_format)
         {
             case 8: size = sizeof(char); break;
         switch(act_format)
         {
             case 8: size = sizeof(char); break;


@@ -111,8 +114,13 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                                                   the terminating 0 */
                     break;
                 case XA_ATOM:
                                                   the terminating 0 */
                     break;
                 case XA_ATOM:

-                    printf("\"%s\"", XGetAtomName(dpy, *(Atom*)ptr));
-                    break;
+                    {
+                        Atom a = *(Atom*)ptr;
+                        printf("\"%s\" (%d)",
+                                (a) ? XGetAtomName(dpy, a) : "None",
+                                (int)a);
+                        break;
+                    }

                 default:
                     if (float_atom != None && act_type == float_atom)
                     {
                 default:
                     if (float_atom != None && act_type == float_atom)
                     {


@@ -128,10 +136,10 @@ print_property(Display *dpy, XDevice* dev, Atom property)
 
             ptr += size;
 
 
             ptr += size;
 

-            if (j < nitems - 1)
-                printf(", ");

             if (done == True)
                 break;
             if (done == True)
                 break;

+            if (j < nitems - 1)
+                printf(", ");

         }
         printf("\n");
         XFree(data);
         }
         printf("\n");
         XFree(data);


@@ -140,7 +148,8 @@ print_property(Display *dpy, XDevice* dev, Atom property)
 
 }
 
 
 }
 

-int list_props(Display *dpy, int argc, char** argv, char* name, char *desc)
+static int
+list_props_xi1(Display *dpy, int argc, char** argv, char* name, char *desc)

 {
     XDeviceInfo *info;
     XDevice     *dev;
 {
     XDeviceInfo *info;
     XDevice     *dev;


@@ -189,144 +198,6 @@ int list_props(Display *dpy, int argc, char** argv, char* name, char *desc)
     return EXIT_SUCCESS;
 }
 
     return EXIT_SUCCESS;
 }
 

-int
-set_int_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
-{
-    XDeviceInfo *info;
-    XDevice     *dev;
-    Atom         prop;
-    char        *name;
-    int          i;
-    char        *data;
-    int          format, nelements =  0;
-
-    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);
-
-    nelements = argc - 3;
-    format    = atoi(argv[2]);
-    if (format != 8 && format != 16 && format != 32)
-    {
-        fprintf(stderr, "Invalid format %d\n", format);
-        return EXIT_FAILURE;
-    }
-
-    data = calloc(nelements, sizeof(long));
-    for (i = 0; i < nelements; i++)
-    {
-        switch(format)
-        {
-            case 8:
-                *(((char*)data) + i) = atoi(argv[3 + i]);
-                break;
-            case 16:
-                *(((short*)data) + i) = atoi(argv[3 + i]);
-                break;
-            case 32:
-                *(((long*)data) + i) = atoi(argv[3 + i]);
-                break;
-        }
-    }
-
-    XChangeDeviceProperty(dpy, dev, prop, XA_INTEGER, format, PropModeReplace,
-                          (unsigned char*)data, nelements);
-
-    free(data);
-    XCloseDevice(dpy, dev);
-    return EXIT_SUCCESS;
-}
-
-int
-set_float_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
-{
-    XDeviceInfo *info;
-    XDevice     *dev;
-    Atom         prop, float_atom;
-    char        *name;
-    int          i;
-    long        *data;
-    int          nelements =  0;
-    char*        endptr;
-
-    if (argc < 2)
-    {
-        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);
-
-    nelements = argc - 2;
-
-    float_atom = XInternAtom(dpy, "FLOAT", False);
-
-    if (float_atom == (Atom)0)
-    {
-       fprintf(stderr, "no FLOAT atom present in server\n");
-       return EXIT_FAILURE;
-    }
-
-    if (sizeof(float) != 4)
-    {
-       fprintf(stderr, "sane FP required\n");
-       return EXIT_FAILURE;
-    }
-
-    data = calloc(nelements, sizeof(long));
-    for (i = 0; i < nelements; i++)
-    {
-        *((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;
-       }
-    }
-
-    XChangeDeviceProperty(dpy, dev, prop, float_atom, 32, PropModeReplace,
-                          (unsigned char*)data, nelements);
-
-    free(data);
-    XCloseDevice(dpy, dev);
-    return EXIT_SUCCESS;
-}
-

 
 int watch_props(Display *dpy, int argc, char** argv, char* n, char *desc)
 {
 
 int watch_props(Display *dpy, int argc, char** argv, char* n, char *desc)
 {


@@ -374,7 +245,8 @@ int watch_props(Display *dpy, int argc, char** argv, char* n, char *desc)
     XCloseDevice(dpy, dev);
 }
 
     XCloseDevice(dpy, dev);
 }
 

-int delete_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
+static int
+delete_prop_xi1(Display *dpy, int argc, char** argv, char* n, char *desc)

 {
     XDevice     *dev;
     XDeviceInfo *info;
 {
     XDevice     *dev;
     XDeviceInfo *info;


@@ -405,17 +277,25 @@ int delete_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
     return EXIT_SUCCESS;
 }
 
     return EXIT_SUCCESS;
 }
 

-int
-set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
+static int
+do_set_prop_xi1(Display *dpy, Atom type, int format, int argc, char **argv, char *n, char *desc)

 {
 {

-    XDeviceInfo *info;
-    XDevice     *dev;
-    Atom         prop;
-    char        *name;
-    int          i, j;
-    Bool         is_atom;
-    Atom        *data;
-    int          nelements =  0;
+    XDeviceInfo  *info;
+    XDevice      *dev;
+    Atom          prop;
+    Atom          old_type;
+    char         *name;
+    int           i;
+    Atom          float_atom;
+    int           old_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)
     {
 
     if (argc < 3)
     {


@@ -441,54 +321,260 @@ set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
 
     prop = parse_atom(dpy, name);
 
 
     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;
     nelements = argc - 2;

-    data = calloc(nelements, sizeof(Atom));
+    if (type == None || format == 0) {
+        if (XGetDeviceProperty(dpy, dev, prop, 0, 0, False, AnyPropertyType,
+                               &old_type, &old_format, &act_nitems,
+                               &bytes_after, &data.c) != Success) {
+            fprintf(stderr, "failed to get property type and format for %s\n",
+                    name);
+            return EXIT_FAILURE;
+        } else {
+            if (type == None)
+                type = old_type;
+            if (format == 0)
+                format = old_format;
+        }
+
+        XFree(data.c);
+    }
+
+    if (type == None) {
+        fprintf(stderr, "property %s doesn't exist, you need to specify "
+                "its type and format\n", name);
+        return EXIT_FAILURE;
+    }
+
+    data.c = calloc(nelements, sizeof(long));
+

     for (i = 0; i < nelements; i++)
     {
     for (i = 0; i < nelements; i++)
     {

-        is_atom = True;
-        name = argv[2 + i];
-        for(j = 0; j < strlen(name); j++) {
-            if (!isdigit(name[j])) {
-                is_atom = False;
-                break;
+        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;

         }
         }

+    }

 
 

-        if (!is_atom)
-            data[i] = XInternAtom(dpy, name, False);
-        else
+    XChangeDeviceProperty(dpy, dev, prop, type, format, PropModeReplace,
+                          data.c, nelements);
+    free(data.c);
+    XCloseDevice(dpy, dev);
+    return EXIT_SUCCESS;
+}
+
+#if HAVE_XI2
+static void
+print_property_xi2(Display *dpy, int deviceid, Atom property)
+{
+    Atom                act_type;
+    char                *name;
+    int                 act_format;
+    unsigned long       nitems, bytes_after;
+    unsigned char       *data, *ptr;
+    int                 j, done = False;
+
+    name = XGetAtomName(dpy, property);
+    printf("\t%s (%ld):\t", name, property);
+
+    if (XIGetProperty(dpy, deviceid, property, 0, 1000, False,
+                           AnyPropertyType, &act_type, &act_format,
+                           &nitems, &bytes_after, &data) == Success)
+    {
+        Atom float_atom = XInternAtom(dpy, "FLOAT", True);
+
+        ptr = data;
+
+        if (nitems == 0)
+            printf("<no items>");
+
+        for (j = 0; j < nitems; j++)

         {
         {

-            data[i] = atoi(name);
-            XFree(XGetAtomName(dpy, data[i]));
+            switch(act_type)
+            {
+                case XA_INTEGER:
+                    switch(act_format)
+                    {
+                        case 8:
+                            printf("%d", *((int8_t*)ptr));
+                            break;
+                        case 16:
+                            printf("%d", *((int16_t*)ptr));
+                            break;
+                        case 32:
+                            printf("%d", *((int32_t*)ptr));
+                            break;
+                    }
+                    break;
+                case XA_STRING:
+                    if (act_format != 8)
+                    {
+                        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:
+                    {
+                        Atom a = *(Atom*)ptr;
+                        printf("\"%s\" (%d)",
+                                (a) ? XGetAtomName(dpy, a) : "None",
+                                (int)a);
+                        break;
+                    }
+                    break;
+                default:
+                    if (float_atom != None && act_type == float_atom)
+                    {
+                        printf("%f", *((float*)ptr));
+                        break;
+                    }
+
+                    printf("\t... of unknown type %s\n",
+                            XGetAtomName(dpy, act_type));
+                    done = True;
+                    break;
+            }
+
+            ptr += act_format/8;
+
+            if (done == True)
+                break;
+            if (j < nitems - 1)
+                printf(", ");

         }
         }

+        printf("\n");
+        XFree(data);
+    } else
+        printf("\tFetch failure\n");
+
+}
+
+static int
+list_props_xi2(Display *dpy, int argc, char** argv, char* name, char *desc)
+{
+    XIDeviceInfo *info;
+    int         i;
+    int         nprops;
+    Atom        *props;
+
+    if (argc == 0)
+    {
+        fprintf(stderr, "Usage: xinput %s %s\n", name, desc);
+        return EXIT_FAILURE;

     }
 
     }
 

-    XChangeDeviceProperty(dpy, dev, prop, XA_ATOM, 32, PropModeReplace,
-                          (unsigned char*)data, nelements);
+    for (i = 0; i < argc; i++)
+    {
+        info = xi2_find_device_info(dpy, argv[i]);
+        if (!info)
+        {
+            fprintf(stderr, "unable to find device %s\n", argv[i]);
+            continue;
+        }

 
 

-    free(data);
-    XCloseDevice(dpy, dev);
+        props = XIListProperties(dpy, info->deviceid, &nprops);
+        if (!nprops)
+        {
+            printf("Device '%s' does not report any properties.\n", info->name);
+            continue;
+        }
+
+        printf("Device '%s':\n", info->name);
+        while(nprops--)
+        {
+            print_property_xi2(dpy, info->deviceid, props[nprops]);
+        }
+
+        XFree(props);
+    }

     return EXIT_SUCCESS;
 }
 
     return EXIT_SUCCESS;
 }
 

-int
-set_prop(Display *dpy, int argc, char **argv, char *n, char *desc)
+static int
+delete_prop_xi2(Display *dpy, int argc, char** argv, char* n, char *desc)

 {
 {

-    XDeviceInfo  *info;
-    XDevice      *dev;
+    XIDeviceInfo *info;
+    char        *name;
+    Atom        prop;
+
+    info = xi2_find_device_info(dpy, argv[0]);
+    if (!info)
+    {
+        fprintf(stderr, "unable to find device %s\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    name = argv[1];
+
+    prop = parse_atom(dpy, name);
+
+    XIDeleteProperty(dpy, info->deviceid, prop);
+
+    return EXIT_SUCCESS;
+}
+
+static int
+do_set_prop_xi2(Display *dpy, Atom type, int format, int argc, char **argv, char *n, char *desc)
+{
+    XIDeviceInfo *info;

     Atom          prop;
     Atom          prop;

-    Atom          type;
+    Atom          old_type;

     char         *name;
     int           i;
     Atom          float_atom;
     char         *name;
     int           i;
     Atom          float_atom;

-    int           format, nelements = 0;
+    int           old_format, nelements = 0;

     unsigned long act_nitems, bytes_after;
     char         *endptr;
     union {
         unsigned char *c;
     unsigned long act_nitems, bytes_after;
     char         *endptr;
     union {
         unsigned char *c;

-        short *s;
-        long *l;
-        Atom *a;
+        int16_t *s;
+        int32_t *l;

     } data;
 
     if (argc < 3)
     } data;
 
     if (argc < 3)


@@ -497,20 +583,13 @@ set_prop(Display *dpy, int argc, char **argv, char *n, char *desc)
         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    info = find_device_info(dpy, argv[0], False);
+    info = xi2_find_device_info(dpy, argv[0]);

     if (!info)
     {
         fprintf(stderr, "unable to find device %s\n", argv[0]);
         return EXIT_FAILURE;
     }
 
     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);
     name = argv[1];
 
     prop = parse_atom(dpy, name);


@@ -523,21 +602,30 @@ set_prop(Display *dpy, int argc, char **argv, char *n, char *desc)
     float_atom = XInternAtom(dpy, "FLOAT", False);
 
     nelements = argc - 2;
     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;
-    }
+    if (type == None || format == 0) {
+        if (XIGetProperty(dpy, info->deviceid, prop, 0, 0, False,
+                          AnyPropertyType, &old_type, &old_format, &act_nitems,
+                          &bytes_after, &data.c) != Success) {
+            fprintf(stderr, "failed to get property type and format for %s\n",
+                    name);
+            return EXIT_FAILURE;
+        } else {
+            if (type == None)
+                type = old_type;
+            if (format == 0)
+                format = old_format;
+        }

 
 

-    XFree(data.c);
+        XFree(data.c);
+    }

 
     if (type == None) {
 
     if (type == None) {

-        fprintf(stderr, "property %s doesn't exist\n", name);
+        fprintf(stderr, "property %s doesn't exist, you need to specify "
+                "its type and format\n", name);

         return EXIT_FAILURE;
     }
 
         return EXIT_FAILURE;
     }
 

-    data.c = calloc(nelements, sizeof(long));
+    data.c = calloc(nelements, sizeof(int32_t));

 
     for (i = 0; i < nelements; i++)
     {
 
     for (i = 0; i < nelements; i++)
     {


@@ -574,16 +662,140 @@ set_prop(Display *dpy, int argc, char **argv, char *n, char *desc)
                         format, name);
                 return EXIT_FAILURE;
             }
                         format, name);
                 return EXIT_FAILURE;
             }

-            data.a[i] = parse_atom(dpy, argv[2 + i]);
+            data.l[i] = parse_atom(dpy, argv[2 + i]);

         } else {
             fprintf(stderr, "unexpected type for property %s\n", name);
             return EXIT_FAILURE;
         }
     }
 
         } else {
             fprintf(stderr, "unexpected type for property %s\n", name);
             return EXIT_FAILURE;
         }
     }
 

-    XChangeDeviceProperty(dpy, dev, prop, type, format, PropModeReplace,
+    XIChangeProperty(dpy, info->deviceid, prop, type, format, PropModeReplace,

                           data.c, nelements);
     free(data.c);
                           data.c, nelements);
     free(data.c);

-    XCloseDevice(dpy, dev);

     return EXIT_SUCCESS;
 }
     return EXIT_SUCCESS;
 }

+#endif
+
+int list_props(Display *display, int argc, char *argv[], char *name,
+               char *desc)
+{
+#ifdef HAVE_XI2
+    if (xinput_version(display) == XI_2_Major)
+        return list_props_xi2(display, argc, argv, name, desc);
+#endif
+    return list_props_xi1(display, argc, argv, name, desc);
+
+}
+
+int delete_prop(Display *display, int argc, char *argv[], char *name,
+                char *desc)
+{
+#ifdef HAVE_XI2
+    if (xinput_version(display) == XI_2_Major)
+        return delete_prop_xi2(display, argc, argv, name, desc);
+#endif
+    return delete_prop_xi1(display, argc, argv, name, desc);
+
+}
+
+static int
+do_set_prop(Display *display, Atom type, int format, int argc, char *argv[], char *name, char *desc)
+{
+#ifdef HAVE_XI2
+    if (xinput_version(display) == XI_2_Major)
+        return do_set_prop_xi2(display, type, format, argc, argv, name, desc);
+#endif
+    return do_set_prop_xi1(display, type, format, argc, argv, name, desc);
+}
+
+int
+set_atom_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
+{
+    return do_set_prop(dpy, XA_ATOM, 32, argc, argv, n, desc);
+}
+
+int
+set_int_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
+{
+    int          i;
+    int          format;
+
+    if (argc < 3)
+    {
+        fprintf(stderr, "Usage: xinput %s %s\n", n, desc);
+        return EXIT_FAILURE;
+    }
+
+    format    = atoi(argv[2]);
+    if (format != 8 && format != 16 && format != 32)
+    {
+        fprintf(stderr, "Invalid format %d\n", format);
+        return EXIT_FAILURE;
+    }
+
+    for (i = 3; i < argc; i++)
+        argv[i - 1] = argv[i];
+
+    return do_set_prop(dpy, XA_INTEGER, format, argc - 1, argv, n, desc);
+}
+
+int
+set_float_prop(Display *dpy, int argc, char** argv, char* n, char *desc)
+{
+    Atom float_atom = XInternAtom(dpy, "FLOAT", False);
+
+    if (sizeof(float) != 4)
+    {
+       fprintf(stderr, "sane FP required\n");
+       return EXIT_FAILURE;
+    }
+
+    return do_set_prop(dpy, float_atom, 32, argc, argv, n, desc);
+}
+
+int set_prop(Display *display, int argc, char *argv[], char *name,
+             char *desc)
+{
+    Atom type = None;
+    int format = 0;
+    int i = 0, j;
+
+    while (i < argc) {
+        char *option = strchr(argv[i], '=');
+        /* skip non-option arguments */
+        if (strncmp(argv[i], "--", 2) || !option) {
+            i++;
+            continue;
+        }
+
+        if (!strncmp(argv[i], "--type=", strlen("--type="))) {
+            if (!strcmp(option + 1, "int")) {
+                type = XA_INTEGER;
+            } else if (!strcmp(option + 1, "float")) {
+                type = XInternAtom(display, "FLOAT", False);
+                format = 32;
+            } else if (!strcmp(option + 1, "atom")) {
+                type = XA_ATOM;
+                format = 32;
+            } else {
+                fprintf(stderr, "unknown property type %s\n", option + 1);
+                return EXIT_FAILURE;
+            }
+        } else if (!strncmp(argv[i], "--format=", strlen("--format="))) {
+            format = atoi(option + 1);
+            if (format != 8 && format != 16 && format != 32) {
+                fprintf(stderr, "invalid property format %s\n", option + 1);
+                return EXIT_FAILURE;
+            }
+        } else {
+            fprintf(stderr, "invalid option %s\n", argv[i]);
+            return EXIT_FAILURE;
+        }
+
+        for (j = i; j + 1 < argc; j++)
+            argv[j] = argv[j + 1];
+        argc--;
+    }
+
+    return do_set_prop(display, type, format, argc, argv, name, desc);
+}