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

[Jeremy Huddleston]

 hw/xquartz/X11Application.m |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit ca0babafa4e9cf1b67ec460655bffe569ac9c3e9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Aug 4 20:11:45 2008 -0700

    XQuartz: Fixed proper processing of tablet button presses

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index f9222fe..19e1f33 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -863,6 +863,7 @@ static void send_nsevent (NSEventType type, NSEvent *e) {
 	tilt_y = 0;
 
 	switch (type) {
+		case NSMouseMoved: ev_button=0; ev_type=MotionNotify; goto check_subtype;
 		case NSLeftMouseDown:    ev_button=1; ev_type=ButtonPress; goto check_subtype;
 		case NSOtherMouseDown:   ev_button=2; ev_type=ButtonPress; goto check_subtype;
 		case NSRightMouseDown:   ev_button=3; ev_type=ButtonPress; goto check_subtype;
@@ -874,16 +875,16 @@ static void send_nsevent (NSEventType type, NSEvent *e) {
 		case NSRightMouseDragged: ev_button=3; ev_type=MotionNotify; goto check_subtype;
 		
 check_subtype:
-			if ([e subtype] != NSTabletPointEventSubtype) goto handle_mouse;
+			if ([e subtype] != NSTabletPointEventSubtype) 
+                goto handle_mouse;
 			// fall through to get tablet data
 		case NSTabletPoint:
 			pressure = [e pressure];
 			tilt_x = [e tilt].x;
 			tilt_y = [e tilt].y; 
+            goto handle_mouse;
 			// fall through to normal mouse handling
 
-		case NSMouseMoved: ev_button=0; ev_type=MotionNotify; goto handle_mouse;
-
 handle_mouse:
 		DarwinSendPointerEvents(ev_type, ev_button, pointer_x, pointer_y,
 			pressure, tilt_x, tilt_y);