X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fxio.c;h=65098bff143e10b05708bff793cb5f15501034e2;hp=2bdb4653d4ab0e38b4e75259a76ae693dbb6679e;hb=0bc4964e6bcf3a3ee3b383ee79a97f69ffa48b46;hpb=0626c18f1b1aa99ad4d91953d74446bff155ef57

diff --git a/src/xio.c b/src/xio.c
index 2bdb465..65098bf 100644
--- a/src/xio.c
+++ b/src/xio.c
@@ -14,9 +14,26 @@ static Widget navigation, weapons, planets, misc;
 static Widget navlabel, weaplabel, planlabel, misclabel;
 
 static String fallback[] = {
-    /* text window resources */
     "*text.resizable: true",
     "*text.resize: ResizeBoth",
+    "*text.width: 640",
+    "*text.height: 200",
+    "*navigation.fromVert: text",
+    "*navigation.borderWidth: 0",
+    "*navlabel.label: Navigation:   ",
+    "*navlabel.borderWidth: 0",
+    "*weapons.fromVert: navigation",
+    "*weapons.borderWidth: 0",
+    "*weaplabel.label: Weapons:      ",
+    "*weaplabel.borderWidth: 0",
+    "*planets.fromVert: weapons",
+    "*planets.borderWidth: 0",
+    "*planlabel.label: Planets:      ",
+    "*planlabel.borderWidth: 0",
+    "*misc.fromVert: planets",
+    "*misc.borderWidth: 0",
+    "*misclabel.label: Miscellaneous:",
+    "*misclabel.borderWidth: 0",
     NULL,
 };
 
@@ -76,9 +93,6 @@ static struct cmd_t commands[] = {
     {"Help",		noargs_proc,	&misc,		0},
 };
 
-#define MAXWIDTH	640
-#define TEXTHEIGHT	200
-
 static void instantiate_main(int argc, char **argv)
 { 
     struct cmd_t *cp;
@@ -89,50 +103,40 @@ static void instantiate_main(int argc, char **argv)
 				    XtNallowShellResize, True, NULL);
     form = XtVaCreateManagedWidget("form", formWidgetClass, toplevel, NULL);
     /* the command window */
-    text = XtVaCreateManagedWidget("text", asciiTextWidgetClass, form, 
-				   XtNwidth, MAXWIDTH, XtNheight, TEXTHEIGHT,
+    text = XtVaCreateManagedWidget("text", 
+				   asciiTextWidgetClass, form,
+				   XtNeditType, XawtextEdit,
+				   XtNdisplayCaret,False,
 				   NULL);
-    XtVaSetValues(text, XtNeditType,XawtextRead, XtNdisplayCaret,False, NULL);
     /* The button panels */
     navigation  = XtVaCreateManagedWidget("navigation", 
 					  boxWidgetClass, form,
-					  XtNborderWidth, 0,
-					  XtNfromVert, text,
 					  XtNorientation, XtorientHorizontal,
 					  NULL); 
-    navlabel  = XtVaCreateManagedWidget("Navigation:   ", 
+    navlabel  = XtVaCreateManagedWidget("navlabel", 
 					labelWidgetClass, navigation,
-					XtNborderWidth, 0,
 					NULL); 
     weapons  = XtVaCreateManagedWidget("weapons", 
 				       boxWidgetClass, form,
-				       XtNborderWidth, 0,
-				       XtNfromVert, navigation, 
 				       XtNorientation, XtorientHorizontal,
 				       NULL); 
-    weaplabel  = XtVaCreateManagedWidget("Weapons:      ", 
+    weaplabel  = XtVaCreateManagedWidget("weaplabel", 
 					 labelWidgetClass, weapons,
-					 XtNborderWidth, 0,
 					 NULL); 
     planets  = XtVaCreateManagedWidget("planets", 
 				       boxWidgetClass, form,
-				       XtNborderWidth, 0,
-				       XtNfromVert, weapons, 
 				       XtNorientation, XtorientHorizontal,
 				       NULL); 
-    planlabel  = XtVaCreateManagedWidget("Planets:      ", 
+    planlabel  = XtVaCreateManagedWidget("planlabel", 
 					 labelWidgetClass, planets,
 					 XtNborderWidth, 0,
 					 NULL); 
     misc  = XtVaCreateManagedWidget("misc", 
 				       boxWidgetClass, form,
-				       XtNborderWidth, 0,
-				       XtNfromVert, planets, 
 				       XtNorientation, XtorientHorizontal,
 				       NULL); 
-    misclabel  = XtVaCreateManagedWidget("Miscellaneous:", 
+    misclabel  = XtVaCreateManagedWidget("misclabel", 
 					 labelWidgetClass, misc,
-					 XtNborderWidth, 0,
 					 NULL); 
     for (cp = commands; cp < commands + sizeof(commands)/sizeof(commands[0]); cp++) {
 	cp->widget = XtVaCreateManagedWidget(cp->name,