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;
}
// h += marginH + a.height + 1;
gtk_window_resize(GTK_WINDOW(shellWidget), w, 10);
DoEvents();
- gtk_widget_set_size_request(optList[W_BOARD].handle, -1, -1); // liberate board again
+ 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);
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
}
- for(h=0; sizeDefaults[h].name && sizeDefaults[h].squareSize*8 > sqx*BOARD_WIDTH; h++) {}
+ for(h=0; sizeDefaults[h+1].name && sizeDefaults[h].squareSize*8 > sqx*BOARD_WIDTH; h++) {}
if(initialSquareSize != sizeDefaults[h].squareSize) { // boardSize changed
initialSquareSize = sizeDefaults[h].squareSize; // used for saving font
- if(!fontValid[CLOCK_FONT][initialSquareSize]) { ASSIGN(fontTable[CLOCK_FONT][initialSquareSize], CLOCK_FONT_NAME); }
- appData.clockFont = InsertPxlSize(fontTable[CLOCK_FONT][initialSquareSize], 2*(sizeDefaults[h].clockFontPxlSize+1)/3);
- if(!fontValid[MESSAGE_FONT][initialSquareSize]) { ASSIGN(fontTable[MESSAGE_FONT][initialSquareSize], DEFAULT_FONT_NAME); }
- appData.font = InsertPxlSize(fontTable[MESSAGE_FONT][initialSquareSize], sizeDefaults[h].coordFontPxlSize);
+ 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);
void
DragProc ()
{
- static int busy;
- if(busy) { // prevent recursive calling, but postpone interrupting call rather than lose it
- if(!delayedDragTag) delayedDragTag = g_timeout_add( 200, (GSourceFunc) DragProc, NULL);
- return;
- }
- busy = 1;
+ 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;
+
+ 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