X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=750e64fefce869eb0a7825b900807096f9c87295;hb=e6e38912837a4fe2464356408d10dee950b3121c;hp=88d6557a040899cf5d44f96336ceba648f303473;hpb=36c7e09704a7ef2229f316e8e70e423d4f0fa93b;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 88d6557..750e64f 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, 2013 Free Software Foundation, Inc. + * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. * * The following terms apply to Digital Equipment Corporation's copyright * interest in XBoard: @@ -167,6 +167,23 @@ extern char *getenv(); #include "gettext.h" #include "draw.h" +#ifdef __APPLE__ +# 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 '-' + // redefine some defaults +# undef ICS_LOGON +# undef SYSCONFDIR +# undef DATADIR +# define ICS_LOGON "Library/Preferences/XboardICS.conf" +# define SYSCONFDIR "../etc" +# define DATADIR dataDir + char *dataDir; // for expanding ~~ +#else +# define SLASH '/' +# define DATADIR "~~" +#endif #ifdef __EMX__ #ifndef HAVE_USLEEP @@ -256,6 +273,7 @@ WindowPlacement wpEvalGraph; WindowPlacement wpEngineOutput; WindowPlacement wpGameList; WindowPlacement wpTags; +WindowPlacement wpDualBoard; /* This magic number is the number of intermediate frames used in each half of the animation. For short moves it's reduced @@ -562,11 +580,16 @@ ConvertToLine (int argc, char **argv) //-------------------------------------------------------------------------------------------- +int clockKludge; + void ResizeBoardWindow (int w, int h, int inhibit) { + GtkAllocation a; + if(clockKludge) return; // ignore as long as clock does not have final height + gtk_widget_get_allocation(optList[W_WHITE].handle, &a); w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed... - h += marginH; + h += marginH + a.height + 1; gtk_window_resize(GTK_WINDOW(shellWidget), w, h); } @@ -643,6 +666,7 @@ PrintArg (ArgType t) case ArgString: p = " STR"; break; case ArgBoolean: p = " TF"; break; case ArgSettingsFilename: + case ArgBackupSettingsFile: case ArgFilename: p = " FILE"; break; case ArgX: p = " Nx"; break; case ArgY: p = " Ny"; break; @@ -656,6 +680,7 @@ PrintArg (ArgType t) case ArgTwo: case ArgNone: case ArgCommSettings: + default: break; } return p; @@ -690,6 +715,39 @@ PrintOptions () if(len) buf[len] = NULLCHAR, printf("%s\n", buf); } +void +SlaveResize (Option *opt) +{ + static int slaveW, slaveH, w, h; + GtkAllocation a; + if(!slaveH) { + gtk_widget_get_allocation(shells[DummyDlg], &a); + w = a.width; h = a.height; + gtk_widget_get_allocation(opt->handle, &a); + slaveW = w - opt->max; // [HGM] needed to set new shellWidget size when we resize board + slaveH = h - a.height + 13; + } + gtk_window_resize(GTK_WINDOW(shells[DummyDlg]), slaveW + opt->max, slaveH + opt->value); +} + +#ifdef __APPLE__ +static char clickedFile[MSG_SIZ]; +static int suppress; + +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; +} +#endif + int main (int argc, char **argv) { @@ -705,7 +763,7 @@ main (int argc, char **argv) debugFP = stderr; if(argc > 1 && (!strcmp(argv[1], "-v" ) || !strcmp(argv[1], "--version" ))) { - printf("%s version %s\n", PACKAGE_NAME, PACKAGE_VERSION); + printf("%s version %s\n\n configure options: %s\n", PACKAGE_NAME, PACKAGE_VERSION, CONFIGURE_OPTIONS); exit(0); } @@ -716,6 +774,29 @@ main (int argc, char **argv) /* set up GTK */ gtk_init (&argc, &argv); +#ifdef __APPLE__ + { // prepare to catch OX OpenFile signal, which will tell us the clicked file + GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + dataDir = gtkosx_application_get_bundle_path(); + 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); + suppress = (argc == 1 || argc > 1 && argv[1][00] != '-'); // OSX sends signal even if name was already argv[1]! + 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" + } + } + } +#endif /* set up keyboard accelerators group */ GtkAccelerators = gtk_accel_group_new(); @@ -732,6 +813,7 @@ main (int argc, char **argv) // } bindtextdomain(PACKAGE, LOCALEDIR); + bind_textdomain_codeset(PACKAGE, "UTF-8"); // needed when creating markup for the clocks textdomain(PACKAGE); #endif @@ -903,6 +985,7 @@ main (int argc, char **argv) layoutName = "normalLayout"; } + wpMain.width = -1; // prevent popup sizes window optList = BoardPopUp(squareSize, lineGap, (void*) #ifdef TODO_GTK #if ENABLE_NLS @@ -970,15 +1053,21 @@ main (int argc, char **argv) // XtSetValues(shellWidget, &shellArgs[2], 4); #endif { + // Note: We cannot do sensible sizing here, because the height of the clock widget is not yet known + // It wil only become known asynchronously, when we first write a string into it. + // This will then change the clock widget height, which triggers resizing the top-level window + // and a configure event. Only then can we know the total height of the top-level window, + // and calculate the height we need. The clockKludge flag suppresses all resizing until + // that moment comes, after which the configure event-handler handles it through a (delayed) DragProg. + int hc; 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); + 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 + 13; - gtk_window_resize(GTK_WINDOW(shellWidget), marginW + boardWidth, marginH + boardHeight); -//printf("margins h=%d v=%d\n", marginW, marginH); + marginH = h - a.height - hc; // subtract current clock height, so it can be added back dynamically } CreateAnyPieces(); @@ -1235,7 +1324,7 @@ FindFont (char *pattern, int targetPxlSize) safeStrCpy(p, best, strlen(best)+1 ); } if (appData.debugMode) { - fprintf(debugFP, _("resolved %s at pixel size %d\n to %s\n"), + fprintf(debugFP, "resolved %s at pixel size %d\n to %s\n", pattern, targetPxlSize, p); } XFreeFontNames(fonts); @@ -1399,15 +1488,23 @@ CoDrag (GtkWidget *sh, WindowPlacement *wp) void ReSize (WindowPlacement *wp) { - int sqx, sqy, w, h, lg = lineGap; + 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 == a.height) return; // wait for clock to get final size at startup + if(clockKludge) { // clock height OK now; calculate desired initial board height + clockKludge = 0; + wp->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) / BOARD_HEIGHT - lg; + sqy = (wp->height - lg - marginH - hc) / 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; + sqy = (wp->height - lg - marginH - hc) / BOARD_HEIGHT - lg; if(sqy < sqx) sqx = sqy; } if(sqx != squareSize) { @@ -1432,7 +1529,6 @@ DragProc () busy = 1; // GetActualPlacement(shellWidget, &wpNew); -//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 @@ -1650,14 +1746,14 @@ void MoveTypeInProc(eventkey) { char buf[10]; - // ingnore if ctrl or alt is pressed - if (eventkey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK)) { + // ingnore if ctrl, alt, or meta is pressed + if (eventkey->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK | GDK_META_MASK)) { return; } buf[0]=eventkey->keyval; buf[1]='\0'; - if (*buf >= 32) + if (eventkey->keyval > 32 && eventkey->keyval < 256) BoxAutoPopUp (buf); } @@ -1686,26 +1782,15 @@ TempForwardProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) ForwardEvent(); TempBackwardActive = False; } - -void -ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms) -{ // called as key binding - char buf[MSG_SIZ]; - String name; - if (nprms && *nprms > 0) - name = prms[0]; - else - name = "xboard"; - snprintf(buf, sizeof(buf), "xterm -e man %s &", name); - system(buf); -} #endif void ManProc () { // called from menu -#ifdef TODO_GTK - ManInner(NULL, NULL, NULL, NULL); +#ifdef __APPLE__ + system("%s ./man.command", appData.sysOpen); +#else + system("xterm -e man xboard &"); #endif } @@ -2026,7 +2111,7 @@ void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp char *cp; /* make a copy of the filter string, so that strtok can work with it*/ - cp = strndup(filter,strlen(filter)); + cp = strdup(filter); /* add filters for file extensions */ gtkfilter = gtk_file_filter_new();