Skip to content

Fix for ANSI issues (#34) #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ape wants to merge 4 commits into
base: silica
Choose a base branch
from
Open

Fix for ANSI issues (#34) #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f5b141
terminal: Add support for ansi sequence CSI n X - erase n chars
urjaman Nov 24, 2014
7d86380
terminal: Add CSI n I and CSI n Z support and cleanup tab code (Next:…
urjaman Nov 24, 2014
cb83d50
Add definitions for the previous commit (tab CSI support)
urjaman Nov 24, 2014
f542177
Merge branch 'ansifix' into silica
Ape Jul 16, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 62 additions & 8 deletions src/terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,14 +297,7 @@ void Terminal::insertInBuffer(const QString& chars)
}
}
else if(ch.toLatin1()=='\t') { //tab
if(cursorPos().y() <= iTabStops.size()) {
for(int i=0; i<iTabStops[cursorPos().y()-1].count(); i++) {
if(iTabStops[cursorPos().y()-1][i] > cursorPos().x()) {
setCursorPos(QPoint( iTabStops[cursorPos().y()-1][i], cursorPos().y() ));
break;
}
}
}
forwardTab();
}
else if(ch.toLatin1()==14 || ch.toLatin1()==15) { //SI and SO, related to character set... ignore
}
Expand Down Expand Up @@ -457,6 +450,30 @@ void Terminal::clearAll(bool wholeBuffer)
setCursorPos(QPoint(1,1));
}

void Terminal::backwardTab(void)
{
if(cursorPos().y() <= iTabStops.size()) {
for(int i=iTabStops[cursorPos().y()-1].count()-1; i>=0; i--) {
if(iTabStops[cursorPos().y()-1][i] < cursorPos().x()) {
setCursorPos(QPoint( iTabStops[cursorPos().y()-1][i], cursorPos().y() ));
break;
}
}
}
}

void Terminal::forwardTab(void)
{
if(cursorPos().y() <= iTabStops.size()) {
for(int i=0; i<iTabStops[cursorPos().y()-1].count(); i++) {
if(iTabStops[cursorPos().y()-1][i] > cursorPos().x()) {
setCursorPos(QPoint( iTabStops[cursorPos().y()-1][i], cursorPos().y() ));
break;
}
}
}
}


void Terminal::ansiSequence(const QString& seq)
{
Expand Down Expand Up @@ -609,6 +626,43 @@ void Terminal::ansiSequence(const QString& seq)
}
break;

case 'X':
if(!extra.isEmpty() || (params.count()>1)) {
unhandled=true;
break;
}
if (params.count()==0) {
params.append(1);
}
eraseLineAtCursor(cursorPos().x(),cursorPos().x()+(params.at(0)?params.at(0)-1:0));
break;

case 'I':
if(!extra.isEmpty() || (params.count()>1)) {
unhandled=true;
break;
}
if (params.count()==0) {
params.append(1);
}
for (int i=0;i<params.at(0);i++) {
forwardTab();
}
break;

case 'Z':
if(!extra.isEmpty() || (params.count()>1)) {
unhandled=true;
break;
}
if (params.count()==0) {
params.append(1);
}
for (int i=0;i<params.at(0);i++) {
backwardTab();
}
break;

case 'L': // insert lines
if(!extra.isEmpty()) {
unhandled=true;
Expand Down
4 changes: 3 additions & 1 deletion src/terminal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ class Terminal : public QObject
void resetTerminal();
void resetTabs();
void adjustSelectionPosition(int lines);

void forwardTab();
void backwardTab();

TextRender* iRenderer;
PtyIFace* iPtyIFace;
QQuickView* iWindow;
Expand Down