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:
Daniel Stone 2006-08-07 23:00:45 +03:00 committed by Daniel Stone
parent baf93b3abe
commit bedc4ecf23
2 changed files with 4 additions and 2 deletions

View File

@ -865,6 +865,7 @@ MouseInit (KdPointerInfo *pi)
((EphyrPointerPrivate *)pi->driverPrivate)->enabled = FALSE;
pi->nAxes = 3;
pi->nButtons = 32;
pi->name = KdSaveString("Xephyr virtual mouse");
ephyrMouse = pi;
return Success;
}
@ -917,6 +918,7 @@ EphyrKeyboardInit (KdKeyboardInfo *ki)
ki->maxScanCode = ki->keySyms.maxKeyCode;
ki->keySyms.mapWidth = ephyrKeySyms.mapWidth;
ki->keySyms.map = ephyrKeySyms.map;
ki->name = KdSaveString("Xephyr virtual keyboard");
ephyrKbd = ki;
return Success;
}

View File

@ -58,14 +58,14 @@ InitInput (int argc, char **argv)
if (!ki)
FatalError("Couldn't create Xephyr keyboard\n");
ki->driver = &EphyrKeyboardDriver;
ki->name = KdSaveString("Xephyr virtual keyboard");
KdAddKeyboardDriver(&EphyrKeyboardDriver);
KdAddKeyboard(ki);
pi = KdNewPointer();
if (!pi)
FatalError("Couldn't create Xephyr pointer\n");
pi->driver = &EphyrMouseDriver;
pi->name = KdSaveString("Xephyr virtual mouse");
KdAddPointerDriver(&EphyrMouseDriver);
KdAddPointer(pi);
KdInitInput();