mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-01 22:03:09 +00:00
Checkpoint fixes to DMX for X input changes.
Xdmx builds and runs now. Keyboard seems OK, and mouse pointer moves, but everything else is flakey. Something is still seriously wrong.
This commit is contained in:
parent
d92da3d5f3
commit
92e8cdbd32
7 changed files with 242 additions and 4 deletions
|
|
@ -182,7 +182,12 @@ static void dmxCrossScreen(ScreenPtr pScreen, Bool entering)
|
|||
static void dmxWarpCursor(ScreenPtr pScreen, int x, int y)
|
||||
{
|
||||
DMXDBG3("dmxWarpCursor(%d,%d,%d)\n", pScreen->myNum, x, y);
|
||||
#if 11 /*BP*/
|
||||
/* This call is depracated. Replace with???? */
|
||||
miPointerWarpCursor(pScreen, x, y);
|
||||
#else
|
||||
pScreen->SetCursorPosition(pScreen, x, y, FALSE);
|
||||
#endif
|
||||
}
|
||||
|
||||
miPointerScreenFuncRec dmxPointerCursorFuncs =
|
||||
|
|
@ -190,7 +195,7 @@ miPointerScreenFuncRec dmxPointerCursorFuncs =
|
|||
dmxCursorOffScreen,
|
||||
dmxCrossScreen,
|
||||
dmxWarpCursor,
|
||||
dmxeqEnqueue,
|
||||
dmxeqEnqueue, /*XXX incompatible type/function! */
|
||||
dmxeqSwitchScreen
|
||||
};
|
||||
|
||||
|
|
@ -939,8 +944,13 @@ void dmxCheckCursor(void)
|
|||
pScreen = screenInfo.screens[dmxScreen->index];
|
||||
|
||||
if (!dmxOnScreen(x, y, dmxScreen)) {
|
||||
#if 00
|
||||
if (firstScreen && i == miPointerCurrentScreen()->myNum)
|
||||
miPointerSetNewScreen(firstScreen->index, x, y);
|
||||
#else
|
||||
if (firstScreen && i == miPointerGetScreen(inputInfo.pointer)->myNum)
|
||||
miPointerSetScreen(inputInfo.pointer, firstScreen->index, x, y);
|
||||
#endif
|
||||
_dmxSetCursor(pScreen, NULL,
|
||||
x - dmxScreen->rootXOrigin,
|
||||
y - dmxScreen->rootYOrigin);
|
||||
|
|
|
|||
Loading…
Reference in a new issue