X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=a7cbd455b2c42d9c9cdd92e49db1b7385814d525;hb=a799eb8719fdd78da3359ab5810adac322ea4365;hp=1b3d58f138d74c1804ff9e9224d3fc4de7af7a7a;hpb=784a0a8b299157e7bdb55c87ca05ba7c86b6fc95;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index 1b3d58f..a7cbd45 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -401,6 +401,21 @@ ParseFont (char *name, int number) case 2: // COORD_FONT appData.coordFont = strdup(name); break; + case CONSOLE_FONT: + appData.icsFont = strdup(name); + break; + case EDITTAGS_FONT: + appData.tagsFont = strdup(name); + break; + case COMMENT_FONT: + appData.commentFont = strdup(name); + break; + case MOVEHISTORY_FONT: + appData.historyFont = strdup(name); + break; + case GAMELIST_FONT: + appData.gameListFont = strdup(name); + break; default: return; } @@ -410,9 +425,14 @@ ParseFont (char *name, int number) void SetFontDefaults () { // only 2 fonts currently - appData.clockFont = CLOCK_FONT_NAME; - appData.coordFont = COORD_FONT_NAME; - appData.font = DEFAULT_FONT_NAME; + appData.clockFont = strdup(CLOCK_FONT_NAME); + appData.coordFont = strdup(COORD_FONT_NAME); + appData.font = strdup(DEFAULT_FONT_NAME); + appData.icsFont = strdup(CONSOLE_FONT_NAME); + appData.tagsFont = strdup(TAGS_FONT_NAME); + appData.commentFont = strdup(COMMENT_FONT_NAME); + appData.historyFont = strdup(HISTORY_FONT_NAME); + appData.gameListFont = strdup(GAMELIST_FONT_NAME); } void @@ -470,6 +490,21 @@ SaveFontArg (FILE *f, ArgDescriptor *ad) case 2: // COORD_FONT name = appData.coordFont; break; + case CONSOLE_FONT: + name = appData.icsFont; + break; + case EDITTAGS_FONT: + name = appData.tagsFont; + break; + case COMMENT_FONT: + name = appData.commentFont; + break; + case MOVEHISTORY_FONT: + name = appData.historyFont; + break; + case GAMELIST_FONT: + name = appData.gameListFont; + break; default: return; } @@ -623,10 +658,25 @@ InitializeFonts (int clockFontPxlSize, int coordFontPxlSize, int fontPxlSize) appData.font = fontTable[MESSAGE_FONT][squareSize]; if(!fontIsSet[COORD_FONT] && fontValid[COORD_FONT][squareSize]) appData.coordFont = fontTable[COORD_FONT][squareSize]; - - appData.font = InsertPxlSize(appData.font, fontPxlSize); + if(!fontIsSet[CONSOLE_FONT] && fontValid[CONSOLE_FONT][squareSize]) + appData.icsFont = fontTable[CONSOLE_FONT][squareSize]; + if(!fontIsSet[EDITTAGS_FONT] && fontValid[EDITTAGS_FONT][squareSize]) + appData.tagsFont = fontTable[EDITTAGS_FONT][squareSize]; + if(!fontIsSet[COMMENT_FONT] && fontValid[COMMENT_FONT][squareSize]) + appData.commentFont = fontTable[COMMENT_FONT][squareSize]; + if(!fontIsSet[MOVEHISTORY_FONT] && fontValid[MOVEHISTORY_FONT][squareSize]) + appData.historyFont = fontTable[MOVEHISTORY_FONT][squareSize]; + if(!fontIsSet[GAMELIST_FONT] && fontValid[GAMELIST_FONT][squareSize]) + appData.gameListFont = fontTable[GAMELIST_FONT][squareSize]; + + appData.font = InsertPxlSize(appData.font, coordFontPxlSize); appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize); appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize); + appData.icsFont = InsertPxlSize(appData.icsFont, coordFontPxlSize); + appData.tagsFont = InsertPxlSize(appData.tagsFont, coordFontPxlSize); + appData.commentFont = InsertPxlSize(appData.commentFont, coordFontPxlSize); + appData.historyFont = InsertPxlSize(appData.historyFont, coordFontPxlSize); + appData.gameListFont = InsertPxlSize(appData.gameListFont, coordFontPxlSize); #ifdef TODO_GTK XrmValue vTo; @@ -772,6 +822,8 @@ StartNewXBoard(GtkosxApplication *app, gchar *path, gpointer user_data) } return TRUE; } + +GtkosxApplication *theApp; #endif int @@ -802,16 +854,16 @@ main (int argc, char **argv) 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); char *path = gtkosx_application_get_bundle_path(); + theApp = g_object_new(GTKOSX_TYPE_APPLICATION, NULL); 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); - 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). @@ -1075,8 +1127,7 @@ main (int argc, char **argv) */ 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); + SetClockIcon(0); // sets white icon /* @@ -1152,6 +1203,9 @@ main (int argc, char **argv) BoardToTop(); } + gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() + InitPosition(TRUE); + InitBackEnd2(); if (errorExitStatus == -1) { @@ -1172,8 +1226,6 @@ main (int argc, char **argv) } } - gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() - InitPosition(TRUE); UpdateLogos(TRUE); // XtSetKeyboardFocus(shellWidget, formWidget); #ifdef TODO_GTK @@ -1190,6 +1242,12 @@ gtk_main_iteration(); return 0; } +void +DoEvents () +{ + while(gtk_events_pending()) gtk_main_iteration(); +} + RETSIGTYPE TermSizeSigHandler (int sig) { @@ -1554,11 +1612,13 @@ ReSize (WindowPlacement *wp) 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! - wp->height = BOARD_HEIGHT * (squareSize + lineGap) + lineGap + marginH + hc; + if(clockKludge && hc != clockKludge) wp->height += hc - clockKludge, clockKludge = 0; + wpMain.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 - hc) / BOARD_HEIGHT - lg; if(sqy < sqx) sqx = sqy; + if(sqx < 20) return; 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; @@ -1566,7 +1626,6 @@ ReSize (WindowPlacement *wp) 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.