| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-12 00:34:36 (GMT) |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-01-12 00:34:36 (GMT) |
| commit | b1d29784410b3b93037e5636f336ba608d8ad6e3 (patch) (side-by-side diff) | |
| tree | 1ba9160ff151bf9137a46997b5fedb2936cce02d | |
| parent | 3c596c061e75848cfa76dd9259c23a3f3a67444c (diff) | |
| download | xserver-b1d29784410b3b93037e5636f336ba608d8ad6e3.zip xserver-b1d29784410b3b93037e5636f336ba608d8ad6e3.tar.gz | |
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 c104589..f016682 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 eb79366..215a4a9 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); |
