X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTEditorWidget.java;h=7798ad84c6a425b7a798860febcfe24289cbd79f;hb=ed76cd41d2764d6c5d3ef03449723579af9a2197;hp=a329dfa347b770dcb279140a1c5ef170f72aab64;hpb=20c416a0cb63ad5d2e3f14eae42d2d7b2f13e946;p=fanfix.git

diff --git a/src/jexer/TEditorWidget.java b/src/jexer/TEditorWidget.java
index a329dfa..7798ad8 100644
--- a/src/jexer/TEditorWidget.java
+++ b/src/jexer/TEditorWidget.java
@@ -221,21 +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();
+                selectionColumn1 = newX;
+                selectionLine1 = newLine;
             } else {
                 inSelection = true;
-                selectionColumn0 = leftColumn + mouse.getX();
-                selectionLine0 = topLine + mouse.getY();
+                selectionColumn0 = newX;
+                selectionLine0 = newLine;
                 selectionColumn1 = selectionColumn0;
                 selectionLine1 = selectionLine0;
             }
 
-            // 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);
@@ -252,7 +256,6 @@ public class TEditorWidget extends TWidget implements EditMenuUser {
                 }
                 return;
             }
-
             document.setLineNumber(newLine);
             setCursorY(mouse.getY());
             if (newX >= document.getCurrentLine().getDisplayLength()) {
@@ -516,12 +519,11 @@ public class TEditorWidget extends TWidget implements EditMenuUser {
         int endRow = selectionLine1;
 
         if (((selectionColumn1 < selectionColumn0)
-                && (selectionLine1 <= selectionLine0))
-            || ((selectionColumn1 <= selectionColumn0)
-                && (selectionLine1 < selectionLine0))
+                && (selectionLine1 == selectionLine0))
+            || (selectionLine1 < selectionLine0)
         ) {
-            // The user selected from bottom-right to top-left.  Reverse the
-            // coordinates for the inverted section.
+            // 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;
@@ -789,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.
      *
@@ -798,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.
      *
@@ -822,26 +842,74 @@ public class TEditorWidget extends TWidget implements EditMenuUser {
         int endCol = selectionColumn1;
         int endRow = selectionLine1;
 
+        /*
+        System.err.println("INITIAL: " + startRow + " " + startCol + " " +
+            endRow + " " + endCol + " " +
+            document.getLineNumber() + " " + document.getCursor());
+         */
+
         if (((selectionColumn1 < selectionColumn0)
-                && (selectionLine1 <= selectionLine0))
-            || ((selectionColumn1 <= selectionColumn0)
-                && (selectionLine1 < selectionLine0))
+                && (selectionLine1 == selectionLine0))
+            || (selectionLine1 < selectionLine0)
         ) {
-            // The user selected from bottom-right to top-left.  Reverse the
-            // coordinates for the inverted section.
+            // 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);
@@ -861,12 +929,11 @@ public class TEditorWidget extends TWidget implements EditMenuUser {
         int endRow = selectionLine1;
 
         if (((selectionColumn1 < selectionColumn0)
-                && (selectionLine1 <= selectionLine0))
-            || ((selectionColumn1 <= selectionColumn0)
-                && (selectionLine1 < selectionLine0))
+                && (selectionLine1 == selectionLine0))
+            || (selectionLine1 < selectionLine0)
         ) {
-            // The user selected from bottom-right to top-left.  Reverse the
-            // coordinates for the inverted section.
+            // 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;
@@ -931,6 +998,77 @@ public class TEditorWidget extends TWidget implements EditMenuUser {
         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;
+    }
+
     // ------------------------------------------------------------------------
     // EditMenuUser -----------------------------------------------------------
     // ------------------------------------------------------------------------