Recompiled with AghDev 2.0.x; case insensitive sorting/compare; no path on commandline (com files can execute with zinc); clear some messages after they are done

Author: lennart-benschop

Makefile

@@ -42,3 +42,6 @@ bin/mc.bin: mc/launcher.bin mc/mc.asm
 
 mc/launcher.bin: mc/launcher.asm mos_api.inc
 	cd mc;$(ASM) launcher.asm
+
+clean:
+	cd mc;make clean;cd ../recode;make clean;cd ../loadfont;make clean;cd ..; rm -f bin/*.ovl bin/*.bin mos/*.bin

bin/12amc.hlp

@@ -1,7 +1,7 @@
 12AM COMMANDER
 
 A Midnight Commander look-alike for Agon Light.
-v0.02 (c) 2024 L.C. Benschop.
+v0.03 (c) 2024 L.C. Benschop.
 
 Keys used:
 

bin/12amc.ovl

@@ -35,7 +35,7 @@ static int entry_compare(const void *a, const void *b)
   const dirinfo_t *e1 = a;
   const dirinfo_t *e2 = b;
   if (e1->is_dir == e2->is_dir) {
-    return strcmp(e1->name,e2->name);
+    return my_strcasecmp(e1->name,e2->name);
   }
   else if (e1->is_dir) {
     return -1;
@@ -169,7 +169,7 @@ void dirlist_show(uint8_t which, struct dirlist *dir)
     for (row = 0; row<dirwin_height; row++) {
       if (idx >= dir->n_entries)
 	break;
-      vdp_cursor_tab(row,0);
+      vdp_cursor_tab(0,row);
       dirlist_show_entry(&dir->entries[idx], row == (dir->sel_idx - dir->top_idx));
       idx++;
     }      
@@ -188,7 +188,7 @@ void dirlist_move_cursor(uint8_t which, struct dirlist *dir, int direction)
     return;
   }
   old_row = dir->sel_idx - dir->top_idx;
-  vdp_cursor_tab(old_row,0);
+  vdp_cursor_tab(0,old_row);
   dirlist_show_entry(&dir->entries[dir->sel_idx], false);
   new_idx = (signed)dir->sel_idx + direction;
   if (new_idx < 0) {
@@ -206,7 +206,7 @@ void dirlist_move_cursor(uint8_t which, struct dirlist *dir, int direction)
     }
     dirlist_show(which,dir);
   } else {
-    vdp_cursor_tab(new_row,0);
+    vdp_cursor_tab(0,new_row);
     dirlist_show_entry(&dir->entries[dir->sel_idx], true);    
     display_curfile(which,dir->entries[dir->sel_idx].name);
   }

bin/loadfont.bin

@@ -139,7 +139,7 @@ void display_frame(void)
   vdp_move_to(scr_cols*font_width/2+font_width-1,font_height+4);
   vdp_line_to(scr_cols*font_width/2+font_width-1,font_height*(4+dirwin_height)+4);
 
-  vdp_cursor_tab(scr_rows-1,0);
+  vdp_cursor_tab(0,scr_rows-1);
   for (i=0;i<10;i++ ) {
     display_setattr(false,true);
     printf("%2d",i+1);
@@ -183,7 +183,7 @@ void display_setwin(uint8_t w)
 void display_curdir(uint8_t which, char *s, bool hilight)
 {
   putch(26);
-  vdp_cursor_tab(0,(scr_cols/2)*(which-1)+1);
+  vdp_cursor_tab((scr_cols/2)*(which-1)+1,0);
   display_setattr(hilight,false);
   printf("%-38.38s",s);
   display_setattr(false,false);
@@ -195,7 +195,7 @@ void display_curdir(uint8_t which, char *s, bool hilight)
 void display_curfile(uint8_t which, char *s)
 {
   putch(26);
-  vdp_cursor_tab(dirwin_height+3,(scr_cols/2)*(which-1)+1);
+  vdp_cursor_tab((scr_cols/2)*(which-1)+1,dirwin_height+3);
   display_setattr(false,false);
   printf("%-38.38s",s);
 }

bin/recode.bin

@@ -1,6 +1,8 @@
 /* 12AM COmmander, a Midnight Commander Lookalike for Agon Light.
    11/05/2024
    23/06/2024: added mode/font/video mode config
+   21/07/2024: do case-insensitive compare. do not add path to filename in
+               commands.
  */
 #include <stdio.h>
 #include <string.h>
