geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the specific pointer device ID for X11 button and motion events

main
Sam Lantinga 2024-03-21 16:15:09 -07:00
parent 476245564c
commit 20a860c876
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/video/x11/SDL_x11events.c
View File

@ -832,7 +832,7 @@ SDL_WindowData *X11_FindWindow(SDL_VideoDevice *_this, Window window)
return NULL; return NULL;
} }
void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, int button, const float x, const float y, const unsigned long time) void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_MouseID mouseID, int button, const float x, const float y, const unsigned long time)
{ {
SDL_Window *window = windowdata->window; SDL_Window *window = windowdata->window;
const SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata; const SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
@ -842,7 +842,7 @@ void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, i
printf("window %p: ButtonPress (X11 button = %d)\n", window, button); printf("window %p: ButtonPress (X11 button = %d)\n", window, button);
#endif #endif
if (X11_IsWheelEvent(display, button, &xticks, &yticks)) { if (X11_IsWheelEvent(display, button, &xticks, &yticks)) {
SDL_SendMouseWheel(0, window, videodata->mouseID, (float)-xticks, (float)yticks, SDL_MOUSEWHEEL_NORMAL); SDL_SendMouseWheel(0, window, mouseID, (float)-xticks, (float)yticks, SDL_MOUSEWHEEL_NORMAL);
} else { } else {
SDL_bool ignore_click = SDL_FALSE; SDL_bool ignore_click = SDL_FALSE;
if (button == Button1) { if (button == Button1) {
@ -863,13 +863,13 @@ void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *windowdata, i
windowdata->last_focus_event_time = 0; windowdata->last_focus_event_time = 0;
} }
if (!ignore_click) { if (!ignore_click) {
SDL_SendMouseButton(0, window, videodata->mouseID, SDL_PRESSED, button); SDL_SendMouseButton(0, window, mouseID, SDL_PRESSED, button);
} }
} }
X11_UpdateUserTime(windowdata, time); X11_UpdateUserTime(windowdata, time);
} }
void X11_HandleButtonRelease(SDL_VideoDevice *_this, SDL_WindowData *windowdata, int button) void X11_HandleButtonRelease(SDL_VideoDevice *_this, SDL_WindowData *windowdata, SDL_MouseID mouseID, int button)
{ {
SDL_Window *window = windowdata->window; SDL_Window *window = windowdata->window;
const SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata; const SDL_VideoData *videodata = (SDL_VideoData *)_this->driverdata;
@ -884,7 +884,7 @@ void X11_HandleButtonRelease(SDL_VideoDevice *_this, SDL_WindowData *windowdata,
/* see explanation at case ButtonPress */ /* see explanation at case ButtonPress */
button -= (8 - SDL_BUTTON_X1); button -= (8 - SDL_BUTTON_X1);
} }
SDL_SendMouseButton(0, window, videodata->mouseID, SDL_RELEASED, button); SDL_SendMouseButton(0, window, mouseID, SDL_RELEASED, button);
} }
} }
@ -1531,13 +1531,13 @@ static void X11_DispatchEvent(SDL_VideoDevice *_this, XEvent *xevent)
case ButtonPress: case ButtonPress:
{ {
X11_HandleButtonPress(_this, data, xevent->xbutton.button, X11_HandleButtonPress(_this, data, videodata->mouseID, xevent->xbutton.button,
xevent->xbutton.x, xevent->xbutton.y, xevent->xbutton.time); xevent->xbutton.x, xevent->xbutton.y, xevent->xbutton.time);
} break; } break;
case ButtonRelease: case ButtonRelease:
{ {
X11_HandleButtonRelease(_this, data, xevent->xbutton.button); X11_HandleButtonRelease(_this, data, videodata->mouseID, xevent->xbutton.button);
} break; } break;
#endif /* !SDL_VIDEO_DRIVER_X11_XINPUT2 */ #endif /* !SDL_VIDEO_DRIVER_X11_XINPUT2 */

4
src/video/x11/SDL_x11events.h
View File

