diff options
Diffstat (limited to 'konsole/konsole/TEmuVt102.cpp')
-rw-r--r-- | konsole/konsole/TEmuVt102.cpp | 53 |
1 files changed, 28 insertions, 25 deletions
diff --git a/konsole/konsole/TEmuVt102.cpp b/konsole/konsole/TEmuVt102.cpp index e0efab745..1d303089d 100644 --- a/konsole/konsole/TEmuVt102.cpp +++ b/konsole/konsole/TEmuVt102.cpp @@ -81,10 +81,10 @@ TEmuVt102::TEmuVt102(TEWidget* gui) : TEmulation(gui) { //kdDebug(1211)<<"TEmuVt102 ctor() connecting"<<endl; - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); //kdDebug(1211)<<"TEmuVt102 ctor() initToken..."<<endl; initTokenizer(); //kdDebug(1211)<<"TEmuVt102 ctor() reset()"<<endl; @@ -100,16 +100,16 @@ void TEmuVt102::changeGUI(TEWidget* newgui) if (static_cast<TEWidget *>( gui )==newgui) return; if ( gui ) { - TQObject::disconnect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } TEmulation::changeGUI(newgui); - TQObject::connect(gui,TQT_SIGNAL(mouseSignal(int,int,int)), - this,TQT_SLOT(onMouse(int,int,int))); - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui,TQ_SIGNAL(mouseSignal(int,int,int)), + this,TQ_SLOT(onMouse(int,int,int))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } /*! @@ -172,7 +172,7 @@ void TEmuVt102::reset() // Tokens ------------------------------------------------------------------ -- /* - Since the tokens are the central notion if this section, we've put them + Since the tokens are the central notion in this section, we've put them in front. They provide the syntactical elements used to represent the terminals operations as byte sequences. @@ -267,7 +267,7 @@ void TEmuVt102::initTokenizer() for(i = 0; i < 256; i++) tbl[ i] = 0; for(i = 0; i < 32; i++) tbl[ i] |= CTL; for(i = 32; i < 256; i++) tbl[ i] |= CHR; - for(s = (UINT8*)"@ABCDGHILMPSTXZcdfry"; *s; s++) tbl[*s] |= CPN; + for(s = (UINT8*)"@ABCDEFGHILMPSTXZbcdfry"; *s; s++) tbl[*s] |= CPN; // resize = \e[8;<row>;<col>t for(s = (UINT8*)"t"; *s; s++) tbl[*s] |= CPS; for(s = (UINT8*)"0123456789" ; *s; s++) tbl[*s] |= DIG; @@ -621,6 +621,8 @@ switch( N ) case TY_CSI_PN('B' ) : scr->cursorDown (p ); break; //VT100 case TY_CSI_PN('C' ) : scr->cursorRight (p ); break; //VT100 case TY_CSI_PN('D' ) : scr->cursorLeft (p ); break; //VT100 + case TY_CSI_PN('E' ) : scr->cursorNextLine (p ); break; //VT100 + case TY_CSI_PN('F' ) : scr->cursorPrevLine (p ); break; //VT100 case TY_CSI_PN('G' ) : scr->setCursorX (p ); break; //LINUX case TY_CSI_PN('H' ) : scr->setCursorYX (p, q); break; //VT100 case TY_CSI_PN('I' ) : scr->Tabulate (p ); break; @@ -631,6 +633,7 @@ switch( N ) case TY_CSI_PN('T' ) : scr->scrollDown (p ); break; case TY_CSI_PN('X' ) : scr->eraseChars (p ); break; case TY_CSI_PN('Z' ) : scr->backTabulate (p ); break; + case TY_CSI_PN('b' ) : scr->repeatChars (p ); break; case TY_CSI_PN('c' ) : reportTerminalType ( ); break; //VT100 case TY_CSI_PN('d' ) : scr->setCursorY (p ); break; //LINUX case TY_CSI_PN('f' ) : scr->setCursorYX (p, q); break; //VT100 @@ -964,17 +967,17 @@ void TEmuVt102::doKeyPress( TQKeyEvent* ev ) { switch(ev->key()) { - case Qt::Key_Down : gui->doScroll(+1); return; - case Qt::Key_Up : gui->doScroll(-1); return; - case Qt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; - case Qt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; + case TQt::Key_Down : gui->doScroll(+1); return; + case TQt::Key_Up : gui->doScroll(-1); return; + case TQt::Key_PageUp : gui->doScroll(-gui->Lines()/2); return; + case TQt::Key_PageDown : gui->doScroll(gui->Lines()/2); return; } } // revert to non-history when typing if (scr->getHistCursor() != scr->getHistLines() && (!ev->text().isEmpty() - || ev->key()==Qt::Key_Down || ev->key()==Qt::Key_Up || ev->key()==Qt::Key_Left || ev->key()==Qt::Key_Right - || ev->key()==Qt::Key_PageUp || ev->key()==Qt::Key_PageDown)) + || ev->key()==TQt::Key_Down || ev->key()==TQt::Key_Up || ev->key()==TQt::Key_Left || ev->key()==TQt::Key_Right + || ev->key()==TQt::Key_PageUp || ev->key()==TQt::Key_PageDown)) scr->setHistCursor(scr->getHistLines()); if (cmd==CMD_send) @@ -1201,8 +1204,8 @@ void TEmuVt102::setConnect(bool c) TEmulation::setConnect(c); if (gui) { - TQObject::disconnect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::disconnect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } if (c) { // refresh mouse mode @@ -1216,8 +1219,8 @@ void TEmuVt102::setConnect(bool c) else scrolllock_set_off(); #endif - TQObject::connect(gui, TQT_SIGNAL(sendStringToEmu(const char*)), - this, TQT_SLOT(sendString(const char*))); + TQObject::connect(gui, TQ_SIGNAL(sendStringToEmu(const char*)), + this, TQ_SLOT(sendString(const char*))); } } @@ -1228,7 +1231,7 @@ char TEmuVt102::getErase() int len; bool metaspecified; - if (keytrans->findEntry(Qt::Key_Backspace, 0, &cmd, &txt, &len, + if (keytrans->findEntry(TQt::Key_Backspace, 0, &cmd, &txt, &len, &metaspecified) && (cmd==CMD_send) && (len == 1)) return txt[0]; |