hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

XQuartz: Force X11Controller to reset a broken DISPLAY envvar.

Browse source 
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
This commit is contained in:
Jeremy Huddleston 2008-11-25 01:30:03 -08:00
commit 94df1ab7f0
3 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/xquartz/mach-startup/bundle-main.c
View file

@ -57,6 +57,8 @@ void DarwinListenOnOpenFD(int fd);
extern int noPanoramiXExtension;
extern int xquartz_resetenv_display;
#define DEFAULT_CLIENT "/usr/X11/bin/xterm"
#define DEFAULT_STARTX "/usr/X11/bin/startx"
#define DEFAULT_SHELL "/bin/sh"
@ -408,6 +410,9 @@ int startup_trigger(int argc, char **argv, char **envp) {
if((s = getenv("DISPLAY"))) {
fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n", s);
unsetenv("DISPLAY");
/* This tells X11Controller to not use the environment's DISPLAY and reset it based on the server's display */
xquartz_resetenv_display = 1;
} else {
fprintf(stderr, "X11.app: Could not connect to server (DISPLAY is not set). Starting X server.\n");
}