mirror of
https://github.com/Swordfish90/cool-retro-term.git
synced 2024-07-04 03:56:23 +02:00
Merge pull request #103 from Swordfish90/improvemouse
Improved mouse behavior. Enabled mouse support for applications.
This commit is contained in:
Filippo Scognamiglio
commit
98b2511660
|
|
@ -133,40 +133,33 @@ Item{
|
|||
acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
|
||||
anchors.fill: parent
|
||||
onWheel:{
|
||||
if(wheel.modifiers & Qt.ControlModifier){
|
||||
wheel.angleDelta.y > 0 ? zoomIn.trigger() : zoomOut.trigger();
|
||||
} else {
|
||||
var coord = correctDistortion(wheel.x, wheel.y);
|
||||
var lines = wheel.angleDelta.y > 0 ? -2 : 2;
|
||||
kterminal.scrollWheel(coord.width, coord.height, lines);
|
||||
}
|
||||
onClicked: {
|
||||
if (mouse.button == Qt.RightButton){
|
||||
contextmenu.popup();
|
||||
} else if (mouse.button == Qt.MiddleButton){
|
||||
kterminal.pasteSelection();
|
||||
var lines = wheel.angleDelta.y > 0 ? -1 : 1;
|
||||
kterminal.scrollWheelEvent(coord, lines);
|
||||
}
|
||||
}
|
||||
onDoubleClicked: {
|
||||
if (mouse.button == Qt.LeftButton){
|
||||
var coord = correctDistortion(mouse.x, mouse.y);
|
||||
kterminal.mouseDoubleClick(coord.width, coord.height);
|
||||
}
|
||||
}
|
||||
onPositionChanged: {
|
||||
if (pressedButtons & Qt.LeftButton){
|
||||
var coord = correctDistortion(mouse.x, mouse.y);
|
||||
kterminal.mouseMove(coord.width, coord.height);
|
||||
}
|
||||
kterminal.mouseDoubleClickEvent(coord, mouse.button, mouse.modifiers);
|
||||
}
|
||||
onPressed: {
|
||||
if (mouse.button == Qt.LeftButton){
|
||||
if((!kterminal.usesMouse || mouse.modifiers & Qt.ShiftModifier) && mouse.button == Qt.RightButton) {
|
||||
contextmenu.popup();
|
||||
} else {
|
||||
var coord = correctDistortion(mouse.x, mouse.y);
|
||||
kterminal.mousePress(coord.width, coord.height);
|
||||
kterminal.mousePressEvent(coord, mouse.button, mouse.modifiers)
|
||||
}
|
||||
}
|
||||
onReleased: {
|
||||
if (mouse.button == Qt.LeftButton){
|
||||
var coord = correctDistortion(mouse.x, mouse.y);
|
||||
kterminal.mouseRelease(coord.width, coord.height);
|
||||
kterminal.mouseReleaseEvent(coord, mouse.button, mouse.modifiers);
|
||||
}
|
||||
onPositionChanged: {
|
||||
var coord = correctDistortion(mouse.x, mouse.y);
|
||||
kterminal.mouseMoveEvent(coord, mouse.button, mouse.buttons, mouse.modifiers);
|
||||
}
|
||||
|
||||
//Frame displacement properties
|
||||
|
|
@ -185,7 +178,7 @@ Item{
|
|||
var cc = Qt.size(0.5 - x, 0.5 - y);
|
||||
var distortion = (cc.height * cc.height + cc.width * cc.width) * shadersettings.screen_distortion;
|
||||
|
||||
return Qt.size((x - cc.width * (1+distortion) * distortion) * width,
|
||||
return Qt.point((x - cc.width * (1+distortion) * distortion) * width,
|
||||
(y - cc.height * (1+distortion) * distortion) * height)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -376,6 +376,12 @@ signals:
|
|||
*/
|
||||
void imageSizeChanged(int lineCount , int columnCount);
|
||||
|
||||
/**
|
||||
* Emitted after receiving the escape sequence which asks to change
|
||||
* the terminal emulator's size
|
||||
*/
|
||||
void imageResizeRequest(const QSize& sizz);
|
||||
|
||||
/**
|
||||
* Emitted when the terminal program requests to change various properties
|
||||
* of the terminal display.
|
||||
|
|
|
|||
|
|
@ -48,9 +48,10 @@
|
|||
#include "ShellCommand.h" // REUSE THIS
|
||||
#include "Vt102Emulation.h" // REUSE THIS
|
||||
|
||||
|
||||
int Session::lastSessionId = 0;
|
||||
|
||||
using namespace Konsole;
|
||||
|
||||
Session::Session() :
|
||||
_shellProcess(0)
|
||||
, _emulation(0)
|
||||
|
|
@ -199,14 +200,9 @@ void Session::addView(KTerminalDisplay * widget)
|
|||
|
||||
// allow emulation to notify view when the foreground process
|
||||
// indicates whether or not it is interested in mouse signals
|
||||
|
||||
// TODO Disabled since at the moment it is not working properly.
|
||||
// Remember to reenable that once it' is's working.
|
||||
|
||||
//connect( _emulation , SIGNAL(programUsesMouseChanged(bool)) , widget ,
|
||||
// SLOT(setUsesMouse(bool)) );
|
||||
|
||||
//widget->setUsesMouse( _emulation->programUsesMouse() );
|
||||
connect( _emulation , SIGNAL(programUsesMouseChanged(bool)) , widget ,
|
||||
SLOT(setUsesMouse(bool)) );
|
||||
widget->setUsesMouse( _emulation->programUsesMouse() );
|
||||
|
||||
widget->setScreenWindow(_emulation->createWindow());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -447,93 +447,378 @@ QStringList KTerminalDisplay::availableColorSchemes()
|
|||
return ret;
|
||||
}
|
||||
|
||||
void KTerminalDisplay::scrollWheel(qreal x, qreal y, int lines){
|
||||
void KTerminalDisplay::scrollWheelEvent(QPoint position, int lines){
|
||||
if(_mouseMarks){
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(QPoint(x,y) , charLine , charColumn);
|
||||
|
||||
emit mouseSignal(lines > 0 ? 5 : 4,
|
||||
charColumn + 1,
|
||||
charLine + 1,
|
||||
0);
|
||||
} else {
|
||||
if(_screenWindow->lineCount() == _screenWindow->windowLines()){
|
||||
const int keyCode = lines > 0 ? Qt::Key_Down : Qt::Key_Up;
|
||||
QKeyEvent keyEvent(QEvent::KeyPress, keyCode, Qt::NoModifier);
|
||||
|
||||
emit keyPressedSignal(&keyEvent);
|
||||
emit keyPressedSignal(&keyEvent);
|
||||
} else {
|
||||
_screenWindow->scrollBy( ScreenWindow::ScrollLines, lines );
|
||||
_screenWindow->scrollCount();
|
||||
updateImage();
|
||||
}
|
||||
} else {
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
|
||||
emit mouseSignal(lines > 0 ? 5 : 4,
|
||||
charColumn + 1,
|
||||
charLine + 1,
|
||||
0);
|
||||
}
|
||||
}
|
||||
|
||||
void KTerminalDisplay::mousePress(qreal x, qreal y){
|
||||
if (m_focusOnClick) forcedFocus();
|
||||
if (m_showVKBonClick) ShowVKB(true);
|
||||
void KTerminalDisplay::doPaste(QString text, bool appendReturn)
|
||||
{
|
||||
if (!_screenWindow)
|
||||
return;
|
||||
|
||||
if (appendReturn)
|
||||
text.append("\r");
|
||||
|
||||
if (!text.isEmpty()) {
|
||||
text.replace('\n', '\r');
|
||||
// if (bracketedPasteMode()) {
|
||||
// text.prepend("\e[200~");
|
||||
// text.append("\e[201~");
|
||||
// }
|
||||
// perform paste by simulating keypress events
|
||||
QKeyEvent e(QEvent::KeyPress, 0, Qt::NoModifier, text);
|
||||
emit keyPressedSignal(&e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::pasteFromClipboard(bool appendEnter)
|
||||
{
|
||||
QString text = QGuiApplication::clipboard()->text(QClipboard::Clipboard);
|
||||
doPaste(text, appendEnter);
|
||||
}
|
||||
|
||||
void KTerminalDisplay::pasteFromX11Selection(bool appendEnter)
|
||||
{
|
||||
QString text = QGuiApplication::clipboard()->text(QClipboard::Selection);
|
||||
doPaste(text, appendEnter);
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::processMidButtonClick(QPoint &position, Qt::KeyboardModifier modifiers)
|
||||
{
|
||||
if (_mouseMarks || (modifiers & Qt::ShiftModifier)) {
|
||||
const bool appendEnter = modifiers & Qt::ControlModifier;
|
||||
|
||||
if (true /*_middleClickPasteMode == Enum::PasteFromX11Selection*/) {
|
||||
pasteFromX11Selection(appendEnter);
|
||||
} else if (false /*_middleClickPasteMode == Enum::PasteFromClipboard*/) {
|
||||
pasteFromClipboard(appendEnter);
|
||||
} else {
|
||||
Q_ASSERT(false);
|
||||
}
|
||||
} else {
|
||||
int charLine = 0;
|
||||
int charColumn = 0;
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
|
||||
emit mouseSignal(1, charColumn + 1, charLine + 1, 0);
|
||||
//emit mouseSignal(1, charColumn + 1, charLine + 1 + _scrollBar->value() - _scrollBar->maximum() , 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::mousePressEvent(QPoint position, int but, int mod)
|
||||
{
|
||||
Qt::MouseButton button = (Qt::MouseButton) but;
|
||||
Qt::KeyboardModifier modifiers = (Qt::KeyboardModifier) mod;
|
||||
// if (_possibleTripleClick && (ev->button() == Qt::LeftButton)) {
|
||||
// mouseTripleClickEvent(ev);
|
||||
// return;
|
||||
// }
|
||||
|
||||
if (!_screenWindow) return;
|
||||
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(QPoint(x,y), charLine, charColumn);
|
||||
|
||||
_wordSelectionMode = false;
|
||||
_lineSelectionMode = false;
|
||||
|
||||
if(_mouseMarks){
|
||||
emit mouseSignal(0, charColumn + 1, charLine + 1, 0);
|
||||
} else {
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
QPoint pos = QPoint(charColumn, charLine);
|
||||
|
||||
if (button == Qt::LeftButton) {
|
||||
_lineSelectionMode = false;
|
||||
_wordSelectionMode = false;
|
||||
|
||||
_preserveLineBreaks = !((modifiers & Qt::ControlModifier) && !(modifiers & Qt::AltModifier));
|
||||
_columnSelectionMode = (modifiers & Qt::AltModifier) && (modifiers & Qt::ControlModifier);
|
||||
|
||||
if (_mouseMarks || (modifiers == Qt::ShiftModifier)) {
|
||||
// Only extend selection for programs not interested in mouse
|
||||
if (_mouseMarks && (modifiers == Qt::ShiftModifier)) {
|
||||
extendSelection(position);
|
||||
} else {
|
||||
_screenWindow->clearSelection();
|
||||
|
||||
//pos.ry() += _scrollBar->value();
|
||||
_iPntSel = _pntSel = pos;
|
||||
_actSel = 1; // left mouse button pressed but nothing selected yet.
|
||||
}
|
||||
}
|
||||
|
||||
void KTerminalDisplay::mouseMove(qreal x, qreal y){
|
||||
QPoint pos(x, y);
|
||||
|
||||
if(_mouseMarks){
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(pos, charLine, charColumn);
|
||||
|
||||
emit mouseSignal(0, charColumn + 1, charLine + 1, 1);
|
||||
} else {
|
||||
extendSelection(pos);
|
||||
}
|
||||
}
|
||||
|
||||
void KTerminalDisplay::mouseDoubleClick(qreal x, qreal y){
|
||||
QPoint pos(x, y);
|
||||
|
||||
if(_mouseMarks){
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(pos, charLine, charColumn);
|
||||
|
||||
emit mouseSignal(0, charColumn + 1, charLine + 1, 0);
|
||||
//emit mouseSignal(0, charColumn + 1, charLine + 1, 0);
|
||||
} else {
|
||||
_wordSelectionMode = true;
|
||||
extendSelection(pos);
|
||||
}
|
||||
} else if (button == Qt::MidButton) {
|
||||
processMidButtonClick(position, modifiers);
|
||||
} else if (button == Qt::RightButton) {
|
||||
if (!_mouseMarks)
|
||||
emit mouseSignal(2, charColumn + 1, charLine + 1, 0);
|
||||
}
|
||||
}
|
||||
|
||||
void KTerminalDisplay::mouseRelease(qreal x, qreal y){
|
||||
void KTerminalDisplay::mouseMoveEvent(QPoint position, int but, int buts, int mod)
|
||||
{
|
||||
Qt::MouseButton button = (Qt::MouseButton) but;
|
||||
Qt::KeyboardModifier modifiers = (Qt::KeyboardModifier) mod;
|
||||
Qt::MouseButtons buttons = (Qt::MouseButtons) buts;
|
||||
|
||||
int charLine = 0;
|
||||
int charColumn = 0;
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
|
||||
// for auto-hiding the cursor, we need mouseTracking
|
||||
if (buttons == Qt::NoButton) return;
|
||||
|
||||
// if the terminal is interested in mouse movements
|
||||
// then emit a mouse movement signal, unless the shift
|
||||
// key is being held down, which overrides this.
|
||||
if (!_mouseMarks && !(modifiers & Qt::ShiftModifier)) {
|
||||
int button = 3;
|
||||
if (buttons & Qt::LeftButton)
|
||||
button = 0;
|
||||
if (buttons & Qt::MidButton)
|
||||
button = 1;
|
||||
if (buttons & Qt::RightButton)
|
||||
button = 2;
|
||||
|
||||
emit mouseSignal(button, charColumn + 1, charLine + 1, 1);
|
||||
return;
|
||||
}
|
||||
|
||||
if (_actSel == 0) return;
|
||||
|
||||
// don't extend selection while pasting
|
||||
if (buttons & Qt::MidButton) return;
|
||||
|
||||
extendSelection(position);
|
||||
}
|
||||
|
||||
|
||||
QPoint KTerminalDisplay::findWordEnd(const QPoint &pnt)
|
||||
{
|
||||
const int regSize = qMax(_screenWindow->windowLines(), 10);
|
||||
const int curLine = _screenWindow->currentLine();
|
||||
int i = pnt.y();
|
||||
int x = pnt.x();
|
||||
int y = i + curLine;
|
||||
int j = loc(x, i);
|
||||
QVector<LineProperty> lineProperties = _lineProperties;
|
||||
Screen *screen = _screenWindow->screen();
|
||||
Character *image = _image;
|
||||
Character *tmp_image = NULL;
|
||||
const QChar selClass = charClass(image[j]);
|
||||
const int imageSize = regSize * _columns;
|
||||
const int maxY = _screenWindow->lineCount() - 1;
|
||||
const int maxX = _columns - 1;
|
||||
|
||||
while (true) {
|
||||
const int lineCount = lineProperties.count();
|
||||
for (;;j++, x++) {
|
||||
if (x < maxX) {
|
||||
if (charClass(image[j + 1]) == selClass)
|
||||
continue;
|
||||
goto out;
|
||||
} else if (i < lineCount - 1) {
|
||||
if (lineProperties[i] & LINE_WRAPPED &&
|
||||
charClass(image[j + 1]) == selClass) {
|
||||
x = -1;
|
||||
i++;
|
||||
y++;
|
||||
continue;
|
||||
}
|
||||
goto out;
|
||||
} else if (y < maxY) {
|
||||
if (i < lineCount && !(lineProperties[i] & LINE_WRAPPED))
|
||||
goto out;
|
||||
break;
|
||||
} else {
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
int newRegEnd = qMin(y + regSize - 1, maxY);
|
||||
lineProperties = screen->getLineProperties(y, newRegEnd);
|
||||
i = 0;
|
||||
if (!tmp_image) {
|
||||
tmp_image = new Character[imageSize];
|
||||
image = tmp_image;
|
||||
}
|
||||
screen->getImage(tmp_image, imageSize, y, newRegEnd);
|
||||
x--;
|
||||
j = loc(x, i);
|
||||
}
|
||||
out:
|
||||
y -= curLine;
|
||||
// In word selection mode don't select @ (64) if at end of word.
|
||||
if (((image[j].rendition & RE_EXTENDED_CHAR) == 0) &&
|
||||
(QChar(image[j].character) == '@') &&
|
||||
(y > pnt.y() || x > pnt.x())) {
|
||||
if (x > 0) {
|
||||
x--;
|
||||
} else {
|
||||
y--;
|
||||
}
|
||||
}
|
||||
if (tmp_image) {
|
||||
delete[] tmp_image;
|
||||
}
|
||||
return QPoint(x, y);
|
||||
}
|
||||
|
||||
QPoint KTerminalDisplay::findWordStart(const QPoint &pnt)
|
||||
{
|
||||
const int regSize = qMax(_screenWindow->windowLines(), 10);
|
||||
const int curLine = _screenWindow->currentLine();
|
||||
int i = pnt.y();
|
||||
int x = pnt.x();
|
||||
int y = i + curLine;
|
||||
int j = loc(x, i);
|
||||
QVector<LineProperty> lineProperties = _lineProperties;
|
||||
Screen *screen = _screenWindow->screen();
|
||||
Character *image = _image;
|
||||
Character *tmp_image = NULL;
|
||||
const QChar selClass = charClass(image[j]);
|
||||
const int imageSize = regSize * _columns;
|
||||
|
||||
while (true) {
|
||||
for (;;j--, x--) {
|
||||
if (x > 0) {
|
||||
if (charClass(image[j - 1]) == selClass)
|
||||
continue;
|
||||
goto out;
|
||||
} else if (i > 0) {
|
||||
if (lineProperties[i - 1] & LINE_WRAPPED &&
|
||||
charClass(image[j - 1]) == selClass) {
|
||||
x = _columns;
|
||||
i--;
|
||||
y--;
|
||||
continue;
|
||||
}
|
||||
goto out;
|
||||
} else if (y > 0) {
|
||||
break;
|
||||
} else {
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
int newRegStart = qMax(0, y - regSize);
|
||||
lineProperties = screen->getLineProperties(newRegStart, y - 1);
|
||||
i = y - newRegStart;
|
||||
if (!tmp_image) {
|
||||
tmp_image = new Character[imageSize];
|
||||
image = tmp_image;
|
||||
}
|
||||
screen->getImage(tmp_image, imageSize, newRegStart, y - 1);
|
||||
j = loc(x, i);
|
||||
}
|
||||
out:
|
||||
if (tmp_image) {
|
||||
delete[] tmp_image;
|
||||
}
|
||||
return QPoint(x, y - curLine);
|
||||
}
|
||||
|
||||
|
||||
|
||||
void KTerminalDisplay::mouseDoubleClickEvent(QPoint position, int but, int mod)
|
||||
{
|
||||
Qt::MouseButton button = (Qt::MouseButton) but;
|
||||
Qt::KeyboardModifier modifiers = (Qt::KeyboardModifier) mod;
|
||||
|
||||
if (button != Qt::LeftButton) return;
|
||||
if (!_screenWindow) return;
|
||||
|
||||
int charLine = 0;
|
||||
int charColumn = 0;
|
||||
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
|
||||
// If the application is interested in mouse events. They have already been forwarded.
|
||||
if (!_mouseMarks && !(modifiers & Qt::ShiftModifier))
|
||||
return;
|
||||
|
||||
_screenWindow->clearSelection();
|
||||
|
||||
_wordSelectionMode = true;
|
||||
_actSel = 2; // within selection
|
||||
|
||||
_iPntSel = QPoint(charColumn, charLine);
|
||||
const QPoint bgnSel = findWordStart(_iPntSel);
|
||||
const QPoint endSel = findWordEnd(_iPntSel);
|
||||
|
||||
_screenWindow->setSelectionStart(bgnSel.x() , bgnSel.y() , false);
|
||||
_screenWindow->setSelectionEnd(endSel.x() , endSel.y());
|
||||
copyToX11Selection();
|
||||
|
||||
//TODO implement triple click.
|
||||
// _possibleTripleClick = true;
|
||||
|
||||
// QTimer::singleShot(QApplication::doubleClickInterval(), this,
|
||||
// SLOT(tripleClickTimeout()));
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::copyToX11Selection()
|
||||
{
|
||||
if (!_screenWindow)
|
||||
return;
|
||||
|
||||
QString text = _screenWindow->selectedText(_preserveLineBreaks);
|
||||
if (text.isEmpty())
|
||||
return;
|
||||
|
||||
QGuiApplication::clipboard()->setText(text, QClipboard::Selection);
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::mouseReleaseEvent(QPoint position, int but, int mod)
|
||||
{
|
||||
Qt::MouseButton button = (Qt::MouseButton) but;
|
||||
Qt::KeyboardModifier modifiers = (Qt::KeyboardModifier) mod;
|
||||
|
||||
if (!_screenWindow)
|
||||
return;
|
||||
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(position, charLine, charColumn);
|
||||
|
||||
if (button == Qt::LeftButton) {
|
||||
if (_actSel > 1) {
|
||||
copyToX11Selection();
|
||||
}
|
||||
|
||||
_actSel = 0;
|
||||
|
||||
if(_mouseMarks){
|
||||
int charLine;
|
||||
int charColumn;
|
||||
getCharacterPosition(QPoint(x,y), charLine, charColumn);
|
||||
//FIXME: emits a release event even if the mouse is
|
||||
// outside the range. The procedure used in `mouseMoveEvent'
|
||||
// applies here, too.
|
||||
|
||||
if (!_mouseMarks && !(modifiers & Qt::ShiftModifier))
|
||||
emit mouseSignal(0, charColumn + 1, charLine + 1 , 2);
|
||||
}
|
||||
|
||||
if (!_mouseMarks &&
|
||||
(button == Qt::RightButton || button == Qt::MidButton) &&
|
||||
!(modifiers & Qt::ShiftModifier)) {
|
||||
emit mouseSignal(button == Qt::MidButton ? 1 : 2, charColumn + 1, charLine + 1, 2);
|
||||
}
|
||||
}
|
||||
|
||||
void KTerminalDisplay::scrollScreenWindow(enum ScreenWindow::RelativeScrollMode mode, int amount)
|
||||
|
|
@ -546,7 +831,12 @@ void KTerminalDisplay::scrollScreenWindow(enum ScreenWindow::RelativeScrollMode
|
|||
|
||||
|
||||
void KTerminalDisplay::setUsesMouse(bool usesMouse){
|
||||
_mouseMarks = !usesMouse;
|
||||
_mouseMarks = usesMouse;
|
||||
emit usesMouseChanged();
|
||||
}
|
||||
|
||||
bool KTerminalDisplay::getUsesMouse(){
|
||||
return !_mouseMarks;
|
||||
}
|
||||
|
||||
void KTerminalDisplay::setAutoFocus(bool au)
|
||||
|
|
@ -1361,8 +1651,23 @@ void KTerminalDisplay::updateLineProperties()
|
|||
_lineProperties = _screenWindow->getLineProperties();
|
||||
}
|
||||
|
||||
QChar KTerminalDisplay::charClass(QChar qch) const
|
||||
QChar KTerminalDisplay::charClass(const Character& ch) const
|
||||
{
|
||||
if (ch.rendition & RE_EXTENDED_CHAR) {
|
||||
ushort extendedCharLength = 0;
|
||||
const ushort* chars = ExtendedCharTable::instance.lookupExtendedChar(ch.character, extendedCharLength);
|
||||
if (chars && extendedCharLength > 0) {
|
||||
const QString s = QString::fromUtf16(chars, extendedCharLength);
|
||||
if (_wordCharacters.contains(s, Qt::CaseInsensitive))
|
||||
return 'a';
|
||||
bool allLetterOrNumber = true;
|
||||
for (int i = 0; allLetterOrNumber && i < s.size(); ++i)
|
||||
allLetterOrNumber = s.at(i).isLetterOrNumber();
|
||||
return allLetterOrNumber ? 'a' : s.at(0);
|
||||
}
|
||||
return 0;
|
||||
} else {
|
||||
const QChar qch(ch.character);
|
||||
if (qch.isSpace()) return ' ';
|
||||
|
||||
if (qch.isLetterOrNumber() || _wordCharacters.contains(qch, Qt::CaseInsensitive))
|
||||
|
|
@ -1370,6 +1675,8 @@ QChar KTerminalDisplay::charClass(QChar qch) const
|
|||
|
||||
return qch;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void KTerminalDisplay::setWordCharacters(const QString& wc)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ class KONSOLEPRIVATE_EXPORT KTerminalDisplay : public QQuickPaintedItem
|
|||
Q_PROPERTY(bool ShowIMEOnClick READ autoVKB WRITE setAutoVKB NOTIFY changedAutoVKB)
|
||||
Q_PROPERTY(QSize terminalSize READ getTerminalSize NOTIFY terminalSizeChanged)
|
||||
Q_PROPERTY(QSize paintedFontSize READ getFontSize NOTIFY paintedFontSizeChanged)
|
||||
Q_PROPERTY(bool usesMouse READ getUsesMouse NOTIFY usesMouseChanged)
|
||||
|
||||
|
||||
public:
|
||||
|
|
@ -311,15 +312,10 @@ public slots:
|
|||
void setColorScheme(const QString &name);
|
||||
QStringList availableColorSchemes();
|
||||
|
||||
void scrollWheel(qreal x, qreal y, int lines);
|
||||
void mousePress(qreal x, qreal y);
|
||||
void mouseMove(qreal x, qreal y);
|
||||
void mouseDoubleClick(qreal x, qreal y);
|
||||
void mouseRelease(qreal x, qreal y);
|
||||
|
||||
void scrollScreenWindow(enum ScreenWindow::RelativeScrollMode mode, int amount);
|
||||
|
||||
void setUsesMouse(bool usesMouse);
|
||||
bool getUsesMouse(void);
|
||||
|
||||
bool autoFocus() { return m_focusOnClick; }
|
||||
void setAutoFocus(bool au);
|
||||
|
|
@ -425,6 +421,8 @@ signals:
|
|||
|
||||
void mouseSignal(int,int,int,int);
|
||||
|
||||
void usesMouseChanged();
|
||||
|
||||
void terminalSizeChanged();
|
||||
void paintedFontSizeChanged();
|
||||
|
||||
|
|
@ -477,7 +475,11 @@ protected:
|
|||
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
|
||||
QRect geometryRound(const QRectF &r) const;
|
||||
|
||||
//void mousePressEvent(QMouseEvent*ev);
|
||||
Q_INVOKABLE void mousePressEvent(QPoint position, int but, int mod);
|
||||
Q_INVOKABLE void mouseReleaseEvent(QPoint position, int but, int mod);
|
||||
Q_INVOKABLE void mouseDoubleClickEvent(QPoint position, int but, int mod);
|
||||
Q_INVOKABLE void mouseMoveEvent(QPoint position, int but, int buts, int mod);
|
||||
Q_INVOKABLE void scrollWheelEvent(QPoint position, int lines);
|
||||
//void mouseReleaseEvent( QMouseEvent* );
|
||||
//void mouseMoveEvent( QMouseEvent* );
|
||||
|
||||
|
|
@ -497,7 +499,7 @@ protected:
|
|||
// - A space (returns ' ')
|
||||
// - Part of a word (returns 'a')
|
||||
// - Other characters (returns the input character)
|
||||
QChar charClass(QChar ch) const;
|
||||
QChar charClass(const Character& ch) const;
|
||||
|
||||
void clearImage();
|
||||
|
||||
|
|
@ -594,6 +596,14 @@ private:
|
|||
// redraws the cursor
|
||||
void updateCursor();
|
||||
|
||||
QPoint findWordStart(const QPoint &pnt);
|
||||
QPoint findWordEnd(const QPoint &pnt);
|
||||
void processMidButtonClick(QPoint &position, Qt::KeyboardModifier modifiers);
|
||||
void copyToX11Selection();
|
||||
void pasteFromClipboard(bool appendEnter);
|
||||
void pasteFromX11Selection(bool appendEnter);
|
||||
void doPaste(QString text, bool appendReturn);
|
||||
|
||||
bool handleShortcutOverrideEvent(QKeyEvent* event);
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
/////////////////////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -23,37 +23,47 @@
|
|||
// Own
|
||||
#include "Vt102Emulation.h"
|
||||
|
||||
// XKB
|
||||
//#include <config-konsole.h>
|
||||
|
||||
// this allows konsole to be compiled without XKB and XTEST extensions
|
||||
// even though it might be available on a particular system.
|
||||
#if defined(AVOID_XKB)
|
||||
#undef HAVE_XKB
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_XKB)
|
||||
void scrolllock_set_off();
|
||||
void scrolllock_set_on();
|
||||
#endif
|
||||
|
||||
// Standard
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <assert.h>
|
||||
|
||||
// Qt
|
||||
#include <QtCore/QEvent>
|
||||
#include <QtCore/QTimer>
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtCore/QByteRef>
|
||||
|
||||
// KDE
|
||||
//#include <kdebug.h>
|
||||
//#include <klocale.h>
|
||||
//#include <KLocalizedString>
|
||||
//#include <KDebug>
|
||||
|
||||
// Konsole
|
||||
#include "KeyboardTranslator.h"
|
||||
#include "Screen.h"
|
||||
#include "TerminalDisplay.h"
|
||||
|
||||
using Konsole::Vt102Emulation;
|
||||
|
||||
/*
|
||||
The VT100 has 32 special graphical characters. The usual vt100 extended
|
||||
xterm fonts have these at 0x00..0x1f.
|
||||
|
||||
QT's iso mapping leaves 0x00..0x7f without any changes. But the graphicals
|
||||
come in here as proper unicode characters.
|
||||
|
||||
We treat non-iso10646 fonts as VT100 extended and do the required mapping
|
||||
from unicode to 0x00..0x1f. The remaining translation is then left to the
|
||||
QCodec.
|
||||
*/
|
||||
|
||||
// assert for i in [0..31] : vt100extended(vt100_graphics[i]) == i.
|
||||
|
||||
unsigned short Konsole::vt100_graphics[32] = {
|
||||
// 0/8 1/9 2/10 3/11 4/12 5/13 6/14 7/15
|
||||
0x0020, 0x25C6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
|
||||
0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
|
||||
0xF800, 0xF801, 0x2500, 0xF803, 0xF804, 0x251c, 0x2524, 0x2534,
|
||||
0x252c, 0x2502, 0x2264, 0x2265, 0x03C0, 0x2260, 0x00A3, 0x00b7
|
||||
};
|
||||
|
||||
Vt102Emulation::Vt102Emulation()
|
||||
: Emulation(),
|
||||
|
|
@ -77,12 +87,20 @@ void Vt102Emulation::clearEntireScreen()
|
|||
|
||||
void Vt102Emulation::reset()
|
||||
{
|
||||
// Save the current codec so we can set it later.
|
||||
// Ideally we would want to use the profile setting
|
||||
const QTextCodec* currentCodec = codec();
|
||||
|
||||
resetTokenizer();
|
||||
resetModes();
|
||||
resetCharset(0);
|
||||
_screen[0]->reset();
|
||||
resetCharset(1);
|
||||
_screen[1]->reset();
|
||||
|
||||
if (currentCodec)
|
||||
setCodec(currentCodec);
|
||||
else
|
||||
setCodec(LocaleCodec);
|
||||
|
||||
bufferedUpdate();
|
||||
|
|
@ -142,7 +160,7 @@ void Vt102Emulation::reset()
|
|||
The last two forms allow list of arguments. Since the elements of
|
||||
the lists are treated individually the same way, they are passed
|
||||
as individual tokens to the interpretation. Further, because the
|
||||
meaning of the parameters are names (althought represented as numbers),
|
||||
meaning of the parameters are names (although represented as numbers),
|
||||
they are includes within the token ('N').
|
||||
|
||||
*/
|
||||
|
|
@ -162,7 +180,7 @@ void Vt102Emulation::reset()
|
|||
#define TY_CSI_PG(A) TY_CONSTRUCT(9,A,0)
|
||||
#define TY_CSI_PE(A) TY_CONSTRUCT(10,A,0)
|
||||
|
||||
#define MAX_ARGUMENT 4096
|
||||
const int MAX_ARGUMENT = 4096;
|
||||
|
||||
// Tokenizer --------------------------------------------------------------- --
|
||||
|
||||
|
|
@ -200,15 +218,13 @@ void Vt102Emulation::addToCurrentToken(int cc)
|
|||
}
|
||||
|
||||
// Character Class flags used while decoding
|
||||
|
||||
#define CTL 1 // Control character
|
||||
#define CHR 2 // Printable character
|
||||
#define CPN 4 // TODO: Document me
|
||||
#define DIG 8 // Digit
|
||||
#define SCS 16 // TODO: Document me
|
||||
#define GRP 32 // TODO: Document me
|
||||
#define CPS 64 // Character which indicates end of window resize
|
||||
// escape sequence '\e[8;<row>;<col>t'
|
||||
const int CTL = 1; // Control character
|
||||
const int CHR = 2; // Printable character
|
||||
const int CPN = 4; // TODO: Document me
|
||||
const int DIG = 8; // Digit
|
||||
const int SCS = 16; // Select Character Set
|
||||
const int GRP = 32; // TODO: Document me
|
||||
const int CPS = 64; // Character which indicates end of window resize
|
||||
|
||||
void Vt102Emulation::initTokenizer()
|
||||
{
|
||||
|
|
@ -267,13 +283,14 @@ void Vt102Emulation::initTokenizer()
|
|||
#define Xte (Xpe && cc == 7 )
|
||||
#define ces(C) (cc < 256 && (charClass[cc] & (C)) == (C) && !Xte)
|
||||
|
||||
#define ESC 27
|
||||
#define CNTL(c) ((c)-'@')
|
||||
const int ESC = 27;
|
||||
const int DEL = 127;
|
||||
|
||||
// process an incoming unicode character
|
||||
void Vt102Emulation::receiveChar(int cc)
|
||||
{
|
||||
if (cc == 127)
|
||||
if (cc == DEL)
|
||||
return; //VT100: ignore.
|
||||
|
||||
if (ces(CTL))
|
||||
|
|
@ -294,7 +311,7 @@ void Vt102Emulation::receiveChar(int cc)
|
|||
addToCurrentToken(cc);
|
||||
|
||||
int* s = tokenBuffer;
|
||||
int p = tokenBufferPos;
|
||||
const int p = tokenBufferPos;
|
||||
|
||||
if (getMode(MODE_Ansi))
|
||||
{
|
||||
|
|
@ -418,7 +435,7 @@ void Vt102Emulation::updateTitle()
|
|||
meaning is assigned to them. These are either operations of
|
||||
the current _screen, or of the emulation class itself.
|
||||
|
||||
The token to be interpreteted comes in as a machine word
|
||||
The token to be interpreted comes in as a machine word
|
||||
possibly accompanied by two parameters.
|
||||
|
||||
Likewise, the operations assigned to, come with up to two
|
||||
|
|
@ -433,7 +450,6 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
{
|
||||
switch (token)
|
||||
{
|
||||
|
||||
case TY_CHR( ) : _currentScreen->displayCharacter (p ); break; //UTF16
|
||||
|
||||
// 127 DEL : ignored on input
|
||||
|
|
@ -528,7 +544,9 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
case TY_ESC_DE('8' ) : _currentScreen->helpAlign ( ); break;
|
||||
|
||||
// resize = \e[8;<row>;<col>t
|
||||
case TY_CSI_PS('t', 8) : setImageSize( q /* columns */, p /* lines */ ); break;
|
||||
case TY_CSI_PS('t', 8) : setImageSize( p /*lines */, q /* columns */ );
|
||||
emit imageResizeRequest(QSize(q, p));
|
||||
break;
|
||||
|
||||
// change tab text color : \e[28;<color>t color: 0-16,777,215
|
||||
case TY_CSI_PS('t', 28) : emit changeTabTextColorRequest ( p ); break;
|
||||
|
|
@ -552,6 +570,7 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
|
||||
case TY_CSI_PS('m', 0) : _currentScreen->setDefaultRendition ( ); break;
|
||||
case TY_CSI_PS('m', 1) : _currentScreen-> setRendition (RE_BOLD ); break; //VT100
|
||||
//case TY_CSI_PS('m', 3) : _currentScreen-> setRendition (RE_ITALIC ); break; //VT100
|
||||
case TY_CSI_PS('m', 4) : _currentScreen-> setRendition (RE_UNDERLINE); break; //VT100
|
||||
case TY_CSI_PS('m', 5) : _currentScreen-> setRendition (RE_BLINK ); break; //VT100
|
||||
case TY_CSI_PS('m', 7) : _currentScreen-> setRendition (RE_REVERSE ); break;
|
||||
|
|
@ -559,6 +578,7 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
case TY_CSI_PS('m', 11) : /* IGNORED: mapping related */ break; //LINUX
|
||||
case TY_CSI_PS('m', 12) : /* IGNORED: mapping related */ break; //LINUX
|
||||
case TY_CSI_PS('m', 22) : _currentScreen->resetRendition (RE_BOLD ); break;
|
||||
//case TY_CSI_PS('m', 23) : _currentScreen->resetRendition (RE_ITALIC ); break; //VT100
|
||||
case TY_CSI_PS('m', 24) : _currentScreen->resetRendition (RE_UNDERLINE); break;
|
||||
case TY_CSI_PS('m', 25) : _currentScreen->resetRendition (RE_BLINK ); break;
|
||||
case TY_CSI_PS('m', 27) : _currentScreen->resetRendition (RE_REVERSE ); break;
|
||||
|
|
@ -622,6 +642,8 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
case TY_CSI_PN('B' ) : _currentScreen->cursorDown (p ); break; //VT100
|
||||
case TY_CSI_PN('C' ) : _currentScreen->cursorRight (p ); break; //VT100
|
||||
case TY_CSI_PN('D' ) : _currentScreen->cursorLeft (p ); break; //VT100
|
||||
case TY_CSI_PN('E' ) : /* Not implemented: cursor next p lines */ break; //VT100
|
||||
case TY_CSI_PN('F' ) : /* Not implemented: cursor preceding p lines */ break; //VT100
|
||||
case TY_CSI_PN('G' ) : _currentScreen->setCursorX (p ); break; //LINUX
|
||||
case TY_CSI_PN('H' ) : _currentScreen->setCursorYX (p, q); break; //VT100
|
||||
case TY_CSI_PN('I' ) : _currentScreen->tab (p ); break;
|
||||
|
|
@ -736,6 +758,21 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
case TY_CSI_PR('s', 1003) : saveMode (MODE_Mouse1003); break; //XTERM
|
||||
case TY_CSI_PR('r', 1003) : restoreMode (MODE_Mouse1003); break; //XTERM
|
||||
|
||||
case TY_CSI_PR('h', 1005) : setMode (MODE_Mouse1005); break; //XTERM
|
||||
case TY_CSI_PR('l', 1005) : resetMode (MODE_Mouse1005); break; //XTERM
|
||||
case TY_CSI_PR('s', 1005) : saveMode (MODE_Mouse1005); break; //XTERM
|
||||
case TY_CSI_PR('r', 1005) : restoreMode (MODE_Mouse1005); break; //XTERM
|
||||
|
||||
case TY_CSI_PR('h', 1006) : setMode (MODE_Mouse1006); break; //XTERM
|
||||
case TY_CSI_PR('l', 1006) : resetMode (MODE_Mouse1006); break; //XTERM
|
||||
case TY_CSI_PR('s', 1006) : saveMode (MODE_Mouse1006); break; //XTERM
|
||||
case TY_CSI_PR('r', 1006) : restoreMode (MODE_Mouse1006); break; //XTERM
|
||||
|
||||
case TY_CSI_PR('h', 1015) : setMode (MODE_Mouse1015); break; //URXVT
|
||||
case TY_CSI_PR('l', 1015) : resetMode (MODE_Mouse1015); break; //URXVT
|
||||
case TY_CSI_PR('s', 1015) : saveMode (MODE_Mouse1015); break; //URXVT
|
||||
case TY_CSI_PR('r', 1015) : restoreMode (MODE_Mouse1015); break; //URXVT
|
||||
|
||||
case TY_CSI_PR('h', 1034) : /* IGNORED: 8bitinput activation */ break; //XTERM
|
||||
|
||||
case TY_CSI_PR('h', 1047) : setMode (MODE_AppScreen); break; //XTERM
|
||||
|
|
@ -754,6 +791,11 @@ void Vt102Emulation::processToken(int token, int p, int q)
|
|||
case TY_CSI_PR('h', 1049) : saveCursor(); _screen[1]->clearEntireScreen(); setMode(MODE_AppScreen); break; //XTERM
|
||||
case TY_CSI_PR('l', 1049) : resetMode(MODE_AppScreen); restoreCursor(); break; //XTERM
|
||||
|
||||
case TY_CSI_PR('h', 2004) : setMode (MODE_BracketedPaste); break; //XTERM
|
||||
case TY_CSI_PR('l', 2004) : resetMode (MODE_BracketedPaste); break; //XTERM
|
||||
case TY_CSI_PR('s', 2004) : saveMode (MODE_BracketedPaste); break; //XTERM
|
||||
case TY_CSI_PR('r', 2004) : restoreMode (MODE_BracketedPaste); break; //XTERM
|
||||
|
||||
//FIXME: weird DEC reset sequence
|
||||
case TY_CSI_PE('p' ) : /* IGNORED: reset ( ) */ break;
|
||||
|
||||
|
|
@ -797,13 +839,13 @@ void Vt102Emulation::sendString(const char* s , int length)
|
|||
if ( length >= 0 )
|
||||
emit sendData(s,length);
|
||||
else
|
||||
emit sendData(s,strlen(s));
|
||||
emit sendData(s,qstrlen(s));
|
||||
}
|
||||
|
||||
void Vt102Emulation::reportCursorPosition()
|
||||
{
|
||||
char tmp[20];
|
||||
sprintf(tmp,"\033[%d;%dR",_currentScreen->getCursorY()+1,_currentScreen->getCursorX()+1);
|
||||
snprintf(tmp, sizeof(tmp), "\033[%d;%dR", _currentScreen->getCursorY()+1, _currentScreen->getCursorX()+1);
|
||||
sendString(tmp);
|
||||
}
|
||||
|
||||
|
|
@ -822,7 +864,7 @@ void Vt102Emulation::reportTerminalType()
|
|||
|
||||
void Vt102Emulation::reportSecondaryAttributes()
|
||||
{
|
||||
// Seconday device attribute response (Request was: ^[[>0c or ^[[>c)
|
||||
// Secondary device attribute response (Request was: ^[[>0c or ^[[>c)
|
||||
if (getMode(MODE_Ansi))
|
||||
sendString("\033[>0;115;0c"); // Why 115? ;)
|
||||
else
|
||||
|
|
@ -830,11 +872,24 @@ void Vt102Emulation::reportSecondaryAttributes()
|
|||
// konsoles backward compatibility.
|
||||
}
|
||||
|
||||
/* DECREPTPARM – Report Terminal Parameters
|
||||
ESC [ <sol>; <par>; <nbits>; <xspeed>; <rspeed>; <clkmul>; <flags> x
|
||||
|
||||
http://vt100.net/docs/vt100-ug/chapter3.html
|
||||
*/
|
||||
void Vt102Emulation::reportTerminalParms(int p)
|
||||
// DECREPTPARM
|
||||
{
|
||||
char tmp[100];
|
||||
sprintf(tmp,"\033[%d;1;1;112;112;1;0x",p); // not really true.
|
||||
/*
|
||||
sol=1: This message is a request; report in response to a request.
|
||||
par=1: No parity set
|
||||
nbits=1: 8 bits per character
|
||||
xspeed=112: 9600
|
||||
rspeed=112: 9600
|
||||
clkmul=1: The bit rate multiplier is 16.
|
||||
flags=0: None
|
||||
*/
|
||||
snprintf(tmp, sizeof(tmp), "\033[%d;1;1;112;112;1;0x", p); // not really true.
|
||||
sendString(tmp);
|
||||
}
|
||||
|
||||
|
|
@ -853,12 +908,12 @@ void Vt102Emulation::reportAnswerBack()
|
|||
|
||||
/*!
|
||||
`cx',`cy' are 1-based.
|
||||
`eventType' indicates the button pressed (0-2)
|
||||
or a general mouse release (3).
|
||||
`cb' indicates the button pressed or released (0-2) or scroll event (4-5).
|
||||
|
||||
eventType represents the kind of mouse action that occurred:
|
||||
0 = Mouse button press or release
|
||||
0 = Mouse button press
|
||||
1 = Mouse drag
|
||||
2 = Mouse button release
|
||||
*/
|
||||
|
||||
void Vt102Emulation::sendMouseEvent(int cb, int cx, int cy , int eventType)
|
||||
|
|
@ -866,6 +921,11 @@ void Vt102Emulation::sendMouseEvent( int cb, int cx, int cy , int eventType )
|
|||
if (cx < 1 || cy < 1)
|
||||
return;
|
||||
|
||||
// With the exception of the 1006 mode, button release is encoded in cb.
|
||||
// Note that if multiple extensions are enabled, the 1006 is used, so it's okay to check for only that.
|
||||
if (eventType == 2 && !getMode(MODE_Mouse1006))
|
||||
cb = 3;
|
||||
|
||||
// normal buttons are passed as 0x20 + button,
|
||||
// mouse wheel (buttons 4,5) as 0x5c + button
|
||||
if (cb >= 4)
|
||||
|
|
@ -875,15 +935,35 @@ void Vt102Emulation::sendMouseEvent( int cb, int cx, int cy , int eventType )
|
|||
if ((getMode(MODE_Mouse1002) || getMode(MODE_Mouse1003)) && eventType == 1)
|
||||
cb += 0x20; //add 32 to signify motion event
|
||||
|
||||
char command[20];
|
||||
sprintf(command,"\033[M%c%c%c",cb+0x20,cx+0x20,cy+0x20);
|
||||
char command[32];
|
||||
command[0] = '\0';
|
||||
// Check the extensions in decreasing order of preference. Encoding the release event above assumes that 1006 comes first.
|
||||
if (getMode(MODE_Mouse1006)) {
|
||||
snprintf(command, sizeof(command), "\033[<%d;%d;%d%c", cb, cx, cy, eventType == 2 ? 'm' : 'M');
|
||||
} else if (getMode(MODE_Mouse1015)) {
|
||||
snprintf(command, sizeof(command), "\033[%d;%d;%dM", cb + 0x20, cx, cy);
|
||||
} else if (getMode(MODE_Mouse1005)) {
|
||||
if (cx <= 2015 && cy <= 2015) {
|
||||
// The xterm extension uses UTF-8 (up to 2 bytes) to encode
|
||||
// coordinate+32, no matter what the locale is. We could easily
|
||||
// convert manually, but QString can also do it for us.
|
||||
QChar coords[2];
|
||||
coords[0] = cx + 0x20;
|
||||
coords[1] = cy + 0x20;
|
||||
QString coordsStr = QString(coords, 2);
|
||||
QByteArray utf8 = coordsStr.toUtf8();
|
||||
snprintf(command, sizeof(command), "\033[M%c%s", cb + 0x20, (const char *)utf8);
|
||||
}
|
||||
} else if (cx <= 223 && cy <= 223) {
|
||||
snprintf(command, sizeof(command), "\033[M%c%c%c", cb + 0x20, cx + 0x20, cy + 0x20);
|
||||
}
|
||||
|
||||
sendString(command);
|
||||
}
|
||||
|
||||
void Vt102Emulation::sendText(const QString& text)
|
||||
{
|
||||
if (!text.isEmpty())
|
||||
{
|
||||
if (!text.isEmpty()) {
|
||||
QKeyEvent event(QEvent::KeyPress,
|
||||
0,
|
||||
Qt::NoModifier,
|
||||
|
|
@ -893,7 +973,7 @@ void Vt102Emulation::sendText( const QString& text )
|
|||
}
|
||||
void Vt102Emulation::sendKeyEvent(QKeyEvent* event)
|
||||
{
|
||||
Qt::KeyboardModifiers modifiers = event->modifiers();
|
||||
const Qt::KeyboardModifiers modifiers = event->modifiers();
|
||||
KeyboardTranslator::States states = KeyboardTranslator::NoState;
|
||||
|
||||
// get current states
|
||||
|
|
@ -905,17 +985,20 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
|
|||
states |= KeyboardTranslator::ApplicationKeypadState;
|
||||
|
||||
// check flow control state
|
||||
if (modifiers & Qt::ControlModifier)
|
||||
{
|
||||
if (event->key() == Qt::Key_S)
|
||||
if (modifiers & Qt::ControlModifier) {
|
||||
switch (event->key()) {
|
||||
case Qt::Key_S:
|
||||
emit flowControlKeyPressed(true);
|
||||
else if (event->key() == Qt::Key_Q)
|
||||
break;
|
||||
case Qt::Key_Q:
|
||||
case Qt::Key_C: // cancel flow control
|
||||
emit flowControlKeyPressed(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// look up key binding
|
||||
if ( _keyTranslator )
|
||||
{
|
||||
if (_keyTranslator) {
|
||||
KeyboardTranslator::Entry entry = _keyTranslator->findEntry(
|
||||
event->key() ,
|
||||
modifiers,
|
||||
|
|
@ -928,8 +1011,9 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
|
|||
// Alt+[Character] results in Esc+[Character] being sent
|
||||
// (unless there is an entry defined for this particular combination
|
||||
// in the keyboard modifier)
|
||||
bool wantsAltModifier = entry.modifiers() & entry.modifierMask() & Qt::AltModifier;
|
||||
bool wantsAnyModifier = entry.state() &
|
||||
const bool wantsAltModifier = entry.modifiers() & entry.modifierMask() & Qt::AltModifier;
|
||||
const bool wantsMetaModifier = entry.modifiers() & entry.modifierMask() & Qt::MetaModifier;
|
||||
const bool wantsAnyModifier = entry.state() &
|
||||
entry.stateMask() & KeyboardTranslator::AnyModifierState;
|
||||
|
||||
if ( modifiers & Qt::AltModifier && !(wantsAltModifier || wantsAnyModifier)
|
||||
|
|
@ -937,13 +1021,18 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
|
|||
{
|
||||
textToSend.prepend("\033");
|
||||
}
|
||||
if ( modifiers & Qt::MetaModifier && !(wantsMetaModifier || wantsAnyModifier)
|
||||
&& !event->text().isEmpty() )
|
||||
{
|
||||
textToSend.prepend("\030@s");
|
||||
}
|
||||
|
||||
if ( entry.command() != KeyboardTranslator::NoCommand )
|
||||
{
|
||||
KTerminalDisplay * currentView = _currentScreen->currentTerminalDisplay();
|
||||
if (entry.command() & KeyboardTranslator::EraseCommand)
|
||||
if (entry.command() & KeyboardTranslator::EraseCommand) {
|
||||
textToSend += eraseChar();
|
||||
else if (entry.command() & KeyboardTranslator::ScrollPageUpCommand)
|
||||
} else if (entry.command() & KeyboardTranslator::ScrollPageUpCommand)
|
||||
currentView->scrollScreenWindow(ScreenWindow::ScrollPages, -1);
|
||||
else if (entry.command() & KeyboardTranslator::ScrollPageDownCommand)
|
||||
currentView->scrollScreenWindow(ScreenWindow::ScrollPages, 1);
|
||||
|
|
@ -951,8 +1040,11 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
|
|||
currentView->scrollScreenWindow(ScreenWindow::ScrollLines, -1);
|
||||
else if (entry.command() & KeyboardTranslator::ScrollLineDownCommand)
|
||||
currentView->scrollScreenWindow(ScreenWindow::ScrollLines, 1);
|
||||
|
||||
// TODO command handling
|
||||
// else if (entry.command() & KeyboardTranslator::ScrollUpToTopCommand)
|
||||
// currentView->scrollScreenWindow(ScreenWindow::ScrollLines,
|
||||
// - currentView->screenWindow()->currentLine());
|
||||
// else if (entry.command() & KeyboardTranslator::ScrollDownToBottomCommand)
|
||||
// currentView->scrollScreenWindow(ScreenWindow::ScrollLines, lineCount());
|
||||
}
|
||||
else if (!entry.text().isEmpty())
|
||||
{
|
||||
|
|
@ -967,12 +1059,12 @@ void Vt102Emulation::sendKeyEvent( QKeyEvent* event )
|
|||
{
|
||||
// print an error message to the terminal if no key translator has been
|
||||
// set
|
||||
QString translatorError = tr("No keyboard translator available. "
|
||||
"The information needed to convert key presses "
|
||||
"into characters to send to the terminal "
|
||||
"is missing.");
|
||||
// QString translatorError = i18n("No keyboard translator available. "
|
||||
// "The information needed to convert key presses "
|
||||
// "into characters to send to the terminal "
|
||||
// "is missing.");
|
||||
reset();
|
||||
receiveData( translatorError.toLatin1().constData() , translatorError.count() );
|
||||
// receiveData(translatorError.toAscii().constData(), translatorError.count());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1022,7 +1114,7 @@ unsigned short Vt102Emulation::applyCharset(unsigned short c)
|
|||
void Vt102Emulation::resetCharset(int scrno)
|
||||
{
|
||||
_charset[scrno].cu_cs = 0;
|
||||
strncpy(_charset[scrno].charset,"BBBB",4);
|
||||
qstrncpy(_charset[scrno].charset, "BBBB", 4);
|
||||
_charset[scrno].sa_graphic = false;
|
||||
_charset[scrno].sa_pound = false;
|
||||
_charset[scrno].graphic = false;
|
||||
|
|
@ -1100,13 +1192,17 @@ void Vt102Emulation::restoreCursor()
|
|||
void Vt102Emulation::resetModes()
|
||||
{
|
||||
// MODE_Allow132Columns is not reset here
|
||||
// to match Xterm's behaviour (see Xterm's VTReset() function)
|
||||
// to match Xterm's behavior (see Xterm's VTReset() function)
|
||||
|
||||
resetMode(MODE_132Columns); saveMode(MODE_132Columns);
|
||||
resetMode(MODE_Mouse1000); saveMode(MODE_Mouse1000);
|
||||
resetMode(MODE_Mouse1001); saveMode(MODE_Mouse1001);
|
||||
resetMode(MODE_Mouse1002); saveMode(MODE_Mouse1002);
|
||||
resetMode(MODE_Mouse1003); saveMode(MODE_Mouse1003);
|
||||
resetMode(MODE_Mouse1005); saveMode(MODE_Mouse1005);
|
||||
resetMode(MODE_Mouse1006); saveMode(MODE_Mouse1006);
|
||||
resetMode(MODE_Mouse1015); saveMode(MODE_Mouse1015);
|
||||
resetMode(MODE_BracketedPaste); saveMode(MODE_BracketedPaste);
|
||||
|
||||
resetMode(MODE_AppScreen); saveMode(MODE_AppScreen);
|
||||
resetMode(MODE_AppCuKeys); saveMode(MODE_AppCuKeys);
|
||||
|
|
@ -1118,8 +1214,7 @@ void Vt102Emulation::resetModes()
|
|||
void Vt102Emulation::setMode(int m)
|
||||
{
|
||||
_currentModes.mode[m] = true;
|
||||
switch (m)
|
||||
{
|
||||
switch (m) {
|
||||
case MODE_132Columns:
|
||||
if (getMode(MODE_Allow132Columns))
|
||||
clearScreenAndSetColumns(132);
|
||||
|
|
@ -1133,12 +1228,18 @@ void Vt102Emulation::setMode(int m)
|
|||
emit programUsesMouseChanged(false);
|
||||
break;
|
||||
|
||||
case MODE_AppScreen : _screen[1]->clearSelection();
|
||||
case MODE_BracketedPaste:
|
||||
//emit programBracketedPasteModeChanged(true);
|
||||
break;
|
||||
|
||||
case MODE_AppScreen :
|
||||
_screen[1]->clearSelection();
|
||||
setScreen(1);
|
||||
break;
|
||||
}
|
||||
if (m < MODES_SCREEN || m == MODE_NewLine)
|
||||
{
|
||||
// FIXME: Currently this has a redundant condition as MODES_SCREEN is 6
|
||||
// and MODE_NewLine is 5
|
||||
if (m < MODES_SCREEN || m == MODE_NewLine) {
|
||||
_screen[0]->setMode(m);
|
||||
_screen[1]->setMode(m);
|
||||
}
|
||||
|
|
@ -1147,8 +1248,7 @@ void Vt102Emulation::setMode(int m)
|
|||
void Vt102Emulation::resetMode(int m)
|
||||
{
|
||||
_currentModes.mode[m] = false;
|
||||
switch (m)
|
||||
{
|
||||
switch (m) {
|
||||
case MODE_132Columns:
|
||||
if (getMode(MODE_Allow132Columns))
|
||||
clearScreenAndSetColumns(80);
|
||||
|
|
@ -1160,13 +1260,18 @@ void Vt102Emulation::resetMode(int m)
|
|||
emit programUsesMouseChanged(true);
|
||||
break;
|
||||
|
||||
case MODE_BracketedPaste:
|
||||
//emit programBracketedPasteModeChanged(false);
|
||||
break;
|
||||
|
||||
case MODE_AppScreen :
|
||||
_screen[0]->clearSelection();
|
||||
setScreen(0);
|
||||
break;
|
||||
}
|
||||
if (m < MODES_SCREEN || m == MODE_NewLine)
|
||||
{
|
||||
// FIXME: Currently this has a redundant condition as MODES_SCREEN is 6
|
||||
// and MODE_NewLine is 5
|
||||
if (m < MODES_SCREEN || m == MODE_NewLine) {
|
||||
_screen[0]->resetMode(m);
|
||||
_screen[1]->resetMode(m);
|
||||
}
|
||||
|
|
@ -1202,29 +1307,53 @@ char Vt102Emulation::eraseChar() const
|
|||
return '\b';
|
||||
}
|
||||
|
||||
#if 0
|
||||
// print contents of the scan buffer
|
||||
static void hexdump(int* s, int len)
|
||||
{ int i;
|
||||
for (i = 0; i < len; i++)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < len; i++) {
|
||||
if (s[i] == '\\')
|
||||
printf("\\\\");
|
||||
else
|
||||
if ((s[i]) > 32 && s[i] < 127)
|
||||
else if ((s[i]) > 32 && s[i] < 127)
|
||||
printf("%c", s[i]);
|
||||
else
|
||||
printf("\\%04x(hex)", s[i]);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// return contents of the scan buffer
|
||||
static QString hexdump2(int* s, int len)
|
||||
{
|
||||
int i;
|
||||
char dump[128];
|
||||
QString returnDump;
|
||||
|
||||
for (i = 0; i < len; i++) {
|
||||
if (s[i] == '\\')
|
||||
snprintf(dump, sizeof(dump), "%s", "\\\\");
|
||||
else if ((s[i]) > 32 && s[i] < 127)
|
||||
snprintf(dump, sizeof(dump), "%c", s[i]);
|
||||
else
|
||||
snprintf(dump, sizeof(dump), "\\%04x(hex)", s[i]);
|
||||
returnDump.append(QString(dump));
|
||||
}
|
||||
return returnDump;
|
||||
}
|
||||
|
||||
void Vt102Emulation::reportDecodingError()
|
||||
{
|
||||
if (tokenBufferPos == 0 || (tokenBufferPos == 1 && (tokenBuffer[0] & 0xff) >= 32))
|
||||
return;
|
||||
printf("Undecodable sequence: ");
|
||||
hexdump(tokenBuffer,tokenBufferPos);
|
||||
printf("\n");
|
||||
|
||||
// printf("Undecodable sequence: ");
|
||||
// hexdump(tokenBuffer, tokenBufferPos);
|
||||
// printf("\n");
|
||||
|
||||
QString outputError = QString("Undecodable sequence: ");
|
||||
outputError.append(hexdump2(tokenBuffer, tokenBufferPos));
|
||||
//kDebug() << outputError;
|
||||
}
|
||||
|
||||
//#include "Vt102Emulation.moc"
|
||||
|
||||
|
|
|
|||
|
|
@ -23,19 +23,16 @@
|
|||
#ifndef VT102EMULATION_H
|
||||
#define VT102EMULATION_H
|
||||
|
||||
// Standard Library
|
||||
#include <stdio.h>
|
||||
|
||||
// Qt
|
||||
#include <QtGui/QKeyEvent>
|
||||
#include <QtCore/QHash>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
// Konsole
|
||||
#include "Emulation.h"
|
||||
#include "Screen.h"
|
||||
#include "ScreenWindow.h"
|
||||
#include "TerminalDisplay.h"
|
||||
|
||||
class QTimer;
|
||||
class QKeyEvent;
|
||||
|
||||
#define MODE_AppScreen (MODES_SCREEN+0) // Mode #1
|
||||
#define MODE_AppCuKeys (MODES_SCREEN+1) // Application cursor keys (DECCKM)
|
||||
|
|
@ -44,14 +41,20 @@
|
|||
#define MODE_Mouse1001 (MODES_SCREEN+4) // Use Hilight mouse tracking
|
||||
#define MODE_Mouse1002 (MODES_SCREEN+5) // Use cell motion mouse tracking
|
||||
#define MODE_Mouse1003 (MODES_SCREEN+6) // Use all motion mouse tracking
|
||||
#define MODE_Ansi (MODES_SCREEN+7) // Use US Ascii for character sets G0-G3 (DECANM)
|
||||
#define MODE_132Columns (MODES_SCREEN+8) // 80 <-> 132 column mode switch (DECCOLM)
|
||||
#define MODE_Allow132Columns (MODES_SCREEN+9) // Allow DECCOLM mode
|
||||
#define MODE_total (MODES_SCREEN+10)
|
||||
#define MODE_Mouse1005 (MODES_SCREEN+7) // Xterm-style extended coordinates
|
||||
#define MODE_Mouse1006 (MODES_SCREEN+8) // 2nd Xterm-style extended coordinates
|
||||
#define MODE_Mouse1015 (MODES_SCREEN+9) // Urxvt-style extended coordinates
|
||||
#define MODE_Ansi (MODES_SCREEN+10) // Use US Ascii for character sets G0-G3 (DECANM)
|
||||
#define MODE_132Columns (MODES_SCREEN+11) // 80 <-> 132 column mode switch (DECCOLM)
|
||||
#define MODE_Allow132Columns (MODES_SCREEN+12) // Allow DECCOLM mode
|
||||
#define MODE_BracketedPaste (MODES_SCREEN+13) // Xterm-style bracketed paste mode
|
||||
#define MODE_total (MODES_SCREEN+14)
|
||||
|
||||
|
||||
struct CharCodes
|
||||
namespace Konsole
|
||||
{
|
||||
extern unsigned short vt100_graphics[32];
|
||||
|
||||
struct CharCodes {
|
||||
// coding info
|
||||
char charset[4]; //
|
||||
int cu_cs; // actual charset.
|
||||
|
|
@ -127,7 +130,7 @@ private:
|
|||
void resetModes();
|
||||
|
||||
void resetTokenizer();
|
||||
#define MAX_TOKEN_LENGTH 80
|
||||
#define MAX_TOKEN_LENGTH 256 // Max length of tokens (e.g. window title)
|
||||
void addToCurrentToken(int cc);
|
||||
int tokenBuffer[MAX_TOKEN_LENGTH]; //FIXME: overflow?
|
||||
int tokenBufferPos;
|
||||
|
|
@ -155,9 +158,6 @@ private:
|
|||
void reportCursorPosition();
|
||||
void reportTerminalParms(int p);
|
||||
|
||||
void onScrollLock();
|
||||
void scrollLock(const bool lock);
|
||||
|
||||
// clears the screen and resizes it to the specified
|
||||
// number of columns
|
||||
void clearScreenAndSetColumns(int columnCount);
|
||||
|
|
@ -168,8 +168,9 @@ private:
|
|||
{
|
||||
public:
|
||||
// Initializes all modes to false
|
||||
TerminalState()
|
||||
{ memset(&mode,false,MODE_total * sizeof(bool)); }
|
||||
TerminalState() {
|
||||
memset(&mode, false, MODE_total * sizeof(bool));
|
||||
}
|
||||
|
||||
bool mode[MODE_total];
|
||||
};
|
||||
|
|
@ -185,6 +186,6 @@ private:
|
|||
QHash<int, QString> _pendingTitleUpdates;
|
||||
QTimer* _titleUpdateTimer;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // VT102EMULATION_H
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user