Change \2#0 -> \1#

Now when attribute codes can be different lengths, use that...

1 files changed, 18 insertions, 18 deletions

diff --git a/com32/modules/menumain.c b/com32/modules/menumain.c
index 5a2c137e..aafea2bb 100644
--- a/com32/modules/menumain.c
+++ b/com32/modules/menumain.c
@@ -195,25 +195,25 @@ draw_row(int y, int sel, int top, int sbtop, int sbbot)
 {
   int i = (y-4-VSHIFT)+top;
 
-  printf("\033[%d;%dH\2#01\016x\017%s ",
-	 y, MARGIN+1+HSHIFT, (i == sel) ? "\2#05" : "\2#03");
+  printf("\033[%d;%dH\1#1\016x\017%s ",
+	 y, MARGIN+1+HSHIFT, (i == sel) ? "\1#5" : "\1#3");
 
   if ( i >= nentries ) {
     fputs(pad_line("", 0, WIDTH-2*MARGIN-4), stdout);
   } else {
     display_entry(&menu_entries[i],
-		  (i == sel) ? "\2#05" : "\2#03",
-		  (i == sel) ? "\2#06" : "\2#04",
+		  (i == sel) ? "\1#5" : "\1#3",
+		  (i == sel) ? "\1#6" : "\1#4",
 		  WIDTH-2*MARGIN-4);
   }
 
   if ( nentries <= MENU_ROWS ) {
-    printf(" \2#01\016x\017");
+    printf(" \1#1\016x\017");
   } else if ( sbtop > 0 ) {
     if ( y >= sbtop && y <= sbbot )
-      printf(" \2#07\016a\017");
+      printf(" \1#7\016a\017");
     else
-      printf(" \2#01\016x\017");
+      printf(" \1#1\016x\017");
   } else {
     putchar(' ');		/* Don't modify the scrollbar */
   }
@@ -380,16 +380,16 @@ draw_menu(int sel, int top, int edit_line)
     sbtop += 4;  sbbot += 4;	/* Starting row of scrollbar */
   }
 
-  printf("\033[%d;%dH\2#01\016l", VSHIFT+1, HSHIFT+MARGIN+1);
+  printf("\033[%d;%dH\1#1\016l", VSHIFT+1, HSHIFT+MARGIN+1);
   for ( x = 2+HSHIFT ; x <= (WIDTH-2*MARGIN-1)+HSHIFT ; x++ )
     putchar('q');
 
-  printf("k\033[%d;%dH\2#01x\017\2#02 %s \2#01\016x",
+  printf("k\033[%d;%dH\1#1x\017\1#2 %s \1#1\016x",
 	 VSHIFT+2,
 	 HSHIFT+MARGIN+1,
 	 pad_line(messages[MSG_TITLE].msg, 1, WIDTH-2*MARGIN-4));
 
-  printf("\033[%d;%dH\2#01t", VSHIFT+3, HSHIFT+MARGIN+1);
+  printf("\033[%d;%dH\1#1t", VSHIFT+3, HSHIFT+MARGIN+1);
   for ( x = 2+HSHIFT ; x <= (WIDTH-2*MARGIN-1)+HSHIFT ; x++ )
     putchar('q');
   fputs("u\017", stdout);
@@ -397,7 +397,7 @@ draw_menu(int sel, int top, int edit_line)
   for ( y = 4+VSHIFT ; y < 4+VSHIFT+MENU_ROWS ; y++ )
     draw_row(y, sel, top, sbtop, sbbot);
 
-  printf("\033[%d;%dH\2#01\016m", y, HSHIFT+MARGIN+1);
+  printf("\033[%d;%dH\1#1\016m", y, HSHIFT+MARGIN+1);
   for ( x = 2+HSHIFT ; x <= (WIDTH-2*MARGIN-1)+HSHIFT ; x++ )
     putchar('q');
   fputs("j\017", stdout);
@@ -407,14 +407,14 @@ draw_menu(int sel, int top, int edit_line)
   else
     tabmsg = messages[MSG_NOTAB].msg;
 
-  printf("\2#08\033[%d;1H%s", TABMSG_ROW, pad_line(tabmsg, 1, WIDTH));
-  printf("\2#00\033[%d;1H", END_ROW);
+  printf("\1#8\033[%d;1H%s", TABMSG_ROW, pad_line(tabmsg, 1, WIDTH));
+  printf("\1#0\033[%d;1H", END_ROW);
 }
 
 static void
 clear_screen(void)
 {
-  fputs("\033e\033%@\033)0\033(B\2#00\033[?25l\033[2J", stdout);
+  fputs("\033e\033%@\033)0\033(B\1#0\033[?25l\033[2J", stdout);
 }
 
 static void
@@ -425,7 +425,7 @@ display_help(const char *text)
 
   if (!text) {
     text = "";
-    printf("\2#00\033[%d;1H", HELPMSG_ROW);
+    printf("\1#0\033[%d;1H", HELPMSG_ROW);
   } else {
     printf("\2#16\033[%d;1H", HELPMSG_ROW);
   }
@@ -477,7 +477,7 @@ edit_cmdline(char *input, int top)
 
     if ( redraw > 0 ) {
       /* Redraw the command line */
-      printf("\033[?25l\033[%d;1H\2#09> \2#10%s",
+      printf("\033[?25l\033[%d;1H\1#9> \2#10%s",
 	     CMDLINE_ROW, pad_line(cmdline, 0, prev_len));
       printf("\2#10\033[%d;3H%s\033[?25h",
 	     CMDLINE_ROW, pad_line(cmdline, 0, cursor));
@@ -711,7 +711,7 @@ run_menu(void)
     if ( key != KEY_NONE ) {
       timeout_left = key_timeout;
       if ( to_clear )
-	printf("\033[%d;1H\2#00\033[K", TIMEOUT_ROW);
+	printf("\033[%d;1H\1#0\033[K", TIMEOUT_ROW);
     }
 
     switch ( key ) {
@@ -815,7 +815,7 @@ run_menu(void)
 	  draw_menu(-1, top, 0);
 	} else {
 	  /* Erase [Tab] message and help text*/
-	  printf("\033[%d;1H\2#00\033[K", TABMSG_ROW);
+	  printf("\033[%d;1H\1#0\033[K", TABMSG_ROW);
 	  display_help(NULL);
 	}