Changeset 47519e1b for fmtext.c

Timestamp:

Jan 2, 2008, 2:42:05 AM (16 years ago)

Author:

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

Branches:

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

Children:

c60ade2

Parents:

2febcae

Message:

text entry:
* first pass at utf-8 text entry. This is not yet complete, and it certainly has bugs.
  The following is an incomplete list of functions that will probably misbehave if you use them.
  - owl_editwin_move_to_nextword()
  - owl_editwin_move_to_previousword()
  - owl_editwin_delete_nextword()
  - owl_editwin_delete_previousword()
  - owl_editwin_delete_to_endofline()
  - owl_editwin_fill_paragraph()

format text:
* owl_fmtext_curs_waddstr() contract restored to match trunk.
* owl_fmtext_curs_waddstr_without_search() added.

misc:
* Importing Markus Kuhn's wcwidth.c from
  http://www.cl.cam.ac.uk/~mgk25/ucs/wcwidth.c
* Change wcwidth() calls to mk_wcwidth()

File:

• fmtext.c (modified) (4 diffs)

fmtext.c

@@ -248 +248 @@
  * must already be initiatlized with curses
  */
-void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w, int do_search)
+void _owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w, int do_search) /*noproto*/
 {
   /* char *tmpbuff; */
@@ -264 +264 @@
   search_results = (do_search
                     ? owl_fmtext_search(f, owl_global_get_search_string(&g))
-                    : NULL);
-  if (search_results) search_len = strlen(owl_global_get_search_string(&g));
+                    : 0);
+  search_len = (search_results
+                ? strlen(owl_global_get_search_string(&g))
+                : 0);
   s = f->textbuff;
   /* Set default attributes. */
@@ -350 +352 @@
 }
 
+void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w)
+{
+  _owl_fmtext_curs_waddstr(f, w, owl_global_is_search_active(&g));
+}
+
+void owl_fmtext_curs_waddstr_without_search(owl_fmtext *f, WINDOW *w)
+{
+  _owl_fmtext_curs_waddstr(f, w, 0);
+}
 
 /* start with line 'aline' (where the first line is 0) and print
@@ -413 +424 @@
     st = 0;
     padding = 0;
+    chwidth = 0;
     ptr_c = ptr_s;
     while(col <= bcol && ptr_c < ptr_e) {
       gunichar c = g_utf8_get_char(ptr_c);
       if (!_owl_fmtext_is_format_char(c)) {
-        chwidth = wcwidth(c);
+        chwidth = mk_wcwidth(c);
       
         if (col + chwidth > bcol)