X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTField.java;h=7c8b5bc415e62882a24941734da6ac213c706b75;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=3d727ea17ce1d19003646ec6091570e6173bb860;hpb=afdec5e9d0416e1c571f1961572b8ededef81146;p=fanfix.git

diff --git a/src/jexer/TField.java b/src/jexer/TField.java
index 3d727ea..7c8b5bc 100644
--- a/src/jexer/TField.java
+++ b/src/jexer/TField.java
@@ -219,16 +219,12 @@ public class TField extends TWidget {
 
         if (keypress.equals(kbLeft)) {
             if (position > 0) {
-                if (position < text.length()) {
-                    screenPosition -= StringUtils.width(text.charAt(position));
-                } else {
-                    screenPosition--;
-                }
-                position--;
+                screenPosition -= StringUtils.width(text.codePointBefore(position));
+                position -= Character.charCount(text.codePointBefore(position));
             }
             if (fixed == false) {
                 if ((screenPosition == windowStart) && (windowStart > 0)) {
-                    windowStart -= StringUtils.width(text.charAt(
+                    windowStart -= StringUtils.width(text.codePointAt(
                         screenToTextPosition(windowStart)));
                 }
             }
@@ -238,20 +234,24 @@ public class TField extends TWidget {
 
         if (keypress.equals(kbRight)) {
             if (position < text.length()) {
-                screenPosition += StringUtils.width(text.charAt(position));
-                position++;
+                screenPosition += StringUtils.width(text.codePointAt(position));
+                position += Character.charCount(text.codePointAt(position));
                 if (fixed == true) {
                     if (screenPosition == getWidth()) {
                         screenPosition--;
-                        position--;
+                        position -= Character.charCount(text.codePointAt(position));
                     }
                 } else {
-                    if ((screenPosition - windowStart) >= getWidth()) {
-                        windowStart += StringUtils.width(text.charAt(
+                    while ((screenPosition - windowStart +
+                            StringUtils.width(text.codePointAt(text.length() - 1)))
+                        > getWidth()
+                    ) {
+                        windowStart += StringUtils.width(text.codePointAt(
                             screenToTextPosition(windowStart)));
                     }
                 }
             }
+            assert (position <= text.length());
             return;
         }
 
@@ -286,7 +286,7 @@ public class TField extends TWidget {
 
         if (keypress.equals(kbBackspace) || keypress.equals(kbBackspaceDel)) {
             if (position > 0) {
-                position--;
+                position -= Character.charCount(text.codePointBefore(position));
                 text = text.substring(0, position)
                         + text.substring(position + 1);
                 screenPosition = StringUtils.width(text.substring(0, position));
@@ -295,7 +295,7 @@ public class TField extends TWidget {
                 if ((screenPosition >= windowStart)
                     && (windowStart > 0)
                 ) {
-                    windowStart -= StringUtils.width(text.charAt(
+                    windowStart -= StringUtils.width(text.codePointAt(
                         screenToTextPosition(windowStart)));
                 }
             }
@@ -321,10 +321,10 @@ public class TField extends TWidget {
                 if (insertMode == false) {
                     // Replace character
                     text = text.substring(0, position)
-                            + keypress.getKey().getChar()
+                            + codePointString(keypress.getKey().getChar())
                             + text.substring(position + 1);
-                    screenPosition += StringUtils.width(text.charAt(position));
-                    position++;
+                    screenPosition += StringUtils.width(text.codePointAt(position));
+                    position += Character.charCount(keypress.getKey().getChar());
                 } else {
                     // Insert character
                     insertChar(keypress.getKey().getChar());
@@ -338,19 +338,19 @@ public class TField extends TWidget {
                 } else if ((fixed == true) && (insertMode == false)) {
                     // Overwrite the last character, maybe move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getChar()
+                            + codePointString(keypress.getKey().getChar())
                             + text.substring(position + 1);
                     if (screenPosition < getWidth() - 1) {
-                        screenPosition += StringUtils.width(text.charAt(position));
-                        position++;
+                        screenPosition += StringUtils.width(text.codePointAt(position));
+                        position += Character.charCount(keypress.getKey().getChar());
                     }
                 } else if ((fixed == false) && (insertMode == false)) {
                     // Overwrite the last character, definitely move position
                     text = text.substring(0, position)
-                            + keypress.getKey().getChar()
+                            + codePointString(keypress.getKey().getChar())
                             + text.substring(position + 1);
-                    screenPosition += StringUtils.width(text.charAt(position));
-                    position++;
+                    screenPosition += StringUtils.width(text.codePointAt(position));
+                    position += Character.charCount(keypress.getKey().getChar());
                 } else {
                     if (position == text.length()) {
                         // Append this character
@@ -378,6 +378,17 @@ public class TField extends TWidget {
     // TWidget ----------------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * Override TWidget's height: we can only set height at construction
+     * time.
+     *
+     * @param height new widget height (ignored)
+     */
+    @Override
+    public void setHeight(final int height) {
+        // Do nothing
+    }
+
     /**
      * Draw the text field.
      */
@@ -407,6 +418,19 @@ public class TField extends TWidget {
     // TField -----------------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * Convert a char (codepoint) to a string.
+     *
+     * @param ch the char
+     * @return the string
+     */
+    private String codePointString(final int ch) {
+        StringBuilder sb = new StringBuilder(1);
+        sb.append(Character.toChars(ch));
+        assert (Character.charCount(ch) == sb.length());
+        return sb.toString();
+    }
+
     /**
      * Get field background character.
      *
@@ -455,11 +479,11 @@ public class TField extends TWidget {
     protected void dispatch(final boolean enter) {
         if (enter) {
             if (enterAction != null) {
-                enterAction.DO();
+                enterAction.DO(this);
             }
         } else {
             if (updateAction != null) {
-                updateAction.DO();
+                updateAction.DO(this);
             }
         }
     }
@@ -477,7 +501,7 @@ public class TField extends TWidget {
 
         int n = 0;
         for (int i = 0; i < text.length(); i++) {
-            n += StringUtils.width(text.charAt(i));
+            n += StringUtils.width(text.codePointAt(i));
             if (n >= screenPosition) {
                 return i + 1;
             }
@@ -525,15 +549,15 @@ public class TField extends TWidget {
      */
     protected void appendChar(final int ch) {
         // Append the LAST character
-        text += ch;
-        position++;
+        text += codePointString(ch);
+        position += Character.charCount(ch);
         screenPosition += StringUtils.width(ch);
 
         assert (position == text.length());
 
         if (fixed) {
             if (screenPosition >= getWidth()) {
-                position--;
+                position -= Character.charCount(ch);
                 screenPosition -= StringUtils.width(ch);
             }
         } else {
@@ -549,8 +573,9 @@ public class TField extends TWidget {
      * @param ch char to append
      */
     protected void insertChar(final int ch) {
-        text = text.substring(0, position) + ((char) ch) + text.substring(position);
-        position++;
+        text = text.substring(0, position) + codePointString(ch)
+                + text.substring(position);
+        position += Character.charCount(ch);
         screenPosition += StringUtils.width(ch);
         if ((screenPosition - windowStart) == getWidth()) {
             assert (!fixed);
@@ -577,7 +602,7 @@ public class TField extends TWidget {
         screenPosition = StringUtils.width(text);
         if (fixed == true) {
             if (screenPosition >= getWidth()) {
-                position = text.length() - 1;
+                position -= Character.charCount(text.codePointBefore(position));
                 screenPosition = StringUtils.width(text) - 1;
              }
         } else {
@@ -599,7 +624,7 @@ public class TField extends TWidget {
     public void setPosition(final int position) {
         if ((position < 0) || (position >= text.length())) {
             throw new IndexOutOfBoundsException("Max length is " +
-                StringUtils.width(text) + ", requested position " + position);
+                text.length() + ", requested position " + position);
         }
         this.position = position;
         normalizeWindowStart();