Made nano/more keep currently selected colours; support pause after command in mc

Author: lennart-benschop

bin/12amc.cfg

@@ -1,6 +1,6 @@
 # Select video mode
 mode 0
-# Select font (buffer ID or sys). Don't chang if omitted.
+# Select font (buffer ID or sys). Don't change if omitted.
 #font sys
 font 10
 # Select colors for foreground, background and highlight.
@@ -17,4 +17,5 @@ edit nano %s &90000
 exec bas bbcbasic24 %s
 exec bbc bbcbasic24 %s
 exec 4th forth24 %s
-
+# bmpb viewer will pause after displaying
+execp bmp bmpb %s

bin/12amc.hlp

@@ -1,7 +1,7 @@
 12AM COMMANDER
 
 A Midnight Commander look-alike for Agon Light.
-v0.01 (c) 2024 L.C. Benschop.
+v0.02 (c) 2024 L.C. Benschop.
 
 Keys used:
 
@@ -88,6 +88,10 @@ exec <ext> <commandline>
 This specifies the command that will be executed when pressing ENTER on a 
 file with a specific extension.
 
+execp <ext> <commandline>
+
+Like exec, but it will pause after executing the command.
+
 Any line starting with a # is a comment. Can be used to comment out all but
 one viewer or editor.
 

bin/12amc.ovl

@@ -48,7 +48,7 @@ void display_init(void)
     23, 16, 1, 0, // Scroll protection.
     23, 0, 152, 0, // No actions from control keys.
     15,            // No paged mode.
-    18, 0, 15      // Graphics colour to white
+    18, 0,         // Graphics colour, still needs a byte
   };
 
   /* set the mode */
@@ -61,6 +61,7 @@ void display_init(void)
   display_setattr(false,false);
   vdp_cursor_enable(false);
   mos_puts(&disp_str[0],sizeof disp_str, 0);
+  putch(fgcol);
   time = getsysvar_time();
   while (getsysvar_time() == time) {
   }
