diff --git a/desktop.inc b/desktop.inc index bad2140..b9d1239 100644 --- a/desktop.inc +++ b/desktop.inc @@ -201,6 +201,9 @@ font_glyphs := $8883 ; $80 glyphs, organized by row, 9 bytes per ;;; $0E = (C) $1E = solid apple (MT:@) ;;; $0F = (R) $1F = open apple (MT:A) +GLYPH_FOLDERL := $01 +GLYPH_FOLDERR := $02 + GLYPH_LARROW := $09 GLYPH_RARROW := $15 GLYPH_UARROW := $0B diff --git a/desktop/desktop.s b/desktop/desktop.s index 3950252..e63a5ff 100644 --- a/desktop/desktop.s +++ b/desktop/desktop.s @@ -4565,7 +4565,7 @@ LD760: PASCAL_STRING "Run list" PASCAL_STRING {GLYPH_OAPPLE,"3 at first boot"} PASCAL_STRING {GLYPH_OAPPLE,"4 at first use"} PASCAL_STRING {GLYPH_OAPPLE,"5 never"} - PASCAL_STRING "Enter the full pathname of the run list file:" + PASCAL_STRING "Enter the full pathname of the run list file:" ; Duplicate ??? .byte $00,$00,$00,$00,$00,$00,$00 .byte $00,$06,$00,$17,$00,$58,$01,$57 @@ -4617,8 +4617,11 @@ file_count: .byte $00,$00,$0D .byte $00,$00,$00,$00,$00,$7D,$00,$00 - .byte $00,$02,$00,$00,$00,$00,$00,$02 - .byte $01,$02,$00,$00,$57,$01,$28,$00 + .byte $00,$02,$00,$00,$00,$00,$00 + + PASCAL_STRING {GLYPH_FOLDERL,GLYPH_FOLDERR} + + .byte $00,$00,$57,$01,$28,$00 .byte $6B,$01,$30,$00,$6B,$01,$38,$00 .byte $57,$01,$4B,$00,$6B,$01,$53,$00 .byte $6B,$01,$5B,$00,$6B,$01,$63,$00 diff --git a/desktop/ovl4.s b/desktop/ovl4.s index 0df5aca..b0f0599 100644 --- a/desktop/ovl4.s +++ b/desktop/ovl4.s @@ -1190,23 +1190,23 @@ L5CF7: MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entrydlg rts L5D82: MGTK_RELAY_CALL MGTK::MoveTo, $DA03 - addr_call L5DED, $DA07 + addr_call L5DED, $DA07 ; "OK" rts L5D93: MGTK_RELAY_CALL MGTK::MoveTo, $DA21 - addr_call L5DED, $DA25 + addr_call L5DED, $DA25 ; "Open" rts L5DA4: MGTK_RELAY_CALL MGTK::MoveTo, $DA17 - addr_call L5DED, $DA1B + addr_call L5DED, $DA1B ; "Close" rts L5DB5: MGTK_RELAY_CALL MGTK::MoveTo, $DA2A - addr_call L5DED, $DA2E + addr_call L5DED, $DA2E ; "Cancel" rts L5DC6: MGTK_RELAY_CALL MGTK::MoveTo, $DA40 - addr_call L5DED, $DA44 + addr_call L5DED, $DA44 ; "Change Drive" rts L5DD7: stax $06 @@ -1263,8 +1263,7 @@ L5E56: .byte 0 L5E57: jsr L5DD7 stax $06 MGTK_RELAY_CALL MGTK::MoveTo, $DA55 - lda $06 - ldx $07 + ldax $06 jsr L5DED rts @@ -1273,8 +1272,7 @@ L5E57: jsr L5DD7 L5E6F: jsr L5DD7 stax $06 MGTK_RELAY_CALL MGTK::MoveTo, $DA59 - lda $06 - ldx $07 + ldax $06 jsr L5DED rts @@ -1532,7 +1530,7 @@ L60A9: MGTK_RELAY_CALL MGTK::MoveTo, $D917 lda #$01 sta $D917 MGTK_RELAY_CALL MGTK::MoveTo, $D917 - addr_call L5DED, $D91D + addr_call L5DED, $D91D ; Folder glyphs lda #$10 sta $D917 L60FF: lda L6128 @@ -1646,7 +1644,7 @@ L61E6: inx stx $0220 addr_call L6129, $0220 MGTK_RELAY_CALL MGTK::MoveTo, $DA51 - addr_call L5DED, $DA5F + addr_call L5DED, $DA5F ; " Disk: " addr_call L5DED, $0220 MGTK_RELAY_CALL MGTK::InitPort, $D239 MGTK_RELAY_CALL MGTK::SetPort, $D239 @@ -2052,9 +2050,9 @@ L6634: copy16 #$D8EF, $06 MGTK_RELAY_CALL MGTK::MoveTo, $DAA6 lda $D402 beq L6684 - addr_call L5DED, $D402 -L6684: addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf0 +L6684: addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " rts ;;; ============================================================ @@ -2067,9 +2065,9 @@ L6693: lda winfo_entrydlg MGTK_RELAY_CALL MGTK::MoveTo, $DAB2 lda $D443 beq L66C9 - addr_call L5DED, $D443 -L66C9: addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf1 +L66C9: addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " rts lda winfo_entrydlg @@ -2348,8 +2346,8 @@ L69D5: lda L6A17 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D8F6 - addr_call L5DED, $D484 + addr_call L5DED, $D8F6 ; null char + addr_call L5DED, path_buf2 jsr L6EA3 rts @@ -2365,8 +2363,8 @@ L6A1E: dec $D402 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6EA3 rts @@ -2393,8 +2391,8 @@ L6A6B: ldx $D402 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6EA3 rts @@ -2421,9 +2419,9 @@ L6AD6: dec $D484 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $DAA6 - addr_call L5DED, $D402 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf0 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6EA3 rts @@ -2497,8 +2495,8 @@ L6B81: lda L6BC3 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D8F6 - addr_call L5DED, $D484 + addr_call L5DED, $D8F6 ; null char + addr_call L5DED, path_buf2 jsr L6E9F rts @@ -2514,8 +2512,8 @@ L6BCA: dec $D443 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6E9F rts @@ -2542,8 +2540,8 @@ L6C17: ldx $D443 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $06 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6E9F rts @@ -2570,9 +2568,9 @@ L6C82: dec $D484 lda winfo_entrydlg jsr L62C8 MGTK_RELAY_CALL MGTK::MoveTo, $DAB2 - addr_call L5DED, $D443 - addr_call L5DED, $D484 - addr_call L5DED, $D8F8 + addr_call L5DED, path_buf1 + addr_call L5DED, path_buf2 + addr_call L5DED, $D8F8 ; " " jsr L6E9F rts diff --git a/desktop/ovl7.s b/desktop/ovl7.s index 5ece7b1..8e3b051 100644 --- a/desktop/ovl7.s +++ b/desktop/ovl7.s @@ -26,7 +26,7 @@ L7021: lda path_buf0,y jsr common_overlay::L5F49 ldy path_buf0 L7030: lda path_buf0,y - cmp #$2F + cmp #'/' beq L7044 dey cpy #$01 @@ -106,30 +106,30 @@ L7101: lda winfo_entrydlg jsr common_overlay::L62C8 lda path_buf0 beq L7116 - addr_call common_overlay::L5E0A, $D729 + addr_call common_overlay::L5E0A, $D729 ; "Edit an Entry ..." jmp L711D -L7116: addr_call common_overlay::L5E0A, $D718 -L711D: addr_call common_overlay::L5E6F, $D849 +L7116: addr_call common_overlay::L5E0A, $D718 ; "Add an Entry ..." +L711D: addr_call common_overlay::L5E6F, $D849 ; "Enter the full pathname of the run list file:" MGTK_RELAY_CALL MGTK::SetPenMode, penXOR ; penXOR MGTK_RELAY_CALL MGTK::FrameRect, dialog_rect1 MGTK_RELAY_CALL MGTK::FrameRect, dialog_rect2 - addr_call common_overlay::L5E57, $D769 - addr_call common_overlay::L5E6F, $D797 + addr_call common_overlay::L5E57, $D769 ; "Enter the full pathname of the run list file:" + addr_call common_overlay::L5E6F, $D797 ; "Enter the name ... you wish to appear..." MGTK_RELAY_CALL MGTK::MoveTo, $D922 - addr_call common_overlay::L5DED, $D7DE + addr_call common_overlay::L5DED, $D7DE ; "Add a new entry to the:" MGTK_RELAY_CALL MGTK::MoveTo, $D926 - addr_call common_overlay::L5DED, $D7F6 + addr_call common_overlay::L5DED, $D7F6 ; "1 Run list" MGTK_RELAY_CALL MGTK::MoveTo, $D92A - addr_call common_overlay::L5DED, $D802 + addr_call common_overlay::L5DED, $D802 ; "2 Other Run list" MGTK_RELAY_CALL MGTK::MoveTo, $D92E - addr_call common_overlay::L5DED, $D814 + addr_call common_overlay::L5DED, $D814 ; "Down load:" MGTK_RELAY_CALL MGTK::MoveTo, $D932 - addr_call common_overlay::L5DED, $D81F + addr_call common_overlay::L5DED, $D81F ; "3 At first boot" MGTK_RELAY_CALL MGTK::MoveTo, $D936 - addr_call common_overlay::L5DED, $D830 + addr_call common_overlay::L5DED, $D830 ; "4 At first use" MGTK_RELAY_CALL MGTK::MoveTo, $D93A - addr_call common_overlay::L5DED, $D840 + addr_call common_overlay::L5DED, $D840 ; "5 Never" MGTK_RELAY_CALL MGTK::SetPenMode, penXOR MGTK_RELAY_CALL MGTK::FrameRect, $D93E MGTK_RELAY_CALL MGTK::FrameRect, $D946