X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=60b50d15487b2215688000fa6499507d795fdd51;hb=0daaf16c6e5f8323e33d43ab32f90396d801a53f;hp=afe8ef7af83617a44427ab82980cba966a42618a;hpb=e5876bb39d5f30d92865ff5f37b0b60f15e4fa87;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index afe8ef7..60b50d1 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -167,6 +167,19 @@ extern char *getenv(); #include "gettext.h" #include "draw.h" +#ifdef OSX +# include "gtkmacintegration/gtkosxapplication.h" + // prevent pathname of positional file argument provided by OSx 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 +# define ICS_LOGON "Library/Preferences/XboardICS.conf" +# define SYSCONFDIR "../etc" +#else +# define SLASH '/' +#endif #ifdef __EMX__ #ifndef HAVE_USLEEP @@ -226,6 +239,9 @@ static GdkPixbuf *mainwindowIcon=NULL; static GdkPixbuf *WhiteIcon=NULL; static GdkPixbuf *BlackIcon=NULL; +/* key board accelerators */ +GtkAccelGroup *GtkAccelerators; + typedef unsigned int BoardSize; BoardSize boardSize; Boolean chessProgram; @@ -253,6 +269,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 @@ -282,73 +299,10 @@ XtResource clientResources[] = { }; #endif +/* keyboard shortcuts not yet transistioned int menuitem @ menu.c */ char globalTranslations[] = - ":F9: MenuItem(Actions.Resign) \n \ - :Ctrln: MenuItem(File.NewGame) \n \ - :MetaV: MenuItem(File.NewVariant) \n \ - :Ctrlo: MenuItem(File.LoadGame) \n \ - :MetaNext: MenuItem(LoadNextGameProc) \n \ - :MetaPrior: MenuItem(LoadPrevGameProc) \n \ - :CtrlDown: LoadSelectedProc(3) \n \ + ":CtrlDown: LoadSelectedProc(3) \n \ :CtrlUp: LoadSelectedProc(-3) \n \ - :Ctrls: MenuItem(File.SaveGame) \n \ - :Ctrlc: MenuItem(Edit.CopyGame) \n \ - :Ctrlv: MenuItem(Edit.PasteGame) \n \ - :CtrlO: MenuItem(File.LoadPosition) \n \ - :ShiftNext: MenuItem(LoadNextPositionProc) \n \ - :ShiftPrior: MenuItem(LoadPrevPositionProc) \n \ - :CtrlS: MenuItem(File.SavePosition) \n \ - :CtrlC: MenuItem(Edit.CopyPosition) \n \ - :CtrlV: MenuItem(Edit.PastePosition) \n \ - :Ctrlq: MenuItem(File.Quit) \n \ - :Ctrlw: MenuItem(Mode.MachineWhite) \n \ - :Ctrlb: MenuItem(Mode.MachineBlack) \n \ - :Ctrlt: MenuItem(Mode.TwoMachines) \n \ - :Ctrla: MenuItem(Mode.AnalysisMode) \n \ - :Ctrlg: MenuItem(Mode.AnalyzeFile) \n \ - :Ctrle: MenuItem(Mode.EditGame) \n \ - :CtrlE: MenuItem(Mode.EditPosition) \n \ - :MetaO: MenuItem(View.EngineOutput) \n \ - :MetaE: MenuItem(View.EvaluationGraph) \n \ - :MetaG: MenuItem(View.GameList) \n \ - :MetaH: MenuItem(View.MoveHistory) \n \ - :Pause: MenuItem(Mode.Pause) \n \ - :F3: MenuItem(Action.Accept) \n \ - :F4: MenuItem(Action.Decline) \n \ - :F12: MenuItem(Action.Rematch) \n \ - :F5: MenuItem(Action.CallFlag) \n \ - :F6: MenuItem(Action.Draw) \n \ - :F7: MenuItem(Action.Adjourn) \n \ - :F8: MenuItem(Action.Abort) \n \ - :F10: MenuItem(Action.StopObserving) \n \ - :F11: MenuItem(Action.StopExamining) \n \ - :Ctrld: MenuItem(DebugProc) \n \ - :Meta CtrlF12: MenuItem(DebugProc) \n \ - :MetaEnd: MenuItem(Edit.ForwardtoEnd) \n \ - :MetaRight: MenuItem(Edit.Forward) \n \ - :MetaHome: MenuItem(Edit.BacktoStart) \n \ - :MetaLeft: MenuItem(Edit.Backward) \n \ - :Left: MenuItem(Edit.Backward) \n \ - :Right: MenuItem(Edit.Forward) \n \ - :Home: MenuItem(Edit.Revert) \n \ - :End: MenuItem(Edit.TruncateGame) \n \ - :Ctrlm: MenuItem(Engine.MoveNow) \n \ - :Ctrlx: MenuItem(Engine.RetractMove) \n \ - :MetaJ: MenuItem(Options.Adjudications) \n \ - :MetaU: MenuItem(Options.CommonEngine) \n \ - :MetaT: MenuItem(Options.TimeControl) \n \ - :CtrlP: MenuItem(PonderNextMove) \n " -#ifndef OPTIONSDIALOG - "\ - :CtrlQ: MenuItem(AlwaysQueenProc) \n \ - :CtrlF: MenuItem(AutoflagProc) \n \ - :CtrlA: MenuItem(AnimateMovingProc) \n \ - :CtrlL: MenuItem(TestLegalityProc) \n \ - :CtrlH: MenuItem(HideThinkingProc) \n " -#endif - "\ - :F1: MenuItem(Help.ManXBoard) \n \ - :F2: MenuItem(View.FlipView) \n \ :Return: TempBackwardProc() \n \ :Return: TempForwardProc() \n"; @@ -371,7 +325,7 @@ String xboardResources[] = { void BoardToTop () { - gtk_window_present(GTK_WINDOW(mainwindow)); + gtk_window_present(GTK_WINDOW(shells[BoardWindow])); } //--------------------------------------------------------------------------------------------------------- @@ -622,11 +576,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); } @@ -703,6 +662,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; @@ -716,6 +676,7 @@ PrintArg (ArgType t) case ArgTwo: case ArgNone: case ArgCommSettings: + default: break; } return p; @@ -750,6 +711,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 OSX +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) { @@ -765,7 +759,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); } @@ -776,6 +770,31 @@ main (int argc, char **argv) /* set up GTK */ gtk_init (&argc, &argv); +#ifdef OSX + { // prepare to catch OX OpenFile signal, which will tell us the clicked file + GtkosxApplication *theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); + 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(); programName = strrchr(argv[0], '/'); if (programName == NULL) @@ -789,6 +808,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 @@ -960,6 +980,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 @@ -994,6 +1015,9 @@ main (int argc, char **argv) InitMenuMarkers(); + // add accelerators to main shell + gtk_window_add_accel_group(GTK_WINDOW(shellWidget), GtkAccelerators); + /* * Create an icon. (Use two icons, to indicate whther it is white's or black's turn.) */ @@ -1024,15 +1048,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 - 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); + marginH = h - a.height - hc; // subtract current clock height, so it can be added back dynamically } CreateAnyPieces(); @@ -1289,7 +1319,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); @@ -1453,15 +1483,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) { @@ -1486,7 +1524,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 @@ -1704,14 +1741,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); }