Bug fixes

[fanfix.git] / src / jexer / TEditorWidget.java

diff --git a/src/jexer/TEditorWidget.java b/src/jexer/TEditorWidget.java
index cf4d887fd3cba5525637f406e4b776e517950d54..690c5731f280a936cd1ce6f5ac3bbcf0c4d4f4ac 100644 (file)
--- a/src/jexer/TEditorWidget.java
+++ b/src/jexer/TEditorWidget.java
@@ -112,7 +112,6 @@ public final class TEditorWidget extends TWidget {
                 }
             }
         }
-
     }
 
     /**
@@ -141,14 +140,14 @@ public final class TEditorWidget extends TWidget {
             // Set the row and column
             int newLine = topLine + mouse.getY();
             int newX = leftColumn + mouse.getX();
-            if (newLine > document.getLineCount()) {
+            if (newLine > document.getLineCount() - 1) {
                 // Go to the end
                 document.setLineNumber(document.getLineCount() - 1);
                 document.end();
-                if (document.getLineCount() > getHeight()) {
-                    setCursorY(getHeight() - 1);
+                if (newLine > document.getLineCount() - 1) {
+                    setCursorY(document.getLineCount() - 1 - topLine);
                 } else {
-                    setCursorY(document.getLineCount() - 1);
+                    setCursorY(mouse.getY());
                 }
                 alignCursor();
                 return;
@@ -160,6 +159,7 @@ public final class TEditorWidget extends TWidget {
                 document.end();
                 alignCursor();
             } else {
+                document.setCursor(newX);
                 setCursorX(mouse.getX());
             }
             return;
@@ -183,8 +183,13 @@ public final class TEditorWidget extends TWidget {
             // Need to move topLine to bring document back into view.
             if (topLineIsTop) {
                 topLine = line - (getHeight() - 1);
+                if (topLine < 0) {
+                    topLine = 0;
+                }
+                assert (topLine >= 0);
             } else {
                 topLine = line;
+                assert (topLine >= 0);
             }
         }
 
@@ -193,6 +198,7 @@ public final class TEditorWidget extends TWidget {
         */
 
         // Document is in view, let's set cursorY
+        assert (line >= topLine);
         setCursorY(line - topLine);
         alignCursor();
     }
@@ -206,6 +212,7 @@ public final class TEditorWidget extends TWidget {
      */
     private void alignDocument(final boolean topLineIsTop) {
         int line = document.getLineNumber();
+        int cursor = document.getCursor();
 
         if ((line < topLine) || (line > topLine + getHeight() - 1)) {
             // Need to move document to ensure it fits view.
@@ -214,6 +221,9 @@ public final class TEditorWidget extends TWidget {
             } else {
                 document.setLineNumber(topLine + (getHeight() - 1));
             }
+            if (cursor < document.getCurrentLine().getDisplayLength()) {
+                document.setCursor(cursor);
+            }
         }
 
         /*
@@ -244,7 +254,8 @@ public final class TEditorWidget extends TWidget {
         /*
         System.err.println("document cursor " + document.getCursor() +
             " leftColumn " + leftColumn);
-         */
+        */
+
 
         setCursorX(document.getCursor() - leftColumn);
     }
@@ -257,13 +268,11 @@ public final class TEditorWidget extends TWidget {
     @Override
     public void onKeypress(final TKeypressEvent keypress) {
         if (keypress.equals(kbLeft)) {
-            if (document.left()) {
-                alignCursor();
-            }
+            document.left();
+            alignTopLine(false);
         } else if (keypress.equals(kbRight)) {
-            if (document.right()) {
-                alignCursor();
-            }
+            document.right();
+            alignTopLine(true);
         } else if (keypress.equals(kbUp)) {
             document.up();
             alignTopLine(false);
@@ -302,14 +311,21 @@ public final class TEditorWidget extends TWidget {
         } else if (keypress.equals(kbIns)) {
             document.setOverwrite(!document.getOverwrite());
         } else if (keypress.equals(kbDel)) {
-            // TODO: join lines
             document.del();
             alignCursor();
         } else if (keypress.equals(kbBackspace)) {
             document.backspace();
+            alignTopLine(false);
+        } else if (keypress.equals(kbTab)) {
+            // TODO: tab character.  For now just 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)) {
-            // TODO: split lines
+            document.enter();
+            alignTopLine(true);
         } else if (!keypress.getKey().isFnKey()
             && !keypress.getKey().isAlt()
             && !keypress.getKey().isCtrl()
@@ -375,7 +391,11 @@ public final class TEditorWidget extends TWidget {
      * @param row the new editing row number.  Row 1 is the first row.
      */
     public void setEditingRowNumber(final int row) {
-        document.setLineNumber(row - 1);
+        assert (row > 0);
+        if ((row > 0) && (row < document.getLineCount())) {
+            document.setLineNumber(row - 1);
+            alignTopLine(true);
+        }
     }
 
     /**
@@ -394,7 +414,10 @@ public final class TEditorWidget extends TWidget {
      * column.
      */
     public void setEditingColumnNumber(final int column) {
-        document.setCursor(column - 1);
+        if ((column > 0) && (column < document.getLineLength())) {
+            document.setCursor(column - 1);
+            alignCursor();
+        }
     }
 
     /**