X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=src%2Fxio.c;h=4ba585ff8761bebfc718b9ab16997c788dcf4c78;hb=32702accdb97f90e3f89ac388ea38655d8f4729c;hp=95670993dfea867fbb5f70b2db7e1cfd29caf9c8;hpb=63531cb25c72858ed465453c6ead096a8c9a1d20;p=super-star-trek.git

diff --git a/src/xio.c b/src/xio.c
index 9567099..4ba585f 100644
--- a/src/xio.c
+++ b/src/xio.c
@@ -2,61 +2,31 @@
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Shell.h>
+#include <X11/Xaw/Box.h>
 #include <X11/Xaw/Form.h>
 #include <X11/Xaw/Command.h>
 #include <X11/Xaw/AsciiText.h>
 #include "sst.h"
 
 static XtAppContext app_context;
-static Widget toplevel, form, text, buttons; 
+static Widget toplevel, text, form; 
+static Widget navigation, weapons, status, planets, misc; 
+static Widget navlabel, weaplabel, statlabel, planlabel, misclabel;
 
-String fallback[] = {
+static String fallback[] = {
     /* text window resources */
     "*text.resizable: true",
     "*text.resize: ResizeBoth",
-    /* layout constraints */
-    /* navigation row */
-    //"*Move.fromHoriz:",
-    "*Impulse.fromHoriz: Move",
-    "*Rest.fromHoriz: Impulse",
-    "*Warp.fromHoriz: Rest",
-    "*Dock.fromHoriz: Warp",
-    "*Chart.fromHoriz: Dock",
-    // Weapons row
-    "*Phasers.fromVert: Move",
-    "*Torpedo.fromHoriz: Phasers",
-    "*Shields.fromHoriz: Torpedo",
-    "*Damages.fromHoriz: Shields",
-    "*Crystals.fromHoriz: Damages",
-    "*Deathray.fromHoriz: Crystals",
-    "*Mayday.fromHoriz: Deathray",
-    "*Abandon.fromHoriz: Mayday",
-    // Planet row
-    "*Sensors.fromVert: Phasers",
-    "*Orbit.fromHoriz: Sensors",
-    "*Transport.fromHoriz: Orbit",
-    "*Mine.fromHoriz: Transport",
-    "*Shuttle.fromHoriz: Transport",
-    "*Planets.fromHoriz: Shuttle",
-    // Miscellany row
-    "*Report.fromVert: Sensors",
-    "*Computer.fromHoriz: Report",
-    "*Probe.fromHoriz: Computer",
-    "*Help.fromHoriz: Computer",
-    // Ending it all
-    "*Score.fromVert: Report",
-    "*Destruct.fromHoriz: Score",
-    "*Quit.fromHoriz: Destruct",
-    "*Emexit.fromHoriz: Quit",
-    "*Save.fromHoriz: Emexit",
     NULL,
 };
 
 struct cmd_t {
     char *name;
     void (*callback)(Widget, XtPointer, XtPointer);
+    Widget *parent;
     int enable;
     Widget widget;
+
 };
 
 static void quit_proc(Widget w, XtPointer client_data, XtPointer call_data)
@@ -65,36 +35,46 @@ static void quit_proc(Widget w, XtPointer client_data, XtPointer call_data)
     exit (0);
 }
 
