X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=750e64fefce869eb0a7825b900807096f9c87295;hb=e6e38912837a4fe2464356408d10dee950b3121c;hp=44c998430e1d196cf06b7bc0dc9749969acbd15f;hpb=0d88b7c20af19de163b648898ec8d3ed4c31d796;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 44c9984..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 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 @@ -195,10 +212,10 @@ char *FindFont P((char *pattern, int targetPxlSize)); #endif void DelayedDrag P((void)); void ICSInputBoxPopUp P((void)); +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)); @@ -226,6 +243,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 +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 @@ -282,73 +303,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"; @@ -368,16 +326,10 @@ String xboardResources[] = { }; #endif -/* Max possible square size */ -#define MAXSQSIZE 256 - -static int xpm_avail[MAXSQSIZE]; - - void BoardToTop () { - gtk_window_present(GTK_WINDOW(mainwindow)); + gtk_window_present(GTK_WINDOW(shells[BoardWindow])); } //--------------------------------------------------------------------------------------------------------- @@ -561,33 +513,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 -} -#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 +//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 } -#endif void GetWindowCoords () @@ -647,23 +580,17 @@ 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; -// 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 + h += marginH + a.height + 1; + gtk_window_resize(GTK_WINDOW(shellWidget), w, h); } int @@ -739,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; @@ -752,6 +680,7 @@ PrintArg (ArgType t) case ArgTwo: case ArgNone: case ArgCommSettings: + default: break; } return p; @@ -786,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) { @@ -793,7 +755,6 @@ main (int argc, char **argv) int boardWidth, boardHeight, w, h; char *p; int forceMono = False; - GError *gtkerror=NULL; srandom(time(0)); // [HGM] book: make random truly random @@ -802,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); } @@ -813,6 +774,32 @@ 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(); programName = strrchr(argv[0], '/'); if (programName == NULL) @@ -826,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 @@ -997,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 @@ -1031,6 +1020,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.) */ @@ -1061,13 +1053,22 @@ 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 - hc; // subtract current clock height, so it can be added back dynamically } - marginW = w - boardWidth; // [HGM] needed to set new shellWidget size when we resize board - marginH = h - boardHeight; CreateAnyPieces(); CreateGrid(); @@ -1323,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); @@ -1441,12 +1442,13 @@ static WindowPlacement wpNew; void CoDrag (GtkWidget *sh, WindowPlacement *wp) { - int j=0, 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; @@ -1457,6 +1459,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); @@ -1466,6 +1469,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; @@ -1476,17 +1480,35 @@ 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; + 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 - 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 - 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 - hc) / 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. @@ -1507,16 +1529,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); @@ -1527,23 +1550,22 @@ 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; 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; } @@ -1586,7 +1608,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 ); } @@ -1639,7 +1661,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) { @@ -1648,7 +1670,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 @@ -1670,9 +1692,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; } @@ -1688,14 +1710,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) { @@ -1705,7 +1727,7 @@ PasteGameProc () fwrite(text, 1, len, f); fclose(f); - // load from file + // load from file LoadGameFromFile(gamePasteFilename, 0, gamePasteFilename, TRUE); return; } @@ -1724,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); } @@ -1760,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 } @@ -1807,12 +1818,6 @@ SetWindowTitle (char *text, char *title, char *icon) } -static int -NullXErrorCheck (Display *dpy, XErrorEvent *error_event) -{ - return 0; -} - void DisplayIcsInteractionTitle (String message) { @@ -1849,6 +1854,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]; @@ -1866,6 +1872,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)); @@ -2083,7 +2092,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; @@ -2102,7 +2111,7 @@ void FileNamePopUpGTK(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(); @@ -2183,4 +2192,3 @@ void FileNamePopUpGTK(label, def, filter, proc, pathFlag, openMode, name, fp) return; } -