Merge pull request #6 from Ripjetski6502/dev

merging menus into wmenu, rework code to use const for window count

Author: Ripjetski6502

bin/fullappdemo.xex

@@ -14,7 +14,7 @@ interface
 
 const
     // Version
-    LIB_VERSION = '1.1.3';
+    LIB_VERSION = '1.2.0';
 
     // Window Record and Memory Alloc
     WRECSZ = 10;
@@ -56,41 +56,41 @@ interface
     XNONE = 255;
 
     // OS Registers
-    DMACTL = 559;
-    COLDST = 580;
-    GPRIOR = 623;
+    // DMACTL = 559;
+    // COLDST = 580;
+    // GPRIOR = 623;
     INVFLG = 694;
     SHFLOK = 702;
     HELPFG = 732;
     KEYPCH = 764;
-    GRACTL = 53277;
+    // GRACTL = 53277;
     CONSOL = 53279;
-    PMBASE = 54279;
+    // PMBASE = 54279;
 
     // PM Registers
-    HPOSP0 = 53248;
-    HPOSP1 = 53249;
-    HPOSP2 = 53250;
+    // HPOSP0 = 53248;
+    // HPOSP1 = 53249;
+    // HPOSP2 = 53250;
 
     // Screen Bits
     ALMARG = 82;
     RSCRN  = 88;
-    PCOLR0 = 704;
-    PCOLR1 = 705;
-    PCOLR2 = 706;
-    PCOLR3 = 707;
-    AFOREG = 709;
-    ABACKG = 710;
-    ABORDR = 712;
+    // PCOLR0 = 704;
+    // PCOLR1 = 705;
+    // PCOLR2 = 706;
+    // PCOLR3 = 707;
+    // AFOREG = 709;
+    // ABACKG = 710;
+    // ABORDR = 712;
     ACURIN = 752;
 
     // Colors
-    CBLACK  = 0;
-    CWHITE  = 14;
-    CGREEN  = 210;
-    CBLUE   = 146;
-    CRED    = 50;
-    CYELLOW = 222;
+    // CBLACK  = 0;
+    // CWHITE  = 14;
+    // CGREEN  = 210;
+    // CBLUE   = 146;
+    // CRED    = 50;
+    // CYELLOW = 222;
 
     // Keystroke Values
     KNOMAP = 199;

src/a8defines.pas

@@ -17,9 +17,9 @@ interface
 type
     // Window handle info
     td_wnrec = record
-        bU, bX, bY, bW, bH, bI: array[0..10] of Byte;
-        cM: array[0..10] of ^Byte;
-        cZ: array[0..10] of Word;
+        bU, bX, bY, bW, bH, bI: array[0..WRECSZ] of Byte;
+        cM: array[0..WRECSZ] of ^Byte;
+        cZ: array[0..WRECSZ] of Word;
     end;
 
     // Window position - virtual cursor

src/a8defwin.pas

@@ -651,7 +651,7 @@ function GCombo(bN, x, y, bE, bI, bS: Byte; pS: TStringArray): Byte;
                     // calculating position based on parent window
                     bZ:=WOpen(baW.bX[bN] + x - 1, baW.bY[bN] + y + 1, bL + 2, bS + 2, WOFF);
 
-                    bC:=MenuV(bZ, 1, 1, WON, bC, bS, pS);
+                    bC:=WMenu(bZ, 1, 1, GVERT, WON, bC, bS, pS);
                     WClose(bZ);
                     bM := true;
 

src/a8libgadg.pas

@@ -10,7 +10,7 @@
 //          a8libstr.pas
 //          a8libmisc.pas
 // Revised:
-// - Added MenuH to draw menu horizontally
+// - Merged MenuH and MenuV to single routine WMenu
 // --------------------------------------------------
 
 unit a8libmenu;
@@ -27,131 +27,14 @@ interface
 // --------------------------------------------------
 // Function Prototypes
 // --------------------------------------------------
