X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTEditorWidget.java;h=7798ad84c6a425b7a798860febcfe24289cbd79f;hb=12d0abe244f0d80712b99f0ad309ad836d5a4c06;hp=dcd2feaa74da296ff5b009cf9c00ec7a7babba1e;hpb=101bc589ae14b3258a0a09514e68a59bec2c3daa;p=fanfix.git diff --git a/src/jexer/TEditorWidget.java b/src/jexer/TEditorWidget.java index dcd2fea..7798ad8 100644 --- a/src/jexer/TEditorWidget.java +++ b/src/jexer/TEditorWidget.java @@ -31,6 +31,7 @@ package jexer; import java.io.IOException; import jexer.bits.CellAttributes; +import jexer.bits.StringUtils; import jexer.event.TCommandEvent; import jexer.event.TKeypressEvent; import jexer.event.TMouseEvent; @@ -80,11 +81,6 @@ public class TEditorWidget extends TWidget implements EditMenuUser { */ private int leftColumn = 0; - /** - * If true, selection is a rectangle. - */ - private boolean selectionRectangle = false; - /** * If true, the mouse is dragging a selection. */ @@ -168,17 +164,11 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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(); @@ -196,7 +186,6 @@ public class TEditorWidget extends TWidget implements EditMenuUser { if (inSelection) { selectionColumn1 = document.getCursor(); selectionLine1 = document.getLineNumber(); - selectionRectangle = mouse.isCtrl(); } return; } @@ -213,7 +202,6 @@ public class TEditorWidget extends TWidget implements EditMenuUser { if (inSelection) { selectionColumn1 = document.getCursor(); selectionLine1 = document.getLineNumber(); - selectionRectangle = mouse.isCtrl(); } return; } else { @@ -233,22 +221,25 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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); @@ -262,11 +253,9 @@ public class TEditorWidget extends TWidget implements EditMenuUser { if (inSelection) { selectionColumn1 = document.getCursor(); selectionLine1 = document.getLineNumber(); - selectionRectangle = mouse.isCtrl(); } return; } - document.setLineNumber(newLine); setCursorY(mouse.getY()); if (newX >= document.getCurrentLine().getDisplayLength()) { @@ -279,30 +268,14 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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. * @@ -310,7 +283,7 @@ public class TEditorWidget extends TWidget implements EditMenuUser { */ @Override public void onKeypress(final TKeypressEvent keypress) { - if (keypress.getKey().isShift() || keypress.getKey().isCtrl()) { + if (keypress.getKey().isShift()) { // Selection. if (!inSelection) { inSelection = true; @@ -318,10 +291,20 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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) @@ -336,11 +319,15 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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); @@ -354,13 +341,19 @@ public class TEditorWidget extends TWidget implements EditMenuUser { ) { 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) { @@ -368,38 +361,54 @@ public class TEditorWidget extends TWidget implements EditMenuUser { } 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() @@ -407,6 +416,7 @@ public class TEditorWidget extends TWidget implements EditMenuUser { && !keypress.getKey().isCtrl() ) { // Plain old keystroke, process it + deleteSelection(); document.addChar(keypress.getKey().getChar()); alignCursor(); } else { @@ -417,7 +427,6 @@ public class TEditorWidget extends TWidget implements EditMenuUser { if (inSelection) { selectionColumn1 = document.getCursor(); selectionLine1 = document.getLineNumber(); - selectionRectangle = keypress.getKey().isCtrl(); } } @@ -458,18 +467,14 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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; } @@ -506,6 +511,25 @@ public class TEditorWidget extends TWidget implements EditMenuUser { */ @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); @@ -524,9 +548,35 @@ public class TEditorWidget extends TWidget implements EditMenuUser { 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); + } + } + } + } + + } } } @@ -741,6 +791,17 @@ public class TEditorWidget extends TWidget implements EditMenuUser { return document.getLineLengthMax() + 1; } + /** + * Get the current editing row plain text. 1-based. + * + * @param row the editing row number. Row 1 is the first row. + * @return the plain text of the row + */ + public String getEditingRawLine(final int row) { + Line line = document.getLine(row - 1); + return line.getRawString(); + } + /** * Get the dirty value. * @@ -750,6 +811,13 @@ public class TEditorWidget extends TWidget implements EditMenuUser { return document.isDirty(); } + /** + * Unset the dirty flag. + */ + public void setNotDirty() { + document.setNotDirty(); + } + /** * Save contents to file. * @@ -767,8 +835,238 @@ public class TEditorWidget extends TWidget implements EditMenuUser { if (inSelection == false) { return; } + inSelection = false; + + int startCol = selectionColumn0; + int startRow = selectionLine0; + int endCol = selectionColumn1; + int endRow = selectionLine1; - // TODO + /* + 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); + } + } + + getClipboard().copyText(sb.toString()); + } + + /** + * Set the selection. + * + * @param startRow the starting row number. 0-based: row 0 is the first + * row. + * @param startColumn the starting column number. 0-based: column 0 is + * the first column. + * @param endRow the ending row number. 0-based: row 0 is the first row. + * @param endColumn the ending column number. 0-based: column 0 is the + * first column. + */ + public void setSelection(final int startRow, final int startColumn, + final int endRow, final int endColumn) { + + inSelection = true; + selectionLine0 = startRow; + selectionColumn0 = startColumn; + selectionLine1 = endRow; + selectionColumn1 = endColumn; + } + + /** + * Unset the selection. + */ + public void unsetSelection() { + inSelection = false; + } + + /** + * Replace whatever is being selected with new text. If not in + * selection, nothing is replaced. + * + * @param text the new replacement text + */ + public void replaceSelection(final String text) { + if (!inSelection) { + return; + } + + // Delete selected text, then paste text from clipboard. + deleteSelection(); + + for (int i = 0; i < text.length(); ) { + int ch = text.codePointAt(i); + onKeypress(new TKeypressEvent(false, 0, ch, false, false, + false)); + i += Character.charCount(ch); + } + } + + /** + * Get the entire contents of the editor as one string. + * + * @return the editor contents + */ + public String getText() { + return document.getText(); + } + + /** + * Set the entire contents of the editor from one string. + * + * @param text the new contents + */ + public void setText(final String text) { + document = new Document(text, defaultColor); + unsetSelection(); + topLine = 0; + leftColumn = 0; } // ------------------------------------------------------------------------