@ -29,8 +29,8 @@ extern void X11_SendWakeupEvent(SDL_VideoDevice *_this, SDL_Window *window);
extern int X11_SuspendScreenSaver(SDL_VideoDevice *_this); extern int X11_SuspendScreenSaver(SDL_VideoDevice *_this);
extern void X11_ReconcileKeyboardState(SDL_VideoDevice *_this); extern void X11_ReconcileKeyboardState(SDL_VideoDevice *_this);
extern void X11_GetBorderValues(SDL_WindowData *data); extern void X11_GetBorderValues(SDL_WindowData *data);
extern void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *wdata, int button, const float x, const float y, const unsigned long time); extern void X11_HandleButtonPress(SDL_VideoDevice *_this, SDL_WindowData *wdata, SDL_MouseID mouseID, int button, const float x, const float y, const unsigned long time);
extern void X11_HandleButtonRelease(SDL_VideoDevice *_this, SDL_WindowData *wdata, int button); extern void X11_HandleButtonRelease(SDL_VideoDevice *_this, SDL_WindowData *wdata, SDL_MouseID mouseID, int button);
extern SDL_WindowData *X11_FindWindow(SDL_VideoDevice *_this, Window window); extern SDL_WindowData *X11_FindWindow(SDL_VideoDevice *_this, Window window);
extern SDL_bool X11_ProcessHitTest(SDL_VideoDevice *_this, SDL_WindowData *data, const float x, const float y, SDL_bool force_new_result); extern SDL_bool X11_ProcessHitTest(SDL_VideoDevice *_this, SDL_WindowData *data, const float x, const float y, SDL_bool force_new_result);
extern SDL_bool X11_TriggerHitTestAction(SDL_VideoDevice *_this, SDL_WindowData *data, const float x, const float y); extern SDL_bool X11_TriggerHitTestAction(SDL_VideoDevice *_this, SDL_WindowData *data, const float x, const float y);

16
src/video/x11/SDL_x11xinput2.c
View File

@ -108,11 +108,17 @@ static void xinput2_init_device_list(SDL_VideoData *videodata)
switch (dev->use) { switch (dev->use) {
case XIMasterKeyboard: case XIMasterKeyboard:
videodata->keyboardID = (SDL_KeyboardID)dev->deviceid; videodata->keyboardID = (SDL_KeyboardID)dev->deviceid;
SDL_AddKeyboard(videodata->keyboardID, SDL_FALSE); SDL_AddKeyboard((SDL_KeyboardID)dev->deviceid, SDL_FALSE);
break;
case XISlaveKeyboard:
SDL_AddKeyboard((SDL_KeyboardID)dev->deviceid, SDL_FALSE);
break; break;
case XIMasterPointer: case XIMasterPointer:
videodata->mouseID = (SDL_MouseID)dev->deviceid; videodata->mouseID = (SDL_MouseID)dev->deviceid;
SDL_AddMouse(videodata->mouseID, SDL_FALSE); SDL_AddMouse((SDL_MouseID)dev->deviceid, SDL_FALSE);
break;
case XISlavePointer:
SDL_AddMouse((SDL_MouseID)dev->deviceid, SDL_FALSE);
break; break;
default: default:
break; break;
@ -471,10 +477,10 @@ int X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
} }
if (pressed) { if (pressed) {
X11_HandleButtonPress(_this, windowdata, button, X11_HandleButtonPress(_this, windowdata, (SDL_MouseID)xev->sourceid, button,
xev->event_x, xev->event_y, xev->time); xev->event_x, xev->event_y, xev->time);
} else { } else {
X11_HandleButtonRelease(_this, windowdata, button); X11_HandleButtonRelease(_this, windowdata, (SDL_MouseID)xev->sourceid, button);
} }
} }
} break; } break;
@ -521,7 +527,7 @@ int X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event); SDL_Window *window = xinput2_get_sdlwindow(videodata, xev->event);
if (window) { if (window) {
X11_ProcessHitTest(_this, window->driverdata, (float)xev->event_x, (float)xev->event_y, SDL_FALSE); X11_ProcessHitTest(_this, window->driverdata, (float)xev->event_x, (float)xev->event_y, SDL_FALSE);
SDL_SendMouseMotion(0, window, videodata->mouseID, SDL_FALSE, (float)xev->event_x, (float)xev->event_y); SDL_SendMouseMotion(0, window, (SDL_MouseID)xev->sourceid, SDL_FALSE, (float)xev->event_x, (float)xev->event_y);
} }
} }
} }