Skip to content

Commit

Permalink
Build: Turn on line continuations feature
Browse files Browse the repository at this point in the history
... and use it for some list box macro calls
  • Loading branch information
inexorabletash committed Jan 4, 2025
1 parent 4dc3386 commit 67a38b0
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 12 deletions.
1 change: 1 addition & 0 deletions config.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

.setcpu "6502"
.feature string_escapes
.feature line_continuations

;;; Product Info

Expand Down
16 changes: 11 additions & 5 deletions desk.acc/find.files.s
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,21 @@ pattern: .res 16 ; null-terminated/upcased version
;;; ============================================================
;;; List Box

DEFINE_LIST_BOX_WINFO winfo_results, kResultsWindowId, kResultsLeft, kResultsTop, kResultsWidth, kResultsHeight, DEFAULT_FONT

DEFINE_LIST_BOX listbox_rec, winfo_results, kResultsRows, SELF_MODIFIED_BYTE, DrawListEntryProc, NoOp, NoOp
DEFINE_LIST_BOX_WINFO winfo_results, \
kResultsWindowId, \
kResultsLeft, \
kResultsTop, \
kResultsWidth, \
kResultsHeight, \
DEFAULT_FONT
DEFINE_LIST_BOX listbox_rec, winfo_results, \
kResultsRows, SELF_MODIFIED_BYTE, \
DrawListEntryProc, NoOp, NoOp
DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

selected_index := listbox_rec::selected_index
num_entries := listbox_rec::num_items

DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

;;; ============================================================

.proc Init
Expand Down
12 changes: 10 additions & 2 deletions desk.acc/sounds.s
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,16 @@ nextwinfo: .addr 0

kListBoxWindowId = kDAWindowId + 1

DEFINE_LIST_BOX_WINFO winfo_listbox, kListBoxWindowId, kListLeft + kDALeft, kListTop + kDATop, kListRight - kListLeft, kListHeight, DEFAULT_FONT
DEFINE_LIST_BOX listbox_rec, winfo_listbox, kListRows, kNumSounds, DrawListEntryProc, OnListSelectionChange, OnListSelectionChange
DEFINE_LIST_BOX_WINFO winfo_listbox, \
kListBoxWindowId, \
kListLeft + kDALeft, \
kListTop + kDATop, \
kListRight - kListLeft, \
kListHeight, \
DEFAULT_FONT
DEFINE_LIST_BOX listbox_rec, winfo_listbox, \
kListRows, kNumSounds, \
DrawListEntryProc, OnListSelectionChange, OnListSelectionChange
DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

;;; ============================================================
Expand Down
14 changes: 11 additions & 3 deletions disk_copy/auxlc.s
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,21 @@ kListBoxWidth = 150
kListBoxHeight = kListItemHeight*kListRows-1

kListBoxWindowId = 2
DEFINE_LIST_BOX_WINFO winfo_drive_select, kListBoxWindowId, kListBoxLeft, kListBoxTop, kListBoxWidth, kListBoxHeight, DEFAULT_FONT
DEFINE_LIST_BOX_WINFO winfo_drive_select, \
kListBoxWindowId, \
kListBoxLeft, \
kListBoxTop, \
kListBoxWidth, \
kListBoxHeight, \
DEFAULT_FONT
DEFINE_LIST_BOX listbox_rec, winfo_drive_select, \
kListRows, SELF_MODIFIED_BYTE, \
DrawListEntryProc, NoOp, NoOp
DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

DEFINE_LIST_BOX listbox_rec, winfo_drive_select, kListRows, SELF_MODIFIED_BYTE, DrawListEntryProc, NoOp, NoOp
num_drives := listbox_rec::num_items
current_drive_selection := listbox_rec::selected_index

DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

DEFINE_POINT list_entry_pos, 0, 0

Expand Down
12 changes: 10 additions & 2 deletions lib/file_dialog_res.s
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,13 @@ kEntryListCtlWindowID = $3F
kExListBoxTop = kFilePickerDlgExTop + 28
.endif

DEFINE_LIST_BOX_WINFO winfo_listbox, kEntryListCtlWindowID, kListBoxLeft, kListBoxTop, kListBoxWidth, kListBoxHeight, FONT
DEFINE_LIST_BOX_WINFO winfo_listbox, \
kEntryListCtlWindowID, \
kListBoxLeft, \
kListBoxTop, \
kListBoxWidth, \
kListBoxHeight, \
FONT

.ifdef FD_EXTENDED
;;; Needed in DeskTop (LBTK in Aux, File Dialog in Main)
Expand All @@ -155,7 +161,9 @@ DrawEntryProc := ::file_dialog_impl__DrawListEntryProc
OnSelChange := ::file_dialog_impl__OnListSelectionChange
.endif

DEFINE_LIST_BOX listbox_rec, file_dialog_res::winfo_listbox, file_dialog_res::kListRows, SELF_MODIFIED_BYTE, DrawEntryProc, OnSelChange, NoOp
DEFINE_LIST_BOX listbox_rec, file_dialog_res::winfo_listbox, \
file_dialog_res::kListRows, SELF_MODIFIED_BYTE, \
DrawEntryProc, OnSelChange, NoOp
DEFINE_LIST_BOX_PARAMS lb_params, listbox_rec

NoOp: rts
Expand Down

0 comments on commit 67a38b0

Please sign in to comment.