From 9ff6ef244bb9fed69896055a138e1b4e521e4c22 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 30 Sep 2009 04:49:57 +0000 Subject: [PATCH] I just tested DGA mouse motion with X.org 1.6.0 and it's working fine, with evdev and the G5 mouse. It's not creating a ton of events here. --- src/video/x11/SDL_x11events.c | 16 +++------------- src/video/x11/SDL_x11video.h | 4 ---- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/src/video/x11/SDL_x11events.c b/src/video/x11/SDL_x11events.c index f2f9bb163..301060017 100644 --- a/src/video/x11/SDL_x11events.c +++ b/src/video/x11/SDL_x11events.c @@ -515,9 +515,9 @@ printf("KeymapNotify!\n"); #ifdef DEBUG_MOTION printf("DGA motion: %d,%d\n", xevent.xmotion.x_root, xevent.xmotion.y_root); #endif - /* batch DGA motion into one event, queued later. */ - dga_x += xevent.xmotion.x_root; - dga_y += xevent.xmotion.y_root; + posted = SDL_PrivateMouseMotion(0, 1, + xevent.xmotion.x_root, + xevent.xmotion.y_root); } else { posted = X11_WarpedMotion(this,&xevent); } @@ -931,16 +931,6 @@ void X11_PumpEvents(_THIS) X11_DispatchEvent(this); ++pending; } - - /* We batch up all the DGA motion events and generate a single SDL - event from them, since newer x.org releases might send a LOT of - these at once and flood the SDL event queue. --ryan. */ - if (dga_x || dga_y) { - SDL_PrivateMouseMotion(0, 1, dga_x, dga_y); - dga_x = 0; - dga_y = 0; - } - if ( switch_waiting ) { Uint32 now; diff --git a/src/video/x11/SDL_x11video.h b/src/video/x11/SDL_x11video.h index 48d32ddd9..6489f7598 100644 --- a/src/video/x11/SDL_x11video.h +++ b/src/video/x11/SDL_x11video.h @@ -70,8 +70,6 @@ struct SDL_PrivateVideoData { /* Direct Graphics Access extension information */ int using_dga; - Sint16 dga_x; - Sint16 dga_y; #ifndef NO_SHARED_MEMORY /* MIT shared memory extension information */ @@ -174,8 +172,6 @@ struct SDL_PrivateVideoData { #define SDL_IC (this->hidden->X11_IC) #define SDL_windowid (this->hidden->SDL_windowid) #define using_dga (this->hidden->using_dga) -#define dga_x (this->hidden->dga_x) -#define dga_y (this->hidden->dga_y) #define use_mitshm (this->hidden->use_mitshm) #define shminfo (this->hidden->shminfo) #define SDL_Ximage (this->hidden->Ximage)