+static void noargs_proc(Widget w, XtPointer client_data, XtPointer call_data)
+/* use this for commands that take no arguments */
+{
+    /* currently a stub */
+}
+
 static struct cmd_t commands[] = {
-    {"Phasers",		NULL,		0},
-    {"Torpedo",		NULL,		0},
-    {"Move",		NULL,		0},
-    {"Shields",		NULL,		0},
-    {"Dock",		NULL,		0},
-    {"Damages",		NULL,		0},
-    {"Chart",		NULL,		0},
-    {"Impulse",		NULL,		0},
-    {"Rest",		NULL,		0},
-    {"Warp",		NULL,		0},
-    {"Score",		NULL,		0},
-    {"Sensors",		NULL,		OPTION_PLANETS},
-    {"Orbit",		NULL,		OPTION_PLANETS},
-    {"Transport",	NULL,		OPTION_PLANETS},
-    {"Mine",		NULL,		OPTION_PLANETS},
-    {"Crystals",	NULL,		OPTION_PLANETS},
-    {"Shuttle",		NULL,		OPTION_PLANETS},
-    {"Planets",		NULL,		OPTION_PLANETS},
-    {"Report",		NULL,		0},
-    {"Computer",	NULL,      	0},
-    {"Emexit",		NULL,		0},
-    {"Probe",		NULL,		OPTION_PROBE},
-    {"Save",		NULL,		0},
-    {"Abandon",		NULL,		0},
-    {"Destruct",	NULL,		0},
-    {"Deathray",	NULL,		0},
-    {"Mayday",		NULL,		0},
-    {"Quit",		quit_proc,	0},
-    {"Help",		NULL,		0},
+    {"Move",		NULL,		&navigation,	0},
+    {"Dock",		noargs_proc,	&navigation,	0},
+    {"Chart",		noargs_proc,	&navigation,	0},
+    {"Impulse",		NULL,		&navigation,	0},
+    {"Rest",		NULL,		&navigation,	0},
+    {"Warp",		NULL,		&navigation,	0},
+    {"Probe",		NULL,		&navigation,	OPTION_PROBE},
+
+    {"Phasers",		NULL,		&weapons,	0},
+    {"Torpedo",		NULL,		&weapons,	0},
+    {"Shields",		NULL,		&weapons,	0},
+    {"Damages",		noargs_proc,	&weapons,	0},
+    {"Abandon",		noargs_proc,	&weapons,	0},
+    {"Destruct",	noargs_proc,	&weapons,	0},
+    {"Deathray",	noargs_proc,	&weapons,	0},
+    {"Mayday",		noargs_proc,	&weapons,	0},
+
+    {"Score",		noargs_proc,	&status,	0},
+    {"Report",		noargs_proc,	&status,	0},
+    {"Computer",	noargs_proc,   	&status,	0},
+
+    {"Sensors",		noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Orbit",		noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Transport",	noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Mine",		noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Crystals",	noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Shuttle",		noargs_proc,	&planets,	OPTION_PLANETS},
+    {"Planets",		noargs_proc,	&planets,	OPTION_PLANETS},
+
+    {"Emexit",		noargs_proc,	&misc,		0},
+    {"Save",		NULL,		&misc,		0},
+    {"Quit",		quit_proc,	&misc,		0},
+    {"Help",		noargs_proc,	&misc,		0},
 };
 
 int main(int argc, char **argv)
@@ -108,16 +88,59 @@ int main(int argc, char **argv)
     form = XtVaCreateManagedWidget("form", formWidgetClass, toplevel, NULL);
     /* the command window */
     text = XtVaCreateManagedWidget("text", asciiTextWidgetClass, form, 
-				    NULL);
+				   XtNwidth, 400, XtNheight, 200,
+				   NULL);
     XtVaSetValues(text, XtNeditType,XawtextRead, XtNdisplayCaret,False, NULL);
-    /* The button panel */
-    buttons  = XtVaCreateManagedWidget("form", 
-					formWidgetClass, form, 
-					XtNfromVert, text, 
+    /* The button panels */
+    navigation  = XtVaCreateManagedWidget("navigation", 
+				       boxWidgetClass, form,
+				       XtNfromVert, text, 
+				       XtNorientation, XtorientHorizontal,
+				       NULL); 
+    navlabel  = XtVaCreateManagedWidget("Navigation:   ", 
+					labelWidgetClass, navigation,
+					XtNborderWidth, 0,
 					NULL); 
+    weapons  = XtVaCreateManagedWidget("weapons", 
+				       boxWidgetClass, form,
+				       XtNfromVert, navigation, 
+				       XtNorientation, XtorientHorizontal,
+				       NULL); 
+    weaplabel  = XtVaCreateManagedWidget("Weapons:      ", 
+					 labelWidgetClass, weapons,
+					 XtNborderWidth, 0,
+					 NULL); 
+    status   = XtVaCreateManagedWidget("status", 
+				       boxWidgetClass, form,
+				       XtNfromVert, weapons, 
+				       XtNorientation, XtorientHorizontal,
+				       NULL); 
+    statlabel  = XtVaCreateManagedWidget("Status:       ", 
+					 labelWidgetClass, status,
+					 XtNborderWidth, 0,
+					 NULL); 
+    planets  = XtVaCreateManagedWidget("planets", 
+				       boxWidgetClass, form,
+				       XtNfromVert, status, 
+				       XtNorientation, XtorientHorizontal,
+				       NULL); 
+    planlabel  = XtVaCreateManagedWidget("Planets:      ", 
+					 labelWidgetClass, planets,
+					 XtNborderWidth, 0,
+					 NULL); 
+    misc  = XtVaCreateManagedWidget("misc", 
+				       boxWidgetClass, form,
+				       XtNfromVert, planets, 
+				       XtNorientation, XtorientHorizontal,
+				       NULL); 
+    misclabel  = XtVaCreateManagedWidget("Miscellaneous:", 
+					 labelWidgetClass, misc,
+					 XtNborderWidth, 0,
+					 NULL); 
     for (cp = commands; cp < commands + sizeof(commands)/sizeof(commands[0]); cp++) {
 	cp->widget = XtVaCreateManagedWidget(cp->name, 
-					     commandWidgetClass, buttons, 
+					     commandWidgetClass, 
+					     *cp->parent, 
 					     XtNlabel, cp->name,
 					     NULL);
 	if (cp->callback)