libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 155 insertions, 63 deletions

diff --git a/xorg-server/hw/dmx/examples/ev.c b/xorg-server/hw/dmx/examples/ev.c
index ed23b8aa9..b70016a45 100644
--- a/xorg-server/hw/dmx/examples/ev.c
+++ b/xorg-server/hw/dmx/examples/ev.c
@@ -46,16 +46,17 @@
 
 struct input_event event;
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    char          name[64];           /* RATS: Use ok, but could be better */
-    char          buf[256] = { 0, };  /* RATS: Use ok */
-    unsigned char mask[EV_MAX/8 + 1]; /* RATS: Use ok */
-    int           version;
-    int           fd = 0;
-    int           rc;
-    int           i, j;
-    char          *tmp;
+    char name[64];              /* RATS: Use ok, but could be better */
+    char buf[256] = { 0, };     /* RATS: Use ok */
+    unsigned char mask[EV_MAX / 8 + 1]; /* RATS: Use ok */
+    int version;
+    int fd = 0;
+    int rc;
+    int i, j;
+    char *tmp;
 
 #define test_bit(bit) (mask[(bit)/8] & (1 << ((bit)%8)))
 
@@ -73,15 +74,32 @@ int main(int argc, char **argv)
             for (j = 0; j < EV_MAX; j++) {
                 if (test_bit(j)) {
                     const char *type = "unknown";
-                    switch(j) {
-                    case EV_KEY: type = "keys/buttons"; break;
-                    case EV_REL: type = "relative";     break;
-                    case EV_ABS: type = "absolute";     break;
-                    case EV_MSC: type = "reserved";     break;
-                    case EV_LED: type = "leds";         break;
-                    case EV_SND: type = "sound";        break;
-                    case EV_REP: type = "repeat";       break;
-                    case EV_FF:  type = "feedback";     break;
+
+                    switch (j) {
+                    case EV_KEY:
+                        type = "keys/buttons";
+                        break;
+                    case EV_REL:
+                        type = "relative";
+                        break;
+                    case EV_ABS:
+                        type = "absolute";
+                        break;
+                    case EV_MSC:
+                        type = "reserved";
+                        break;
+                    case EV_LED:
+                        type = "leds";
+                        break;
+                    case EV_SND:
+                        type = "sound";
+                        break;
+                    case EV_REP:
+                        type = "repeat";
+                        break;
+                    case EV_FF:
+                        type = "feedback";
+                        break;
                     }
                     printf(" %s", type);
                 }
@@ -96,27 +114,27 @@ int main(int argc, char **argv)
         if ((fd = open(name, O_RDWR, 0)) >= 0) {
             printf("%s: open, fd = %d\n", name, fd);
             for (i = 0; i < LED_MAX; i++) {
-                event.time.tv_sec  = time(0);
+                event.time.tv_sec = time(0);
                 event.time.tv_usec = 0;
-                event.type         = EV_LED;
-                event.code         = i;
-                event.value        = 0;
+                event.type = EV_LED;
+                event.code = i;
+                event.value = 0;
                 write(fd, &event, sizeof(event));
             }
-            
+
             while ((rc = read(fd, &event, sizeof(event))) > 0) {
                 printf("%-24.24s.%06lu type 0x%04x; code 0x%04x;"
                        " value 0x%08x; ",
                        ctime(&event.time.tv_sec),
-                       event.time.tv_usec,
-                       event.type, event.code, event.value);
+                       event.time.tv_usec, event.type, event.code, event.value);
                 switch (event.type) {
                 case EV_KEY:
                     if (event.code > BTN_MISC) {
                         printf("Button %d %s",
                                event.code & 0xff,
                                event.value ? "press" : "release");
-                    } else {
+                    }
+                    else {
                         printf("Key %d (0x%x) %s",
                                event.code & 0xff,
                                event.code & 0xff,
@@ -125,51 +143,125 @@ int main(int argc, char **argv)
                     break;
                 case EV_REL:
                     switch (event.code) {
-                    case REL_X:      tmp = "X";       break;
-                    case REL_Y:      tmp = "Y";       break;
-                    case REL_HWHEEL: tmp = "HWHEEL";  break;
-                    case REL_DIAL:   tmp = "DIAL";    break;
-                    case REL_WHEEL:  tmp = "WHEEL";   break;
-                    case REL_MISC:   tmp = "MISC";    break;
-                    default:         tmp = "UNKNOWN"; break;
+                    case REL_X:
+                        tmp = "X";
+                        break;
+                    case REL_Y:
+                        tmp = "Y";
+                        break;
+                    case REL_HWHEEL:
+                        tmp = "HWHEEL";
+                        break;
+                    case REL_DIAL:
+                        tmp = "DIAL";
+                        break;
+                    case REL_WHEEL:
+                        tmp = "WHEEL";
+                        break;
+                    case REL_MISC:
+                        tmp = "MISC";
+                        break;
+                    default:
+                        tmp = "UNKNOWN";
+                        break;
                     }
                     printf("Relative %s %d", tmp, event.value);
                     break;
                 case EV_ABS:
                     switch (event.code) {
-                    case ABS_X:        tmp = "X";        break;
-                    case ABS_Y:        tmp = "Y";        break;
-                    case ABS_Z:        tmp = "Z";        break;
-                    case ABS_RX:       tmp = "RX";       break;
-                    case ABS_RY:       tmp = "RY";       break;
-                    case ABS_RZ:       tmp = "RZ";       break;
-                    case ABS_THROTTLE: tmp = "THROTTLE"; break;
-                    case ABS_RUDDER:   tmp = "RUDDER";   break;
-                    case ABS_WHEEL:    tmp = "WHEEL";    break;
-                    case ABS_GAS:      tmp = "GAS";      break;
-                    case ABS_BRAKE:    tmp = "BRAKE";    break;
-                    case ABS_HAT0X:    tmp = "HAT0X";    break;
-                    case ABS_HAT0Y:    tmp = "HAT0Y";    break;
-                    case ABS_HAT1X:    tmp = "HAT1X";    break;
-                    case ABS_HAT1Y:    tmp = "HAT1Y";    break;
-                    case ABS_HAT2X:    tmp = "HAT2X";    break;
-                    case ABS_HAT2Y:    tmp = "HAT2Y";    break;
-                    case ABS_HAT3X:    tmp = "HAT3X";    break;
-                    case ABS_HAT3Y:    tmp = "HAT3Y";    break;
-                    case ABS_PRESSURE: tmp = "PRESSURE"; break;
-                    case ABS_DISTANCE: tmp = "DISTANCE"; break;
-                    case ABS_TILT_X:   tmp = "TILT_X";   break;
-                    case ABS_TILT_Y:   tmp = "TILT_Y";   break;
-                    case ABS_MISC:     tmp = "MISC";     break;
-                    default:           tmp = "UNKNOWN";  break;
+                    case ABS_X:
+                        tmp = "X";
+                        break;
+                    case ABS_Y:
+                        tmp = "Y";
+                        break;
+                    case ABS_Z:
+                        tmp = "Z";
+                        break;
+                    case ABS_RX:
+                        tmp = "RX";
+                        break;
+                    case ABS_RY:
+                        tmp = "RY";
+                        break;
+                    case ABS_RZ:
+                        tmp = "RZ";
+                        break;
+                    case ABS_THROTTLE:
+                        tmp = "THROTTLE";
+                        break;
+                    case ABS_RUDDER:
+                        tmp = "RUDDER";
+                        break;
+                    case ABS_WHEEL:
+                        tmp = "WHEEL";
+                        break;
+                    case ABS_GAS:
+                        tmp = "GAS";
+                        break;
+                    case ABS_BRAKE:
+                        tmp = "BRAKE";
+                        break;
+                    case ABS_HAT0X:
+                        tmp = "HAT0X";
+                        break;
+                    case ABS_HAT0Y:
+                        tmp = "HAT0Y";
+                        break;
+                    case ABS_HAT1X:
+                        tmp = "HAT1X";
+                        break;
+                    case ABS_HAT1Y:
+                        tmp = "HAT1Y";
+                        break;
+                    case ABS_HAT2X:
+                        tmp = "HAT2X";
+                        break;
+                    case ABS_HAT2Y:
+                        tmp = "HAT2Y";
+                        break;
+                    case ABS_HAT3X:
+                        tmp = "HAT3X";
+                        break;
+                    case ABS_HAT3Y:
+                        tmp = "HAT3Y";
+                        break;
+                    case ABS_PRESSURE:
+                        tmp = "PRESSURE";
+                        break;
+                    case ABS_DISTANCE:
+                        tmp = "DISTANCE";
+                        break;
+                    case ABS_TILT_X:
+                        tmp = "TILT_X";
+                        break;
+                    case ABS_TILT_Y:
+                        tmp = "TILT_Y";
+                        break;
+                    case ABS_MISC:
+                        tmp = "MISC";
+                        break;
+                    default:
+                        tmp = "UNKNOWN";
+                        break;
                     }
                     printf("Absolute %s %d", tmp, event.value);
                     break;
-                case EV_MSC: printf("Misc"); break;
-                case EV_LED: printf("Led");  break;
-                case EV_SND: printf("Snd");  break;
-                case EV_REP: printf("Rep");  break;
-                case EV_FF:  printf("FF");   break;
+                case EV_MSC:
+                    printf("Misc");
+                    break;
+                case EV_LED:
+                    printf("Led");
+                    break;
+                case EV_SND:
+                    printf("Snd");
+                    break;
+                case EV_REP:
+                    printf("Rep");
+                    break;
+                case EV_FF:
+                    printf("FF");
+                    break;
                     break;
                 }
                 printf("\n");