xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 configure.ac                |    2 +-
 hw/xquartz/X11Application.m |   26 +++++++++++++++++---------
 hw/xquartz/X11Controller.m  |   17 +++++++++--------
 3 files changed, 27 insertions(+), 18 deletions(-)

New commits:
commit 2b3492c723789cb7172acee0e224fba50c960358
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Mar 30 20:39:51 2009 -0700

    1.4.2-apple38

diff --git a/configure.ac b/configure.ac
index 23c12e7..043898b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.4.2-apple37, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.4.2-apple38, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
commit 7a67935b05a475215b9bdbb959e4f7e15f32416f
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Mar 30 20:37:25 2009 -0700

    XQuartz: Fix mouse tracking for quake, et. al. in wine
    
    Patch courtesy of Codeweavers
    
    Fix mouse movement tracking.  For a non-window-related mouse-move event,
    calculate the new position by adding the event's delta-x and delta-y values
    to the previous mouse position.  Do not rely on the current mouse position
    because it may have been changed by a XWarpPointer call.

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index b82c89f..6a0e011 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -961,26 +961,34 @@ static inline int ensure_flag(int flags, int device_independent, int device_depe
     DeviceIntPtr pDev;
     int modifierFlags;
 
+    static NSPoint lastpt;
+
     /* convert location to be relative to top-left of primary display */
-    location = [e locationInWindow];
     window = [e window];
-    screen = [[[NSScreen screens] objectAtIndex:0] frame];
 
     if (window != nil)	{
         NSRect frame = [window frame];
-        pointer_x = location.x + frame.origin.x;
-        pointer_y = (screen.origin.y + screen.size.height)
-                    - (location.y + frame.origin.y);
+        location = [e locationInWindow];
+        location.x += frame.origin.x;
+        location.y += frame.origin.y;
+        lastpt = location;
     } else {
-        pointer_x = location.x;
-        pointer_y = (screen.origin.y + screen.size.height) - location.y;
+        location.x = lastpt.x + [e deltaX];
+        location.y = lastpt.y - [e deltaY];
+        lastpt = [NSEvent mouseLocation];
     }
-
+    
+    /* Convert coordinate system */
+    screen = [[[NSScreen screens] objectAtIndex:0] frame];
+    location.y = (screen.origin.y + screen.size.height) - location.y;
+    
     /* Setup our valuators.  These will range from 0 to 1 */
     pressure = 0;
     tilt_x = 0;
     tilt_y = 0;
-    
+    pointer_x = location.x;
+    pointer_y = location.y;
+
     modifierFlags = [e modifierFlags];
     
 #ifdef NX_DEVICELCMDKEYMASK
commit f179a51b55e03b1f3cd0133d8194530b79f28910
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Jan 16 19:26:07 2009 -0800

    XQuartz: SnowLeopard: Help system book name changed in 10.6
    (cherry picked from commit b57cb05c69acbedb00a97234099ea104309aa2cb)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 9b30fa6..adf861c 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -687,18 +687,19 @@ objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
     [prefs_panel makeKeyAndOrderFront:sender];
 }
 
-- (IBAction) quit:sender
-{
-  DarwinSendDDXEvent(kXquartzQuit, 0);
+- (IBAction) quit:sender {
+    DarwinSendDDXEvent(kXquartzQuit, 0);
 }
 
-- (IBAction) x11_help:sender
-{
-  AHLookupAnchor ((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR ("mchlp2276"));
+- (IBAction) x11_help:sender {
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    AHLookupAnchor((CFStringRef)NSLocalizedString(@"Mac Help", no comment), CFSTR("mchlp2276"));
+#else
+    AHLookupAnchor(CFSTR("com.apple.machelp"), CFSTR("mchlp2276"));
+#endif
 }
 
-- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item
-{
+- (OSX_BOOL) validateMenuItem:(NSMenuItem *)item {
   NSMenu *menu = [item menu];
     
   if (item == toggle_fullscreen_item)