Further fixes for menus

The loader.system wrapper file was wrongly launching the .enh versions of utilities for the unenhanced IIe.

.gitignore

@@ -0,0 +1,2 @@
+
+obj/

src/cfgtoken.h

@@ -1,7 +1,7 @@
 
 #define NEWCONFIG_MAGIC       0x0001434E // "NC\x01\x00"
 #define NEWCONFIG_EOF_MARKER  0x00464F45 // "EOF\x00"
-#define CFGTOKEN_REVISION     0x00015652 // "RV\xXX\x00"
+#define CFGTOKEN_REVISION     0x00005652 // "RV\xXX\x00"
 
 #define CFGTOKEN_MODE_VGA     0x0000564D // "MV\x00\x00" VGA
 #define CFGTOKEN_MODE_PCPI    0x00005A4D // "MZ\x00\x00" PCPI Applicard
@@ -38,8 +38,8 @@
 #define CFGTOKEN_WIFI_IP      0x04004957 // "WI\x00\xSS" WiFi IP
 #define CFGTOKEN_WIFI_NM      0x04004E57 // "WN\x00\xSS" WiFi Netmask
 
-#define CFGTOKEN_JD_HOST      0x0000484A // "JH\x00\x01" JetDirect Hostname
-#define CFGTOKEN_JD_PORT      0x0200444A // "JD\x00\x01" JetDirect Port
+#define CFGTOKEN_JD_HOST      0x0000484A // "JH\x00\xSS" JetDirect Hostname
+#define CFGTOKEN_JD_PORT      0x0200504A // "JP\x00\x02" JetDirect Port
 
 #define CFGTOKEN_FONT_00      0x00004656 // "VF\xXX\x00" Custom default font
 

src/config.c

@@ -1711,10 +1711,10 @@ void main (void) {
             backdrop(PROGNAME);
 
             window(" Main Menu ", 26, 15, 0);
-            gotoy(y+5); gotox(8);
-            repeatchar(CHAR_BORDER_BOTTOM, 24);
-            gotoy(y+10); gotox(8);
-            repeatchar(CHAR_BORDER_BOTTOM, 24);
+            gotoy(y+4); gotox(7);
+            repeatchar(CHAR_SEPARATOR, 26);
+            gotoy(y+9); gotox(7);
+            repeatchar(CHAR_SEPARATOR, 26);
         }
         if(paint_menu) {
             gotoy(y+0); gotox(8);

src/loader.c

@@ -11,7 +11,7 @@ void main (void) {
 
     strcpy(filename, NEXTNAME);
 
-    if(get_ostype() >= 0x30) {
+    if(get_ostype() >= 0x31) {
         strcat(filename, ".ENH");
     } else {
         strcat(filename, ".BASE");

src/menu.c

@@ -144,6 +144,7 @@ void main (void) {
                     }
 #if defined(__APPLE2ENH__)
                 }
+#endif
             case MENU_EXIT:
                 launcher_rows+=2;
                 last_item = i;
@@ -155,7 +156,6 @@ void main (void) {
                     separator_allowed = 0;
                 }
                 break;
-#endif
         }
     }
  
@@ -186,8 +186,8 @@ void main (void) {
                         break;
                     case MENU_SEPARATOR:
                         if(separator_allowed) {
-                            gotoy(window_top+y); gotox(8);
-                            repeatchar(CHAR_BORDER_BOTTOM, 24);
+                            gotoy(window_top+y-1); gotox(8);
+                            repeatchar(CHAR_SEPARATOR, 24);
                             y++;
                             separator_allowed = 0;
                         }

src/menu.h

@@ -3,6 +3,7 @@
 
 #if defined(__APPLE2ENH__)
  #define CHAR_CURSOR              0x7F
+ #define CHAR_SEPARATOR           '_'
  #define CHAR_BAR_MIDDLE          0xD3
  #define CHAR_BORDER_BOTTOM       0xCC
  #define CHAR_TITLEBAR_ENCLOSED   0xDC
@@ -22,6 +23,7 @@
  #define CHAR_BORDER_BOTTOM_RIGHT ' '
 #else
  #define CHAR_CURSOR              (' '|0x80)
+ #define CHAR_SEPARATOR           '_'
  #define CHAR_BAR_MIDDLE          '-'
  #define CHAR_BORDER_BOTTOM       '-'
  #define CHAR_TITLEBAR_ENCLOSED   '-'