Commit 891d1442 authored by Sam Lantinga's avatar Sam Lantinga

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.

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403949
parent 8c8764bf
...@@ -515,9 +515,9 @@ printf("KeymapNotify!\n"); ...@@ -515,9 +515,9 @@ printf("KeymapNotify!\n");
#ifdef DEBUG_MOTION #ifdef DEBUG_MOTION
printf("DGA motion: %d,%d\n", xevent.xmotion.x_root, xevent.xmotion.y_root); printf("DGA motion: %d,%d\n", xevent.xmotion.x_root, xevent.xmotion.y_root);
#endif #endif
/* batch DGA motion into one event, queued later. */ posted = SDL_PrivateMouseMotion(0, 1,
dga_x += xevent.xmotion.x_root; xevent.xmotion.x_root,
dga_y += xevent.xmotion.y_root; xevent.xmotion.y_root);
} else { } else {
posted = X11_WarpedMotion(this,&xevent); posted = X11_WarpedMotion(this,&xevent);
} }
...@@ -931,16 +931,6 @@ void X11_PumpEvents(_THIS) ...@@ -931,16 +931,6 @@ void X11_PumpEvents(_THIS)
X11_DispatchEvent(this); X11_DispatchEvent(this);
++pending; ++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 ) { if ( switch_waiting ) {
Uint32 now; Uint32 now;
......
...@@ -70,8 +70,6 @@ struct SDL_PrivateVideoData { ...@@ -70,8 +70,6 @@ struct SDL_PrivateVideoData {
/* Direct Graphics Access extension information */ /* Direct Graphics Access extension information */
int using_dga; int using_dga;
Sint16 dga_x;
Sint16 dga_y;
#ifndef NO_SHARED_MEMORY #ifndef NO_SHARED_MEMORY
/* MIT shared memory extension information */ /* MIT shared memory extension information */
...@@ -174,8 +172,6 @@ struct SDL_PrivateVideoData { ...@@ -174,8 +172,6 @@ struct SDL_PrivateVideoData {
#define SDL_IC (this->hidden->X11_IC) #define SDL_IC (this->hidden->X11_IC)
#define SDL_windowid (this->hidden->SDL_windowid) #define SDL_windowid (this->hidden->SDL_windowid)
#define using_dga (this->hidden->using_dga) #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 use_mitshm (this->hidden->use_mitshm)
#define shminfo (this->hidden->shminfo) #define shminfo (this->hidden->shminfo)
#define SDL_Ximage (this->hidden->Ximage) #define SDL_Ximage (this->hidden->Ximage)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment