RETSIGTYPE CmailSigHandler P((int sig));
RETSIGTYPE IntSigHandler P((int sig));
RETSIGTYPE TermSizeSigHandler P((int sig));
-#if ENABLE_NLS
char *InsertPxlSize P((char *pattern, int targetPxlSize));
+#if ENABLE_NLS
XFontSet CreateFontSet P((char *base_fnt_lst));
#else
char *FindFont P((char *pattern, int targetPxlSize));
if(sscanf(name, "size%d:", &size)) {
// [HGM] font: font is meant for specific boardSize (likely from settings file);
// defer processing it until we know if it matches our board size
- if(size >= 0 && size<MAX_SIZE) { // for now, fixed limit
+ if(!strstr(name, "-*-") && // ignore X-fonts
+ size >= 0 && size<MAX_SIZE) { // for now, fixed limit
fontTable[number][size] = strdup(strchr(name, ':')+1);
fontValid[number][size] = True;
}
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;
}
ResizeBoardWindow (int w, int h, int inhibit)
{
GtkAllocation a;
- if(clockKludge) return; // ignore as long as clock does not have final height
+// 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 + a.height + 1;
void
InitializeFonts (int clockFontPxlSize, int coordFontPxlSize, int fontPxlSize)
{ // determine what fonts to use, and create them
+
+ if(!fontIsSet[CLOCK_FONT] && fontValid[CLOCK_FONT][squareSize])
+ appData.clockFont = fontTable[CLOCK_FONT][squareSize];
+ if(!fontIsSet[MESSAGE_FONT] && fontValid[MESSAGE_FONT][squareSize])
+ 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[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;
XrmDatabase xdb;
}
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).
/*
* Determine what fonts to use.
*/
-#ifdef TODO_GTK
- InitializeFonts(clockFontPxlSize, coordFontPxlSize, fontPxlSize);
-#endif
+ InitializeFonts((2*clockFontPxlSize+1)/3, coordFontPxlSize, fontPxlSize);
/*
* Detect if there are not enough colors available and adapt.
*/
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
/*
BoardToTop();
}
+ gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes()
+ InitPosition(TRUE);
+
InitBackEnd2();
if (errorExitStatus == -1) {
}
}
- gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes()
- InitPosition(TRUE);
UpdateLogos(TRUE);
// XtSetKeyboardFocus(shellWidget, formWidget);
#ifdef TODO_GTK
return 0;
}
+void
+DoEvents ()
+{
+ while(gtk_events_pending()) gtk_main_iteration();
+}
+
RETSIGTYPE
TermSizeSigHandler (int sig)
{
#define Abs(n) ((n)<0 ? -(n) : (n))
+char *
+InsertPxlSize (char *pattern, int targetPxlSize)
+{
+ char buf[MSG_SIZ];
+ snprintf(buf, MSG_SIZ, pattern, targetPxlSize); // pattern is something like "Sans Bold %d"
+ return strdup(buf);
+}
+
#ifdef ENABLE_NLS
+#ifdef TODO_GTK
char *
InsertPxlSize (char *pattern, int targetPxlSize)
{
return base_fnt_lst;
}
+#endif
#ifdef TODO_GTK
XFontSet
* The return value should be freed with XtFree when no
* longer needed.
*/
+#ifdef TODO_GTK
char *
FindFont (char *pattern, int targetPxlSize)
{
char **fonts, *p, *best, *scalable, *scalableTail;
int i, j, nfonts, minerr, err, pxlSize;
-#ifdef TODO_GTK
fonts = XListFonts(xDisplay, pattern, 999999, &nfonts);
if (nfonts < 1) {
fprintf(stderr, _("%s: no fonts match pattern %s\n"),
pattern, targetPxlSize, p);
}
XFreeFontNames(fonts);
-#endif
return p;
}
#endif
+#endif
void
EnableNamedMenuItem (char *menuRef, int state)
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(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;
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.
gtk_widget_modify_bg(gtk_widget_get_parent(opt->handle), GTK_STATE_NORMAL, &col);
if (appData.clockMode) {
- markup = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"heavy\" background=\"%s\" foreground=\"%s\">%s:%s%s</span>",
+ markup = g_markup_printf_escaped("<span font=\"%s\" background=\"%s\" foreground=\"%s\">%s:%s%s</span>", appData.clockFont,
bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer));
+// markup = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"heavy\" background=\"%s\" foreground=\"%s\">%s:%s%s</span>",
+// bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer));
} else {
- markup = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"heavy\" background=\"%s\" foreground=\"%s\">%s </span>",
+ markup = g_markup_printf_escaped("<span font=\"%s\" background=\"%s\" foreground=\"%s\">%s </span>", appData.clockFont,
bgcolor, fgcolor, color);
+// markup = g_markup_printf_escaped("<span size=\"xx-large\" weight=\"heavy\" background=\"%s\" foreground=\"%s\">%s </span>",
+// bgcolor, fgcolor, color);
}
gtk_label_set_markup(GTK_LABEL(w), markup);
g_free(markup);
projects / xboard.git / blobdiff