diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-11 16:34:36 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-02-17 19:02:28 -0800 |
| commit | 519ae3a0dfc61fc55370abec75551aa2615643fb (patch) | |
| tree | b333ad63789e7f2eb6c20265af21fc780006490a /hw | |
| parent | ada58b69ca0a5e674cda7ae59a53061645621888 (diff) | |
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'hw')
| -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 ) darwinTabletCurrent = darwinTabletStylus; - ActivateDevice(darwinKeyboard); - ActivateDevice(darwinPointer); - ActivateDevice(darwinTabletStylus); - ActivateDevice(darwinTabletCursor); - ActivateDevice(darwinTabletEraser); - EnableDevice(darwinKeyboard); - EnableDevice(darwinPointer); - EnableDevice(darwinTabletStylus); - EnableDevice(darwinTabletCursor); - EnableDevice(darwinTabletEraser); - DarwinEQInit(); 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); extern darwinKeyboardInfo keyInfo; extern pthread_mutex_t keyInfo_mutex; void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents); -void DarwinKeyboardInit(DeviceIntPtr pDev); int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); int DarwinModifierNXKeyToNXKeycode(int key, int side); int DarwinModifierNXKeyToNXMask(int key); |