diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-16 15:34:33 +0000 |
| commit | 0b8629ada4293370d220bbb7e6c195c711baee7d (patch) | |
| tree | a7774b45662db90282ae18b17eb3d8f77d8c746d /xorg-server/hw/xquartz/quartzKeyboard.h | |
| parent | 8654ee514b4d79feec936501717a06892090d3b7 (diff) | |
| download | vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.gz vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.tar.bz2 vcxsrv-0b8629ada4293370d220bbb7e6c195c711baee7d.zip | |
svn merge -r534:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.h')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzKeyboard.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.h b/xorg-server/hw/xquartz/quartzKeyboard.h index 1aaec6ef2..1151a0035 100644 --- a/xorg-server/hw/xquartz/quartzKeyboard.h +++ b/xorg-server/hw/xquartz/quartzKeyboard.h @@ -41,18 +41,10 @@ #define MIN_KEYCODE XkbMinLegalKeyCode // unfortunately, this isn't 0... #define MAX_KEYCODE NUM_KEYCODES + MIN_KEYCODE - 1 -typedef struct darwinKeyboardInfo_struct { - CARD8 modMap[MAP_LENGTH]; - KeySym keyMap[MAP_LENGTH * GLYPHS_PER_KEY]; - unsigned char modifierKeycodes[32][2]; -} darwinKeyboardInfo; - /* These functions need to be implemented by Xquartz, XDarwin, etc. */ -Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info); +Bool QuartsResyncKeymap(Bool sendDDXEvent); /* Provided for darwinEvents.c */ -extern darwinKeyboardInfo keyInfo; -extern pthread_mutex_t keyInfo_mutex; void DarwinKeyboardReloadHandler(void); int DarwinModifierNXKeycodeToNXKey(unsigned char keycode, int *outSide); int DarwinModifierNXKeyToNXKeycode(int key, int side); |