XQuartz: Don't need explicit Activate/EnableDevice in InitInput
(cherry picked from commit b1d2978441
)
This commit is contained in:
parent
dde5c591be
commit
67710ad1d1
|
@ -511,17 +511,6 @@ void InitInput( int argc, char **argv )
|
||||||
|
|
||||||
darwinTabletCurrent = darwinTabletStylus;
|
darwinTabletCurrent = darwinTabletStylus;
|
||||||
|
|
||||||
ActivateDevice(darwinKeyboard);
|
|
||||||
ActivateDevice(darwinPointer);
|
|
||||||
ActivateDevice(darwinTabletStylus);
|
|
||||||
ActivateDevice(darwinTabletCursor);
|
|
||||||
ActivateDevice(darwinTabletEraser);
|
|
||||||
EnableDevice(darwinKeyboard);
|
|
||||||
EnableDevice(darwinPointer);
|
|
||||||
EnableDevice(darwinTabletStylus);
|
|
||||||
EnableDevice(darwinTabletCursor);
|
|
||||||
EnableDevice(darwinTabletEraser);
|
|
||||||
|
|
||||||
DarwinEQInit();
|
DarwinEQInit();
|
||||||
|
|
||||||
QuartzInitInput(argc, argv);
|
QuartzInitInput(argc, argv);
|
||||||
|
|
|
@ -54,7 +54,6 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info);
|
||||||
extern darwinKeyboardInfo keyInfo;
|
extern darwinKeyboardInfo keyInfo;
|
||||||
extern pthread_mutex_t keyInfo_mutex;
|
extern pthread_mutex_t keyInfo_mutex;
|
||||||
void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents);
|
void DarwinKeyboardReloadHandler(int screenNum, xEventPtr xe, DeviceIntPtr dev, int nevents);
|
||||||
void DarwinKeyboardInit(DeviceIntPtr pDev);
|
|
||||||
int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
|
int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide);
|
||||||
int DarwinModifierNXKeyToNXKeycode(int key, int side);
|
int DarwinModifierNXKeyToNXKeycode(int key, int side);
|
||||||
int DarwinModifierNXKeyToNXMask(int key);
|
int DarwinModifierNXKeyToNXMask(int key);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user