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

Mouse events now report the correct window id and window enter/leave events are now reported.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403654
This commit is contained in:
Bob Pendleton 2009-06-11 20:08:33 +00:00
parent fa620100d8
commit 75ffaf1d21
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/events/SDL_mouse.c
View file

@ -97,6 +97,7 @@ SDL_AddMouse(const SDL_Mouse * mouse, char *name, int pressure_max,
/* we're setting the mouse properties */
length = 0;
length = SDL_strlen(name);
SDL_mice[index]->focus = 0;
SDL_mice[index]->name = SDL_malloc((length + 2) * sizeof(char));
SDL_strlcpy(SDL_mice[index]->name, name, length + 1);
SDL_mice[index]->pressure_max = pressure_max;

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

@ -83,8 +83,10 @@ X11_DispatchEvent(_THIS)
/* Gaining mouse coverage? */
case EnterNotify:{
#ifdef DEBUG_XEVENTS
printf("EnterNotify! (%d,%d)\n", xevent.xcrossing.x,
xevent.xcrossing.y);
printf("EnterNotify! (%d,%d,%d)\n",
xevent.xcrossing.x,
xevent.xcrossing.y,
xevent.xcrossing.mode);
if (xevent.xcrossing.mode == NotifyGrab)
printf("Mode: NotifyGrab\n");
if (xevent.xcrossing.mode == NotifyUngrab)
@ -92,10 +94,12 @@ X11_DispatchEvent(_THIS)
#endif
if ((xevent.xcrossing.mode != NotifyGrab) &&
(xevent.xcrossing.mode != NotifyUngrab)) {
#if 1
/* FIXME: Should we reset data for all mice? */
#if 0
SDL_SetMouseFocus(0, data->windowID);
SDL_SendMouseMotion(0, 0, move->x, move->y, 0);
for (i = 0; i < SDL_GetNumMice(); ++i) {
SDL_Mouse *mouse = SDL_GetMouse(i);
SDL_SetMouseFocus(mouse->id, data->windowID);
}
#endif
}
}
@ -104,8 +108,10 @@ X11_DispatchEvent(_THIS)
/* Losing mouse coverage? */
case LeaveNotify:{
#ifdef DEBUG_XEVENTS
printf("LeaveNotify! (%d,%d)\n", xevent.xcrossing.x,
xevent.xcrossing.y);
printf("LeaveNotify! (%d,%d,%d)\n",
xevent.xcrossing.x,
xevent.xcrossing.y,
xevent.xcrossing.mode);
if (xevent.xcrossing.mode == NotifyGrab)
printf("Mode: NotifyGrab\n");
if (xevent.xcrossing.mode == NotifyUngrab)
@ -114,9 +120,12 @@ X11_DispatchEvent(_THIS)
if ((xevent.xcrossing.mode != NotifyGrab) &&
(xevent.xcrossing.mode != NotifyUngrab) &&
(xevent.xcrossing.detail != NotifyInferior)) {
#if 1
/* FIXME: Should we reset data for all mice? */
#if 0
SDL_SetMouseFocus(0, 0);
for (i = 0; i < SDL_GetNumMice(); ++i) {
SDL_Mouse *mouse = SDL_GetMouse(i);
SDL_SetMouseFocus(mouse->id, 0);
}
#endif
}
}

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

@ -52,6 +52,8 @@ X11_InitMouse(_THIS)
#endif
int num_mice = 0;
SDL_zero(mouse);
#if SDL_VIDEO_DRIVER_X11_XINPUT
/* we're getting the list of input devices */
n = 0;