Changeset db1af5f for fmtext.c

Timestamp:

Jan 7, 2009, 5:28:19 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

50f8932

Parents:

e2a620b

Message:

Fix a bug rendering multi-byte characters in the last column of the window.

When the last character on a line was not wide, the code assumed that
it consumed one byte. This caused multi-byte characters to render
improperly. Now we find the start of the next character to ensure we
get the whole thing. [Fixes: #56]

Reported by: andersk

Also, clarified some comments and did a bit of code hoisting.

File:

• fmtext.c (modified) (2 diffs)

fmtext.c

@@ -169 +169 @@
 
 /* Internal function.  Append text from 'in' between index 'start' and
- * 'stop' to the end of 'f'
+ * 'stop', inclusive, to the end of 'f'. This function works with
+ * bytes.
  */
 void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) /*noproto*/
@@ -474 +475 @@
         _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
       }
+      else if (chwidth > 1) {
+        /* Last char is wide, truncate. */
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
+        owl_fmtext_append_normal(out, "\n");
+      }
       else {
-        if (chwidth > 1) {
-          /* Last char is wide, truncate. */
-          _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
-          owl_fmtext_append_normal(out, "\n");
-        }
-        else {
-          /* Last char fits perfectly, leave alone.*/
-          _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
-        }
+        /* Last char fits perfectly, We skip to the next char and back
+         * up a byte to make sure we get it all.
+         */
+        ptr_c = g_utf8_next_char(ptr_c);
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
       }
     }