Changeset 528 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu

Timestamp:

Mar 22, 2013, 5:43:54 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Swapping Floppy and Hard Drives at the same time work again (broke in r492).
• Hotkeys again work in boot menu (broke in r492).

File:

• trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuEvent.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuEvent.asm

@@ -69 +69 @@
 MENUEVENT_ExitMenu equ  (BootMenuEvent_Completed - FirstEvent)
 MENUEVENT_ItemHighlightedFromCX equ (EventItemHighlightedFromCX - FirstEvent)
+MENUEVENT_KeyStrokeInAX equ (EventKeyStrokeInAX - FirstEvent)
 MENUEVENT_ItemSelectedFromCX equ (EventItemSelectedFromCX - FirstEvent)
 MENUEVENT_RefreshTitle equ (BootMenuPrint_TitleStrings - FirstEvent)
@@ -94 +95 @@
     dw      EventNotHandled                     ; MENUEVENT.IdleProcessing
     dw      EventItemHighlightedFromCX          ; MENUEVENT.ItemHighlightedFromCX
+    
     dw      EventItemSelectedFromCX             ; MENUEVENT.ItemSelectedFromCX
     dw      EventKeyStrokeInAX                  ; MENUEVENT.KeyStrokeInAX
@@ -161 +163 @@
 EventItemHighlightedFromCX:
     push    cx
+
+    ; Drive number translations and hotkeys must be reset to defaults so highlighted
+    ; selections are correctly displayed on Hotkey Bar and on Boot Menu
+%ifdef MODULE_HOTKEYS
+    call    BootVars_StoreDefaultDriveLettersToHotkeyVars
+%endif
+    call    DriveXlate_Reset
+
+    ; Set highlighted item to be drive to boot from for visual purposes only
     call    BootMenu_GetDriveToDXforMenuitemInCX
-    jnc     .noDriveSwap
+    jnc     SHORT .noDriveSwapSinceRomBootSelected
     call    DriveXlate_SetDriveToSwap
-.noDriveSwap:
+
+%ifdef MODULE_HOTKEYS
+    ; Store highlighted drive as hotkey
+    call    HotkeyBar_StoreHotkeyToBootvarsForDriveNumberInDL
+    jmp     SHORT .UpdateHotkeyBar
+.noDriveSwapSinceRomBootSelected:
+    mov     ah, ROM_BOOT_HOTKEY_SCANCODE
+    call    HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
+
+.UpdateHotkeyBar:
+    ; Redraw Hotkey Bar for updated boot drive letters
+    mov     al, MONO_NORMAL
+    CALL_DISPLAY_LIBRARY    SetCharacterAttributeFromAL
+
+    mov     bl, ATTRIBUTES_ARE_USED
+    mov     ax, TELETYPE_OUTPUT_WITH_ATTRIBUTE
+    CALL_DISPLAY_LIBRARY    SetCharOutputFunctionFromAXwithAttribFlagInBL
+    call    HotkeyBar_DrawToTopOfScreen
+%else
+.noDriveSwapSinceRomBootSelected:
+%endif ; MODULE_HOTKEYS
 
     ; Redraw changes in drive numbers
@@ -181 +212 @@
 
 ;--------------------------------------------------------------------
+; EventKeyStrokeInAX
+;   Parameters
+;       AL:     ASCII character for the key
+;       AH:     Keyboard library scan code for the key
+;       DS:     Ptr to RAMVARS
+;       ES:     Ptr to BDA (zero)
+;       SS:BP:  Menu library handle
+;   Returns:
+;       CF:     Set if event processed
+;               Cleared if event not processed
+;   Corrupts registers:
+;       Does not matter
+;--------------------------------------------------------------------
+%ifdef MODULE_HOTKEYS
+EventKeyStrokeInAX:
+    ; Keypress will be the primary boot drive
+    cmp     ah, BOOT_MENU_HOTKEY_SCANCODE
+    je      SHORT BootMenuEvent_Completed   ; Ignore Boot Menu hotkey
+    call    HotkeyBar_StoreHotkeyToBootvarsIfValidKeystrokeInAX
+    jnc     SHORT BootMenuEvent_Completed
+    ; Fall to CloseBootMenu through EventItemSelectedFromCX
+%endif
+
+
+;--------------------------------------------------------------------
 ; EventItemSelectedFromCX
 ;   Parameters
@@ -223 +279 @@
 BootMenuEvent_Completed:
     stc
-    ret
+%ifndef MODULE_HOTKEYS
+EventKeyStrokeInAX:
+%endif
+    ret