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

const for inrect tests

Browse Source
This commit is contained in:
Joshua Bell 2018-02-03 20:06:16 -08:00
parent bbb6e3c680
commit e7adcc2232
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
desktop/desktop.s
View File

@ -3957,19 +3957,19 @@ LBC0C: jsr LBDE1
bit alert_action bit alert_action
bpl LBC42 bpl LBC42
MGTK_RELAY2_CALL MGTK::InRect, cancel_rect MGTK_RELAY2_CALL MGTK::InRect, cancel_rect
cmp #$80 cmp #MGTK::inrect_inside
bne LBC2D bne LBC2D
jmp LBCE9 jmp LBCE9
LBC2D: bit alert_action LBC2D: bit alert_action
bvs LBC42 bvs LBC42
MGTK_RELAY2_CALL MGTK::InRect, try_again_rect MGTK_RELAY2_CALL MGTK::InRect, try_again_rect
cmp #$80 cmp #MGTK::inrect_inside
bne LBC52 bne LBC52
jmp LBC6D jmp LBC6D
LBC42: MGTK_RELAY2_CALL MGTK::InRect, try_again_rect LBC42: MGTK_RELAY2_CALL MGTK::InRect, try_again_rect
cmp #$80 cmp #MGTK::inrect_inside
bne LBC52 bne LBC52
jmp LBD65 jmp LBD65
@ -3993,7 +3993,7 @@ LBC84: MGTK_RELAY2_CALL MGTK::GetEvent, event_params
jsr LBDE1 jsr LBDE1
MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords
MGTK_RELAY2_CALL MGTK::InRect, try_again_rect MGTK_RELAY2_CALL MGTK::InRect, try_again_rect
cmp #$80 cmp #MGTK::inrect_inside
beq LBCB5 beq LBCB5
lda LBCE8 lda LBCE8
beq LBCBD beq LBCBD
@ -4030,7 +4030,7 @@ LBD00: MGTK_RELAY2_CALL MGTK::GetEvent, event_params
jsr LBDE1 jsr LBDE1
MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords
MGTK_RELAY2_CALL MGTK::InRect, cancel_rect MGTK_RELAY2_CALL MGTK::InRect, cancel_rect
cmp #$80 cmp #MGTK::inrect_inside
beq LBD31 beq LBD31
lda LBD64 lda LBD64
beq LBD39 beq LBD39
@ -4067,7 +4067,7 @@ LBD7C: MGTK_RELAY2_CALL MGTK::GetEvent, event_params
jsr LBDE1 jsr LBDE1
MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords MGTK_RELAY2_CALL MGTK::MoveTo, event_params_coords
MGTK_RELAY2_CALL MGTK::InRect, try_again_rect MGTK_RELAY2_CALL MGTK::InRect, try_again_rect
cmp #$80 cmp #MGTK::inrect_inside
beq LBDAD beq LBDAD
lda LBDE0 lda LBDE0
beq LBDB5 beq LBDB5
@ -18004,7 +18004,7 @@ LA5B4: lda winfoF
MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params
MGTK_RELAY_CALL MGTK::MoveTo, $D20D MGTK_RELAY_CALL MGTK::MoveTo, $D20D
MGTK_RELAY_CALL MGTK::InRect, rect1 MGTK_RELAY_CALL MGTK::InRect, rect1
cmp #$80 cmp #MGTK::inrect_inside
bne LA5E5 bne LA5E5
jsr set_cursor_insertion_point_with_flag jsr set_cursor_insertion_point_with_flag
jmp LA5E8 jmp LA5E8
@ -18040,11 +18040,11 @@ LA614: lda winfoF
MGTK_RELAY_CALL MGTK::MoveTo, $D20D MGTK_RELAY_CALL MGTK::MoveTo, $D20D
bit LD8E7 bit LD8E7
bvc LA63A bvc LA63A
jmp LA65E jmp check_button_yes
LA63A: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::ok_button_rect LA63A: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::ok_button_rect
cmp #$80 cmp #MGTK::inrect_inside
beq LA64A beq check_button_ok
jmp LA6C1 jmp LA6C1
prompt_button_ok := 0 prompt_button_ok := 0
@ -18053,16 +18053,18 @@ LA63A: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::ok_button_rect
prompt_button_no := 3 prompt_button_no := 3
prompt_button_all := 4 prompt_button_all := 4
LA64A: jsr set_penmode_xor2 check_button_ok:
jsr set_penmode_xor2
MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::ok_button_rect MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::ok_button_rect
jsr button_loop_ok jsr button_loop_ok
bmi :+ bmi :+
lda #prompt_button_ok lda #prompt_button_ok
: rts : rts
LA65E: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::yes_button_rect check_button_yes:
cmp #$80 MGTK_RELAY_CALL MGTK::InRect, desktop_aux::yes_button_rect
bne LA67F cmp #MGTK::inrect_inside
bne check_button_no
jsr set_penmode_xor2 jsr set_penmode_xor2
MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::yes_button_rect MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::yes_button_rect
jsr button_loop_yes jsr button_loop_yes
@ -18070,9 +18072,10 @@ LA65E: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::yes_button_rect
lda #prompt_button_yes lda #prompt_button_yes
: rts : rts
LA67F: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::no_button_rect check_button_no:
cmp #$80 MGTK_RELAY_CALL MGTK::InRect, desktop_aux::no_button_rect
bne LA6A0 cmp #MGTK::inrect_inside
bne check_button_all
jsr set_penmode_xor2 jsr set_penmode_xor2
MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::no_button_rect MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::no_button_rect
jsr button_loop_no jsr button_loop_no
@ -18080,8 +18083,9 @@ LA67F: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::no_button_rect
lda #prompt_button_no lda #prompt_button_no
: rts : rts
LA6A0: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::all_button_rect check_button_all:
cmp #$80 MGTK_RELAY_CALL MGTK::InRect, desktop_aux::all_button_rect
cmp #MGTK::inrect_inside
bne LA6C1 bne LA6C1
jsr set_penmode_xor2 jsr set_penmode_xor2
MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::all_button_rect MGTK_RELAY_CALL MGTK::PaintRect, desktop_aux::all_button_rect
@ -18091,12 +18095,13 @@ LA6A0: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::all_button_rect
: rts : rts
LA6C1: bit LD8E7 LA6C1: bit LD8E7
bpl LA6C9 bpl check_button_cancel
lda #$FF lda #$FF
rts rts
LA6C9: MGTK_RELAY_CALL MGTK::InRect, desktop_aux::cancel_button_rect check_button_cancel:
cmp #$80 MGTK_RELAY_CALL MGTK::InRect, desktop_aux::cancel_button_rect
cmp #MGTK::inrect_inside
beq LA6D9 beq LA6D9
jmp LA6ED jmp LA6ED
@ -19872,7 +19877,7 @@ loop: MGTK_RELAY_CALL MGTK::GetEvent, event_params
MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params
MGTK_RELAY_CALL MGTK::MoveTo, $D20D MGTK_RELAY_CALL MGTK::MoveTo, $D20D
jsr test_proc jsr test_proc
cmp #$80 ; inside? cmp #MGTK::inrect_inside
beq inside beq inside
lda down_flag ; outside but was inside? lda down_flag ; outside but was inside?
beq invert beq invert
@ -19972,7 +19977,7 @@ LB9B7: rts
LB9B8: MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params LB9B8: MGTK_RELAY_CALL MGTK::ScreenToWindow, event_params
MGTK_RELAY_CALL MGTK::MoveTo, $D20D MGTK_RELAY_CALL MGTK::MoveTo, $D20D
MGTK_RELAY_CALL MGTK::InRect, rect1 MGTK_RELAY_CALL MGTK::InRect, rect1
cmp #$80 cmp #MGTK::inrect_inside
beq LB9D8 beq LB9D8
rts rts

4
mgtk.inc
View File

@ -575,6 +575,10 @@ menuopt_item_is_checked := 1 << 5
menuopt_item_is_filler := 1 << 6 menuopt_item_is_filler := 1 << 6
menuopt_disable_flag := 1 << 7 menuopt_disable_flag := 1 << 7
;;; Response from InRect
inrect_inside := $80
inrect_outside := $00
.endscope ; MGTK .endscope ; MGTK
;;; ================================================== ;;; ==================================================