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
This commit is contained in:
Pierre-Loup A. Griffais 2015-11-30 15:23:18 -08:00
parent 59f9261aca
commit 7b43e3ff99
2 changed files with 23 additions and 0 deletions

7
debian/changelog vendored
View file

@ -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 <pgriffais@valvesoftware.com> 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.

View file

@ -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)
{