mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-22 01:20:26 +00:00
Xi: add GetClientPointer and GetPointerPairing requests.
dix: use PickKeyboard for ProcSetInputFocus and ProcGetInputFocus instead
of the core keyboard.
This commit is contained in:
parent
0acf993e28
commit
f8cd19bd16
9 changed files with 332 additions and 3 deletions
|
|
@ -131,7 +131,6 @@ FreeCursor(pointer value, XID cid)
|
|||
}
|
||||
FreeCursorBits(pCurs->bits);
|
||||
xfree( pCurs);
|
||||
MPXDBG("freeing memory for cursor\n");
|
||||
return(Success);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3897,6 +3897,7 @@ int
|
|||
ProcSetInputFocus(client)
|
||||
ClientPtr client;
|
||||
{
|
||||
DeviceIntPtr kbd = PickKeyboard(client);
|
||||
REQUEST(xSetInputFocusReq);
|
||||
|
||||
REQUEST_SIZE_MATCH(xSetInputFocusReq);
|
||||
|
|
@ -3904,16 +3905,17 @@ ProcSetInputFocus(client)
|
|||
if (!XaceHook(XACE_DEVICE_ACCESS, client, inputInfo.keyboard, TRUE))
|
||||
return Success;
|
||||
|
||||
return SetInputFocus(client, inputInfo.keyboard, stuff->focus,
|
||||
return SetInputFocus(client, kbd, stuff->focus,
|
||||
stuff->revertTo, stuff->time, FALSE);
|
||||
}
|
||||
|
||||
int
|
||||
ProcGetInputFocus(ClientPtr client)
|
||||
{
|
||||
DeviceIntPtr kbd = PickKeyboard(client);
|
||||
xGetInputFocusReply rep;
|
||||
/* REQUEST(xReq); */
|
||||
FocusClassPtr focus = inputInfo.keyboard->focus;
|
||||
FocusClassPtr focus = kbd->focus;
|
||||
|
||||
REQUEST_SIZE_MATCH(xReq);
|
||||
rep.type = X_Reply;
|
||||
|
|
|
|||
Loading…
Reference in a new issue