From ceec6f41a47002bce44f699abe607fe9a95fbc44 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Fri, 28 Dec 2018 15:46:09 -0800 Subject: [PATCH] Prefer = for constants and := for labels --- MGTK.md | 34 ++--- desk.acc/calculator.s | 78 +++++------ desk.acc/date.s | 28 ++-- desk.acc/puzzle.s | 36 +++--- desk.acc/show.text.file.s | 26 ++-- desk.acc/sort.directory.s | 4 +- desktop.inc | 78 +++++------ desktop.system/desktop.system.s | 2 +- desktop/desktop_lc.s | 12 +- desktop/desktop_main.s | 64 ++++----- desktop/desktop_res.s | 18 +-- desktop/loader.s | 32 ++--- desktop/ovl1b.s | 6 +- desktop/ovl4.s | 4 +- inc/apple2.inc | 52 ++++---- inc/prodos.inc | 130 +++++++++---------- mgtk.inc | 222 ++++++++++++++++---------------- 17 files changed, 411 insertions(+), 415 deletions(-) diff --git a/MGTK.md b/MGTK.md index bac394b..2a65400 100644 --- a/MGTK.md +++ b/MGTK.md @@ -378,16 +378,16 @@ otherwise: ``` ``` -event_kind_no_event := 0 ; No mouse or keypress -event_kind_button_down := 1 ; Mouse button was depressed -event_kind_button_up := 2 ; Mouse button was released -event_kind_key_down := 3 ; Key was pressed -event_kind_drag := 4 ; Mouse button still down -event_kind_apple_key := 5 ; Mouse button was depressed, modifier key down -event_kind_update := 6 ; Window update needed +event_kind_no_event = 0 ; No mouse or keypress +event_kind_button_down = 1 ; Mouse button was depressed +event_kind_button_up = 2 ; Mouse button was released +event_kind_key_down = 3 ; Key was pressed +event_kind_drag = 4 ; Mouse button still down +event_kind_apple_key = 5 ; Mouse button was depressed, modifier key down +event_kind_update = 6 ; Window update needed -event_modifier_open_apple := 1 << 0 -event_modifier_solid_apple := 1 << 1 +event_modifier_open_apple = 1 << 0 +event_modifier_solid_apple = 1 << 1 ``` ### Menu @@ -443,15 +443,15 @@ _title bar_ which in turn has an optional _close box_. Within the content area a optional _resize box_ and optional _scroll bars_. ``` -option_dialog_box := 1 << 0 -option_go_away_box := 1 << 1 -option_grow_box := 1 << 2 +option_dialog_box = 1 << 0 +option_go_away_box = 1 << 1 +option_grow_box = 1 << 2 -scroll_option_none := 0 -scroll_option_present := 1 << 7 -scroll_option_thumb := 1 << 6 -scroll_option_active := 1 << 0 -scroll_option_normal := scroll_option_present | scroll_option_thumb | scroll_option_active +scroll_option_none = 0 +scroll_option_present = 1 << 7 +scroll_option_thumb = 1 << 6 +scroll_option_active = 1 << 0 +scroll_option_normal = scroll_option_present | scroll_option_thumb | scroll_option_active ``` ## Commands diff --git a/desk.acc/calculator.s b/desk.acc/calculator.s index b19be10..d38703d 100644 --- a/desk.acc/calculator.s +++ b/desk.acc/calculator.s @@ -107,7 +107,7 @@ skip: lda #0 sta RAMWRTON rts .endproc - sizeof_routine := * - routine + sizeof_routine = * - routine .endproc ;;; ============================================================ @@ -201,31 +201,31 @@ flag: .byte MGTK::zp_overwrite ;;; ============================================================ ;;; Button Definitions - button_width := 17 - button_height := 9 + button_width = 17 + button_height = 9 - col1_left := 13 - col1_right := col1_left+button_width ; 30 - col2_left := 42 - col2_right := col2_left+button_width ; 59 - col3_left := 70 - col3_right := col3_left+button_width ; 87 - col4_left := 98 - col4_right := col4_left+button_width ; 115 + col1_left = 13 + col1_right = col1_left+button_width ; 30 + col2_left = 42 + col2_right = col2_left+button_width ; 59 + col3_left = 70 + col3_right = col3_left+button_width ; 87 + col4_left = 98 + col4_right = col4_left+button_width ; 115 - row1_top := 22 - row1_bot := row1_top+button_height ; 31 - row2_top := 38 - row2_bot := row2_top+button_height ; 47 - row3_top := 53 - row3_bot := row3_top+button_height ; 62 - row4_top := 68 - row4_bot := row4_top+button_height ; 77 - row5_top := 83 - row5_bot := row5_top+button_height ; 92 + row1_top = 22 + row1_bot = row1_top+button_height ; 31 + row2_top = 38 + row2_bot = row2_top+button_height ; 47 + row3_top = 53 + row3_bot = row3_top+button_height ; 62 + row4_top = 68 + row4_bot = row4_top+button_height ; 77 + row5_top = 83 + row5_bot = row5_top+button_height ; 92 - border_lt := 1 ; border width pixels (left/top) - border_br := 2 ; (bottom/right) + border_lt = 1 ; border width pixels (left/top) + border_br = 2 ; (bottom/right) .proc btn_c viewloc: DEFINE_POINT col1_left - border_lt, row1_top - border_lt @@ -430,7 +430,7 @@ port: .word col4_left,row4_top,col4_right,row5_bot ;; drawing the shadowed buttons. ;; bitmaps are low 7 bits, 0=black 1=white - bitmap_stride := 3 ; bytes + bitmap_stride = 3 ; bytes button_bitmap: ; bitmap for normal buttons .byte px(%0000000),px(%0000000),px(%0000001) .byte px(%0111111),px(%1111111),px(%1111100) @@ -446,7 +446,7 @@ button_bitmap: ; bitmap for normal buttons .byte px(%0000000),px(%0000000),px(%0000000) .byte px(%1000000),px(%0000000),px(%0000000) - wide_bitmap_stride := 8 + wide_bitmap_stride = 8 wide_button_bitmap: ; bitmap for '0' button .byte px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%0000000),px(%1111111) .byte px(%0111111),px(%1111111),px(%1111111),px(%1111111),px(%1111111),px(%1111111),px(%1111110),px(%0111111) @@ -532,10 +532,10 @@ white_pattern: backcolor: .byte $7F .endproc - display_left := 10 - display_top := 5 - display_width := 120 - display_height := 17 + display_left = 10 + display_top = 5 + display_width = 120 + display_height = 17 .proc frame_display_params left: .word display_left @@ -563,7 +563,7 @@ textptr: .addr text_buffer1 textlen: .byte 15 .endproc -text_buffer_size := 14 +text_buffer_size = 14 text_buffer1: .res text_buffer_size+2, 0 @@ -644,7 +644,7 @@ textfont: .addr 0 .byte 0 ; ??? - menu_bar_height := 13 + menu_bar_height = 13 ;; params for MGTK::SetPortBits when decorating title bar .proc screen_port @@ -668,10 +668,10 @@ penmode: .byte MGTK::pencopy penmode: .byte MGTK::notpenXOR .endproc - window_width := 130 - window_height := 96 - default_left := 210 - default_top := 60 + window_width = 130 + window_height = 96 + default_left = 210 + default_top = 60 .proc winfo window_id: .byte da_window_id @@ -874,7 +874,7 @@ exit: lda LCBANK1 sta RAMWRTOFF jmp exit_da .endproc - sizeof_routine := * - routine ; Can't use .sizeof before the .proc definition + sizeof_routine = * - routine ; Can't use .sizeof before the .proc definition .endproc : cmp #MGTK::Area::dragbar ; Title bar? @@ -1555,8 +1555,8 @@ loop: ldy #0 ;;; Draw the title bar decoration draw_title_bar: - offset_left := 115 ; pixels from left of client area - offset_top := 22 ; pixels from top of client area (up!) + offset_left = 115 ; pixels from left of client area + offset_top = 22 ; pixels from top of client area (up!) ldx winfo::left+1 lda winfo::left clc @@ -1621,6 +1621,6 @@ loop: inc TXTPTR end: rts .endproc .org save_org + .sizeof(adjust_txtptr_copied) - sizeof_adjust_txtptr_copied := .sizeof(adjust_txtptr_copied) + sizeof_adjust_txtptr_copied = .sizeof(adjust_txtptr_copied) da_end := * diff --git a/desk.acc/date.s b/desk.acc/date.s index 3416cad..b229504 100644 --- a/desk.acc/date.s +++ b/desk.acc/date.s @@ -31,7 +31,7 @@ filename: write_buffer: .byte 0,0 - sizeof_write_buffer := * - write_buffer + sizeof_write_buffer = * - write_buffer ;;; ============================================================ @@ -120,10 +120,10 @@ start_da: ;; The following 7 rects are iterated over to identify ;; a hit target for a click. - num_hit_rects := 7 - first_hit_rect := * - up_rect_index := 3 - down_rect_index := 4 + num_hit_rects = 7 + first_hit_rect = * + up_rect_index = 3 + down_rect_index = 4 ok_button_rect: .word $6A,$2E,$B5,$39 @@ -198,7 +198,7 @@ which_area:.byte 0 window_id: .byte 0 .endproc - da_window_id := 100 + da_window_id = 100 .proc screentowindow_params window_id: .byte da_window_id @@ -500,12 +500,12 @@ decrement_table: .addr 0, decrement_day, decrement_month, decrement_year - day_min := 1 - day_max := 31 - month_min := 1 - month_max := 12 - year_min := 0 - year_max := 99 + day_min = 1 + day_max = 31 + month_min = 1 + month_max = 12 + year_min = 0 + year_max = 99 increment_day: clc @@ -578,7 +578,7 @@ decrement_year: ptr := $07 str := month_string + 3 - len := 3 + len = 3 copy16 #str, ptr @@ -641,7 +641,7 @@ skip: jmp dest sta RAMWRTOFF jmp save_date_and_exit .endproc - sizeof_routine := * - routine + sizeof_routine = * - routine .endproc ;;; ============================================================ diff --git a/desk.acc/puzzle.s b/desk.acc/puzzle.s index bd420ab..cdbd782 100644 --- a/desk.acc/puzzle.s +++ b/desk.acc/puzzle.s @@ -64,7 +64,7 @@ stash_stack: .byte 0 jmp create_window .endproc - da_window_id := 51 + da_window_id = 51 ;;; ============================================================ ;;; Redraw the screen (all windows) after a EventKind::drag @@ -98,7 +98,7 @@ skip: lda #0 sta RAMWRTON rts .endproc - sizeof_routine := * - routine + sizeof_routine = * - routine .endproc ;;; ============================================================ @@ -176,16 +176,16 @@ a_grafport: .addr setport_params getwinport_params_window_id := getwinport_params::window_id ;; Puzzle piece row/columns - cw := 28 - c1 := 5 - c2 := c1 + cw - c3 := c2 + cw - c4 := c3 + cw - rh := 16 - r1 := 3 - r2 := r1 + rh - r3 := r2 + rh - r4 := r3 + rh + cw = 28 + c1 = 5 + c2 = c1 + cw + c3 = c2 + cw + c4 = c3 + cw + rh = 16 + r1 = 3 + r2 = r1 + rh + r3 = r2 + rh + r4 = r3 + rh space_positions: ; left, top for all 16 holes .word c1,r1 @@ -579,10 +579,10 @@ setport_params: .byte $00,$2F,$02,$B1,$00,$00,$01,$02 .byte $06 - default_left := 220 - default_top := 80 - default_width := $79 - default_height := $44 + default_left = 220 + default_top = 80 + default_width = $79 + default_height = $44 .proc winfo window_id: .byte da_window_id @@ -743,7 +743,7 @@ destroy: sta RAMWRTOFF jmp exit_da .endproc - sizeof_routine := * - routine + sizeof_routine = * - routine ;; title bar? check_title: @@ -844,7 +844,7 @@ nope: clc ;;; ============================================================ ;;; Process piece click - hole_piece := 12 + hole_piece = 12 .proc process_click diff --git a/desk.acc/show.text.file.s b/desk.acc/show.text.file.s index 3227f62..19d9a4e 100644 --- a/desk.acc/show.text.file.s +++ b/desk.acc/show.text.file.s @@ -56,7 +56,7 @@ call_main_addr := call_main_trampoline+7 ; address patched in her sta RAMWRTON rts .endproc - sizeof_call_main_template := * - call_main_template + sizeof_call_main_template = * - call_main_template .proc call_init ;; run the DA @@ -160,7 +160,7 @@ params_start: io_buf := $0C00 default_buffer := $1200 -read_length := $0100 +read_length = $0100 DEFINE_OPEN_PARAMS open_params, pathbuf, io_buf DEFINE_READ_PARAMS read_params, default_buffer, read_length @@ -185,10 +185,10 @@ black_pattern: white_pattern: .res $8, $FF - da_window_id := 100 + da_window_id = 100 - line_spacing := 10 - right_const := 506 + line_spacing = 10 + right_const = 506 L095A: .byte $00 L095B: .word right_const @@ -271,10 +271,10 @@ textptr: .addr 0 ; address textlen: .byte 0 ; length .endproc - default_width := 512 - default_height := 150 - default_left := 10 - default_top := 28 + default_width = 512 + default_height = 150 + default_left = 10 + default_top = 28 .proc winfo window_id: .byte da_window_id ; window identifier @@ -516,7 +516,7 @@ title: jsr on_title_bar_click jsr redraw_screen jsr calc_window_size - max_width := default_width + max_width = default_width lda #>max_width cmp winfo::maprect::x2+1 bne :+ @@ -645,7 +645,7 @@ loop : lda winfo::vthumbpos end: rts .endproc -vscroll_max := $FA +vscroll_max = $FA .proc on_vscroll_below_click loop: lda winfo::vthumbpos @@ -1370,8 +1370,8 @@ ignore: clc ; Click ignored fixed_str: DEFINE_STRING "Fixed " prop_str: DEFINE_STRING "Proportional" - label_width := 50 - title_bar_height := 12 + label_width = 50 + title_bar_height = 12 .proc mode_mapinfo ; bounding port for mode label viewloc: DEFINE_POINT 0, 0, viewloc diff --git a/desk.acc/sort.directory.s b/desk.acc/sort.directory.s index c834055..9849ff7 100644 --- a/desk.acc/sort.directory.s +++ b/desk.acc/sort.directory.s @@ -13,7 +13,7 @@ dir_data_buffer := $0E00 -dir_data_buffer_len := $0E00 +dir_data_buffer_len = $0E00 ;;; ============================================================ @@ -139,7 +139,7 @@ on_line_buffer: io_buf := $1C00 buffer := dir_data_buffer - buffer_len := dir_data_buffer_len + buffer_len = dir_data_buffer_len DEFINE_OPEN_PARAMS open_params, path_buf, io_buf DEFINE_READ_PARAMS read_params, buffer, buffer_len diff --git a/desktop.inc b/desktop.inc index 762c163..78b46f3 100644 --- a/desktop.inc +++ b/desktop.inc @@ -2,15 +2,15 @@ ;;; DeskTop Internals ;;; ============================================================ -screen_width := 560 -screen_height := 192 +screen_width = 560 +screen_height = 192 ;;; ============================================================ VERSION_MAJOR = 1 VERSION_MINOR = 1 -DA_FILE_TYPE := $F1 +DA_FILE_TYPE = $F1 max_desk_acc_count = 8 @@ -19,7 +19,7 @@ INVOKER_FILENAME := $280 ; File to invoke (PREFIX must be set) DA_LOAD_ADDRESS := $800 ; Loaded into MAIN DA_IO_BUFFER := $1C00 ; ...through $1FFF -DA_MAX_SIZE := DA_IO_BUFFER - DA_LOAD_ADDRESS +DA_MAX_SIZE = DA_IO_BUFFER - DA_LOAD_ADDRESS ;; Can't load DA past I/O Buffer at MAIN $1C00, ;; but icon tables start at AUX $1B00 so can't clone there. @@ -78,24 +78,24 @@ DESKTOP := $8E00 ;; Implementation bounces to $93BC, uses jump table at $939E -DT_ADD_ICON := $01 ; { .addr icondata } -DT_HIGHLIGHT_ICON := $02 ; { .byte icon } -DT_REDRAW_ICON := $03 ; { .byte icon } -DT_REMOVE_ICON := $04 ; { .byte icon } -DT_HIGHLIGHT_ALL := $05 ; { .byte window_id } -DT_UNHIGHLIGHT_ALL := $06 -DT_CLOSE_WINDOW := $07 ; { .byte window_id } -DT_GET_HIGHLIGHTED := $08 ; { .res 20 } -DT_FIND_ICON := $09 ; { .word mousex, .word mousey, .byte result } -DT_DRAG_HIGHLIGHTED := $0A ; { .byte param } +DT_ADD_ICON = $01 ; { .addr icondata } +DT_HIGHLIGHT_ICON = $02 ; { .byte icon } +DT_REDRAW_ICON = $03 ; { .byte icon } +DT_REMOVE_ICON = $04 ; { .byte icon } +DT_HIGHLIGHT_ALL = $05 ; { .byte window_id } +DT_UNHIGHLIGHT_ALL = $06 +DT_CLOSE_WINDOW = $07 ; { .byte window_id } +DT_GET_HIGHLIGHTED = $08 ; { .res 20 } +DT_FIND_ICON = $09 ; { .word mousex, .word mousey, .byte result } +DT_DRAG_HIGHLIGHTED = $0A ; { .byte param } ; Input: specific icon being dragged ; Output: 0 = on desktop (no-op) ; hi bit clear: low bits are target icon ; hi bit set: low bits are target window -DT_UNHIGHLIGHT_ICON := $0B ; { .addr iconentry } -DT_REDRAW_ICONS := $0C ; Repaints desktop icons * -DT_ICON_IN_RECT := $0D ; { .byte icon, rect bounds } -DT_REDRAW_ICON_IDX := $0E ; { .byte icon_index } +DT_UNHIGHLIGHT_ICON = $0B ; { .addr iconentry } +DT_REDRAW_ICONS = $0C ; Repaints desktop icons * +DT_ICON_IN_RECT = $0D ; { .byte icon, rect bounds } +DT_REDRAW_ICON_IDX = $0E ; { .byte icon_index } ;;; `icon` is the icon number, i.e. first field in icon entry ;;; `icon_index` is the index in the icon table @@ -204,17 +204,17 @@ last_menu_click_params := $E25A name .res 17 ; 15 chars plus leading/trailing spaces .endstruct -max_icon_count := 127 +max_icon_count = 127 -icon_entry_open_mask := %10000000 -icon_entry_type_mask := %01110000 -icon_entry_winid_mask := %00001111 -icon_entry_type_dir := %00000000 -icon_entry_type_sys := %00010000 -icon_entry_type_bin := %00100000 -icon_entry_type_bas := %00110000 -icon_entry_type_txt := %01010000 -icon_entry_type_trash := %01110000 +icon_entry_open_mask = %10000000 +icon_entry_type_mask = %01110000 +icon_entry_winid_mask = %00001111 +icon_entry_type_dir = %00000000 +icon_entry_type_sys = %00010000 +icon_entry_type_bin = %00100000 +icon_entry_type_bas = %00110000 +icon_entry_type_txt = %01010000 +icon_entry_type_trash = %01110000 ;;; ============================================================ ;;; Internals - Default Font @@ -244,19 +244,19 @@ DEFAULT_FONT := $8800 ;;; $0E = (C) $1E = solid apple (MT:@) ;;; $0F = (R) $1F = open apple (MT:A) -GLYPH_FOLDERL := $01 -GLYPH_FOLDERR := $02 +GLYPH_FOLDERL = $01 +GLYPH_FOLDERR = $02 -GLYPH_SPC := $00 -GLYPH_INSPT := $06 +GLYPH_SPC = $00 +GLYPH_INSPT = $06 -GLYPH_LARROW := $09 -GLYPH_RARROW := $15 -GLYPH_UARROW := $0B -GLYPH_DARROW := $0A -GLYPH_RETURN := $0D -GLYPH_OAPPLE := $1F -GLYPH_SAPPLE := $1E +GLYPH_LARROW = $09 +GLYPH_RARROW = $15 +GLYPH_UARROW = $0B +GLYPH_DARROW = $0A +GLYPH_RETURN = $0D +GLYPH_OAPPLE = $1F +GLYPH_SAPPLE = $1E ;;; Menu (by default) uses: ;;; Solid Mod $1E diff --git a/desktop.system/desktop.system.s b/desktop.system/desktop.system.s index 5b2ed01..aa6e93e 100644 --- a/desktop.system/desktop.system.s +++ b/desktop.system/desktop.system.s @@ -644,7 +644,7 @@ done: rts open_io_buffer := $A000 dir_buffer := $A400 - dir_bufsize := BLOCK_SIZE + dir_bufsize = BLOCK_SIZE entry_length_offset := $23 file_count_offset := $25 diff --git a/desktop/desktop_lc.s b/desktop/desktop_lc.s index afbbc13..10e5fc3 100644 --- a/desktop/desktop_lc.s +++ b/desktop/desktop_lc.s @@ -12,12 +12,12 @@ ;;; Constants needed in both main and aux - menu_id_apple := 1 - menu_id_file := 2 - menu_id_view := 4 - menu_id_special := 5 - menu_id_startup := 8 - menu_id_selector := 3 + menu_id_apple = 1 + menu_id_file = 2 + menu_id_view = 4 + menu_id_special = 5 + menu_id_startup = 8 + menu_id_selector = 3 ;;; Various routines callable from MAIN diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s index d12fe8c..19e1a77 100644 --- a/desktop/desktop_main.s +++ b/desktop/desktop_main.s @@ -24,15 +24,15 @@ dst_path_buf := $1FC0 dynamic_routine_7000 := $7000 dynamic_routine_9000 := $9000 - dynamic_routine_disk_copy := 0 - dynamic_routine_format_erase := 1 - dynamic_routine_selector1 := 2 - dynamic_routine_common := 3 - dynamic_routine_file_copy := 4 - dynamic_routine_file_delete := 5 - dynamic_routine_selector2 := 6 - dynamic_routine_restore5000 := 7 - dynamic_routine_restore9000 := 8 + dynamic_routine_disk_copy = 0 + dynamic_routine_format_erase = 1 + dynamic_routine_selector1 = 2 + dynamic_routine_common = 3 + dynamic_routine_file_copy = 4 + dynamic_routine_file_delete = 5 + dynamic_routine_selector2 = 6 + dynamic_routine_restore5000 = 7 + dynamic_routine_restore9000 = 8 .org $4000 @@ -8143,8 +8143,8 @@ L85FA: .word 0 .proc detect_double_click - double_click_deltax := 8 - double_click_deltay := 7 + double_click_deltax = 8 + double_click_deltay = 7 ;; Stash initial coords ldx #3 @@ -12119,17 +12119,17 @@ do_on_line: ;;; ============================================================ ;;; Dialog Launcher (or just proc handler???) - index_about_dialog := 0 - index_copy_dialog := 1 - index_delete_dialog := 2 - index_new_folder_dialog := 3 - index_get_info_dialog := 6 - index_lock_dialog := 7 - index_unlock_dialog := 8 - index_rename_dialog := 9 - index_download_dialog := $A - index_get_size_dialog := $B - index_warning_dialog := $C + index_about_dialog = 0 + index_copy_dialog = 1 + index_delete_dialog = 2 + index_new_folder_dialog = 3 + index_get_info_dialog = 6 + index_lock_dialog = 7 + index_unlock_dialog = 8 + index_rename_dialog = 9 + index_download_dialog = 10 + index_get_size_dialog = 11 + index_warning_dialog = 12 invoke_dialog_proc: .assert * = $A500, error, "Entry point used by overlay" @@ -13483,13 +13483,13 @@ warning_message_table: .addr desktop_aux::str_too_many_windows,desktop_aux::str_1_space .addr desktop_aux::str_save_selector_list,desktop_aux::str_on_system_disk .endproc - warning_msg_insert_system_disk := 0 - warning_msg_selector_list_full := 1 - warning_msg_selector_list_full2 := 2 - warning_msg_window_must_be_closed := 3 - warning_msg_window_must_be_closed2 := 4 - warning_msg_too_many_windows := 5 - warning_msg_save_selector_list := 6 + warning_msg_insert_system_disk = 0 + warning_msg_selector_list_full = 1 + warning_msg_selector_list_full2 = 2 + warning_msg_window_must_be_closed = 3 + warning_msg_window_must_be_closed2 = 4 + warning_msg_too_many_windows = 5 + warning_msg_save_selector_list = 6 ;;; ============================================================ @@ -13559,8 +13559,8 @@ set_penmode_xor2: .proc detect_double_click2 .assert * = $B445, error, "Entry point used by overlay" - double_click_deltax := 5 - double_click_deltay := 4 + double_click_deltax = 5 + double_click_deltay = 4 COPY_STRUCT MGTK::Point, event_coords, coords @@ -13718,7 +13718,7 @@ done: jmp reset_grafport3a ;;; A,X has pointer to DrawText params block ;;; Y has row number (1, 2, ... ) with high bit to center it - DDL_CENTER := $80 + DDL_CENTER = $80 .proc draw_dialog_label .assert * = $B590, error, "Entry point used by overlay" diff --git a/desktop/desktop_res.s b/desktop/desktop_res.s index bfd4508..9c2334e 100644 --- a/desktop/desktop_res.s +++ b/desktop/desktop_res.s @@ -456,7 +456,7 @@ nextwinfo: .addr 0 ;;; "About Apple II Desktop" Dialog .proc winfo_about_dialog - width := 400 + width = 400 window_id: .byte $18 options: .byte MGTK::Option::dialog_box @@ -493,7 +493,7 @@ winfo_about_dialog_port := winfo_about_dialog::port ;;; Dialog used for Edit/Delete/Run an Entry ... .proc winfo_entry_picker - width := 350 + width = 350 window_id: .byte $1B options: .byte MGTK::Option::dialog_box @@ -536,7 +536,7 @@ pos_dialog_title: DEFINE_POINT 0, 18, pos_dialog_title point7: DEFINE_POINT 40,18, point7 pointD: DEFINE_POINT 40,35, pointD - dialog_label_default_x := 40 + dialog_label_default_x = 40 dialog_label_pos: DEFINE_POINT dialog_label_default_x,0, dialog_label_pos @@ -651,7 +651,7 @@ has_input_field_flag: .byte 0 - prompt_insertion_point_blink_count := $14 + prompt_insertion_point_blink_count = $14 prompt_ip_counter: .byte prompt_insertion_point_blink_count @@ -1223,11 +1223,11 @@ LE6C1: .addr winfo8title_ptr ;; (low nibble must match menu order) - view_by_icon := $80 - view_by_name := $81 - view_by_date := $82 - view_by_size := $83 - view_by_type := $84 + view_by_icon = $80 + view_by_name = $81 + view_by_date = $82 + view_by_size = $83 + view_by_type = $84 win_view_by_table: .res 8, 0 diff --git a/desktop/loader.s b/desktop/loader.s index 88e5317..cc91b0f 100644 --- a/desktop/loader.s +++ b/desktop/loader.s @@ -422,14 +422,10 @@ max_page: .org $280 SLOT1 := $C100 - TAB := $09 - LF := $0A - CR := $0D - ESC := $1B hbasl := $6 - screen_width := 560 - screen_height := 192 + screen_width = 560 + screen_height = 192 ;; Test for OpenApple+SolidApple+P pha @@ -484,7 +480,7 @@ done: rts bne :- rts init_graphics: - .byte ESC,"G0560" ; Graphics, 560 data bytes + .byte CHAR_ESCAPE,"G0560" ; Graphics, 560 data bytes .endproc .proc send_row @@ -560,9 +556,9 @@ done: sta PAGE2OFF ; Read main mem $2000-$3FFF ;; Print a row (560x8), CR+LF loop: jsr send_row - lda #CR + lda #CHAR_RETURN jsr cout - lda #LF + lda #CHAR_DOWN jsr cout lda y_coord @@ -571,9 +567,9 @@ loop: jsr send_row bcc loop ;; Finish up - lda #CR + lda #CHAR_RETURN jsr cout - lda #CR + lda #CHAR_RETURN jsr cout jsr send_restore_state sta ALTZPON @@ -612,7 +608,7 @@ loop: jsr send_row sta COUT_HOOK+1 lda #