X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxboard.c;h=a7cbd455b2c42d9c9cdd92e49db1b7385814d525;hb=a799eb8719fdd78da3359ab5810adac322ea4365;hp=ecf36dd044159235ee7dee6701eb6ec912f9fabe;hpb=c24634958b7f2bbfdbe2b1bbc88703fead251204;p=xboard.git diff --git a/gtk/xboard.c b/gtk/xboard.c index ecf36dd..a7cbd45 100644 --- a/gtk/xboard.c +++ b/gtk/xboard.c @@ -204,8 +204,8 @@ int main P((int argc, char **argv)); 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)); @@ -384,7 +384,8 @@ ParseFont (char *name, int number) 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= 0 && size 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). @@ -848,6 +926,8 @@ main (int argc, char **argv) { // [HGM] initstring: kludge to fix bad bug. expand '\n' characters in init string and computer string. static char buf[MSG_SIZ]; + snprintf(buf, MSG_SIZ, appData.sysOpen, DATADIR); + ASSIGN(appData.sysOpen, buf); // expand %s in -openCommand to DATADIR (usefull for OS X configuring) EscapeExpand(buf, appData.firstInitString); appData.firstInitString = strdup(buf); EscapeExpand(buf, appData.secondInitString); @@ -909,6 +989,8 @@ main (int argc, char **argv) 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; @@ -932,11 +1014,11 @@ main (int argc, char **argv) } 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--; @@ -965,14 +1047,12 @@ main (int argc, char **argv) /* [HR] height treated separately (hacked) */ boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); - boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); +// boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); /* * 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. @@ -1047,8 +1127,7 @@ main (int argc, char **argv) */ 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 /* @@ -1119,6 +1198,14 @@ main (int argc, char **argv) EngineOutputPopUp(); } + if( wpConsole.visible && appData.icsActive ) { + ChatProc(); + BoardToTop(); + } + + gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() + InitPosition(TRUE); + InitBackEnd2(); if (errorExitStatus == -1) { @@ -1139,8 +1226,6 @@ main (int argc, char **argv) } } - gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() - InitPosition(TRUE); UpdateLogos(TRUE); // XtSetKeyboardFocus(shellWidget, formWidget); #ifdef TODO_GTK @@ -1157,6 +1242,12 @@ gtk_main_iteration(); return 0; } +void +DoEvents () +{ + while(gtk_events_pending()) gtk_main_iteration(); +} + RETSIGTYPE TermSizeSigHandler (int sig) { @@ -1194,7 +1285,16 @@ CmailSigHandlerCallBack (InputSourceRef isr, VOIDSTAR closure, char *message, in #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) { @@ -1245,6 +1345,7 @@ InsertPxlSize (char *pattern, int targetPxlSize) return base_fnt_lst; } +#endif #ifdef TODO_GTK XFontSet @@ -1292,13 +1393,13 @@ CreateFontSet (char *base_fnt_lst) * 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"), @@ -1347,17 +1448,17 @@ FindFont (char *pattern, int targetPxlSize) pattern, targetPxlSize, p); } XFreeFontNames(fonts); -#endif return p; } #endif +#endif void EnableNamedMenuItem (char *menuRef, int state) { 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 @@ -1511,15 +1612,13 @@ ReSize (WindowPlacement *wp) 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; @@ -1527,7 +1626,6 @@ ReSize (WindowPlacement *wp) 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. @@ -1558,6 +1656,7 @@ DragProc () 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); @@ -1773,7 +1872,7 @@ void MoveTypeInProc(eventkey) buf[0]=eventkey->keyval; buf[1]='\0'; if (eventkey->keyval > 32 && eventkey->keyval < 256) - BoxAutoPopUp (buf); + ConsoleAutoPopUp (buf); } #ifdef TODO_GTK @@ -1897,11 +1996,15 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) gtk_widget_modify_bg(gtk_widget_get_parent(opt->handle), GTK_STATE_NORMAL, &col); if (appData.clockMode) { - markup = g_markup_printf_escaped("%s:%s%s", + markup = g_markup_printf_escaped("%s:%s%s", appData.clockFont, bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); +// markup = g_markup_printf_escaped("%s:%s%s", +// bgcolor, fgcolor, color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); } else { - markup = g_markup_printf_escaped("%s ", + markup = g_markup_printf_escaped("%s ", appData.clockFont, bgcolor, fgcolor, color); +// markup = g_markup_printf_escaped("%s ", +// bgcolor, fgcolor, color); } gtk_label_set_markup(GTK_LABEL(w), markup); g_free(markup); @@ -1955,6 +2058,11 @@ DoInputCallback(io, cond, data) 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; }