dix/events.c: Use wClient where appropriate.
Signed-off-by: Eamon Walsh <ewalsh@tycho.nsa.gov>
This commit is contained in:
parent
3cea176d5a
commit
77e90261d5
|
@ -3989,8 +3989,7 @@ CoreEnterLeaveEvent(
|
|||
if ((type == EnterNotify) && (mask & KeymapStateMask))
|
||||
{
|
||||
xKeymapEvent ke;
|
||||
ClientPtr client = grab ? rClient(grab)
|
||||
: clients[CLIENT_ID(pWin->drawable.id)];
|
||||
ClientPtr client = grab ? rClient(grab) : wClient(pWin);
|
||||
if (XaceHook(XACE_DEVICE_ACCESS, client, keybd, DixReadAccess))
|
||||
bzero((char *)&ke.map[0], 31);
|
||||
else
|
||||
|
@ -4087,7 +4086,7 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
|
|||
((pWin->eventMask | wOtherEventMasks(pWin)) & KeymapStateMask))
|
||||
{
|
||||
xKeymapEvent ke;
|
||||
ClientPtr client = clients[CLIENT_ID(pWin->drawable.id)];
|
||||
ClientPtr client = wClient(pWin);
|
||||
if (XaceHook(XACE_DEVICE_ACCESS, client, dev, DixReadAccess))
|
||||
bzero((char *)&ke.map[0], 31);
|
||||
else
|
||||
|
@ -5181,7 +5180,7 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources)
|
|||
to None
|
||||
*/
|
||||
#ifdef NOTDEF
|
||||
|| clients[CLIENT_ID(parent->drawable.id)]->clientGone
|
||||
|| wClient(parent)->clientGone
|
||||
#endif
|
||||
);
|
||||
DoFocusEvents(keybd, pWin, parent, focusEventMode);
|
||||
|
|
Loading…
Reference in New Issue