diff options
author | marha <marha@users.sourceforge.net> | 2010-01-08 13:17:02 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-01-08 13:17:02 +0000 |
commit | 91a30d5622174febaa2107b010effcf2fb5b9a2e (patch) | |
tree | bef04beb0812925c8d343813b26be65073a53c3f /xorg-server/hw/kdrive/ephyr/ephyrinit.c | |
parent | 20f59c125afe31a8bdb0ae6a74dd408e5fa00237 (diff) | |
download | vcxsrv-91a30d5622174febaa2107b010effcf2fb5b9a2e.tar.gz vcxsrv-91a30d5622174febaa2107b010effcf2fb5b9a2e.tar.bz2 vcxsrv-91a30d5622174febaa2107b010effcf2fb5b9a2e.zip |
Git update 8 jan 2010
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr/ephyrinit.c')
-rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrinit.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c index 2b72b4e0a..c7bfb5bec 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c @@ -40,17 +40,18 @@ extern Bool noGlxVisualInit; #endif extern Bool ephyrNoXV; +#ifdef KDRIVE_EVDEV +extern KdPointerDriver LinuxEvdevMouseDriver; +extern KdKeyboardDriver LinuxEvdevKeyboardDriver; +#endif + void processScreenArg (char *screen_size, char *parent_id) ; void InitCard (char *name) { - KdCardAttr attr; - EPHYR_DBG("mark"); - - - KdCardInfoAdd (&ephyrFuncs, &attr, 0); + KdCardInfoAdd (&ephyrFuncs, 0); } void @@ -66,11 +67,11 @@ InitInput (int argc, char **argv) KdPointerInfo *pi; KdAddKeyboardDriver(&EphyrKeyboardDriver); -#ifdef linux +#ifdef KDRIVE_EVDEV KdAddKeyboardDriver(&LinuxEvdevKeyboardDriver); #endif KdAddPointerDriver(&EphyrMouseDriver); -#ifdef linux +#ifdef KDRIVE_EVDEV KdAddPointerDriver(&LinuxEvdevMouseDriver); #endif |