import java.io.IOException;
import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
import jexer.event.TCommandEvent;
import jexer.event.TKeypressEvent;
import jexer.event.TMouseEvent;
*/
private int leftColumn = 0;
- /**
- * If true, selection is a rectangle.
- */
- private boolean selectionRectangle = false;
-
/**
* If true, the mouse is dragging a selection.
*/
if (mouse.isMouse1()) {
// Selection.
- if (inSelection) {
- selectionColumn1 = leftColumn + mouse.getX();
- selectionLine1 = topLine + mouse.getY();
- } else if (mouse.isShift() || mouse.isCtrl()) {
- inSelection = true;
- selectionColumn0 = leftColumn + mouse.getX();
- selectionLine0 = topLine + mouse.getY();
- selectionColumn1 = selectionColumn0;
- selectionLine1 = selectionLine0;
- selectionRectangle = mouse.isAlt() | mouse.isCtrl();
- }
+ inSelection = true;
+ selectionColumn0 = leftColumn + mouse.getX();
+ selectionLine0 = topLine + mouse.getY();
+ selectionColumn1 = selectionColumn0;
+ selectionLine1 = selectionLine0;
// Set the row and column
int newLine = topLine + mouse.getY();
if (inSelection) {
selectionColumn1 = document.getCursor();
selectionLine1 = document.getLineNumber();
- selectionRectangle = mouse.isCtrl();
}
return;
}
if (inSelection) {
selectionColumn1 = document.getCursor();
selectionLine1 = document.getLineNumber();
- selectionRectangle = mouse.isCtrl();
}
return;
} else {
public void onMouseMotion(final TMouseEvent mouse) {
if (mouse.isMouse1()) {
+ // Set the row and column
+ int newLine = topLine + mouse.getY();
+ int newX = leftColumn + mouse.getX();
+ if ((newLine < 0) || (newX < 0)) {
+ return;
+ }
+
// Selection.
if (inSelection) {
- selectionColumn1 = leftColumn + mouse.getX();
- selectionLine1 = topLine + mouse.getY();
- } else if (mouse.isShift() || mouse.isCtrl()) {
+ selectionColumn1 = newX;
+ selectionLine1 = newLine;
+ } else {
inSelection = true;
- selectionColumn0 = leftColumn + mouse.getX();
- selectionLine0 = topLine + mouse.getY();
+ selectionColumn0 = newX;
+ selectionLine0 = newLine;
selectionColumn1 = selectionColumn0;
selectionLine1 = selectionLine0;
- selectionRectangle = mouse.isAlt() | mouse.isCtrl();
}
- // Set the row and column
- int newLine = topLine + mouse.getY();
- int newX = leftColumn + mouse.getX();
if (newLine > document.getLineCount() - 1) {
// Go to the end
document.setLineNumber(document.getLineCount() - 1);
if (inSelection) {
selectionColumn1 = document.getCursor();
selectionLine1 = document.getLineNumber();
- selectionRectangle = mouse.isCtrl();
}
return;
}
-
document.setLineNumber(newLine);
setCursorY(mouse.getY());
if (newX >= document.getCurrentLine().getDisplayLength()) {
if (inSelection) {
selectionColumn1 = document.getCursor();
selectionLine1 = document.getLineNumber();
- selectionRectangle = mouse.isCtrl();
}
return;
- } else {
- inSelection = false;
}
// Pass to children
super.onMouseDown(mouse);
}
- /**
- * Handle mouse release events.
- *
- * @param mouse mouse button release event
- */
- @Override
- public void onMouseUp(final TMouseEvent mouse) {
- inSelection = false;
-
- // Pass to children
- super.onMouseDown(mouse);
- }
-
/**
* Handle keystrokes.
*
*/
@Override
public void onKeypress(final TKeypressEvent keypress) {
- if (keypress.getKey().isShift() || keypress.getKey().isCtrl()) {
+ if (keypress.getKey().isShift()) {
// Selection.
if (!inSelection) {
inSelection = true;
selectionLine0 = document.getLineNumber();
selectionColumn1 = selectionColumn0;
selectionLine1 = selectionLine0;
- selectionRectangle = keypress.getKey().isCtrl();
}
} else {
- inSelection = false;
+ if (keypress.equals(kbLeft)
+ || keypress.equals(kbRight)
+ || keypress.equals(kbUp)
+ || keypress.equals(kbDown)
+ || keypress.equals(kbPgDn)
+ || keypress.equals(kbPgUp)
+ || keypress.equals(kbHome)
+ || keypress.equals(kbEnd)
+ ) {
+ // Non-shifted navigation keys disable selection.
+ inSelection = false;
+ }
}
if (keypress.equals(kbLeft)
alignTopLine(true);
} else if (keypress.equals(kbAltLeft)
|| keypress.equals(kbCtrlLeft)
+ || keypress.equals(kbAltShiftLeft)
+ || keypress.equals(kbCtrlShiftLeft)
) {
document.backwardsWord();
alignTopLine(false);
} else if (keypress.equals(kbAltRight)
|| keypress.equals(kbCtrlRight)
+ || keypress.equals(kbAltShiftRight)
+ || keypress.equals(kbCtrlShiftRight)
) {
document.forwardsWord();
alignTopLine(true);
) {
document.down();
alignTopLine(true);
- } else if (keypress.equals(kbPgUp)) {
+ } else if (keypress.equals(kbPgUp)
+ || keypress.equals(kbShiftPgUp)
+ ) {
document.up(getHeight() - 1);
alignTopLine(false);
- } else if (keypress.equals(kbPgDn)) {
+ } else if (keypress.equals(kbPgDn)
+ || keypress.equals(kbShiftPgDn)
+ ) {
document.down(getHeight() - 1);
alignTopLine(true);
- } else if (keypress.equals(kbHome)) {
+ } else if (keypress.equals(kbHome)
+ || keypress.equals(kbShiftHome)
+ ) {
if (document.home()) {
leftColumn = 0;
if (leftColumn < 0) {
}
setCursorX(0);
}
- } else if (keypress.equals(kbEnd)) {
+ } else if (keypress.equals(kbEnd)
+ || keypress.equals(kbShiftEnd)
+ ) {
if (document.end()) {
alignCursor();
}
- } else if (keypress.equals(kbCtrlHome)) {
+ } else if (keypress.equals(kbCtrlHome)
+ || keypress.equals(kbCtrlShiftHome)
+ ) {
document.setLineNumber(0);
document.home();
topLine = 0;
leftColumn = 0;
setCursorX(0);
setCursorY(0);
- } else if (keypress.equals(kbCtrlEnd)) {
+ } else if (keypress.equals(kbCtrlEnd)
+ || keypress.equals(kbCtrlShiftEnd)
+ ) {
document.setLineNumber(document.getLineCount() - 1);
document.end();
alignTopLine(false);
} else if (keypress.equals(kbIns)) {
document.setOverwrite(!document.getOverwrite());
} else if (keypress.equals(kbDel)) {
- document.del();
+ if (inSelection) {
+ deleteSelection();
+ } else {
+ document.del();
+ }
alignCursor();
} else if (keypress.equals(kbBackspace)
|| keypress.equals(kbBackspaceDel)
) {
- document.backspace();
+ if (inSelection) {
+ deleteSelection();
+ } else {
+ document.backspace();
+ }
alignTopLine(false);
} else if (keypress.equals(kbTab)) {
+ deleteSelection();
// Add spaces until we hit modulo 8.
for (int i = document.getCursor(); (i + 1) % 8 != 0; i++) {
document.addChar(' ');
}
alignCursor();
} else if (keypress.equals(kbEnter)) {
+ deleteSelection();
document.enter();
alignTopLine(true);
} else if (!keypress.getKey().isFnKey()
&& !keypress.getKey().isCtrl()
) {
// Plain old keystroke, process it
+ deleteSelection();
document.addChar(keypress.getKey().getChar());
alignCursor();
} else {
if (inSelection) {
selectionColumn1 = document.getCursor();
selectionLine1 = document.getLineNumber();
- selectionRectangle = keypress.getKey().isCtrl();
}
}
public void onCommand(final TCommandEvent command) {
if (command.equals(cmCut)) {
// Copy text to clipboard, and then remove it.
-
- // TODO
-
+ copySelection();
deleteSelection();
return;
}
if (command.equals(cmCopy)) {
// Copy text to clipboard.
-
- // TODO
-
+ copySelection();
return;
}
*/
@Override
public void draw() {
+ CellAttributes selectedColor = getTheme().getColor("teditor.selected");
+
+ int startCol = selectionColumn0;
+ int startRow = selectionLine0;
+ int endCol = selectionColumn1;
+ int endRow = selectionLine1;
+
+ if (((selectionColumn1 < selectionColumn0)
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
+ ) {
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
+ startCol = selectionColumn1;
+ startRow = selectionLine1;
+ endCol = selectionColumn0;
+ endRow = selectionLine0;
+ }
+
for (int i = 0; i < getHeight(); i++) {
// Background line
getScreen().hLineXY(0, i, getWidth(), ' ', defaultColor);
break;
}
}
- }
- // TODO: highlight selected region
+ // Highlight selected region
+ if (inSelection) {
+ if (startRow == endRow) {
+ if (topLine + i == startRow) {
+ for (x = startCol; x <= endCol; x++) {
+ putAttrXY(x - leftColumn, i, selectedColor);
+ }
+ }
+ } else {
+ if (topLine + i == startRow) {
+ for (x = startCol; x < line.getDisplayLength(); x++) {
+ putAttrXY(x - leftColumn, i, selectedColor);
+ }
+ } else if (topLine + i == endRow) {
+ for (x = 0; x <= endCol; x++) {
+ putAttrXY(x - leftColumn, i, selectedColor);
+ }
+ } else if ((topLine + i >= startRow)
+ && (topLine + i <= endRow)
+ ) {
+ for (x = 0; x < getWidth(); x++) {
+ putAttrXY(x, i, selectedColor);
+ }
+ }
+ }
+ }
+
+ }
}
}
if (inSelection == false) {
return;
}
+ inSelection = false;
+
+ int startCol = selectionColumn0;
+ int startRow = selectionLine0;
+ int endCol = selectionColumn1;
+ int endRow = selectionLine1;
+
+ /*
+ System.err.println("INITIAL: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
+
+ if (((selectionColumn1 < selectionColumn0)
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
+ ) {
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
+ startCol = selectionColumn1;
+ startRow = selectionLine1;
+ endCol = selectionColumn0;
+ endRow = selectionLine0;
+
+ if (endRow >= document.getLineCount()) {
+ // The selection started beyond EOF, trim it to EOF.
+ endRow = document.getLineCount() - 1;
+ endCol = document.getLine(endRow).getDisplayLength();
+ } else if (endRow == document.getLineCount() - 1) {
+ // The selection started beyond EOF, trim it to EOF.
+ if (endCol >= document.getLine(endRow).getDisplayLength()) {
+ endCol = document.getLine(endRow).getDisplayLength() - 1;
+ }
+ }
+ }
+ /*
+ System.err.println("FLIP: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ System.err.println(" --END: " + endRow + " " + document.getLineCount() +
+ " " + document.getLine(endRow).getDisplayLength());
+ */
+
+ assert (endRow < document.getLineCount());
+ if (endCol >= document.getLine(endRow).getDisplayLength()) {
+ endCol = document.getLine(endRow).getDisplayLength() - 1;
+ }
+ if (endCol < 0) {
+ endCol = 0;
+ }
+ if (startCol >= document.getLine(startRow).getDisplayLength()) {
+ startCol = document.getLine(startRow).getDisplayLength() - 1;
+ }
+ if (startCol < 0) {
+ startCol = 0;
+ }
+
+ // Place the cursor on the selection end, and "press backspace" until
+ // the cursor matches the selection start.
+ /*
+ System.err.println("BEFORE: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
+ document.setLineNumber(endRow);
+ document.setCursor(endCol + 1);
+ while (!((document.getLineNumber() == startRow)
+ && (document.getCursor() == startCol))
+ ) {
+ /*
+ System.err.println("DURING: " + startRow + " " + startCol + " " +
+ endRow + " " + endCol + " " +
+ document.getLineNumber() + " " + document.getCursor());
+ */
+
+ document.backspace();
+ }
+ alignTopLine(true);
+ }
+
+ /**
+ * Copy text within the selection bounds to clipboard.
+ */
+ private void copySelection() {
+ if (inSelection == false) {
+ return;
+ }
+
+ int startCol = selectionColumn0;
+ int startRow = selectionLine0;
+ int endCol = selectionColumn1;
+ int endRow = selectionLine1;
+
+ if (((selectionColumn1 < selectionColumn0)
+ && (selectionLine1 == selectionLine0))
+ || (selectionLine1 < selectionLine0)
+ ) {
+ // The user selected from bottom-to-top and/or right-to-left.
+ // Reverse the coordinates for the inverted section.
+ startCol = selectionColumn1;
+ startRow = selectionLine1;
+ endCol = selectionColumn0;
+ endRow = selectionLine0;
+ }
+
+ StringBuilder sb = new StringBuilder();
+
+ if (endRow > startRow) {
+ // First line
+ String line = document.getLine(startRow).getRawString();
+ int x = 0;
+ for (int i = 0; i < line.length(); ) {
+ int ch = line.codePointAt(i);
+
+ if (x >= startCol) {
+ sb.append(Character.toChars(ch));
+ }
+ x += StringUtils.width(ch);
+ i += Character.charCount(ch);
+ }
+ sb.append("\n");
+
+ // Middle lines
+ for (int y = startRow + 1; y < endRow; y++) {
+ sb.append(document.getLine(y).getRawString());
+ sb.append("\n");
+ }
+
+ // Final line
+ line = document.getLine(endRow).getRawString();
+ x = 0;
+ for (int i = 0; i < line.length(); ) {
+ int ch = line.codePointAt(i);
+
+ if (x > endCol) {
+ break;
+ }
+
+ sb.append(Character.toChars(ch));
+ x += StringUtils.width(ch);
+ i += Character.charCount(ch);
+ }
+ } else {
+ assert (startRow == endRow);
+
+ // Only one line
+ String line = document.getLine(startRow).getRawString();
+ int x = 0;
+ for (int i = 0; i < line.length(); ) {
+ int ch = line.codePointAt(i);
+
+ if ((x >= startCol) && (x <= endCol)) {
+ sb.append(Character.toChars(ch));
+ }
+
+ x += StringUtils.width(ch);
+ i += Character.charCount(ch);
+ }
+ }
- // TODO
+ getClipboard().copyText(sb.toString());
}
// ------------------------------------------------------------------------
git://git.nikiroo.be / fanfix.git / blobdiff