// defer processing it until we know if it matches our board size
if(!strstr(name, "-*-") && // ignore X-fonts
size >= 0 && size<MAX_SIZE) { // for now, fixed limit
- fontTable[number][size] = name = strdup(strchr(name, ':')+1);
+ fontTable[number][size] = strdup(strchr(name, ':')+1);
fontValid[number][size] = True;
- } else return;
+ }
+ return;
}
switch(number) {
case 0: // CLOCK_FONT
appData.coordFont = fontTable[COORD_FONT][squareSize];
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, fontPxlSize);
+ appData.font = InsertPxlSize(appData.font, coordFontPxlSize);
appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize);
- appData.icsFont = InsertPxlSize(appData.icsFont, fontPxlSize);
- appData.tagsFont = InsertPxlSize(appData.tagsFont, fontPxlSize);
- appData.commentFont = InsertPxlSize(appData.commentFont, fontPxlSize);
- appData.historyFont = InsertPxlSize(appData.historyFont, fontPxlSize);
- appData.gameListFont = InsertPxlSize(appData.gameListFont, fontPxlSize);
+ 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;
}
return TRUE;
}
+
+GtkosxApplication *theApp;
#endif
int
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).
*/
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
/*