X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=99af0487cb335cda688e893f655b229fe6711d17;hb=c64bb96345d0464fe123b5e1af71eb3f0f1afc3c;hp=5877c3a74a2682bef03f0b71bb66c11dbbfecc50;hpb=ebbd3101235b8a04c34b30eb9a037bb6bae71123;p=xboard.git diff --git a/xboard.c b/xboard.c index 5877c3a..99af048 100644 --- a/xboard.c +++ b/xboard.c @@ -61,6 +61,8 @@ #include #include #include +#include +#include #if !OMIT_SOCKETS # if HAVE_SYS_SOCKET_H @@ -202,6 +204,7 @@ extern char *getenv(); #include "childio.h" #include "xgamelist.h" #include "xhistory.h" +#include "xevalgraph.h" #include "xedittags.h" #include "menus.h" #include "board.h" @@ -256,8 +259,6 @@ void DrawPositionProc P((Widget w, XEvent *event, void CommentClick P((Widget w, XEvent * event, String * params, Cardinal * nParams)); void ICSInputBoxPopUp P((void)); -void FileNamePopUp P((char *label, char *def, char *filter, - FileProc proc, char *openMode)); void SelectCommand P((Widget w, XtPointer client_data, XtPointer call_data)); void KeyBindingProc P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); void QuitWrapper P((Widget w, XEvent *event, String *prms, Cardinal *nprms)); @@ -303,8 +304,6 @@ XFontStruct *coordFontStruct, *countFontStruct; XtAppContext appContext; char *layoutName; -FileProc fileProc; -char *fileOpenMode; char installDir[] = "."; // [HGM] UCI: needed for UCI; probably needs run-time initializtion Position commentX = -1, commentY = -1; @@ -1161,6 +1160,63 @@ InitializeFonts (int clockFontPxlSize, int coordFontPxlSize, int fontPxlSize) #endif } +char * +PrintArg (ArgType t) +{ + char *p=""; + switch(t) { + case ArgZ: + case ArgInt: p = " N"; break; + case ArgString: p = " STR"; break; + case ArgBoolean: p = " TF"; break; + case ArgSettingsFilename: + case ArgFilename: p = " FILE"; break; + case ArgX: p = " Nx"; break; + case ArgY: p = " Ny"; break; + case ArgAttribs: p = " TEXTCOL"; break; + case ArgColor: p = " COL"; break; + case ArgFont: p = " FONT"; break; + case ArgBoardSize: p = " SIZE"; break; + case ArgFloat: p = " FLOAT"; break; + case ArgTrue: + case ArgFalse: + case ArgTwo: + case ArgNone: + case ArgCommSettings: + break; + } + return p; +} + +void +PrintOptions () +{ + char buf[MSG_SIZ]; + int len=0; + ArgDescriptor *q, *p = argDescriptors+5; + printf("\nXBoard accepts the following options:\n" + "(N = integer, TF = true or false, STR = text string, FILE = filename,\n" + " Nx, Ny = relative coordinates, COL = color, FONT = X-font spec,\n" + " SIZE = board-size spec(s)\n" + " Within parentheses are short forms, or options to set to true or false.\n" + " Persistent options (saved in the settings file) are marked with *)\n\n"); + while(p->argName) { + if(p->argType == ArgCommSettings) { p++; continue; } // XBoard has no comm port + snprintf(buf+len, MSG_SIZ, "-%s%s", p->argName, PrintArg(p->argType)); + if(p->save) strcat(buf+len, "*"); + for(q=p+1; q->argLoc == p->argLoc; q++) { + if(q->argName[0] == '-') continue; + strcat(buf+len, q == p+1 ? " (" : " "); + sprintf(buf+strlen(buf), "-%s%s", q->argName, PrintArg(q->argType)); + } + if(q != p+1) strcat(buf+len, ")"); + len = strlen(buf); + if(len > 39) len = 0, printf("%s\n", buf); else while(len < 39) buf[len++] = ' '; + p = q; + } + if(len) buf[len] = NULLCHAR, printf("%s\n", buf); +} + int main (int argc, char **argv) { @@ -1182,6 +1238,11 @@ main (int argc, char **argv) exit(0); } + if(argc > 1 && !strcmp(argv[1], "--help" )) { + PrintOptions(); + exit(0); + } + programName = strrchr(argv[0], '/'); if (programName == NULL) programName = argv[0]; @@ -1396,7 +1457,7 @@ XBoard square size (hint): %d\n\ #if ENABLE_NLS &clockFontSet); #else - &clockFonStruct); + clockFontStruct); #endif boardWidget = optList[W_BOARD].handle; menuBarWidget = optList[W_MENU].handle; @@ -1462,6 +1523,13 @@ XBoard square size (hint): %d\n\ CreateGrid(); CreateAnyPieces(); + if(appData.logoSize) + { // locate and read user logo + char buf[MSG_SIZ]; + snprintf(buf, MSG_SIZ, "%s/%s.png", appData.logoDir, UserName()); + ASSIGN(userLogo, buf); + } + if (appData.animate || appData.animateDragging) CreateAnimVars(); @@ -1509,6 +1577,7 @@ XBoard square size (hint): %d\n\ gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes() InitPosition(TRUE); + UpdateLogos(TRUE); // XtSetKeyboardFocus(shellWidget, formWidget); XSetInputFocus(xDisplay, XtWindow(formWidget), RevertToPointerRoot, CurrentTime); @@ -2281,7 +2350,7 @@ MarkMenuItem (char *menuRef, int state) } void -EnableMenuItem (char *menuRef, int state) +EnableNamedMenuItem (char *menuRef, int state) { MenuItem *item = MenuNameToItem(menuRef); @@ -2299,7 +2368,7 @@ void SetMenuEnables (Enables *enab) { while (enab->name != NULL) { - EnableMenuItem(enab->name, enab->value); + EnableNamedMenuItem(enab->name, enab->value); enab++; } } @@ -2357,15 +2426,21 @@ do_flash_delay (unsigned long msec) TimeDelay(msec); } +static cairo_surface_t *cs; // to keep out of back-end :-( + void DrawBorder (int x, int y, int type) { - GC gc = lineGC; + cairo_t *cr; + DrawSeekOpen(); - if(type == 1) gc = highlineGC; else if(type == 2) gc = prelineGC; + cr = cairo_create(cs); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle(cr, x, y, squareSize+lineGap, squareSize+lineGap); + SetPen(cr, lineGap, type == 1 ? appData.highlightSquareColor : appData.premoveHighlightColor, 0); + cairo_stroke(cr); - XDrawRectangle(xDisplay, xBoardWindow, gc, x, y, - squareSize+lineGap, squareSize+lineGap); + DrawSeekClose(); } static int @@ -2386,6 +2461,27 @@ CutOutSquare (int x, int y, int *x0, int *y0, int kind) return 1; } +void +DrawLogo (void *handle, void *logo) +{ + cairo_surface_t *img, *cs; + cairo_t *cr; + int w, h; + + if(!logo || !handle) return; + cs = cairo_xlib_surface_create(xDisplay, XtWindow(handle), DefaultVisual(xDisplay, 0), appData.logoSize, appData.logoSize/2); + img = cairo_image_surface_create_from_png (logo); + w = cairo_image_surface_get_width (img); + h = cairo_image_surface_get_height (img); + cr = cairo_create(cs); + cairo_scale(cr, (float)appData.logoSize/w, appData.logoSize/(2.*h)); + cairo_set_source_surface (cr, img, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + cairo_surface_destroy (img); + cairo_surface_destroy (cs); +} + static void BlankSquare (int x, int y, int color, ChessSquare piece, Drawable dest, int fac) { // [HGM] extra param 'fac' for forcing destination to (0,0) for copying to animation buffer @@ -2563,14 +2659,22 @@ ChooseDrawFunc () void DrawDot (int marker, int x, int y, int r) { + cairo_t *cr; + DrawSeekOpen(); + cr = cairo_create(cs); + cairo_arc(cr, x+r/2, y+r/2, r/2, 0.0, 2*M_PI); if(appData.monoMode) { - XFillArc(xDisplay, xBoardWindow, marker == 2 ? darkSquareGC : lightSquareGC, - x, y, r, r, 0, 64*360); - XDrawArc(xDisplay, xBoardWindow, marker == 2 ? lightSquareGC : darkSquareGC, - x, y, r, r, 0, 64*360); - } else - XFillArc(xDisplay, xBoardWindow, marker == 2 ? prelineGC : highlineGC, - x, y, r, r, 0, 64*360); + SetPen(cr, 2, marker == 2 ? "#000000" : "#FFFFFF", 0); + cairo_stroke_preserve(cr); + SetPen(cr, 2, marker == 2 ? "#FFFFFF" : "#000000", 0); + } else { + SetPen(cr, 2, marker == 2 ? "#FF0000" : "#FFFF00", 0); + } + cairo_fill(cr); + cairo_stroke(cr); + + cairo_destroy(cr); + DrawSeekClose(); } void @@ -2704,47 +2808,143 @@ EventProc (Widget widget, caddr_t unused, XEvent *event) DelayedDrag(); // as long as events keep coming in faster than 50 msec, they destroy each other } -// [HGM] seekgraph: some low-level drawing routines cloned from xevalgraph -void -DrawSeekAxis (int x, int y, int xTo, int yTo) +// [HGM] seekgraph: some low-level drawing routines (by JC, mostly) + +float +Color (char *col, int n) { - XDrawLine(xDisplay, xBoardWindow, lineGC, x, y, xTo, yTo); + int c; + sscanf(col, "#%x", &c); + c = c >> 4*n & 255; + return c/255.; } void -DrawSeekBackground (int left, int top, int right, int bottom) +SetPen (cairo_t *cr, float w, char *col, int dash) { - XFillRectangle(xDisplay, xBoardWindow, lightSquareGC, left, top, right-left, bottom-top); + static const double dotted[] = {4.0, 4.0}; + static int len = sizeof(dotted) / sizeof(dotted[0]); + cairo_set_line_width (cr, w); + cairo_set_source_rgba (cr, Color(col, 4), Color(col, 2), Color(col, 0), 1.0); + if(dash) cairo_set_dash (cr, dotted, len, 0.0); } -void -DrawSeekText (char *buf, int x, int y) +void DrawSeekAxis( int x, int y, int xTo, int yTo ) { - XDrawString(xDisplay, xBoardWindow, coordGC, x, y+4, buf, strlen(buf)); + cairo_t *cr; + + /* get a cairo_t */ + cr = cairo_create (cs); + + cairo_move_to (cr, x, y); + cairo_line_to(cr, xTo, yTo ); + + SetPen(cr, 2, "#000000", 0); + cairo_stroke(cr); + + /* free memory */ + cairo_destroy (cr); } -void -DrawSeekDot (int x, int y, int colorNr) +void DrawSeekBackground( int left, int top, int right, int bottom ) +{ + cairo_t *cr = cairo_create (cs); + + cairo_rectangle (cr, left, top, right-left, bottom-top); + + cairo_set_source_rgba(cr, 0.8, 0.8, 0.4,1.0); + cairo_fill(cr); + + /* free memory */ + cairo_destroy (cr); +} + +void DrawSeekText(char *buf, int x, int y) +{ + cairo_t *cr = cairo_create (cs); + + cairo_select_font_face (cr, "Sans", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + + cairo_set_font_size (cr, 12.0); + + cairo_move_to (cr, x, y+4); + cairo_show_text( cr, buf); + + cairo_set_source_rgba(cr, 0, 0, 0,1.0); + cairo_stroke(cr); + + /* free memory */ + cairo_destroy (cr); +} + +void DrawSeekDot(int x, int y, int colorNr) { + cairo_t *cr = cairo_create (cs); int square = colorNr & 0x80; - GC color; colorNr &= 0x7F; - color = colorNr == 0 ? prelineGC : colorNr == 1 ? darkSquareGC : highlineGC; + if(square) - XFillRectangle(xDisplay, xBoardWindow, color, - x-squareSize/9, y-squareSize/9, 2*squareSize/9, 2*squareSize/9); + cairo_rectangle (cr, x-squareSize/9, y-squareSize/9, 2*squareSize/9, 2*squareSize/9); else - XFillArc(xDisplay, xBoardWindow, color, - x-squareSize/8, y-squareSize/8, squareSize/4, squareSize/4, 0, 64*360); + cairo_arc(cr, x, y, squareSize/8, 0.0, 2*M_PI); + + SetPen(cr, 2, "#000000", 0); + cairo_stroke_preserve(cr); + switch (colorNr) { + case 0: cairo_set_source_rgba(cr, 1.0, 0, 0,1.0); break; + case 1: cairo_set_source_rgba (cr, 0.0, 0.7, 0.2, 1.0); break; + default: cairo_set_source_rgba (cr, 1.0, 1.0, 0.0, 1.0); break; + } + cairo_fill(cr); + + /* free memory */ + cairo_destroy (cr); +} + +void +DrawSeekOpen () +{ + int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); + int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + cs = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); } void -DrawGrid () +DrawSeekClose () { - XDrawSegments(xDisplay, xBoardWindow, lineGC, - gridSegments, BOARD_HEIGHT + BOARD_WIDTH + 2); + cairo_surface_destroy(cs); } +void +DrawGrid() +{ + /* draws a grid starting around Nx, Ny squares starting at x,y */ + int i; + cairo_t *cr; + + DrawSeekOpen(); + /* get a cairo_t */ + cr = cairo_create (cs); + + cairo_set_antialias (cr, CAIRO_ANTIALIAS_NONE); + SetPen(cr, lineGap, "#000000", 0); + + /* lines in X */ + for (i = 0; i < BOARD_WIDTH + BOARD_HEIGHT + 2; i++) + { + cairo_move_to (cr, gridSegments[i].x1, gridSegments[i].y1); + cairo_line_to (cr, gridSegments[i].x2, gridSegments[i].y2); + cairo_stroke (cr); + } + + /* free memory */ + cairo_destroy (cr); + DrawSeekClose(); + + return; +} /* * event handler for redrawing the board @@ -2800,26 +3000,6 @@ CommentPopDown () PopDown(CommentDlg); } -static char *openName; -FILE *openFP; - -void -DelayedLoad () -{ - (void) (*fileProc)(openFP, 0, openName); -} - -void -FileNamePopUp (char *label, char *def, char *filter, FileProc proc, char *openMode) -{ - fileProc = proc; /* I can't see a way not */ - fileOpenMode = openMode; /* to use globals here */ - { // [HGM] use file-selector dialog stolen from Ghostview - // int index; // this is not supported yet - Browse(BoardWindow, label, (def[0] ? def : NULL), filter, False, openMode, &openName, &openFP); - } -} - /* Disable all user input other than deleting the window */ static int frozen = 0; @@ -2885,7 +3065,9 @@ ModeHighlight () MarkMenuItem("Mode.MachineMatch", matchMode && matchGame < appData.matchGames); /* Maybe all the enables should be handled here, not just this one */ - EnableMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); + EnableNamedMenuItem("Mode.Training", gameMode == Training || gameMode == PlayFromGameFile); + + DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle); } @@ -3145,6 +3327,12 @@ ManInner (Widget w, XEvent *event, String *prms, Cardinal *nprms) } void +ManProc () +{ // called from menu + ManInner(NULL, NULL, NULL, NULL); +} + +void SetWindowTitle (char *text, char *title, char *icon) { Arg args[16]; @@ -3348,7 +3536,7 @@ DisplayTimerLabel (Option *opt, char *color, long timer, int highlight) foregroundOrWarningColor = lowTimeWarningColor; if (appData.clockMode) { - snprintf(buf, MSG_SIZ, "%s: %s", color, TimeString(timer)); + snprintf(buf, MSG_SIZ, "%s:%s%s", color, appData.logoSize && !partnerUp ? "\n" : " ", TimeString(timer)); XtSetArg(args[0], XtNlabel, buf); } else { snprintf(buf, MSG_SIZ, "%s ", color); @@ -3740,19 +3928,56 @@ SetDragPiece (AnimNr anr, ChessSquare piece) /* [AS] Arrow highlighting support */ -void -DrawPolygon (Pnt arrow[], int nr) -{ - XPoint pts[10]; +void DrawPolygon(Pnt arrow[], int nr) +{ // for now on own surface; eventually this should become a global that is only destroyed on resize + cairo_surface_t *boardSurface; + cairo_t *cr; int i; - for(i=0; i<10; i++) pts[i].x = arrow[i].x, pts[i].y = arrow[i].y; - XFillPolygon(xDisplay, xBoardWindow, highlineGC, pts, nr, Nonconvex, CoordModeOrigin); - if(appData.monoMode) arrow[nr] = arrow[0], XDrawLines(xDisplay, xBoardWindow, darkSquareGC, pts, nr+1, CoordModeOrigin); + int w = lineGap + BOARD_WIDTH * (squareSize + lineGap); + int h = lineGap + BOARD_HEIGHT * (squareSize + lineGap); + boardSurface = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), w, h); + cr = cairo_create (boardSurface); + cairo_move_to (cr, arrow[nr-1].x, arrow[nr-1].y); + for (i=0;itidy); + } + } + if(logoName[0]) + { ASSIGN(cps->programLogo, logoName); } } void UpdateLogos (int displ) { - return; // no logos in XBoard yet + if(optList[W_WHITE-1].handle == NULL) return; + LoadLogo(&first, 0, 0); + LoadLogo(&second, 1, appData.icsActive); + if(displ) DisplayLogos(optList[W_WHITE-1].handle, optList[W_BLACK+1].handle); + return; }