Merge branch 'master' of git://cadel.mutabah.net/acess2

[tpg/acess2.git] / KernelLand / Kernel / drv / vterm_vt100.c

diff --git a/KernelLand/Kernel/drv/vterm_vt100.c b/KernelLand/Kernel/drv/vterm_vt100.c
index fb152a3..1f34479 100644 (file)
--- a/KernelLand/Kernel/drv/vterm_vt100.c
+++ b/KernelLand/Kernel/drv/vterm_vt100.c
@@ -158,7 +158,23 @@ void VT_int_ParseEscape_StandardLarge(tVTerm *Term, char CmdChar, int argc, int
                        Term->ViewPos += Term->TextWidth*tmp;
                }
                break;
-       
+       // Set Mode (?)
+       case 'h':
+               if( argc >= 1 )
+               {
+                       switch(args[0])
+                       {
+                       case 2: // Keyboard action mode
+                       case 4: // Insert mode
+                       case 12:        // Send/receive
+                       case 20:        // Automatic newline
+                               break;
+                       default:        // ?
+                               break;
+                       }
+               }
+               break;
+               
        // Set Font flags
        case 'm':
                for( ; argc--; )
@@ -188,6 +204,18 @@ void VT_int_ParseEscape_StandardLarge(tVTerm *Term, char CmdChar, int argc, int
                                Term->CurColour &= 0xFFFF8000;
                                Term->CurColour |= caVT100Colours[ colour_idx ];
                        }
+                       // Foreground Colour - bright
+                       else if(90 <= args[argc] && args[argc] <= 97 ) {
+                               colour_idx = args[argc]-90 + 8;
+                               Term->CurColour &= 0x8000FFFF;
+                               Term->CurColour |= (Uint32)caVT100Colours[ colour_idx ] << 16;
+                       }
+                       // Background Colour - bright
+                       else if(100 <= args[argc] && args[argc] <= 107 ) {
+                               colour_idx = args[argc]-100 + 8;
+                               Term->CurColour &= 0xFFFF8000;
+                               Term->CurColour |= (Uint32)caVT100Colours[ colour_idx ];
+                       }
                        else {
                                Log_Warning("VTerm", "Unknown font flag %i", args[argc]);
                        }
@@ -211,30 +239,55 @@ void VT_int_ParseEscape_StandardLarge(tVTerm *Term, char CmdChar, int argc, int
  * \fn int VT_int_ParseEscape(tVTerm *Term, const char *Buffer)
  * \brief Parses a VT100 Escape code
  */
-int VT_int_ParseEscape(tVTerm *Term, const char *Buffer)
+int VT_int_ParseEscape(tVTerm *Term, const char *Buffer, size_t Bytes)
 {
        char    c;
-        int    argc = 0, j = 1;
+        int    argc = 0, j = 0;
         int    args[6] = {0,0,0,0};
         int    bQuestionMark = 0;
+       const int       ofs = Term->EscapeCodeLen;
+       const int       sparespace = sizeof(Term->EscapeCodeCache)-Term->EscapeCodeLen;
+       const int       copysize = MIN(Bytes, sparespace);
+
+       memcpy( Term->EscapeCodeCache + Term->EscapeCodeLen, Buffer, copysize );
+       Term->EscapeCodeLen += copysize;
        
-       switch(Buffer[0])
+       Bytes = Term->EscapeCodeLen;
+       Buffer = Term->EscapeCodeCache;
+
+       if( Bytes == j )        return j-ofs;
+       c = Buffer[j++];
+       if(c != '\x1b') {
+               Term->EscapeCodeLen = 0;
+               return 0;
+       }
+
+       if( Bytes == j )        return j-ofs;
+       c = Buffer[j++];
+
+       switch(c)
        {
        //Large Code
        case '[':
                // Get Arguments
+               if(Bytes == j)  return j-ofs;
                c = Buffer[j++];
                if(c == '?') {
                        bQuestionMark = 1;
+                       if(Bytes == j)  return j-ofs;
                        c = Buffer[j++];
                }
                if( '0' <= c && c <= '9' )
                {
                        do {
-                               if(c == ';')    c = Buffer[j++];
+                               if(c == ';') {
+                                       if(Bytes == j)  return j-ofs;
+                                       c = Buffer[j++];
+                               }
                                while('0' <= c && c <= '9') {
                                        args[argc] *= 10;
                                        args[argc] += c-'0';
+                                       if(Bytes == j)  return j-ofs;
                                        c = Buffer[j++];
                                }
                                argc ++;
@@ -242,54 +295,70 @@ int VT_int_ParseEscape(tVTerm *Term, const char *Buffer)
                }
                
                // Get Command
-               if( ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
+               if( !('a' <= c && c <= 'z') && !('A' <= c && c <= 'Z') )
                {
-                       if( bQuestionMark )
+                       // Error - eat ESC only?
+                       // > j : Entire code skipped
+                       Term->EscapeCodeLen = 0;
+                       return j-ofs;
+               }
+               
+               if( bQuestionMark )
+               {
+                       switch(c)
                        {
-                               switch(c)
+                       // DEC Private Mode Set
+                       case 'h':
+                               if(argc != 1)   break;
+                               switch(args[0])
                                {
-                               // DEC Private Mode Set
-                               case 'h':
-                                       if(argc != 1)   break;
-                                       switch(args[0])
-                                       {
-                                       case 25:
-                                               Term->Flags &= ~VT_FLAG_HIDECSR;
-                                               break;
-                                       case 1047:
-                                               VT_int_ToggleAltBuffer(Term, 1);
-                                               break;
-                                       }
+                               case 25:
+                                       Term->Flags &= ~VT_FLAG_HIDECSR;
                                        break;
-                               case 'l':
-                                       if(argc != 1)   break;
-                                       switch(args[0])
-                                       {
-                                       case 25:
-                                               Term->Flags |= VT_FLAG_HIDECSR;
-                                               break;
-                                       case 1047:
-                                               VT_int_ToggleAltBuffer(Term, 0);
-                                               break;
-                                       }
+                               case 1047:
+                                       VT_int_ToggleAltBuffer(Term, 1);
+                                       break;
+                               }
+                               break;
+                       case 'l':
+                               if(argc != 1)   break;
+                               switch(args[0])
+                               {
+                               case 25:
+                                       Term->Flags |= VT_FLAG_HIDECSR;
                                        break;
-                               default:
-                                       Log_Warning("VTerm", "Unknown control sequence '\\x1B[?%c'", c);
+                               case 1047:
+                                       VT_int_ToggleAltBuffer(Term, 0);
                                        break;
                                }
+                               break;
+                       default:
+                               Log_Warning("VTerm", "Unknown control sequence '\\x1B[?%c'", c);
+                               break;
                        }
-                       else
-                       {
-                               VT_int_ParseEscape_StandardLarge(Term, c, argc, args);
-                       }
+               }
+               else
+               {
+                       VT_int_ParseEscape_StandardLarge(Term, c, argc, args);
                }
                break;
-               
+       case '\0':
+               // Ignore \0
+               break;
        default:
-               Log_Notice("VTerm", "TODO: Handle short escape codes");
+               //Log_Notice("VTerm", "TODO: Handle short escape codes");
+               {
+                       static volatile int tmp = 0;
+                       if(tmp == 0) {
+                               tmp = 1;
+                               Debug("VTerm: Unknown short 0x%x", c);
+                               tmp = 0;
+                       }
+               }
                break;
        }
        
        //Log_Debug("VTerm", "j = %i, Buffer = '%s'", j, Buffer);
-       return j;
+       Term->EscapeCodeLen = 0;
+       return j-ofs;
 }