aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xquartz
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-01-14 17:14:58 +0000
committermarha <marha@users.sourceforge.net>2010-01-14 17:14:58 +0000
commit8bbcd844049eb1296ccd25aca75bf3b08f28facb (patch)
treea4b168a1b2c686548550719b094e982124696f3d /xorg-server/hw/xquartz
parent5eaf49ad7feec1f2043ecb1b90c04c534ce29f46 (diff)
parentb152ebf4b66368e1cbfda1ae81cef29bf9c00bb7 (diff)
downloadvcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.gz
vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.tar.bz2
vcxsrv-8bbcd844049eb1296ccd25aca75bf3b08f28facb.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xquartz')
-rw-r--r--xorg-server/hw/xquartz/bundle/Info.plist.cpp4
-rw-r--r--xorg-server/hw/xquartz/quartzKeyboard.c4
-rw-r--r--xorg-server/hw/xquartz/xpr/x-hook.c3
3 files changed, 8 insertions, 3 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Info.plist.cpp b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
index 87214f456..e89d985f4 100644
--- a/xorg-server/hw/xquartz/bundle/Info.plist.cpp
+++ b/xorg-server/hw/xquartz/bundle/Info.plist.cpp
@@ -35,9 +35,9 @@
<string>http://xquartz.macosforge.org/downloads/sparkle/release.xml</string>
#endif
<key>NSHumanReadableCopyright</key>
- <string>© 2003-2009 Apple Inc.
+ <string>© 2003-2010 Apple Inc.
© 2003 XFree86 Project, Inc.
-© 2003-2009 X.org Foundation, Inc.
+© 2003-2010 X.org Foundation, Inc.
</string>
<key>NSMainNibFile</key>
<string>main</string>
diff --git a/xorg-server/hw/xquartz/quartzKeyboard.c b/xorg-server/hw/xquartz/quartzKeyboard.c
index 62b2ebbdf..96b5fa5b6 100644
--- a/xorg-server/hw/xquartz/quartzKeyboard.c
+++ b/xorg-server/hw/xquartz/quartzKeyboard.c
@@ -260,6 +260,7 @@ static void DarwinBuildModifierMaps(darwinKeyboardInfo *info) {
break;
case XK_Mode_switch:
+ ErrorF("DarwinBuildModifierMaps: XK_Mode_switch encountered, unable to determine side.\n");
info->modifierKeycodes[NX_MODIFIERKEY_ALTERNATE][0] = i;
#ifdef NX_MODIFIERKEY_RALTERNATE
info->modifierKeycodes[NX_MODIFIERKEY_RALTERNATE][0] = i;
@@ -388,7 +389,6 @@ void DarwinKeyboardReloadHandler(void) {
pthread_mutex_lock(&keyInfo_mutex); {
/* Initialize our keySyms */
- DarwinBuildModifierMaps(&keyInfo);
keySyms.map = keyInfo.keyMap;
keySyms.mapWidth = GLYPHS_PER_KEY;
keySyms.minKeyCode = MIN_KEYCODE;
@@ -808,5 +808,7 @@ Bool QuartzReadSystemKeymap(darwinKeyboardInfo *info) {
}
}
+ DarwinBuildModifierMaps(info);
+
return TRUE;
}
diff --git a/xorg-server/hw/xquartz/xpr/x-hook.c b/xorg-server/hw/xquartz/xpr/x-hook.c
index 03e7f8553..5b850fe88 100644
--- a/xorg-server/hw/xquartz/xpr/x-hook.c
+++ b/xorg-server/hw/xquartz/xpr/x-hook.c
@@ -79,6 +79,9 @@ X_PFX (hook_run) (x_list *lst, void *arg)
void **data;
int length, i;
+ if(!lst)
+ return;
+
length = X_PFX (list_length) (lst);
fun = xalloc (sizeof (x_hook_function *) * length);
data = xalloc (sizeof (void *) * length);