Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-02-21 08:29:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/disasm'

Browse Source
This commit is contained in:
Joshua Bell 2018-12-11 19:10:20 -08:00
commit 6fe93e6650
2 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
desktop/desktop_main.s
View File

@ -48,7 +48,7 @@ JT_MAIN_LOOP: jmp enter_main_loop
JT_MGTK_RELAY: jmp MGTK_RELAY JT_MGTK_RELAY: jmp MGTK_RELAY
JT_SIZE_STRING: jmp compose_blocks_string JT_SIZE_STRING: jmp compose_blocks_string
JT_DATE_STRING: jmp compose_date_string JT_DATE_STRING: jmp compose_date_string
L400C: jmp L5E78 ; ??? JT_SELECT_WINDOW: jmp select_and_refresh_window
JT_AUXLOAD: jmp DESKTOP_AUXLOAD JT_AUXLOAD: jmp DESKTOP_AUXLOAD
JT_EJECT: jmp cmd_eject JT_EJECT: jmp cmd_eject
JT_REDRAW_ALL: jmp redraw_windows ; * JT_REDRAW_ALL: jmp redraw_windows ; *
@ -59,7 +59,7 @@ JT_MLI_RELAY: jmp MLI_RELAY ; *
JT_COPY_TO_BUF: jmp DESKTOP_COPY_TO_BUF JT_COPY_TO_BUF: jmp DESKTOP_COPY_TO_BUF
JT_COPY_FROM_BUF: jmp DESKTOP_COPY_FROM_BUF JT_COPY_FROM_BUF: jmp DESKTOP_COPY_FROM_BUF
JT_NOOP: jmp cmd_noop JT_NOOP: jmp cmd_noop
L402D: jmp L8707 ; ??? JT_FILE_TYPE_STRING: jmp compose_file_type_string
JT_SHOW_ALERT0: jmp DESKTOP_SHOW_ALERT0 JT_SHOW_ALERT0: jmp DESKTOP_SHOW_ALERT0
JT_SHOW_ALERT: jmp DESKTOP_SHOW_ALERT JT_SHOW_ALERT: jmp DESKTOP_SHOW_ALERT
JT_LAUNCH_FILE: jmp launch_file JT_LAUNCH_FILE: jmp launch_file
@ -529,7 +529,7 @@ call_proc:
DESKTOP_RELAY_CALL DT_FIND_ICON, event_coords DESKTOP_RELAY_CALL DT_FIND_ICON, event_coords
lda findicon_which_icon lda findicon_which_icon
beq :+ beq :+
jmp L67D7 jmp handle_icon_click
: jmp L68AA : jmp L68AA
@ -1603,7 +1603,7 @@ L4CD6: pha
pha pha
jsr L6F0D jsr L6F0D
pla pla
jmp L5E78 jmp select_and_refresh_window
: ldy #1 : ldy #1
L4CF3: iny L4CF3: iny
@ -1711,7 +1711,7 @@ L4D9D: pha
pha pha
jsr L6F0D jsr L6F0D
pla pla
jmp L5E78 jmp select_and_refresh_window
L4DC2: ldy #1 L4DC2: ldy #1
: iny : iny
@ -1749,7 +1749,7 @@ L4DF2: txa
bne L4E10 bne L4E10
ldy #$00 ldy #$00
lda ($06),y lda ($06),y
jsr L6A8A jsr open_folder_or_volume_icon
jmp L4E14 jmp L4E14
L4E10: cmp #$40 L4E10: cmp #$40
@ -1882,7 +1882,7 @@ L4EC3: sta cached_window_icon_count
L4F3C: lda #MGTK::checkitem_uncheck L4F3C: lda #MGTK::checkitem_uncheck
sta checkitem_params::check sta checkitem_params::check
MGTK_RELAY_CALL MGTK::CheckItem, checkitem_params MGTK_RELAY_CALL MGTK::CheckItem, checkitem_params
jsr L66A2 jsr update_window_menu_items
jmp reset_grafport3 jmp reset_grafport3
.endproc .endproc
@ -1971,7 +1971,7 @@ success:
sty path_buffer sty path_buffer
addr_call L6FAF, path_buffer addr_call L6FAF, path_buffer
beq done beq done
jsr L5E78 jsr select_and_refresh_window
done: jmp redraw_windows_and_desktop done: jmp redraw_windows_and_desktop
@ -2451,7 +2451,7 @@ L53BA: inc L5426
lda selected_window_index lda selected_window_index
bne L53CD bne L53CD
jmp L540E jmp L540E
L53CD: jmp L5E78 L53CD: jmp select_and_refresh_window
L53D0: tax L53D0: tax
lda selected_icon_list,x lda selected_icon_list,x
@ -3637,7 +3637,7 @@ L5D77: lda LEBFC
lda active_window_id lda active_window_id
jsr L6F0D jsr L6F0D
lda active_window_id lda active_window_id
jsr L5E78 jsr select_and_refresh_window
jmp redraw_windows_and_desktop jmp redraw_windows_and_desktop
L5D8E: lda LEBFC L5D8E: lda LEBFC
@ -3649,7 +3649,7 @@ L5D99: and #$7F
pha pha
jsr L6F0D jsr L6F0D
pla pla
jsr L5E78 jsr select_and_refresh_window
jmp redraw_windows_and_desktop jmp redraw_windows_and_desktop
L5DA6: cpx #$02 L5DA6: cpx #$02
@ -3705,7 +3705,7 @@ L5DFC: lda L5CD9 ; after a double-click (on file or folder)
bne L5E27 bne L5E27
lda L5CD9 ; handle directory lda L5CD9 ; handle directory
jsr L6A8A jsr open_folder_or_volume_icon
bmi L5E27 bmi L5E27
jmp L5DEC jmp L5DEC
@ -3757,7 +3757,7 @@ L5E77: .byte 0
;;; ============================================================ ;;; ============================================================
.proc L5E78 .proc select_and_refresh_window
sta window_id sta window_id
jsr redraw_windows_and_desktop jsr redraw_windows_and_desktop
jsr clear_selection jsr clear_selection
@ -4140,7 +4140,7 @@ L6276: ldx active_window_id
lda #MGTK::checkitem_uncheck lda #MGTK::checkitem_uncheck
sta checkitem_params::check sta checkitem_params::check
MGTK_RELAY_CALL MGTK::CheckItem, checkitem_params MGTK_RELAY_CALL MGTK::CheckItem, checkitem_params
jsr L66A2 jsr update_window_menu_items
jmp redraw_windows_and_desktop jmp redraw_windows_and_desktop
.endproc .endproc
@ -4453,7 +4453,7 @@ L66A0: .word 0
;;; ============================================================ ;;; ============================================================
.proc L66A2 .proc update_window_menu_items
ldx active_window_id ldx active_window_id
beq disable_menu_items beq disable_menu_items
jmp check_menu_items jmp check_menu_items
@ -4612,7 +4612,7 @@ disable_selector_menu_items := toggle_selector_menu_items::disable
;;; ============================================================ ;;; ============================================================
.proc L67D7 .proc handle_icon_click
lda selected_icon_count lda selected_icon_count
bne L67DF bne L67DF
jmp set_selection jmp set_selection
@ -4681,7 +4681,7 @@ L6863: lda LEBFC
pha pha
jsr L6F0D jsr L6F0D
pla pla
jmp L5E78 jmp select_and_refresh_window
L6872: jsr L6A3F L6872: jsr L6A3F
jmp redraw_windows_and_desktop jmp redraw_windows_and_desktop
@ -4694,7 +4694,7 @@ L6878: txa
L6880: lda findicon_which_icon L6880: lda findicon_which_icon
cmp trash_icon_num cmp trash_icon_num
beq L688E beq L688E
jsr L6A8A jsr open_folder_or_volume_icon
jsr DESKTOP_COPY_FROM_BUF jsr DESKTOP_COPY_FROM_BUF
L688E: rts L688E: rts
@ -4867,12 +4867,12 @@ L6A80: inx
pha pha
jsr L6F0D jsr L6F0D
pla pla
jmp L5E78 jmp select_and_refresh_window
.endproc .endproc
;;; ============================================================ ;;; ============================================================
.proc L6A8A .proc open_folder_or_volume_icon
sta icon_params2 sta icon_params2
jsr DESKTOP_COPY_FROM_BUF jsr DESKTOP_COPY_FROM_BUF
lda icon_params2 lda icon_params2
@ -7636,9 +7636,10 @@ loop: lda LEC43,x
.proc prepare_col_type .proc prepare_col_type
lda LEC53 lda LEC53
jsr L8707 jsr compose_file_type_string
COPY_BYTES 5, LDFC5, text_buffer2::data-1 ;; BUG: should be 4 not 5???
COPY_BYTES 5, str_file_type, text_buffer2::data-1
rts rts
.endproc .endproc
@ -8058,7 +8059,7 @@ tmp: .byte 0
;;; ============================================================ ;;; ============================================================
.proc L8707 .proc compose_file_type_string
sta L877F sta L877F
copy16 type_table_addr, $06 copy16 type_table_addr, $06
ldy #$00 ldy #$00
@ -8078,17 +8079,17 @@ L8726: tya
copy16 type_names_addr, $06 copy16 type_names_addr, $06
ldx #$00 ldx #$00
L8736: lda ($06),y L8736: lda ($06),y
sta LDFC6,x sta str_file_type+1,x
iny iny
inx inx
cpx #$04 cpx #$04
bne L8736 bne L8736
stx LDFC5 stx str_file_type
rts rts
L8745: copy #4, LDFC5 L8745: copy #4, str_file_type
copy #' ', LDFC6 copy #' ', str_file_type+1
copy #'$', LDFC7 copy #'$', str_file_type+2
lda L877F lda L877F
lsr a lsr a
lsr a lsr a
@ -8097,20 +8098,20 @@ L8745: copy #4, LDFC5
cmp #$0A cmp #$0A
bcs L8764 bcs L8764
clc clc
adc #$30 adc #'0' ; 0-9
bne L8767 bne L8767
L8764: clc L8764: clc
adc #$37 adc #'7' ; A-F
L8767: sta LDFC8 L8767: sta str_file_type+3
lda L877F lda L877F
and #$0F and #$0F
cmp #$0A cmp #$0A
bcs L8778 bcs L8778
clc clc
adc #$30 adc #'0' ; 0-9
bne L877B bne L877B
L8778: clc L8778: clc
adc #$37 adc #'7' ; A-F
L877B: sta path_buf4 L877B: sta path_buf4
rts rts
@ -9863,13 +9864,13 @@ compute_suffix:
bne L9519 bne L9519
ldx L953A ldx L953A
L950E: lda L953A,x L950E: lda L953A,x
sta LDFC5,x sta str_file_type,x
dex dex
bpl L950E bpl L950E
bmi L951F bmi L951F
L9519: lda get_file_info_params5::file_type L9519: lda get_file_info_params5::file_type
jsr L402D jsr JT_FILE_TYPE_STRING
L951F: copy16 #LDFC5, L92E4 L951F: copy16 #str_file_type, L92E4
jsr launch_get_info_dialog jsr launch_get_info_dialog
bne L9534 bne L9534
L952E: inc L92E6 L952E: inc L92E6
@ -15224,7 +15225,7 @@ config_toolkit:
MGTK_RELAY_CALL MGTK::SetCursor, pointer_cursor MGTK_RELAY_CALL MGTK::SetCursor, pointer_cursor
lda #0 lda #0
sta active_window_id sta active_window_id
jsr desktop_main::L66A2 jsr desktop_main::update_window_menu_items
jsr desktop_main::disable_eject_menu_item jsr desktop_main::disable_eject_menu_item
jsr desktop_main::disable_file_menu_items jsr desktop_main::disable_file_menu_items
jmp MGTK::MLI jmp MGTK::MLI

5
desktop/desktop_res.s
View File

@ -926,10 +926,7 @@ window_address_table:
;;; ============================================================ ;;; ============================================================
LDFC5: .byte 0 str_file_type: .res 4, 0
LDFC6: .byte 0
LDFC7: .byte 0
LDFC8: .byte 0
path_buf4: path_buf4:
.res 65, 0 .res 65, 0