@@ -13,6 +15,19 @@
 #include "mc.h"
 
 
+int my_strcasecmp(char *p,char *q)
+{
+  char c1,c2;
+  for(;;) {
+    c1 = *p++;
+    c2 = *q++;
+    if (c1 >= 'a' && c1 <= 'z') c1-=0x20; 
+    if (c2 >= 'a' && c2 <= 'z') c2-=0x20;
+    if (c1 != c2) return c1-c2;
+    if ((c1 | c2 ) == 0) return 0;
+ }
+}
+
 char dirname_left[256];
 char dirname_right[256];
 struct dirlist * dirlist_left;
@@ -94,11 +109,15 @@ void execute_command(char *cmdline,bool fWait)
 char cmdbuf[256];
 char pathbuf[256];
 
-void set_pathbuf(void)
+void set_pathbuf(bool fFullPath)
 {
-  strcpy(pathbuf,which_dir==1?dirname_left:dirname_right);
-  if (strcmp(pathbuf,"/")!=0) {
-    strcat(pathbuf,"/");
+  if (fFullPath) {
+    strcpy(pathbuf,which_dir==1?dirname_left:dirname_right);
+    if (strcmp(pathbuf,"/")!=0) {
+      strcat(pathbuf,"/");
+    }
+  } else {
+    pathbuf[0]=0;
   }
   strcat(pathbuf,dirlist_get_name(which_dir==1?dirlist_left:dirlist_right));
 }
@@ -183,7 +202,6 @@ char * scan_word(char*dest, char *src)
   return p;     
 }
 
-
 /* Replacement for fgets as the one in AgDev appears to be broken,
    does not detect EOF on real machine */
 static char * my_fgets(char *s, unsigned int maxlen, FILE *f)
@@ -215,12 +233,12 @@ void read_cfg_file(void)
       cmdbuf[strlen(cmdbuf)-1] = 0; /* Get rid of trailing newline */
       p = cmdbuf;
       p = scan_word(pathbuf,p);
-      if (strcmp(pathbuf,"view") == 0) {
+      if (my_strcasecmp(pathbuf,"view") == 0) {
 	strcpy(viewer_cmd,p);
-      } else if (strcmp(pathbuf,"edit") == 0) {
+      } else if (my_strcasecmp(pathbuf,"edit") == 0) {
 	strcpy(editor_cmd,p);
-      } else if (strcmp(pathbuf,"exec") == 0 || strcmp(pathbuf,"execp") == 0) {
-	do_pause = strcmp(pathbuf,"execp") == 0;
+      } else if (my_strcasecmp(pathbuf,"exec") == 0 || my_strcasecmp(pathbuf,"execp") == 0) {
+	do_pause = my_strcasecmp(pathbuf,"execp") == 0;
 	p = scan_word(pathbuf,p);
 	while (*p++==' ')
 	  ;
@@ -232,9 +250,9 @@ void read_cfg_file(void)
 
 	  n_extensions++;
 	}
-      } else if (strcmp(pathbuf,"mode") == 0) {
+      } else if (my_strcasecmp(pathbuf,"mode") == 0) {
 	video_mode = strtol(p,&p,10);
-      } else if (strcmp(pathbuf,"font") == 0) {
+      } else if (my_strcasecmp(pathbuf,"font") == 0) {
 	while (*p++ == ' ')
 	  ;
 	p--;
@@ -243,7 +261,7 @@ void read_cfg_file(void)
 	}else {
 	  font_nr = strtol(p,&p,10);
 	}
