[X16EDIT] sync to upstream

mooinglemur · Mar 1, 2024 · 638f4af · 638f4af
1 parent 2a2225e
commit 638f4af
Show file tree

Hide file tree

Showing 31 changed files with 614 additions and 228 deletions.
diff --git a/x16-edit/.git-commit b/x16-edit/.git-commit
@@ -1 +1 @@
-8f1b1b80d6ea8180bb5eeffd4b58793c87b2e469
+ba1b4ae4455429fb64debe536dcb07cfc9fbe60f
diff --git a/x16-edit/Makefile b/x16-edit/Makefile
@@ -26,7 +26,7 @@ $(BUILD_DIR)/X16EDIT.PRG: $(BUILD_DIR)/help.bin $(BUILD_DIR)/help_short.bin $(SR
 # Target for ROM program
 $(BUILD_DIR)/x16edit-rom.bin: $(BUILD_DIR)/help.bin $(BUILD_DIR)/help_short.bin $(SRC_FILES)
 	@mkdir -p $(BUILD_DIR) 
-	cl65 --asm-args -Dtarget_mem=2 -o $@ -t cx16 -C $(CONF_DIR)/x16edit-rom.cfg --mapfile $(BUILD_DIR)/x16edit-rom.map main.asm
+	cl65 --asm-args -Dtarget_mem=2 -o $@ -t cx16 -C $(CONF_DIR)/x16edit-rom.cfg --mapfile $(BUILD_DIR)/x16edit-rom.map -Ln $(BUILD_DIR)/x16edit-rom.sym -l $(BUILD_DIR)/x16edit-rom.lst main.asm
 
 # Clean-up target
 clean:

diff --git a/x16-edit/appversion.inc b/x16-edit/appversion.inc
@@ -1,6 +1,6 @@
 .define appversion_major    0
 .define appversion_minor    8
-.define appversion_patch    1
+.define appversion_patch    2
 
 .if target_mem=target_rom
     .segment "APPSIG"

diff --git a/x16-edit/bridge.inc b/x16-edit/bridge.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/bridge_macro.inc b/x16-edit/bridge_macro.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/charset.inc b/x16-edit/charset.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/clipboard.inc b/x16-edit/clipboard.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/cmd.inc b/x16-edit/cmd.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/cmd_file.inc b/x16-edit/cmd_file.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/common.inc b/x16-edit/common.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:
@@ -53,6 +53,7 @@
 .define KERNAL_MEMTOP $ff99
 .define KERNAL_DECOMPRESS $feed
 .define KERNAL_MACPTR $ff44
+.define KERNAL_MCIOUT $feb1
 .define KERNAL_SCREEN_MODE $ff5f
 .define KERNAL_FETCH $ff74
 
@@ -165,8 +166,9 @@ tempvars:               .res 16             ;Temporary variables
 mem_map                                 = $a000               ;1024 bytes ($a000-$a3ff)
 clipboard_mem                           = $a400               ;3072 bytes ($a400-$afff)
 ram_backup_storage                      = $b000               ;1280 bytes ($b000-$b4ff)
-dir_entry                               = $b500               ;256 bytes
-help_txt                                = $b600
+dir_entry                               = $b500               ;256 bytes ($b500-$b5ff)
+rambuf_backup                           = $b600               ;768 bytes ($b600-$b8ff)
+help_txt                                = $b900               ;1792 bytes ($b900-$bfff)
 
 ;*****************************************************************************
 ;CONSTANTS

diff --git a/x16-edit/compile.inc b/x16-edit/compile.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/conf/cx16-asm.cfg b/x16-edit/conf/cx16-asm.cfg
@@ -23,6 +23,7 @@ SEGMENTS {
     DATA:     load = MAIN,     type = rw;
     BSS:      load = MAIN,     type = bss,                define = yes;
     VARS:     load = VARMEM,   type = bss, define = yes;
+    RAMCODE3: load = MAIN,     type = rw;
 }
 FEATURES {
     CONDES: type    = constructor,

diff --git a/x16-edit/conf/x16edit-hiram.cfg b/x16-edit/conf/x16edit-hiram.cfg
diff --git a/x16-edit/conf/x16edit-rom.cfg b/x16-edit/conf/x16edit-rom.cfg
@@ -1,6 +1,9 @@
 MEMORY {
     ZP:             file = "", start = $0022, size = $0080 - $0022, define = yes;
     VARMEM:         file = "", start = $0400, size = $0400, define=yes;
+    RAMCODE1:       file = "", start = $9c00, size = $200;
+    RAMCODE2:       file = "", start = $9c00, size = $200;
+    RAMCODE3:       file = "", start = $9e00, size = $100;
     ROMBANK:        start = $c000, size = $3ff0, fill=yes, bank=1, fillval=$aa;
     APPSIGMEM:      start = $fff0, size = $0a, fill=yes, fillval=$aa;
     VECT:           start = $fffa, size = $06, fill=yes, fillval=$aa;
@@ -11,6 +14,9 @@ SEGMENTS {
     VARS:     load = VARMEM,    type = bss, define = yes;
     CODE:     load = ROMBANK,   type = ro;
     CODE2:    load = ROMBANK2,  type = ro;
+    RAMCODE1: load = ROMBANK2,  run = RAMCODE1, type=rw, define=yes;
+    RAMCODE2: load = ROMBANK2,  run = RAMCODE2, type=rw, define=yes;
+    RAMCODE3: load = RAMCODE3,  type=rw, define=yes;
     APPSIG:   load = APPSIGMEM, type = ro;
     IRQ:      load = VECT,      type = ro;
 }
diff --git a/x16-edit/cursor.inc b/x16-edit/cursor.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/dir.inc b/x16-edit/dir.inc
@@ -1,5 +1,5 @@
 ;*******************************************************************************
-;Copyright 2022-2023, Stefan Jakobsson
+;Copyright 2022-2024, Stefan Jakobsson
 ;
 ;Redistribution and use in source and binary forms, with or without modification, 
 ;are permitted provided that the following conditions are met:

diff --git a/x16-edit/docs/manual.pdf b/x16-edit/docs/manual.pdf
diff --git a/x16-edit/docs/manual.tex b/x16-edit/docs/manual.tex
@@ -122,7 +122,8 @@ \section{Basic usage}
         you want the selection to start and release it where you want the selection to end. 
         Selections can be copied or cut. More on that later.
 
-        The mouse is automatically enabled when you start the editor.
+        The mouse is automatically enabled when you start the editor. The mouse pointer 
+        is hidden while typing on the keyboard, and shown again when you move or click the mouse.
 
     \subsection{User interface}
         X16 Edit's user interface is similar to GNU Nano, and should be mostly self-explanatory.
@@ -182,6 +183,12 @@ \section{More on text editing}
         On startup, the editor detects the current character set and continues using that.
 
         You may change the character set by pressing Ctrl+E, which cycles through the options.
+
+    \subsection{Quote mode}
+        The PETSCII character set contains control codes that are commonly used in BASIC programs. The
+        control codes are, for instance, used to clear the screen and to move the cursor. Normally, it is not
+        possible to type PETSCII control codes in the editor. Control codes may
+        be typed by activating the quote mode (Ctrl+Q). You exit quote mode by pressing ESC.
 
     \subsection{Tab stop}
         The default tab stop width is four spaces. 
@@ -223,7 +230,7 @@ \section{More on text editing}
         \begin{itemize}
             \item if two or more consecutive line breaks are found, 
             \item if a line contains only blank space characters, or
-            \item if the level of indent is different from the previous line.
+            \item if the level of indentation is different from the previous line.
         \end{itemize}
 
     \subsection{Cut, copy and uncut}
@@ -406,10 +413,10 @@ \section{Advanced topics}
     signature consists of the text "X16EDIT" followed by three bytes representing
     the program version (major, minor, patch).
 
-    If the editor's first ROM bank is 10, it can be started from BASIC like this:
+    If the editor's first ROM bank is 16, it can be started from BASIC like this:
 
 \begin{verbatim}
-    BANK 10,10
+    BANK 16,16
     SYS $C000
 \end{verbatim}
 
@@ -426,7 +433,7 @@ \section{Advanced topics}
             \item Load file with options, start the editor with custom options and then loads the specified text file
         \end{itemize}
 
-        Information on how to call the different entry points and code samples are available in Appendix B. 
+        Information on how to call the different entry points and code samples is available in Appendix B. 
 
 \appendix
 \newpage
@@ -470,7 +477,7 @@ \section{List of keyboard shortcuts}
         space& ---   & Insert non-breaking space \\
         1..9 & ---   & Set tab stop width \\
         ENTER & ---  & Set line break encoding \\
-        F    & ---   & Compile toolbox \\
+        F    & ---   & Programming toolbox \\
     \end{longtable}
 
 \newpage
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		8f1b1b80d6ea8180bb5eeffd4b58793c87b2e469
		ba1b4ae4455429fb64debe536dcb07cfc9fbe60f