Changeset 369 in xtideuniversalbios for trunk/Assembly_Library/Src/Menu


Ignore:
Timestamp:
Mar 29, 2012, 9:29:28 AM (12 years ago)
Author:
gregli@…
google:author:
gregli@hotmail.com
Message:

Removed align directives for initalization code and added define for align in boot-time calls to the assembly library (defaulting to 1), resulting in a significant savings for the AT and 386 builds. Fixed a bug with switch command line handling in the serial server. Put in CR characters in licesnse.txt, so that it properly displays on Windows. In the configurator, added default values for user supplied CHS and LBA values, defaulting to values within range when those features are enabled. Updated the copyright message in the configurator as the literal word Copyright is important.

Location:
trunk/Assembly_Library/Src/Menu
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Assembly_Library/Src/Menu/CharOutLineSplitter.asm

    r181 r369  
    1414;       AX, DX, DI
    1515;--------------------------------------------------------------------
    16 ALIGN JUMP_ALIGN
     16ALIGN MENU_JUMP_ALIGN
    1717CharOutLineSplitter_PrepareForPrintingTextLines:
    1818    ; Get first text line column offset to DX
    … …  
    4141;       Nothing
    4242;--------------------------------------------------------------------
    43 ALIGN JUMP_ALIGN
     43ALIGN MENU_JUMP_ALIGN
    4444CharOutLineSplitter_GetFirstBorderLineColumnOffsetToAX:
    4545    call    MenuLocation_GetTitleBordersTopLeftCoordinatesToAX
    … …  
    6060;       DX
    6161;--------------------------------------------------------------------
    62 ALIGN JUMP_ALIGN
     62ALIGN MENU_JUMP_ALIGN
    6363CharOutLineSplitter_IsCursorAtTheEndOfTextLine:
    6464    push    ax
    … …  
    8686;       AX, DX
    8787;--------------------------------------------------------------------
    88 ALIGN JUMP_ALIGN
     88ALIGN MENU_JUMP_ALIGN
    8989CharOutLineSplitter_MovePartialWordToNewTextLine:
    9090    push    si
    … …  
    106106    mov     cx, di
    107107    mov     si, di
    108 ALIGN JUMP_ALIGN
     108ALIGN MENU_JUMP_ALIGN
    109109.ScanNextCharacter:     ; Space will always be found since one comes after border
    110110    dec     si

  • trunk/Assembly_Library/Src/Menu/Menu.asm

    r181 r369  
    1717;       AX (unless used as a return register), DI
    1818;--------------------------------------------------------------------
    19 ALIGN JUMP_ALIGN
     19ALIGN MENU_JUMP_ALIGN
    2020Menu_FunctionFromDI:
    2121    push    si

  • trunk/Assembly_Library/Src/Menu/MenuAttributes.asm

    r223 r369  
    2828;       AX, SI, DI
    2929;--------------------------------------------------------------------
    30 ALIGN JUMP_ALIGN
     30ALIGN MENU_JUMP_ALIGN
    3131MenuAttribute_SetToDisplayContextFromTypeInSI:
    3232    call    MenuAttribute_GetToAXfromTypeInSI
    … …  
    4444;       SI
    4545;--------------------------------------------------------------------
    46 ALIGN JUMP_ALIGN
     46ALIGN MENU_JUMP_ALIGN
    4747MenuAttribute_GetToAXfromTypeInSI:
    4848    push    ds
    … …  
    5959    jmp     SHORT .LoadAttributeAndReturn
    6060
    61 ALIGN JUMP_ALIGN
     61ALIGN MENU_JUMP_ALIGN
    6262.LoadMonoAttribute:
    6363    add     si, .rgcMonochromeAttributes
    6464    jmp     SHORT .LoadAttributeAndReturn
    6565
    66 ALIGN JUMP_ALIGN
     66ALIGN MENU_JUMP_ALIGN
    6767.LoadColorAttribute:
    6868    add     si, .rgcColorAttributes

  • trunk/Assembly_Library/Src/Menu/MenuBorders.asm

    r293 r369  
    2222;       AX, BX, CX, DX, SI, DI
    2323;--------------------------------------------------------------------
    24 ALIGN JUMP_ALIGN
     24ALIGN MENU_JUMP_ALIGN
    2525MenuBorders_RefreshAll:
    2626%ifndef USE_186
    … …  
    5252;       AX, BX, DX, SI, DI
    5353;--------------------------------------------------------------------
    54 ALIGN JUMP_ALIGN
     54ALIGN MENU_JUMP_ALIGN
    5555MenuBorders_RedrawBottomBorderLine:
    5656    call    MenuBorders_AdjustDisplayContextForDrawingBorders
    … …  
    7171;--------------------------------------------------------------------
    7272%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    73 ALIGN JUMP_ALIGN
     73ALIGN MENU_JUMP_ALIGN
    7474MenuBorders_RefreshItemBorders:
    7575    call    MenuBorders_AdjustDisplayContextForDrawingBorders
    … …  
    9191;       AX, BX, SI, DI
    9292;--------------------------------------------------------------------
    93 ALIGN JUMP_ALIGN
     93ALIGN MENU_JUMP_ALIGN
    9494MenuBorders_AdjustDisplayContextForDrawingBorders:
    9595    mov     bl, ATTRIBUTES_ARE_USED
    … …  
    116116;       Nothing
    117117;--------------------------------------------------------------------
    118 ALIGN JUMP_ALIGN
     118ALIGN MENU_JUMP_ALIGN
    119119MenuBorders_GetNumberOfMiddleCharactersToDX:
    120120    eMOVZX  dx, [bp+MENUINIT.bWidth]
    … …  
    133133;       AX, BX, CX, SI, DI
    134134;--------------------------------------------------------------------
    135 ALIGN JUMP_ALIGN
     135ALIGN MENU_JUMP_ALIGN
    136136RefreshTitleBorders:
    137137    call    DrawTopBorderLine
    … …  
    149149;       AX, BX, CX, SI, DI
    150150;--------------------------------------------------------------------
    151 ALIGN JUMP_ALIGN
     151ALIGN MENU_JUMP_ALIGN
    152152RefreshInformationBorders:
    153153    call    DrawSeparationBorderLine
    … …  
    165165;       AX, BX, CX, SI, DI
    166166;--------------------------------------------------------------------
    167 ALIGN JUMP_ALIGN
     167ALIGN MENU_JUMP_ALIGN
    168168RefreshItemBorders:
    169169    call    DrawSeparationBorderLine
    … …  
    184184DrawTextBorderLinesByCXtimes:
    185185    jcxz    .NoBorderLinesToDraw
    186 ALIGN JUMP_ALIGN
     186ALIGN MENU_JUMP_ALIGN
    187187.DrawBordersWithFunctionInBX:
    188188    call    DrawTextBorderLine
    … …  
    207207;       AX, SI, DI
    208208;--------------------------------------------------------------------
    209 ALIGN JUMP_ALIGN
     209ALIGN MENU_JUMP_ALIGN
    210210DrawTopBorderLine:
    211211    mov     si, g_rgbTopBorderCharacters
    … …  
    213213    jmp     SHORT PrintNewlineToEndBorderLine
    214214
    215 ALIGN JUMP_ALIGN
     215ALIGN MENU_JUMP_ALIGN
    216216DrawSeparationBorderLine:
    217217    mov     si, g_rgbSeparationBorderCharacters
    218218    jmp     SHORT PrintBorderCharactersFromCSSIandShadowCharacter
    219219
    220 ALIGN JUMP_ALIGN
     220ALIGN MENU_JUMP_ALIGN
    221221DrawBottomBorderLine:
    222222    mov     si, g_rgbBottomBorderCharacters
    … …  
    231231    ret
    232232
    233 ALIGN JUMP_ALIGN
     233ALIGN MENU_JUMP_ALIGN
    234234DrawBottomShadowLine:
    235235    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
    … …  
    243243    ret
    244244
    245 ALIGN JUMP_ALIGN
     245ALIGN MENU_JUMP_ALIGN
    246246DrawTextBorderLine:
    247247    mov     si, g_rgbTextBorderCharacters
    … …  
    259259;       AX, SI, DI
    260260;--------------------------------------------------------------------
    261 ALIGN JUMP_ALIGN
     261ALIGN MENU_JUMP_ALIGN
    262262PrintBorderCharactersFromCSSIandShadowCharacter:
    263263    call    PrintBorderCharactersFromCSSI
    … …  
    277277;       AX, DI
    278278;--------------------------------------------------------------------
    279 ALIGN JUMP_ALIGN
     279ALIGN MENU_JUMP_ALIGN
    280280PrintNewlineToEndBorderLine:
    281281    CALL_DISPLAY_LIBRARY PrintNewlineCharacters
    … …  
    293293;       AX, SI, DI
    294294;--------------------------------------------------------------------
    295 ALIGN JUMP_ALIGN
     295ALIGN MENU_JUMP_ALIGN
    296296PrintShadowCharactersByDXtimes:
    297297    CALL_DISPLAY_LIBRARY PushDisplayContext
    … …  
    323323;       AX, SI, DI
    324324;--------------------------------------------------------------------
    325 ALIGN JUMP_ALIGN
     325ALIGN MENU_JUMP_ALIGN
    326326PrintBorderCharactersFromCSSI:
    327327    cs lodsb        ; Load from [cs:si+BORDER_CHARS.cLeft] to AL
    … …  
    346346;       AX, DI
    347347;--------------------------------------------------------------------
    348 ALIGN JUMP_ALIGN
     348ALIGN MENU_JUMP_ALIGN
    349349MenuBorders_PrintSingleBorderCharacterFromAL:
    350350    CALL_DISPLAY_LIBRARY PrintCharacterFromAL
    351351    ret
    352352
    353 ALIGN JUMP_ALIGN
     353ALIGN MENU_JUMP_ALIGN
    354354MenuBorders_PrintMultipleBorderCharactersFromAL:
    355355    push    cx
    … …  
    369369;       AX, SI, DI
    370370;--------------------------------------------------------------------
    371 ALIGN JUMP_ALIGN
     371ALIGN MENU_JUMP_ALIGN
    372372DrawTimeoutCounterString:
    373373    call    MenuTime_GetTimeoutSecondsLeftToAX

  • trunk/Assembly_Library/Src/Menu/MenuCharOut.asm

    r293 r369  
    2121;       AX, DX
    2222;--------------------------------------------------------------------
    23 ALIGN JUMP_ALIGN
     23ALIGN MENU_JUMP_ALIGN
    2424MenuCharOut_MenuTeletypeOutputWithAutomaticLineChange:
    2525    call    CharOutLineSplitter_IsCursorAtTheEndOfTextLine
    … …  
    3030    ; Fall to MenuCharOut_MenuTextTeletypeOutputWithAttribute
    3131
    32 ALIGN JUMP_ALIGN
     32ALIGN MENU_JUMP_ALIGN
    3333MenuCharOut_MenuTeletypeOutput:
    3434    cmp     al, CR
    … …  
    5151;       AX, DX
    5252;--------------------------------------------------------------------
    53 ALIGN JUMP_ALIGN
     53ALIGN MENU_JUMP_ALIGN
    5454MenuCharOut_PrintLFCRandAdjustOffsetForStartOfLine:
    5555    mov     al, LF
    … …  
    5757    ; Fall to PrintCRandAdjustOffsetForStartOfLine
    5858
    59 ALIGN JUMP_ALIGN
     59ALIGN MENU_JUMP_ALIGN
    6060PrintCRandAdjustOffsetForStartOfLine:
    6161    mov     al, CR

  • trunk/Assembly_Library/Src/Menu/MenuEvent.asm

    r189 r369  
    1616;       AX, BX, DX
    1717;--------------------------------------------------------------------
    18 ALIGN JUMP_ALIGN
     18ALIGN MENU_JUMP_ALIGN
    1919MenuEvent_InitializeMenuinit:
    2020    push    ss
    … …  
    3535;       AX, BX, DX
    3636;--------------------------------------------------------------------
    37 ALIGN JUMP_ALIGN
     37ALIGN MENU_JUMP_ALIGN
    3838MenuEvent_ExitMenu:
    3939    mov     bl, MENUEVENT_ExitMenu
    … …  
    5252;       AX, BX, DX
    5353;--------------------------------------------------------------------
    54 ALIGN JUMP_ALIGN
     54ALIGN MENU_JUMP_ALIGN
    5555MenuEvent_IdleProcessing:
    5656    mov     bl, MENUEVENT_IdleProcessing
    … …  
    7070;       AX, CX, BX, DX
    7171;--------------------------------------------------------------------
    72 ALIGN JUMP_ALIGN
     72ALIGN MENU_JUMP_ALIGN
    7373MenuEvent_RefreshTitle:
    7474    mov     bl, MENUEVENT_RefreshTitle
    … …  
    9393;       AX, BX, DX
    9494;--------------------------------------------------------------------
    95 ALIGN JUMP_ALIGN
     95ALIGN MENU_JUMP_ALIGN
    9696MenuEvent_RefreshItemFromCX:
    9797    mov     bl, MENUEVENT_RefreshItemFromCX
    … …  
    109109;       AX, BX, DX, SI, DI
    110110;--------------------------------------------------------------------
    111 ALIGN JUMP_ALIGN
     111ALIGN MENU_JUMP_ALIGN
    112112MenuEvent_HighlightItemFromCX:
    113113    mov     dx, cx
    … …  
    136136;       AX, BX, DX
    137137;--------------------------------------------------------------------
    138 ALIGN JUMP_ALIGN
     138ALIGN MENU_JUMP_ALIGN
    139139MenuEvent_KeyStrokeInAX:
    140140    mov     bl, MENUEVENT_KeyStrokeInAX
    … …  
    171171;       BX
    172172;--------------------------------------------------------------------
    173 ALIGN JUMP_ALIGN
     173ALIGN MENU_JUMP_ALIGN
    174174MenuEvent_SendFromBX:
    175175    push    es

  • trunk/Assembly_Library/Src/Menu/MenuInit.asm

    r289 r369  
    1515;       All except segments
    1616;--------------------------------------------------------------------
    17 ALIGN JUMP_ALIGN
     17ALIGN MENU_JUMP_ALIGN
    1818MenuInit_DisplayMenuWithHandlerInBXandUserDataInDXAX:
    1919    push    es
    … …  
    4949;       All, except SS:BP
    5050;--------------------------------------------------------------------
    51 ALIGN JUMP_ALIGN
     51ALIGN MENU_JUMP_ALIGN
    5252MenuInit_EnterMenuWithHandlerInBXandUserDataInDXAX:
    5353    mov     [bp+MENU.fnEventHandler], bx
    … …  
    7676;       AX, BX, CX, DX, SI, DI
    7777;--------------------------------------------------------------------
    78 ALIGN JUMP_ALIGN
     78ALIGN MENU_JUMP_ALIGN
    7979MenuInit_RefreshMenuWindow:
    8080    call    MenuBorders_RefreshAll          ; Draw borders
    … …  
    9494;--------------------------------------------------------------------
    9595%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    96 ALIGN JUMP_ALIGN
     96ALIGN MENU_JUMP_ALIGN
    9797MenuInit_CloseMenuIfExitEventAllows:
    9898    call    MenuEvent_ExitMenu
    … …  
    111111;       Nothing
    112112;--------------------------------------------------------------------
    113 ALIGN JUMP_ALIGN
     113ALIGN MENU_JUMP_ALIGN
    114114MenuInit_CloseMenuWindow:
    115115    or      BYTE [bp+MENU.bFlags], FLG_MENU_EXIT
    … …  
    127127;       AX, BX, CX, DX, SI, DI
    128128;--------------------------------------------------------------------
    129 ALIGN JUMP_ALIGN
     129ALIGN MENU_JUMP_ALIGN
    130130MenuInit_HighlightItemFromAX:
    131131    sub     ax, [bp+MENUINIT.wHighlightedItem]
    … …  
    142142;--------------------------------------------------------------------
    143143%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    144 ALIGN JUMP_ALIGN
     144ALIGN MENU_JUMP_ALIGN
    145145MenuInit_GetHighlightedItemToAX:
    146146    mov     ax, [bp+MENUINIT.wHighlightedItem]
    … …  
    162162;--------------------------------------------------------------------
    163163%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    164 ALIGN JUMP_ALIGN
     164ALIGN MENU_JUMP_ALIGN
    165165MenuInit_SetTitleHeightFromAL:
    166166    mov     [bp+MENUINIT.bTitleLines], al
    167167    ret
    168168
    169 ALIGN JUMP_ALIGN
     169ALIGN MENU_JUMP_ALIGN
    170170MenuInit_SetInformationHeightFromAL:
    171171    mov     [bp+MENUINIT.bInfoLines], al
    172172    ret
    173173
    174 ALIGN JUMP_ALIGN
     174ALIGN MENU_JUMP_ALIGN
    175175MenuInit_SetTotalItemsFromAX:
    176176    mov     [bp+MENUINIT.wItems], ax
    … …  
    191191;--------------------------------------------------------------------
    192192%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    193 ALIGN JUMP_ALIGN
     193ALIGN MENU_JUMP_ALIGN
    194194MenuInit_SetUserDataFromDSSI:
    195195    mov     [bp+MENU.dwUserData], si
    … …  
    197197    ret
    198198
    199 ALIGN JUMP_ALIGN
     199ALIGN MENU_JUMP_ALIGN
    200200MenuInit_GetUserDataToDSSI:
    201201    lds     si, [bp+MENU.dwUserData]

  • trunk/Assembly_Library/Src/Menu/MenuLocation.asm

    r293 r369  
    1616;       Nothing
    1717;--------------------------------------------------------------------
    18 ALIGN JUMP_ALIGN
     18ALIGN MENU_JUMP_ALIGN
    1919MenuLocation_GetTextCoordinatesToAXforItemInAX:
    2020    sub     ax, [bp+MENU.wFirstVisibleItem]     ; Item to line
    … …  
    4242    jmp     SHORT AddItemBordersTopLeftCoordinatesToAX
    4343
    44 ALIGN JUMP_ALIGN
     44ALIGN MENU_JUMP_ALIGN
    4545MenuLocation_GetTitleTextTopLeftCoordinatesToAX:
    4646    mov     ax, (MENU_TEXT_ROW_OFFSET<<8) | MENU_TEXT_COLUMN_OFFSET
    … …  
    5050    jmp     SHORT MenuLocation_AddTitleBordersTopLeftCoordinatesToAX
    5151
    52 ALIGN JUMP_ALIGN
     52ALIGN MENU_JUMP_ALIGN
    5353MenuLocation_GetInformationTextTopLeftCoordinatesToAX:
    5454    mov     ax, (MENU_TEXT_ROW_OFFSET<<8) | MENU_TEXT_COLUMN_OFFSET
    5555    jmp     SHORT AddInformationBordersTopLeftCoordinatesToAX
    5656
    57 ALIGN JUMP_ALIGN
     57ALIGN MENU_JUMP_ALIGN
    5858MenuLocation_GetBottomBordersTopLeftCoordinatesToAX:
    5959    xor     ax, ax
    … …  
    7777    stc                         ; Compensate for Information top border
    7878    adc     ah, [bp+MENUINIT.bInfoLines]
    79 ALIGN JUMP_ALIGN
     79ALIGN MENU_JUMP_ALIGN
    8080AddInformationBordersTopLeftCoordinatesToAX:
    8181    push    cx
    … …  
    8484    add     ah, cl
    8585    pop     cx
    86 ALIGN JUMP_ALIGN
     86ALIGN MENU_JUMP_ALIGN
    8787AddItemBordersTopLeftCoordinatesToAX:
    8888    stc                         ; Compensate for Title top border
    8989    adc     ah, [bp+MENUINIT.bTitleLines]
    90 ALIGN JUMP_ALIGN
     90ALIGN MENU_JUMP_ALIGN
    9191MenuLocation_AddTitleBordersTopLeftCoordinatesToAX:
    9292    push    di
    … …  
    112112;       Nothing
    113113;--------------------------------------------------------------------
    114 ALIGN JUMP_ALIGN
     114ALIGN MENU_JUMP_ALIGN
    115115MenuLocation_GetMaxTextLineLengthToAX:
    116116    eMOVZX  ax, [bp+MENUINIT.bWidth]

  • trunk/Assembly_Library/Src/Menu/MenuLoop.asm

    r189 r369  
    1414;       AX, BX, CX, DX, SI, DI
    1515;--------------------------------------------------------------------
    16 ALIGN JUMP_ALIGN
     16ALIGN MENU_JUMP_ALIGN
    1717MenuLoop_Enter:
    1818    call    KeystrokeProcessing
    … …  
    3636;       All, except SS:BP
    3737;--------------------------------------------------------------------
    38 ALIGN JUMP_ALIGN
     38ALIGN MENU_JUMP_ALIGN
    3939KeystrokeProcessing:
    4040    call    Keyboard_GetKeystrokeToAX
    … …  
    4343    ret
    4444
    45 ALIGN JUMP_ALIGN
     45ALIGN MENU_JUMP_ALIGN
    4646TimeoutProcessing:
    4747    call    MenuTime_UpdateSelectionTimeout
    … …  
    6262;       AX, BX, CX, DX, SI, DI
    6363;--------------------------------------------------------------------
    64 ALIGN JUMP_ALIGN
     64ALIGN MENU_JUMP_ALIGN
    6565ProcessKeystrokeFromAX:
    6666    xchg    cx, ax
    … …  
    8585;       BX, CX, DX, SI, DI
    8686;--------------------------------------------------------------------
    87 ALIGN JUMP_ALIGN
     87ALIGN MENU_JUMP_ALIGN
    8888.ProcessMenuSystemKeystrokeFromAX:
    8989    cmp     al, ESC
    … …  
    9696    ret     ; Return with CF cleared since keystroke not processed
    9797
    98 ALIGN JUMP_ALIGN
     98ALIGN MENU_JUMP_ALIGN
    9999.LeaveMenuWithoutSelectingItem:
    100100    call    MenuEvent_ExitMenu
    … …  
    106106    ret
    107107
    108 ALIGN JUMP_ALIGN
     108ALIGN MENU_JUMP_ALIGN
    109109.SelectItem:
    110110    mov     cx, [bp+MENUINIT.wHighlightedItem]
    … …  
    128128;       BX, CX, DX, SI, DI
    129129;--------------------------------------------------------------------
    130 ALIGN JUMP_ALIGN
     130ALIGN MENU_JUMP_ALIGN
    131131MenuLoop_ProcessScrollingKeysFromAX:
    132132    xchg    ah, al
    … …  
    148148    ret
    149149
    150 ALIGN JUMP_ALIGN
     150ALIGN MENU_JUMP_ALIGN
    151151.ChangeToPreviousPage:
    152152    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    … …  
    157157    jge     SHORT .MoveHighlightedItemByAX  ; No rotation for PgUp
    158158    ; Fall to .SelectFirstItem
    159 ALIGN JUMP_ALIGN
     159ALIGN MENU_JUMP_ALIGN
    160160.SelectFirstItem:
    161161    mov     ax, [bp+MENUINIT.wHighlightedItem]
    … …  
    163163    jmp     SHORT .MoveHighlightedItemByAX
    164164
    165 ALIGN JUMP_ALIGN
     165ALIGN MENU_JUMP_ALIGN
    166166.ChangeToNextPage:
    167167    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    … …  
    172172    jb      SHORT .MoveHighlightedItemByAX  ; No rotation for PgDn
    173173    ; Fall to .SelectLastItem
    174 ALIGN JUMP_ALIGN
     174ALIGN MENU_JUMP_ALIGN
    175175.SelectLastItem:
    176176    stc
    … …  
    179179    jmp     SHORT .MoveHighlightedItemByAX
    180180
    181 ALIGN JUMP_ALIGN
     181ALIGN MENU_JUMP_ALIGN
    182182.DecrementSelectedItem:
    183183    mov     ax, -1
    … …  
    185185.IncrementSelectedItem:
    186186    mov     al, 1   ; AH is already 0
    187 ALIGN JUMP_ALIGN
     187ALIGN MENU_JUMP_ALIGN
    188188.MoveHighlightedItemByAX:
    189189    call    MenuScrollbars_MoveHighlightedItemByAX

  • trunk/Assembly_Library/Src/Menu/MenuScrollbars.asm

    r293 r369  
    1515;       AX
    1616;--------------------------------------------------------------------
    17 ALIGN JUMP_ALIGN
     17ALIGN MENU_JUMP_ALIGN
    1818MenuScrollbars_AreScrollbarsNeeded:
    1919    xchg    ax, cx
    … …  
    3434;       AH, CX, DX
    3535;--------------------------------------------------------------------
    36 ALIGN JUMP_ALIGN
     36ALIGN MENU_JUMP_ALIGN
    3737MenuScrollbars_GetScrollCharacterToALForLineInDI:
    3838    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    … …  
    4545    call    .GetLastThumbLineToAX
    4646    cmp     ax, di              ; After last thumb line?
    47 ALIGN JUMP_ALIGN
     47ALIGN MENU_JUMP_ALIGN
    4848.ReturnTrackCharacter:
    4949    mov     al, SCROLL_TRACK_CHARACTER
    5050    jb      SHORT .Return
    5151    mov     al, SCROLL_THUMB_CHARACTER
    52 ALIGN JUMP_ALIGN, ret
     52ALIGN MENU_JUMP_ALIGN, ret
    5353.Return:
    5454    ret
    … …  
    6464;       CX, DX
    6565;--------------------------------------------------------------------
    66 ALIGN JUMP_ALIGN
     66ALIGN MENU_JUMP_ALIGN
    6767.GetLastThumbLineToAX:
    6868    call    MenuScrollbars_GetLastVisibleItemOnPageToAX
    … …  
    8080;       CX, DX
    8181;--------------------------------------------------------------------
    82 ALIGN JUMP_ALIGN
     82ALIGN MENU_JUMP_ALIGN
    8383.CalculateFirstOrLastThumbLineToAX:
    8484    mul     cx
    … …  
    9797;       AX, BX, CX, DX, SI, DI
    9898;--------------------------------------------------------------------
    99 ALIGN JUMP_ALIGN
     99ALIGN MENU_JUMP_ALIGN
    100100MenuScrollbars_MoveHighlightedItemByAX:
    101101    mov     cx, [bp+MENUINIT.wHighlightedItem]
    … …  
    120120    jae     SHORT .ScrollPageForNewItemInCX
    121121
    122 ALIGN JUMP_ALIGN
     122ALIGN MENU_JUMP_ALIGN
    123123.RotateNegativeItemInCX:
    124124    add     cx, dx
    … …  
    135135;       AX, BX, CX, DX, SI, DI
    136136;--------------------------------------------------------------------
    137 ALIGN JUMP_ALIGN
     137ALIGN MENU_JUMP_ALIGN
    138138.ScrollPageForNewItemInCX:
    139139    call    MenuScrollbars_IsItemInCXonVisiblePage
    … …  
    154154    cwd     ; This won't work if MaxFirstVisibleItem > 32767
    155155
    156 ALIGN JUMP_ALIGN
     156ALIGN MENU_JUMP_ALIGN
    157157.DXisPositive:
    158158    cmp     ax, dx
    … …  
    160160    xchg    dx, ax
    161161
    162 ALIGN JUMP_ALIGN
     162ALIGN MENU_JUMP_ALIGN
    163163.AXisLessThanDX:
    164164    mov     [bp+MENU.wFirstVisibleItem], ax
    165165    call    MenuText_RefreshAllItems
    166166
    167 ALIGN JUMP_ALIGN
     167ALIGN MENU_JUMP_ALIGN
    168168.HighlightNewItemOnCX:
    169169    jmp     MenuEvent_HighlightItemFromCX
    … …  
    181181;       AX
    182182;--------------------------------------------------------------------
    183 ALIGN JUMP_ALIGN
     183ALIGN MENU_JUMP_ALIGN
    184184MenuScrollbars_IsItemInCXonVisiblePage:
    185185    cmp     [bp+MENU.wFirstVisibleItem], cx
    … …  
    190190    ja      SHORT .ItemIsNotVisible
    191191    stc     ; Item is visible
    192 ALIGN JUMP_ALIGN, ret
     192ALIGN MENU_JUMP_ALIGN, ret
    193193.ItemIsNotVisible:
    194194    ret
    … …  
    204204;       Nothing
    205205;--------------------------------------------------------------------
    206 ALIGN JUMP_ALIGN
     206ALIGN MENU_JUMP_ALIGN
    207207MenuScrollbars_GetLastVisibleItemOnPageToAX:
    208208    xchg    cx, ax
    … …  
    223223;       Nothing
    224224;--------------------------------------------------------------------
    225 ALIGN JUMP_ALIGN
     225ALIGN MENU_JUMP_ALIGN
    226226MenuScrollbars_GetActualVisibleItemsOnPageToCX:
    227227    call    MenuScrollbars_GetMaxVisibleItemsOnPageToCX
    … …  
    229229    jb      SHORT .Return
    230230    mov     cx, [bp+MENUINIT.wItems]
    231 ALIGN JUMP_ALIGN, ret
     231ALIGN MENU_JUMP_ALIGN, ret
    232232.Return:
    233233    ret
    … …  
    243243;       Nothing
    244244;--------------------------------------------------------------------
    245 ALIGN JUMP_ALIGN
     245ALIGN MENU_JUMP_ALIGN
    246246MenuScrollbars_GetMaxVisibleItemsOnPageToCX:
    247247    eMOVZX  cx, [bp+MENUINIT.bHeight]

  • trunk/Assembly_Library/Src/Menu/MenuText.asm

    r194 r369  
    1616;--------------------------------------------------------------------
    1717%ifndef EXCLUDE_FROM_XTIDE_UNIVERSAL_BIOS
    18 ALIGN JUMP_ALIGN
     18ALIGN MENU_JUMP_ALIGN
    1919MenuText_ClearTitleArea:
    2020    CALL_DISPLAY_LIBRARY PushDisplayContext     ; Save cursor coordinates
    … …  
    2424%endif
    2525       
    26 ALIGN JUMP_ALIGN
     26ALIGN MENU_JUMP_ALIGN
    2727MenuText_ClearInformationArea:
    2828    CALL_DISPLAY_LIBRARY PushDisplayContext     ; Save cursor coordinates
    … …  
    5050;       AX, BX, CX, DX, SI, DI
    5151;--------------------------------------------------------------------
    52 ALIGN JUMP_ALIGN
     52ALIGN MENU_JUMP_ALIGN
    5353MenuText_RefreshTitle:
    5454    cmp     BYTE [bp+MENUINIT.bTitleLines], 0
    … …  
    5757    jmp     MenuEvent_RefreshTitle
    5858
    59 ALIGN JUMP_ALIGN
     59ALIGN MENU_JUMP_ALIGN
    6060MenuText_RefreshInformation:
    6161    cmp     BYTE [bp+MENUINIT.bInfoLines], 0
    … …  
    7474;       AX, BX, DX, SI, DI
    7575;--------------------------------------------------------------------
    76 ALIGN JUMP_ALIGN
     76ALIGN MENU_JUMP_ALIGN
    7777PrepareToDrawTitleArea:
    7878    mov     si, ATTRIBUTE_CHARS.cTitle
    … …  
    8080    jmp     SHORT FinishPreparationsToDrawTitleOrInformationArea
    8181
    82 ALIGN JUMP_ALIGN
     82ALIGN MENU_JUMP_ALIGN
    8383MenuText_PrepareToDrawInformationArea:
    8484    mov     si, ATTRIBUTE_CHARS.cInformation
    … …  
    9898;       AX, BX, DX, SI, DI
    9999;--------------------------------------------------------------------
    100 ALIGN JUMP_ALIGN
     100ALIGN MENU_JUMP_ALIGN
    101101MenuText_RefreshAllItems:
    102102    push    cx
    … …  
    104104    call    MenuScrollbars_GetActualVisibleItemsOnPageToCX
    105105    mov     ax, [bp+MENU.wFirstVisibleItem]
    106 ALIGN JUMP_ALIGN
     106ALIGN MENU_JUMP_ALIGN
    107107.ItemRefreshLoop:
    108108    call    MenuText_RefreshItemFromAX
    … …  
    124124;       BX, DX, SI, DI
    125125;--------------------------------------------------------------------
    126 ALIGN JUMP_ALIGN
     126ALIGN MENU_JUMP_ALIGN
    127127MenuText_RefreshItemFromAX:
    128128    push    cx
    … …  
    151151;       AX, BX, DX, SI, DI
    152152;--------------------------------------------------------------------
    153 ALIGN JUMP_ALIGN
     153ALIGN MENU_JUMP_ALIGN
    154154MenuText_AdjustDisplayContextForDrawingItemFromCX:
    155155    mov     ax, cx
    … …  
    171171;       AX, BX, DX, SI, DI
    172172;--------------------------------------------------------------------
    173 ALIGN JUMP_ALIGN
     173ALIGN MENU_JUMP_ALIGN
    174174AdjustDisplayContextForDrawingTextsAtCoordsInAXwithAttrTypeInSIandCharOutFunctionInDX:
    175175    CALL_DISPLAY_LIBRARY SetCursorCoordinatesFromAX
    … …  
    192192;       AX, BX, DX, DI
    193193;--------------------------------------------------------------------
    194 ALIGN JUMP_ALIGN
     194ALIGN MENU_JUMP_ALIGN
    195195ClearPreviousItem:
    196196    CALL_DISPLAY_LIBRARY GetSoftwareCoordinatesToAX
    … …  
    217217;       Nothing
    218218;--------------------------------------------------------------------
    219 ALIGN JUMP_ALIGN
     219ALIGN MENU_JUMP_ALIGN
    220220GetItemTextAttributeTypeToSIforItemInCX:
    221221    mov     si, ATTRIBUTE_CHARS.cItem
    … …  
    226226    jne     SHORT .ReturnAttributeTypeInSI
    227227    sub     si, BYTE ATTRIBUTE_CHARS.cItem - ATTRIBUTE_CHARS.cHighlightedItem
    228 ALIGN JUMP_ALIGN, ret
     228ALIGN MENU_JUMP_ALIGN, ret
    229229.ReturnAttributeTypeInSI:
    230230    ret
    … …  
    241241;       AX, CX, BX, DX, SI, DI
    242242;--------------------------------------------------------------------
    243 ALIGN JUMP_ALIGN
     243ALIGN MENU_JUMP_ALIGN
    244244DrawScrollbarCharacterForItemInCXifNecessary:
    245245    call    MenuScrollbars_AreScrollbarsNeeded
    … …  
    247247    ret
    248248
    249 ALIGN JUMP_ALIGN
     249ALIGN MENU_JUMP_ALIGN
    250250.DrawScrollbarCharacter:
    251251    call    MenuBorders_AdjustDisplayContextForDrawingBorders

  • trunk/Assembly_Library/Src/Menu/MenuTime.asm

    r133 r369  
    1515;       AX, BX
    1616;--------------------------------------------------------------------
    17 ALIGN JUMP_ALIGN
     17ALIGN MENU_JUMP_ALIGN
    1818MenuTime_StartSelectionTimeoutWithTicksInAX:
    1919    push    ds
    … …  
    3434;       AX, BX, DX, SI, DI
    3535;--------------------------------------------------------------------
    36 ALIGN JUMP_ALIGN
     36ALIGN MENU_JUMP_ALIGN
    3737MenuTime_StopSelectionTimeout:
    3838    test    BYTE [bp+MENU.bFlags], FLG_MENU_TIMEOUT_COUNTDOWN
    … …  
    5252;       AX, BX, SI, DI
    5353;--------------------------------------------------------------------
    54 ALIGN JUMP_ALIGN
     54ALIGN MENU_JUMP_ALIGN
    5555MenuTime_UpdateSelectionTimeout:
    5656    test    BYTE [bp+MENU.bFlags], FLG_MENU_TIMEOUT_COUNTDOWN
    … …  
    6666    ret
    6767
    68 ALIGN JUMP_ALIGN
     68ALIGN MENU_JUMP_ALIGN
    6969.RedrawSinceNoTimeout:
    7070    call    MenuBorders_RedrawBottomBorderLine
    … …  
    8484;       AX
    8585;--------------------------------------------------------------------
    86 ALIGN JUMP_ALIGN
     86ALIGN MENU_JUMP_ALIGN
    8787MenuTime_GetTimeoutSecondsLeftToAX:
    8888    push    ds
    … …  
    117117;       Nothing
    118118;--------------------------------------------------------------------
    119 ALIGN JUMP_ALIGN
     119ALIGN MENU_JUMP_ALIGN
    120120PointDSBXtoTimeoutCounter:
    121121    push    ss
Note: See TracChangeset for help on using the changeset viewer.