Changeset 65 for trunk/bootcode/setup/main.asm

Timestamp:

Oct 11, 2016, 10:41:56 PM (9 years ago)

Author:

Ben Rietbroek

Message:

Use different colors for testbuilds [v1.1.1-testing]

When the colors for a testbuild are the same as the colors used for a
release, it's easy to forget one is using a testbuild. So, from now on
testbuilds will use a different color-scheme as a reminder.

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

File:

• trunk/bootcode/setup/main.asm (modified) (10 diffs)

trunk/bootcode/setup/main.asm

@@ -324 +324 @@
 
 
-
-CLR_MENU_WINDOW_CLASSIC    = 0e01h
-CLR_MENU_WINDOW_BM   = 0e01h
+; Initial bg-colors on setup-items -- revert to item-bg when cursor moved
+CLR_MENU_WINDOW_CLASSIC = 0e01h
+CLR_MENU_WINDOW_BM      = 0e01h
+CLR_MENU_WINDOW_TB      = 0e08h
+IFDEF TESTBUILD
+CLR_MENU_WINDOW = CLR_MENU_WINDOW_TB
+ELSE
+CLR_MENU_WINDOW = CLR_MENU_WINDOW_BM
+ENDIF
+
 ;        In: BP - Pointer to Menu
 ;       Out: DH - Active Item on Screen
 SETUP_DrawMenuOnScreen          Proc Near
    call    SETUP_DrawMenuWindow
-   mov     cx, CLR_MENU_WINDOW_BM
+   mov     cx, CLR_MENU_WINDOW
    call    VideoIO_Color
    xor     ch, ch
@@ -358 +365 @@
 
 
-
 CLR_SELECTED_ITEM_CLASSIC  = 0f04h
-CLR_SELECTED_ITEM_BM = 0f04h
+CLR_SELECTED_ITEM_BM       = 0f04h
+CLR_SELECTED_ITEM_TB       = 0f04h
+IFDEF TESTBUILD
+CLR_SELECTED_ITEM = CLR_SELECTED_ITEM_TB
+ELSE
+CLR_SELECTED_ITEM = CLR_SELECTED_ITEM_BM
+ENDIF
+
 ; Displays selected Item on screen
 ;        In: DH - Active Item
 ; Destroyed: None
 SETUP_DrawSelectItem            Proc Near Uses cx
-   mov     cx, CLR_SELECTED_ITEM_BM
+   mov     cx, CLR_SELECTED_ITEM
    call    VideoIO_Color
    mov     ch, dh
@@ -373 +386 @@
 
 
-CLR_DESELECTED_ITEM_CLASSIC  = 0e01h
-CLR_DESELECTED_ITEM_BM  = 0e01h
+CLR_DESELECTED_ITEM_CLASSIC   = 0e01h
+CLR_DESELECTED_ITEM_BM        = 0e01h
+CLR_DESELECTED_ITEM_TB        = 0e08h
+IFDEF TESTBUILD
+CLR_DESELECTED_ITEM = CLR_DESELECTED_ITEM_TB
+ELSE
+CLR_DESELECTED_ITEM = CLR_DESELECTED_ITEM_BM
+ENDIF
+
 ; Display last-selected Item on screen (De-Select)
 ;        In: DL - Active Item
 ; Destroyed: None
 SETUP_DrawDeSelectItem          Proc Near Uses cx
-   mov     cx, CLR_DESELECTED_ITEM_BM
+   mov     cx, CLR_DESELECTED_ITEM
    call    VideoIO_Color
    mov     ch, dl
@@ -441 +461 @@
          call    VideoIO_Locate
 
+
 CLR_ITEM_PACK_CLASSIC   = 0f01h
-CLR_ITEM_PACK_BM  = 0f01h
-
-         mov     cx, CLR_ITEM_PACK_BM
+CLR_ITEM_PACK_BM        = 0f01h
+CLR_ITEM_PACK_TB        = 0f08h
+IFDEF TESTBUILD
+CLR_ITEM_PACK = CLR_ITEM_PACK_TB
+ELSE
+CLR_ITEM_PACK = CLR_ITEM_PACK_BM
+ENDIF
+
+         mov     cx, CLR_ITEM_PACK
          call    VideoIO_Color           ; White on blue background
          mov     si, ds:[si+LocMENU_ItemNamePtr] ; SI - Name of Item
@@ -496 +523 @@
 SETUP_FillUpItemPack_Now        EndP
 
-
+CLR_SETUP_WINDOW_CLASSIC   = 0f01h
+CLR_SETUP_WINDOW_BM        = 0901h
+CLR_SETUP_WINDOW_TB        = 0908h
+IFDEF TESTBUILD
+CLR_SETUP_WINDOW = CLR_SETUP_WINDOW_TB
+ELSE
+CLR_SETUP_WINDOW = CLR_SETUP_WINDOW_BM
+ENDIF
 
 SETUP_DrawMenuWindow            Proc Near   Uses es
-   mov     cx, 0901h
+   mov     cx, CLR_SETUP_WINDOW
    call    VideoIO_Color
    mov     bx, 0401h
@@ -627 +661 @@
 SETUP_DrawMenuBase              EndP
 
+
+; F10-SETUP Help Directions
+CLR_SETUP_HELP_CLASSIC   = 0f01h
+CLR_SETUP_HELP_BM        = 0f01h
+CLR_SETUP_HELP_TB        = 0f08h
+IFDEF TESTBUILD
+CLR_SETUP_HELP = CLR_SETUP_HELP_TB
+ELSE
+CLR_SETUP_HELP = CLR_SETUP_HELP_BM
+ENDIF
+
 ; Zeichnet die Men Hilfe aufn Bildschirm
 ;        In: SI - Pointer to 4 HelpStrings...
 ; Destroyed: None
 SETUP_DrawMenuHelp              Proc Near   Uses cx si
-   mov     cx, 0F01h
+   mov     cx, CLR_SETUP_HELP
    call    VideoIO_Color
    mov     cx, 0F05h
@@ -893 +938 @@
    cmp     ax, 0ABABh                    ; Magic Processing...
    je      SLEP_MagicLayOut
-   mov     cx, 0D05h
+   mov     cx, 0D05h                     ; Password Dialog
    call    VideoIO_Color
 
@@ -908 +953 @@
    dec     dl                            ; Size window to match given string...
    call    VideoIO_MakeWindow
-   mov     cx, 0F05h
+   mov     cx, 0F05h                     ; Password EntryField Label
    call    VideoIO_Color
 
@@ -916 +961 @@
    call    VideoIO_Locate
    call    VideoIO_Print                 ; Uses given string 'Define or Verify'
-   mov     cx, 0E05h
+   mov     cx, 0E05h                     ; Password EntryField
    call    VideoIO_Color
    mov     word ptr [EnterPwd_Location], 0E26h
@@ -923 +968 @@
 
   SLEP_MagicLayOut:
-   mov     cx, 0C04h
+   mov     cx, 0C04h                      ; Only used for different (unused) layout (ABAB)
    call    VideoIO_Color