From 7b43e3ff99c294b9f34f1f8ae263e3f7803a653d Mon Sep 17 00:00:00 2001 From: "Pierre-Loup A. Griffais" Date: Mon, 30 Nov 2015 15:23:18 -0800 Subject: [PATCH] Import Debian version 1.32 steamos-compositor (1.32) brewmaster; urgency=medium * Fix a bug where cursor would be auto-hidden even when buttons held * Show cursor if a button gets clicked while it's hidden --- debian/changelog | 7 +++++++ src/steamcompmgr.c | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/debian/changelog b/debian/changelog index aa48f7f..b498d8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +steamos-compositor (1.32) brewmaster; urgency=medium + + * Fix a bug where cursor would be auto-hidden even when buttons held + * Show cursor if a button gets clicked while it's hidden + + -- Pierre-Loup A. Griffais Mon, 30 Nov 2015 15:23:18 -0800 + steamos-compositor (1.31) brewmaster; urgency=medium * Added support for one than more overlay layers; most opaque one wins. diff --git a/src/steamcompmgr.c b/src/steamcompmgr.c index 1b604fc..78d6645 100644 --- a/src/steamcompmgr.c +++ b/src/steamcompmgr.c @@ -2289,6 +2289,22 @@ main (int argc, char **argv) if (fadeOutWindow.id) XSendEvent(dpy, ourWindow, True, ExposureMask, &exposeEvent); + Window window_returned, child; + int root_x, root_y; + int win_x, win_y; + unsigned int mask_return; + + XQueryPointer(dpy, DefaultRootWindow(dpy), &window_returned, + &child, &root_x, &root_y, &win_x, &win_y, + &mask_return); + + if ( mask_return & ( Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask ) ) + { + hideCursorForMovement = False; + lastCursorMovedTime = get_time_in_milliseconds(); + apply_cursor_state(dpy); + } + if (!hideCursorForMovement && (get_time_in_milliseconds() - lastCursorMovedTime) > CURSOR_HIDE_TIME) {