Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2024-11-29 07:49:20 +00:00
Code Issues Projects Releases Wiki Activity

Start adding icon for REL files

Browse Source
This commit is contained in:
Joshua Bell 2019-01-03 16:07:59 -08:00
parent 2c6af218f5
commit c83d788b06
6 changed files with 98 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES.md
View File

@ -11,7 +11,7 @@
* Add Special > Check Drive command to refresh a single drive. (#97) * Add Special > Check Drive command to refresh a single drive. (#97)
* Show Text File DA: Keyboard support. Escape quits, arrows scroll. (#4) * Show Text File DA: Keyboard support. Escape quits, arrows scroll. (#4)
* Reorganized/renamed several menu items. (#13) * Reorganized/renamed several menu items. (#13)
* New icons for graphics, AppleWorks, and IIgs-specific file types. * New icons for graphics, AppleWorks, relocatable, and IIgs-specific file types. (#105)
* Improvements to several existing icon bitmaps. (#74) * Improvements to several existing icon bitmaps. (#74)
* DAs with high bit in aux-type set are skipped. (#102) * DAs with high bit in aux-type set are skipped. (#102)

8
desktop.inc
View File

@ -215,10 +215,10 @@ icon_entry_open_mask = %10000000
icon_entry_type_mask = %01110000 icon_entry_type_mask = %01110000
icon_entry_winid_mask = %00001111 icon_entry_winid_mask = %00001111
icon_entry_type_dir = %00000000 icon_entry_type_dir = %00000000
icon_entry_type_sys = %00010000 icon_entry_type_system = %00010000
icon_entry_type_bin = %00100000 icon_entry_type_binary = %00100000
icon_entry_type_bas = %00110000 icon_entry_type_basic = %00110000
icon_entry_type_txt = %01010000 icon_entry_type_generic = %01010000
icon_entry_type_trash = %01110000 icon_entry_type_trash = %01110000
;;; ============================================================ ;;; ============================================================

17
desktop/desktop_aux.s
View File

@ -113,7 +113,22 @@ iigs_file_icon:
.byte px(%0100000),px(%0000000),px(%0000000),px(%0000010) .byte px(%0100000),px(%0000000),px(%0000000),px(%0000010)
.byte px(%0111111),px(%1111111),px(%1111111),px(%1111110) .byte px(%0111111),px(%1111111),px(%1111111),px(%1111110)
rel_file_icon:
.byte px(%0000000),px(%0000001),px(%1000000),px(%0000000)
.byte px(%0000000),px(%0000110),px(%0110000),px(%0000000)
.byte px(%0000000),px(%0011000),px(%0001100),px(%0000000)
.byte px(%0000000),px(%1100000),px(%0000011),px(%0000000)
.byte px(%0000011),px(%0000000),px(%0000000),px(%1100000)
.byte px(%0001100),px(%1111001),px(%1110100),px(%0011000)
.byte px(%0110000),px(%1000101),px(%0000100),px(%0000110)
.byte px(%1000000),px(%1111101),px(%1100100),px(%0000001)
.byte px(%0110000),px(%1001001),px(%0000100),px(%0000110)
.byte px(%0001100),px(%1000101),px(%1110111),px(%1011000)
.byte px(%0000011),px(%0000000),px(%0000000),px(%1100000)
.byte px(%0000000),px(%1100000),px(%0000011),px(%0000000)
.byte px(%0000000),px(%0011000),px(%0001100),px(%0000000)
.byte px(%0000000),px(%0000110),px(%0110000),px(%0000000)
.byte px(%0000000),px(%0000001),px(%1000000),px(%0000000)
PAD_TO $8800 PAD_TO $8800

7
desktop/desktop_main.s
View File

@ -3857,11 +3857,11 @@ handle_double_click:
ldy #IconEntry::win_type ldy #IconEntry::win_type
lda ($06),y lda ($06),y
and #icon_entry_type_mask and #icon_entry_type_mask
cmp #icon_entry_type_sys cmp #icon_entry_type_system
beq L5E28 beq L5E28
cmp #icon_entry_type_bin cmp #icon_entry_type_binary
beq L5E28 beq L5E28
cmp #icon_entry_type_bas cmp #icon_entry_type_basic
beq L5E28 beq L5E28
cmp #icon_entry_type_dir cmp #icon_entry_type_dir
bne :+ bne :+
@ -6661,6 +6661,7 @@ found:
copy16 #type_deltay_table, ptr copy16 #type_deltay_table, ptr
lda (ptr),y lda (ptr),y
sta icon_deltay sta icon_deltay
;; TODO: compute y-offset from iconbits instead
tya tya
asl a asl a

135
desktop/desktop_res.s
View File

@ -319,41 +319,13 @@ path_buf0: .res 65, 0
path_buf1: .res 65, 0 path_buf1: .res 65, 0
path_buf2: .res 65, 0 path_buf2: .res 65, 0
alert_bitmap2:
.byte px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0000000),px(%1111111),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111100),px(%1111100),px(%0000001),px(%1110000),px(%0000111),px(%0000000),px(%0000000)
.byte px(%0111100),px(%1111100),px(%0000011),px(%1100000),px(%0000011),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0000111),px(%1100111),px(%1111001),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0001111),px(%1100111),px(%1111001),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111111),px(%1111001),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111111),px(%1110011),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111111),px(%1100111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111111),px(%1001111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111111),px(%0011111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111110),px(%0111111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111100),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1111100),px(%0011111),px(%1111100),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111110),px(%0000000),px(%0111111),px(%1111111),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1100000),px(%1111111),px(%1111100),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1100001),px(%1111111),px(%1111111),px(%1111111),px(%0000000),px(%0000000)
.byte px(%0111000),px(%0000011),px(%1111111),px(%1111111),px(%1111110),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1100000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0111111),px(%1100000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
.byte px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000)
alert_bitmap2_params: alert_bitmap2_params:
DEFINE_POINT 40, 8 ; viewloc DEFINE_POINT 40, 8 ; viewloc
.addr alert_bitmap2 ; mapbits .addr desktop_aux::alert_bitmap ; mapbits
.byte 7 ; mapwidth .byte 7 ; mapwidth
.byte 0 ; reserved .byte 0 ; reserved
DEFINE_RECT 0, 0, 36, 23 ; maprect DEFINE_RECT 0, 0, 36, 23 ; maprect
;; Looks like window param blocks starting here
.proc winfo_alert_dialog .proc winfo_alert_dialog
window_id: .byte $0F window_id: .byte $0F
options: .byte MGTK::Option::dialog_box options: .byte MGTK::Option::dialog_box
@ -860,8 +832,6 @@ delete_a_file_label:
file_to_delete_label: file_to_delete_label:
PASCAL_STRING "File to delete:" PASCAL_STRING "File to delete:"
.assert * = $DAD8, error, "Segment length mismatch"
pos_clock: pos_clock:
DEFINE_POINT 500, 10 DEFINE_POINT 500, 10
@ -1426,34 +1396,37 @@ icon_entries:
.org $FB00 .org $FB00
num_file_types = 12 num_file_types = 13
type_table: type_table:
.byte FT_TYPELESS, FT_SRC, FT_TEXT, FT_BINARY .byte FT_TYPELESS ; typeless
.byte FT_DIRECTORY, FT_SYSTEM, FT_BASIC, FT_GRAPHICS .byte FT_SRC ; src
.byte FT_ADB, FT_AWP, FT_ASP .byte FT_REL ; rel
.byte FT_BAD .byte FT_TEXT ; text
.byte FT_BINARY ; binary
icon_type_table: .byte FT_DIRECTORY ; directory
;; Bit 4-6 in IconEntry::win_type: .byte FT_SYSTEM ; system
;; 000 = directory .byte FT_BASIC ; basic
;; 001 = system .byte FT_GRAPHICS ; graphics
;; 010 = binary (maybe runnable) .byte FT_ADB ; appleworks db
;; 011 = basic .byte FT_AWP ; appleworks wp
;; 100 = (unused) .byte FT_ASP ; appleworks sp
;; 101 = data (text/generic/...) .byte FT_BAD ; bad block
;; 110 = (unused)
;; 111 = trash
.byte $50,$50,$50,$20
.byte $00,$10,$30,$50
.byte $50,$50,$50
.byte $10
type_names_table: type_names_table:
.byte " ???", " SRC", " TXT", " BIN" .byte " ???" ; typeless
.byte " DIR", " SYS", " BAS", " FOT" .byte " SRC" ; src
.byte " ADB", " AWP", " ASP" .byte " REL" ; rel
.byte " BAD" .byte " TXT" ; text
.byte " BIN" ; binary
.byte " DIR" ; directory
.byte " SYS" ; system
.byte " BAS" ; basic
.byte " FOT" ; graphics
.byte " ADB" ; appleworks db
.byte " AWP" ; appleworks wp
.byte " ASP" ; appleworks sp
.byte " BAD" ; bad block
;;; The icon-related tables (below) use a distinguishing icon ;;; The icon-related tables (below) use a distinguishing icon
;;; for "apps" (SYS files with ".SYSTEM" name suffix, and IIgs ;;; for "apps" (SYS files with ".SYSTEM" name suffix, and IIgs
@ -1463,28 +1436,64 @@ type_names_table:
;;; Similarly, IIgs-specific types ($5x, $Ax-$Cx) are all ;;; Similarly, IIgs-specific types ($5x, $Ax-$Cx) are all
;;; mapped to $B0 (SRC). ;;; mapped to $B0 (SRC).
type_icons_table: icon_type_table:
.addr gen, src, txt, bin, dir, sys, bas, fot .byte icon_entry_type_generic ; typeless
.addr adb, awp, asp .byte icon_entry_type_generic ; src
.addr app .byte icon_entry_type_generic ; rel
.byte icon_entry_type_generic ; text
.byte icon_entry_type_binary ; binary
.byte icon_entry_type_dir ; directory
.byte icon_entry_type_system ; system
.byte icon_entry_type_basic ; basic
.byte icon_entry_type_generic ; graphics
.byte icon_entry_type_generic ; appleworks db
.byte icon_entry_type_generic ; appleworks wp
.byte icon_entry_type_generic ; appleworks sp
.byte icon_entry_type_system ; system (see below)
type_icons_table: ; map into definitions below
.addr gen ; typeless
.addr src ; src
.addr rel ; rel
.addr txt ; text
.addr bin ; binary
.addr dir ; directory
.addr sys ; system
.addr bas ; basic
.addr fot ; graphics
.addr adb ; appleworks db
.addr awp ; appleworks wp
.addr asp ; appleworks sp
.addr app ; system (see below)
type_deltay_table: type_deltay_table:
.byte 2, 2, 2, 2, 6, 0, 2, 6 .byte 2 ; typeless
.byte 2, 2, 2 .byte 2 ; src
.byte 0 .byte 2 ; rel
.byte 2 ; text
.byte 2 ; binary
.byte 6 ; directory
.byte 0 ; system
.byte 2 ; basic
.byte 6 ; graphics
.byte 2 ; appleworks db
.byte 2 ; appleworks wp
.byte 2 ; appleworks sp
.byte 0 ; system (see below)
.macro DEFICON mapbits, mapwidth, x1, y1, x2, y2, maskbits .macro DEFICON mapbits, mapwidth, x1, y1, x2, y2, maskbits
;; First part is MGTK::MapInfo without leading viewloc ;; First part is MGTK::MapInfo without leading viewloc
.addr mapbits .addr mapbits
.byte mapwidth .byte mapwidth
.byte 0 ; reserved .byte 0 ; reserved
.word x1, y1, x2, y2 .word x1, y1, x2, y2 ; maprect
;; Next part is link to mask ;; Next part is link to mask
.addr maskbits .addr maskbits
.endmacro .endmacro
gen: DEFICON generic_icon, 4, 0, 0, 27, 15, generic_mask gen: DEFICON generic_icon, 4, 0, 0, 27, 15, generic_mask
src: DEFICON desktop_aux::iigs_file_icon, 4, 0, 0, 27, 15, generic_mask src: DEFICON desktop_aux::iigs_file_icon, 4, 0, 0, 27, 15, generic_mask
rel: DEFICON desktop_aux::rel_file_icon, 4, 0, 0, 27, 14, binary_mask
txt: DEFICON text_icon, 4, 0, 0, 27, 15, generic_mask txt: DEFICON text_icon, 4, 0, 0, 27, 15, generic_mask
bin: DEFICON binary_icon, 4, 0, 0, 27, 14, binary_mask bin: DEFICON binary_icon, 4, 0, 0, 27, 14, binary_mask
dir: DEFICON folder_icon, 4, 0, 0, 27, 11, folder_mask dir: DEFICON folder_icon, 4, 0, 0, 27, 11, folder_mask

1
inc/prodos.inc
View File

@ -102,6 +102,7 @@ FT_ASP = $1B ; AppleWorks Spreadsheet
FT_SRC = $B0 ; IIgs system type; re-used? FT_SRC = $B0 ; IIgs system type; re-used?
FT_S16 = $B3 ; IIgs Application Program FT_S16 = $B3 ; IIgs Application Program
FT_BASIC = $FC FT_BASIC = $FC
FT_REL = $FE
FT_SYSTEM = $FF FT_SYSTEM = $FF
;;; ============================================================ ;;; ============================================================