frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ephyr: don't load ephyr input driver if -seat option is passed 

When used for single-GPU multi-seat purposes, there's no need to enable
ephyr virtual input devices, since Xephyr is supposed to handle its own
hardware devices.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
This commit is contained in:
Laércio de Sousa 2015-12-11 11:43:14 -02:00 committed by Adam Jackson
parent 7213e99cbc
commit da69f2f15a
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/kdrive/ephyr/ephyrinit.c
View File

@ -91,15 +91,15 @@ InitInput(int argc, char **argv)
KdKeyboardInfo *ki; KdKeyboardInfo *ki;
KdPointerInfo *pi; KdPointerInfo *pi;
KdAddKeyboardDriver(&EphyrKeyboardDriver);
#ifdef KDRIVE_EVDEV #ifdef KDRIVE_EVDEV
KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver); KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver);
#endif
KdAddPointerDriver(&EphyrMouseDriver);
#ifdef KDRIVE_EVDEV
KdAddPointerDriver(&LinuxEvdevMouseDriver); KdAddPointerDriver(&LinuxEvdevMouseDriver);
#endif #endif
if (!SeatId) {
KdAddKeyboardDriver(&EphyrKeyboardDriver);
KdAddPointerDriver(&EphyrMouseDriver);
if (!kdHasKbd) { if (!kdHasKbd) {
ki = KdNewKeyboard(); ki = KdNewKeyboard();
if (!ki) if (!ki)
@ -115,6 +115,7 @@ InitInput(int argc, char **argv)
pi->driver = &EphyrMouseDriver; pi->driver = &EphyrMouseDriver;
KdAddPointer(pi); KdAddPointer(pi);
} }
}
KdInitInput(); KdInitInput();
} }