Implement -positionDir option GTK

[xboard.git] / gtk / xboard.c

diff --git a/gtk/xboard.c b/gtk/xboard.c
index e2a3237..ef35f2a 100644 (file)
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -890,6 +890,7 @@ main (int argc, char **argv)
        snprintf(svgDir, MSG_SIZ, "%s/themes/default", dataDir);
        suppress = (argc == 1 || argc > 1 && argv[1][00] != '-'); // OSX sends signal even if name was already argv[1]!
        g_signal_connect(theApp, "NSApplicationOpenFile", G_CALLBACK(StartNewXBoard), NULL);
+       g_signal_connect(theApp, "NSApplicationWillTerminate", G_CALLBACK(ExitEvent), NULL);
        // we must call application ready before we can get the signal,
        // and supply a (dummy) menu bar before that, to avoid problems with dual apples in it
        gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(gtk_menu_bar_new()));
@@ -1196,8 +1197,8 @@ main (int argc, char **argv)
        gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
        clockKludge = hc = a.height;
        gtk_widget_get_allocation(boardWidget, &a);
-//     marginW =  w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board
-//     marginH =  h - a.height - hc; // subtract current clock height, so it can be added back dynamically
+       marginW =  w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board
+       marginH =  h - a.height - hc; // subtract current clock height, so it can be added back dynamically
     }
 
     CreateAnyPieces(1);
@@ -1655,22 +1656,29 @@ void
 ReSize (WindowPlacement *wp)
 {
        GtkAllocation a;
-       int sqx, sqy, w, h, hc, lg = lineGap;
+       int sqx, sqy, w, h, lg = lineGap;
        static int first = 1;
-       gtk_widget_get_allocation(optList[W_WHITE].handle, &a);
-       hc = a.height; // clock height can depend on single / double line clock text!
-//        if(clockKludge && hc != clockKludge) wp->height += hc - clockKludge, clockKludge = 0;
-       wpMain.height = BOARD_HEIGHT * (squareSize + lineGap) + lineGap + marginH + hc;
-       if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
-       sqx = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
-       sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg;
+       if(wp->width == wpMain.width && wp->height == wpMain.height && !first) return; // not sized
+       gtk_widget_get_allocation(optList[W_DROP+1].handle, &a); // table that should contain everything
+       w = a.width; h = a.height;
+       gtk_widget_get_allocation(shellWidget, &a);
+       if(a.width < w || a.height < h) { // outer window smaller than dialog content?
+           w = a.width - w; h = a.height - h; // subtract matrgins, measured as table minus board dimensions
+           gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+           w += a.width; h += a.height;
+       } else {
+           gtk_widget_get_allocation(optList[W_BOARD].handle, &a);
+           w = a.width; h = a.height;
+       }
+       sqx = (w - lg) / BOARD_WIDTH - lg;
+       sqy = (h - lg) / BOARD_HEIGHT - lg;
        if(sqy < sqx) sqx = sqy;
         if(sqx < 20) return;
        if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
            int oldSqx = sqx;
            lg = lineGap = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
-           sqx = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
-           sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg;
+           sqx = (w  - lg) / BOARD_WIDTH - lg;
+           sqy = (h - lg) / BOARD_HEIGHT - lg;
            if(sqy < sqx) sqx = sqy;
            lg = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
            if(sqx == oldSqx + 1 && lg == lineGap + 1) sqx = oldSqx, squareSize = 0; // prevent oscillations, force resize by kludge
@@ -1684,7 +1692,7 @@ ReSize (WindowPlacement *wp)
        h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
        if(optList[W_BOARD].max   > w) optList[W_BOARD].max = w;
        if(optList[W_BOARD].value > h) optList[W_BOARD].value = h;
-       first = 0;
+       first = appData.fixedSize;
 }
 
 static guint delayedDragTag = 0;
@@ -1696,7 +1704,7 @@ DragProc ()
        if(busy) return;
 
        busy = 1;
-//     GetActualPlacement(shellWidget, &wpNew);
+       GetActualPlacement(shellWidget, &wpNew);
        if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
           wpNew.width == wpMain.width && wpNew.height == wpMain.height) { // not sized
            busy = 0; return; // false alarm
@@ -2309,6 +2317,12 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp
   char fileext[10] = "";
   char *result     = NULL;
   char *cp;
+  char curDir[MSG_SIZ];
+
+  if(def && *def && def[strlen(def)-1] == '/') {
+    getcwd(curDir, MSG_SIZ);
+    chdir(def);
+  }
 
   /* make a copy of the filter string, so that strtok can work with it*/
   cp = strdup(filter);
@@ -2388,6 +2402,8 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp
   gtk_widget_destroy (dialog);
   ModeHighlight();
 
+  if(def && *def && def[strlen(def)-1] == '/') chdir(curDir);
+
   free(cp);
   return;