X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=0837911d4d519400c70d11186bdc883afe4b6286;hb=1c03d229073e56dda9e5856db5adaae51576a3bb;hp=38ecb2dc0952bb581d56e52ebf76be275d30c68b;hpb=e6df7a018a00f4f5ed8c20882af27c9033d6aa5b;p=xboard.git

diff --git a/gtk/xboard.c b/gtk/xboard.c
index 38ecb2d..0837911 100644
--- a/gtk/xboard.c
+++ b/gtk/xboard.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -199,7 +199,6 @@ void MoveTypeInProc P((GdkEventKey *eventkey));
 gboolean KeyPressProc P((GtkWindow *window, GdkEventKey *eventkey, gpointer data));
 Boolean TempBackwardActive = False;
 void DisplayMove P((int moveNumber));
-void ICSInitScript P((void));
 void update_ics_width P(());
 int CopyMemoProc P(());
 static gboolean EventProc P((GtkWidget *widget, GdkEvent *event, gpointer g));
@@ -1454,11 +1453,17 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp)
 void
 ReSize (WindowPlacement *wp)
 {
-	int sqx, sqy, w, h;
+	int sqx, sqy, w, h, lg = lineGap;
 	if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
-	sqx = (wp->width  - lineGap - marginW) / BOARD_WIDTH - lineGap;
-	sqy = (wp->height - lineGap - marginH) / BOARD_HEIGHT - lineGap;
+	sqx = (wp->width  - lg - marginW) / BOARD_WIDTH - lg;
+	sqy = (wp->height - lg - marginH) / BOARD_HEIGHT - lg;
 	if(sqy < sqx) sqx = sqy;
+	if(appData.overrideLineGap < 0) { // do second iteration with adjusted lineGap
+	    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) / BOARD_HEIGHT - lg;
+	    if(sqy < sqx) sqx = sqy;
+	}
 	if(sqx != squareSize) {
 //printf("new sq size %d (%dx%d)\n", sqx, wp->width, wp->height);
 	    squareSize = sqx; // adopt new square size
@@ -1560,7 +1565,7 @@ ModeHighlight ()
 	  /* Always toggle, don't set.  Previous code messes up when
 	     invoked while the button is pressed, as releasing it
 	     toggles the state again. */
-	    GdkColor color;     
+	    GdkColor color;
             gdk_color_parse( pausing ? "#808080" : "#F0F0F0", &color );
             gtk_widget_modify_bg ( GTK_WIDGET(optList[W_PAUSE].handle), GTK_STATE_NORMAL, &color );
 	}
@@ -1613,7 +1618,7 @@ void CopyFileToClipboard(gchar *filename)
       return;
     }
     selection_tmp[len] = NULLCHAR; // file is now in selection_tmp
-    
+
     // copy selection_tmp to clipboard
     GdkDisplay *gdisp = gdk_display_get_default();
     if (!gdisp) {
@@ -1622,7 +1627,7 @@ void CopyFileToClipboard(gchar *filename)
     }
     cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     gtk_clipboard_set_text(cb, selection_tmp, -1);
-    g_free(selection_tmp);    
+    g_free(selection_tmp);
 }
 
 void
@@ -1644,9 +1649,9 @@ PastePositionProc ()
     gchar *fenstr;
 
     if (gdisp == NULL) return;
-    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);    
+    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     fenstr = gtk_clipboard_wait_for_text(cb);
-    if (fenstr==NULL) return; // nothing had been selected to copy  
+    if (fenstr==NULL) return; // nothing had been selected to copy
     EditPositionPasteFEN(fenstr);
     return;
 }
@@ -1662,14 +1667,14 @@ PasteGameProc ()
     // get game from clipboard
     GdkDisplay *gdisp = gdk_display_get_default();
     if (gdisp == NULL) return;
-    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);    
+    cb = gtk_clipboard_get_for_display(gdisp, GDK_SELECTION_CLIPBOARD);
     text = gtk_clipboard_wait_for_text(cb);
-    if (text == NULL) return; // nothing to paste  
+    if (text == NULL) return; // nothing to paste
     len = strlen(text);
 
     // write to temp file
     if (text == NULL || len == 0) {
-      return; //nothing to paste 
+      return; //nothing to paste
     }
     f = fopen(gamePasteFilename, "w");
     if (f == NULL) {
@@ -1679,7 +1684,7 @@ PasteGameProc ()
     fwrite(text, 1, len, f);
     fclose(f);
 
-    // load from file 
+    // load from file
     LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE);
     return;
 }
@@ -1705,7 +1710,7 @@ void MoveTypeInProc(eventkey)
 
     buf[0]=eventkey->keyval;
     buf[1]='\0';
-    if (*buf >= 32)        
+    if (*buf >= 32)
 	BoxAutoPopUp (buf);
 }
 
@@ -2155,4 +2160,3 @@ void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp)
   return;
 
 }
-