Apple-2-SW
/
a2d
mirror of https://github.com/mi57730/a2d.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support GS/OS filename casing for files. Issue #64 

* Move filename case adjustment to directory enumeration
* Don't adjust filename case if GS/OS upper/lowercase bitflags set
* Details at GS/OS Tech Note #8

This is primarily for ProDOS 2.5 support. Note that volume names are
not handled correctly yet - they are always case-adjusted.
This commit is contained in:
Joshua Bell 2019-01-10 22:57:16 -08:00
parent 3180399fb0
commit 55544b8835
5 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
desktop/desktop_main.s
View File

@ -1036,13 +1036,9 @@ prefix_buffer: .res 30, 0
lda (ptr),y
tay
loop: lda (ptr),y
cmp #'a'
bcc :+
cmp #'z'+1
bcs :+
and #CASE_MASK
jsr upcase_char
sta (ptr),y
: dey
dey
bne loop
rts
.endproc
@ -1050,6 +1046,15 @@ loop: lda (ptr),y
.endproc
prefix_buffer := launch_file::prefix_buffer
.proc upcase_char
cmp #'a'
bcc done
cmp #'z'+1
bcs done
and #CASE_MASK
done: rts
.endproc
;;; ============================================================
L485D: .word $E000
@ -5647,9 +5652,6 @@ start: sta exact_match_flag
dey
bne :-
;; And capitalize
addr_call adjust_case, path_buffer
lda #0
sta found_windows_count
sta window_num
@ -5875,6 +5877,17 @@ L7223: iny
;; See FileRecord struct for record structure
;; TODO: Determine if this case adjustment is necessary
txa
pha
tya
pha
addr_call_indirect adjust_fileentry_case, entry_ptr
pla
tay
pla
tax
;; name, file_type
: lda (entry_ptr),y
sta record,x
@ -6233,8 +6246,7 @@ L7561: lda LE1B0,y
sta ($08),y
dey
bpl L7561
L7569: addr_call_indirect adjust_case, $08
lda cached_window_id
L7569: lda cached_window_id
jsr window_lookup
stax $06
ldy #$14
@ -6542,13 +6554,14 @@ L7767: .byte $14
lda (file_entry),y
tay
ldx str_sys_suffix
: lda (file_entry),y
cloop: lda (file_entry),y
jsr upcase_char
cmp str_sys_suffix,x
bne not_app
dey
beq not_app
dex
bne :-
bne cloop
is_app:
lda #FT_BAD ; overloaded meaning in icon tables
@ -6573,7 +6586,6 @@ got_type:
tya
jsr find_icon_details_for_file_type
addr_call adjust_case, name_tmp
ldy #IconEntry::len
ldx #0
L77F0: lda name_tmp,x
@ -7239,6 +7251,7 @@ iloop: jsr ptr_calc
sta name_len
ldy #1
cloop: lda (ptr),y
jsr upcase_char
cmp name,y
beq :+
bcs inext
@ -7260,6 +7273,7 @@ place: lda record_num
ldy name_len
: lda (ptr),y
jsr upcase_char
sta name,y
dey
bne :-
@ -7799,7 +7813,6 @@ loop: lda LEC43,x
lda #' '
sta text_buffer2::data
inc text_buffer2::length
addr_call adjust_case, text_buffer2::length
rts
.endproc
@ -8729,7 +8742,8 @@ create_icon:
lda cvi_data_buffer
and #NAME_LENGTH_MASK
sta cvi_data_buffer
addr_call adjust_case, cvi_data_buffer
addr_call adjust_volname_case, cvi_data_buffer
ldy #IconEntry::name
copy #' ', (icon_ptr),y ; leading space
@ -10702,6 +10716,8 @@ done: rts
loop: jsr read_file_entry
bne end_dir
addr_call adjust_fileentry_case, file_entry_buf
lda file_entry_buf + FileEntry::storage_type_name_length
beq loop
lda file_entry_buf + FileEntry::storage_type_name_length
@ -12752,7 +12768,7 @@ do2: ldy #1
lda (ptr),y
sta ptr+1
stx ptr
jsr copy_name_to_buf0_adjust_case
jsr copy_name_to_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
jsr copy_dialog_param_addr_to_ptr
@ -12763,7 +12779,7 @@ do2: ldy #1
lda (ptr),y
sta ptr+1
stx ptr
jsr copy_name_to_buf1_adjust_case
jsr copy_name_to_buf1
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LAE82
addr_call draw_text1, path_buf1
yax_call MGTK_RELAY, MGTK::MoveTo, desktop_aux::LB0BA
@ -12877,7 +12893,7 @@ do2: ldy #1
lda (ptr),y
sta ptr+1
stx ptr
jsr copy_name_to_buf0_adjust_case
jsr copy_name_to_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::LB0BA
@ -13050,7 +13066,7 @@ do3: ldy #1
lda ($06),y
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
jsr copy_name_to_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::delete_remaining_count_pos
@ -13337,7 +13353,7 @@ do3: ldy #1
lda ($06),y
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
jsr copy_name_to_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::lock_remaining_count_pos
@ -13424,7 +13440,7 @@ do3: ldy #1
lda ($06),y
sta $06+1
stx $06
jsr copy_name_to_buf0_adjust_case
jsr copy_name_to_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::current_target_file_pos
addr_call draw_text1, path_buf0
MGTK_RELAY_CALL MGTK::MoveTo, desktop_aux::unlock_remaining_count_pos
@ -14007,32 +14023,30 @@ hi: .byte 0
.endproc
;;; ============================================================
;; Unreferenced ???
.proc draw_text_at_point7
stax $06
MGTK_RELAY_CALL MGTK::MoveTo, point7
addr_call_indirect draw_text1, $06
rts
.endproc
;;; ============================================================
;;; Adjust case in a pathname (input buf A,X, output buf $A)
.proc adjust_case
.assert * = $B781, error, "Entry point used by overlay"
;;; Adjust filename case in a FileEntry, if not GS/OS flagged.
;;; Input: A,X points at FileEntry structure.
.proc adjust_fileentry_case
ptr := $A
stax ptr
ldy #0
;; Check for GS/OS lowercase filename
;; http://www.1000bit.it/support/manuali/apple/technotes/gsos/tn.gsos.08.html
ldy #FileEntry::min_version
lda (ptr),y
tay
bmi done ; High bit is set = natively supported
entry2: ldy #FileEntry::storage_type_name_length
lda (ptr),y
and #NAME_LENGTH_MASK
beq done
.assert FileEntry::file_name = 1, error, "bad assumptions in structure"
;; Walk backwards through string. At char N, check char N-1
;; to see if it is a symbol. If it is, and char N is a letter,
;; lower-case it.
tay
loop: dey
beq done
@ -14040,26 +14054,35 @@ loop: dey
done: rts
: lda (ptr),y
and #CHAR_MASK ; convert to ASCII
cmp #'0' ; <'0' includes '.', '/' and ' '
cmp #'0' ; <'0' includes '.'
bcs check_alpha
dey
jmp loop
bpl loop ; always
check_alpha:
iny
lda (ptr),y
and #CHAR_MASK
cmp #'A'
bcc :+
cmp #'Z'+1
bcs :+
ora #(~CASE_MASK & $FF)
ora #AS_BYTE(~CASE_MASK)
sta (ptr),y
: dey
jmp loop
bpl loop ; always
.endproc
.proc adjust_volname_case
ptr := $A
stax ptr
;; TODO: Skip if VolumeDirectoryHeader's byte $17 high bit is set
jmp adjust_fileentry_case::entry2
.endproc
;;; ============================================================
PAD_TO $B7B9 ; Maintain previous addresses
;;; ============================================================
@ -14803,7 +14826,7 @@ saved_proc_buf:
;;; ============================================================
.proc copy_name_to_buf0_adjust_case
.proc copy_name_to_buf0
ptr := $6
ldy #0
@ -14813,11 +14836,10 @@ saved_proc_buf:
sta path_buf0,y
dey
bpl :-
addr_call adjust_case, path_buf0
rts
.endproc
.proc copy_name_to_buf1_adjust_case
.proc copy_name_to_buf1
ptr := $6
ldy #0
@ -14827,7 +14849,6 @@ saved_proc_buf:
sta path_buf1,y
dey
bpl :-
addr_call adjust_case, path_buf1
rts
.endproc
@ -14847,6 +14868,8 @@ set_fill_white:
MGTK_RELAY_CALL MGTK::SetPenMode, pencopy
rts
PAD_TO $BEB1
reset_grafport3a:
.assert * = $BEB1, error, "Entry point used by overlay"
@ -15429,6 +15452,9 @@ open_dir:
copy16 #read_dir_buffer + .sizeof(SubdirectoryHeader), dir_ptr
process_block:
;; TODO: Adjust case
addr_call_indirect desktop_main::adjust_fileentry_case, dir_ptr
ldy #FileEntry::storage_type_name_length
lda (dir_ptr),y
and #NAME_LENGTH_MASK
@ -15478,8 +15504,6 @@ is_da: inc desk_acc_num
dey
bne :-
addr_call_indirect desktop_main::adjust_case, da_ptr
;; Convert periods to spaces
lda (da_ptr),y
tay

