diff options
| author | Deron Johnson <deron.johnson@sun.com> | 2005-05-06 00:25:41 +0000 |
|---|---|---|
| committer | Deron Johnson <deron.johnson@sun.com> | 2005-05-06 00:25:41 +0000 |
| commit | 15bbec1d885dc08d136afbf5da0f67730d1d0d8b (patch) | |
| tree | b6db7201ce2c7db8ad1e83d084a72bf856544e00 | |
| parent | 38c27bc0e6aeb485b743cb48b7b0a579f4f6d848 (diff) | |
Fix the gratuitous event byte swapping nonsense that the DS has to do (part
1 of 2). The other part is in the core. This is dev-0-7-0-4.
| -rw-r--r-- | dix/events.c | 12 | ||||
| -rw-r--r-- | xkb/xkbPrKeyEv.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/dix/events.c b/dix/events.c index de759ac45..e6bdbfb5b 100644 --- a/dix/events.c +++ b/dix/events.c @@ -1871,6 +1871,11 @@ DeliverEventsToWindow(pWin, pEvents, count, filter, grab, mskidx) } if ((type == ButtonPress) && deliveries && (!grab)) { +#ifdef LG3D + if (!lgeDisplayServerIsAlive || + !IsWinLgePRWWin(pWin) || + (pEvents->u.u.detail < 4)) { +#endif /* LG3D */ GrabRec tempGrab; tempGrab.device = inputInfo.pointer; @@ -1884,6 +1889,9 @@ DeliverEventsToWindow(pWin, pEvents, count, filter, grab, mskidx) tempGrab.cursor = NullCursor; (*inputInfo.pointer->ActivateGrab)(inputInfo.pointer, &tempGrab, currentTime, TRUE); +#ifdef LG3D + } +#endif /* LG3D */ } else if ((type == MotionNotify) && deliveries) inputInfo.pointer->valuator->motionHintWindow = pWin; @@ -3378,7 +3386,7 @@ drawable.id:0; xE->u.keyButtonPointer.rootX = xeviehot.x; xE->u.keyButtonPointer.rootY = xeviehot.y; xE->u.keyButtonPointer.state = keyc->state; - WriteToClient(clients[xevieClientIndex], sizeof(xEvent), (char *)xE); + WriteToClient(clients[xevieClientIndex], 1, (char *)xE); #ifdef XKB if(noXkbExtension) #endif @@ -3623,7 +3631,7 @@ ProcessPointerEvent (xE, mouse, count) } #endif /* LG3D_EVENT_TEST_LATENCY */ - WriteToClient(lgePickerClient, sizeof(xEvent), (char *)e); + WriteEventsToClient(lgePickerClient, 1, e); } return; diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c index 2cf3f31e1..4124b8ad2 100644 --- a/xkb/xkbPrKeyEv.c +++ b/xkb/xkbPrKeyEv.c @@ -79,7 +79,7 @@ unsigned ndx; lg3dNextPickSeq = LG3D_PICK_SEQ_MIN; } - WriteToClient(lgePickerClient, sizeof(xEvent), (char *)e); + WriteEventsToClient(lgePickerClient, 1, xE); } return; } |