typedef unsigned int BoardSize;
BoardSize boardSize;
Boolean chessProgram;
-static int initialSquareSize;
+int initialSquareSize;
int minX, minY; // [HGM] placement: volatile limits on upper-left corner
int smallLayout = 0, tinyLayout = 0,
// [HGM] font: keep a font for each square size, even non-stndard ones
#define NUM_SIZES 18
-#define MAX_SIZE 130
Boolean fontIsSet[NUM_FONTS], fontValid[NUM_FONTS][MAX_SIZE];
char *fontTable[NUM_FONTS][MAX_SIZE];
}
void
+ChangeFont (int force, char **font, int fnr, int size, char *def, int pix)
+{
+ if(!fontValid[fnr][size]) {
+ if(fontIsSet[fnr] && !force) return; // unless forced we do not replace an explicitly specified font by a default
+ ASSIGN(fontTable[fnr][size], def); // use default
+ fontIsSet[fnr] = False;
+ } else fontIsSet[fnr] = True;
+ FREE(*font); *font = InsertPxlSize(fontTable[fnr][size], pix);
+}
+
+void
CreateFonts ()
{ // no-op, until we identify the code for this already in XBoard and move it here
}
default:
return;
}
+ if(fontIsSet[n]) // only save fonts that were not defaults
for(i=0; i<NUM_SIZES; i++) // [HGM] font: current font becomes standard for current size
if(sizeDefaults[i].squareSize == initialSquareSize) { // only for standard sizes!
- fontTable[n][initialSquareSize] = strdup(name);
+ ASSIGN(fontTable[n][initialSquareSize], name);
fontValid[n][initialSquareSize] = True;
break;
}
gtk_widget_set_size_request(optList[W_BOARD].handle, w, h); // protect board widget
// w += marginW + 1; // [HGM] not sure why the +1 is (sometimes) needed...
// h += marginH + a.height + 1;
- gtk_window_resize(GTK_WINDOW(shellWidget), w, h);
+ gtk_window_resize(GTK_WINDOW(shellWidget), w, 10);
DoEvents();
- gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board again
+ if(!appData.fixedSize) gtk_widget_set_size_request(optList[W_BOARD].handle, 100, 100); // liberate board again
}
int
{ // determine what fonts to use, and create them
if(!fontIsSet[CLOCK_FONT] && fontValid[CLOCK_FONT][squareSize])
- appData.clockFont = fontTable[CLOCK_FONT][squareSize];
+ appData.clockFont = fontTable[CLOCK_FONT][squareSize], fontIsSet[CLOCK_FONT] = True;
if(!fontIsSet[MESSAGE_FONT] && fontValid[MESSAGE_FONT][squareSize])
- appData.font = fontTable[MESSAGE_FONT][squareSize];
+ appData.font = fontTable[MESSAGE_FONT][squareSize], fontIsSet[MESSAGE_FONT] = True;
if(!fontIsSet[COORD_FONT] && fontValid[COORD_FONT][squareSize])
- appData.coordFont = fontTable[COORD_FONT][squareSize];
+ appData.coordFont = fontTable[COORD_FONT][squareSize], fontIsSet[COORD_FONT] = True;
if(!fontIsSet[CONSOLE_FONT] && fontValid[CONSOLE_FONT][squareSize])
- appData.icsFont = fontTable[CONSOLE_FONT][squareSize];
+ appData.icsFont = fontTable[CONSOLE_FONT][squareSize], fontIsSet[CONSOLE_FONT] = True;
if(!fontIsSet[EDITTAGS_FONT] && fontValid[EDITTAGS_FONT][squareSize])
- appData.tagsFont = fontTable[EDITTAGS_FONT][squareSize];
+ appData.tagsFont = fontTable[EDITTAGS_FONT][squareSize], fontIsSet[EDITTAGS_FONT] = True;
if(!fontIsSet[COMMENT_FONT] && fontValid[COMMENT_FONT][squareSize])
- appData.commentFont = fontTable[COMMENT_FONT][squareSize];
+ appData.commentFont = fontTable[COMMENT_FONT][squareSize], fontIsSet[COMMENT_FONT] = True;
if(!fontIsSet[MOVEHISTORY_FONT] && fontValid[MOVEHISTORY_FONT][squareSize])
- appData.historyFont = fontTable[MOVEHISTORY_FONT][squareSize];
+ appData.historyFont = fontTable[MOVEHISTORY_FONT][squareSize], fontIsSet[MOVEHISTORY_FONT] = True;
if(!fontIsSet[GAMELIST_FONT] && fontValid[GAMELIST_FONT][squareSize])
- appData.gameListFont = fontTable[GAMELIST_FONT][squareSize];
+ appData.gameListFont = fontTable[GAMELIST_FONT][squareSize], fontIsSet[GAMELIST_FONT] = True;
appData.font = InsertPxlSize(appData.font, coordFontPxlSize);
appData.clockFont = InsertPxlSize(appData.clockFont, clockFontPxlSize);
}
if ((chessDir = (char *) getenv("CHESSDIR")) == NULL) {
- chessDir = ".";
+ static char dirName[MSG_SIZ];
+ getcwd(dirName, MSG_SIZ);
+ chessDir = dirName;
} else {
if (chdir(chessDir) != 0) {
fprintf(stderr, _("%s: can't cd to CHESSDIR: "), programName);
menuBarWidget = optList[W_MENU].handle;
dropMenu = optList[W_DROP].handle;
titleWidget = optList[optList[W_TITLE].type != Skip ? W_TITLE : W_SMALL].handle;
+ DelayedDrag(); // fake configure event (i3wm tiling window manager fails to send one after initial resize)
#ifdef TODO_GTK
formWidget = XtParent(boardWidget);
XtSetArg(args[0], XtNbackground, &timerBackgroundPixel);
ReSize (WindowPlacement *wp)
{
GtkAllocation a;
- int sqx, sqy, w, h, lg = lineGap;
- static int first = 1;
- if(wp->width == wpMain.width && wp->height == wpMain.height && !first) return; // not sized
+ int sqx, sqy, i, w, h, lg = lineGap;
+ if(wp->width == wpMain.width && wp->height == wpMain.height) return; // not sized
gtk_widget_get_allocation(optList[W_DROP+1].handle, &a); // table that should contain everything
w = a.width; h = a.height;
gtk_widget_get_allocation(shellWidget, &a);
lg = sqx < 37 ? 1 : sqx < 59 ? 2 : sqx < 116 ? 3 : 4;
if(sqx == oldSqx + 1 && lg == lineGap + 1) sqx = oldSqx, squareSize = 0; // prevent oscillations, force resize by kludge
}
- if(sqx != squareSize && !first) {
+ for(h=0; sizeDefaults[h+1].name && sizeDefaults[h].squareSize*8 > sqx*BOARD_WIDTH; h++) {}
+ if(initialSquareSize != sizeDefaults[h].squareSize && !appData.fixedSize) { // boardSize changed
+ initialSquareSize = sizeDefaults[h].squareSize; // used for saving font
+ ChangeFont(1, &appData.clockFont, CLOCK_FONT, initialSquareSize, CLOCK_FONT_NAME, 2*(sizeDefaults[h].clockFontPxlSize+1)/3);
+ ChangeFont(1, &appData.font, MESSAGE_FONT, initialSquareSize, DEFAULT_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ ChangeFont(0, &appData.icsFont, CONSOLE_FONT, initialSquareSize, CONSOLE_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ ChangeFont(0, &appData.tagsFont, EDITTAGS_FONT, initialSquareSize, TAGS_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ ChangeFont(0, &appData.commentFont, COMMENT_FONT, initialSquareSize, COMMENT_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ ChangeFont(0, &appData.gameListFont, GAMELIST_FONT, initialSquareSize, GAMELIST_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ ChangeFont(0, &appData.historyFont, MOVEHISTORY_FONT, initialSquareSize, HISTORY_FONT_NAME, sizeDefaults[h].coordFontPxlSize);
+ DisplayBothClocks();
+ ApplyFont(&mainOptions[W_MESSG], NULL);
+ for(i=1; i<6; i++) ApplyFont(&mainOptions[W_BUTTON+i], NULL);
+ ApplyFont(&tagsOptions[1], NULL);
+ ApplyFont(&commentOptions[0], NULL);
+ ApplyFont(&historyOptions[0], NULL);
+ ApplyFont(&engoutOptions[5], NULL);
+ ApplyFont(&engoutOptions[12], NULL);
+ ApplyFont(&chatOptions[11], appData.icsFont);
+ AppendColorized(&chatOptions[6], NULL, 0); // kludge to replace font tag
+ }
+ if(!strchr(appData.boardSize, ',')) {
+ ASSIGN(appData.boardSize, sizeDefaults[h].name);
+ }
+#ifndef OSXAPP
+ if(sizeDefaults[h].tinyLayout != tinyLayout) { // alter clipping of menu names to conform to board width
+ int clip = (tinyLayout = sizeDefaults[h].tinyLayout) + 1;
+ char text[MSG_SIZ];
+ for(h=1; mainOptions[h].type == DropDown; h++) {
+ strncpy(text, _(mainOptions[h].name), MSG_SIZ);
+ if(clip != 1) text[clip + (text[clip-1] == '_')] = NULLCHAR;
+ gtk_menu_item_set_label((GtkMenuItem *) mainOptions[h].handle, text);
+ }
+ }
+#endif
+ if(sqx != squareSize && !appData.fixedSize) {
squareSize = sqx; // adopt new square size
- CreatePNGPieces(); // make newly scaled pieces
+ CreatePNGPieces(appData.pieceDirectory); // make newly scaled pieces
InitDrawingSizes(0, 0); // creates grid etc.
} else ResizeBoardWindow(BOARD_WIDTH * (squareSize + lineGap) + lineGap, BOARD_HEIGHT * (squareSize + lineGap) + lineGap, 0);
w = BOARD_WIDTH * (squareSize + lineGap) + lineGap;
h = BOARD_HEIGHT * (squareSize + lineGap) + lineGap;
if(optList[W_BOARD].max > w) optList[W_BOARD].max = w;
if(optList[W_BOARD].value > h) optList[W_BOARD].value = h;
- first = appData.fixedSize;
if(twoBoards && shellUp[DummyDlg]) {
SlavePopUp(); dualOptions[3].max = 0; DoEvents(); // calls SlaveResize, kludge to force assigning new canvas
partnerUp = !partnerUp; flipView = !flipView;
void
DragProc ()
{
- static int busy;
- if(busy) return;
+ static int busy;
+ if(busy++) return; // prevent recursive calling, but remember we missed an event in 'busy'
+
+ if(delayedDragTag) g_source_remove(delayedDragTag); // no more timer interrupts from same event!
+ delayedDragTag = 0;
- busy = 1;
+ do {
GetActualPlacement(shellWidget, &wpNew);
if(wpNew.x == wpMain.x && wpNew.y == wpMain.y && // not moved
wpNew.width == wpMain.width && wpNew.height == wpMain.height) { // not sized
- busy = 0; return; // false alarm
+ busy = 0; break; // false alarm
}
- ReSize(&wpNew);
+ ReSize(&wpNew); // this can be interrupted by other events
if(appData.useStickyWindows) {
if(shellUp[EngOutDlg]) CoDrag(shells[EngOutDlg], &wpEngineOutput);
if(shellUp[HistoryDlg]) CoDrag(shells[HistoryDlg], &wpMoveHistory);
}
wpMain = wpNew;
DrawPosition(True, NULL);
- if(delayedDragTag) g_source_remove(delayedDragTag);
- delayedDragTag = 0; // now drag executed, make sure next DelayedDrag will not cancel timer event (which could now be used by other)
- busy = 0;
+ if(busy > 2) busy = 2; // if multiple events were backlogged, only do one more
+ } while(--busy);
}
void
wpNew.y = event->configure.y;
wpNew.width = event->configure.width;
wpNew.height = event->configure.height;
+// SetWidgetLabel(&mainOptions[W_WHITE], ""); SetWidgetLabel(&mainOptions[W_BLACK], "");
DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other
return FALSE;
}
#endif
}
+void
+LockBoardSize (int after)
+{
+ static char *oldClockFont, *oldMessgFont;
+ int w, h;
+ if(oldMessgFont && !strcmp(oldMessgFont, appData.font) &&
+ oldClockFont && !strcmp(oldClockFont, appData.clockFont) && after < 2) return; // only do something when font changed
+ w = BOARD_WIDTH*(squareSize + lineGap) + lineGap;
+ h = BOARD_HEIGHT*(squareSize + lineGap) + lineGap;
+ if(after & 1) {
+ ASSIGN(oldClockFont, appData.clockFont);
+ ASSIGN(oldMessgFont, appData.font);
+ gtk_window_resize(GTK_WINDOW(shellWidget), w, h);
+ DoEvents();
+ gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board
+ } else { // before
+ gtk_widget_set_size_request(optList[W_BOARD].handle, w, h); // protect board widget
+ }
+}
void
DisplayTimerLabel (Option *opt, char *color, long timer, int highlight)
{
+ static int twoLines = -1;
GtkWidget *w = (GtkWidget *) opt->handle;
GdkColor col;
- char *markup;
+ char *markup, two = (appData.logoSize != 0);
char bgcolor[10];
char fgcolor[10];
strcpy(fgcolor, appData.lowTimeWarningColor);
}
+ if(! partnerUp && two != twoLines) LockBoardSize(2); // lock board size if clock height changes
+
gdk_color_parse( bgcolor, &col );
gtk_widget_modify_bg(gtk_widget_get_parent(opt->handle), GTK_STATE_NORMAL, &col);
if (appData.clockMode) {
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));
+ bgcolor, fgcolor, color, two ? "\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 {
}
gtk_label_set_markup(GTK_LABEL(w), markup);
g_free(markup);
+
+ if(!partnerUp && two != twoLines) LockBoardSize(3), twoLines = two;
}
static GdkPixbuf **clockIcons[] = { &WhiteIcon, &BlackIcon };
return;
}
-void FileNamePopUpWrapper(label, def, filter, proc, pathFlag, openMode, name, fp)
- char *label;
- char *def;
- char *filter;
- FileProc proc;
- char *openMode;
- Boolean pathFlag;
- char **name;
- FILE **fp;
+void FileNamePopUpWrapper(
+ char *label,
+ char *def,
+ char *filter,
+ FileProc proc,
+ Boolean pathFlag,
+ char *openMode,
+ char **name,
+ FILE **fp)
{
GtkWidget *dialog;
GtkFileFilter *gtkfilter;