2
desktop/ovl2.s
View File

@ -1488,7 +1488,6 @@ L19FB: lda read_buffer + 6,x
ldx ovl2_path_buf
lda #'?'
L1A22: sta ovl2_path_buf,x
addr_call desktop_main::adjust_case, ovl2_path_buf
rts
;;; ============================================================
@ -1515,7 +1514,6 @@ L1A22: sta ovl2_path_buf,x
ldx ovl2_path_buf
lda #$3F
sta ovl2_path_buf,x
addr_call desktop_main::adjust_case, ovl2_path_buf ; Adjust case ("/HD/GAMES" -> "/Hd/Games")
rts
L1A6D: lda on_line_params::unit_num

17
desktop/ovl4.s
View File

@ -1318,13 +1318,14 @@ L5E6F: jsr copy_string_to_lcbuf
sta on_line_params::unit_num
yax_call MLI_RELAY, ON_LINE, on_line_params
lda on_line_buffer
and #$0F
and #NAME_LENGTH_MASK
sta on_line_buffer
bne found
jsr inc_device_num
jmp :-
found: lda #0
found: addr_call desktop_main::adjust_volname_case, on_line_buffer
lda #0
sta path_buf
addr_call L5F0D, on_line_buffer
rts
@ -1427,7 +1428,9 @@ L5F5B: jsr L5ECB
jmp L6012
L5F87: copy16 #$142B, $06
L5F8F: ldy #$00
L5F8F: addr_call_indirect desktop_main::adjust_fileentry_case, $06
ldy #$00
lda ($06),y
and #NAME_LENGTH_MASK
bne L5F9A
@ -1643,7 +1646,6 @@ L61E6: inx
cpy L6226
bne L61E6
stx $0220
addr_call desktop_main::adjust_case, $0220
MGTK_RELAY_CALL MGTK::MoveTo, disk_label_pos
addr_call draw_string, disk_label
addr_call draw_string, $0220
@ -1934,7 +1936,6 @@ L64E8: lda #$00
L64F5: lda L6515
cmp $177F
beq L64E7
addr_call_indirect desktop_main::adjust_case, $06
inc L6515
lda $06
clc
@ -2895,7 +2896,6 @@ flag: .byte 0
.proc prep_path_buf0
COPY_STRING path_buf, path_buf0
addr_call desktop_main::adjust_case, path_buf0
rts
.endproc
@ -2903,7 +2903,6 @@ flag: .byte 0
.proc prep_path_buf1
COPY_STRING path_buf, path_buf1
addr_call desktop_main::adjust_case, path_buf1
rts
.endproc
@ -3011,9 +3010,7 @@ L6EC2: lda LD920
tax
tya
jsr L5F0D
L6EFB: addr_call desktop_main::adjust_case, split_buf
addr_call desktop_main::adjust_case, path_buf
lda split_buf
L6EFB: lda split_buf
cmp path_buf
bne L6F26
tax

1
desktop/ovl5.s
View File

@ -120,7 +120,6 @@ L7137: lda common_overlay::path_buf,x
sta path_buf1,x
dex
bpl L7137
addr_call desktop_main::adjust_case, path_buf1
lda #$01
sta path_buf2
lda #$06

1
desktop/ovl7.s
View File

@ -13,7 +13,6 @@ L7000: stx L73A9
jsr common_overlay::device_on_line
lda path_buf0
beq L7056
addr_call desktop_main::adjust_case, path_buf0
ldy path_buf0
L7021: lda path_buf0,y
sta common_overlay::path_buf,y