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;
}
if(colorVariable[n]) *(char**)colorVariable[n] = strdup(name);
}
+char *
+Col2Text (int n)
+{
+ return *(char**)colorVariable[n];
+}
+
void
ParseTextAttribs (ColorClass cc, char *s)
{
}
void
+GetPlacement (DialogClass dlg, WindowPlacement *wp)
+{ // wrapper to shield back-end from widget type
+ if(shellUp[dlg]) GetActualPlacement(shells[dlg], wp);
+}
+
+void
GetWindowCoords ()
{ // wrapper to shield use of window handles from back-end (make addressible by number?)
// In XBoard this will have to wait until awareness of window parameters is implemented
if(shellUp[GameListDlg]) GetActualPlacement(shells[GameListDlg], &wpGameList);
if(shellUp[CommentDlg]) GetActualPlacement(shells[CommentDlg], &wpComment);
if(shellUp[TagsDlg]) GetActualPlacement(shells[TagsDlg], &wpTags);
+ GetPlacement(ChatDlg, &wpConsole); if(appData.icsActive) wpConsole.visible = shellUp[ChatDlg];
}
void
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;
programName, appData.boardSize);
exit(2);
}
+ if(BOARD_WIDTH > 8)
+ squareSize = (squareSize*8 + BOARD_WIDTH/2)/BOARD_WIDTH; // scale height
if (i < 7) {
/* Find some defaults; use the nearest known size */
SizeDefaults *szd, *nearest;
} else {
SizeDefaults *szd = sizeDefaults;
if (*appData.boardSize == NULLCHAR) {
- GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow));
+ GdkScreen *screen = gtk_window_get_screen(GTK_WINDOW(mainwindow)); // TODO: this does not work, as no mainwindow yet
guint screenwidth = gdk_screen_get_width(screen);
guint screenheight = gdk_screen_get_height(screen);
- while (screenwidth < szd->minScreenSize ||
- screenheight < szd->minScreenSize) {
+ while (screenwidth < (szd->minScreenSize*BOARD_WIDTH + 4)/8 ||
+ screenheight < (szd->minScreenSize*BOARD_HEIGHT + 4)/8) {
szd++;
}
if (szd->name == NULL) szd--;
/*
* 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.
EngineOutputPopUp();
}
+ if( wpConsole.visible && appData.icsActive ) {
+ ChatProc();
+ BoardToTop();
+ }
+
InitBackEnd2();
if (errorExitStatus == -1) {
#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
{
MenuItem *item = MenuNameToItem(menuRef);
- if(item) gtk_widget_set_sensitive(item->handle, state);
+ if(item && item->handle) gtk_widget_set_sensitive(item->handle, state);
}
void
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;
- }
+ wp->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(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
if(shellUp[EvalGraphDlg]) CoDrag(shells[EvalGraphDlg], &wpEvalGraph);
if(shellUp[GameListDlg]) CoDrag(shells[GameListDlg], &wpGameList);
+ if(shellUp[ChatDlg]) CoDrag(shells[ChatDlg], &wpConsole);
}
wpMain = wpNew;
DrawPosition(True, NULL);
buf[0]=eventkey->keyval;
buf[1]='\0';
if (eventkey->keyval > 32 && eventkey->keyval < 256)
- BoxAutoPopUp (buf);
+ ConsoleAutoPopUp (buf);
}
#ifdef TODO_GTK
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);
count = read(is->fd, is->unused,
INPUT_SOURCE_BUF_SIZE - (is->unused - is->buf));
if (count <= 0) {
+ if(count == 0 && is->kind == CPReal && shells[ChatDlg]) { // [HGM] absence of terminal is no error if ICS Console present
+ RemoveInputSource(is); // cease reading stdin
+ stdoutClosed = TRUE; // suppress future output
+ return True;
+ }
(is->func)(is, is->closure, is->buf, count, count ? errno : 0);
return True;
}
projects / xboard.git / blobdiff