From d040940efe041b57e6323921c380ceb2bb43f41e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 30 Jul 2009 16:16:51 +1000 Subject: xfixes: FixesHideCursor should work on all master pointers. Presumably, a client calling HideCursor doesn't want any cursor displayed. Signed-off-by: Peter Hutterer --- xfixes/cursor.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'xfixes') diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 698e4d58f..d91dbff70 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -912,7 +912,12 @@ ProcXFixesHideCursor (ClientPtr client) ret = createCursorHideCount(client, pWin->drawable.pScreen); if (ret == Success) { - CursorDisplayCursor(PickPointer(client), pWin->drawable.pScreen, CursorCurrent); + DeviceIntPtr dev; + for (dev = inputInfo.devices; dev; dev = dev->next) + { + if (IsMaster(dev) && IsPointerDevice(dev)) + CursorDisplayCursor(dev, pWin->drawable.pScreen, CursorCurrent); + } } return ret; @@ -1004,9 +1009,14 @@ CursorFreeHideCount (pointer data, XID id) { CursorHideCountPtr pChc = (CursorHideCountPtr) data; ScreenPtr pScreen = pChc->pScreen; + DeviceIntPtr dev; deleteCursorHideCount(pChc, pChc->pScreen); - CursorDisplayCursor(inputInfo.pointer, pScreen, CursorCurrent); + for (dev = inputInfo.devices; dev; dev = dev->next) + { + if (IsMaster(dev) && IsPointerDevice(dev)) + CursorDisplayCursor(dev, pScreen, CursorCurrent); + } return 1; } -- cgit v1.2.3