X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=f811dbe735e8af88365a3b75881d54955b50c66c;hb=18f63518ed5d7c91bcaf737924e6ccf31ad3e0d4;hp=0b63833dc81260648a87bd5b7bc054009bf7cdd0;hpb=ef69c417ccc6498ba0c13591b4deaa34a9a76ba1;p=xboard.git diff --git a/draw.c b/draw.c index 0b63833..f811dbe 100644 --- a/draw.c +++ b/draw.c @@ -55,6 +55,8 @@ #include #include #include +#include +#include #if STDC_HEADERS # include @@ -84,7 +86,6 @@ extern char *getenv(); #include "frontend.h" #include "backend.h" -#include "xboard.h" #include "xevalgraph.h" #include "board.h" #include "menus.h" @@ -111,7 +112,9 @@ extern char *getenv(); #define SOLID 0 #define OUTLINE 1 Boolean cairoAnimate; -static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard; +Option *currBoard; +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 cairo_surface_t *pngBoardBitmap[2]; @@ -126,26 +129,14 @@ struct { int x1, x2, y1, y2; } gridSegments[BOARD_RANKS + BOARD_FILES + 2]; -void -SwitchWindow () -{ - cairo_surface_t *cstmp = csBoardWindow; - csBoardWindow = csDualBoard; - if(!csDualBoard && cstmp) { - int boardWidth = lineGap + BOARD_WIDTH * (squareSize + lineGap); - int boardHeight = lineGap + BOARD_HEIGHT * (squareSize + lineGap); - csBoardWindow = cairo_xlib_surface_create(xDisplay, xBoardWindow, DefaultVisual(xDisplay, 0), boardWidth, boardHeight); - } -} +static int dual = 0; void -NewSurfaces () +SwitchWindow () { - // delete surfaces after size becomes invalid, so they will be recreated - if(csBoardWindow) cairo_surface_destroy(csBoardWindow); - if(csBoardBackup) cairo_surface_destroy(csBoardBackup); - if(csDualBoard) cairo_surface_destroy(csDualBoard); - csBoardWindow = csBoardBackup = csDualBoard = NULL; + dual = !dual; + currBoard = (dual ? &mainOptions[W_BOARD] : &dualOptions[3]); + csBoardWindow = DRAWABLE(currBoard); } #define BoardSize int @@ -154,9 +145,10 @@ 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 Dimension oldWidth, oldHeight; + static int oldWidth, oldHeight; static VariantClass oldVariant; static int oldMono = -1, oldTwoBoards = 0; + extern Widget formWidget; if(!formWidget) return; @@ -171,12 +163,11 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); - NewSurfaces(); /* * Inhibit shell resizing. */ - ResizeBoardWindow(boardWidth, boardHeight, !cairoAnimate); + ResizeBoardWindow(boardWidth, boardHeight, 0); DelayedDrag(); } @@ -234,32 +225,115 @@ 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]; + } + } + cairo_surface_mark_dirty(res); + return res; +} + static void ScaleOnePiece (char *name, int color, int piece) { - int w, h; + float w, h; char buf[MSG_SIZ]; + RsvgHandle *svg=NULL; + RsvgDimensionData svg_dimensions; + GError **svgerror=NULL; cairo_surface_t *img, *cs; cairo_t *cr; - static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images + + g_type_init (); + + if(*appData.svgDirectory) { // try to freshly render svg pieces first, always from file, to supply the source bitmap + snprintf(buf, MSG_SIZ, "%s/%s%s.svg", appData.svgDirectory, color ? "Black" : "White", pngPieceNames[piece]); + + if(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); + + rsvg_handle_close (svg,NULL); + } + } if((img = pngPieceImages[color][piece]) == NULL) { // if PNG file for this piece was not yet read, read it now and store it - snprintf(buf, MSG_SIZ, "%s/%s%s.png", appData.pngDirectory, color ? "Black" : "White", pngPieceNames[piece]); - pngPieceImages[color][piece] = img = cairo_image_surface_create_from_png (buf); - w = cairo_image_surface_get_width (img); - h = cairo_image_surface_get_height (img); - if(w != 64 || h != 64) { printf("Bad png size %dx%d in %s\n", w, h, buf); exit(1); } + 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); + } } + pngPieceImages[color][piece] = img; + + // 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; + // scaled copying of the raw png image cr = cairo_create(cs); - cairo_scale(cr, squareSize/64., squareSize/64.); + w = cairo_image_surface_get_width (img); + h = cairo_image_surface_get_height (img); + cairo_scale(cr, squareSize/w, squareSize/h); cairo_set_source_surface (cr, img, 0, 0); cairo_paint (cr); cairo_destroy (cr); + + if(!appData.trueColors || !*appData.pngDirectory && !appData.svgDirectory) { // 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; + sscanf(color ? appData.blackPieceColor+1 : appData.whitePieceColor+1, "%x", &p); // replacement color + cairo_surface_flush(cs); + for(i=0; i> 24; r = c >> 16 & 255; // alpha and red, where red is the 'white' weight, since white is #FFFFCC in the source images + f = (color ? a - r : r)/255.; // fraction of black or white in the mix that has to be replaced + 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 + } + cairo_surface_mark_dirty(cs); + } } void @@ -273,23 +347,24 @@ CreatePNGPieces () } } -int +void CreateAnyPieces () { // [HGM] taken out of main - if (appData.pngDirectory[0] != NULLCHAR) { - CreatePNGPieces(); - } + CreatePNGPieces(); CreatePNGBoard(appData.liteBackTextureFile, 1); CreatePNGBoard(appData.darkBackTextureFile, 0); - cairoAnimate = *appData.pngDirectory && useTexture == 3 - && strstr(appData.liteBackTextureFile, ".png") && strstr(appData.darkBackTextureFile, ".png"); - return cairoAnimate; } void -InitDrawingParams () +InitDrawingParams (int reloadPieces) { + int i, p; MakeColors(); + if(reloadPieces) + for(i=0; i<2; i++) for(p=0; p