Merge remote-tracking branch 'origin/disasm'

This commit is contained in:
Joshua Bell 2019-04-24 23:44:08 -07:00
commit e028076e0c

View File

@ -4177,60 +4177,63 @@ L60D5: jsr push_pointers
;;; ============================================================ ;;; ============================================================
.proc handle_title_click .proc handle_title_click
jmp L60DE ptr := $06
L60DE: copy active_window_id, event_params jmp :+
: copy active_window_id, event_params
MGTK_RELAY_CALL MGTK::FrontWindow, active_window_id MGTK_RELAY_CALL MGTK::FrontWindow, active_window_id
lda active_window_id lda active_window_id
jsr copy_window_portbits jsr copy_window_portbits
MGTK_RELAY_CALL MGTK::DragWindow, event_params MGTK_RELAY_CALL MGTK::DragWindow, event_params
lda active_window_id lda active_window_id
jsr window_lookup jsr window_lookup
stax $06 stax ptr
ldy #$16 ldy #MGTK::Winfo::port + MGTK::GrafPort::viewloc + MGTK::Point::ycoord
lda ($06),y lda (ptr),y
cmp #$19 cmp #$19 ; ???
bcs L6112 bcs :+
lda #$19 lda #$19
sta ($06),y sta (ptr),y
L6112: ldy #$14
sub16in ($06),y, port_copy+MGTK::GrafPort::viewloc+MGTK::Point::xcoord, L6197 : ldy #MGTK::Winfo::port + MGTK::GrafPort::viewloc + MGTK::Point::xcoord
sub16in (ptr),y, port_copy+MGTK::GrafPort::viewloc+MGTK::Point::xcoord, deltax
iny iny
sub16in ($06),y, port_copy+MGTK::GrafPort::viewloc+MGTK::Point::ycoord, L6199 sub16in (ptr),y, port_copy+MGTK::GrafPort::viewloc+MGTK::Point::ycoord, deltay
ldx active_window_id ldx active_window_id
dex dex
lda win_view_by_table,x lda win_view_by_table,x
beq L6143 ; view by icon beq :+ ; view by icon
rts rts
L6143: jsr LoadActiveWindowIconTable ;; Update icon positions
ldx #$00 : jsr LoadActiveWindowIconTable
L614E: cpx cached_window_icon_count ldx #0
bne L6161 next: cpx cached_window_icon_count
bne :+
jsr StoreWindowIconTable jsr StoreWindowIconTable
jsr LoadDesktopIconTable jsr LoadDesktopIconTable
jmp L6196 jmp done
L6161: txa : txa
pha pha
lda cached_window_icon_list,x lda cached_window_icon_list,x
jsr icon_entry_lookup jsr icon_entry_lookup
stax $06 stax ptr
ldy #$03 ldy #IconEntry::iconx
add16in ($06),y, L6197, ($06),y add16in (ptr),y, deltax, (ptr),y
iny iny
add16in ($06),y, L6199, ($06),y add16in (ptr),y, deltay, (ptr),y
pla pla
tax tax
inx inx
jmp L614E jmp next
L6196: rts done: rts
L6197: .word 0 deltax: .word 0
L6199: .word 0 deltay: .word 0
.endproc .endproc