Skip to content

Fixed: Remove trailing whitespace padding when copying multi-line text #4940

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
tcely wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed: Remove trailing whitespace padding when copying multi-line text #4940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions terminal-emulator/src/main/java/com/termux/terminal/TerminalBuffer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,34 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolea
for (int row = selY1; row <= selY2; row++) {
int x1 = (row == selY1) ? selX1 : 0;
int x2;
TerminalRow lineObject = mLines[externalToInternalRow(row)];
boolean rowLineWrap = getLineWrap(row);

if (row == selY2) {
x2 = selX2 + 1;
if (x2 > columns) x2 = columns;
} else {
x2 = columns;
// For non-final rows, only read to full width if line is wrapped.
// Otherwise, find the actual end of content to avoid trailing whitespace.
if (rowLineWrap) {
x2 = columns;
} else {
// Find last non-space character in the line
x2 = lineObject.getSpaceUsed();
char[] text = lineObject.mText;
for (int i = x2 - 1; i >= 0; i--) {
if (text[i] != ' ') {
x2 = i + 1;
break;
}
}
if (x2 == 0 && lineObject.getSpaceUsed() > 0) {
// Line is all spaces - keep at least one to preserve empty line
x2 = 1;
}
}
}
TerminalRow lineObject = mLines[externalToInternalRow(row)];

int x1Index = lineObject.findStartOfColumn(x1);
int x2Index = (x2 < mColumns) ? lineObject.findStartOfColumn(x2) : lineObject.getSpaceUsed();
if (x2Index == x1Index) {
Expand All @@ -83,7 +104,6 @@ public String getSelectedText(int selX1, int selY1, int selX2, int selY2, boolea
char[] line = lineObject.mText;
int lastPrintingCharIndex = -1;
int i;
boolean rowLineWrap = getLineWrap(row);
if (rowLineWrap && x2 == columns) {
// If the line was wrapped, we shouldn't lose trailing space:
lastPrintingCharIndex = x2Index - 1;
Expand Down