Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2024-11-28 15:50:16 +00:00
Code Issues Projects Releases Wiki Activity

DeskTop: More overlay noodling

Browse Source
This commit is contained in:
Joshua Bell 2018-05-17 23:54:10 -07:00
parent 4658142898
commit afb769020c
6 changed files with 58 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
desktop/ovl2.s
View File

@ -115,9 +115,7 @@ L0902: jsr desktop_main::prompt_input_loop
L090C: lda winfo_alert_dialog
jsr desktop_main::set_port_from_window_id
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
ldy #$11
ldax #$AE6E
jsr MGTK_RELAY
MGTK_RELAY_CALL MGTK::PaintRect, $AE6E
ldax #$B2C6
ldy #$01
jsr desktop_main::draw_dialog_label
@ -345,11 +343,9 @@ L0BDC: cmp $D887
bne L0C04
jsr desktop_main::LB445
bmi L0C03
L0BE6: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
L0BE6: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR ; flash the button
MGTK_RELAY_CALL MGTK::PaintRect, $AE20
MGTK_RELAY_CALL MGTK::PaintRect, $AE20
ldy #$11
ldax #$AE20
jsr MGTK_RELAY
lda #$00
L0C03: rts

72
desktop/ovl4.s
View File

@ -100,7 +100,7 @@ L5106: bit LD8EC
jmp L5106
L5151: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
lda winfo_entrydlg
sta screentowindow_window_id
MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
@ -142,7 +142,7 @@ L51C7: lda findwindow_window_id
jmp L531F
L51D2: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
lda winfo_entrydlg
sta screentowindow_window_id
MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
@ -164,7 +164,7 @@ L520D: tax
L5213: jmp L5308
L5216: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_open_button_rect
jsr track_open_button_click
@ -273,7 +273,7 @@ L5386: ldx $D920
lda $1780,x
bmi L53B5
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_ok_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_ok_button_rect
@ -283,7 +283,7 @@ L5386: ldx $D920
L53B5: and #$7F
pha
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_open_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_open_button_rect
@ -926,14 +926,14 @@ L59F7: lda event_key
L5A27: cmp #CHAR_TAB
bne L5A52
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_change_drive_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_change_drive_button_rect
jsr L565C
L5A4F: jmp L5AC8
L5A52: cmp #$0F ; Ctrl+O - Open
L5A52: cmp #CHAR_CTRL_O ; Open
bne L5A8B
lda $D920
bmi L5AC8
@ -942,17 +942,17 @@ L5A52: cmp #$0F ; Ctrl+O - Open
bmi :+
jmp L5AC8
: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_open_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_open_button_rect
jsr L5607
jmp L5AC8
L5A8B: cmp #$03 ; Ctrl+C - Close
L5A8B: cmp #CHAR_CTRL_C ; Close
bne :+
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, common_close_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_close_button_rect
@ -975,8 +975,8 @@ L5AC8: jsr L56E3
key_return:
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR ; flash the button
MGTK_RELAY_CALL MGTK::PaintRect, common_ok_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_ok_button_rect
jsr jt_12
@ -986,8 +986,8 @@ key_return:
key_escape:
lda winfo_entrydlg
jsr L62C8
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR ; flash the button
MGTK_RELAY_CALL MGTK::PaintRect, common_cancel_button_rect
MGTK_RELAY_CALL MGTK::PaintRect, common_cancel_button_rect
jsr jt_01
@ -1249,7 +1249,7 @@ L5CF6: .byte 0
MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entrydlg
MGTK_RELAY_CALL MGTK::OpenWindow, winfo_entrydlg_file_picker
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::FrameRect, common_dialog_frame_rect
MGTK_RELAY_CALL MGTK::FrameRect, common_ok_button_rect
@ -1590,7 +1590,7 @@ L606C: .byte 0
;;; ============================================================
L606D: lda winfo_entrydlg_file_picker
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::PaintRect, winfo_entrydlg_file_picker_cliprect
lda #$10
sta picker_entry_pos
@ -1642,7 +1642,7 @@ L60FF: lda L6128
bne L6110
jsr L6274
lda winfo_entrydlg_file_picker
jsr L62C8
jsr set_port_for_window
L6110: inc L6128
add16 picker_entry_pos+2, #8, picker_entry_pos+2
jmp L608E
@ -1721,7 +1721,7 @@ L61B0: .byte 0
;;; ============================================================
L61B1: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::PaintRect, rect_D9C8
copy16 #path_buf, $06
ldy #$00
@ -1815,7 +1815,7 @@ L6274: ldx #0
adc #0
sta rect_D90F+7
lda winfo_entrydlg_file_picker
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, rect_D90F
MGTK_RELAY_CALL MGTK::InitPort, grafport3
@ -1826,10 +1826,14 @@ L62C7: .byte 0
;;; ============================================================
L62C8: sta getwinport_params2 ; window_id
.proc set_port_for_window
sta getwinport_params2_window_id
MGTK_RELAY_CALL MGTK::GetWinPort, getwinport_params2
MGTK_RELAY_CALL MGTK::SetPort, grafport2
rts
.endproc
;;; ============================================================
L62DE: ldax #$0F5A
L62E2: sta L63C2,x
@ -2104,7 +2108,7 @@ L658B: cmp #$09
rts
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
jsr L6E45
stax $06
copy16 common_input1_textpos+2, $08
@ -2126,7 +2130,7 @@ L65D6: copy16 #$D8EF, $06
rts
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
jsr L6E72
stax $06
copy16 common_input2_textpos+2, $08
@ -2149,7 +2153,7 @@ L6634: copy16 #$D8EF, $06
rts
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::PaintRect, common_input1_rect
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::FrameRect, common_input1_rect
@ -2164,7 +2168,7 @@ L6684: addr_call draw_string, path_buf2
;;; ============================================================
L6693: lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::PaintRect, common_input2_rect
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::FrameRect, common_input2_rect
@ -2180,7 +2184,7 @@ L66C9: addr_call draw_string, path_buf2
sta screentowindow_window_id
MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
MGTK_RELAY_CALL MGTK::InRect, common_input1_rect
cmp #MGTK::inrect_inside
@ -2308,7 +2312,7 @@ L684D: .word 0
sta screentowindow_window_id
MGTK_RELAY_CALL MGTK::ScreenToWindow, screentowindow_params
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, screentowindow_windowx
MGTK_RELAY_CALL MGTK::InRect, common_input2_rect
cmp #MGTK::inrect_inside
@ -2450,7 +2454,7 @@ L69D5: lda L6A17
stax $06
copy16 common_input1_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, str_1_char
addr_call draw_string, path_buf2
@ -2467,7 +2471,7 @@ L6A1E: dec path_buf0
stax $06
copy16 common_input1_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, path_buf2
addr_call draw_string, str_2_spaces
@ -2495,7 +2499,7 @@ L6A6B: ldx path_buf0
stax $06
copy16 common_input1_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, path_buf2
addr_call draw_string, str_2_spaces
@ -2523,7 +2527,7 @@ L6ACA: lda path_buf2+1,x
bne L6ACA
L6AD6: dec path_buf2
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, common_input1_textpos
addr_call draw_string, path_buf0
addr_call draw_string, path_buf2
@ -2600,7 +2604,7 @@ L6B81: lda L6BC3
stax $06
copy16 common_input2_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, str_1_char
addr_call draw_string, path_buf2
@ -2617,7 +2621,7 @@ L6BCA: dec path_buf1
stax $06
copy16 common_input2_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, path_buf2
addr_call draw_string, str_2_spaces
@ -2645,7 +2649,7 @@ L6C17: ldx path_buf1
stax $06
copy16 common_input2_textpos+2, $08
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, $06
addr_call draw_string, path_buf2
addr_call draw_string, str_2_spaces
@ -2673,7 +2677,7 @@ L6C76: lda path_buf2+1,x
bne L6C76
L6C82: dec path_buf2
lda winfo_entrydlg
jsr L62C8
jsr set_port_for_window
MGTK_RELAY_CALL MGTK::MoveTo, common_input2_textpos
addr_call draw_string, path_buf1
addr_call draw_string, path_buf2

