From 634be1ecc596d406ee5ea6f22194ef3b6348f42d Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Thu, 4 Oct 2012 15:01:05 +0200 Subject: [PATCH] Add mode to draw PNG piece images through cairo The PNG images have to be supplied as files in a -pngDirectory (a new option) with a 256x256 bitmap. They are then scaled by cairo to the desired square size. This does not work very well for the smaller sizes. --- args.h | 2 + common.h | 1 + dialogs.c | 1 + xboard.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 0 deletions(-) diff --git a/args.h b/args.h index 2d8b7aa..147f8bb 100644 --- a/args.h +++ b/args.h @@ -215,6 +215,8 @@ ArgDescriptor argDescriptors[] = { { "pixmap", ArgFilename, (void *) &appData.pixmapDirectory, FALSE, INVALID }, { "bitmapDirectory", ArgFilename, (void *) &appData.bitmapDirectory, XBOARD, (ArgIniType) "" }, { "bm", ArgFilename, (void *) &appData.bitmapDirectory, FALSE, INVALID }, + { "pngDirectory", ArgFilename, (void *) &appData.pngDirectory, XBOARD, (ArgIniType) "" }, + { "png", ArgFilename, (void *) &appData.pngDirectory, FALSE, INVALID }, { "soundDirectory", ArgFilename, (void *) &appData.soundDirectory, XBOARD, (ArgIniType) "" }, { "msLoginDelay", ArgInt, (void *) &appData.msLoginDelay, XBOARD, (ArgIniType) MS_LOGIN_DELAY }, { "pasteSelection", ArgBoolean, (void *) &appData.pasteSelection, XBOARD, (ArgIniType) FALSE }, diff --git a/common.h b/common.h index 0669b36..752d434 100644 --- a/common.h +++ b/common.h @@ -409,6 +409,7 @@ typedef struct { Boolean noChessProgram; char *host[ENGINES]; char *bitmapDirectory; + char *pngDirectory; char *soundDirectory; char *remoteShell; char *remoteUser; diff --git a/dialogs.c b/dialogs.c index 5f25c5a..b5d9026 100644 --- a/dialogs.c +++ b/dialogs.c @@ -811,6 +811,7 @@ static Option boardOptions[] = { { 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") }, { 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".xpm", NULL, FileName, N_("Light-Squares Texture File:") }, { 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".xpm", NULL, FileName, N_("Dark-Squares Texture File:") }, +{ 0, 0, 0, NULL, (void*) &appData.pngDirectory, "", NULL, PathName, N_("Directory with PNG Pieces:") }, { 0, 0, 0, NULL, (void*) &appData.bitmapDirectory, "", NULL, PathName, N_("Directory with Bitmap Pieces:") }, { 0, 0, 0, NULL, (void*) &appData.pixmapDirectory, "", NULL, PathName, N_("Directory with Pixmap Pieces:") }, { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" } diff --git a/xboard.c b/xboard.c index 99af048..4bc8d38 100644 --- a/xboard.c +++ b/xboard.c @@ -237,6 +237,7 @@ static void CreateGCs P((int redo)); static void CreateAnyPieces P((void)); void CreateXIMPieces P((void)); void CreateXPMPieces P((void)); +void CreatePNGPieces P((void)); void CreateXPMBoard P((char *s, int n)); void CreatePieces P((void)); Widget CreateMenuBar P((Menu *mb, int boardWidth)); @@ -339,6 +340,8 @@ WindowPlacement wpTags; #define SOLID 0 #define OUTLINE 1 +cairo_surface_t *pngPieceBitmaps[2][(int)BlackPawn]; // scaled pieces as used +cairo_surface_t *pngPieceBitmaps2[2][(int)BlackPawn+4]; // scaled pieces in store Pixmap pieceBitmap[2][(int)BlackPawn]; Pixmap pieceBitmap2[2][(int)BlackPawn+4]; /* [HGM] pieces */ Pixmap xpmPieceBitmap[4][(int)BlackPawn]; /* LL, LD, DL, DD actually used*/ @@ -1029,6 +1032,12 @@ InitDrawingSizes (BoardSize boardSize, int flags) } } } + for(i=0; i<2; i++) { + int p; +printf("Copy pieces\n"); + for(p=0; p<=(int)WhiteKing; p++) + pngPieceBitmaps[i][p] = pngPieceBitmaps2[i][p]; // defaults + } oldMono = -10; // kludge to force recreation of animation masks oldVariant = gameInfo.variant; } @@ -1091,6 +1100,9 @@ CreateAnyPieces () CreateXPMBoard(appData.liteBackTextureFile, 1); CreateXPMBoard(appData.darkBackTextureFile, 0); } + if (appData.pngDirectory[0] != NULLCHAR) { // for now do in parallel + CreatePNGPieces(); + } #else CreateXIMPieces(); /* Create regular pieces */ @@ -2206,6 +2218,53 @@ CreateXPMPieces () } #endif /* HAVE_LIBXPM */ +char *pngPieceNames[] = // must be in same order as internal piece encoding +{ "Pawn", "Knight", "Bishop", "Rook", "Queen", "Advisor", "Elephant", "Archbishop", "Marshall", "Gold", "Commoner", + "Canon", "Nightrider", "CrownedBishop", "CrownedRook", "Princess", "Chancellor", "Hawk", "Lance", "Cobra", "Unicorn", "King", + "GoldKnight", "GoldLance", "GoldPawn", "GoldSilver", NULL +}; + +void +ScaleOnePiece (char *name, int color, int piece) +{ + int 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(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 != 256 || h != 256) { printf("Bad png size %dx%d in %s\n", w, h, buf); exit(1); } + } + + // 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/256., squareSize/256.); + cairo_set_source_surface (cr, img, 0, 0); + cairo_paint (cr); + cairo_destroy (cr); + cairo_surface_destroy (img); +} + +void +CreatePNGPieces () +{ + int p; + + for(p=0; pngPieceNames[p]; p++) { + ScaleOnePiece(pngPieceNames[p], 0, p); + ScaleOnePiece(pngPieceNames[p], 1, p); + } +} + #if HAVE_LIBXPM /* No built-in bitmaps */ void CreatePieces() @@ -2637,6 +2696,28 @@ colorDrawPieceImage (ChessSquare piece, int square_color, int x, int y, Drawable squareSize, squareSize, x, y); } +static void +pngDrawPiece (ChessSquare piece, int square_color, int x, int y, Drawable dest) +{ + int kind, p = piece; + cairo_t *cr; + + if ((int)piece < (int) BlackPawn) { + kind = 0; + } else { + kind = 1; + piece -= BlackPawn; + } + if(appData.upsideDown && flipView) { p += p < BlackPawn ? BlackPawn : -BlackPawn; }// swap white and black pieces + BlankSquare(x, y, square_color, piece, dest, 1); // erase previous contents with background + DrawSeekOpen(); + cr = cairo_create (cs); + cairo_set_source_surface (cr, pngPieceBitmaps[kind][piece], x, y); + cairo_paint(cr); + cairo_destroy (cr); + DrawSeekClose(); +} + typedef void (*DrawFunc)(); DrawFunc @@ -2648,6 +2729,8 @@ ChooseDrawFunc () } else { return monoDrawPiece; } + } else if(appData.pngDirectory[0]) { + return pngDrawPiece; } else { if (useImages) return colorDrawPieceImage; -- 1.7.0.4