Merge remote-tracking branch 'origin/disasm'

This commit is contained in:
Joshua Bell 2019-02-25 19:51:53 -08:00
commit 6edb9a3e22

View File

@ -257,7 +257,7 @@ by_icon:
copy cached_window_id, getwinport_params2::window_id copy cached_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
COPY_BLOCK grafport2::cliprect, tmp_rect COPY_BLOCK grafport2::cliprect, tmp_rect
@ -278,7 +278,7 @@ L4227: copy #0, draw_window_header_flag
copy cached_window_id, getwinport_params2::window_id copy cached_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
lda active_window_id lda active_window_id
jsr assign_window_portbits jsr assign_window_portbits
jmp reset_grafport3 jmp reset_grafport3
@ -313,12 +313,12 @@ window: lda num
beq done beq done
tax tax
copy selected_icon_list,x, icon_param copy selected_icon_list,x, icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param
beq :+ beq :+
DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_param DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_param
: lda icon_param : lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
inc num inc num
jmp window jmp window
@ -2294,7 +2294,7 @@ L516D: lda L51EB,x
copy active_window_id, getwinport_params2::window_id copy active_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
copy #0, L51EF copy #0, L51EF
L518D: lda L51EF L518D: lda L51EF
cmp cached_window_icon_count cmp cached_window_icon_count
@ -2308,7 +2308,7 @@ L518D: lda L51EF
jmp L518D jmp L518D
L51A7: jsr reset_grafport3 L51A7: jsr reset_grafport3
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
jsr StoreWindowIconTable jsr StoreWindowIconTable
jsr update_scrollbars jsr update_scrollbars
lda selected_window_index lda selected_window_index
@ -2319,11 +2319,11 @@ L51A7: jsr reset_grafport3
L51C0: ldx L51EF L51C0: ldx L51EF
lda selected_icon_count,x lda selected_icon_count,x
sta icon_param sta icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
jsr offset_grafport2_and_set jsr offset_grafport2_and_set
DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param
lda icon_param lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
dec L51EF dec L51EF
bne L51C0 bne L51C0
finish: jmp LoadDesktopIconTable finish: jmp LoadDesktopIconTable
@ -2726,11 +2726,11 @@ L5485: cpx cached_window_icon_count
pha pha
lda cached_window_icon_list,x lda cached_window_icon_list,x
sta icon_param sta icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param
pha pha
lda icon_param lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
pla pla
beq L54B7 beq L54B7
pla pla
@ -2888,12 +2888,12 @@ L55F0: ldx L544A
beq L5614 beq L5614
jsr L56F9 jsr L56F9
lda icon_param lda icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
L5614: DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param L5614: DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param
lda getwinport_params2::window_id lda getwinport_params2::window_id
beq L562B beq L562B
lda icon_param lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
L562B: rts L562B: rts
@ -2907,12 +2907,12 @@ L562C: lda icon_param
beq L564A beq L564A
jsr L56F9 jsr L56F9
lda icon_param lda icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
L564A: DESKTOP_RELAY_CALL DT_UNHIGHLIGHT_ICON, icon_param L564A: DESKTOP_RELAY_CALL DT_UNHIGHLIGHT_ICON, icon_param
lda getwinport_params2::window_id lda getwinport_params2::window_id
beq L5661 beq L5661
lda icon_param lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
L5661: rts L5661: rts
.endproc .endproc
@ -2955,12 +2955,12 @@ L56B4: ldx L56F8
lda LE22C lda LE22C
beq L56CF beq L56CF
lda icon_param2 lda icon_param2
jsr icon_window_to_screen jsr icon_screen_to_window
L56CF: DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param2 L56CF: DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param2
lda LE22C lda LE22C
beq L56E3 beq L56E3
lda icon_param2 lda icon_param2
jsr icon_screen_to_window jsr icon_window_to_screen
L56E3: dec L56F8 L56E3: dec L56F8
bpl L56B4 bpl L56B4
lda selected_window_index lda selected_window_index
@ -3730,7 +3730,7 @@ done_client_click:
jsr L84D1 jsr L84D1
bit active_window_view_by bit active_window_view_by
bmi :+ ; list view, no icons bmi :+ ; list view, no icons
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
: copy active_window_id, getwinport_params2::window_id : copy active_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
@ -3820,7 +3820,7 @@ replace:
jsr get_set_port2 jsr get_set_port2
copy icon_num, icon_param copy icon_num, icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
jsr offset_grafport2_and_set jsr offset_grafport2_and_set
DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param
@ -3828,7 +3828,7 @@ replace:
jsr get_set_port2 jsr get_set_port2
lda icon_num lda icon_num
jsr icon_screen_to_window jsr icon_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
bit double_click_flag bit double_click_flag
bmi start_icon_drag bmi start_icon_drag
@ -3894,7 +3894,7 @@ desktop:
copy active_window_id, getwinport_params2::window_id copy active_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
jsr offset_grafport2_and_set jsr offset_grafport2_and_set
ldx selected_icon_count ldx selected_icon_count
@ -3913,7 +3913,7 @@ desktop:
jsr get_set_port2 jsr get_set_port2
jsr update_scrollbars jsr update_scrollbars
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
;;; Used as additional entry point ;;; Used as additional entry point
@ -4114,7 +4114,7 @@ L5F88: txa
pha pha
lda cached_window_icon_list,x lda cached_window_icon_list,x
sta icon_param sta icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param DESKTOP_RELAY_CALL DT_ICON_IN_RECT, icon_param
beq L5FB9 beq L5FB9
DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param DESKTOP_RELAY_CALL DT_HIGHLIGHT_ICON, icon_param
@ -4123,7 +4123,7 @@ L5F88: txa
copy icon_param, selected_icon_list,x copy icon_param, selected_icon_list,x
copy active_window_id, selected_window_index copy active_window_id, selected_window_index
L5FB9: lda icon_param L5FB9: lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
pla pla
tax tax
inx inx
@ -4193,7 +4193,7 @@ L60D3: .byte 0
L60D4: .byte 0 L60D4: .byte 0
L60D5: jsr push_pointers L60D5: jsr push_pointers
jmp icon_ptr_window_to_screen jmp icon_ptr_screen_to_window
.endproc .endproc
L5F13 := L5F13_impl::start L5F13 := L5F13_impl::start
@ -4264,9 +4264,9 @@ L6199: .word 0
MGTK_RELAY_CALL MGTK::GrowWindow, event_params MGTK_RELAY_CALL MGTK::GrowWindow, event_params
jsr redraw_windows_and_desktop jsr redraw_windows_and_desktop
jsr LoadActiveWindowIconTable jsr LoadActiveWindowIconTable
jsr cached_icons_window_to_screen
jsr update_scrollbars
jsr cached_icons_screen_to_window jsr cached_icons_screen_to_window
jsr update_scrollbars
jsr cached_icons_window_to_screen
jsr LoadDesktopIconTable jsr LoadDesktopIconTable
jmp reset_grafport3 jmp reset_grafport3
.endproc .endproc
@ -4541,7 +4541,7 @@ L650D: .word 0
.proc L650F .proc L650F
bit active_window_view_by bit active_window_view_by
bmi :+ ; list view, not icons bmi :+ ; list view, not icons
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
: jsr L6523 : jsr L6523
jsr compute_icons_bbox jsr compute_icons_bbox
lda active_window_id lda active_window_id
@ -4579,7 +4579,7 @@ L650D: .word 0
.proc L6556 .proc L6556
bit active_window_view_by bit active_window_view_by
bmi :+ bmi :+
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
: MGTK_RELAY_CALL MGTK::PaintRect, grafport2::cliprect : MGTK_RELAY_CALL MGTK::PaintRect, grafport2::cliprect
jsr reset_grafport3 jsr reset_grafport3
jmp L6C19 jmp L6C19
@ -5117,13 +5117,13 @@ found_win:
bne skip ; but only if active window bne skip ; but only if active window
jsr get_set_port2 jsr get_set_port2
lda icon_params2 lda icon_params2
jsr icon_window_to_screen jsr icon_screen_to_window
: DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_params2 : DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_params2
lda getwinport_params2::window_id lda getwinport_params2::window_id
beq skip ; skip if on desktop beq skip ; skip if on desktop
lda icon_params2 ; restore from drawing lda icon_params2 ; restore from drawing
jsr icon_screen_to_window jsr icon_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
skip: lda icon_params2 skip: lda icon_params2
@ -5215,13 +5215,13 @@ update_view:
jsr get_set_port2 jsr get_set_port2
jsr offset_grafport2_and_set jsr offset_grafport2_and_set
lda icon_params2 lda icon_params2
jsr icon_window_to_screen jsr icon_screen_to_window
: DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_params2 : DESKTOP_RELAY_CALL DT_REDRAW_ICON, icon_params2
lda getwinport_params2::window_id lda getwinport_params2::window_id
beq skip2 ; skip if on desktop beq skip2 ; skip if on desktop
lda icon_params2 ; restore from drawing lda icon_params2 ; restore from drawing
jsr icon_screen_to_window jsr icon_window_to_screen
jsr reset_grafport3 jsr reset_grafport3
skip2: jsr L744B skip2: jsr L744B
@ -5238,7 +5238,7 @@ skip2: jsr L744B
jsr draw_window_header jsr draw_window_header
;; Restore and add the icons ;; Restore and add the icons
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
copy #0, num copy #0, num
: lda num : lda num
cmp cached_window_icon_count cmp cached_window_icon_count
@ -5254,7 +5254,7 @@ skip2: jsr L744B
;; Finish up ;; Finish up
done: copy cached_window_id, active_window_id done: copy cached_window_id, active_window_id
jsr update_scrollbars jsr update_scrollbars
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
jsr StoreWindowIconTable jsr StoreWindowIconTable
jsr LoadDesktopIconTable jsr LoadDesktopIconTable
jmp reset_grafport3 jmp reset_grafport3
@ -5364,7 +5364,7 @@ L6CCD: copy cached_window_id, getwinport_params2::window_id
bit draw_window_header_flag bit draw_window_header_flag
bmi :+ bmi :+
jsr draw_window_header jsr draw_window_header
: jsr cached_icons_window_to_screen : jsr cached_icons_screen_to_window
jsr offset_grafport2_and_set jsr offset_grafport2_and_set
COPY_BLOCK grafport2::cliprect, tmp_rect COPY_BLOCK grafport2::cliprect, tmp_rect
@ -5380,7 +5380,7 @@ L6CF3: cpx cached_window_icon_count
copy cached_window_id, getwinport_params2::window_id copy cached_window_id, getwinport_params2::window_id
jsr get_set_port2 jsr get_set_port2
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
rts rts
L6D09: txa L6D09: txa
@ -5420,10 +5420,10 @@ L6D56: lda L6DB0
tax tax
lda selected_icon_list,x lda selected_icon_list,x
sta icon_param sta icon_param
jsr icon_window_to_screen jsr icon_screen_to_window
DESKTOP_RELAY_CALL DT_UNHIGHLIGHT_ICON, icon_param DESKTOP_RELAY_CALL DT_UNHIGHLIGHT_ICON, icon_param
lda icon_param lda icon_param
jsr icon_screen_to_window jsr icon_window_to_screen
inc L6DB0 inc L6DB0
jmp L6D56 jmp L6D56
@ -5461,9 +5461,9 @@ L6DB0: .byte 0
jmp config_port jmp config_port
;; List view ;; List view
: jsr cached_icons_window_to_screen : jsr cached_icons_screen_to_window
jsr compute_icons_bbox jsr compute_icons_bbox
jsr cached_icons_screen_to_window jsr cached_icons_window_to_screen
config_port: config_port:
copy active_window_id, getwinport_params2::window_id copy active_window_id, getwinport_params2::window_id
@ -5517,7 +5517,7 @@ activate_ctl:
;;; ============================================================ ;;; ============================================================
.proc cached_icons_window_to_screen .proc cached_icons_screen_to_window
lda #0 lda #0
sta count sta count
loop: lda count loop: lda count
@ -5525,7 +5525,7 @@ loop: lda count
beq done beq done
tax tax
lda cached_window_icon_list,x lda cached_window_icon_list,x
jsr icon_window_to_screen jsr icon_screen_to_window
inc count inc count
jmp loop jmp loop
@ -5536,7 +5536,7 @@ count: .byte 0
;;; ============================================================ ;;; ============================================================
.proc cached_icons_screen_to_window .proc cached_icons_window_to_screen
lda #0 lda #0
sta index sta index
loop: lda index loop: lda index
@ -5544,7 +5544,7 @@ loop: lda index
beq done beq done
tax tax
lda cached_window_icon_list,x lda cached_window_icon_list,x
jsr icon_screen_to_window jsr icon_window_to_screen
inc index inc index
jmp loop jmp loop
@ -6746,7 +6746,7 @@ L7870: lda cached_window_id
ldx cached_window_icon_count ldx cached_window_icon_count
dex dex
lda cached_window_icon_list,x lda cached_window_icon_list,x
jsr icon_screen_to_window jsr icon_window_to_screen
add16 file_entry, #icon_y_spacing, file_entry add16 file_entry, #icon_y_spacing, file_entry
rts rts
@ -8224,7 +8224,7 @@ date: .word 0
jsr push_pointers jsr push_pointers
bit active_window_view_by bit active_window_view_by
bmi L84DC bmi L84DC
jsr cached_icons_window_to_screen jsr cached_icons_screen_to_window
L84DC: sub16 grafport2::cliprect::x2, grafport2::cliprect::x1, L85F8 L84DC: sub16 grafport2::cliprect::x2, grafport2::cliprect::x1, L85F8
sub16 grafport2::cliprect::y2, grafport2::cliprect::y1, L85FA sub16 grafport2::cliprect::y2, grafport2::cliprect::y1, L85FA
lda event_kind lda event_kind
@ -8605,10 +8605,10 @@ port_copy:
.endproc .endproc
;;; ============================================================ ;;; ============================================================
;;; Convert icon's coordinates from screen to window (direction???) ;;; Convert icon's coordinates from window to screen
;;; (icon index in A, active window) ;;; (icon index in A, active window)
.proc icon_screen_to_window .proc icon_window_to_screen
entry_ptr := $6 entry_ptr := $6
winfo_ptr := $8 winfo_ptr := $8
@ -8665,10 +8665,10 @@ pos_win: .word 0, 0
.endproc .endproc
;;; ============================================================ ;;; ============================================================
;;; Convert icon's coordinates from window to screen (direction???) ;;; Convert icon's coordinates from screen to window
;;; (icon index in A, active window) ;;; (icon index in A, active window)
.proc icon_window_to_screen .proc icon_screen_to_window
tay tay
jsr push_pointers jsr push_pointers
tya tya
@ -8677,10 +8677,10 @@ pos_win: .word 0, 0
;; fall through ;; fall through
.endproc .endproc
;;; Convert icon's coordinates from window to screen (direction???) ;;; Convert icon's coordinates from screen to window
;;; (icon entry pointer in $6, active window) ;;; (icon entry pointer in $6, active window)
.proc icon_ptr_window_to_screen .proc icon_ptr_screen_to_window
entry_ptr := $6 entry_ptr := $6
winfo_ptr := $8 winfo_ptr := $8