2
desktop/ovl5.s
View File

@ -44,7 +44,7 @@ L7029: lda jump_table_entries+1,x
rts
L7052: lda winfo_entrydlg
jsr common_overlay::L62C8
jsr common_overlay::set_port_for_window
addr_call common_overlay::L5E0A, copy_a_file_label
addr_call common_overlay::L5E57, source_filename_label
addr_call common_overlay::L5E6F, destination_filename_label

2
desktop/ovl6.s
View File

@ -42,7 +42,7 @@ L7029: lda jump_table_entries+1,x
rts
L704D: lda winfo_entrydlg
jsr common_overlay::L62C8
jsr common_overlay::set_port_for_window
addr_call common_overlay::L5E0A, delete_a_file_label
addr_call common_overlay::L5E57, file_to_delete_label
MGTK_RELAY_CALL MGTK::SetPenMode, penXOR

31
desktop/ovl7.s
View File

@ -85,7 +85,7 @@ L70B0: lda jump_table_entries+1,x
sta $5104
copy16 #$0601, path_buf2
lda winfo_entrydlg
jsr common_overlay::L62C8
jsr common_overlay::set_port_for_window
lda L73A9
jsr L7467
lda L73AA
@ -103,7 +103,7 @@ L70B0: lda jump_table_entries+1,x
rts
L7101: lda winfo_entrydlg
jsr common_overlay::L62C8
jsr common_overlay::set_port_for_window
lda path_buf0
beq L7116
addr_call common_overlay::L5E0A, edit_an_entry_label
@ -287,30 +287,25 @@ L73AA: .byte 0
MGTK_RELAY_CALL MGTK::InRect, rect_D966
cmp #MGTK::inrect_inside
bne L73BB
bne :+
jmp L73FE
L73BB: MGTK_RELAY_CALL MGTK::InRect, rect_D96E
: MGTK_RELAY_CALL MGTK::InRect, rect_D96E
cmp #MGTK::inrect_inside
bne L73CB
bne :+
jmp L7413
L73CB: MGTK_RELAY_CALL MGTK::InRect, rect_D976
: MGTK_RELAY_CALL MGTK::InRect, rect_D976
cmp #MGTK::inrect_inside
bne L73DB
bne :+
jmp L7428
L73DB: MGTK_RELAY_CALL MGTK::InRect, rect_D97E
: MGTK_RELAY_CALL MGTK::InRect, rect_D97E
cmp #MGTK::inrect_inside
bne L73EB
bne :+
jmp L743D
L73EB: MGTK_RELAY_CALL MGTK::InRect, rect_D986
: MGTK_RELAY_CALL MGTK::InRect, rect_D986
cmp #MGTK::inrect_inside
bne L73FB
bne :+
jmp L7452
L73FB: return #$00
: return #0
L73FE: lda L73A9
cmp #1
@ -413,7 +408,7 @@ L74E1: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
rts
L74F4: lda winfo_entrydlg
jsr common_overlay::L62C8
jsr common_overlay::set_port_for_window
lda event_modifiers
bne L7500
rts

2
inc/apple2.inc
View File

@ -249,11 +249,13 @@ MOUSE_MODE := $0738
;;; Character Constants (Screen/Key Codes)
;;; ============================================================
CHAR_CTRL_C := $03
CHAR_LEFT := $08
CHAR_TAB := $09
CHAR_DOWN := $0A
CHAR_UP := $0B
CHAR_RETURN := $0D
CHAR_CTRL_O := $0F
CHAR_RIGHT := $15
CHAR_ESCAPE := $1B
CHAR_DELETE := $7F