summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-11 16:34:36 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-01-11 16:39:33 -0800
commit67710ad1d172cc4d53e28e5cc7dab2efb57a9a85 (patch)
treef88eba80c2d7648c71515be5f2d8fe83b5cf65c3
parentdde5c591be74139ec6f2a90a3fdc7904d7342554 (diff)
XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d29784410b3b93037e5636f336ba608d8ad6e3)
-rw-r--r--hw/xquartz/darwin.c11
-rw-r--r--hw/xquartz/quartzKeyboard.h1
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);