From 1eaee6671caa22b85cdd845778be366fe490eebc Mon Sep 17 00:00:00 2001
From: Lars Doelle <lars.doelle@on-line.de>
Date: Wed, 26 Jan 2000 22:07:46 +0000
Subject: [PATCH] adjustments

svn path=/trunk/kdebase/konsole/; revision=39315
---
 src/TEmuVt102.C | 50 ++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/TEmuVt102.C b/src/TEmuVt102.C
index 7d76766f6..e24cb0d04 100644
--- a/src/TEmuVt102.C
+++ b/src/TEmuVt102.C
@@ -191,7 +191,7 @@ void VT102Emulation::tau( int code, int p, int q )
   switch (code)
   {
 
-    case TY_CHR___(         ) : scr->ShowCharacter        (p         ); break; //UTF16
+    case TY_CHR___(         ) :      ShowCharacter        (p         ); break; //UTF16
 
     //FIXME:       127 DEL    : ignored on input?
 
@@ -221,9 +221,9 @@ void VT102Emulation::tau( int code, int p, int q )
     case TY_CTL___(CNTL('U')) : /* NAK: ignored                      */ break;
     case TY_CTL___(CNTL('V')) : /* SYN: ignored                      */ break;
     case TY_CTL___(CNTL('W')) : /* ETB: ignored                      */ break;
-    case TY_CTL___(CNTL('X')) : scr->ShowCharacter        (    0x2592); break; //VT100
+    case TY_CTL___(CNTL('X')) :      ShowCharacter        (    0x2592); break; //VT100
     case TY_CTL___(CNTL('Y')) : /* EM : ignored                      */ break;
-    case TY_CTL___(CNTL('Z')) : scr->ShowCharacter        (    0x2592); break; //VT100
+    case TY_CTL___(CNTL('Z')) :      ShowCharacter        (    0x2592); break; //VT100
     case TY_CTL___(CNTL('[')) : /* ESC: cannot be seen here.         */ break;
     case TY_CTL___(CNTL('\\')): /* FS : ignored                      */ break;
     case TY_CTL___(CNTL(']')) : /* GS : ignored                      */ break;
@@ -464,11 +464,9 @@ void VT102Emulation::tau( int code, int p, int q )
    to control codes and individual utf-16 characters.
 
    This is complicated by VT100 charmaps, which do their
-   own encodings. These VT100 charmaps are responsible
-   for some line drawing graphical glyphs.
+   own encodings.
 
-   Translation is a layered into the emulation, but
-   treated by the protocol like a screen mode.
+   FIXME: we have to put things a little more straight, here.
 */
 
 #define CHARSET charset[scr==screen[1]]
@@ -553,6 +551,17 @@ unsigned short VT102Emulation::applyCharmap(unsigned short c)
   return c;
 }
 
+/*
+   Show Character using current character map.
+   The screen knows only unicode characters
+   and no translations.
+*/
+
+void VT102Emulation::ShowCharacter(int c)
+{
+  scr->ShowCharacter(applyCharmap(c));
+}
+
 // First Level Translation (Bytes -> Unicode)
 
 /* We are doing code conversion first before scanning for controls.
@@ -662,21 +671,20 @@ void VT102Emulation::processCharacter(int cc)
   int  n = argc;
   if (getMode(MODE_Ansi))
   {
-    if (lec(1,0,ESC)) {                                                  return; }
-    if (les(2,1,GRP)) {                                                  return; }
-    if (Xte         ) { XtermHack();                            reset(); return; }
-    if (Xpe         ) {                                                  return; }
-    if (lec(3,2,'?')) {                                                  return; }
-    if (lec(3,2,'>')) {                                                  return; }
-    if (lun(       )) { tau( TY_CHR___(), applyCharmap(cc), 0); reset(); return; }
-  
-    if (lec(2,0,ESC)) { tau( TY_ESC___(s[1]     ),  0,   0);    reset(); return; }
-    if (les(3,1,SCS)) { tau( TY_ESC_CS(s[1],s[2]),  0,   0);    reset(); return; }
-    if (lec(3,1,'#')) { tau( TY_ESC_DE(s[2]     ),  0,   0);    reset(); return; }
+    if (lec(1,0,ESC)) {                                                 return; }
+    if (les(2,1,GRP)) {                                                 return; }
+    if (Xte         ) { XtermHack();                           reset(); return; }
+    if (Xpe         ) {                                                 return; }
+    if (lec(3,2,'?')) {                                                 return; }
+    if (lec(3,2,'>')) {                                                 return; }
+    if (lun(       )) { tau( TY_CHR___(         ),   cc,   0); reset(); return; }
+    if (lec(2,0,ESC)) { tau( TY_ESC___(s[1]     ),    0,   0); reset(); return; }
+    if (les(3,1,SCS)) { tau( TY_ESC_CS(s[1],s[2]),    0,   0); reset(); return; }
+    if (lec(3,1,'#')) { tau( TY_ESC_DE(s[2]     ),    0,   0); reset(); return; }
 //  if (egt(       )) { tau( TY_CSI_PG(cc       ),  '>',   0); reset(); return; }
-    if (eps(    CPN)) { tau( TY_CSI_PN(cc       ),  a[0],a[1]); reset(); return; }
-    if (ees(    DIG)) { Dig                                              return; }
-    if (eec(    ';')) { Arg                                              return; }
+    if (eps(    CPN)) { tau( TY_CSI_PN(cc       ), a[0],a[1]); reset(); return; }
+    if (ees(    DIG)) { Dig                                             return; }
+    if (eec(    ';')) { Arg                                             return; }
     for (i=0;i<=n;i++)
     if (epp(       ))   tau( TY_CSI_PR(cc,a[i]),    0,   0);          else
                         tau( TY_CSI_PS(cc,a[i]),    0,   0);