Xi: add GetClientPointer and GetPointerPairing requests.

dix:    use PickKeyboard for ProcSetInputFocus and ProcGetInputFocus instead
        of the core keyboard.
This commit is contained in:
Peter Hutterer 2007-03-22 17:47:01 +10:30
commit f8cd19bd16
9 changed files with 332 additions and 3 deletions

View file

@ -131,7 +131,6 @@ FreeCursor(pointer value, XID cid)
}
FreeCursorBits(pCurs->bits);
xfree( pCurs);
MPXDBG("freeing memory for cursor\n");
return(Success);
}

View file

@ -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;