identify entry file picker winfo

This commit is contained in:
Joshua Bell 2018-03-14 20:38:47 -07:00
parent d6b757849b
commit e014bda697
7 changed files with 62 additions and 61 deletions

View File

@ -4437,7 +4437,7 @@ fontptr: .addr DEFAULT_FONT
nextwinfo: .addr 0 nextwinfo: .addr 0
.endproc .endproc
.proc winfo15 .proc winfo_entrydlg_file_picker
window_id: .byte $15 window_id: .byte $15
options: .byte MGTK::option_dialog_box options: .byte MGTK::option_dialog_box
title: .addr 0 title: .addr 0
@ -4449,15 +4449,15 @@ vthumbmax: .byte 3
vthumbpos: .byte 0 vthumbpos: .byte 0
status: .byte 0 status: .byte 0
reserved: .byte 0 reserved: .byte 0
mincontwidth: .word $64 mincontwidth: .word 100
maxcontwidth: .word $46 maxcontwidth: .word 70
mincontlength: .word $64 mincontlength: .word 100
maxcontlength: .word $46 maxcontlength: .word 70
port: port:
viewloc: DEFINE_POINT $35, $32 viewloc: DEFINE_POINT 53, 50
mapbits: .addr MGTK::screen_mapbits mapbits: .addr MGTK::screen_mapbits
mapwidth: .word MGTK::screen_mapwidth mapwidth: .word MGTK::screen_mapwidth
cliprect: DEFINE_RECT 0, 0, $7D, $46 cliprect: DEFINE_RECT 0, 0, 125, 70
penpattern: .res 8, $FF penpattern: .res 8, $FF
colormasks: .byte MGTK::colormask_and, MGTK::colormask_or colormasks: .byte MGTK::colormask_and, MGTK::colormask_or
penloc: DEFINE_POINT 0, 0 penloc: DEFINE_POINT 0, 0
@ -4481,15 +4481,15 @@ vthumbmax: .byte 0
vthumbpos: .byte 0 vthumbpos: .byte 0
status: .byte 0 status: .byte 0
reserved: .byte 0 reserved: .byte 0
mincontwidth: .word $96 mincontwidth: .word 150
maxcontwidth: .word $32 maxcontwidth: .word 50
mincontlength: .word $1F4 mincontlength: .word 500
maxcontlength: .word $8C maxcontlength: .word 140
port: port:
viewloc: DEFINE_POINT $50, $28 viewloc: DEFINE_POINT 80, 40
mapbits: .addr MGTK::screen_mapbits mapbits: .addr MGTK::screen_mapbits
mapwidth: .word MGTK::screen_mapwidth mapwidth: .word MGTK::screen_mapwidth
cliprect: DEFINE_RECT 0, 0, $190, $6E cliprect: DEFINE_RECT 0, 0, 400, 110
penpattern: .res 8, $FF penpattern: .res 8, $FF
colormasks: .byte MGTK::colormask_and, MGTK::colormask_or colormasks: .byte MGTK::colormask_and, MGTK::colormask_or
penloc: DEFINE_POINT 0, 0 penloc: DEFINE_POINT 0, 0
@ -4514,15 +4514,15 @@ vthumbmax: .byte 0
vthumbpos: .byte 0 vthumbpos: .byte 0
status: .byte 0 status: .byte 0
reserved: .byte 0 reserved: .byte 0
mincontwidth: .word $96 mincontwidth: .word 150
maxcontwidth: .word $32 maxcontwidth: .word 50
mincontlength: .word $1F4 mincontlength: .word 500
maxcontlength: .word $8C maxcontlength: .word 140
port: port:
viewloc: DEFINE_POINT $69, $19 viewloc: DEFINE_POINT 105, 25
mapbits: .addr MGTK::screen_mapbits mapbits: .addr MGTK::screen_mapbits
mapwidth: .word MGTK::screen_mapwidth mapwidth: .word MGTK::screen_mapwidth
cliprect: DEFINE_RECT 0, 0, $15E, $6E cliprect: DEFINE_RECT 0, 0, 350, 110
penpattern: .res 8, $FF penpattern: .res 8, $FF
colormasks: .byte MGTK::colormask_and, MGTK::colormask_or colormasks: .byte MGTK::colormask_and, MGTK::colormask_or
penloc: DEFINE_POINT 0, 0 penloc: DEFINE_POINT 0, 0
@ -4540,7 +4540,7 @@ rect1: DEFINE_RECT 40,61,360,71, rect1
point6: DEFINE_POINT 45,70, point6 point6: DEFINE_POINT 45,70, point6
pos_dialog_title: DEFINE_POINT 0, 18, pos_dialog_title pos_dialog_title: DEFINE_POINT 0, 18, pos_dialog_title
point7: DEFINE_POINT 40,18, point7 point7: DEFINE_POINT 40,18, point7
pointD: DEFINE_POINT $28, $23, pointD pointD: DEFINE_POINT 40, 35, pointD
dialog_label_default_x := 40 dialog_label_default_x := 40
dialog_label_pos: dialog_label_pos:
@ -4551,7 +4551,7 @@ dialog_label_pos:
.addr MGTK::screen_mapbits .addr MGTK::screen_mapbits
.byte MGTK::screen_mapwidth .byte MGTK::screen_mapwidth
.byte 0 .byte 0
DEFINE_RECT 0, 0, $166, $64 DEFINE_RECT 0, 0, 358, 100
.endproc .endproc
;; ??? ;; ???

