X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=cf1b4e045b0957850365af56e254dc5488e95dcf;hb=7e84512efd14c63c94e011315d7fbec2d1cbb384;hp=0837911d4d519400c70d11186bdc883afe4b6286;hpb=1c03d229073e56dda9e5856db5adaae51576a3bb;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 0837911..cf1b4e0 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -226,6 +226,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 +256,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 +286,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 +312,7 @@ String xboardResources[] = { void BoardToTop () { - gtk_window_present(GTK_WINDOW(mainwindow)); + gtk_window_present(GTK_WINDOW(shells[BoardWindow])); } //--------------------------------------------------------------------------------------------------------- @@ -622,11 +563,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 +649,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; @@ -750,6 +697,21 @@ 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); +} + int main (int argc, char **argv) { @@ -777,6 +739,9 @@ main (int argc, char **argv) /* set up GTK */ gtk_init (&argc, &argv); + /* set up keyboard accelerators group */ + GtkAccelerators = gtk_accel_group_new(); + programName = strrchr(argv[0], '/'); if (programName == NULL) programName = argv[0]; @@ -789,6 +754,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 +926,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 +961,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 +994,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 +1265,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 +1429,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,16 +1470,17 @@ 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 } ReSize(&wpNew); - if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput); - if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory); - if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph); - if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList); + if(appData.useStickyWindows) { + if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput); + if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory); + if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph); + if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList); + } wpMain = wpNew; DrawPosition(True, NULL); if(delayedDragTag) g_source_remove(delayedDragTag); @@ -1521,8 +1506,7 @@ EventProc (GtkWidget *widget, GdkEvent *event, gpointer g) wpNew.y = event->configure.y; wpNew.width = event->configure.width; wpNew.height = event->configure.height; - if(appData.useStickyWindows) - DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other + DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other return FALSE; } @@ -1710,7 +1694,7 @@ void MoveTypeInProc(eventkey) buf[0]=eventkey->keyval; buf[1]='\0'; - if (*buf >= 32) + if (eventkey->keyval > 32 && eventkey->keyval < 256) BoxAutoPopUp (buf); } @@ -2060,7 +2044,7 @@ UpdateLogos (int displ) return; } -void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp) +void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp) char *label; char *def; char *filter;