updated emulationLayer to use WidgetLayer (not Widget, which is b0rked)

default.cpp is broken, because there is still no new widget (coming
soon...)

1 files changed, 9 insertions, 9 deletions

diff --git a/noncore/apps/opie-console/vt102emulation.cpp b/noncore/apps/opie-console/vt102emulation.cpp
index 2220f4e..7eecef3 100644
--- a/noncore/apps/opie-console/vt102emulation.cpp
+++ b/noncore/apps/opie-console/vt102emulation.cpp
@@ -56,25 +56,25 @@
 /*                                                                           */
 /*                       Constructor / Destructor                            */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 /*
    Nothing really intesting happens here.
 */
 
 /*!
 */
 
-Vt102Emulation::Vt102Emulation(Widget* gui) : EmulationLayer(gui)
+Vt102Emulation::Vt102Emulation(WidgetLayer* gui) : EmulationLayer(gui)
 {
   QObject::connect(gui,SIGNAL(mouseSignal(int,int,int)),
                    this,SLOT(onMouse(int,int,int)));
   initTokenizer();
   reset();
 }
 
 /*!
 */
 
 Vt102Emulation::~Vt102Emulation()
 {
@@ -340,25 +340,25 @@ void Vt102Emulation::tau( int token, int p, int q )
 
     case TY_CHR___(         ) : scr->ShowCharacter        (p         ); break; //UTF16
 
     //             127 DEL    : ignored on input
 
     case TY_CTL___('@'      ) : /* NUL: ignored                      */ break;
     case TY_CTL___('A'      ) : /* SOH: ignored                      */ break;
     case TY_CTL___('B'      ) : /* STX: ignored                      */ break;
     case TY_CTL___('C'      ) : /* ETX: ignored                      */ break;
     case TY_CTL___('D'      ) : /* EOT: ignored                      */ break;
     case TY_CTL___('E'      ) :      reportAnswerBack     (          ); break; //VT100
     case TY_CTL___('F'      ) : /* ACK: ignored                      */ break;
-    case TY_CTL___('G'      ) : gui->Bell                 (          ); break; //VT100
+    case TY_CTL___('G'      ) : gui->bell                 (          ); break; //VT100
     case TY_CTL___('H'      ) : scr->BackSpace            (          ); break; //VT100
     case TY_CTL___('I'      ) : scr->Tabulate             (          ); break; //VT100
     case TY_CTL___('J'      ) : scr->NewLine              (          ); break; //VT100
     case TY_CTL___('K'      ) : scr->NewLine              (          ); break; //VT100
     case TY_CTL___('L'      ) : scr->NewLine              (          ); break; //VT100
     case TY_CTL___('M'      ) : scr->Return               (          ); break; //VT100
 
     case TY_CTL___('N'      ) :      useCharset           (         1); break; //VT100
     case TY_CTL___('O'      ) :      useCharset           (         0); break; //VT100
 
     case TY_CTL___('P'      ) : /* DLE: ignored                      */ break;
     case TY_CTL___('Q'      ) : /* DC1: XON continue                 */ break; //VT100
@@ -728,29 +728,29 @@ void Vt102Emulation::onKeyPress( QKeyEvent* ev )
   int cmd; const char* txt; int len;
   if (keytrans->findEntry(ev->key(), encodeMode(MODE_NewLine  , BITS_NewLine   ) + // OLD,
                                      encodeMode(MODE_Ansi     , BITS_Ansi      ) + // OBSOLETE,
                                      encodeMode(MODE_AppCuKeys, BITS_AppCuKeys ) + // VT100 stuff
                                      encodeStat(ControlButton , BITS_Control   ) +
                                      encodeStat(ShiftButton   , BITS_Shift     ) +
                                      encodeStat(AltButton     , BITS_Alt       ),
                           &cmd, &txt, &len ))
 //printf("cmd: %d, %s, %d\n",cmd,txt,len);
     {
       switch(cmd) // ... and execute if found.
         {
-	case CMD_emitSelection  : gui->emitSelection();           return;
-	case CMD_scrollPageUp   : gui->doScroll(-gui->Lines()/2); return;
-	case CMD_scrollPageDown : gui->doScroll(+gui->Lines()/2); return;
-	case CMD_scrollLineUp   : gui->doScroll(-1             ); return;
-	case CMD_scrollLineDown : gui->doScroll(+1             ); return;
+	case CMD_emitSelection  : gui->insertSelection();         return;
+	case CMD_scrollPageUp   : gui->scroll(-gui->lines()/2); return;
+	case CMD_scrollPageDown : gui->scroll(+gui->lines()/2); return;
+	case CMD_scrollLineUp   : gui->scroll(-1             ); return;
+	case CMD_scrollLineDown : gui->scroll(+1             ); return;
 	case CMD_send           : sendString( txt );              return;
 	case CMD_prevSession    : emit prevSession();             return;
 	case CMD_nextSession    : emit nextSession();             return;
         }
     }
   // fall back handling
   if (!ev->text().isEmpty())
   {
     if (ev->state() & AltButton) sendString("\033"); // ESC, this is the ALT prefix
       /// very hacky
      if ((ev->state() & ControlButton) && (ev->text().upper().ascii()[0]=='A')) sendString("\01");
      else if ((ev->state() & ControlButton) && (ev->text().upper().ascii()[0]=='B')) sendString("\02");
@@ -915,44 +915,44 @@ void Vt102Emulation::resetModes()
   resetMode(MODE_AppScreen); saveMode(MODE_AppScreen);
   // here come obsolete modes
   resetMode(MODE_AppCuKeys); saveMode(MODE_AppCuKeys);
   resetMode(MODE_NewLine  );
     setMode(MODE_Ansi     );
 }
 
 void Vt102Emulation::setMode(int m)
 {
   currParm.mode[m] = TRUE;
   switch (m)
   {
-    case MODE_Mouse1000 : gui->setMouseMarks(FALSE);
+    case MODE_Mouse1000 : //gui->setMouseMarks(FALSE);
     break;
     case MODE_AppScreen : screen[1]->clearSelection();
                           screen[1]->clearEntireScreen();
                           setScreen(1);
     break;
   }
   if (m < MODES_SCREEN || m == MODE_NewLine)
   {
     screen[0]->setMode(m);
     screen[1]->setMode(m);
   }
 }
 
 void Vt102Emulation::resetMode(int m)
 {
   currParm.mode[m] = FALSE;
   switch (m)
   {
-    case MODE_Mouse1000 : gui->setMouseMarks(TRUE);
+    case MODE_Mouse1000 : //gui->setMouseMarks(TRUE);
     break;
     case MODE_AppScreen : screen[0]->clearSelection();
                           setScreen(0);
     break;
   }
   if (m < MODES_SCREEN || m == MODE_NewLine)
   {
     screen[0]->resetMode(m);
     screen[1]->resetMode(m);
   }
 }