Changeset 390 in xtideuniversalbios for trunk/Assembly_Library/Src/Menu/MenuInit.asm

Timestamp:

Apr 17, 2012, 2:35:52 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Assembly Library:

• Menu library now stores and restores display context.
• Added couple of new eCMOVx macros.

File:

• trunk/Assembly_Library/Src/Menu/MenuInit.asm (modified) (3 diffs)

trunk/Assembly_Library/Src/Menu/MenuInit.asm

@@ -36 +36 @@
     push    es
     push    ds
-    LOAD_BDA_SEGMENT_TO ds, cx, !
-    push    WORD [BDA.wVidCurShape]
-    mov     cl, MENU_size
-    eENTER_STRUCT cx
-
+    xchg    cx, ax          ; Backup user data
+    CALL_DISPLAY_LIBRARY    PushDisplayContext
+
+    ; Create MENU struct to stack
+    mov     ax, MENU_size
+    eENTER_STRUCT   ax
+    xchg    ax, cx          ; Restore user data to AX
     call    Memory_ZeroSSBPwithSizeInCX
-    call    MenuInit_EnterMenuWithHandlerInBXandUserDataInDXAX
+
+    ; Display menu
+    call    EnterMenuWithHandlerInBXandUserDataInDXAX
+
+    ; Get menu selection and destroy menu variables from stack
     mov     dx, [bp+MENUINIT.wHighlightedItem]
-
-    eLEAVE_STRUCT MENU_size
-    pop     ax
-    CALL_DISPLAY_LIBRARY SetCursorShapeFromAX
-    CALL_DISPLAY_LIBRARY SynchronizeDisplayContextToHardware
+    eLEAVE_STRUCT   MENU_size
+
+    CALL_DISPLAY_LIBRARY    PopDisplayContext
     xchg    ax, dx          ; Return highlighted item in AX
     pop     ds
@@ -56 +60 @@
 
 ;--------------------------------------------------------------------
-; MenuInit_EnterMenuWithHandlerInBXandUserDataInDXAX
+; EnterMenuWithHandlerInBXandUserDataInDXAX
 ;   Parameters
 ;       DX:AX:  User specified data
@@ -67 +71 @@
 ;--------------------------------------------------------------------
 ALIGN MENU_JUMP_ALIGN
-MenuInit_EnterMenuWithHandlerInBXandUserDataInDXAX:
+EnterMenuWithHandlerInBXandUserDataInDXAX:
     mov     [bp+MENU.fnEventHandler], bx
     mov     [bp+MENU.dwUserData], ax