Changeset 67 in xtideuniversalbios for trunk/Assembly_Library/Src/Menu/MenuText.asm

Timestamp:

Dec 9, 2010, 5:14:25 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to Assembly Library:

• Forgot to update SI on new File Read and Write functions.
• Screen clearing function now accepts any character and attribute.
• Menu library now accepts CR,LF combination as line feed. Previously only LF,CR worked properly.

File:

• trunk/Assembly_Library/Src/Menu/MenuText.asm (modified) (6 diffs)

trunk/Assembly_Library/Src/Menu/MenuText.asm

@@ -2 +2 @@
 ; Project name  :   Assembly Library
 ; Created date  :   21.7.2010
-; Last update   :   24.10.2010
+; Last update   :   9.12.2010
 ; Author        :   Tomi Tilli
 ; Description   :   Functions for drawing menu texts by the user.
@@ -126 +126 @@
 MenuText_RefreshItemFromAX:
     push    cx
-    mov     cx, ax                  ; Backup item to CX
-
+    push    ax
+
+    xchg    cx, ax
     call    MenuScrollbars_IsItemInCXonVisiblePage
     jnc     SHORT .InvalidItem
     call    MenuText_AdjustDisplayContextForDrawingItemFromCX
+    call    ClearPreviousItem
     call    MenuEvent_RefreshItemFromCX
-    call    DrawScrollbarIfNecessary
+    call    DrawScrollbarCharacterForItemInCXifNecessary
 .InvalidItem:
-    xchg    ax, cx                  ; Restore AX
+    pop     ax
     pop     cx
     ret
@@ -181 +183 @@
 
 ;--------------------------------------------------------------------
+; ClearPreviousItem
+;   Parameters
+;       SS:BP:  Ptr to MENU
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       AX, BX, DX, DI
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+ClearPreviousItem:
+    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
+    xchg    bx, ax
+
+    call    MenuBorders_GetNumberOfMiddleCharactersToDX
+    sub     dx, BYTE MENU_TEXT_COLUMN_OFFSET
+    mov     al, [cs:g_rgbTextBorderCharacters+BORDER_CHARS.cMiddle]
+    call    MenuBorders_PrintMultipleBorderCharactersFromAL
+
+    xchg    ax, bx
+    CALL_DISPLAY_LIBRARY SetCursorCoordinatesFromAX
+    ret
+
+
+;--------------------------------------------------------------------
 ; GetItemTextAttributeTypeToSIforItemInCX
 ;   Parameters
@@ -205 +231 @@
 
 ;--------------------------------------------------------------------
-; DrawScrollbarIfNecessary
+; DrawScrollbarCharacterForItemInCXifNecessary
 ;   Parameters
 ;       CX:     Item to refresh
@@ -212 +238 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, BX, DX, SI, DI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-DrawScrollbarIfNecessary:
-    push    cx
-    call    .DrawSpacesBeforeScrollbarCharacter
+;       AX, CX, BX, DX, SI, DI
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+DrawScrollbarCharacterForItemInCXifNecessary:
     call    MenuScrollbars_AreScrollbarsNeeded
-    pop     cx
     jc      SHORT .DrawScrollbarCharacter
     ret
 
-;--------------------------------------------------------------------
-; .DrawSpacesBeforeScrollbarCharacter
-;   Parameters
-;       CX:     Item to refresh
-;       SS:BP:  Ptr to MENU
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, CX, DX, DI
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-.DrawSpacesBeforeScrollbarCharacter:
-    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
-    xchg    dx, ax                  ; Current coordinates to DX
-    mov     ax, cx
-    call    MenuLocation_GetScrollbarCoordinatesToAXforItemInAX
-    sub     al, dl
-    sub     al, MENU_TEXT_COLUMN_OFFSET/2
-
-    eMOVZX  cx, al
-    jcxz    .NoSpacesNeeded
-    mov     al, ' '
-    CALL_DISPLAY_LIBRARY PrintRepeatedCharacterFromALwithCountInCX
-ALIGN JUMP_ALIGN, ret
-.NoSpacesNeeded:
-    ret
-
-;--------------------------------------------------------------------
-; .DrawScrollbarCharacter
-;   Parameters
-;       CX:     Item to refresh
-;       SS:BP:  Ptr to MENU
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       AX, BX, DX, SI, DI
-;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 .DrawScrollbarCharacter:
-    push    cx
-
     call    MenuBorders_AdjustDisplayContextForDrawingBorders
-
     mov     ax, cx
     call    MenuLocation_GetScrollbarCoordinatesToAXforItemInAX
@@ -273 +256 @@
     sub     di, [bp+MENU.wFirstVisibleItem]     ; Item to line
     call    MenuScrollbars_GetScrollCharacterToALForLineInDI
-    CALL_DISPLAY_LIBRARY PrintCharacterFromAL
-
-    pop     cx
-    ret
+    jmp     MenuBorders_PrintSingleBorderCharacterFromAL