Merge pull request #29 from dtlewis290/Cog

Map X windows properly when opening or reopening the display, as requ…

platforms/unix/vm-display-X11/sqUnixX11.c

@@ -4559,7 +4559,6 @@ void initWindow(char *displayName)
     dndInitialise();
 }
 
-
 void setWindowSize(void)
 {
   int width, height, maxWidth, maxHeight;
@@ -6784,7 +6783,13 @@ int openXDisplay(void)
       initClipboard();
       initWindow(displayName);
       initPixmap();
-      if (inBrowser()) /* if so we will be reparented and mapped by plugin */
+      if (!inBrowser())
+	{
+	  setWindowSize();
+	  XMapWindow(stDisplay, stParent);
+	  XMapWindow(stDisplay, stWindow);
+	}
+      else /* if in browser we will be reparented and mapped by plugin */
 	{
 	  /* tell browser our window */
 #        if defined(DEBUG_BROWSER)
@@ -6805,16 +6810,6 @@ int openXDisplay(void)
   return 0;
 }
 
-static void
-mapXDisplay(void)
-{
-  if (!inBrowser()) {
-    setWindowSize();
-    XMapWindow(stDisplay, stParent);
-    XMapWindow(stDisplay, stWindow);
-  }
-}
-
 int forgetXDisplay(void)
 {
   /* Initialise variables related to the X connection, and
@@ -7276,7 +7271,6 @@ static void display_winOpen(int argc, char *dropFiles[])
   if (launched)
     exit(0);
 
-  mapXDisplay();
 }