2007-01-15 Ross Burton <ross@openedhand.com>

	* src/main.c:
	Use Xephyr by default, and attempt to find a spare display instead
	of hard-coding :1.


git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1437 b067294f-1dea-0310-9683-c47a78595994

2 files changed, 23 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 705f377..2c56d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-15  Ross Burton  <ross@openedhand.com>
+
+	* src/main.c:
+	Use Xephyr by default, and attempt to find a spare display instead
+	of hard-coding :1.
+
 2006-02-10  Ross Burton  <ross@openedhand.com>
 
 	* src/config.c:
diff --git a/src/main.c b/src/main.c
index 1dc8e7c..fa13478 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 #include "callbacks.h"
 #include "prefs.h"
 
-#define XNEST_BIN "/usr/X11R6/bin/Xnest"
+#define XNEST_BIN "/usr/bin/Xephyr"
 
 /* Used by the signal handler to detect which child has died */
 pid_t xnest_pid;
@@ -36,13 +36,28 @@ static gboolean key_event (GtkWidget * widget, GdkEventKey * event,
 
 static void fakeapp_catch_sigchild (int sign);
 
+static char *
+find_spare_dpy (void)
+{
+  int i;
+  char buf[100];   
+  
+  for (i = 0; i < 256; i++) {
+    g_snprintf (buf, sizeof(buf), "/tmp/.X%d-lock", i);
+    if (access (buf, F_OK) != 0) {
+      return g_strdup_printf (":%i", i);
+    }
+  }
+  return NULL;
+}
+
 FakeApp *
 fakeapp_new (void)
 {
   GladeXML *glade;
   FakeApp *app = g_new0 (FakeApp, 1);
 
-  app->xnest_dpy_name = ":1";
+  app->xnest_dpy_name = find_spare_dpy ();
   app->xnest_bin_path = XNEST_BIN;
   app->xnest_bin_options = strdup ("-ac");	/* freed if changed */