pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

The core pointer is comprised of merging the inputs of all mice.

Browse source 
If there are other mice, they should show up in the device list, and
we want to report events from those devices instead of the core events.
However, if XInput isn't supported or we can't find other mice in the
device list, we'll add the core pointer and interpret normal mouse events.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403454
This commit is contained in:
Sam Lantinga 2009-01-04 18:29:20 +00:00
parent 4307faf9d4
commit 1627124ff0
2 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/video/x11/SDL_x11events.c
View file

@ -280,6 +280,16 @@ X11_DispatchEvent(_THIS)
}
break;
default:{
#if SDL_VIDEO_DRIVER_X11_XINPUT
for (i = 0; i < SDL_GetNumMice(); ++i) {
SDL_Mouse *mouse;
X11_MouseData *data;
mouse = SDL_GetMouse(i);
data = (X11_MouseData *) mouse->driverdata;
if (!data) {
switch (xevent.type) {
case MotionNotify:
#ifdef DEBUG_MOTION
printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
@ -294,16 +304,7 @@ X11_DispatchEvent(_THIS)
case ButtonRelease:
SDL_SendMouseButton(0, SDL_RELEASED, xevent.xbutton.button);
break;
default:{
#if SDL_VIDEO_DRIVER_X11_XINPUT
for (i = 0; i < SDL_GetNumMice(); ++i) {
SDL_Mouse *mouse;
X11_MouseData *data;
mouse = SDL_GetMouse(i);
data = (X11_MouseData *) mouse->driverdata;
if (!data) {
}
continue;
}

19
src/video/x11/SDL_x11mouse.c
View file

@ -50,19 +50,14 @@ X11_InitMouse(_THIS)
int event_code;
XEventClass xEvent;
#endif
SDL_zero(mouse);
SDL_AddMouse(&mouse, "CorePointer", 0, 0, 1);
int num_mice = 0;
#if SDL_VIDEO_DRIVER_X11_XINPUT
if (!SDL_X11_HAVE_XINPUT) {
/* should have dynamically loaded, but wasn't available. */
return;
}
/* we're getting the list of input devices */
n = 0;
if (SDL_X11_HAVE_XINPUT) {
DevList = XListInputDevices(display, &n);
}
/* we're aquiring valuators: mice, tablets, etc. */
for (i = 0; i < n; ++i) {
@ -127,6 +122,9 @@ X11_InitMouse(_THIS)
} else {
SDL_AddMouse(&mouse, DevList[i].name, 0, 0, 1);
}
if (DevList[i].use == IsXExtensionPointer) {
++num_mice;
}
break;
}
/* if it's not class we're interested in, lets go further */
@ -138,6 +136,11 @@ X11_InitMouse(_THIS)
}
XFreeDeviceList(DevList);
#endif
if (num_mice == 0) {
SDL_zero(mouse);
SDL_AddMouse(&mouse, "CorePointer", 0, 0, 1);
}
}
void