[B2-devel] Leopard X11 DISPLAY variable patch

[Mike S. <bas...@sp...>]

Hi,

I was testing some other SS patches and I noticed that when I ran an X11 
build of SS there were not all the video modes I expected in the the 
control strip. Mac OS X 10.5 changed the form of the DISPLAY environment 
variable. I pasted (sorry) the patch for SheepShaver/src/Unix below. A 
similar change most likely needs to be made to 
BasiliskII/src/Unix/video_x.cpp as well. The reason for this is that the 
DISPLAY variable looks like this in Leopard:

/tmp/launch-XXXXXX/:0

The Xs are like in mktemp.

Also I have some more patches I would like to submit but I am waiting to 
see if the others I submitted will be accepted. The cpr.sh one touches the 
autoconf stuff that other patches also touch.

mzs

Index: video_x.cpp
===================================================================
RCS file: /home/cvs/cebix/SheepShaver/src/Unix/video_x.cpp,v
retrieving revision 1.50
diff -u -8 -r1.50 video_x.cpp
--- video_x.cpp	1 Jan 2008 09:47:39 -0000	1.50
+++ video_x.cpp	17 Feb 2009 14:23:46 -0000
  #ifdef ENABLE_VOSF
  	// Zero the mainBuffer structure
  	mainBuffer.dirtyPages = NULL;
  	mainBuffer.pageInfo = NULL;
  #endif

  	// Check if X server runs on local machine
  	local_X11 = (strncmp(XDisplayName(x_display_name), ":", 1) == 0)
+	         || (strncmp(XDisplayName(x_display_name), "/", 1) == 0)
  	         || (strncmp(XDisplayName(x_display_name), "unix:", 5) == 0);

  	// Init keycode translation
  	keycode_init();

  	// Read frame skip prefs
  	frame_skip = PrefsFindInt32("frameskip");
  	if (frame_skip == 0)