commit 9518dd92b53ca2834c1d82e2fd8fa5aa4d2191f1
author Bugfix <mg@henning-ullrich.de> Wed Apr 09 00:13:36 2025 +0200
committer Zesstra <zesstra@zesstra.de> Sat Jun 28 12:32:06 2025 +0000
tree bba4dc77effcea0479ca5fa4f092a0ad6f408434
parent 49837f3c2ebcae0505f32e02bcd6ceedf065d3c9

Textuelle Marker fuer ls bei NO_ASCII

Change-Id: I4e23e5c39a42a3c8f5796c190bdb27753892b52b

std/shells/magier/fileview.c

diff --git a/std/shells/magier/fileview.c b/std/shells/magier/fileview.c
index a0bfa51..d5b4777 100644
--- a/std/shells/magier/fileview.c
+++ b/std/shells/magier/fileview.c
@@ -73,6 +73,14 @@
   // 0-Key ist der default, wenn ein Platzhalter nicht gefunden wird. Wird
   // z.B. fuer Ende-Tags benutzt.
   lstemplates.colormap[0]=ANSI_NORMAL;
+  // Variablen fuer Markierungszeichen bei P_NO_ASCII_ART
+  string obj = "";
+  string vc = "";
+  if(QueryProp(P_NO_ASCII_ART))
+  {
+    obj = "*";
+    vc = "+";
+  }
   // Template fuer die Ausgabe und die Defaults fuer die Farbplatzhalter je
   // nach Terminal einstellen.
   switch(QueryProp(P_TTY))
@@ -80,8 +88,11 @@
     case "vt100":
       lstemplates.templates[DIR] = "%^LS_DIR_START%^%s/%^LS_DIR_END%^";
       lstemplates.templates[DIR, 1] = 1;
-      lstemplates.templates[OBJ] = "%^LS_OBJ_START%^%s%^LS_OBJ_END%^";
-      lstemplates.templates[VC] = "%^LS_VC_START%^%s%^LS_VC_END%^";
+      lstemplates.templates[OBJ] =
+          "%^LS_OBJ_START%^%s" + obj + "%^LS_OBJ_END%^";
+      lstemplates.templates[OBJ, 1] = sizeof(obj);
+      lstemplates.templates[VC] = "%^LS_VC_START%^%s" + vc + "%^LS_VC_END%^";
+      lstemplates.templates[VC, 1] = sizeof(vc);
       lstemplates.colormap["LS_DIR_START"]=ANSI_BOLD;
       lstemplates.colormap["LS_OBJ_START"]=ANSI_INVERS;
       lstemplates.colormap["LS_VC_START"]=ANSI_INVERS;
@@ -90,9 +101,12 @@
       // spaeter den 0-Key in colormap
       break;
     case "ansi":
-      lstemplates.templates[DIR] = "%^LS_DIR_START%^%s%^LS_DIR_END%^";
-      lstemplates.templates[OBJ] = "%^LS_OBJ_START%^%s%^LS_OBJ_END%^";
-      lstemplates.templates[VC] = "%^LS_VC_START%^%s%^LS_VC_END%^";
+      lstemplates.templates[DIR] = "%^LS_DIR_START%^%s/%^LS_DIR_END%^";
+      lstemplates.templates[DIR, 1] = 1;
+      lstemplates.templates[OBJ] = "%^LS_OBJ_START%^%s" + obj + "%^LS_OBJ_END%^";
+      lstemplates.templates[OBJ, 1] = sizeof(obj);
+      lstemplates.templates[VC] = "%^LS_VC_START%^%s" + vc + "%^LS_VC_END%^";
+      lstemplates.templates[VC, 1] = sizeof(vc);
       lstemplates.colormap["LS_DIR_START"]=ANSI_BLUE+ANSI_BOLD;
       lstemplates.colormap["LS_OBJ_START"]=ANSI_RED;
       lstemplates.colormap["LS_VC_START"]=ANSI_PURPLE;