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

[client] wayland: update absolute mouse position

Browse Source 
We are actually getting mouse events directly from Wayland instead of going
through SDL, so we call app_updateCursorPos in pointer motion handlers and
swallow the SDL event.

Also removed parameters for app_handleMouseBasic as it relies exclusively on
absolute positions provided by app_updateCursorPos. Wayland does not give
you relative movements at all unless grabbed and passing absolute movements
is semantically incorrect.

Note that when the cursor is grabbed, movements are handled entirely through
relativePointerMotionHandler in wayland.c and does not go through
app_handleMouseBasic at all.
This commit is contained in:
Quantum 2021-01-16 04:59:05 -05:00 committed by Geoffrey McRae
parent 0690eacc9b
commit 078a151e4f
3 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/displayservers/Wayland/wayland.c
View File

@ -125,7 +125,8 @@ static void pointerMotionHandler(void * data, struct wl_pointer * pointer,
{ {
int sx = wl_fixed_to_int(sxW); int sx = wl_fixed_to_int(sxW);
int sy = wl_fixed_to_int(syW); int sy = wl_fixed_to_int(syW);
app_handleMouseNormal(sx, sy); app_updateCursorPos(sx, sy);
app_handleMouseBasic();
} }
static void pointerEnterHandler(void * data, struct wl_pointer * pointer, static void pointerEnterHandler(void * data, struct wl_pointer * pointer,
@ -134,7 +135,8 @@ static void pointerEnterHandler(void * data, struct wl_pointer * pointer,
{ {
int sx = wl_fixed_to_int(sxW); int sx = wl_fixed_to_int(sxW);
int sy = wl_fixed_to_int(syW); int sy = wl_fixed_to_int(syW);
app_handleMouseNormal(sx, sy); app_updateCursorPos(sx, sy);
app_handleMouseBasic();
} }
static void pointerLeaveHandler(void * data, struct wl_pointer * pointer, static void pointerLeaveHandler(void * data, struct wl_pointer * pointer,
@ -394,13 +396,7 @@ static bool waylandEventFilter(SDL_Event * event)
switch(event->type) switch(event->type)
{ {
case SDL_MOUSEMOTION: case SDL_MOUSEMOTION:
{
app_updateCursorPos(event->motion.x, event->motion.y);
// we must use the basic handler as Wayland has no warp support
app_handleMouseBasic(event->motion.x, event->motion.y);
return true; return true;
}
} }
return false; return false;

6
client/include/app.h
View File

@ -34,9 +34,9 @@ void app_updateWindowPos(int x, int y);
void app_handleResizeEvent(int w, int h); void app_handleResizeEvent(int w, int h);
void app_handleMouseGrabbed(double ex, double ey); void app_handleMouseGrabbed(double ex, double ey);
void app_handleMouseNormal(double ex, double ey); void app_handleMouseNormal(double ex, double ey);
void app_handleMouseBasic(double ex, double ey); void app_handleMouseBasic(void);
void app_handleWindowEnter(); void app_handleWindowEnter(void);
void app_handleWindowLeave(); void app_handleWindowLeave(void);
void app_clipboardRelease(void); void app_clipboardRelease(void);
void app_clipboardNotify(const LG_ClipboardData type, size_t size); void app_clipboardNotify(const LG_ClipboardData type, size_t size);

10
client/src/main.c
View File

@ -1103,16 +1103,8 @@ void app_handleMouseNormal(double ex, double ey)
// cursor warp support. Instead, we attempt a best-effort emulation which works // cursor warp support. Instead, we attempt a best-effort emulation which works
// with a 1:1 mouse movement patch applied in the guest. For anything fancy, use // with a 1:1 mouse movement patch applied in the guest. For anything fancy, use
// capture mode. // capture mode.
void app_handleMouseBasic(double ex, double ey) void app_handleMouseBasic()
{ {
/* if we don't have the current cursor pos just send cursor movements */
if (!g_cursor.guest.valid)
{
if (g_cursor.grab)
app_handleMouseGrabbed(ex, ey);
return;
}
const bool inView = const bool inView =
g_cursor.pos.x >= g_state.dstRect.x && g_cursor.pos.x >= g_state.dstRect.x &&
g_cursor.pos.x < g_state.dstRect.x + g_state.dstRect.w && g_cursor.pos.x < g_state.dstRect.x + g_state.dstRect.w &&