Mercurial > sdl-ios-xcode

changeset 82:2bddc38a9f5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
When the mouse is grabbed, send the application the motion associated with the enter/leave notify events.
author Sam Lantinga <slouken@lokigames.com>
date Tue, 26 Jun 2001 17:40:59 +0000
parents 1a2723474f12
children 4c8b9babaae4
files src/video/x11/SDL_x11events.c
diffstat 1 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/video/x11/SDL_x11events.c	Mon Jun 25 22:16:44 2001 +0000
+++ b/src/video/x11/SDL_x11events.c	Tue Jun 26 17:40:59 2001 +0000
@@ -58,6 +58,7 @@
 
 /* Define this if you want to debug X11 events */
 /*#define DEBUG_XEVENTS*/
+#define DEBUG_XEVENTS
 
 /* The translation tables from an X11 keysym to a SDL keysym */
 static SDLKey ODD_keymap[256];
@@ -167,7 +168,7 @@
 	    /* Gaining mouse coverage? */
 	    case EnterNotify: {
 #ifdef DEBUG_XEVENTS
-printf("EnterNotify!\n");
+printf("EnterNotify! (%d,%d)\n", xevent.xcrossing.x, xevent.xcrossing.y);
 if ( xevent.xcrossing.mode == NotifyGrab )
 printf("Mode: NotifyGrab\n");
 if ( xevent.xcrossing.mode == NotifyUngrab )
@@ -175,7 +176,13 @@
 #endif
 		if ( (xevent.xcrossing.mode != NotifyGrab) &&
 		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-			posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+			if ( this->input_grab == SDL_GRAB_OFF ) {
+				posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
+			} else {
+				posted = SDL_PrivateMouseMotion(0, 0,
+						xevent.xcrossing.x,
+						xevent.xcrossing.y);
+			}
 		}
 	    }
 	    break;
@@ -183,7 +190,7 @@
 	    /* Losing mouse coverage? */
 	    case LeaveNotify: {
 #ifdef DEBUG_XEVENTS
-printf("LeaveNotify!\n");
+printf("LeaveNotify! (%d,%d)\n", xevent.xcrossing.x, xevent.xcrossing.y);
 if ( xevent.xcrossing.mode == NotifyGrab )
 printf("Mode: NotifyGrab\n");
 if ( xevent.xcrossing.mode == NotifyUngrab )
@@ -191,7 +198,13 @@
 #endif
 		if ( (xevent.xcrossing.mode != NotifyGrab) &&
 		     (xevent.xcrossing.mode != NotifyUngrab) ) {
-			posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+			if ( this->input_grab == SDL_GRAB_OFF ) {
+				posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
+			} else {
+				posted = SDL_PrivateMouseMotion(0, 0,
+						xevent.xcrossing.x,
+						xevent.xcrossing.y);
+			}
 		}
 	    }
 	    break;
@@ -246,6 +259,9 @@
 					posted = X11_WarpedMotion(this,&xevent);
 				}
 			} else {
+#ifdef DEBUG_MOTION
+  printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
+#endif
 				posted = SDL_PrivateMouseMotion(0, 0,
 						xevent.xmotion.x,
 						xevent.xmotion.y);