Changeset 3957Tweet

Timestamp:

Nov 19, 2009, 2:31:37 PM (11 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Implemented \33M ANSI command (scroll up), less now works flawlessly while hitting up arrow

File:

• neercs/trunk/src/term.c (modified) (8 diffs)

neercs/trunk/src/term.c

@@ -181 +181 @@
             skip += 1;
         }
-
+        /* Reverse Index (RI) go up one line, reverse scroll if necessary */
+        else if(buffer[i] == '\033' && buffer[i + 1] == 'M')
+        {
+            /* FIXME : not sure about the meaning of 'go up one line' and 
+             * 'if necessary' words. Implemented as a scroller only. */
+            for(j = height; j > 0; j--)
+            {
+                for(k = 0; k < width; k++)
+                {
+                        caca_put_char(sc->cv, k, j, caca_get_char(sc->cv, k, j-1));
+                        caca_put_attr(sc->cv, k, j, caca_get_attr(sc->cv, k, j-1));
+                }
+            }
+            caca_draw_line(sc->cv, 0, 0, width, 0, ' ');
+            skip += 1;
+        }
+        
         /* Single Shift Select of G3 Character Set (SS2: 0x8f):
          * affects next character only */
@@ -387 +403 @@
             switch(buffer[i + final])
             {
-            case 'H': /* CUP (0x48) - Cursor Position */
-                x = (argc > 1 && argv[1] > 0) ? argv[1] - 1 : 0;
-                y = (argc > 0 && argv[0] > 0) ? argv[0] - 1 : 0;
-                break;
             case 'A': /* CUU (0x41) - Cursor Up */
                 y -= argc ? argv[0] : 1;
@@ -400 +412 @@
                 break;
             case 'C': /* CUF (0x43) - Cursor Right */
-                    debug("Cursor right %d\n", argc);
                 x += argc ? argv[0] : 1;
                 break;
@@ -411 +422 @@
                 x = (argc && argv[0] > 0) ? argv[0] - 1 : 0;
                 break;
+            case 'H': /* CUP (0x48) - Cursor Position */
+                x = (argc > 1 && argv[1] > 0) ? argv[1] - 1 : 0;
+                y = (argc > 0 && argv[0] > 0) ? argv[0] - 1 : 0;
+                break;
             case 'J': /* ED (0x4a) - Erase In Page */
                 savedattr = caca_get_attr(sc->cv, -1, -1);
@@ -432 +447 @@
                 break;
             case 'K': /* EL (0x4b) - Erase In Line */
-                if(!argc || argv[0] == 0)
+                if(!argc || argv[0] == 0) 
+                {
                     caca_draw_line(sc->cv, x, y, width, y, ' ');
+                }
                 else if(argv[0] == 1)
+                {
                     caca_draw_line(sc->cv, 0, y, x, y, ' ');
+                }
                 else if(argv[0] == 2)
+                {
                     if((unsigned int)x < width)
                         caca_draw_line(sc->cv, x, y, width - 1, y, ' ');
+                }
                 //x = width;
                 break;
@@ -459 +480 @@
                 if(!argc || argv[0] == 0)
                     argv[0] = 1; /* echo -ne 'foobar\r\e[0P\n' */ 
-                    /* Jylam : Start from x, not 0 */
+                /* Jylam : Start from x, not 0 */
                 for(j = x; (unsigned int)(j + argv[0]) < width; j++)
                 {
@@ -576 +597 @@
             size_t bytes;
 
-            if(i + 6 < size)
+            if(i + 6 < size) {
                 ch = caca_utf8_to_utf32((char const *)(buffer + i), &bytes);
-            else
+            } else
             {
                 /* Add a trailing zero to what we're going to read */
@@ -613 +634 @@
 
             wch = caca_utf32_is_fullwidth(ch) ? 2 : 1;
+            
             skip += bytes - 1;
         }