frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix/events.c: Use wClient where appropriate. 

Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
This commit is contained in:
Eamon Walsh 2009-05-19 19:36:03 -04:00
parent 3cea176d5a
commit 77e90261d5
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dix/events.c
View File

@ -3989,8 +3989,7 @@ CoreEnterLeaveEvent(
if ((type == EnterNotify) && (mask & KeymapStateMask)) if ((type == EnterNotify) && (mask & KeymapStateMask))
{ {
xKeymapEvent ke; xKeymapEvent ke;
ClientPtr client = grab ? rClient(grab) ClientPtr client = grab ? rClient(grab) : wClient(pWin);
: clients[CLIENT_ID(pWin->drawable.id)];
if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess)) if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
bzero((char *)&ke.map[0], 31); bzero((char *)&ke.map[0], 31);
else else
@ -4087,7 +4086,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask)) ((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))
{ {
xKeymapEvent ke; xKeymapEvent ke;
ClientPtr client = clients[CLIENT_ID(pWin->drawable.id)]; ClientPtr client = wClient(pWin);
if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess)) if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
bzero((char *)&ke.map[0], 31); bzero((char *)&ke.map[0], 31);
else else
@ -5181,7 +5180,7 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
to None to None
*/ */
#ifdef NOTDEF #ifdef NOTDEF
|| clients[CLIENT_ID(parent->drawable.id)]->clientGone || wClient(parent)->clientGone
#endif #endif
); );
DoFocusEvents(keybd, pWin, parent, focusEventMode); DoFocusEvents(keybd, pWin, parent, focusEventMode);