View File

@ -71,7 +71,7 @@ updatethumb_stash := updatethumb_params + 5 ; not part of struct
winfoF := $D57D winfoF := $D57D
winfo12 := $D5B7 winfo12 := $D5B7
winfo15 := $D5F1 winfo_entrydlg_file_picker := $D5F1
winfo1B := $D665 winfo1B := $D665
path_buf0 := $D402 path_buf0 := $D402

View File

@ -794,38 +794,39 @@ L97D4: asl a
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
rts rts
L9822: lda $D20A ;; key down handler
cmp #$02 L9822: lda event_modifiers
bne L982C cmp #MGTK::event_modifier_solid_apple
bne :+
return #$FF return #$FF
: lda event_key
L982C: lda $D209
and #$7F and #$7F
cmp #$08
bne L9838 cmp #CHAR_LEFT
bne :+
jmp L98F8 jmp L98F8
L9838: cmp #$15 : cmp #CHAR_RIGHT
bne L983F bne :+
jmp L98AC jmp L98AC
L983F: cmp #$0D : cmp #CHAR_RETURN
bne L9846 bne :+
jmp L985E jmp L985E
L9846: cmp #$1B : cmp #CHAR_ESCAPE
bne L984D bne :+
jmp L9885 jmp L9885
L984D: cmp #$0A : cmp #CHAR_DOWN
bne L9854 bne :+
jmp L9978 jmp L9978
L9854: cmp #$0B : cmp #CHAR_UP
bne L985B bne :+
jmp L993F jmp L993F
L985B: return #$FF : return #$FF
L985E: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR L985E: MGTK_RELAY_CALL MGTK::SetPenMode, penXOR
MGTK_RELAY_CALL MGTK::PaintRect, $D6F8 MGTK_RELAY_CALL MGTK::PaintRect, $D6F8

View File

