X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=da0c4d2ca69bfe74190812cc39164c856523449d;hb=ac9d48038a86a672579abbcbbc53b17e2515ba13;hp=1050d305fa6f65b156083221b02952388a57adcc;hpb=297022f1fc176754c1cac6adf34f97776a1d8a5d;p=xboard.git diff --git a/draw.c b/draw.c index 1050d30..da0c4d2 100644 --- a/draw.c +++ b/draw.c @@ -55,6 +55,8 @@ #include #include #include +#include +#include #if STDC_HEADERS # include @@ -110,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]; @@ -130,24 +134,9 @@ static int dual = 0; void SwitchWindow () { - cairo_surface_t *cstmp = csBoardWindow; - csBoardWindow = csDualBoard; dual = !dual; - if(!csDualBoard) { - csBoardWindow = GetOutputSurface(&dualOptions[3], 0, 0); - dual = 1; - } - csDualBoard = cstmp; -} - -void -NewSurfaces () -{ - // 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; + currBoard = (dual ? &mainOptions[W_BOARD] : &dualOptions[3]); + csBoardWindow = DRAWABLE(currBoard); } #define BoardSize int @@ -174,7 +163,6 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); - NewSurfaces(); /* * Inhibit shell resizing. @@ -249,14 +237,15 @@ ConvertPixmap (int color, int piece) 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); - buf = (int *) malloc(p->size*stride); for(i=0; isize; i++) { for(j=0; jsize; j++) { char c = pixels[i+f+1][j]; @@ -265,8 +254,7 @@ ConvertPixmap (int color, int piece) buf[i*p->size + j] = colcode[k]; } } - res = cairo_image_surface_create_for_data((unsigned char *) buf, CAIRO_FORMAT_ARGB32, p->size, p->size, stride); - if(cairo_surface_status(res) != CAIRO_STATUS_SUCCESS) { printf("bad pixmap convert\n"); exit(1); } + cairo_surface_mark_dirty(res); return res; } @@ -275,21 +263,50 @@ ScaleOnePiece (char *name, int color, int piece) { 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 - if(!*appData.pngDirectory) img = ConvertPixmap(color, piece); else - if(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]); - img = cairo_image_surface_create_from_png (buf); - if(cairo_surface_status(img) != CAIRO_STATUS_SUCCESS) img = ConvertPixmap(color, piece); + 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 + 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); w = cairo_image_surface_get_width (img); @@ -298,6 +315,25 @@ 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...) + 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 @@ -320,9 +356,15 @@ CreateAnyPieces () } void -InitDrawingParams () +InitDrawingParams (int reloadPieces) { + int i, p; MakeColors(); + if(reloadPieces) + for(i=0; i<2; i++) for(p=0; p