X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=0837911d4d519400c70d11186bdc883afe4b6286;hb=1c03d229073e56dda9e5856db5adaae51576a3bb;hp=77eef841bda8421672363bb03c25bada33368b8e;hpb=cddb5c485a52d0444e81b4df49e1fe921c78b53c;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 77eef84..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)); @@ -556,33 +555,14 @@ GetActualPlacement (GtkWidget *shell, WindowPlacement *wp) GtkAllocation a; if(!shell) return; gtk_widget_get_allocation(shell, &a); + gtk_window_get_position(GTK_WINDOW(shell), &a.x, &a.y); wp->x = a.x; wp->y = a.y; wp->width = a.width; wp->height = a.height; -printf("placement\n"); - frameX = a.x; frameY = a.y; // remember to decide if windows touch +//printf("placement: (%d,%d) %dx%d\n", a.x, a.y, a.width, a.height); + frameX = 3; frameY = 3; // remember to decide if windows touch } -#ifdef TODO_GTK -void -GetActualPlacement (Widget wg, WindowPlacement *wp) -{ - XWindowAttributes winAt; - Window win, dummy; - int rx, ry; - - if(!wg) return; - - win = XtWindow(wg); - XGetWindowAttributes(xDisplay, win, &winAt); // this works, where XtGetValues on XtNx, XtNy does not! - XTranslateCoordinates (xDisplay, win, winAt.root, -winAt.border_width, -winAt.border_width, &rx, &ry, &dummy); - wp->x = rx - winAt.x; - wp->y = ry - winAt.y; - wp->height = winAt.height; - wp->width = winAt.width; - frameX = winAt.x; frameY = winAt.y; // remember to decide if windows touch -} -#endif void GetWindowCoords () @@ -647,18 +627,7 @@ ResizeBoardWindow (int w, int h, int inhibit) { w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed... h += marginH; -// gtk_window_resize(GTK_WINDOW(shellWidget), w, h); -#ifdef TODO_GTK - w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed... - h += marginH; - shellArgs[0].value = w; - shellArgs[1].value = h; - shellArgs[4].value = shellArgs[2].value = w; - shellArgs[5].value = shellArgs[3].value = h; - XtSetValues(shellWidget, &shellArgs[0], inhibit ? 6 : 2); - - XSync(xDisplay, False); -#endif + gtk_window_resize(GTK_WINDOW(shellWidget), w, h); } int @@ -1058,10 +1027,13 @@ main (int argc, char **argv) GtkAllocation a; gtk_widget_get_allocation(shells[BoardWindow], &a); w = a.width; h = a.height; -printf("start size (%d,%d), %dx%d\n", a.x, a.y, w, h); +//printf("start size (%d,%d), %dx%d\n", a.x, a.y, w, h); + gtk_widget_get_allocation(boardWidget, &a); + marginW = w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board + marginH = h - a.height - 25; // subtract 25, because GTK seems to insert this amount of extra empty space + gtk_window_resize(GTK_WINDOW(shellWidget), marginW + boardWidth, marginH + boardHeight); +//printf("margins h=%d v=%d\n", marginW, marginH); } - marginW = w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board - marginH = h - boardHeight; CreateAnyPieces(); CreateGrid(); @@ -1435,12 +1407,13 @@ static WindowPlacement wpNew; void CoDrag (GtkWidget *sh, WindowPlacement *wp) { - int touch=0, fudge = 2; + int touch=0, fudge = 2, f = 2; GetActualPlacement(sh, wp); - if(abs(wpMain.x + wpMain.width + 2*frameX - wp->x) < fudge) touch = 1; else // right touch - if(abs(wp->x + wp->width + 2*frameX - wpMain.x) < fudge) touch = 2; else // left touch - if(abs(wpMain.y + wpMain.height + frameX + frameY - wp->y) < fudge) touch = 3; else // bottom touch - if(abs(wp->y + wp->height + frameX + frameY - wpMain.y) < fudge) touch = 4; // top touch + if(abs(wpMain.x + wpMain.width + 2*frameX - f - wp->x) < fudge) touch = 1; else // right touch + if(abs(wp->x + wp->width + 2*frameX + f - wpMain.x) < fudge) touch = 2; else // left touch + if(abs(wpMain.y + wpMain.height + frameX - f + frameY - wp->y) < fudge) touch = 3; else // bottom touch + if(abs(wp->y + wp->height + frameX + frameY + f - wpMain.y) < fudge) touch = 4; // top touch +//printf("CoDrag: touch = %d x=%d w=%d x2=%d w2=%d fx=%d\n", touch, wpMain.x, wpMain.width, wp->x, wp->width, frameX); if(!touch ) return; // only windows that touch co-move if(touch < 3 && wpNew.height != wpMain.height) { // left or right and height changed int heightInc = wpNew.height - wpMain.height; @@ -1451,6 +1424,7 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp) #ifdef TODO_GTK if(heightInc) XtSetArg(args[j], XtNheight, wp->height + heightInc), j++; #endif + wp->height += heightInc; } else if(touch > 2 && wpNew.width != wpMain.width) { // top or bottom and width changed int widthInc = wpNew.width - wpMain.width; double fracLeft = Fraction(wp->x, wpMain.x, wpMain.x + wpMain.width + 2*frameX); @@ -1460,6 +1434,7 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp) #ifdef TODO_GTK if(widthInc) XtSetArg(args[j], XtNwidth, wp->width + widthInc), j++; #endif + wp->width += widthInc; } wp->x += wpNew.x - wpMain.x; wp->y += wpNew.y - wpMain.y; @@ -1470,17 +1445,27 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp) XtSetArg(args[j], XtNy, wp->y); j++; XtSetValues(sh, args, j); #endif + gtk_window_move(GTK_WINDOW(sh), wp->x, wp->y); +//printf("moved to (%d,%d)\n", wp->x, wp->y); + gtk_window_resize(GTK_WINDOW(sh), wp->width, wp->height); } 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 CreatePNGPieces(); // make newly scaled pieces InitDrawingSizes(0, 0); // creates grid etc. @@ -1501,7 +1486,7 @@ DragProc () busy = 1; // GetActualPlacement(shellWidget, &wpNew); -printf("drag proc (%d,%d) %dx%d\n", wpNew.x, wpNew.y, wpNew.width, wpNew.height); +//printf("drag proc (%d,%d) %dx%d\n", wpNew.x, wpNew.y, wpNew.width, wpNew.height); 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 @@ -1521,16 +1506,16 @@ printf("drag proc (%d,%d) %dx%d\n", wpNew.x, wpNew.y, wpNew.width, wpNew.height) void DelayedDrag () { -printf("old timr = %d\n", delayedDragTag); +//printf("old timr = %d\n", delayedDragTag); if(delayedDragTag) g_source_remove(delayedDragTag); delayedDragTag = g_timeout_add( 200, (GSourceFunc) DragProc, NULL); -printf("new timr = %d\n", delayedDragTag); +//printf("new timr = %d\n", delayedDragTag); } static gboolean EventProc (GtkWidget *widget, GdkEvent *event, gpointer g) { -printf("event proc (%d,%d) %dx%d\n", event->configure.x, event->configure.y, event->configure.width, event->configure.height); +//printf("event proc (%d,%d) %dx%d\n", event->configure.x, event->configure.y, event->configure.width, event->configure.height); // immediately wpNew.x = event->configure.x; wpNew.y = event->configure.y; @@ -1580,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 ); } @@ -1633,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) { @@ -1642,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 @@ -1664,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; } @@ -1682,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) { @@ -1699,7 +1684,7 @@ PasteGameProc () fwrite(text, 1, len, f); fclose(f); - // load from file + // load from file LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE); return; } @@ -1725,7 +1710,7 @@ void MoveTypeInProc(eventkey) buf[0]=eventkey->keyval; buf[1]='\0'; - if (*buf >= 32) + if (*buf >= 32) BoxAutoPopUp (buf); } @@ -1837,6 +1822,7 @@ void DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) { GtkWidget *w = (GtkWidget *) opt->handle; + GdkColor col; char *markup; char bgcolor[10]; char fgcolor[10]; @@ -1854,6 +1840,9 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) strcpy(fgcolor, appData.lowTimeWarningColor); } + gdk_color_parse( bgcolor, &col ); + gtk_widget_modify_bg(gtk_widget_get_parent(opt->handle), GTK_STATE_NORMAL, &col); + if (appData.clockMode) { markup = g_markup_printf_escaped("%s:%s%s", bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); @@ -2171,4 +2160,3 @@ void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp) return; } -