summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@apple.com>2012-03-13 00:15:55 -0700
committerJeremy Huddleston <jeremyhu@apple.com>2012-03-27 11:50:45 -0700
commitc0b4dec9f248ee2c659c75f32d920ea3073d83e4 (patch)
tree9f1cde3fa923ea9cfd9dacb2efc14c5ece7e1e4b
parenta6f856a72f1a012c8bf3bce4f59be69679a6debf (diff)
XQuartz: Add a defaults option to disable the RENDER extension
RENDER has some ugly issues on XQuartz, so add an option to disable RENDER. Enables workaround for: https://bugs.freedesktop.org/show_bug.cgi?id=26124 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit 0bb8a2566debd6cd11164df9ddca534150ec440a)
-rw-r--r--hw/xquartz/X11Application.h1
-rw-r--r--hw/xquartz/X11Application.m4
2 files changed, 5 insertions, 0 deletions
diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index bdbe6ac1f..56806867e 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -126,6 +126,7 @@ X11ApplicationMain(int argc, char **argv, char **envp);
#define PREFS_APPKIT_MODIFIERS "appkit_modifiers"
#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
#define PREFS_ROOTLESS "rootless"
+#define PREFS_RENDER_EXTENSION "enable_render_extension"
#define PREFS_TEST_EXTENSIONS "enable_test_extensions"
#define PREFS_XP_OPTIONS "xp_options"
#define PREFS_LOGIN_SHELL "login_shell"
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index e091fbb3d..e1d35abbf 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -69,6 +69,7 @@ static dispatch_queue_t eventTranslationQueue;
#endif
extern Bool noTestExtensions;
+extern Bool noRenderExtension;
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
static TISInputSourceRef last_key_layout;
@@ -889,6 +890,9 @@ darwinDesiredDepth];
noTestExtensions = ![self prefs_get_boolean: @PREFS_TEST_EXTENSIONS default:
FALSE];
+noRenderExtension = ![self prefs_get_boolean: @PREFS_RENDER_EXTENSION default:
+TRUE];
+
XQuartzScrollInDeviceDirection =[self prefs_get_boolean: @PREFS_SCROLL_IN_DEV_DIRECTION default:
XQuartzScrollInDeviceDirection];