diff options
author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 03:00:24 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 03:00:24 +0100 |
commit | b40dec982d17b010cedc183ebdc4c75ca7de785f (patch) | |
tree | 915451e80a2c988779741b596c64ef870cbecfdb /nx-X11/programs/Xserver/xfixes/select.c | |
parent | 164263e1a12fc8a3a496739799cb60d547857f0a (diff) | |
parent | 35d166b808939a1518c011d0469125b69dc768d7 (diff) | |
download | nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.tar.gz nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.tar.bz2 nx-libs-b40dec982d17b010cedc183ebdc4c75ca7de785f.zip |
Merge branch 'uli42-pr/update_xfixes' into 3.6.x
Attributes GH PR #645: https://github.com/ArcticaProject/nx-libs/pull/645
Diffstat (limited to 'nx-X11/programs/Xserver/xfixes/select.c')
-rw-r--r-- | nx-X11/programs/Xserver/xfixes/select.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/nx-X11/programs/Xserver/xfixes/select.c b/nx-X11/programs/Xserver/xfixes/select.c index b21301d1c..e457fd5cc 100644 --- a/nx-X11/programs/Xserver/xfixes/select.c +++ b/nx-X11/programs/Xserver/xfixes/select.c @@ -1,6 +1,4 @@ /* - * $Id: select.c,v 1.6 2005/07/03 07:37:35 daniels Exp $ - * * Copyright © 2002 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its @@ -195,12 +193,21 @@ ProcXFixesSelectSelectionInput (ClientPtr client) { REQUEST (xXFixesSelectSelectionInputReq); WindowPtr pWin; +#ifndef NXAGENT_SERVER + int rc; +#endif REQUEST_SIZE_MATCH (xXFixesSelectSelectionInputReq); +#ifndef NXAGENT_SERVER + rc = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); + if (rc != Success) + return rc; +#else pWin = (WindowPtr)SecurityLookupWindow(stuff->window, client, - DixReadAccess); + DixReadAccess); if (!pWin) return(BadWindow); +#endif if (stuff->eventMask & ~SelectionAllEvents) { client->errorValue = stuff->eventMask; |