xephyr: aid input debugging
Add the 'ephyr' mouse and keyboard drivers to the driver list so we can re-add devices. Set the names properly in Ephyr{Keyboard,Mouse}Init, not in InitInput.
This commit is contained in:
parent
baf93b3abe
commit
bedc4ecf23
|
@ -865,6 +865,7 @@ MouseInit (KdPointerInfo *pi)
|
||||||
((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
|
((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
|
||||||
pi->nAxes = 3;
|
pi->nAxes = 3;
|
||||||
pi->nButtons = 32;
|
pi->nButtons = 32;
|
||||||
|
pi->name = KdSaveString("Xephyr virtual mouse");
|
||||||
ephyrMouse = pi;
|
ephyrMouse = pi;
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
@ -917,6 +918,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki)
|
||||||
ki->maxScanCode = ki->keySyms.maxKeyCode;
|
ki->maxScanCode = ki->keySyms.maxKeyCode;
|
||||||
ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
|
ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
|
||||||
ki->keySyms.map = ephyrKeySyms.map;
|
ki->keySyms.map = ephyrKeySyms.map;
|
||||||
|
ki->name = KdSaveString("Xephyr virtual keyboard");
|
||||||
ephyrKbd = ki;
|
ephyrKbd = ki;
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
|
@ -58,14 +58,14 @@ InitInput (int argc, char **argv)
|
||||||
if (!ki)
|
if (!ki)
|
||||||
FatalError("Couldn't create Xephyr keyboard\n");
|
FatalError("Couldn't create Xephyr keyboard\n");
|
||||||
ki->driver = &EphyrKeyboardDriver;
|
ki->driver = &EphyrKeyboardDriver;
|
||||||
ki->name = KdSaveString("Xephyr virtual keyboard");
|
KdAddKeyboardDriver(&EphyrKeyboardDriver);
|
||||||
KdAddKeyboard(ki);
|
KdAddKeyboard(ki);
|
||||||
|
|
||||||
pi = KdNewPointer();
|
pi = KdNewPointer();
|
||||||
if (!pi)
|
if (!pi)
|
||||||
FatalError("Couldn't create Xephyr pointer\n");
|
FatalError("Couldn't create Xephyr pointer\n");
|
||||||
pi->driver = &EphyrMouseDriver;
|
pi->driver = &EphyrMouseDriver;
|
||||||
pi->name = KdSaveString("Xephyr virtual mouse");
|
KdAddPointerDriver(&EphyrMouseDriver);
|
||||||
KdAddPointer(pi);
|
KdAddPointer(pi);
|
||||||
|
|
||||||
KdInitInput();
|
KdInitInput();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user