-function MenuV(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
-function MenuH(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
+function WMenu(bN, x, y, bO, bI, bS, bC: Byte; pS: TStringArray): Byte;
 
 implementation
 
 uses
     a8libwin, a8libmisc;
 
-// ------------------------------------------------------------
-// Func...: MenuV(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte
-// Desc...: Vertical menu
-// Param..: bN = Window handle number
-//           x = window column for cursor
-//           y = window row for cursor
-//          bI = Inverse flag (WON = leave on at selection)
-//          bS = Start item number
-//          bC = Number of menu items
-//          pS = pointer to array of menu item strings
-// Return.: Selected item #, ESC (XESC), or TAB (XTAB)
-// ------------------------------------------------------------
-function MenuV(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
-var
-    bF: Boolean;
-    bL, bK, tmp: Byte;
-    cL: string[39]; // 40 - 1
-    tmpStr: string[39];
-begin
-    bF := false;
-
-    // Set default return to start item #
-    Result := bS;
-
-    // Continue until finished
-    while not bF do
-    begin
-        // Display each item
-        for bL := 0 to bC - 1 do
-        begin
-            tmpStr := pS[bL];
-            SetLength(cL, Length(tmpStr));
-            Move(@tmpStr[1], @cL[1], Length(cL));
-
-            // Display item at row count - inverse if start item
-            if bL + 1 = Result then
-            begin
-                tmp := WON;
-            end
-            else begin
-                tmp := WOFF;
-            end;
-            WPrint(bN, x, y + bL, tmp, cL);
-        end;
-
-        // Get key (no inverse key)
-        bK := WaitKCX(WOFF);
-
-        // Process key
-        if (bK = KDOWN) or (bK = KEQUAL) or (bK = KRIGHT) or (bK = KASTER) then
-        begin
-            // Increment (move down list)
-            Inc(Result);
-
-            // Check for overrun and roll to top
-            if Result > bC then
-            begin
-                Result := 1;
-            end;
-        end
-        else if (bK = KUP) or (bK = KMINUS) or (bK = KLEFT) or (bK = KPLUS) then
-        begin
-            // Decrement (move up list)
-            Dec(Result);
-
-            // Check for underrun and roll to bottom
-            if Result < 1 then
-            begin
-                Result := bC;
-            end;
-        end;
-
-        // Set last selected item before checking for ESC/TAB/ENTER
-        bL := Result;
-
-        // If ESC, set choice to XESC
-        if bK = KESC then
-        begin
-            Result := XESC;
-            bF := true;
-        end
-        // For TAB, set choice to XTAB
-        else if bK = KTAB then
-        begin
-            Result := XTAB;
-            bF := true;
-        end
-        // For enter, just exit
-        else if bK = KENTER then
-        begin
-            bF := true;
-        end;
-    end;
-
-    // Uninverse last selection if needed
-    if bI = WOFF then
-    begin
-        tmpStr := pS[bL - 1];
-        SetLength(cL, Length(tmpStr));
-        Move(@tmpStr[1], @cL[1], Length(cL));
-        WPrint(bN, x, y + bL - 1, WOFF, cL);
-    end;
-end;
-
-// ------------------------------------------------------------
-// Func...: MenuH(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte
-// Desc...: Vertical menu
-// Param..: bN = Window handle number
-//           x = window column for cursor
-//           y = window row for cursor
-//          bI = Inverse flag (WON = leave on at selection)
-//          bS = Start item number
-//          bC = Number of menu items
-//          pS = pointer to array of menu item strings
-// Return.: Selected item #, ESC (XESC), or TAB (XTAB)
-// ------------------------------------------------------------
-function MenuH(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
+function WMenu(bN, x, y, bO, bI, bS, bC: Byte; pS: TStringArray): Byte;
 var
     bF: Boolean;
     bL, bK, tmp, l, pos: Byte;
@@ -182,8 +65,14 @@ function MenuH(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
             else begin
                 tmp := WOFF;
             end;
-            WPrint(bN, pos + bL, y, tmp, cL);
-            pos:=pos + l;
+            if bO = GHORZ then
+            begin
+                WPrint(bN, pos + bL, y, tmp, cL);
+                pos:= pos + l;
+            end
+            else begin
+                WPrint(bN, x, y + bL, tmp, cL);
+            end;
         end;
 
         // Get key (no inverse key)
@@ -241,7 +130,12 @@ function MenuH(bN, x, y, bI, bS, bC: Byte; pS: TStringArray): Byte;
         tmpStr := pS[bL - 1];
         SetLength(cL, Length(tmpStr));
         Move(@tmpStr[1], @cL[1], Length(cL));
-        WPrint(bN, pos + bL - 1, y,  WOFF, cL);
+        
+        if bO = GHORZ then
+            WPrint(bN, pos + bL - 1, y,  WOFF, cL)
+        else
+            WPrint(bN, x, y + bL - 1, WOFF, cL);
     end;
 end;
+
 end.

src/a8libmenu.pas

@@ -73,7 +73,7 @@ procedure WInit;
     cpWM := baWM;
 
     // Work on 10 window+system handles
-    for bL := 0 to 10 do
+    for bL := 0 to WRECSZ do
     begin
         // Clear window handle record vars
         baW.bU[bL] := WOFF;
@@ -127,7 +127,7 @@ function WOpen(x, y, w, h, bT: Byte): Byte;
     Result := WENONE;
 
     // Cycle through handles (exluding system)
-    for bL := 0 to 10 do
+    for bL := 0 to WRECSZ do
     begin
         // If handle is not in use
         if baW.bU[bL] = WOFF then

src/a8libwin.pas

@@ -514,7 +514,7 @@ procedure SubMenu;
     while not bD do
     begin
         // Display menu and get choice
-        bC := MenuV(bW1, 1, 1, WOFF, bC, 3, pcM);
+        bC := WMenu(bW1, 1, 1, GVERT, WOFF, bC, 3, pcM);
 
         // Process choice
         case bC of
@@ -550,7 +550,7 @@ procedure MainMenu;
     while not bD do
     begin
         // Display menu and get choice
-        bC := MenuV(bW1, 1, 1, WON, bC, 4, pcM);
+        bC := WMenu(bW1, 1, 1, GVERT, WON, bC, 4, pcM);
 
         // Process choice
         case bC of
@@ -574,7 +574,7 @@ procedure MainMenu;
     bC := 1;
     // Setup screen
     WInit;
-    WBack(14);
+    WBack($2E);
 
     // Open menu window
     bW1 := WOpen(0, 0, 40, 3, WOFF);
@@ -588,7 +588,7 @@ procedure MainMenu;
     while not bE do
     begin
         // Call menu
-        bC := MenuH(bW1, 1, 1, WON, bC, 3, pcM);
+        bC := WMenu(bW1, 1, 1, GHORZ, WON, bC, 3, pcM);
 
         // Process choice
         case bC of

src/fullappdemo.pas

@@ -64,7 +64,7 @@ procedure SubMenu3;
     while not bD do
     begin
         // Display menu and get choice
-        bC := MenuV(bW1, 1, 1, WOFF, 1, 3, pcM);
+        bC := WMenu(bW1, 1, 1, GVERT,WOFF, 1, 3, pcM);
 
         // Process choice
         case bC of
@@ -108,7 +108,7 @@ procedure SubMenu3;
     while not bD do
     begin
         // Call menu
-        bC := MenuV(bW2, 1, 2, WOFF, 1, 5, pcM);
+        bC := WMenu(bW2, 1, 2, GVERT, WOFF, 1, 5, pcM);
 
         // Process choice
         case bC of