diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-30 09:49:59 +0000 |
| commit | f952d0d771de6d9b8ecc3cbbe3624203723bbb25 (patch) | |
| tree | 6dd2d11e017529c66f2489000136201829dc3b9d /xorg-server/hw/xquartz/quartzKeyboard.c | |
| parent | f6ba83c963bf48dfa349ab8c54d1968c4c69f7b8 (diff) | |
| download | vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.gz vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.tar.bz2 vcxsrv-f952d0d771de6d9b8ecc3cbbe3624203723bbb25.zip | |
xserver libX11 xkeyboard-config git update 30/9/2010
Diffstat (limited to 'xorg-server/hw/xquartz/quartzKeyboard.c')
| -rw-r--r-- | xorg-server/hw/xquartz/quartzKeyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c index 8ea198cd5..cd73ec5bd 100644 --- a/xorg-server/hw/xquartz/quartzKeyboard.c +++ b/xorg-server/hw/xquartz/quartzKeyboard.c @@ -48,7 +48,7 @@ #include <sys/stat.h>
#include <AvailabilityMacros.h>
-#include "quartzCommon.h"
+#include "quartz.h"
#include "darwin.h"
#include "darwinEvents.h"
@@ -262,7 +262,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) { case XK_Alt_L:
info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
info->modMap[MIN_KEYCODE + i] = Mod1Mask;
- if(!quartzOptionSendsAlt)
+ if(!XQuartzOptionSendsAlt)
*k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
break;
@@ -272,7 +272,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) { #else
info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
#endif
- if(!quartzOptionSendsAlt)
+ if(!XQuartzOptionSendsAlt)
*k = XK_Mode_switch; // Yes, this is ugly. This needs to be cleaned up when we integrate quartzKeyboard with this code and refactor.
info->modMap[MIN_KEYCODE + i] = Mod1Mask;
break;
|