Properly fix the LP64 issue in the application resource handling rather

than praying that globals end up in the lower 32-bit address space.

Add a number of missing includes, etc.

Approved by:	edwin

1 files changed, 77 insertions, 32 deletions

diff --git a/games/xrobots/files/patch-main.c b/games/xrobots/files/patch-main.c
index 9a49ee5710b5..fc32162b3cbc 100644
--- a/games/xrobots/files/patch-main.c
+++ b/games/xrobots/files/patch-main.c
@@ -1,62 +1,107 @@
---- main.c.orig	1998-01-23 01:34:05.000000000 +1100
-+++ main.c	2013-10-13 01:30:59.000000000 +1100
-@@ -170,31 +170,31 @@
- 	{"-scorefile","scorefile",XrmoptionSepArg, NULL },
+--- main.c.orig	1998-01-22 14:34:05 UTC
++++ main.c
+@@ -55,11 +55,11 @@
+ #endif
+ 
+ 
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
+ #include "xrobots.h"
+ 
+-#define srandom srand
+-#define random rand
+-
+ /*----------------------------------------------------------------------*/
+ 
+ Widget top_shell, top_widget, playfield_widget, score_command, sonic_command;
+@@ -153,13 +153,7 @@ static XtActionsRec actions[] = {
+   {"do_nothing",(XtActionProc)do_nothing_action},
  };
  
--static XtResource application_resources[] = {
-+XtResource application_resources[] = {
+-Pixel fg, bg;
+-Boolean spiffy,			/* limited graphics 			*/
+-	autoteleport,		/* teleport when sonic used, and no moves */
+-	autoteleportalways,	/* teleport when no available moves 	*/
+-	showjumps,		/* show no intermediate moves 		*/
+-	diewaiting;		/* die if you use wait unsafely 	*/
+-XtTranslations translations;
++AppData app_data;
+ 
+ static XrmOptionDescRec options[] = {
+ 	{"-spiffy",	"spiffy",	XrmoptionSepArg, NULL },
+@@ -172,29 +166,30 @@ static XrmOptionDescRec options[] = {
+ 
+ static XtResource application_resources[] = {
    {"foreground", "Foreground", XtRPixel, sizeof(Pixel),
 -                (Cardinal)&fg, XtRString, (caddr_t) "Black"},
-+                NULL, XtRString, (caddr_t) "Black"},
++                XtOffsetOf(AppData, fg), XtRString, (caddr_t) "Black"},
    {"background", "Background", XtRPixel, sizeof(Pixel),
 -                (Cardinal)&bg, XtRString, (caddr_t) "White"},
-+                NULL, XtRString, (caddr_t) "White"},
++                XtOffsetOf(AppData, bg), XtRString, (caddr_t) "White"},
    {"spiffy", "Spiffy", XtRBoolean, sizeof(Boolean),
 -                (Cardinal)&spiffy, XtRString, (caddr_t) "True"},
-+                NULL, XtRString, (caddr_t) "True"},
++                XtOffsetOf(AppData, spiffy), XtRString, (caddr_t) "True"},
    {"autoteleport", "Autoteleport", XtRBoolean, sizeof(Boolean),
 -                (Cardinal)&autoteleport, XtRString, (caddr_t) "False"},
-+                NULL, XtRString, (caddr_t) "False"},
++                XtOffsetOf(AppData, autoteleport), XtRString, (caddr_t) "False"},
    {"autoteleportalways", "Autoteleportalways", XtRBoolean, sizeof(Boolean),
 -                (Cardinal)&autoteleportalways, XtRString, (caddr_t) "False"},
-+                NULL, XtRString, (caddr_t) "False"},
++                XtOffsetOf(AppData, autoteleportalways), XtRString, (caddr_t) "False"},
    {"showmovement", "Showmovement", XtRBoolean, sizeof(Boolean),
 -                (Cardinal)&showjumps, XtRString, (caddr_t) "True"},
