hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'whot/for-keith'

Browse source
This commit is contained in:
Keith Packard 2011-11-14 09:07:06 -08:00
commit bfa2a1857a
11 changed files with 27 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/xfree86/common/xf86DGA.c
View file

@ -1016,7 +1016,7 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, DGAEvent *event, DeviceIntPtr keybd)
{
KeyClassPtr keyc = keybd->key;
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
DeviceIntPtr pointer = GetPairedDevice(keybd);
DeviceIntPtr pointer = GetMaster(keybd, POINTER_OR_FLOAT);
DeviceEvent ev;
memset(&ev, 0, sizeof(ev));

2
hw/xfree86/common/xf86Init.c
View file

@ -827,6 +827,8 @@ InitInput(int argc, char **argv)
/* Initialize all configured input devices */
for (pInfo = xf86ConfigLayout.inputs; pInfo && *pInfo; pInfo++) {
(*pInfo)->options = xf86AddNewOption((*pInfo)->options, "driver", (*pInfo)->driver);
(*pInfo)->options = xf86AddNewOption((*pInfo)->options, "identifier", (*pInfo)->name);
/* If one fails, the others will too */
if (NewInputDeviceRequest((*pInfo)->options, NULL, &dev) == BadAlloc)
break;

2
hw/xfree86/common/xf86Xinput.c
View file

@ -1275,7 +1275,7 @@ xf86PostKeyEventM(DeviceIntPtr device,
DeviceIntPtr pointer;
/* Some pointers send key events, paired device is wrong then. */
pointer = IsPointerDevice(device) ? device : GetPairedDevice(device);
pointer = GetMaster(device, POINTER_OR_FLOAT);
if (miPointerGetScreen(pointer)) {
int index = miPointerGetScreen(pointer)->myNum;