@@ -98,7 +99,6 @@ void display_init(void)
 void display_finish(void)
 {
   static char disp_str[] = {
-    17, 15, 17, 128, // colours back to white fg/black bg
     26, // Cancel text viewport
     12, // Clear screen
     23, 0, 192, 1, // Set logical coordinates.

mc/src/display.c

@@ -164,6 +164,7 @@ void cmd_reload_dir(void)
 struct {
   char *ext;
   char *cmdline;
+  bool do_pause;
 } cmd_extensions[N_EXTENSIONS];
 unsigned int n_extensions;
 
@@ -207,6 +208,7 @@ void read_cfg_file(void)
 {
   FILE * infile = fopen("/bin/12amc.cfg","r");
   char *p;
+  bool do_pause;
   if (infile != 0) {
     while(my_fgets(cmdbuf, 256, infile) != NULL) {
       if (cmdbuf[0] == '\n' || cmdbuf[0] == '#') continue;
@@ -217,14 +219,17 @@ void read_cfg_file(void)
 	strcpy(viewer_cmd,p);
       } else if (strcmp(pathbuf,"edit") == 0) {
 	strcpy(editor_cmd,p);
-      } else if (strcmp(pathbuf,"exec") == 0) {
+      } else if (strcmp(pathbuf,"exec") == 0 || strcmp(pathbuf,"execp") == 0) {
+	do_pause = strcmp(pathbuf,"execp") == 0;
 	p = scan_word(pathbuf,p);
 	while (*p++==' ')
 	  ;
 	p--;
 	if (n_extensions < N_EXTENSIONS && strlen(pathbuf) != 0) {
 	  cmd_extensions[n_extensions].ext = strdup(pathbuf);
 	  cmd_extensions[n_extensions].cmdline = strdup(p);
+	  cmd_extensions[n_extensions].do_pause = do_pause;
+
 	  n_extensions++;
 	}
       } else if (strcmp(pathbuf,"mode") == 0) {
@@ -338,7 +343,7 @@ main(int argc, char *argv[])
 	  for (i=0; i<n_extensions; i++) {
 	    if (has_ext(pathbuf,cmd_extensions[i].ext)) {
 	      sprintf(cmdbuf, cmd_extensions[i].cmdline, pathbuf);
-	      execute_command(cmdbuf,false);
+	      execute_command(cmdbuf,cmd_extensions[i].do_pause);
 	      break;
 	    }
 	  }

mc/src/main.c

@@ -52,6 +52,16 @@ main_waitmode:		BIT	4, (IX+sysvar_vpd_pflags)
 			LD (prev_cr), A
 			LD (current_col), A
 			LD (num_lines), A
+			LD 	A, 128
+			CALL	get_colour
+			LD	(fg_norm), A
+			ADD	A, 128
+			LD	(bg_inv), A
+			LD 	A, 129
+			CALL	get_colour
+			LD	(fg_inv), A
+			ADD	A, 128
+			LD	(bg_norm), A
  			; Load one byte per character.
 main_byte_loop:
 			MOSCALL mos_feof
@@ -159,9 +169,10 @@ nl_nocrlf:		XOR 	A
 			LD	(num_lines), A		; Clear line counter
 			LD 	HL, c_MORE
 			CALL 	PRCNTSTR		; Print More message
-@@:			MOSCALL mos_getkey
+@@:
+			MOSCALL mos_getkey
 			AND 	A
-			JR	Z, @B			
+			JR	Z, @B
 			CP	'Q'
 			JR	Z, do_quit
 			CP	'q'
@@ -181,14 +192,36 @@ do_quit:		LD	HL, c_CLEAR
 s_ERROR_SRC:		DB 	" Cannot open source file\r\n", 0
 s_USAGE:		DB	" Usage: more <txtfile>\r\n", 0                                 
 c_MORE:			DB  	16 ;String length
-			DB	17, 0  ;foregrond black
-			DB 	17, 143 ; background white
+			DB	17
+fg_inv:			DB   	0 ; foregrond reverse
+			DB 	17
+bg_inv:			DB	0 ; background reverse
 			DB      "--More--"
-			DB 	17, 15 ; foreground white
-			DB	17, 128 ; background black
+			DB 	17
+fg_norm:		DB      0 ; foreground normal
+			DB	17
+bg_norm:		DB      0 ; background normal
 c_CLEAR:		DB      10,13,32,32,32,32,32,32,32,32,13 ; Clear the --More-- output
 c_GETMODE:               DB	4, 15, 23,0,vdp_mode	; Get screen mode parameters. Also switch off paged mode.
 
+; Input A, index to get colour (128 = foreground, 129 = background).
+; output: A scolour index of fg or bg colour.
+get_colour:	    	RES     2,(IX+sysvar_vpd_pflags)
+			LD  	L, A
+			LD	A, 23
+			RST.L   10h
+			XOR	A
+			RST.L   10h
+			LD	A, 148
+			RST.L   10h
+			LD	A, L
+			RST.L   10h
+@@:			BIT	2, (IX+sysvar_vpd_pflags)			
+			JR 	Z, @B		        ; Wait until received.	
+			LD	A,(IX+sysvar_scrpixelIndex)
+			RET
+
+
 current_col:		DS	1			; Current column on the screen.
 num_lines:		DS 	1			; Number of lines printed since last pause
 prev_cr:		DS	1			; flag to indicate previous char was CR.

more.asm

@@ -1120,7 +1120,7 @@ Next_AtEnd:		POP	HL
 			SCF	
 			RET
 ; Move the combination of line addres and line number n lines forward in the text.
-; Never go beyont the last line.
+; Never go beyond the last line.
 ;
 ; Inputs: IX is the address of either cur_lineaddr or top_lineaddr
 ;	  BC is the number of lines to move forward (limited to 16 bits).
@@ -1904,7 +1904,7 @@ s_NAME:			DB	"Editor for Agon ",0
 s_LINE:			DB	"Line ",0
 s_HELP_Small:		DB	" bytes -- Esc to exit, Ctrl-G for help ",0
 
-s_HELP_Large:		DB      12, "Text editor for Agon v0.10, Copyright 2023-2024, L.C. Benschop\r\n"
+s_HELP_Large:		DB      12, "Text editor for Agon v0.11, Copyright 2023-2024, L.C. Benschop\r\n"
 			DB	"\r\n"
 			DB  	"Cursor movement:\r\n"	
 			DB	"Ctrl-B or cursor left, Ctrl-F or cursor right\r\n"
@@ -1990,6 +1990,11 @@ file_modified:		DS 1			; Flag that tells if a file is modified.
 cut_continue:		DS 1			; Flag to indicate that we want to continue cut/copy the next line and add to cut buffer.
 save_sp:		DS 3			; Saved stack pointer for error return.
 ; The default Edit buffer is in the space between the end of the program and the top of the MOS command space.
+current_fg:    	   	DS 1 	    	  	; Foreground colour.
+current_bg:    	   	DS 1 	    	  	; Background colour.
 default_buf:
+			; Initialization code can overlap with text buffer, no longer required
+			; after initialization.
+			include "scr_init.inc"
 default_buf_end:	EQU 0B8000h
 			

mos/more.bin

@@ -74,47 +74,27 @@ Print_String:		LD	A,(HL)
 		
 
 ; Set display to inverse video	
-Inverse_Video:		LD 	HL, c_INVVID
-			JR 	Print_CString
-
+Inverse_Video:	 	LD 	A, 17
+			RST.L	10h
+			LD	A, (current_bg)
+			RST.L   10h
+			LD 	A, 17
+			RST.L	10h
+			LD	A, (current_fg)
+			ADD	A, $80
+			RST.L   10h
+			RET
+			
 ; Set display to true video	
-True_Video:		LD 	HL, c_TRUEVID
-			JR 	Print_CString
-
-; Put VDU in 80 column mode, of not already there.
-Setup_Screen:		PUSH 	IX
-			LD 	HL, c_FIXSETTINGS
-			CALL	Print_CString		; Cancel text window control keys, page mode	
-			MOSCALL mos_sysvars
-			RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
-			LD 	HL, c_GETMODE
-			CALL	Print_CString  		; Get screen mode parameters.
-@@:			BIT	4, (IX+sysvar_vpd_pflags)			
-			JR 	Z, @B		        ; Wait until received.	
-			LD	A, (IX+sysvar_scrMode)
-			LD	(Saved_Mode),A
-			LD	A, (IX+sysvar_scrCols)
-			CP	80
-			JR	NC, Setup_End		; We have a mode with at least 80 columns, keep that.
-			LD	A, 22
-			RST.LIL 10h
-			LD	A, 3
-			RST.LIL 10h			; Enter Mode 3 (80x30)
-			LD	A,(IX+0)
-@@:			CP	(IX+0)
-			JR	Z, @B			; Wait for VBLANK
-Setup_End:		RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
-			LD 	HL, c_GETMODE
-			CALL	Print_CString  		; Get screen mode parameters.
-@@:			BIT	4, (IX+sysvar_vpd_pflags)			
-			JR 	Z, @B		        ; Wait until received.	
-			LD	A, (IX+sysvar_scrRows)
-			LD	(Current_Rows),A
-			LD	A, (IX+sysvar_scrCols)
-			LD	(Current_Cols),A
-			LD 	A, (IX+sysvar_scrMode)
-			LD      (Current_Mode),A
-			POP	IX
+True_Video:   	        LD 	A, 17
+			RST.L	10h
+			LD	A, (current_fg)
+			RST.L   10h
+			LD 	A, 17
+			RST.L	10h
+			LD	A, (current_bg)
+			ADD	A, $80
+			RST.L   10h
 			RET
 			
 ; Restore original video mode.
@@ -149,11 +129,12 @@ Clear_EOL:		PUSH 	IX
 			JR	Z, @B	; Wait for result.
 			LD	A, (Current_Cols)
 			LD	B, A	; Number of columns to B
-			LD	A, (Current_Rows)
-			DEC	A
-			CP	(IX+sysvar_cursorY)
-			JR	NZ, @F	; Are we on bottom row?
-			DEC	B	; Then only fill out up to last column, do not write a space there.
+			LD      A, (Current_Rows)
+			DEC     A
+                        CP      (IX+sysvar_cursorY)
+                        JR      NZ, @F  ; Are we on bottom row?
+                        DEC     B       ; Then only fill out up to last column, do not write a space there.
+	
 @@:			LD	A, (IX+sysvar_cursorX)
 			SUB	B
 			NEG	
@@ -167,14 +148,8 @@ Clear_EOL:		PUSH 	IX
 
 s_CRLF:			DB	13,10,0
 
-c_INVVID:		DB	4
-			DB 	17, 0 		; Forgeground black
-			DB	17, 143		; Background white
-c_TRUEVID:		DB	4
-			DB	17, 15		; Foreground white
-			DB	17, 128		; Background black
-c_FIXSETTINGS:		DB	6, 23,0,$98,0,15,26 ; Switch off control keys, cancel page mode, text window.
-c_ENABLECTRL:		DB	4, 23,0,$98,1       ; Switch on control keys    
+c_FIXSETTINGS:		DB	6, 23,0,$98,0,15,26 ; Switch off control keys, cancel page mode, text window
+c_ENABLECTRL:		DB	4, 23,0,$98,1       ; Switch on control keys
 c_GETMODE:  		DB	3, 23,0,vdp_mode		; Get screen mode parameters. Switch off paged mode, cancels text window.			
 ; RAM
 ; 

mos/nano.bin

@@ -0,0 +1,66 @@
+;
+; Title:	Screen initialization functions.
+; Author:	Lennart Benschop
+;
+; Created:      27/06/2024 Adapted to ez80asm
+
+
+; Put VDU in 80 column mode, if not already there.
+Setup_Screen:		PUSH 	IX
+			LD 	HL, c_FIXSETTINGS
+			CALL	Print_CString		; Cancel text window control keys, page mode	
+			MOSCALL mos_sysvars
+			RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
+			LD 	HL, c_GETMODE
+			CALL	Print_CString  		; Get screen mode parameters.
+@@:			BIT	4, (IX+sysvar_vpd_pflags)			
+			JR 	Z, @B		        ; Wait until received.	
+			LD	A, (IX+sysvar_scrMode)
+			LD	(Saved_Mode),A
+			LD	A, (IX+sysvar_scrCols)
+			CP	80
+			JR	NC, Setup_End		; We have a mode with at least 80 columns, keep that.
+			LD	A, 22
+			RST.LIL 10h
+			LD	A, 3
+			RST.LIL 10h			; Enter Mode 3 (80x30)
+			LD	A,(IX+0)
+@@:			CP	(IX+0)
+			JR	Z, @B			; Wait for VBLANK
+Setup_End:		RES 	4, (IX+sysvar_vpd_pflags)	; Clear mode flag
+			LD 	HL, c_GETMODE
+			CALL	Print_CString  		; Get screen mode parameters.
+@@:			BIT	4, (IX+sysvar_vpd_pflags)			
+			JR 	Z, @B		        ; Wait until received.	
+			LD	A, (IX+sysvar_scrRows)
+			LD	(Current_Rows),A
+			LD	A, (IX+sysvar_scrCols)
+			LD	(Current_Cols),A
+			LD 	A, (IX+sysvar_scrMode)
+			LD      (Current_Mode),A
+			LD 	A, 128	     ; Obtain foreground colour.
+			CALL	get_colour
+			LD	(current_fg),A
+			LD 	A, 129	     ; Obtain background colour.
+			CALL	get_colour
+			LD      (current_bg),A
+			POP	IX
+			RET
+			
+; Input A, index to get colour (128 = foreground, 129 = background).
+; output: A scolour index of fg or bg colour.
+get_colour:	    	RES     2,(IX+sysvar_vpd_pflags)
+			LD  	L, A
+			LD	A, 23
+			RST.L   10h
+			XOR	A
+			RST.L   10h
+			LD	A, 148
+			RST.L   10h
+			LD	A, L
+			RST.L   10h
+@@:			BIT	2, (IX+sysvar_vpd_pflags)			
+			JR 	Z, @B		        ; Wait until received.	
+			LD	A,(IX+sysvar_scrpixelIndex)
+			RET
+