// 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] = strdup(strchr(name, ':')+1);
+ fontTable[number][size] = name = strdup(strchr(name, ':')+1);
fontValid[number][size] = True;
- }
- return;
+ } else return;
}
switch(number) {
case 0: // CLOCK_FONT
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;
}
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
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;
}
appData.font = fontTable[MESSAGE_FONT][squareSize];
if(!fontIsSet[COORD_FONT] && fontValid[COORD_FONT][squareSize])
appData.coordFont = fontTable[COORD_FONT][squareSize];
+ if(!fontIsSet[CONSOLE_FONT] && fontValid[CONSOLE_FONT][squareSize])
+ appData.icsFont = fontTable[CONSOLE_FONT][squareSize];
+ if(!fontIsSet[COMMENT_FONT] && fontValid[COMMENT_FONT][squareSize])
+ appData.commentFont = fontTable[COMMENT_FONT][squareSize];
appData.font = InsertPxlSize(appData.font, fontPxlSize);
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);
#ifdef TODO_GTK
XrmValue vTo;
char *path = gtkosx_application_get_bundle_path();
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).
return 0;
}
+void
+DoEvents ()
+{
+ while(gtk_events_pending()) gtk_main_iteration();
+}
+
RETSIGTYPE
TermSizeSigHandler (int sig)
{