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;
}
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];
+
+ appData.font = InsertPxlSize(appData.font, fontPxlSize);
+ appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
+ appData.coordFont = InsertPxlSize(appData.coordFont, coordFontPxlSize);
+
#ifdef TODO_GTK
XrmValue vTo;
XrmDatabase xdb;
/*
* 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.
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
#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