diff options
author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-11 16:34:36 -0800 |
---|---|---|
committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-11 16:34:36 -0800 |
commit | b1d29784410b3b93037e5636f336ba608d8ad6e3 (patch) | |
tree | 1ba9160ff151bf9137a46997b5fedb2936cce02d | |
parent | 3c596c061e75848cfa76dd9259c23a3f3a67444c (diff) |
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
-rw-r--r-- | hw/xquartz/darwin.c | 11 | ||||
-rw-r--r-- | hw/xquartz/quartzKeyboard.h | 1 |
2 files changed, 0 insertions, 12 deletions
diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index c104589e6..f01668201 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c | |||
@@ -511,17 +511,6 @@ void InitInput( int argc, char **argv ) | |||
511 | 511 | ||
512 | darwinTabletCurrent = darwinTabletStylus; | 512 | darwinTabletCurrent = darwinTabletStylus; |
513 | 513 | ||
514 | ActivateDevice(darwinKeyboard); | ||
515 | ActivateDevice(darwinPointer); | ||
516 | ActivateDevice(darwinTabletStylus); | ||
517 | ActivateDevice(darwinTabletCursor); | ||
518 | ActivateDevice(darwinTabletEraser); | ||
519 | EnableDevice(darwinKeyboard); | ||
520 | EnableDevice(darwinPointer); | ||
521 | EnableDevice(darwinTabletStylus); | ||
522 | EnableDevice(darwinTabletCursor); | ||
523 | EnableDevice(darwinTabletEraser); | ||
524 | |||
525 | DarwinEQInit(); | 514 | DarwinEQInit(); |
526 | 515 | ||
527 | QuartzInitInput(argc, argv); | 516 | QuartzInitInput(argc, argv); |
diff --git a/hw/xquartz/quartzKeyboard.h b/hw/xquartz/quartzKeyboard.h index eb7936662..215a4a9a5 100644 --- a/hw/xquartz/quartzKeyboard.h +++ b/hw/xquartz/quartzKeyboard.h | |||
@@ -54,7 +54,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info); | |||
54 | extern darwinKeyboardInfo keyInfo; | 54 | extern darwinKeyboardInfo keyInfo; |
55 | extern pthread_mutex_t keyInfo_mutex; | 55 | extern pthread_mutex_t keyInfo_mutex; |
56 | void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents); | 56 | void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents); |
57 | void DarwinKeyboardInit(DeviceIntPtr pDev); | ||
58 | int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); | 57 | int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); |
59 | int DarwinModifierNXKeyToNXKeycode(int key, int side); | 58 | int DarwinModifierNXKeyToNXKeycode(int key, int side); |
60 | int DarwinModifierNXKeyToNXMask(int key); | 59 | int DarwinModifierNXKeyToNXMask(int key); |