Date: Tue, 25 Aug 2015 20:52:00 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395316 - in head/games/xinvaders: . files Message-ID: <201508252052.t7PKq0f8055111@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Tue Aug 25 20:51:59 2015 New Revision: 395316 URL: https://svnweb.freebsd.org/changeset/ports/395316 Log: Properly fix the LP64 issue in the application resource handling rather than praying that globals end up in the lower 32-bit address space. Added: head/games/xinvaders/files/patch-vaders.h (contents, props changed) Modified: head/games/xinvaders/Makefile head/games/xinvaders/files/patch-main.c Modified: head/games/xinvaders/Makefile ============================================================================== --- head/games/xinvaders/Makefile Tue Aug 25 20:50:56 2015 (r395315) +++ head/games/xinvaders/Makefile Tue Aug 25 20:51:59 2015 (r395316) @@ -3,7 +3,7 @@ PORTNAME= xinvaders PORTVERSION= 2.1.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= SUNSITE/games/arcade/invaders Modified: head/games/xinvaders/files/patch-main.c ============================================================================== --- head/games/xinvaders/files/patch-main.c Tue Aug 25 20:50:56 2015 (r395315) +++ head/games/xinvaders/files/patch-main.c Tue Aug 25 20:51:59 2015 (r395316) @@ -1,62 +1,89 @@ ---- main.c.orig +--- main.c.orig 2000-09-10 22:32:16 UTC +++ main.c -@@ -38,55 +38,6 @@ - {"-debug", "*debug", XrmoptionNoArg, NULL}, - }; +@@ -26,7 +26,6 @@ Wed May 8 1991 + #include <X11/IntrinsicP.h> + #include <X11/Label.h> + #endif +-static int width, height; /* Size of window. */ + + #ifdef XFILESEARCHPATH + static void AddPathToSearchPath(); +@@ -40,51 +39,51 @@ static XrmOptionDescRec table[] = { --static XtResource resources[] = { -- {XtNwidth, XtCWidth, XtRInt, sizeof(int), + static XtResource resources[] = { + {XtNwidth, XtCWidth, XtRInt, sizeof(int), - (Cardinal)&width, XtRImmediate, (caddr_t) VWIDTH}, -- {XtNheight, XtCHeight, XtRInt, sizeof(int), ++ XtOffsetOf(AppData, width), XtRImmediate, (caddr_t) VWIDTH}, + {XtNheight, XtCHeight, XtRInt, sizeof(int), - (Cardinal)&height, XtRImmediate, (caddr_t) VHEIGHT}, -- {"debug", "Debug", XtRBoolean, sizeof(Boolean), ++ XtOffsetOf(AppData, height), XtRImmediate, (caddr_t) VHEIGHT}, + {"debug", "Debug", XtRBoolean, sizeof(Boolean), - (Cardinal)&debug, XtRString, "off"}, -- {"font", "Font", XtRString, sizeof(String), ++ XtOffsetOf(AppData, debug), XtRString, "off"}, + {"font", "Font", XtRString, sizeof(String), - (Cardinal)&vaderfont, XtRString, (String)"9x15"}, -- {"scale", "Scale", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, vaderfont), XtRString, (String)"9x15"}, + {"scale", "Scale", XtRInt, sizeof(int), - (Cardinal)&scale, XtRImmediate, (caddr_t) 2}, -- {"basewait", "BaseWait", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, scale), XtRImmediate, (caddr_t) 2}, + {"basewait", "BaseWait", XtRInt, sizeof(int), - (Cardinal)&basewait, XtRImmediate, (caddr_t) 10}, -- {"vaderwait", "VaderWait", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, basewait), XtRImmediate, (caddr_t) 10}, + {"vaderwait", "VaderWait", XtRInt, sizeof(int), - (Cardinal)&vaderwait, XtRImmediate, (caddr_t) 300}, -- {"spacerwait", "SpacerWait", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, vaderwait), XtRImmediate, (caddr_t) 300}, + {"spacerwait", "SpacerWait", XtRInt, sizeof(int), - (Cardinal)&spacerwait, XtRImmediate, (caddr_t) 50}, -- {"shotwait", "ShotWait", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, spacerwait), XtRImmediate, (caddr_t) 50}, + {"shotwait", "ShotWait", XtRInt, sizeof(int), - (Cardinal)&shotwait, XtRImmediate, (caddr_t) 10}, -- {"vshotwait", "VshotWait", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, shotwait), XtRImmediate, (caddr_t) 10}, + {"vshotwait", "VshotWait", XtRInt, sizeof(int), - (Cardinal)&vshotwait, XtRImmediate, (caddr_t) 30}, -- {"basecolor", "BaseColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, vshotwait), XtRImmediate, (caddr_t) 30}, + {"basecolor", "BaseColor", XtRPixel, sizeof(Pixel), - (Cardinal)&basepixel, XtRString, "cyan"}, -- {"spacercolor", "SpacerColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, basepixel), XtRString, "cyan"}, + {"spacercolor", "SpacerColor", XtRPixel, sizeof(Pixel), - (Cardinal)&spacerpixel, XtRString, "gray"}, -- {"buildingcolor", "BuildingColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, spacerpixel), XtRString, "gray"}, + {"buildingcolor", "BuildingColor", XtRPixel, sizeof(Pixel), - (Cardinal)&buildingpixel, XtRString, "yellow"}, -- {"vader1color", "Vader1Color", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, buildingpixel), XtRString, "yellow"}, + {"vader1color", "Vader1Color", XtRPixel, sizeof(Pixel), - (Cardinal)&vader1pixel, XtRString, "blue"}, -- {"vader2color", "Vader2Color", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, vader1pixel), XtRString, "blue"}, + {"vader2color", "Vader2Color", XtRPixel, sizeof(Pixel), - (Cardinal)&vader2pixel, XtRString, "green"}, -- {"vader3color", "Vader3Color", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, vader2pixel), XtRString, "green"}, + {"vader3color", "Vader3Color", XtRPixel, sizeof(Pixel), - (Cardinal)&vader3pixel, XtRString, "red"}, -- {"shotcolor", "ShotColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, vader3pixel), XtRString, "red"}, + {"shotcolor", "ShotColor", XtRPixel, sizeof(Pixel), - (Cardinal)&shotpixel, XtRString, "lavender"}, -- {"vshotcolor", "VshotColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, shotpixel), XtRString, "lavender"}, + {"vshotcolor", "VshotColor", XtRPixel, sizeof(Pixel), - (Cardinal)&vshotpixel, XtRString, "orange"}, -- {"scorecolor", "ScoreColor", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, vshotpixel), XtRString, "orange"}, + {"scorecolor", "ScoreColor", XtRPixel, sizeof(Pixel), - (Cardinal)&scorepixel, XtRString, "white"}, -- {"maxshots", "MaxShots", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, scorepixel), XtRString, "white"}, + {"maxshots", "MaxShots", XtRInt, sizeof(int), - (Cardinal) &maxshots, XtRImmediate, (caddr_t) 1}, -- {"maxvshots", "MaxVshots", XtRInt, sizeof(int), ++ XtOffsetOf(AppData, maxshots), XtRImmediate, (caddr_t) 1}, + {"maxvshots", "MaxVshots", XtRInt, sizeof(int), - (Cardinal) &maxvshots, XtRImmediate, (caddr_t) 6}, -- {"defaultfore", "DefaultFore", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, maxvshots), XtRImmediate, (caddr_t) 6}, + {"defaultfore", "DefaultFore", XtRPixel, sizeof(Pixel), - (Cardinal) &defaultfore, XtRString, "white"}, -- {"defaultback", "DefaultBack", XtRPixel, sizeof(Pixel), ++ XtOffsetOf(AppData, defaultfore), XtRString, "white"}, + {"defaultback", "DefaultBack", XtRPixel, sizeof(Pixel), - (Cardinal) &defaultback, XtRString, "black"}, --}; -- ++ XtOffsetOf(AppData, defaultback), XtRString, "black"}, + }; + - /*ARGSUSED*/ - static void CvtStringToFloat(args, num_args, fromVal, toVal) -@@ -141,13 +92,62 @@ +@@ -141,7 +140,7 @@ caddr_t data; return w; } @@ -65,58 +92,104 @@ { static Arg args[10]; int n; - Widget form, button; - /* extern WidgetClass labelwidgetclass; */ +@@ -161,25 +160,25 @@ int main(Cardinal argc, char **argv) + &argc, argv); + dpy = XtDisplay(toplevel); + XtAddConverter(XtRString, XtRFloat, CvtStringToFloat, NULL, 0); +- XtGetApplicationResources(toplevel, (caddr_t) NULL, ++ XtGetApplicationResources(toplevel, (caddr_t) &app_data, + resources, XtNumber(resources), + NULL, (Cardinal) 0); +- AddResource("*background", &defaultback); ++ AddResource("*background", &app_data.defaultback); + if (DisplayCells(dpy, DefaultScreen(dpy)) <= 2) + { +- basepixel = defaultfore; +- buildingpixel = defaultfore; +- vader1pixel = defaultfore; +- vader2pixel = defaultfore; +- vader3pixel = defaultfore; +- shotpixel = defaultfore; +- vshotpixel = defaultfore; +- scorepixel = defaultfore; ++ app_data.basepixel = app_data.defaultfore; ++ app_data.buildingpixel = app_data.defaultfore; ++ app_data.vader1pixel = app_data.defaultfore; ++ app_data.vader2pixel = app_data.defaultfore; ++ app_data.vader3pixel = app_data.defaultfore; ++ app_data.shotpixel = app_data.defaultfore; ++ app_data.vshotpixel = app_data.defaultfore; ++ app_data.scorepixel = app_data.defaultfore; + } +- if (scale<1) scale = 1; +- if (scale>2) scale = 2; +- width = scale*VWIDTH; +- height = scale*VHEIGHT; ++ if (app_data.scale<1) app_data.scale = 1; ++ if (app_data.scale>2) app_data.scale = 2; ++ app_data.width = app_data.scale*VWIDTH; ++ app_data.height = app_data.scale*VHEIGHT; + + form = XtCreateManagedWidget ("form", formWidgetClass, + toplevel, NULL, 0); +@@ -189,8 +188,8 @@ int main(Cardinal argc, char **argv) + XtSetArg (args[n], XtNright, XtChainLeft); n++; + XtSetArg (args[n], XtNtop, XtChainTop); n++; + XtSetArg (args[n], XtNbottom, XtChainTop); n++; +- XtSetArg (args[n], XtNwidth, width); n++; +- XtSetArg (args[n], XtNheight, height); n++; ++ XtSetArg (args[n], XtNwidth, app_data.width); n++; ++ XtSetArg (args[n], XtNheight, app_data.height); n++; + + gamewidget = (VadersWidget) + XtCreateManagedWidget("field", vadersWidgetClass, form, args, n); +@@ -204,29 +203,29 @@ int main(Cardinal argc, char **argv) + XtSetArg (args[n], XtNbottom, XtChainTop); n++; + XtSetArg (args[n], XtNfromHoriz, gamewidget); n++; + XtSetArg (args[n], XtNhorizDistance, 5); n++; +- XtSetArg (args[n], XtNwidth, scale*IWIDTH); n++; +- XtSetArg (args[n], XtNheight, height/2); n++; ++ XtSetArg (args[n], XtNwidth, app_data.scale*IWIDTH); n++; ++ XtSetArg (args[n], XtNheight, app_data.height/2); n++; + + labelwidget = (VadersWidget) + XtCreateManagedWidget("label", vadersWidgetClass, form, args, n); + + pausebutton = MakeCommandButton(form, "pause", Pause, labelwidget, gamewidget, NULL); + XtSetArg(args[0], XtNlabel,_(" Start")); +- XtSetArg(args[1], XtNforeground, defaultfore); +- XtSetArg(args[2], XtNbackground, defaultback); +- XtSetArg(args[3], XtNborderColor, defaultfore); ++ XtSetArg(args[1], XtNforeground, app_data.defaultfore); ++ XtSetArg(args[2], XtNbackground, app_data.defaultback); ++ XtSetArg(args[3], XtNborderColor, app_data.defaultfore); + XtSetValues(pausebutton, args, 4); + button = MakeCommandButton(form, "quit", Quit, pausebutton, gamewidget, NULL); + XtSetArg(args[0], XtNlabel,_(" Quit ")); +- XtSetArg(args[1], XtNforeground, defaultfore); +- XtSetArg(args[2], XtNbackground, defaultback); +- XtSetArg(args[3], XtNborderColor, defaultfore); ++ XtSetArg(args[1], XtNforeground, app_data.defaultfore); ++ XtSetArg(args[2], XtNbackground, app_data.defaultback); ++ XtSetArg(args[3], XtNborderColor, app_data.defaultfore); + XtSetValues(button, args, 4); + infobutton = MakeCommandButton(form, "info", ShowInfo, button, gamewidget, NULL); + XtSetArg(args[0], XtNlabel,_(" Info ")); +- XtSetArg(args[1], XtNforeground, defaultfore); +- XtSetArg(args[2], XtNbackground, defaultback); +- XtSetArg(args[3], XtNborderColor, defaultfore); ++ XtSetArg(args[1], XtNforeground, app_data.defaultfore); ++ XtSetArg(args[2], XtNbackground, app_data.defaultback); ++ XtSetArg(args[3], XtNborderColor, app_data.defaultfore); + XtSetValues(infobutton, args, 4); + + XtRealizeWidget(toplevel); +@@ -280,7 +279,7 @@ char *path; + } + #endif -+ XtResource resources[] = { -+ {XtNwidth, XtCWidth, XtRInt, sizeof(int), -+ (Cardinal)&width, XtRImmediate, (caddr_t) VWIDTH}, -+ {XtNheight, XtCHeight, XtRInt, sizeof(int), -+ (Cardinal)&height, XtRImmediate, (caddr_t) VHEIGHT}, -+ {"debug", "Debug", XtRBoolean, sizeof(Boolean), -+ (Cardinal)&debug, XtRString, "off"}, -+ {"font", "Font", XtRString, sizeof(String), -+ (Cardinal)&vaderfont, XtRString, (String)"9x15"}, -+ {"scale", "Scale", XtRInt, sizeof(int), -+ (Cardinal)&scale, XtRImmediate, (caddr_t) 2}, -+ {"basewait", "BaseWait", XtRInt, sizeof(int), -+ (Cardinal)&basewait, XtRImmediate, (caddr_t) 10}, -+ {"vaderwait", "VaderWait", XtRInt, sizeof(int), -+ (Cardinal)&vaderwait, XtRImmediate, (caddr_t) 300}, -+ {"spacerwait", "SpacerWait", XtRInt, sizeof(int), -+ (Cardinal)&spacerwait, XtRImmediate, (caddr_t) 50}, -+ {"shotwait", "ShotWait", XtRInt, sizeof(int), -+ (Cardinal)&shotwait, XtRImmediate, (caddr_t) 10}, -+ {"vshotwait", "VshotWait", XtRInt, sizeof(int), -+ (Cardinal)&vshotwait, XtRImmediate, (caddr_t) 30}, -+ {"basecolor", "BaseColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&basepixel, XtRString, "cyan"}, -+ {"spacercolor", "SpacerColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&spacerpixel, XtRString, "gray"}, -+ {"buildingcolor", "BuildingColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&buildingpixel, XtRString, "yellow"}, -+ {"vader1color", "Vader1Color", XtRPixel, sizeof(Pixel), -+ (Cardinal)&vader1pixel, XtRString, "blue"}, -+ {"vader2color", "Vader2Color", XtRPixel, sizeof(Pixel), -+ (Cardinal)&vader2pixel, XtRString, "green"}, -+ {"vader3color", "Vader3Color", XtRPixel, sizeof(Pixel), -+ (Cardinal)&vader3pixel, XtRString, "red"}, -+ {"shotcolor", "ShotColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&shotpixel, XtRString, "lavender"}, -+ {"vshotcolor", "VshotColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&vshotpixel, XtRString, "orange"}, -+ {"scorecolor", "ScoreColor", XtRPixel, sizeof(Pixel), -+ (Cardinal)&scorepixel, XtRString, "white"}, -+ {"maxshots", "MaxShots", XtRInt, sizeof(int), -+ (Cardinal) &maxshots, XtRImmediate, (caddr_t) 1}, -+ {"maxvshots", "MaxVshots", XtRInt, sizeof(int), -+ (Cardinal) &maxvshots, XtRImmediate, (caddr_t) 6}, -+ {"defaultfore", "DefaultFore", XtRPixel, sizeof(Pixel), -+ (Cardinal) &defaultfore, XtRString, "white"}, -+ {"defaultback", "DefaultBack", XtRPixel, sizeof(Pixel), -+ (Cardinal) &defaultback, XtRString, "black"}, -+}; -+ - setlocale(LC_ALL, ""); - textdomain(PACKAGE); +-#ifdef sparc ++#ifdef sun + XShapeCombineMask() + {} Added: head/games/xinvaders/files/patch-vaders.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xinvaders/files/patch-vaders.h Tue Aug 25 20:51:59 2015 (r395316) @@ -0,0 +1,149 @@ +--- vaders.h.orig 2000-09-10 22:32:40 UTC ++++ vaders.h +@@ -90,15 +90,82 @@ typedef struct _VadersRec { + + + ++/* ++ * Application resources ++ */ ++typedef struct { ++ int width, height; /* Size of window. */ ++ int scale; ++ Boolean debug; ++ ++ /* Base info: */ ++ int basewait; /* Number of milliseconds to wait between */ ++ /* moving base. */ ++ Pixel basepixel; ++ Pixel buildingpixel; ++ ++ /* Vader info */ ++ Pixel vader1pixel; ++ Pixel vader2pixel; ++ Pixel vader3pixel; ++ int vaderwait; /* Number of milliseconds to wait between */ ++ /* moving vaders. */ ++ ++ /* Spacer info */ ++ Pixel spacerpixel; ++ int spacerwait; /* Number of milliseconds to wait between */ ++ /* moving spacers. */ ++ ++ /* Shot info */ ++ Pixel shotpixel; ++ Pixel vshotpixel; ++ int shotwait; ++ int vshotwait; ++ int maxshots; /* How many shots are allowed to exist at */ ++ /* once. */ ++ int maxvshots; /* How many shots are allowed to exist at */ ++ /* once. */ ++ ++ /* Score info */ ++ Pixel scorepixel; ++ ++ Pixel defaultfore, defaultback; ++ ++ char *vaderfont; ++} AppData; ++ ++ext AppData app_data; ++ ++#ifndef MAIN ++#define scale app_data.scale ++#define debug app_data.debug ++#define basewait app_data.basewait ++#define basepixel app_data.basepixel ++#define buildingpixel app_data.buildingpixel ++#define vader1pixel app_data.vader1pixel ++#define vader2pixel app_data.vader2pixel ++#define vader3pixel app_data.vader3pixel ++#define vaderwait app_data.vaderwait ++#define spacerpixel app_data.spacerpixel ++#define spacerwait app_data.spacerwait ++#define shotpixel app_data.shotpixel ++#define vshotpixel app_data.vshotpixel ++#define shotwait app_data.shotwait ++#define vshotwait app_data.vshotwait ++#define maxshots app_data.maxshots ++#define maxvshots app_data.maxvshots ++#define scorepixel app_data.scorepixel ++#define defaultfore app_data.defaultfore ++#define defaultback app_data.defaultback ++#define vaderfont app_data.vaderfont ++#endif + + /* + * Actual vaders definitions. + */ + + ext Widget pausebutton, infobutton; +-ext int scale; + +-ext Boolean debug; + ext int level; + + ext Display *dpy; +@@ -111,30 +178,17 @@ ext int basesleft; + + /* Base info: */ + +-ext int basewait; /* Number of milleseconds to wait between */ +- /* moving base. */ +- + ext XtIntervalId basetimerid; + +-ext Pixel basepixel; +-ext Pixel buildingpixel; + ext Boolean basedestroyed; /* TRUE if the base is non-existant */ + + /* Vader info: */ + + ext XtIntervalId vadertimerid; +-ext Pixel vader1pixel; +-ext Pixel vader2pixel; +-ext Pixel vader3pixel; +-ext int vaderwait; /* Number of milleseconds to wait between */ +- /* moving vaders. */ + + /* Spacer info */ + +-ext Pixel spacerpixel; + ext XtIntervalId spacertimerid; +-ext int spacerwait; /* Number of milliseconds to wait between */ +- /* moving spacers. */ + ext int spacerappear; /* same, but for the interval between appearances */ + + ext Boolean spacer_shown; /* Currnet_Spacer is something */ +@@ -144,21 +198,11 @@ ext int spacer_counter; /* number of cy + + ext XtIntervalId shottimerid; + ext XtIntervalId vshottimerid; +-ext Pixel shotpixel; +-ext Pixel vshotpixel; +-ext int shotwait; +-ext int vshotwait; +-ext int maxshots; /* How many shots are allowed to exist at */ +- /* once. */ +-ext int maxvshots; /* How many shots are allowed to exist at */ +- /* once. */ + ext int numshots; /* how many shots (from the base) there are right now. */ + ext int numvshots; /* how many shots (from vaders) there are right now. */ + + /* Score info */ + +-ext Pixel scorepixel; +- + ext int bases, nextbonus, lastscore; + extern int hiscore; + +@@ -227,8 +271,5 @@ void InitShot(); + void MoveShots(); + void MoveVshots(); + void PaintAllShots(); +-ext Pixel defaultfore, defaultback; +- +-ext char *vaderfont; + + #endif _vaders_h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508252052.t7PKq0f8055111>