X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=draw.c;h=757185099605e114a3953d1cd295cab5df83a3ed;hb=67b3a0d7c465522feb67841c7374bf863df19357;hp=e79851f0d995a14f5deff72bdc26eac29567e6f0;hpb=224ed6301ed95439f1fe5b8b678d671cbeeaa2dc;p=xboard.git diff --git a/draw.c b/draw.c index e79851f..7571850 100644 --- a/draw.c +++ b/draw.c @@ -110,7 +110,9 @@ extern char *getenv(); #define SOLID 0 #define OUTLINE 1 Boolean cairoAnimate; -static cairo_surface_t *csBoardWindow, *csBoardBackup, *csDualBoard; +Option *currBoard; +static 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 +132,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,12 +161,11 @@ InitDrawingSizes (BoardSize boardSize, int flags) oldWidth = boardWidth; oldHeight = boardHeight; CreateGrid(); - NewSurfaces(); /* * Inhibit shell resizing. */ - ResizeBoardWindow(boardWidth, boardHeight, !cairoAnimate); + ResizeBoardWindow(boardWidth, boardHeight, 0); DelayedDrag(); } @@ -237,32 +223,85 @@ 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]; cairo_surface_t *img, *cs; cairo_t *cr; - static cairo_surface_t *pngPieceImages[2][(int)BlackPawn+4]; // png 256 x 256 images 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); + { // 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 @@ -279,17 +318,21 @@ CreatePNGPieces () void CreateAnyPieces () { // [HGM] taken out of main - if (appData.pngDirectory[0] != NULLCHAR) { - CreatePNGPieces(); - } + CreatePNGPieces(); CreatePNGBoard(appData.liteBackTextureFile, 1); CreatePNGBoard(appData.darkBackTextureFile, 0); } void -InitDrawingParams () +InitDrawingParams (int reloadPieces) { + int i, p; MakeColors(); + if(reloadPieces) + for(i=0; i<2; i++) for(p=0; p