-      } else if (strcmp(pathbuf,"color") == 0 || strcmp(pathbuf,"colour") == 0) {
+      } else if (my_strcasecmp(pathbuf,"color") == 0 || my_strcasecmp(pathbuf,"colour") == 0) {
 	fgcol = strtol(p,&p,10);
 	bgcol = strtol(p,&p,10);
 	hlcol = strtol(p,&p,10);
@@ -335,8 +353,9 @@ main(int argc, char *argv[])
 		  which_dir==1?dirname_left:dirname_right);
       } else {
 	mos_cd(which_dir==1?dirname_left:dirname_right);
-	set_pathbuf();
+	set_pathbuf(false);
 	if (has_ext(pathbuf,"bin")) {
+	  set_pathbuf(true);
 	  execute_command(pathbuf,false);
 	} else {
 	  unsigned int i;
@@ -362,12 +381,14 @@ main(int argc, char *argv[])
       execute_command(cmdbuf,true);
       break;
     case 161: /* F3 view */
-      set_pathbuf();
+      set_pathbuf(false);
+      mos_cd(which_dir==1?dirname_left:dirname_right);
       sprintf(cmdbuf,viewer_cmd,pathbuf);
       execute_command(cmdbuf,false);
       break;
     case 162: /* F4 Edit */
-      set_pathbuf();
+      set_pathbuf(false);
+      mos_cd(which_dir==1?dirname_left:dirname_right);
       sprintf(cmdbuf,editor_cmd,pathbuf);
       execute_command(cmdbuf,false);
       break;
@@ -384,10 +405,12 @@ main(int argc, char *argv[])
 	  vdp_cursor_enable(true);
 	  mos_editline(pathbuf,256,true);
 	  vdp_cursor_enable(false);
+	  putch(12);
 	  mos_copy(cmdbuf,pathbuf);
 	} else {
 	  printf("Copy %d selected files to %s? (Y/N)\n",n_selected,which_dir==1?dirname_right:dirname_left);
 	  ch = getch();
+	  putch(12);
 	  if (ch=='y' || ch=='Y') {
 	    nm = dirlist_first_selected(which_dir==1?dirlist_left:dirlist_right);
 	    while (nm != NULL) {	      
@@ -416,10 +439,12 @@ main(int argc, char *argv[])
 	  vdp_cursor_enable(true);
 	  mos_editline(pathbuf,256,true);
 	  vdp_cursor_enable(false);
+	  putch(12);
 	  mos_ren(cmdbuf,pathbuf);
 	} else {
 	  printf("Move %d selected files to %s? (Y/N)\n",n_selected,which_dir==1?dirname_right:dirname_left);
 	  ch = getch();
+	  putch(12);
 	  if (ch=='y' || ch=='Y') {
 	    nm = dirlist_first_selected(which_dir==1?dirlist_left:dirlist_right);
 	    while (nm != NULL) {	      
@@ -443,6 +468,7 @@ main(int argc, char *argv[])
       vdp_cursor_enable(true);
       mos_editline(cmdbuf,256,true);
       vdp_cursor_enable(false);
+      putch(12);
       mos_mkdir(cmdbuf);
       cmd_reload_dir();
       break;
@@ -457,12 +483,14 @@ main(int argc, char *argv[])
 	  strcpy(cmdbuf,dirlist_get_name(which_dir==1?dirlist_left:dirlist_right));
 	  printf("Delete file: %s? (Y/N)\n",cmdbuf);
 	  ch = getch();
+	  putch(12);
 	  if (ch=='y' || ch=='Y') {
 	    mos_del(cmdbuf);
 	  }
 	} else {
 	  printf("Delete %d selected files? (Y/N)\n",n_selected);
 	  ch = getch();
+	  putch(12);
 	  if (ch=='y' || ch=='Y') {
 	    nm = dirlist_first_selected(which_dir==1?dirlist_left:dirlist_right);
 	    while (nm != NULL) {
@@ -503,6 +531,7 @@ main(int argc, char *argv[])
 	vdp_cursor_enable(true);
 	mos_editline(cmdbuf,256,true);
 	vdp_cursor_enable(false);
+	putch(12);
 	dirlist_select_pattern(which_dir,which_dir==1?dirlist_left:dirlist_right,cmdbuf);	
 	break;
       case '\\':
@@ -513,6 +542,7 @@ main(int argc, char *argv[])
 	vdp_cursor_enable(true);
 	mos_editline(cmdbuf,256,true);
 	vdp_cursor_enable(false);
+	putch(12);
 	dirlist_deselect_pattern(which_dir,which_dir==1?dirlist_left:dirlist_right,cmdbuf);	
 	break;
       case 12: /* Ctrl-L, reload directories */

mc/src/dirlist.c

@@ -19,6 +19,11 @@ extern uint8_t fgcol; /* Foreground colour */
 extern uint8_t bgcol;  /* Background colour */
 extern uint8_t hlcol; /* Hilite colour */
 
+
+/* Replancement for strcasecmp */
+int my_strcasecmp(char *p,char *q);
+
+
 /* Number of bytes fitting into a single directory window*/
 extern uint8_t dirwin_height;