Changes - SailfishOS Open Build Service

Changes of Revision 16

[-] [+]	Changed	_service:tar_git:fingerterm.spec
@@ -1,5 +1,5 @@ Name: fingerterm -Version: 1.1.16+urjaman.keyboard.improvements.20151001003232.5.ge32ad32 +Version: 1.1.16 Release: 1 Summary: A terminal emulator with a custom virtual keyboard Group: System/Base
[-] [+]	Changed	_service ^
@@ -1,7 +1,7 @@ <services><service name="tar_git"> <param name="url">https://github.com/kimmoli/fingerterm</param> - <param name="branch">urjaman-keyboard-improvements</param> - <param name="revision">e32ad324415bd3579ab56f2bd26ed30811674691</param> + <param name="branch">master</param> + <param name="revision">bdb2b7b41db874ee0ba59a9a9bfc3d302205adfe</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
[-] [+]	Changed	_service:tar_git:fingerterm-1.1.16.tar.gz/qml/Main.qml ^
@@ -28,7 +28,7 @@ focus: true Keys.onPressed: { - term.keyPress(event.key,event.modifiers,event.text); + window.vkbKeypress(event.key,event.modifiers); } property string windowTitle: util.currentWindowTitle(); @@ -359,7 +359,7 @@ function vkbKeypress(key,modifiers) { wakeVKB(); - term.keyPress(key,modifiers,""); + term.keyPress(key,modifiers); } function wakeVKB()
[-] [+]	Changed	_service:tar_git:fingerterm-1.1.16.tar.gz/terminal.cpp ^
@@ -174,21 +174,19 @@ iPtyIFace->writeTerm(str); } -void Terminal::keyPress(int key, int modifiers, QString text) +void Terminal::keyPress(int key, int modifiers) { QChar c(key); resetBackBufferScrollPos(); - if ((!text.isEmpty()) && (text[0].unicode() == 0)) text.clear(); - if (c.isLetter()) { c = ((modifiers & Qt::ShiftModifier) != 0) ? c.toUpper() : c.toLower(); } QString toWrite; - if ((key <= 0xFF) \|\| (!text.isEmpty())) { + if (key <= 0xFF) { if((modifiers & Qt::AltModifier) != 0) { toWrite.append(ch_ESC); } @@ -206,11 +204,7 @@ qWarning() << "Ctrl+" << c << " does not translate into a control code"; } } else { - if (text.isEmpty()) { - toWrite.append(c); - } else { - toWrite.append(text); - } + toWrite.append(c); } if (iPtyIFace) { @@ -219,111 +213,18 @@ return; } - int modcode = (modifiers & Qt::ShiftModifier ? 1 : 0) \| - (modifiers & Qt::AltModifier ? 2 : 0) \| - (modifiers & Qt::ControlModifier ? 4 : 0); - - if (modcode == 0) { - char cursorModif='['; - if(iAppCursorKeys) - cursorModif = 'O'; - - if( key==Qt::Key_Up ) - toWrite += QString("%1%2A").arg(ch_ESC).arg(cursorModif).toLatin1(); - if( key==Qt::Key_Down ) - toWrite += QString("%1%2B").arg(ch_ESC).arg(cursorModif).toLatin1(); - if( key==Qt::Key_Right ) - toWrite += QString("%1%2C").arg(ch_ESC).arg(cursorModif).toLatin1(); - if( key==Qt::Key_Left ) - toWrite += QString("%1%2D").arg(ch_ESC).arg(cursorModif).toLatin1(); - if( key==Qt::Key_PageUp ) - toWrite += QString("%1[5~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_PageDown ) - toWrite += QString("%1[6~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_Home ) - toWrite += QString("%1OH").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_End ) - toWrite += QString("%1OF").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_Insert ) - toWrite += QString("%1[2~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_Delete ) - toWrite += QString("%1[3~").arg(ch_ESC).toLatin1(); - - if( key==Qt::Key_F1 ) - toWrite += QString("%1OP").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F2 ) - toWrite += QString("%1OQ").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F3 ) - toWrite += QString("%1OR").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F4 ) - toWrite += QString("%1OS").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F5 ) - toWrite += QString("%1[15~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F6 ) - toWrite += QString("%1[17~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F7 ) - toWrite += QString("%1[18~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F8 ) - toWrite += QString("%1[19~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F9 ) - toWrite += QString("%1[20~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F10 ) - toWrite += QString("%1[21~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F11 ) - toWrite += QString("%1[23~").arg(ch_ESC).toLatin1(); - if( key==Qt::Key_F12 ) - toWrite += QString("%1[24~").arg(ch_ESC).toLatin1(); - - } else { - char modChar = '1' + modcode; - - if( key==Qt::Key_Up ) - toWrite += QString("%1[1;%2A").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Down ) - toWrite += QString("%1[1;%2B").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Right ) - toWrite += QString("%1[1;%2C").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Left ) - toWrite += QString("%1[1;%2D").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_PageUp ) - toWrite += QString("%1[5;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_PageDown ) - toWrite += QString("%1[6;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Home ) - toWrite += QString("%1[1;%2H").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_End ) - toWrite += QString("%1[1;%2F").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Insert ) - toWrite += QString("%1[2;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_Delete ) - toWrite += QString("%1[3;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - - if( key==Qt::Key_F1 ) - toWrite += QString("%1[1;%2P").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F2 ) - toWrite += QString("%1[1;%2Q").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F3 ) - toWrite += QString("%1[1;%2R").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F4 ) - toWrite += QString("%1[1;%2S").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F5 ) - toWrite += QString("%1[15;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F6 ) - toWrite += QString("%1[17;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F7 ) - toWrite += QString("%1[18;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F8 ) - toWrite += QString("%1[19;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F9 ) - toWrite += QString("%1[20;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F10 ) - toWrite += QString("%1[21;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F11 ) - toWrite += QString("%1[23;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - if( key==Qt::Key_F12 ) - toWrite += QString("%1[24;%2~").arg(ch_ESC).arg(modChar).toLatin1(); - - } + char cursorModif='['; + if(iAppCursorKeys) + cursorModif = 'O'; + + if( key==Qt::Key_Up ) + toWrite += QString("%1%2A").arg(ch_ESC).arg(cursorModif).toLatin1(); + if( key==Qt::Key_Down ) + toWrite += QString("%1%2B").arg(ch_ESC).arg(cursorModif).toLatin1(); + if( key==Qt::Key_Right ) + toWrite += QString("%1%2C").arg(ch_ESC).arg(cursorModif).toLatin1(); + if( key==Qt::Key_Left ) + toWrite += QString("%1%2D").arg(ch_ESC).arg(cursorModif).toLatin1(); if( key==Qt::Key_Enter \|\| key==Qt::Key_Return ) { if(iNewLineMode) @@ -336,6 +237,17 @@ if( key==Qt::Key_Tab ) toWrite = "\t"; + if( key==Qt::Key_PageUp ) + toWrite += QString("%1[5~").arg(ch_ESC).toLatin1(); + if( key==Qt::Key_PageDown ) + toWrite += QString("%1[6~").arg(ch_ESC).toLatin1(); + if( key==Qt::Key_Home ) + toWrite += QString("%1OH").arg(ch_ESC).toLatin1(); + if( key==Qt::Key_End ) + toWrite += QString("%1OF").arg(ch_ESC).toLatin1(); + if( key==Qt::Key_Delete ) + toWrite += QString("%1[3~").arg(ch_ESC).toLatin1(); + if( key==Qt::Key_Escape ) { toWrite += QString(1,ch_ESC); }
[-] [+]	Changed	_service:tar_git:fingerterm-1.1.16.tar.gz/terminal.h ^
@@ -79,7 +79,7 @@ QList<TermChar>& currentLine(); - Q_INVOKABLE void keyPress(int key, int modifiers, QString text); + Q_INVOKABLE void keyPress(int key, int modifiers); Q_INVOKABLE const QStringList printableLinesFromCursor(int lines); Q_INVOKABLE void putString(QString str, bool unEscape=false);