X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=gtk%2Fxboard.c;h=4a2731ab449a1d40268f81b9bd4562042083d16b;hp=77e436b84fa0d19eed9dc10c281dae2dd618ad0a;hb=6487eb595b4ee51f8eab706698333e57c5dc4ff8;hpb=e5eb4d4682dc573c4bb981ecd9cde67d579c0515 diff --git a/gtk/xboard.c b/gtk/xboard.c index 77e436b..4a2731a 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -5,7 +5,8 @@ * Massachusetts. * * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006, - * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free + * Software Foundation, Inc. * * The following terms apply to Digital Equipment Corporation's copyright * interest in XBoard: @@ -62,7 +63,6 @@ #include #include #include -#include #include #if !OMIT_SOCKETS @@ -167,22 +167,26 @@ extern char *getenv(); #include "gettext.h" #include "draw.h" -#ifdef __APPLE__ +#ifdef OSXAPP # include // prevent pathname of positional file argument provided by OS X being be mistaken for option name // (price is that we won't recognize Windows option format anymore). # define SLASH '-' +# define IMG ".png" // redefine some defaults # undef ICS_LOGON -# undef DATADIR +# undef LOCALEDIR # undef SETTINGS_FILE # define ICS_LOGON "Library/Preferences/XboardICS.conf" -# define DATADIR dataDir +# define LOCALEDIR localeDir # define SETTINGS_FILE masterSettings - char dataDir[MSG_SIZ]; // for expanding ~~ +# define SYNC_MENUBAR gtkosx_application_sync_menubar(theApp) + char localeDir[MSG_SIZ]; char masterSettings[MSG_SIZ]; #else # define SLASH '/' +# define IMG ".svg" +# define SYNC_MENUBAR #endif #ifdef __EMX__ @@ -205,11 +209,13 @@ RETSIGTYPE CmailSigHandler P((int sig)); RETSIGTYPE IntSigHandler P((int sig)); RETSIGTYPE TermSizeSigHandler P((int sig)); char *InsertPxlSize P((char *pattern, int targetPxlSize)); +#ifdef TODO_GTK #if ENABLE_NLS XFontSet CreateFontSet P((char *base_fnt_lst)); #else char *FindFont P((char *pattern, int targetPxlSize)); #endif +#endif void DelayedDrag P((void)); void ICSInputBoxPopUp P((void)); void MoveTypeInProc P((GdkEventKey *eventkey)); @@ -219,6 +225,7 @@ void DisplayMove P((int moveNumber)); void update_ics_width P(()); int CopyMemoProc P(()); static gboolean EventProc P((GtkWidget *widget, GdkEvent *event, gpointer g)); +static int FindLogo P((char *place, char *name, char *buf)); #ifdef TODO_GTK #if ENABLE_NLS @@ -249,6 +256,7 @@ GtkAccelGroup *GtkAccelerators; typedef unsigned int BoardSize; BoardSize boardSize; Boolean chessProgram; +int initialSquareSize; int minX, minY; // [HGM] placement: volatile limits on upper-left corner int smallLayout = 0, tinyLayout = 0, @@ -373,7 +381,6 @@ colorVariable[] = { // [HGM] font: keep a font for each square size, even non-stndard ones #define NUM_SIZES 18 -#define MAX_SIZE 130 Boolean fontIsSet[NUM_FONTS], fontValid[NUM_FONTS][MAX_SIZE]; char *fontTable[NUM_FONTS][MAX_SIZE]; @@ -386,9 +393,10 @@ ParseFont (char *name, int number) // defer processing it until we know if it matches our board size if(!strstr(name, "-*-") && // ignore X-fonts size >= 0 && sizemax, slaveH + opt->value); } -#ifdef __APPLE__ +GdkPixbuf * +LoadIconFile (gchar *svgFilename) +{ + char buf[MSG_SIZ]; + + snprintf(buf, MSG_SIZ, "%s/%s" IMG, svgDir, svgFilename); + return gdk_pixbuf_new_from_file(buf, NULL); +} + +#ifdef OSXAPP static char clickedFile[MSG_SIZ]; -static int suppress; +TimeMark started; static gboolean StartNewXBoard(GtkosxApplication *app, gchar *path, gpointer user_data) { // handler of OSX OpenFile signal, which sends us the filename of clicked file or first argument - if(suppress) { // we just started XBoard without arguments - strncpy(clickedFile, path, MSG_SIZ); // remember file name, but otherwise ignore - } else { // we are running something presumably useful - char buf[MSG_SIZ]; - snprintf(buf, MSG_SIZ, "open -n -a \"xboard\" --args \"%s\"", path); - system(buf); // start new instance on this file - } - return TRUE; + TimeMark now; + GetTimeMark(&now); + if(1000*now.sec + now.ms - 1000*started.sec - started.ms < 1000) { // received during first second + strncpy(clickedFile, path, MSG_SIZ); // remember file name, but otherwise ignore + } else { // we are running something presumably useful + char buf[MSG_SIZ]; + snprintf(buf, MSG_SIZ, "open -n -a \"xboard\" --args \"%s\"", path); + system(buf); // start new instance on this file + } + return TRUE; } + +GtkosxApplication *theApp; #endif int @@ -843,36 +890,43 @@ main (int argc, char **argv) /* set up GTK */ gtk_init (&argc, &argv); -#ifdef __APPLE__ +#ifdef OSXAPP { // prepare to catch OX OpenFile signal, which will tell us the clicked file - GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); - char *path = gtkosx_application_get_bundle_path(); - strncpy(dataDir, path, MSG_SIZ); - snprintf(masterSettings, MSG_SIZ, "%s/Contents/Resources/etc/xboard.conf", path); - 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); - // 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())); - gtkosx_application_ready(theApp); - if(argc == 1) { // called without args: OSX open-file signal might follow - static char *fakeArgv[3] = {NULL, clickedFile, NULL}; - usleep(10000); // wait 10 msec (and hope this is long enough). - while(gtk_events_pending()) - gtk_main_iteration(); // process all events that came in upto now - suppress = 0; // future open-file signals should start new instance - if(clickedFile[0]) { // we were sent an open-file signal with filename! - fakeArgv[0] = argv[0]; - argc = 2; argv = fakeArgv; // fake that we were called as "xboard filename" - } - } + char *path = gtkosx_application_get_bundle_path(); +#ifdef ENABLE_NLS + char *res_path = gtkosx_application_get_resource_path(); + snprintf(localeDir, MSG_SIZ, "%s/share/locale", res_path); // redefine locale dir for OSX bundle +#endif + GetTimeMark(&started); // remember start time + theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + snprintf(masterSettings, MSG_SIZ, "%s/Contents/Resources/etc/xboard.conf", path); + snprintf(dataDir, MSG_SIZ, "%s/Contents/Resources/share/xboard", path); + snprintf(manDir, MSG_SIZ, "%s/Contents/Resources/share/man", path); + snprintf(svgDir, MSG_SIZ, "%s/themes/default", dataDir); + 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())); + gtkosx_application_ready(theApp); + if(argc == 1) { // called without args: OSX open-file signal might follow + static char *fakeArgv[3] = {NULL, clickedFile, NULL}; + usleep(10000); // wait 10 msec (and hope this is long enough). + while(gtk_events_pending()) + gtk_main_iteration(); // process all events that came in upto now + if(clickedFile[0]) { // we were sent an open-file signal with filename! + fakeArgv[0] = argv[0]; + argc = 2; argv = fakeArgv; // fake that we were called as "xboard filename" + } + } } #endif if(argc > 1 && !strcmp(argv[1], "--show-config")) { // [HGM] install: called to print config info typedef struct {char *name, *value; } Config; static Config configList[] = { - { "Datadir", DATADIR }, + { "Datadir", dataDir }, + { "Mandir", manDir }, { "Sysconfdir", SYSCONFDIR }, { NULL } }; @@ -917,7 +971,7 @@ main (int argc, char **argv) { // [HGM] initstring: kludge to fix bad bug. expand '\n' characters in init string and computer string. static char buf[MSG_SIZ]; - snprintf(buf, MSG_SIZ, appData.sysOpen, DATADIR); + snprintf(buf, MSG_SIZ, appData.sysOpen, dataDir); ASSIGN(appData.sysOpen, buf); // expand %s in -openCommand to DATADIR (usefull for OS X configuring) EscapeExpand(buf, appData.firstInitString); appData.firstInitString = strdup(buf); @@ -930,7 +984,9 @@ main (int argc, char **argv) } if ((chessDir = (char *) getenv("CHESSDIR")) == NULL) { - chessDir = "."; + static char dirName[MSG_SIZ]; + getcwd(dirName, MSG_SIZ); + chessDir = dirName; } else { if (chdir(chessDir) != 0) { fprintf(stderr, _("%s: can't cd to CHESSDIR: "), programName); @@ -980,8 +1036,6 @@ main (int argc, char **argv) programName, appData.boardSize); exit(2); } - if(BOARD_WIDTH > 8) - squareSize = (squareSize*8 + BOARD_WIDTH/2)/BOARD_WIDTH; // scale height if (i < 7) { /* Find some defaults; use the nearest known size */ SizeDefaults *szd, *nearest; @@ -1005,7 +1059,8 @@ main (int argc, char **argv) } else { SizeDefaults *szd = sizeDefaults; if (*appData.boardSize == NULLCHAR) { - GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow)); // TODO: this does not work, as no mainwindow yet +// GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow)); // TODO: this does not work, as no mainwindow yet + GdkScreen *screen = gdk_screen_get_default(); guint screenwidth = gdk_screen_get_width(screen); guint screenheight = gdk_screen_get_height(screen); while (screenwidth < (szd->minScreenSize*BOARD_WIDTH + 4)/8 || @@ -1032,6 +1087,11 @@ main (int argc, char **argv) tinyLayout = szd->tinyLayout; // [HGM] font: use defaults from settings file if available and not overruled } + initialSquareSize = squareSize; // [HGM] remember for saving font info + if(BOARD_WIDTH != 8) { + squareSize = (squareSize*8 + BOARD_WIDTH/2)/BOARD_WIDTH; // keep width the same + lineGap = (squareSize < 37 ? 1 : squareSize < 59 ? 2 : squareSize < 116 ? 3 : 4); + } defaultLineGap = lineGap; if(appData.overrideLineGap >= 0) lineGap = appData.overrideLineGap; @@ -1075,6 +1135,7 @@ main (int argc, char **argv) layoutName = "normalLayout"; } + if(appData.logoSize) appData.logoSize = boardWidth/4-3; wpMain.width = -1; // prevent popup sizes window optList = BoardPopUp(squareSize, lineGap, (void*) #ifdef TODO_GTK @@ -1092,7 +1153,8 @@ main (int argc, char **argv) boardWidget = optList[W_BOARD].handle; menuBarWidget = optList[W_MENU].handle; dropMenu = optList[W_DROP].handle; - titleWidget = optList[optList[W_TITLE].type != -1 ? W_TITLE : W_SMALL].handle; + titleWidget = optList[optList[W_TITLE].type != Skip ? W_TITLE : W_SMALL].handle; + DelayedDrag(); // fake configure event (i3wm tiling window manager fails to send one after initial resize) #ifdef TODO_GTK formWidget = XtParent(boardWidget); XtSetArg(args[0], XtNbackground, &timerBackgroundPixel); @@ -1116,10 +1178,9 @@ main (int argc, char **argv) /* * Create an icon. (Use two icons, to indicate whther it is white's or black's turn.) */ - WhiteIcon = gdk_pixbuf_new_from_file(SVGDIR "/icon_white.svg", NULL); - BlackIcon = gdk_pixbuf_new_from_file(SVGDIR "/icon_black.svg", NULL); - mainwindowIcon = WhiteIcon; - gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon); + WhiteIcon = LoadIconFile("icon_white"); + BlackIcon = LoadIconFile("icon_black"); + SetClockIcon(0); // sets white icon /* @@ -1160,13 +1221,15 @@ main (int argc, char **argv) marginH = h - a.height - hc; // subtract current clock height, so it can be added back dynamically } - CreateAnyPieces(); + CreateAnyPieces(1); CreateGrid(); if(appData.logoSize) { // locate and read user logo - char buf[MSG_SIZ]; - snprintf(buf, MSG_SIZ, "%s/%s.png", appData.logoDir, UserName()); + char buf[MSG_SIZ], name[MSG_SIZ]; + snprintf(name, MSG_SIZ, "/home/%s", UserName()); + if(!FindLogo(name, ".logo", buf)) + FindLogo(appData.logoDir, name + 6, buf); ASSIGN(userLogo, buf); } @@ -1446,11 +1509,23 @@ FindFont (char *pattern, int targetPxlSize) #endif void +MarkMenuItem (char *menuRef, int state) +{ + MenuItem *item = MenuNameToItem(menuRef); + + if(item && item->handle) { + ((GtkCheckMenuItem *) (item->handle))->active = state; + } + SYNC_MENUBAR; +} + +void EnableNamedMenuItem (char *menuRef, int state) { MenuItem *item = MenuNameToItem(menuRef); if(item && item->handle) gtk_widget_set_sensitive(item->handle, state); + SYNC_MENUBAR; } void @@ -1554,12 +1629,12 @@ static WindowPlacement wpNew; void CoDrag (GtkWidget *sh, WindowPlacement *wp) { - int touch=0, fudge = 2, f = 2; + int touch=0, fudge = 4, f = 3; GetActualPlacement(sh, wp); 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(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 + 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 @@ -1601,31 +1676,82 @@ void ReSize (WindowPlacement *wp) { GtkAllocation a; - int sqx, sqy, w, h, hc, lg = lineGap; - 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; + int sqx, sqy, i, w, h, lg = lineGap; 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; + 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 + } + for(h=0; sizeDefaults[h+1].name && sizeDefaults[h].squareSize*8 > sqx*BOARD_WIDTH; h++) {} + if(initialSquareSize != sizeDefaults[h].squareSize && !appData.fixedSize) { // boardSize changed + initialSquareSize = sizeDefaults[h].squareSize; // used for saving font + ChangeFont(1, &appData.clockFont, CLOCK_FONT, initialSquareSize, CLOCK_FONT_NAME, 2*(sizeDefaults[h].clockFontPxlSize+1)/3); + ChangeFont(1, &appData.font, MESSAGE_FONT, initialSquareSize, DEFAULT_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + ChangeFont(0, &appData.icsFont, CONSOLE_FONT, initialSquareSize, CONSOLE_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + ChangeFont(0, &appData.tagsFont, EDITTAGS_FONT, initialSquareSize, TAGS_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + ChangeFont(0, &appData.commentFont, COMMENT_FONT, initialSquareSize, COMMENT_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + ChangeFont(0, &appData.gameListFont, GAMELIST_FONT, initialSquareSize, GAMELIST_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + ChangeFont(0, &appData.historyFont, MOVEHISTORY_FONT, initialSquareSize, HISTORY_FONT_NAME, sizeDefaults[h].coordFontPxlSize); + DisplayBothClocks(); + ApplyFont(&mainOptions[W_MESSG], NULL); + for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL); + ApplyFont(&tagsOptions[1], NULL); + ApplyFont(&commentOptions[0], NULL); + ApplyFont(&historyOptions[0], NULL); + ApplyFont(&engoutOptions[5], NULL); + ApplyFont(&engoutOptions[12], NULL); + ApplyFont(&chatOptions[11], appData.icsFont); + AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag } - if(sqx != squareSize) { + if(!strchr(appData.boardSize, ',')) { + ASSIGN(appData.boardSize, sizeDefaults[h].name); + } +#ifndef OSXAPP + if(sizeDefaults[h].tinyLayout != tinyLayout) { // alter clipping of menu names to conform to board width + int clip = (tinyLayout = sizeDefaults[h].tinyLayout) + 1; + char text[MSG_SIZ]; + for(h=1; mainOptions[h].type == DropDown; h++) { + strncpy(text, _(mainOptions[h].name), MSG_SIZ); + if(clip != 1) text[clip + (text[clip-1] == '_')] = NULLCHAR; + gtk_menu_item_set_label((GtkMenuItem *) mainOptions[h].handle, text); + } + } +#endif + if(sqx != squareSize && !appData.fixedSize) { squareSize = sqx; // adopt new square size - CreatePNGPieces(); // make newly scaled pieces + CreatePNGPieces(appData.pieceDirectory); // make newly scaled pieces InitDrawingSizes(0, 0); // creates grid etc. } else ResizeBoardWindow(BOARD_WIDTH * (squareSize + lineGap) + lineGap, BOARD_HEIGHT * (squareSize + lineGap) + lineGap, 0); w = BOARD_WIDTH * (squareSize + lineGap) + lineGap; 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; + if(twoBoards && shellUp[DummyDlg]) { + SlavePopUp(); dualOptions[3].max = 0; DoEvents(); // calls SlaveResize, kludge to force assigning new canvas + partnerUp = !partnerUp; flipView = !flipView; + DrawPosition(True, NULL); + partnerUp = !partnerUp; flipView = !flipView; + } } static guint delayedDragTag = 0; @@ -1633,16 +1759,19 @@ static guint delayedDragTag = 0; void DragProc () { - static int busy; - if(busy) return; + static int busy; + if(busy++) return; // prevent recursive calling, but remember we missed an event in 'busy' + + if(delayedDragTag) g_source_remove(delayedDragTag); // no more timer interrupts from same event! + delayedDragTag = 0; - busy = 1; -// GetActualPlacement(shellWidget, &wpNew); + do { + 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 + busy = 0; break; // false alarm } - ReSize(&wpNew); + ReSize(&wpNew); // this can be interrupted by other events if(appData.useStickyWindows) { if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput); if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory); @@ -1652,9 +1781,8 @@ DragProc () } wpMain = wpNew; DrawPosition(True, NULL); - if(delayedDragTag) g_source_remove(delayedDragTag); - delayedDragTag = 0; // now drag executed, make sure next DelayedDrag will not cancel timer event (which could now be used by other) - busy = 0; + if(busy > 2) busy = 2; // if multiple events were backlogged, only do one more + } while(--busy); } void @@ -1675,6 +1803,7 @@ EventProc (GtkWidget *widget, GdkEvent *event, gpointer g) wpNew.y = event->configure.y; wpNew.width = event->configure.width; wpNew.height = event->configure.height; +// SetWidgetLabel(&mainOptions[W_WHITE], ""); SetWidgetLabel(&mainOptions[W_BLACK], ""); DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other return FALSE; } @@ -1706,7 +1835,7 @@ void ModeHighlight () { static int oldPausing = FALSE; - static GameMode oldmode = (GameMode) -1; + static GameMode oldMode = (GameMode) -1; char *wname; if (!boardWidget) return; @@ -1724,7 +1853,7 @@ ModeHighlight () } } - wname = ModeToWidgetName(oldmode); + wname = ModeToWidgetName(oldMode); if (wname != NULL) { MarkMenuItem(wname, False); } @@ -1732,8 +1861,9 @@ ModeHighlight () if (wname != NULL) { MarkMenuItem(wname, True); } - oldmode = gameMode; + if(oldMode == TwoMachinesPlay) EnableNamedMenuItem("Mode.MachineMatch", True); MarkMenuItem("Mode.MachineMatch", matchMode && matchGame < appData.matchGames); + oldMode = gameMode; /* Maybe all the enables should be handled here, not just this one */ EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); @@ -1814,7 +1944,7 @@ PasteGameProc () { gchar *text=NULL; GtkClipboard *cb; - guint len=0; + guint len=0; int flip = appData.flipView; FILE* f; // get game from clipboard @@ -1838,7 +1968,9 @@ PasteGameProc () fclose(f); // load from file + if(!appData.autoFlipView) appData.flipView = flipView; LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE); + appData.flipView = flip; return; } @@ -1863,7 +1995,7 @@ void MoveTypeInProc(eventkey) buf[0]=eventkey->keyval; buf[1]='\0'; - if (eventkey->keyval > 32 && eventkey->keyval < 256) + if (eventkey->keyval > 32 && eventkey->keyval < 256 || *buf == 27) ConsoleAutoPopUp (buf); } @@ -1897,9 +2029,9 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) void ManProc () { // called from menu -#ifdef __APPLE__ +#ifdef OSXAPP char buf[MSG_SIZ]; - snprintf(buf, MSG_SIZ, "%s ./man.command", appData.sysOpen); + snprintf(buf, MSG_SIZ, "osascript -e 'tell application \"Terminal\"' -e 'activate' -e 'do script \"man %s/../man/man6/xboard.6\"' -e 'end tell'", dataDir); system(buf); #else system("xterm -e man xboard &"); @@ -1907,6 +2039,20 @@ ManProc () } void +InfoProc () +{ + char buf[MSG_SIZ]; +#ifdef OSXAPP + snprintf(buf, MSG_SIZ, "osascript -e 'tell application \"Terminal\"' -e 'activate' -e 'do script \"info -d %s/../info -f xboard.info\"' -e 'end tell'", dataDir); +#else + snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", + INFODIR, INFOFILE); +#endif + system(buf); +} + + +void SetWindowTitle (char *text, char *title, char *icon) { #ifdef TODO_GTK @@ -1961,13 +2107,33 @@ DisplayIcsInteractionTitle (String message) #endif } +void +LockBoardSize (int after) +{ + static char *oldClockFont, *oldMessgFont; + int w, h; + if(oldMessgFont && !strcmp(oldMessgFont, appData.font) && + oldClockFont && !strcmp(oldClockFont, appData.clockFont) && after < 2) return; // only do something when font changed + w = BOARD_WIDTH*(squareSize + lineGap) + lineGap; + h = BOARD_HEIGHT*(squareSize + lineGap) + lineGap; + if(after & 1) { + ASSIGN(oldClockFont, appData.clockFont); + ASSIGN(oldMessgFont, appData.font); + gtk_window_resize(GTK_WINDOW(shellWidget), w, h); + DoEvents(); + gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board + } else { // before + gtk_widget_set_size_request(optList[W_BOARD].handle, w, h); // protect board widget + } +} void DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) { + static int twoLines = -1; GtkWidget *w = (GtkWidget *) opt->handle; GdkColor col; - char *markup; + char *markup, two = (appData.logoSize != 0); char bgcolor[10]; char fgcolor[10]; @@ -1984,12 +2150,14 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) strcpy(fgcolor, appData.lowTimeWarningColor); } + if(! partnerUp && two != twoLines) LockBoardSize(2); // lock board size if clock height changes + 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", appData.clockFont, - bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); + bgcolor, fgcolor, color, two ? "\n" : " ", TimeString(timer)); // markup = g_markup_printf_escaped("%s:%s%s", // bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); } else { @@ -2000,6 +2168,8 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) } gtk_label_set_markup(GTK_LABEL(w), markup); g_free(markup); + + if(!partnerUp && two != twoLines) LockBoardSize(3), twoLines = two; } static GdkPixbuf **clockIcons[] = { &WhiteIcon, &BlackIcon }; @@ -2010,7 +2180,11 @@ SetClockIcon (int color) GdkPixbuf *pm = *clockIcons[color]; if (mainwindowIcon != pm) { mainwindowIcon = pm; - gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon); +#ifdef OSXAPP + gtkosx_application_set_dock_icon_pixbuf(theApp, mainwindowIcon); +#else + gtk_window_set_icon(GTK_WINDOW(shellWidget), mainwindowIcon); +#endif } } @@ -2186,6 +2360,19 @@ FrameDelay (int time) #endif +static int +FindLogo (char *place, char *name, char *buf) +{ // check if file exists in given place + FILE *f; + if(!place) return 0; + snprintf(buf, MSG_SIZ, "%s/%s.png", place, name); + if(*place && strcmp(place, ".") && (f = fopen(buf, "r")) ) { + fclose(f); + return 1; + } + return 0; +} + static void LoadLogo (ChessProgramState *cps, int n, Boolean ics) { @@ -2195,8 +2382,11 @@ LoadLogo (ChessProgramState *cps, int n, Boolean ics) } else if(appData.autoLogo) { if(ics) { // [HGM] logo: in ICS mode second can be used for ICS sprintf(buf, "%s/%s.png", appData.logoDir, appData.icsHost); - } else if(appData.directory[n] && appData.directory[n][0]) { - sprintf(buf, "%s/%s.png", appData.logoDir, cps->tidy); + } else { // engine; cascade + if(!FindLogo(appData.logoDir, cps->tidy, buf) && // first try user log folder + !FindLogo(appData.directory[n], "logo", buf) && // then engine directory + !FindLogo("/usr/local/share/games/plugins/logos", cps->tidy, buf) ) // then system folders + FindLogo("/usr/share/games/plugins/logos", cps->tidy, buf); } } if(logoName[0]) @@ -2213,15 +2403,15 @@ UpdateLogos (int displ) return; } -void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp) - char *label; - char *def; - char *filter; - FileProc proc; - char *openMode; - Boolean pathFlag; - char **name; - FILE **fp; +void FileNamePopUpWrapper( + char *label, + char *def, + char *filter, + FileProc proc, + Boolean pathFlag, + char *openMode, + char **name, + FILE **fp) { GtkWidget *dialog; GtkFileFilter *gtkfilter; @@ -2230,6 +2420,15 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp char fileext[10] = ""; char *result = NULL; char *cp; + char curDir[MSG_SIZ]; + + StartDir(filter, NULL); // change to start directory for this file type + + 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); @@ -2303,12 +2502,16 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp ASSIGN(*name, filename); ScheduleDelayedEvent(DelayedLoad, 50); } + StartDir(filter, filename); g_free (filename); - }; + } + else StartDir(filter, ""); gtk_widget_destroy (dialog); ModeHighlight(); + if(def && *def && def[strlen(def)-1] == '/') chdir(curDir); + free(cp); return;