X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=02c280534b1f58fa6b4c43e8f6c4cdf195c472a9;hb=aa694af0138b799c4de3e031d15c2a9be3112b6c;hp=757185099605e114a3953d1cd295cab5df83a3ed;hpb=67b3a0d7c465522feb67841c7374bf863df19357;p=xboard.git diff --git a/draw.c b/draw.c index 7571850..02c2805 100644 --- a/draw.c +++ b/draw.c @@ -55,6 +55,8 @@ #include #include #include +#include +#include #if STDC_HEADERS # include @@ -72,22 +74,13 @@ extern char *getenv(); #include #endif - -// [HGM] bitmaps: put before incuding the bitmaps / pixmaps, to know how many piece types there are. #include "common.h" -#if HAVE_LIBXPM -#include "pixmaps/pixmaps.h" -#else -#include "bitmaps/bitmaps.h" -#endif - -#include "frontend.h" #include "backend.h" -#include "xevalgraph.h" #include "board.h" #include "menus.h" #include "dialogs.h" +#include "evalgraph.h" #include "gettext.h" #include "draw.h" @@ -111,10 +104,11 @@ extern char *getenv(); #define OUTLINE 1 Boolean cairoAnimate; Option *currBoard; -static cairo_surface_t *csBoardWindow; +cairo_surface_t *csBoardWindow; static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images static cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used static cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store +static RsvgHandle *svgPieces[2][(int)BlackPawn+4]; // vector pieces in store static cairo_surface_t *pngBoardBitmap[2]; int useTexture, textureW[2], textureH[2]; @@ -123,6 +117,9 @@ int useTexture, textureW[2], textureH[2]; #define White(piece) ((int)(piece) < (int)BlackPawn) +char *crWhite = "#FFFFB0"; +char *crBlack = "#AD5D3D"; + struct { int x1, x2, y1, y2; } gridSegments[BOARD_RANKS + BOARD_FILES + 2]; @@ -137,18 +134,43 @@ SwitchWindow () csBoardWindow = DRAWABLE(currBoard); } +void +SelectPieces(VariantClass v) +{ + int i; + for(i=0; i<2; i++) { + int p; + for(p=0; p<=(int)WhiteKing; p++) + pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults + if(v == VariantShogi) { + pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1]; + pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2]; + pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3]; + pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4]; + pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance]; + } +#ifdef GOTHIC + if(v == VariantGothic) { + pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver]; + } +#endif + if(v == VariantSChess) { + pngPieceBitmaps[i][(int)WhiteAngel] = pngPieceBitmaps2[i][(int)WhiteFalcon]; + pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil]; + } + } +} + #define BoardSize int void InitDrawingSizes (BoardSize boardSize, int flags) { // [HGM] resize is functional now, but for board format changes only (nr of ranks, files) int boardWidth, boardHeight; - int i; static int oldWidth, oldHeight; static VariantClass oldVariant; static int oldMono = -1, oldTwoBoards = 0; - extern Widget formWidget; - if(!formWidget) return; + if(!mainOptions[W_BOARD].handle) return; if(oldTwoBoards && !twoBoards) PopDown(DummyDlg); oldTwoBoards = twoBoards; @@ -175,27 +197,8 @@ InitDrawingSizes (BoardSize boardSize, int flags) if(gameInfo.variant != oldVariant) { // and only if variant changed - for(i=0; i<2; i++) { - int p; - for(p=0; p<=(int)WhiteKing; p++) - pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults - if(gameInfo.variant == VariantShogi) { - pngPieceBitmaps[i][(int)WhiteCannon] = pngPieceBitmaps2[i][(int)WhiteKing+1]; - pngPieceBitmaps[i][(int)WhiteNightrider] = pngPieceBitmaps2[i][(int)WhiteKing+2]; - pngPieceBitmaps[i][(int)WhiteSilver] = pngPieceBitmaps2[i][(int)WhiteKing+3]; - pngPieceBitmaps[i][(int)WhiteGrasshopper] = pngPieceBitmaps2[i][(int)WhiteKing+4]; - pngPieceBitmaps[i][(int)WhiteQueen] = pngPieceBitmaps2[i][(int)WhiteLance]; - } -#ifdef GOTHIC - if(gameInfo.variant == VariantGothic) { - pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteSilver]; - } -#endif - if(gameInfo.variant == VariantSChess) { - pngPieceBitmaps[i][(int)WhiteAngel] = pngPieceBitmaps2[i][(int)WhiteFalcon]; - pngPieceBitmaps[i][(int)WhiteMarshall] = pngPieceBitmaps2[i][(int)WhiteAlfil]; - } - } + SelectPieces(gameInfo.variant); + oldMono = -10; // kludge to force recreation of animation masks oldVariant = gameInfo.variant; } @@ -203,6 +206,17 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldMono = appData.monoMode; } +void +ExposeRedraw (Option *graph, int x, int y, int w, int h) +{ // copy a selected part of the buffer bitmap to the display + cairo_t *cr = cairo_create((cairo_surface_t *) graph->textValue); + cairo_set_source_surface(cr, (cairo_surface_t *) graph->choice, 0, 0); + cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE); + cairo_rectangle(cr, x, y, w, h); + cairo_fill(cr); + cairo_destroy(cr); +} + static void CreatePNGBoard (char *s, int kind) { @@ -223,59 +237,79 @@ char *pngPieceNames[] = // must be in same order as internal piece encoding "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL }; -cairo_surface_t * -ConvertPixmap (int color, int piece) -{ - int i, j, stride, f, colcode[10], w, b; - char ch[10]; - cairo_surface_t *res; - XpmPieces *p = builtInXpms + 10; - char **pixels = p->xpm[piece % BlackPawn][2*color]; - int *buf; - sscanf(pixels[0], "%*d %*d %d", &f); - sscanf(appData.whitePieceColor+1, "%x", &w); - sscanf(appData.blackPieceColor+1, "%x", &b); - res = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, p->size, p->size); - stride = cairo_image_surface_get_stride(res); - buf = (int *) cairo_image_surface_get_data(res); - for(i=0; isize; i++) { - for(j=0; jsize; j++) { - char c = pixels[i+f+1][j]; - int k; - for(k=0; ch[k] != c && k < f; k++); - buf[i*p->size + j] = colcode[k]; +RsvgHandle * +LoadSVG (char *dir, int color, int piece) +{ + char buf[MSG_SIZ]; + RsvgHandle *svg=svgPieces[color][piece]; + RsvgDimensionData svg_dimensions; + GError *svgerror=NULL; + cairo_surface_t *img; + cairo_t *cr; + + snprintf(buf, MSG_SIZ, "%s/%s%s.svg", dir, color ? "Black" : "White", pngPieceNames[piece]); + + if(svg || *dir && (svg = rsvg_handle_new_from_file(buf, &svgerror))) { + + rsvg_handle_get_dimensions(svg, &svg_dimensions); + img = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, squareSize, squareSize); + + cr = cairo_create(img); + cairo_scale(cr, squareSize/(double) svg_dimensions.width, squareSize/(double) svg_dimensions.height); + rsvg_handle_render_cairo(svg, cr); + if(cairo_surface_status(img) == CAIRO_STATUS_SUCCESS) { + if(pngPieceImages[color][piece]) cairo_surface_destroy(pngPieceImages[color][piece]); + pngPieceImages[color][piece] = img; + } + cairo_destroy(cr); + + return svg; } - } - cairo_surface_mark_dirty(res); - return res; + if(svgerror) + g_error_free(svgerror); + return NULL; } static void -ScaleOnePiece (char *name, int color, int piece) +ScaleOnePiece (int color, int piece) { float w, h; char buf[MSG_SIZ]; cairo_surface_t *img, *cs; cairo_t *cr; - if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it - if(!*appData.pngDirectory) img = ConvertPixmap(color, piece); else { - snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]); - img = cairo_image_surface_create_from_png (buf); - if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) img = ConvertPixmap(color, piece); + g_type_init (); + + svgPieces[color][piece] = LoadSVG("", color, piece); // this fills pngPieceImages if we had cached svg with bitmap of wanted size + + if(!pngPieceImages[color][piece]) { // we don't have cached bitmap (implying we did not have cached svg) + if(*appData.pieceDirectory) { // user specified piece directory + snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pieceDirectory, color ? "Black" : "White", pngPieceNames[piece]); + img = cairo_image_surface_create_from_png (buf); // try if there are png pieces there + if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) { // there were not + svgPieces[color][piece] = LoadSVG(appData.pieceDirectory, color, piece); // so try if he has svg there + } else pngPieceImages[color][piece] = img; + } + } + + if(!pngPieceImages[color][piece]) { // we still did not manage to acquire a piece bitmap + static int warned = 0; + if(!(svgPieces[color][piece] = LoadSVG(SVGDIR, color, piece)) && !warned) { // try to fall back on installed svg + char *msg = _("No default pieces installed\nSelect your own -pieceImageDirectory"); + printf("%s\n", msg); // give up + DisplayError(msg, 0); + warned = 1; // prevent error message being repeated for each piece type } } - pngPieceImages[color][piece] = img; + + img = pngPieceImages[color][piece]; + // create new bitmap to hold scaled piece image (and remove any old) if(pngPieceBitmaps2[color][piece]) cairo_surface_destroy (pngPieceBitmaps2[color][piece]); pngPieceBitmaps2[color][piece] = cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, squareSize, squareSize); - if(piece <= WhiteKing) pngPieceBitmaps[color][piece] = cs; + + if(!img) return; + // scaled copying of the raw png image cr = cairo_create(cs); w = cairo_image_surface_get_width (img); @@ -284,7 +318,8 @@ ScaleOnePiece (char *name, int color, int piece) cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); - { // operate on bitmap to color it (king-size hack...) + + if(!appData.trueColors || !*appData.pieceDirectory) { // operate on bitmap to color it (king-size hack...) int stride = cairo_image_surface_get_stride(cs)/4; int *buf = (int *) cairo_image_surface_get_data(cs); int i, j, p; @@ -299,6 +334,11 @@ ScaleOnePiece (char *name, int color, int piece) buf[i*stride + j] = c & 0xFF000000; // alpha channel is kept at same opacity buf[i*stride + j] += ((int)(f*(p&0xFF0000)) & 0xFF0000) + ((int)(f*(p&0xFF00)) & 0xFF00) + (int)(f*(p&0xFF)); // add desired fraction of new color if(color) buf[i*stride + j] += r | r << 8 | r << 16; // details on black pieces get their weight added in pure white + if(appData.monoMode) { + if(a < 64) buf[i*stride + j] = 0; // if not opaque enough, totally transparent + else if(2*r < a) buf[i*stride + j] = 0xFF000000; // if not light enough, totally black + else buf[i*stride + j] = 0xFFFFFFFF; // otherwise white + } } cairo_surface_mark_dirty(cs); } @@ -310,9 +350,10 @@ CreatePNGPieces () int p; for(p=0; pngPieceNames[p]; p++) { - ScaleOnePiece(pngPieceNames[p], 0, p); - ScaleOnePiece(pngPieceNames[p], 1, p); + ScaleOnePiece(0, p); + ScaleOnePiece(1, p); } + SelectPieces(gameInfo.variant); } void @@ -327,11 +368,12 @@ void InitDrawingParams (int reloadPieces) { int i, p; - MakeColors(); if(reloadPieces) for(i=0; i<2; i++) for(p=0; p