Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-10 08:38:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] wm/wayland: bypass SDL loop for pointer events

Browse Source
This commit is contained in:
Tudor Brindus 2021-01-11 21:18:17 -05:00 committed by Geoffrey McRae
parent 96c10c2c2d
commit fd009c6392
3 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/main.c
View File

@ -88,9 +88,6 @@ struct AppParams params = { 0 };
static void setGrab(bool enable); static void setGrab(bool enable);
static void setGrabQuiet(bool enable); static void setGrabQuiet(bool enable);
void handleMouseGrabbed(double ex, double ey);
static void handleMouseNormal(double ex, double ey);
static void lgInit() static void lgInit()
{ {
g_state.state = APP_STATE_RUNNING; g_state.state = APP_STATE_RUNNING;
@ -940,7 +937,7 @@ static void handleMouseWayland()
DEBUG_ERROR("failed to send mouse motion message"); DEBUG_ERROR("failed to send mouse motion message");
} }
static void handleMouseNormal(double ex, double ey) void handleMouseNormal(double ex, double ey)
{ {
/* if we don't have the current cursor pos just send cursor movements */ /* if we don't have the current cursor pos just send cursor movements */
if (!g_cursor.guest.valid) if (!g_cursor.guest.valid)
@ -1489,15 +1486,17 @@ int eventFilter(void * userdata, SDL_Event * event)
g_cursor.pos.x = event->motion.x; g_cursor.pos.x = event->motion.x;
g_cursor.pos.y = event->motion.y; g_cursor.pos.y = event->motion.y;
if (g_cursor.grab) if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND)
{ {
// On Wayland, wm.c calls handleMouseGrabbed, bypassing the SDL event // On Wayland, wm.c calls these functions, bypassing the SDL event loop.
// loop. if (g_cursor.grab)
if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND) {
handleMouseGrabbed(event->motion.xrel, event->motion.yrel); if (g_state.wminfo.subsystem != SDL_SYSWM_WAYLAND)
handleMouseGrabbed(event->motion.xrel, event->motion.yrel);
}
else
handleMouseNormal(event->motion.xrel, event->motion.yrel);
} }
else
handleMouseNormal(event->motion.xrel, event->motion.yrel);
break; break;
} }

1
client/src/main.h
View File

@ -237,3 +237,4 @@ extern struct AppState g_state;
extern struct AppParams params; extern struct AppParams params;
void handleMouseGrabbed(double, double); void handleMouseGrabbed(double, double);
void handleMouseNormal(double, double);

48
client/src/wm.c
View File

@ -242,6 +242,51 @@ static const struct wl_registry_listener registryListener = {
.global_remove = registryGlobalRemoveHandler, .global_remove = registryGlobalRemoveHandler,
}; };
// Mouse-handling listeners.
static void pointerMotionHandler(void * data, struct wl_pointer * pointer,
uint32_t serial, wl_fixed_t sxW, wl_fixed_t syW)
{
int sx = wl_fixed_to_int(sxW);
int sy = wl_fixed_to_int(syW);
handleMouseNormal(sx, sy);
}
static void pointerEnterHandler(void * data, struct wl_pointer * pointer,
uint32_t serial, struct wl_surface * surface, wl_fixed_t sxW,
wl_fixed_t syW)
{
int sx = wl_fixed_to_int(sxW);
int sy = wl_fixed_to_int(syW);
handleMouseNormal(sx, sy);
}
static void pointerLeaveHandler(void * data, struct wl_pointer * pointer,
uint32_t serial, struct wl_surface * surface)
{
// Do nothing.
}
static void pointerAxisHandler(void * data, struct wl_pointer * pointer,
uint32_t serial, uint32_t axis, wl_fixed_t value)
{
// Do nothing.
}
static void pointerButtonHandler(void *data, struct wl_pointer *pointer,
uint32_t serial, uint32_t time, uint32_t button, uint32_t stateW)
{
// Do nothing.
}
static const struct wl_pointer_listener pointerListener = {
.enter = pointerEnterHandler,
.leave = pointerLeaveHandler,
.motion = pointerMotionHandler,
.button = pointerButtonHandler,
.axis = pointerAxisHandler,
};
// Keyboard-handling listeners. // Keyboard-handling listeners.
static void keyboardKeymapHandler(void * data, struct wl_keyboard * keyboard, static void keyboardKeymapHandler(void * data, struct wl_keyboard * keyboard,
@ -296,7 +341,10 @@ static void handlePointerCapability(struct WMDataWayland * wm,
wm->pointer = NULL; wm->pointer = NULL;
} }
else if (hasPointer && !wm->pointer) else if (hasPointer && !wm->pointer)
{
wm->pointer = wl_seat_get_pointer(wm->seat); wm->pointer = wl_seat_get_pointer(wm->seat);
wl_pointer_add_listener(wm->pointer, &pointerListener, wm);
}
} }
static void handleKeyboardCapability(struct WMDataWayland * wm, static void handleKeyboardCapability(struct WMDataWayland * wm,