@ -816,31 +816,31 @@ params: .addr 0
L59B8: rts L59B8: rts
L59B9: lda $D20A L59B9: lda event_modifiers
beq L59F7 beq L59F7
lda $D209 lda event_key
and #$7F and #$7F
cmp #$08 cmp #CHAR_LEFT
bne L59CA bne L59CA
jmp L6D3F jmp L6D3F
L59CA: cmp #$15 L59CA: cmp #CHAR_RIGHT
bne L59D1 bne L59D1
jmp L6D42 jmp L6D42
L59D1: bit L5105 L59D1: bit L5105
bmi L59E4 bmi L59E4
cmp #$0A cmp #CHAR_DOWN
bne L59DD bne L59DD
jmp L5C0E jmp L5C0E
L59DD: cmp #$0B L59DD: cmp #CHAR_UP
bne L59E4 bne L59E4
jmp L5BF6 jmp L5BF6
L59E4: cmp #$30 L59E4: cmp #'0'
bcc L59EF bcc L59EF
cmp #$3A cmp #'9'+1
bcs L59EF bcs L59EF
jmp L5B23 jmp L5B23
@ -848,25 +848,25 @@ L59EF: bit L5105
bmi L5A4F bmi L5A4F
jmp L5B70 jmp L5B70
L59F7: lda $D209 L59F7: lda event_key
and #$7F and #$7F
cmp #$08 cmp #CHAR_LEFT
bne L5A03 bne L5A03
jmp L6D39 jmp L6D39
L5A03: cmp #$15 L5A03: cmp #CHAR_RIGHT
bne L5A0A bne L5A0A
jmp L6D3C jmp L6D3C
L5A0A: cmp #$0D L5A0A: cmp #CHAR_RETURN
bne L5A11 bne L5A11
jmp L5ACC jmp L5ACC
L5A11: cmp #$1B L5A11: cmp #CHAR_ESCAPE
bne L5A18 bne L5A18
jmp L5AF7 jmp L5AF7
L5A18: cmp #$7F L5A18: cmp #CHAR_DELETE
bne L5A1F bne L5A1F
jmp L5B1F jmp L5B1F
@ -874,7 +874,7 @@ L5A1F: bit L5105
bpl L5A27 bpl L5A27
jmp L5AC4 jmp L5AC4
L5A27: cmp #$09 L5A27: cmp #CHAR_TAB
bne L5A52 bne L5A52
lda $D5B7 lda $D5B7
jsr L62C8 jsr L62C8

View File

@ -168,7 +168,7 @@ L7192: lda #$40
L7198: addr_call common_overlay::L647C, path_buf1 L7198: addr_call common_overlay::L647C, path_buf1
bne L7192 bne L7192
MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
lda #0 lda #0
sta $50A8 sta $50A8
@ -185,7 +185,7 @@ L7198: addr_call common_overlay::L647C, path_buf1
;;; ============================================================ ;;; ============================================================
L71D8: MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 L71D8: MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
lda #0 lda #0
sta $D8EC sta $D8EC

View File

@ -74,7 +74,7 @@ L70B1: addr_call common_overlay::L647C, path_buf0
jsr JUMP_TABLE_ALERT_0 jsr JUMP_TABLE_ALERT_0
rts rts
L70C0: MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 L70C0: MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
lda #0 lda #0
sta $D8EC sta $D8EC
@ -87,7 +87,7 @@ L70C0: MGTK_RELAY_CALL MGTK::CloseWindow, winfo15
.byte 0 .byte 0
L70EA: MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 L70EA: MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
lda #0 lda #0
sta $D8EC sta $D8EC

View File

@ -239,7 +239,7 @@ L72E8: lda #$FB
L72EE: MGTK_RELAY_CALL MGTK::InitPort, grafport3 L72EE: MGTK_RELAY_CALL MGTK::InitPort, grafport3
MGTK_RELAY_CALL MGTK::SetPort, grafport3 MGTK_RELAY_CALL MGTK::SetPort, grafport3
MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
sta $D8EC sta $D8EC
jsr common_overlay::L55BA jsr common_overlay::L55BA
@ -252,7 +252,7 @@ L72EE: MGTK_RELAY_CALL MGTK::InitPort, grafport3
MGTK_RELAY_CALL MGTK::InitPort, grafport3 MGTK_RELAY_CALL MGTK::InitPort, grafport3
MGTK_RELAY_CALL MGTK::SetPort, grafport3 MGTK_RELAY_CALL MGTK::SetPort, grafport3
MGTK_RELAY_CALL MGTK::CloseWindow, winfo15 MGTK_RELAY_CALL MGTK::CloseWindow, winfo_entrydlg_file_picker
MGTK_RELAY_CALL MGTK::CloseWindow, winfo12 MGTK_RELAY_CALL MGTK::CloseWindow, winfo12
lda #$00 lda #$00
sta $D8EC sta $D8EC