xserver: Branch 'master' - 3 commits
Jeremy Huddleston
jeremyhu at kemper.freedesktop.org
Thu Oct 23 19:22:39 PDT 2008
hw/xquartz/GL/visualConfigs.c | 6 -
hw/xquartz/X11Application.h | 1
hw/xquartz/X11Application.m | 32 +++++-----
hw/xquartz/bundle/Resources/English.lproj/Localizable.strings |binary
hw/xquartz/pbproxy/pbproxy.h | 1
5 files changed, 18 insertions(+), 22 deletions(-)
New commits:
commit 80b6768536fa439bfc5ce948bc8845a6f4af857b
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date: Thu Oct 23 17:32:32 2008 -0700
XQuartz: Do check_xinitrc() later to avoid possible deadlock.
(cherry picked from commit af95174a088dc787d124ec548b1005f5b67c9e8d)
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index ff202e3..5da1ffc 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -788,20 +788,19 @@ static void check_xinitrc (void) {
Windows displayed by X11 applications may not have titlebars, or may look \
different to windows displayed by native applications.\n\n\
Would you like to move aside the existing file and use the standard X11 \
-environment?", @"Startup xinitrc dialog");
-
- if (NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
- NSLocalizedString (@"No", @""), nil)
- == NSAlertDefaultReturn) {
- char buf2[1024];
- int i = -1;
-
- snprintf (buf2, sizeof (buf2), "%s.old", buf);
+environment the next time you start X11?", @"Startup xinitrc dialog");
+
+ if(NSAlertDefaultReturn == NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
+ NSLocalizedString (@"No", @""), nil)) {
+ char buf2[1024];
+ int i = -1;
- for (i = 1; access (buf2, F_OK) == 0; i++)
- snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+ snprintf (buf2, sizeof (buf2), "%s.old", buf);
- rename (buf, buf2);
+ for(i = 1; access (buf2, F_OK) == 0; i++)
+ snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
+
+ rename (buf, buf2);
}
done:
@@ -824,7 +823,6 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
[[NSNotificationCenter defaultCenter] addObserver:NSApp
selector:@selector (became_key:)
name:NSWindowDidBecomeKeyNotification object:nil];
- check_xinitrc ();
/*
* The xpr Quartz mode is statically linked into this server.
@@ -850,6 +848,11 @@ void X11ApplicationMain (int argc, char **argv, char **envp) {
/* Tell the server thread that it can proceed */
QuartzInitServer(argc, argv, envp);
+
+ /* This must be done after QuartzInitServer because it can result in
+ * an mieqEnqueue() - <rdar://problem/6300249>
+ */
+ check_xinitrc();
[NSApp run];
/* not reached */
diff --git a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings
index fec942e..001227a 100644
Binary files a/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings and b/hw/xquartz/bundle/Resources/English.lproj/Localizable.strings differ
commit d837d4e2af35a83c7932e4d0422097ebd1f6ba2c
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date: Thu Oct 23 17:56:46 2008 -0600
XQuartz: pbproxy: pbproxy.h had invalid macro usage with 2 #else statements, so it wasn't building. Fix the build.
(cherry picked from commit 6bcbb9ba85d95d7df63811a482abc39c4d595366)
diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h
index 324d56c..60566a6 100644
--- a/hw/xquartz/pbproxy/pbproxy.h
+++ b/hw/xquartz/pbproxy/pbproxy.h
@@ -37,7 +37,6 @@ extern void x_input_run (void);
# define DB(msg, args...) debug_printf("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args)
#else
# define DB(msg, args...) do {} while (0)
-#else
#endif
#define TRACE() DB("TRACE\n")
commit 6a2693b2f9cfdec6f30e2ca4c4176f986f97249e
Author: George Peter Staplin <gps at Georges-Workstation.local>
Date: Thu Oct 23 17:40:23 2008 -0600
XQuartz: Remove the enable_stereo default. We now use feature detection to enable stereo visuals.
We need to revisit the GL/indirect.c changes. I think indirect.c should
be using the same feature detection and GLX visual config code. The
indirect changes will require testing...
(cherry picked from commit 49b7a7c6f20ca85d4d624444eb83db2f91344591)
diff --git a/hw/xquartz/GL/visualConfigs.c b/hw/xquartz/GL/visualConfigs.c
index e46d628..a287542 100644
--- a/hw/xquartz/GL/visualConfigs.c
+++ b/hw/xquartz/GL/visualConfigs.c
@@ -56,8 +56,6 @@
#include "capabilities.h"
#include "visualConfigs.h"
-extern BOOL enable_stereo;
-
/* Based originally on code from indirect.c which was based on code from i830_dri.c. */
void setVisualConfigs(void) {
int numConfigs = 0;
@@ -87,7 +85,7 @@ void setVisualConfigs(void) {
2 iterations for accum (on and off (with an accum color size of 16)).
*/
- numConfigs = ((enable_stereo && caps->stereo) ? 2 : 1) * 2 *
+ numConfigs = (caps->stereo ? 2 : 1) * 2 *
(caps->aux_buffers ? 2 : 1) * (caps->buffers) * 2 * 2;
visualConfigs = xcalloc(sizeof(*visualConfigs), numConfigs);
@@ -107,7 +105,7 @@ void setVisualConfigs(void) {
i = 0; /* current buffer */
- for (stereo = 0; stereo < ((enable_stereo && caps->stereo) ? 2 : 1); ++stereo) {
+ for (stereo = 0; stereo < (caps->stereo ? 2 : 1); ++stereo) {
for (depth = 0; depth < 2; ++depth) {
for (aux = 0; aux < (caps->aux_buffers ? 2 : 1); ++aux) {
for (buffers = 0; buffers < caps->buffers; ++buffers) {
diff --git a/hw/xquartz/X11Application.h b/hw/xquartz/X11Application.h
index 4335abc..dd25fb0 100644
--- a/hw/xquartz/X11Application.h
+++ b/hw/xquartz/X11Application.h
@@ -94,7 +94,6 @@ extern int quartzHasRoot, quartzEnableRootless;
#define PREFS_WINDOW_ITEM_MODIFIERS "window_item_modifiers"
#define PREFS_ROOTLESS "rootless"
#define PREFS_XP_OPTIONS "xp_options"
-#define PREFS_ENABLE_STEREO "enable_stereo"
#define PREFS_LOGIN_SHELL "login_shell"
#define PREFS_CLICK_THROUGH "wm_click_through"
#define PREFS_FFM "wm_ffm"
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 00c2c3c..ff202e3 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -65,7 +65,6 @@ int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
static TISInputSourceRef last_key_layout;
extern int darwinFakeButtons;
-extern Bool enable_stereo;
X11Application *X11App;
@@ -676,8 +675,6 @@ static NSMutableArray * cfarray_to_nsarray (CFArrayRef in) {
darwinDesiredDepth = [self prefs_get_integer:@PREFS_DEPTH
default:darwinDesiredDepth];
- enable_stereo = [self prefs_get_boolean:@PREFS_ENABLE_STEREO
- default:enable_stereo];
}
/* This will end up at the end of the responder chain. */
More information about the xorg-commit
mailing list