From ba015257c7d20b54a9a91cff8f10becbbafb69a7 Mon Sep 17 00:00:00 2001 From: he Date: Mon, 19 Feb 2018 09:51:48 +0000 Subject: Sprinkle "unsigned" ahead of "char" for various bitmaps, and handle the C++ trickle-down type conversion warnings. Bump PKGREVISION. --- games/xfreecell/Makefile | 4 +- games/xfreecell/distinfo | 17 +++- games/xfreecell/patches/patch-ad | 21 ----- games/xfreecell/patches/patch-boundingMask.bm | 13 +++ games/xfreecell/patches/patch-card.cpp | 38 +++++++- games/xfreecell/patches/patch-clipMask.bm | 13 +++ games/xfreecell/patches/patch-face.bm | 112 ++++++++++++++++++++++++ games/xfreecell/patches/patch-rank.bm | 13 +++ games/xfreecell/patches/patch-spade_lg.bm | 12 +++ games/xfreecell/patches/patch-stack.cpp | 33 +++++++ games/xfreecell/patches/patch-suit.bm | 71 +++++++++++++++ games/xfreecell/patches/patch-util.cpp | 120 ++++++++++++++++++++++++++ games/xfreecell/patches/patch-util.h | 13 +++ games/xfreecell/patches/patch-widget_util.cpp | 11 ++- games/xfreecell/patches/patch-widget_widget.h | 30 +++++++ 15 files changed, 488 insertions(+), 33 deletions(-) delete mode 100644 games/xfreecell/patches/patch-ad create mode 100644 games/xfreecell/patches/patch-boundingMask.bm create mode 100644 games/xfreecell/patches/patch-clipMask.bm create mode 100644 games/xfreecell/patches/patch-face.bm create mode 100644 games/xfreecell/patches/patch-rank.bm create mode 100644 games/xfreecell/patches/patch-spade_lg.bm create mode 100644 games/xfreecell/patches/patch-stack.cpp create mode 100644 games/xfreecell/patches/patch-suit.bm create mode 100644 games/xfreecell/patches/patch-util.cpp create mode 100644 games/xfreecell/patches/patch-util.h create mode 100644 games/xfreecell/patches/patch-widget_widget.h (limited to 'games/xfreecell') diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile index da29af96bf4..c4d546e1693 100644 --- a/games/xfreecell/Makefile +++ b/games/xfreecell/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2017/09/06 10:40:28 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2018/02/19 09:51:48 he Exp $ DISTNAME= xfreecell-1.0.5b -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= games #MASTER_SITES= #http://www2.giganet.net/~nakayama/ EXTRACT_SUFX= .tgz diff --git a/games/xfreecell/distinfo b/games/xfreecell/distinfo index 7f2739a0055..e6c4303f6b4 100644 --- a/games/xfreecell/distinfo +++ b/games/xfreecell/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 20:57:08 agc Exp $ +$NetBSD: distinfo,v 1.11 2018/02/19 09:51:48 he Exp $ SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6 RMD160 (xfreecell-1.0.5b.tgz) = 2629217bf29734bb25b30ca8aaec62ae19d0ff6f @@ -7,11 +7,20 @@ Size (xfreecell-1.0.5b.tgz) = 49367 bytes SHA1 (patch-aa) = d5235b5a34df4ea12c249d680cc6e674f1c50626 SHA1 (patch-ab) = a34285fa7e8564d18d91cdb23affd1afb5cd8938 SHA1 (patch-ac) = f2fb8f2db71c4051eb28352f02a0fed09f69f97f -SHA1 (patch-ad) = cfdf8f50b5bba32ea8a1bc048e89e0594e85c072 SHA1 (patch-ae) = cbdf88cf997d8f4dfd683dc0e0d10a46d3ec848b -SHA1 (patch-card.cpp) = 7a1f8f07d1a9cdba4427771ab3e7553ae667d7df +SHA1 (patch-boundingMask.bm) = 80f3632ea2774fdd176c3e8d424cc318f3d104ff +SHA1 (patch-card.cpp) = 38396dcd23e72ffab6590caab15a98f3fd3b8fce +SHA1 (patch-clipMask.bm) = e2ca037417396eb5c0c458ce868a7bb0f10d5b6c +SHA1 (patch-face.bm) = b30e39dc9490f14fe574c2b455ec6767953cfb21 SHA1 (patch-freecell.cpp) = 298cc7c3c65b9371ed65a1e987a5d5c790e2ee73 SHA1 (patch-option.cpp) = 31cc65ae105f5fa3885717a4ff99341a864978dc +SHA1 (patch-rank.bm) = a36d86bbc6e177de61132b552dcc17671031a338 +SHA1 (patch-spade_lg.bm) = 1f491a350c426739fdb2035782c4be4523b37bbb +SHA1 (patch-stack.cpp) = ec918200d3e3a1b866671cc41b7f416ff5b113a1 +SHA1 (patch-suit.bm) = 3ee476c43436d8ac25ef48ed5c650f32846dc7a5 +SHA1 (patch-util.cpp) = 319924dbb57de58b2815367ad0f3e28e053f049b +SHA1 (patch-util.h) = c4c00600f8bab887fc6291b6d44218f8780dc697 SHA1 (patch-widget_font.cpp) = 968f4142220d7470819e8ead79e00195ba2837dd SHA1 (patch-widget_scrollbar.cpp) = 006e69e6dcb96448fd04d21d049f113fde756cc3 -SHA1 (patch-widget_util.cpp) = 5ea757fee16555cec98b6ba0d983fde22c2345c1 +SHA1 (patch-widget_util.cpp) = 9f84e3268238b58c17315b08764b9dcddbd7a348 +SHA1 (patch-widget_widget.h) = da99f6b9cb99b708c7547f30dada2b5cbaa2732c diff --git a/games/xfreecell/patches/patch-ad b/games/xfreecell/patches/patch-ad deleted file mode 100644 index 0dcfd601eaa..00000000000 --- a/games/xfreecell/patches/patch-ad +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2008/05/24 15:59:27 obache Exp $ - ---- widget/widget.h.orig 1999-03-15 16:29:32.000000000 +0000 -+++ widget/widget.h -@@ -8,6 +8,8 @@ - #include - #include - -+using namespace std; -+ - const char defaultFont[] = "7x14"; - - extern Display* NSdpy; -@@ -42,6 +44,7 @@ Display* NSdisplay(); - // ##### NSComponent ##### - class NSComponent { - public: -+ virtual ~NSComponent() {}; - virtual int x() const = 0; - virtual int y() const = 0; - virtual unsigned int width() const = 0; diff --git a/games/xfreecell/patches/patch-boundingMask.bm b/games/xfreecell/patches/patch-boundingMask.bm new file mode 100644 index 00000000000..8bf625afc2d --- /dev/null +++ b/games/xfreecell/patches/patch-boundingMask.bm @@ -0,0 +1,13 @@ +$NetBSD: patch-boundingMask.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- boundingMask.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ boundingMask.bm +@@ -2,7 +2,7 @@ + #define boundingMask_height 123 + #define boundingMask_x_hot 0 + #define boundingMask_y_hot 0 +-static char boundingMask_bits[] = { ++static unsigned char boundingMask_bits[] = { + 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0xf8, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfc, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, diff --git a/games/xfreecell/patches/patch-card.cpp b/games/xfreecell/patches/patch-card.cpp index f0791e2b0cd..b5ab29a12ef 100644 --- a/games/xfreecell/patches/patch-card.cpp +++ b/games/xfreecell/patches/patch-card.cpp @@ -1,9 +1,43 @@ -$NetBSD: patch-card.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $ +$NetBSD: patch-card.cpp,v 1.2 2018/02/19 09:51:48 he Exp $ ---- card.cpp.orig 2011-11-22 17:05:24.000000000 +0000 +--- card.cpp.orig 1999-03-27 13:36:28.000000000 +0000 +++ card.cpp @@ -1,3 +1,4 @@ +#include #include #include #ifdef SHAPE +@@ -40,7 +41,7 @@ static Pixmap boundingMask; + static Pixmap clipMask; + #endif + +-static char bitmap[bmWidth * (cardHeight - 2)]; ++static unsigned char bitmap[bmWidth * (cardHeight - 2)]; + static MoveMode moveMode; + + Card::Card(Suit s, unsigned int v) +@@ -49,9 +50,9 @@ Card::Card(Suit s, unsigned int v) + #ifdef SHAPE + if (Option::roundCard() && !initialized) { + //Shape +- boundingMask = XCreateBitmapFromData(dpy, root(), boundingMask_bits, ++ boundingMask = XCreateBitmapFromData(dpy, root(), (const char*)boundingMask_bits, + boundingMask_width, boundingMask_height); +- clipMask = XCreateBitmapFromData(dpy, root(), clipMask_bits, clipMask_width, ++ clipMask = XCreateBitmapFromData(dpy, root(), (const char*)clipMask_bits, clipMask_width, + clipMask_height); + + //Cursor +@@ -89,10 +90,10 @@ Card::Card(Suit s, unsigned int v) + hilight = getColor(dpy, "lightskyblue4"); + + _usualPixmap = +- XCreatePixmapFromBitmapData(dpy, gameWindow, bitmap, cardWidth - 2, ++ XCreatePixmapFromBitmapData(dpy, gameWindow, (char*)bitmap, cardWidth - 2, + cardHeight - 2, fore, back, DefaultDepth(dpy, DefaultScreen(dpy))); + _hilightedPixmap = +- XCreatePixmapFromBitmapData(dpy, gameWindow, bitmap, cardWidth - 2, ++ XCreatePixmapFromBitmapData(dpy, gameWindow, (char*)bitmap, cardWidth - 2, + cardHeight - 2, fore, hilight, DefaultDepth(dpy, DefaultScreen(dpy))); + + selectInput(ButtonPressMask | EnterWindowMask | LeaveWindowMask); diff --git a/games/xfreecell/patches/patch-clipMask.bm b/games/xfreecell/patches/patch-clipMask.bm new file mode 100644 index 00000000000..092ff8f046d --- /dev/null +++ b/games/xfreecell/patches/patch-clipMask.bm @@ -0,0 +1,13 @@ +$NetBSD: patch-clipMask.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- clipMask.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ clipMask.bm +@@ -2,7 +2,7 @@ + #define clipMask_height 123 + #define clipMask_x_hot 0 + #define clipMask_y_hot 0 +-static char clipMask_bits[] = { ++static unsigned char clipMask_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xe0, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x83, 0xf8, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xfc, 0xff, 0xff, 0xff, 0xff, 0xff, diff --git a/games/xfreecell/patches/patch-face.bm b/games/xfreecell/patches/patch-face.bm new file mode 100644 index 00000000000..e96d5655958 --- /dev/null +++ b/games/xfreecell/patches/patch-face.bm @@ -0,0 +1,112 @@ +$NetBSD: patch-face.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- face.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ face.bm +@@ -13,7 +13,7 @@ + #define king_c_height 92 + #define king_c_x_hot -1 + #define king_c_y_hot -1 +-static char king_c_bits[] = { ++static unsigned char king_c_bits[] = { + 0x00, 0xb0, 0x20, 0x08, 0x82, 0x06, 0x80, 0xe3, 0x20, 0x08, 0x82, 0x03, + 0xc0, 0xc7, 0xdb, 0xb6, 0xed, 0x01, 0xe0, 0x8f, 0x21, 0x08, 0xc2, 0x00, + 0xe0, 0x0f, 0xff, 0xff, 0x7f, 0x00, 0xe0, 0x0f, 0x56, 0x55, 0x35, 0x00, +@@ -64,7 +64,7 @@ static char king_c_bits[] = { + #define king_d_height 92 + #define king_d_x_hot -1 + #define king_d_y_hot -1 +-static char king_d_bits[] = { ++static unsigned char king_d_bits[] = { + 0x00, 0x2c, 0x22, 0x22, 0xa2, 0x01, 0x80, 0x58, 0x55, 0x55, 0xd5, 0x00, + 0x80, 0x30, 0x22, 0x22, 0xe2, 0x08, 0xc0, 0xe1, 0x88, 0x88, 0x48, 0x04, + 0xc0, 0xc1, 0x55, 0x55, 0x75, 0x06, 0xe0, 0x83, 0x89, 0x88, 0x28, 0x45, +@@ -115,7 +115,7 @@ static char king_d_bits[] = { + #define king_h_height 92 + #define king_h_x_hot -1 + #define king_h_y_hot -1 +-static char king_h_bits[] = { ++static unsigned char king_h_bits[] = { + 0x00, 0x08, 0x00, 0x00, 0x80, 0x00, 0x00, 0xb0, 0x6d, 0xdb, 0x76, 0x00, + 0x00, 0x60, 0x55, 0x55, 0x55, 0x00, 0x00, 0xc0, 0x28, 0x8a, 0x22, 0x03, + 0x00, 0x80, 0x10, 0x04, 0xa1, 0x04, 0x38, 0x38, 0x11, 0x04, 0xf1, 0x02, +@@ -166,7 +166,7 @@ static char king_h_bits[] = { + #define king_s_height 92 + #define king_s_x_hot -1 + #define king_s_y_hot -1 +-static char king_s_bits[] = { ++static unsigned char king_s_bits[] = { + 0x00, 0xa0, 0x10, 0x04, 0x41, 0x02, 0x00, 0xc2, 0x39, 0x8e, 0x63, 0x01, + 0x00, 0x82, 0x7d, 0xdf, 0xf7, 0x00, 0x00, 0x07, 0x7d, 0xdf, 0x67, 0x00, + 0x00, 0x07, 0x12, 0x04, 0x21, 0x00, 0x80, 0x0f, 0xfc, 0xff, 0x3f, 0x00, +@@ -217,7 +217,7 @@ static char king_s_bits[] = { + #define queen_c_height 92 + #define queen_c_x_hot -1 + #define queen_c_y_hot -1 +-static char queen_c_bits[] = { ++static unsigned char queen_c_bits[] = { + 0xc0, 0xec, 0x92, 0x02, 0x00, 0x00, 0xe0, 0xef, 0x29, 0x03, 0xe0, 0x00, + 0xe1, 0xaf, 0x44, 0x02, 0xf0, 0x01, 0xc3, 0xa6, 0x92, 0x02, 0xf8, 0x03, + 0x02, 0xf6, 0x29, 0x03, 0xf8, 0x03, 0x66, 0xb6, 0xcf, 0x03, 0xf8, 0x03, +@@ -268,7 +268,7 @@ static char queen_c_bits[] = { + #define queen_d_height 92 + #define queen_d_x_hot -1 + #define queen_d_y_hot -1 +-static char queen_d_bits[] = { ++static unsigned char queen_d_bits[] = { + 0x04, 0xf1, 0x49, 0x01, 0x00, 0x00, 0xc8, 0xb7, 0x94, 0x01, 0x80, 0x00, + 0x08, 0x79, 0x22, 0x03, 0x80, 0x00, 0x88, 0x58, 0x41, 0x05, 0xc0, 0x01, + 0xe8, 0xbf, 0x80, 0x09, 0xc0, 0x01, 0x88, 0xec, 0x77, 0x0b, 0xe0, 0x03, +@@ -319,7 +319,7 @@ static char queen_d_bits[] = { + #define queen_h_height 92 + #define queen_h_x_hot -1 + #define queen_h_y_hot -1 +-static char queen_h_bits[] = { ++static unsigned char queen_h_bits[] = { + 0x00, 0x54, 0x05, 0x20, 0x00, 0x00, 0x00, 0xac, 0xce, 0x20, 0x0e, 0x0e, + 0x00, 0x56, 0xcd, 0x11, 0x1f, 0x1f, 0x00, 0xae, 0xda, 0x91, 0xbf, 0x3f, + 0x00, 0x16, 0x15, 0x90, 0xbf, 0x3f, 0x00, 0x0e, 0x3a, 0x93, 0xff, 0x3f, +@@ -370,7 +370,7 @@ static char queen_h_bits[] = { + #define queen_s_height 92 + #define queen_s_x_hot -1 + #define queen_s_y_hot -1 +-static char queen_s_bits[] = { ++static unsigned char queen_s_bits[] = { + 0x00, 0x96, 0xb4, 0x10, 0x00, 0x00, 0x00, 0x4e, 0x19, 0x08, 0x00, 0x00, + 0x00, 0x26, 0xb2, 0x0b, 0x00, 0x00, 0x04, 0x15, 0x34, 0x0b, 0x20, 0x00, + 0x04, 0x0d, 0xb8, 0x0a, 0x20, 0x00, 0x0a, 0x75, 0x7c, 0x08, 0x70, 0x00, +@@ -421,7 +421,7 @@ static char queen_s_bits[] = { + #define jack_c_height 92 + #define jack_c_x_hot -1 + #define jack_c_y_hot -1 +-static char jack_c_bits[] = { ++static unsigned char jack_c_bits[] = { + 0x60, 0xab, 0x6a, 0x6b, 0x03, 0x00, 0xc0, 0xd6, 0x56, 0xb5, 0xe1, 0x00, + 0x80, 0xad, 0x6a, 0xdb, 0xf0, 0x01, 0x81, 0xdb, 0x56, 0x6d, 0xf8, 0x03, + 0x83, 0xf6, 0x7e, 0x37, 0xf8, 0x03, 0x46, 0x0e, 0x00, 0x18, 0xf8, 0x03, +@@ -472,7 +472,7 @@ static char jack_c_bits[] = { + #define jack_d_height 92 + #define jack_d_x_hot -1 + #define jack_d_y_hot -1 +-static char jack_d_bits[] = { ++static unsigned char jack_d_bits[] = { + 0x00, 0xce, 0xed, 0x76, 0x0e, 0x00, 0x00, 0x9c, 0xed, 0x36, 0x87, 0x00, + 0x00, 0x38, 0x0c, 0x86, 0x83, 0x00, 0x01, 0xf0, 0xff, 0xff, 0xc1, 0x01, + 0x03, 0xf0, 0xff, 0xff, 0xc0, 0x01, 0x07, 0xb0, 0x02, 0xc0, 0xe0, 0x03, +@@ -523,7 +523,7 @@ static char jack_d_bits[] = { + #define jack_h_height 92 + #define jack_h_x_hot -1 + #define jack_h_y_hot -1 +-static char jack_h_bits[] = { ++static unsigned char jack_h_bits[] = { + 0x60, 0xca, 0x64, 0xca, 0x00, 0x00, 0xc0, 0xd4, 0x6a, 0x65, 0x00, 0x00, + 0x81, 0xc9, 0x64, 0x32, 0x07, 0x07, 0x03, 0xd3, 0x6a, 0x99, 0x8f, 0x0f, + 0x17, 0xc6, 0x60, 0xcc, 0xdf, 0x1f, 0x37, 0xfc, 0xff, 0xcf, 0xdf, 0x1f, +@@ -574,7 +574,7 @@ static char jack_h_bits[] = { + #define jack_s_height 92 + #define jack_s_x_hot -1 + #define jack_s_y_hot -1 +-static char jack_s_bits[] = { ++static unsigned char jack_s_bits[] = { + 0xb8, 0xba, 0xee, 0xea, 0x40, 0x00, 0x70, 0x75, 0xd7, 0x75, 0xe0, 0x00, + 0xe4, 0xba, 0xee, 0x3a, 0xe0, 0x00, 0xca, 0x75, 0xd7, 0x1d, 0xf0, 0x01, + 0x8e, 0xff, 0xff, 0x0f, 0xf0, 0x01, 0x0e, 0xff, 0xff, 0x0f, 0xf8, 0x03, diff --git a/games/xfreecell/patches/patch-rank.bm b/games/xfreecell/patches/patch-rank.bm new file mode 100644 index 00000000000..41984b14731 --- /dev/null +++ b/games/xfreecell/patches/patch-rank.bm @@ -0,0 +1,13 @@ +$NetBSD: patch-rank.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- rank.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ rank.bm +@@ -11,7 +11,7 @@ + */ + #define rank_width 9 + #define rank_height 14 +-static char rank_bits[13][28] = { ++static unsigned char rank_bits[13][28] = { + { 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x6c, 0x00, 0x6c, 0x00, 0x6c, 0x00, + 0x6c, 0x00, 0xc6, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xc6, 0x00, 0x83, 0x01, + 0x83, 0x01, 0x83, 0x01}, diff --git a/games/xfreecell/patches/patch-spade_lg.bm b/games/xfreecell/patches/patch-spade_lg.bm new file mode 100644 index 00000000000..e07a80a748c --- /dev/null +++ b/games/xfreecell/patches/patch-spade_lg.bm @@ -0,0 +1,12 @@ +$NetBSD: patch-spade_lg.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- spade_lg.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ spade_lg.bm +@@ -1,6 +1,6 @@ + #define spade_lg_width 39 + #define spade_lg_height 52 +-static char spade_lg_bits[] = { ++static unsigned char spade_lg_bits[] = { + 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x00, + 0x00, 0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, diff --git a/games/xfreecell/patches/patch-stack.cpp b/games/xfreecell/patches/patch-stack.cpp new file mode 100644 index 00000000000..58c16aab3ea --- /dev/null +++ b/games/xfreecell/patches/patch-stack.cpp @@ -0,0 +1,33 @@ +$NetBSD: patch-stack.cpp,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- stack.cpp.orig 1999-03-21 16:48:40.000000000 +0000 ++++ stack.cpp +@@ -219,16 +219,16 @@ void SingleStack::dispatchEvent(const XE + static Pixmap clipMask = 0; + static Pixmap boundingMask = 0; + static bool initialized = false; +-static char bitmap[bmWidth * (cardHeight - 2)]; ++static unsigned char bitmap[bmWidth * (cardHeight - 2)]; + + DoneStack::DoneStack(int x_ini, int y_ini, Suit s) + : Stack(x_ini, y_ini) + { + #ifdef SHAPE + if (Option::roundCard() && !initialized) { +- boundingMask = XCreateBitmapFromData(dpy, RootWindow(dpy, 0), boundingMask_bits, ++ boundingMask = XCreateBitmapFromData(dpy, RootWindow(dpy, 0), (const char*)boundingMask_bits, + boundingMask_width, boundingMask_height); +- clipMask = XCreateBitmapFromData(dpy, RootWindow(dpy, 0), clipMask_bits, clipMask_width, ++ clipMask = XCreateBitmapFromData(dpy, RootWindow(dpy, 0), (const char*)clipMask_bits, clipMask_width, + clipMask_height); + initialized = true; + } +@@ -247,7 +247,7 @@ DoneStack::DoneStack(int x_ini, int y_in + back = WhitePixel(dpy, 0); + makeOneSymbolBitmap(s, bitmap); + +- bgpixmap = XCreatePixmapFromBitmapData(dpy, gameWindow, bitmap, cardWidth - 2, ++ bgpixmap = XCreatePixmapFromBitmapData(dpy, gameWindow, (char*)bitmap, cardWidth - 2, + cardHeight - 2, fore, back, DefaultDepth(dpy, DefaultScreen(dpy))); + resize(cardWidth, cardHeight); + backgroundPixmap(bgpixmap); diff --git a/games/xfreecell/patches/patch-suit.bm b/games/xfreecell/patches/patch-suit.bm new file mode 100644 index 00000000000..468b3d5d999 --- /dev/null +++ b/games/xfreecell/patches/patch-suit.bm @@ -0,0 +1,71 @@ +$NetBSD: patch-suit.bm,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- suit.bm.orig 1999-02-26 19:26:25.000000000 +0000 ++++ suit.bm +@@ -13,7 +13,7 @@ + #define spade_height 19 + #define spade_x_hot -1 + #define spade_y_hot -1 +-static char spade_bits[] = { ++static unsigned char spade_bits[] = { + 0x80, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, + 0xf0, 0x07, 0xf8, 0x0f, 0xfc, 0x1f, 0xfe, 0x3f, 0xfe, 0x3f, 0xff, 0x7f, + 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xbe, 0x3e, 0x9c, 0x1c, 0xc0, 0x01, +@@ -22,14 +22,14 @@ static char spade_bits[] = { + #define spade_sm_height 12 + #define spade_sm_x_hot -1 + #define spade_sm_y_hot -1 +-static char spade_sm_bits[] = { ++static unsigned char spade_sm_bits[] = { + 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00, + 0xff, 0x01, 0xff, 0x01, 0xff, 0x01, 0xd6, 0x00, 0x10, 0x00, 0x38, 0x00}; + #define heart_width 15 + #define heart_height 17 + #define heart_x_hot -1 + #define heart_y_hot -1 +-static char heart_bits[] = { ++static unsigned char heart_bits[] = { + 0x1c, 0x1c, 0x3e, 0x3e, 0x7f, 0x7f, 0x7f, 0x7f, 0xff, 0x7f, 0xff, 0x7f, + 0xfe, 0x3f, 0xfe, 0x3f, 0xfc, 0x1f, 0xf8, 0x0f, 0xf0, 0x07, 0xf0, 0x07, + 0xe0, 0x03, 0xc0, 0x01, 0xc0, 0x01, 0x80, 0x00, 0x80, 0x00}; +@@ -37,14 +37,14 @@ static char heart_bits[] = { + #define heart_sm_height 11 + #define heart_sm_x_hot -1 + #define heart_sm_y_hot -1 +-static char heart_sm_bits[] = { ++static unsigned char heart_sm_bits[] = { + 0xc6, 0x00, 0xef, 0x01, 0xff, 0x01, 0xff, 0x01, 0xfe, 0x00, 0xfe, 0x00, + 0x7c, 0x00, 0x38, 0x00, 0x38, 0x00, 0x10, 0x00, 0x10, 0x00}; + #define club_width 15 + #define club_height 16 + #define club_x_hot -1 + #define club_y_hot -1 +-static char club_bits[] = { ++static unsigned char club_bits[] = { + 0xc0, 0x01, 0xe0, 0x03, 0xf0, 0x07, 0xf0, 0x07, 0xf0, 0x07, 0xe0, 0x03, + 0xdc, 0x1d, 0xfe, 0x3f, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0xbe, 0x3e, + 0x9c, 0x1c, 0xc0, 0x01, 0xc0, 0x01, 0xe0, 0x03}; +@@ -52,14 +52,14 @@ static char club_bits[] = { + #define club_sm_height 11 + #define club_sm_x_hot -1 + #define club_sm_y_hot -1 +-static char club_sm_bits[] = { ++static unsigned char club_sm_bits[] = { + 0x38, 0x00, 0x7c, 0x00, 0x7c, 0x00, 0x38, 0x00, 0xd6, 0x00, 0xff, 0x01, + 0xff, 0x01, 0xff, 0x01, 0xd6, 0x00, 0x00, 0x00, 0x38, 0x00}; + #define diamond_width 13 + #define diamond_height 19 + #define diamond_x_hot -1 + #define diamond_y_hot -1 +-static char diamond_bits[] = { ++static unsigned char diamond_bits[] = { + 0x40, 0x00, 0x40, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xf0, 0x01, 0xf8, 0x03, + 0xf8, 0x03, 0xfc, 0x07, 0xfe, 0x0f, 0xff, 0x1f, 0xfe, 0x0f, 0xfc, 0x07, + 0xf8, 0x03, 0xf8, 0x03, 0xf0, 0x01, 0xe0, 0x00, 0xe0, 0x00, 0x40, 0x00, +@@ -68,5 +68,5 @@ static char diamond_bits[] = { + #define diamond_sm_height 12 + #define diamond_sm_x_hot -1 + #define diamond_sm_y_hot -1 +-static char diamond_sm_bits[] = { ++static unsigned char diamond_sm_bits[] = { + 0x08, 0x08, 0x1c, 0x1c, 0x3e, 0x7f, 0x3e, 0x1c, 0x1c, 0x08, 0x08, 0x00}; diff --git a/games/xfreecell/patches/patch-util.cpp b/games/xfreecell/patches/patch-util.cpp new file mode 100644 index 00000000000..5da8f0fd952 --- /dev/null +++ b/games/xfreecell/patches/patch-util.cpp @@ -0,0 +1,120 @@ +$NetBSD: patch-util.cpp,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- util.cpp.orig 1999-03-27 20:17:13.000000000 +0000 ++++ util.cpp +@@ -10,9 +10,9 @@ + #include "suit.bm" + #include "spade_lg.bm" + +-static void draw(const char*, int, int, int, int, char*); +-static void draw180(const char*, int, int, int, int, char*); +-static void drawBox(int, int, int, int, char*); ++static void draw(unsigned const char*, int, int, int, int, unsigned char*); ++static void draw180(unsigned const char*, int, int, int, int, unsigned char*); ++static void drawBox(int, int, int, int, unsigned char*); + + unsigned long getColor(Display *dpy, const char* name) + { +@@ -39,7 +39,7 @@ SuitColor suitColor(Suit s) + + // bitmap + +-const char* faces[4][3] = { ++const unsigned char* faces[4][3] = { + {jack_h_bits, queen_h_bits, king_h_bits}, + {jack_d_bits, queen_d_bits, king_d_bits}, + {jack_c_bits, queen_c_bits, king_c_bits}, +@@ -78,24 +78,24 @@ static const unsigned char reverseByte[0 + 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, + 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff + }; +-static const char* small_suit[4] = { ++static unsigned const char* small_suit[4] = { + heart_sm_bits, diamond_sm_bits, club_sm_bits, spade_sm_bits}; + static const int small_suit_width[4] = { + heart_sm_width, diamond_sm_width, club_sm_width, spade_sm_width}; + static const int small_suit_height[4] = { + heart_sm_height, diamond_sm_height, club_sm_height, spade_sm_height}; +-static const char* main_suit[4] = { ++static unsigned const char* main_suit[4] = { + heart_bits, diamond_bits, club_bits, spade_bits}; + static const int suit_width[4] = { + heart_width, diamond_width, club_width, spade_width}; + static const int suit_height[4] = { + heart_height, diamond_height, club_height, spade_height}; + +-void makeBitmap(Suit s, int v, char * bitmap) ++void makeBitmap(Suit s, int v, unsigned char * bitmap) + { + memset(bitmap, 0, bmWidth*(cardHeight-2)); // erase + if (v <= 9) { +- const char* b = main_suit[s]; ++ const unsigned char* b = main_suit[s]; + int w = suit_width[s]; + int h = suit_height[s]; + if (s == Spade && v == 0) { // ace of spades +@@ -156,9 +156,9 @@ void makeBitmap(Suit s, int v, char * bi + draw180(small_suit[s], x, y, w, h, bitmap); + } + +-void makeOneSymbolBitmap(Suit s, char* bitmap) ++void makeOneSymbolBitmap(Suit s, unsigned char* bitmap) + { +- const char* b = main_suit[s]; ++ unsigned const char* b = main_suit[s]; + int w = suit_width[s]; + int h = suit_height[s]; + +@@ -166,11 +166,11 @@ void makeOneSymbolBitmap(Suit s, char* b + draw(b, (cardWidth-2-w)/2, (cardHeight-2-h)/2, w, h, bitmap); + } + +-static void draw(const char* from, int x, int y, int w, int h, char* bitmap) { +- char* to1 = bitmap+y*bmWidth+x/8; ++static void draw(unsigned const char* from, int x, int y, int w, int h, unsigned char* bitmap) { ++ unsigned char* to1 = bitmap+y*bmWidth+x/8; + int shift = x%8; + for (int j = 0; j < h; j++) { +- char* to = to1; to1 += bmWidth; ++ unsigned char* to = to1; to1 += bmWidth; + char wrap = 0; + for (int i = 0; i < w; i += 8) { + unsigned char v = *from++; +@@ -181,13 +181,13 @@ static void draw(const char* from, int x + } + } + +-static void draw180(const char* from, int x, int y, int w, int h, char* bitmap) { ++static void draw180(unsigned const char* from, int x, int y, int w, int h, unsigned char* bitmap) { + x = cardWidth-3-x; + y = cardHeight-3-y; +- char* to1 = bitmap+y*bmWidth+x/8; ++ unsigned char* to1 = bitmap+y*bmWidth+x/8; + int shift = 7-x%8; + for (int j = 0; j < h; j++) { +- char* to = to1; to1 -= bmWidth; ++ unsigned char* to = to1; to1 -= bmWidth; + char wrap = 0; + for (int i = 0; i < w; i += 8) { + unsigned char v = reverseByte[(unsigned char)(*from++)]; +@@ -198,14 +198,14 @@ static void draw180(const char* from, in + } + } + +-static void drawBox(int x, int y, int w, int h, char* bitmap) { +- char* to1 = bitmap+y*bmWidth+x/8; +- char* to2 = bitmap+y*bmWidth+(x+w-1)/8; +- char v1 = 1 << (x%8); +- char v2 = 1 << ((x+w-1)%8); ++static void drawBox(int x, int y, int w, int h, unsigned char* bitmap) { ++ unsigned char* to1 = bitmap+y*bmWidth+x/8; ++ unsigned char* to2 = bitmap+y*bmWidth+(x+w-1)/8; ++ unsigned char v1 = 1 << (x%8); ++ unsigned char v2 = 1 << ((x+w-1)%8); + *to1 = *(to1+(h-1)*bmWidth) = ~(v1-1); + *to2 = *(to2+(h-1)*bmWidth) = (v2<<1)-1; +- for (char* t = to1+1; t < to2; t++) *t = *(t+(h-1)*bmWidth) = 255; ++ for (unsigned char* t = to1+1; t < to2; t++) *t = *(t+(h-1)*bmWidth) = 255; + for (int j = 2; j < h; j++) { + to1 += bmWidth; *to1 |= v1; + to2 += bmWidth; *to2 |= v2; diff --git a/games/xfreecell/patches/patch-util.h b/games/xfreecell/patches/patch-util.h new file mode 100644 index 00000000000..8de4ccdf485 --- /dev/null +++ b/games/xfreecell/patches/patch-util.h @@ -0,0 +1,13 @@ +$NetBSD: patch-util.h,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- util.h.orig 1999-03-27 20:16:58.000000000 +0000 ++++ util.h +@@ -7,6 +7,6 @@ + unsigned long getColor(Display*, const char*); + SuitColor suitColor(Suit); + +-void makeBitmap(Suit, int, char*); +-void makeOneSymbolBitmap(Suit, char*); ++void makeBitmap(Suit, int, unsigned char*); ++void makeOneSymbolBitmap(Suit, unsigned char*); + #endif diff --git a/games/xfreecell/patches/patch-widget_util.cpp b/games/xfreecell/patches/patch-widget_util.cpp index 14eda727094..711f8fe7131 100644 --- a/games/xfreecell/patches/patch-widget_util.cpp +++ b/games/xfreecell/patches/patch-widget_util.cpp @@ -1,10 +1,13 @@ -$NetBSD: patch-widget_util.cpp,v 1.1 2011/11/22 18:11:14 joerg Exp $ +$NetBSD: patch-widget_util.cpp,v 1.2 2018/02/19 09:51:48 he Exp $ ---- widget/util.cpp.orig 2011-11-22 17:07:23.000000000 +0000 +--- widget/util.cpp.orig 1999-03-15 16:01:51.000000000 +0000 +++ widget/util.cpp -@@ -1,4 +1,5 @@ +@@ -1,6 +1,7 @@ #include "widget.h" +#include - unsigned long allocColor(Display* NSdpy, unsigned int red, unsigned int green, unsigned int blue) +-unsigned long allocColor(Display* NSdpy, unsigned int red, unsigned int green, unsigned int blue) ++unsigned long allocColor(Display* NSdpy, short unsigned int red, short unsigned int green, short unsigned int blue) { + XColor col = { 0, red, green, blue}; + if (XAllocColor(NSdpy, DefaultColormap(NSdpy, 0), &col) == 0) { diff --git a/games/xfreecell/patches/patch-widget_widget.h b/games/xfreecell/patches/patch-widget_widget.h new file mode 100644 index 00000000000..c3717b47217 --- /dev/null +++ b/games/xfreecell/patches/patch-widget_widget.h @@ -0,0 +1,30 @@ +$NetBSD: patch-widget_widget.h,v 1.1 2018/02/19 09:51:48 he Exp $ + +--- widget/widget.h.orig 1999-03-15 16:29:32.000000000 +0000 ++++ widget/widget.h +@@ -8,6 +8,8 @@ + #include + #include + ++using namespace std; ++ + const char defaultFont[] = "7x14"; + + extern Display* NSdpy; +@@ -31,7 +33,7 @@ class NSFrame; + class NSScrollbarListener; + class NSVScrollbar; + +-unsigned long allocColor(Display*, unsigned int R, unsigned int G, unsigned int B); ++unsigned long allocColor(Display*, short unsigned int R, short unsigned int G, short unsigned int B); + unsigned long nameToPixel(const char* colorName); + void NSInitialize(); + void NSMainLoop(); +@@ -42,6 +44,7 @@ Display* NSdisplay(); + // ##### NSComponent ##### + class NSComponent { + public: ++ virtual ~NSComponent() {}; + virtual int x() const = 0; + virtual int y() const = 0; + virtual unsigned int width() const = 0; -- cgit v1.2.3