small fixes to the propery output

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/property.c b/src/property.c
index 062ede96470cc1cfc019d6a7ffee1d12133768a1..e591013d22e15d0d9782bd74b3441109a56b6a48 100644 (file)
--- a/src/property.c
+++ b/src/property.c
@@ -42,7 +42,7 @@ print_property(Display *dpy, XDevice* dev, Atom property)
     int                 act_format;
     unsigned long       nitems, bytes_after;
     unsigned char       *data, *ptr;
     int                 act_format;
     unsigned long       nitems, bytes_after;
     unsigned char       *data, *ptr;

-    int                 j;
+    int                 j, done = False;

 
     name = XGetAtomName(dpy, property);
     printf("\t%s (%ld):\t", name, property);
 
     name = XGetAtomName(dpy, property);
     printf("\t%s (%ld):\t", name, property);


@@ -54,7 +54,6 @@ print_property(Display *dpy, XDevice* dev, Atom property)
         int float_atom = XInternAtom(dpy, "FLOAT", False);
 
         ptr = data;
         int float_atom = XInternAtom(dpy, "FLOAT", False);
 
         ptr = data;

-        printf("\t");

 
         for (j = 0; j < nitems; j++)
         {
 
         for (j = 0; j < nitems; j++)
         {


@@ -75,20 +74,22 @@ print_property(Display *dpy, XDevice* dev, Atom property)
                     }
                     break;
                 case XA_STRING:
                     }
                     break;
                 case XA_STRING:

-                    printf("\t%s", ptr);
+                    printf("\"%s\"", ptr);
+                    done = True;

                     break;
                 case XA_ATOM:
                     break;
                 case XA_ATOM:

-                    printf("\t%s", XGetAtomName(dpy, *(Atom*)ptr));
+                    printf("\"%s\"", XGetAtomName(dpy, *(Atom*)ptr));

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

-                        printf("\t%f\n", *((float*)ptr));
+                        printf("%f", *((float*)ptr));

                         break;
                     }
 
                         break;
                     }
 

-                    printf("\t\t... of unknown type %s\n",
+                    printf("\t... of unknown type %s\n",

                             XGetAtomName(dpy, act_type));
                             XGetAtomName(dpy, act_type));

+                    done = True;

                     break;
             }
 
                     break;
             }
 


@@ -96,7 +97,7 @@ print_property(Display *dpy, XDevice* dev, Atom property)
 
             if (j < nitems - 1)
                 printf(", ");
 
             if (j < nitems - 1)
                 printf(", ");

-            if (act_type == XA_STRING)
+            if (done == True)

                 break;
         }
         printf("\n");
                 break;
         }
         printf("\n");