libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git update

23 Mar 2012

1 files changed, 23 insertions, 22 deletions

diff --git a/xorg-server/hw/dmx/examples/xbell.c b/xorg-server/hw/dmx/examples/xbell.c
index 79419d324..543db24bf 100644
--- a/xorg-server/hw/dmx/examples/xbell.c
+++ b/xorg-server/hw/dmx/examples/xbell.c
@@ -35,27 +35,29 @@
 #include <stdlib.h>
 #include <X11/Xlib.h>
 
-static void pkc(XKeyboardControl *kc, unsigned long vm)
+static void
+pkc(XKeyboardControl * kc, unsigned long vm)
 {
-    if (vm&KBKeyClickPercent)
+    if (vm & KBKeyClickPercent)
         printf("   key_click_percent  = %d\n", kc->key_click_percent);
-    if (vm&KBBellPercent)
+    if (vm & KBBellPercent)
         printf("   bell_percent       = %d\n", kc->bell_percent);
-    if (vm&KBBellPitch)
+    if (vm & KBBellPitch)
         printf("   bell_pitch         = %d\n", kc->bell_pitch);
-    if (vm&KBBellDuration)
+    if (vm & KBBellDuration)
         printf("   bell_duration      = %d\n", kc->bell_duration);
-    if (vm&KBLed)
+    if (vm & KBLed)
         printf("   led                = 0x%x\n", kc->led);
-    if (vm&KBLedMode)
+    if (vm & KBLedMode)
         printf("   led_mode           = %d\n", kc->led_mode);
-    if (vm&KBKey)
+    if (vm & KBKey)
         printf("   key                = %d\n", kc->key);
-    if (vm&KBAutoRepeatMode)
+    if (vm & KBAutoRepeatMode)
         printf("   auto_repeat_mode   = %d\n", kc->auto_repeat_mode);
 }
 
-static void pks(XKeyboardState *ks)
+static void
+pks(XKeyboardState * ks)
 {
     printf("   key_click_percent  = %d\n", ks->key_click_percent);
     printf("   bell_percent       = %d\n", ks->bell_percent);
@@ -65,24 +67,23 @@ static void pks(XKeyboardState *ks)
     printf("   global_auto_repeat = %d\n", ks->global_auto_repeat);
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    Display          *display = XOpenDisplay(NULL);
+    Display *display = XOpenDisplay(NULL);
     XKeyboardControl kc;
-    XKeyboardState   ks;
-    unsigned long    vm;
+    XKeyboardState ks;
+    unsigned long vm;
 
     if (argc != 5) {
         printf("Usage: xbell percent baseVolume pitch duration\n");
         return 1;
     }
-    
-    vm               = (KBBellPercent
-                        | KBBellPitch
-                        | KBBellDuration);
+
+    vm = (KBBellPercent | KBBellPitch | KBBellDuration);
     kc.key_click_percent = atoi(argv[1]);
-    kc.bell_percent  = atoi(argv[2]);
-    kc.bell_pitch    = atoi(argv[3]);
+    kc.bell_percent = atoi(argv[2]);
+    kc.bell_pitch = atoi(argv[3]);
     kc.bell_duration = atoi(argv[4]);
 
     printf("Setting:\n");
@@ -92,9 +93,9 @@ int main(int argc, char **argv)
     printf("Have:\n");
     XGetKeyboardControl(display, &ks);
     pks(&ks);
-    
+
     XBell(display, 100);
-    
+
     XCloseDisplay(display);
     return 0;
 }