summaryrefslogtreecommitdiff
path: root/hw/xquartz/X11Application.m
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-28 12:59:09 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-28 13:02:54 -0800
commit3d527b91b4bfa31e78d5fc7a1447a4026876f14e (patch)
tree4a90ce9053fea3ae4c43a4bef3591481c2dd9e64 /hw/xquartz/X11Application.m
parent71d3df7cc37403b5842227a035d9b995fd920e0b (diff)
XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true (cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9) (cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
Diffstat (limited to 'hw/xquartz/X11Application.m')
-rw-r--r--hw/xquartz/X11Application.m12
1 files changed, 8 insertions, 4 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 9b3442652..21013d90d 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -66,6 +66,8 @@ extern BOOL xpbproxy_init (void);
int X11EnableKeyEquivalents = TRUE, quartzFullscreenMenu = FALSE;
int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
+extern Bool noTestExtensions;
+
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
static TISInputSourceRef last_key_layout;
#else
@@ -708,14 +710,16 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
}
X11EnableKeyEquivalents = [self prefs_get_boolean:@PREFS_KEYEQUIVS
- default:X11EnableKeyEquivalents];
+ default:X11EnableKeyEquivalents];
darwinSyncKeymap = [self prefs_get_boolean:@PREFS_SYNC_KEYMAP
- default:darwinSyncKeymap];
+ default:darwinSyncKeymap];
darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
- default:darwinDesiredDepth];
-
+ default:darwinDesiredDepth];
+
+ noTestExtensions = ![self prefs_get_boolean:@PREFS_TEST_EXTENSIONS
+ default:FALSE];
}
/* This will end up at the end of the responder chain. */