fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012

1 files changed, 48 insertions, 36 deletions

diff --git a/xorg-server/hw/xquartz/darwinEvents.h b/xorg-server/hw/xquartz/darwinEvents.h
index 515dd3049..61ace6ee3 100644
--- a/xorg-server/hw/xquartz/darwinEvents.h
+++ b/xorg-server/hw/xquartz/darwinEvents.h
@@ -31,55 +31,67 @@
 /* For extra precision of our cursor and other valuators */
 #define XQUARTZ_VALUATOR_LIMIT (1 << 16)
 
-Bool DarwinEQInit(void);
-void DarwinEQFini(void);
-void DarwinEQEnqueue(const xEventPtr e);
-void DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
-void DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
-void DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev);
-void DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
-                             float pointer_x, float pointer_y, float pressure,
-                             float tilt_x, float tilt_y);
-void DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, float pointer_x,
-                               float pointer_y, float pressure, float tilt_x,
-                               float tilt_y);
-void DarwinSendKeyboardEvents(int ev_type, int keycode);
-void DarwinSendScrollEvents(float count_x, float count_y, float pointer_x,
-                            float pointer_y, float pressure, float tilt_x,
-                            float tilt_y);
-void DarwinUpdateModKeys(int flags);
-void DarwinListenOnOpenFD(int fd);
+Bool
+DarwinEQInit(void);
+void
+DarwinEQFini(void);
+void
+DarwinEQEnqueue(const xEventPtr e);
+void
+DarwinEQPointerPost(DeviceIntPtr pDev, xEventPtr e);
+void
+DarwinEQSwitchScreen(ScreenPtr pScreen, Bool fromDIX);
+void
+DarwinInputReleaseButtonsAndKeys(DeviceIntPtr pDev);
+void
+DarwinSendPointerEvents(DeviceIntPtr pDev, int ev_type, int ev_button,
+                        double pointer_x, double pointer_y, double pressure,
+                        double tilt_x,
+                        double tilt_y);
+void
+DarwinSendProximityEvents(DeviceIntPtr pDev, int ev_type, double pointer_x,
+                          double pointer_y, double pressure, double tilt_x,
+                          double tilt_y);
+void
+DarwinSendKeyboardEvents(int ev_type, int keycode);
+void
+DarwinSendScrollEvents(double scroll_x, double scroll_y);
+void
+DarwinUpdateModKeys(int flags);
+void
+DarwinListenOnOpenFD(int fd);
 
 /*
  * Subtypes for the ET_XQuartz event type
  */
 enum {
-    kXquartzReloadKeymap,       // Reload system keymap
-    kXquartzActivate,           // restore X drawing and cursor
-    kXquartzDeactivate,         // clip X drawing and switch to Aqua cursor
-    kXquartzSetRootClip,        // enable or disable drawing to the X screen
-    kXquartzQuit,               // kill the X server and release the display
-    kXquartzBringAllToFront,    // bring all X windows to front
-    kXquartzToggleFullscreen,   // Enable/Disable fullscreen mode
-    kXquartzSetRootless,        // Set rootless mode
-    kXquartzSpaceChanged,       // Spaces changed
-    kXquartzListenOnOpenFD,     // Listen to the launchd fd (passed as arg)
+    kXquartzReloadKeymap,     // Reload system keymap
+    kXquartzActivate,         // restore X drawing and cursor
+    kXquartzDeactivate,       // clip X drawing and switch to Aqua cursor
+    kXquartzSetRootClip,      // enable or disable drawing to the X screen
+    kXquartzQuit,             // kill the X server and release the display
+    kXquartzBringAllToFront,  // bring all X windows to front
+    kXquartzToggleFullscreen, // Enable/Disable fullscreen mode
+    kXquartzSetRootless,      // Set rootless mode
+    kXquartzSpaceChanged,     // Spaces changed
+    kXquartzListenOnOpenFD,   // Listen to the launchd fd (passed as arg)
     /*
      * AppleWM events
      */
-    kXquartzControllerNotify,   // send an AppleWMControllerNotify event
-    kXquartzPasteboardNotify,   // notify the WM to copy or paste
-    kXquartzReloadPreferences,  // send AppleWMReloadPreferences
+    kXquartzControllerNotify, // send an AppleWMControllerNotify event
+    kXquartzPasteboardNotify, // notify the WM to copy or paste
+    kXquartzReloadPreferences, // send AppleWMReloadPreferences
     /*
      * Xplugin notification events
      */
-    kXquartzDisplayChanged,     // display configuration has changed
-    kXquartzWindowState,        // window visibility state has changed
-    kXquartzWindowMoved,        // window has moved on screen
+    kXquartzDisplayChanged,   // display configuration has changed
+    kXquartzWindowState,      // window visibility state has changed
+    kXquartzWindowMoved,      // window has moved on screen
 };
 
 /* Send one of the above events to the server thread. */
-void DarwinSendDDXEvent(int type, int argc, ...);
+void
+DarwinSendDDXEvent(int type, int argc, ...);
 
 /* A mask of the modifiers that are in our X11 keyboard layout:
  * (Fn for example is just useful for 3button mouse emulation) */
@@ -92,4 +104,4 @@ extern int darwin_x11_modifier_mask;
 /* The current state of the above listed modifiers */
 extern int darwin_all_modifier_flags;
 
-#endif                          /* _DARWIN_EVENTS_H */
+#endif  /* _DARWIN_EVENTS_H */