-+                NULL, XtRString, (caddr_t) "True"},
++                XtOffsetOf(AppData, showjumps), XtRString, (caddr_t) "True"},
    {"diewaiting", "Diewaiting", XtRBoolean, sizeof(Boolean),
 -                (Cardinal)&diewaiting, XtRString, (caddr_t) "False"},
-+                NULL, XtRString, (caddr_t) "False"},
++                XtOffsetOf(AppData, diewaiting), XtRString, (caddr_t) "False"},
    {"translations","Translations", XtRTranslationTable, sizeof(XtTranslations),
 -                (Cardinal)&translations, XtRString, (caddr_t)translations_str},
-+                NULL, XtRString, (caddr_t)translations_str},
++                XtOffsetOf(AppData, translations), XtRString, (caddr_t)translations_str},
    {"scorefile","Scorefile", XtRString, sizeof(String),
 -                (Cardinal)&score_filename, XtRString, (caddr_t)SCORE_FILE},
-+                NULL, XtRString, (caddr_t)SCORE_FILE},
++                XtOffsetOf(AppData, score_filename), XtRString, (caddr_t)SCORE_FILE},
  };
  
  /*----------------------------------------------------------------------*/
  
++int
  main(argc, argv)
 -  unsigned int argc;
 +  int argc;
    char **argv;
  {
    Arg args[1];
-@@ -206,6 +206,16 @@
- 
-   srandom(getpid());
- 
-+  application_resources[0].resource_offset=(Cardinal)&fg;
-+  application_resources[1].resource_offset=(Cardinal)&bg;
-+  application_resources[2].resource_offset=(Cardinal)&spiffy;
-+  application_resources[3].resource_offset=(Cardinal)&autoteleport;
-+  application_resources[4].resource_offset=(Cardinal)&autoteleportalways;
-+  application_resources[5].resource_offset=(Cardinal)&showjumps;
-+  application_resources[6].resource_offset=(Cardinal)&diewaiting;
-+  application_resources[7].resource_offset=(Cardinal)&translations;
-+  application_resources[8].resource_offset=(Cardinal)&score_filename;
-+
-   top_shell = XtInitialize(argv[0], "xrobots", options, XtNumber(options),
-   (int *)&argc, argv);
-   XtSetValues(top_shell, arglisttop_shell, XtNumber(arglisttop_shell));
+@@ -212,7 +207,7 @@ main(argc, argv)
+ 
+   XtAddActions(actions,XtNumber(actions));
+ 
+-  XtGetApplicationResources(top_shell, 0, application_resources, 
++  XtGetApplicationResources(top_shell, &app_data, application_resources, 
+ 			XtNumber(application_resources), NULL, 0 );
+ 
+   top_widget = XtCreateManagedWidget(
+@@ -228,7 +223,7 @@ main(argc, argv)
+                                     arglistplayfield,
+                                     XtNumber(arglistplayfield));
+ 
+-  XtAugmentTranslations(playfield_widget,translations);
++  XtAugmentTranslations(playfield_widget,app_data.translations);
+ 
+   teleport_command = XtCreateManagedWidget(
+                                     "teleport_button",
+@@ -292,12 +287,12 @@ main(argc, argv)
+ 
+   display   = XtDisplay(playfield_widget);
+   playfield = XtWindow(playfield_widget);
+-  gcv.foreground = fg;
+-  gcv.background = bg;
++  gcv.foreground = app_data.fg;
++  gcv.background = app_data.bg;
+   gcv.function = GXcopy;
+   gc = XCreateGC(display, playfield, 
+  		GCForeground | GCBackground | GCFunction, &gcv);
+-  gcv.foreground = bg;
++  gcv.foreground = app_data.bg;
+   cleargc = XCreateGC(display, playfield,
+  		 GCForeground | GCBackground | GCFunction, &gcv);
+