Changeset 369479d

Timestamp:

Jan 9, 2008, 2:18:31 PM (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:

16c6cca

Parents:

428834d (diff), 6286f26 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 803-811 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r805 | geofft | 2008-01-08 23:24:09 -0500 (Tue, 08 Jan 2008) | 5 lines
  
  Added support for channels in IRC. After you :irc-connect to a server, you can
  :irc-join #channel, and then :irc-msg either a user or a #channel. Replies,
  isprivate, and context should work vaguely as expected.
........
  r806 | nelhage | 2008-01-09 00:25:32 -0500 (Wed, 09 Jan 2008) | 1 line
........
  r807 | nelhage | 2008-01-09 00:25:56 -0500 (Wed, 09 Jan 2008) | 1 line
........
  r808 | nelhage | 2008-01-09 00:26:15 -0500 (Wed, 09 Jan 2008) | 3 lines
  
   r27173@lunatique:  nelhage | 2008-01-09 00:25:13 -0500
   Implement smartnarrow on channels
........
  r809 | nelhage | 2008-01-09 01:26:19 -0500 (Wed, 09 Jan 2008) | 4 lines
  
   r27177@lunatique:  nelhage | 2008-01-09 01:23:14 -0500
   import is_private from ::Connection
   
........
  r810 | nelhage | 2008-01-09 02:23:31 -0500 (Wed, 09 Jan 2008) | 3 lines
  
   r27179@lunatique:  nelhage | 2008-01-09 02:22:05 -0500
   Implement irc-nick
........

Files:

• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (2 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (10 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (5 diffs)
• Makefile.in (modified) (1 diff)
• aim.c (modified) (10 diffs)
• cmd.c (modified) (1 diff)
• config.h.in (modified) (2 diffs)
• configure.in (modified) (3 diffs)
• editwin.c (modified) (31 diffs)
• fmtext.c (modified) (12 diffs)
• functions.c (modified) (9 diffs)
• glib_compat.c (added)
• global.c (modified) (1 diff)
• keymap.c (modified) (6 diffs)
• keypress.c (modified) (2 diffs)
• keys.c (modified) (2 diffs)
• logging.c (modified) (4 diffs)
• message.c (modified) (5 diffs)
• owl.c (modified) (5 diffs)
• owl.h (modified) (4 diffs)
• perlconfig.c (modified) (1 diff)
• text.c (modified) (4 diffs)
• util.c (modified) (3 diffs)
• viewwin.c (modified) (1 diff)
• wcwidth.c (added)
• zcrypt.c (modified) (6 diffs)
• zephyr.c (modified) (1 diff)
• zwrite.c (modified) (13 diffs)

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -36 +36 @@
         return $filter;
     } else {
-        # Unimplemented
-        return undef;
+        # To a Channel
+        my $network = $self->network;
+        my $channel = $self->channel;
+        my $filter = "irc-$network-channel-$channel";
+        my $ftext = qq{type ^irc\$ and network ^$network\$ and channel ^$channel\$};
+        BarnOwl::filter("$filter $ftext");
+        return $filter;
     }
 }
@@ -43 +48 @@
 sub server {shift->{server}}
 sub network {shift->{network}}
+sub channel {shift->{channel}}
 
 # display
-sub context {shift->{channel};}
+sub context {shift->{network};}
+sub subcontext {shift->{recipient};}
 
 sub long_sender {shift->{from} || ""};

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -6 +6 @@
 =head1 NAME
 
-BarnOwl::Module::Jabber
+BarnOwl::Module::IRC
 
 =head1 DESCRIPTION
 
-This module implements Jabber support for barnowl.
+This module implements IRC support for barnowl.
 
 =cut
@@ -17 +17 @@
 use BarnOwl::Hooks;
 use BarnOwl::Message::IRC;
-use BarnOwl::Module::IRC::Connection;
+use BarnOwl::Module::IRC::Connection qw(is_private);
 
 use Net::IRC;
 use Getopt::Long;
 
-our $VERSION = 0.01;
+our $VERSION = 0.02;
 
 our $irc;
@@ -30 +30 @@
 
 sub startup {
-    BarnOwl::new_variable_string(ircnick => {default => $ENV{USER}});
-    BarnOwl::new_variable_string(ircuser => {default => $ENV{USER}});
-    BarnOwl::new_variable_string(ircname => {default => ""});
+    BarnOwl::new_variable_string('irc:nick', {default => $ENV{USER}});
+    BarnOwl::new_variable_string('irc:user', {default => $ENV{USER}});
+    BarnOwl::new_variable_string('irc:name', {default => ""});
+    BarnOwl::new_variable_bool('irc:spew', {default => 0});
     register_commands();
     register_handlers();
@@ -40 +41 @@
 sub shutdown {
     for my $conn (values %ircnets) {
-        $conn->disconnect;
+        $conn->disconnect();
     }
 }
@@ -63 +64 @@
     BarnOwl::new_command('irc-disconnect' => \&cmd_disconnect);
     BarnOwl::new_command('irc-msg'     => \&cmd_msg);
+    BarnOwl::new_command('irc-join' => \&cmd_join);
+    BarnOwl::new_command('irc-nick' => \&cmd_nick);
 }
 
@@ -76 +79 @@
     my $cmd = shift;
 
-    my $nick = BarnOwl::getvar('ircnick');
-    my $username = BarnOwl::getvar('ircuser');
-    my $ircname = BarnOwl::getvar('ircname');
+    my $nick = BarnOwl::getvar('irc:nick');
+    my $username = BarnOwl::getvar('irc:user');
+    my $ircname = BarnOwl::getvar('irc:name');
     my $host;
     my $port;
@@ -90 +93 @@
             "alias=s"    => \$alias,
             "ssl"        => \$ssl,
-            "password=s" => \$password);
+            "password=s" => \$password,
+            "port=i"     => \$port,
+        );
         $host = shift @ARGV or die("Usage: $cmd HOST\n");
         if(!$alias) {
@@ -126 +131 @@
     my $conn = get_connection(\@_);
     my $to = shift or die("Usage: $cmd NICK\n");
+    # handle multiple recipients?
     if(@_) {
         process_msg($conn, $to, join(" ", @_));
@@ -148 +154 @@
         body        => $body,
         sender      => $conn->nick,
-        isprivate   => 'true',
+        is_private($to) ?
+          (isprivate  => 'true') : (channel => $to),
         replycmd    => "irc-msg $to",
-        replysendercmd => "irc-msg " . $conn->nick
+        replysendercmd => "irc-msg $to"
        );
     BarnOwl::queue_message($msg);
 }
 
+sub cmd_join {
+    my $cmd = shift;
+    my $conn = get_connection(\@_);
+    my $chan = shift or die("Usage: $cmd channel\n");
+    $conn->join($chan);
+}
+
+sub cmd_nick {
+    my $cmd = shift;
+    my $conn = get_connection(\@_);
+    my $nick = shift or die("Usage: $cmd <new nick>");
+    $conn->nick($nick);
+}
 
 ################################################################################
@@ -177 +197 @@
 
 sub get_connection_by_alias {
-    die("No such ircnet: $alias\n") unless exists $ircnets{$key};
+    my $key = shift;
+    die("No such ircnet: $key\n") unless exists $ircnets{$key};
     return $ircnets{$key};
 }

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -15 +15 @@
 =cut
 
-use base qw(Net::IRC::Connection Class::Accessor);
+use base qw(Net::IRC::Connection Class::Accessor Exporter);
 __PACKAGE__->mk_accessors(qw(alias channels));
+our @EXPORT_OK = qw(&is_private);
 
 use BarnOwl;
@@ -30 +31 @@
     bless($self, $class);
 
-    $self->add_global_handler(endofmotd => sub { goto &on_connect });
-    $self->add_global_handler(msg => sub { goto &on_msg });
-    $self->add_global_handler(notice => sub { goto &on_msg });
+    $self->add_global_handler(376 => sub { goto &on_connect });
+    $self->add_global_handler(['msg', 'notice', 'public', 'caction'],
+            sub { goto &on_msg });
+    $self->add_global_handler(cping => sub { goto &on_ping });
     $self->add_default_handler(sub { goto &on_event; });
 
@@ -49 +51 @@
 sub on_msg {
     my ($self, $evt) = @_;
-    my $replycmd = "irc-msg " . $evt->nick;
+    my ($recipient) = $evt->to;
+    my $body = strip_irc_formatting([$evt->args]->[0]);
+    $body = BarnOwl::Style::boldify($evt->nick.' '.$body) if $evt->type eq 'caction';
     my $msg = BarnOwl::Message->new(
         type        => 'IRC',
@@ -55 +59 @@
         server      => $self->server,
         network     => $self->alias,
-        recipient   => $self->nick,
-        body        => strip_irc_formatting([$evt->args]->[0]),
+        recipient   => $recipient,
+        body        => $body,
         sender      => $evt->nick,
         hostname    => $evt->host,
         from        => $evt->from,
-        notice      => $evt->type eq 'notice' ? 'true' : '',
-        isprivate   => 'true',
-        replycmd    => $replycmd,
-        replysendercmd => $replycmd
+        $evt->type eq 'notice' ?
+          (notice     => 'true') : (),
+        is_private($recipient) ?
+          (isprivate  => 'true') : (channel => $recipient),
+        replycmd    => 'irc-msg ' .
+            (is_private($recipient) ? $evt->nick : $recipient),
+        replysendercmd => 'irc-msg ' . $evt->nick,
        );
     BarnOwl::queue_message($msg);
+}
+
+sub on_ping {
+    my ($self, $evt) = @_;
+    $self->ctcp_reply($evt->nick, join (' ', ($evt->args)));
+}
+
+sub on_event {
+    my ($self, $evt) = @_;
+    BarnOwl::admin_message("IRC",
+            "Unhandled IRC event of type " . $evt->type . ":\n"
+            . strip_irc_formatting(join("\n", $evt->args)))
+        if BarnOwl::getvar('irc:spew') eq 'on';
 }
 
@@ -83 +103 @@
 }
 
+# Determines if the given message recipient is a username, as opposed to
+# a channel that starts with # or &.
+sub is_private {
+    return shift !~ /^[\#\&]/;
+}
 
 1;

Makefile.in

@@ -26 +26 @@
      keypress.c keymap.c keybinding.c cmd.c context.c zcrypt.c \
      aim.c buddy.c buddylist.c timer.c style.c stylefunc.c errqueue.c \
-     zbuddylist.c muxevents.c popexec.c obarray.c
+     zbuddylist.c muxevents.c popexec.c obarray.c wcwidth.c glib_compat.c
 OWL_SRC = owl.c
 TESTER_SRC = tester.c

aim.c

@@ -948 +948 @@
   
   if (modname) {
-    if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
+    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(modname)+4+1))) {
       /* perror("memrequest: malloc"); */
       return -1;
@@ -954 +954 @@
     sprintf(filename, "%s/%s.ocm", priv->aimbinarypath, modname);
   } else {
-    if (!(filename = malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
+    if (!(filename = owl_malloc(strlen(priv->aimbinarypath)+1+strlen(defaultmod)+1))) {
       /* perror("memrequest: malloc"); */
       return -1;
@@ -964 +964 @@
     if (!modname) {
       /* perror("memrequest: stat"); */
-      free(filename);
+      owl_free(filename);
       return -1;
     }
@@ -986 +986 @@
     int i;
     
-    free(filename); /* not needed */
+    owl_free(filename); /* not needed */
     owl_function_error("getaimdata memrequest: recieved invalid request for 0x%08lx bytes at 0x%08lx (file %s)\n", len, offset, modname);
     i = 8;
@@ -993 +993 @@
     }
     
-    if (!(buf = malloc(i))) {
+    if (!(buf = owl_malloc(i))) {
       return -1;
     }
@@ -1017 +1017 @@
     *buflenret = i;
   } else {
-    if (!(buf = malloc(len))) {
-      free(filename);
+    if (!(buf = owl_malloc(len))) {
+      owl_free(filename);
       return -1;
     }
@@ -1024 +1024 @@
     if (!(f = fopen(filename, "r"))) {
       /* perror("memrequest: fopen"); */
-      free(filename);
-      free(buf);
+      owl_free(filename);
+      owl_free(buf);
       return -1;
     }
     
-    free(filename);
+    owl_free(filename);
     
     if (fseek(f, offset, SEEK_SET) == -1) {
       /* perror("memrequest: fseek"); */
       fclose(f);
-      free(buf);
+      owl_free(buf);
       return -1;
     }
@@ -1041 +1041 @@
       /* perror("memrequest: fread"); */
       fclose(f);
-      free(buf);
+      owl_free(buf);
       return -1;
     }
@@ -1076 +1076 @@
   if (priv->aimbinarypath && (getaimdata(sess, &buf, &buflen, offset, len, modname) == 0)) {
     aim_sendmemblock(sess, fr->conn, offset, buflen, buf, AIM_SENDMEMBLOCK_FLAG_ISREQUEST);
-    free(buf);
+    owl_free(buf);
   } else {
     owl_function_debugmsg("faimtest_memrequest: unable to use AIM binary (\"%s/%s\"), sending defaults...\n", priv->aimbinarypath, modname);
@@ -1342 +1342 @@
       int z;
       
-      newbuf = malloc(i+1);
+      newbuf = owl_malloc(i+1);
       for (z = 0; z < i; z++)
         newbuf[z] = (z % 10)+0x30;
       newbuf[i] = '\0';
       /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_ACK | AIM_IMFLAGS_AWAY, newbuf); */
-      free(newbuf);
+      owl_free(newbuf);
     }
   } else if (strstr(tmpstr, "seticqstatus")) {

cmd.c

@@ -74 +74 @@
   owl_cmd *cmd;
 
-  tmpbuff=strdup(cmdbuff);
+  tmpbuff=owl_strdup(cmdbuff);
   argv=owl_parseline(tmpbuff, &argc);
   if (argc < 0) {

config.h.in

@@ -22 +22 @@
 #undef HAVE_LIBCOM_ERR
 
-/* Define to 1 if you have the `curses' library (-lcurses). */
-#undef HAVE_LIBCURSES
-
 /* Define to 1 if you have the `des425' library (-ldes425). */
 #undef HAVE_LIBDES425
@@ -39 +36 @@
 /* Define to 1 if you have the `krb5' library (-lkrb5). */
 #undef HAVE_LIBKRB5
-
-/* Define to 1 if you have the `ncurses' library (-lncurses). */
-#undef HAVE_LIBNCURSES
 
 /* Define to 1 if you have the `ncursesw' library (-lncursesw). */

configure.in

@@ -12 +12 @@
 fi
 
+m4_include(/usr/share/aclocal/pkg.m4)
+dnl m4_include(pkg.m4)
 
 dnl Check for Athena
@@ -44 +46 @@
 fi
 
-AC_CHECK_LIB(ncursesw, initscr,,
-  AC_CHECK_LIB(ncurses, initscr,,
-    AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(No curses library found.))))
+AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No curses library found.))
 AC_CHECK_LIB(com_err, com_err)
 AC_CHECK_LIB(nsl, gethostbyname)
@@ -109 +109 @@
 LDFLAGS=${LDFLAGS}\ ${FOO}
 
+dnl Add CFLAGS and LDFLAGS for glib-2.0
+PKG_CHECK_MODULES(GLIB,glib-2.0)
+
+echo Adding glib-2.0 CFLAGS ${GLIB_CFLAGS}
+CFLAGS=${CFLAGS}\ ${GLIB_CFLAGS}
+echo Adding glib-2.0 LDFLAGS ${GLIB_LIBS}
+LDFLAGS=${LDFLAGS}\ ${GLIB_LIBS}
+
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 

editwin.c

@@ -143 +143 @@
   e->buffy=0;
   owl_editwin_overwrite_string(e, text);
+  owl_editwin_overwrite_char(e, '\0');
   e->lock=strlen(text);
   /* if (text[e->lock-1]=='\n') e->lock--; */
-  e->buffx=x;
-  e->buffy=y;
+  /*  e->buffx=x; */
+  /*  e->buffy=y; */
   owl_editwin_adjust_for_locktext(e);
   owl_editwin_redisplay(e, 0);
@@ -251 +252 @@
 
   /* start at topline */
-  ptr1=e->buff;
-  for (i=0; i<e->topline; i++) {
-    ptr2=strchr(ptr1, '\n');
+  ptr1 = e->buff;
+  for (i = 0; i < e->topline; i++) {
+    ptr2 = strchr(ptr1, '\n');
     if (!ptr2) {
       /* we're already on the last line */
       break;
     }
-    ptr1=ptr2+1;
+    ptr1 = ptr2 + 1;
   }
   /* ptr1 now stores the starting point */
 
   /* find the ending point and store it in ptr3 */
-  ptr2=ptr1;
-  ptr3=ptr1;
-  for (i=0; i<e->winlines; i++) {
-    ptr3=strchr(ptr2, '\n');
+  ptr2 = ptr1;
+  ptr3 = ptr1;
+  for (i = 0; i < e->winlines; i++) {
+    ptr3 = strchr(ptr2, '\n');
     if (!ptr3) {
       /* we've hit the last line */
       /* print everything to the end */
-      ptr3=e->buff+e->bufflen-1;
+      ptr3 = e->buff + e->bufflen - 1;
       ptr3--;
       break;
     }
-    ptr2=ptr3+1;
-  }
-  ptr3+=2;
-
-  buff=owl_malloc(ptr3-ptr1+50);
-  strncpy(buff, ptr1, ptr3-ptr1);
-  buff[ptr3-ptr1]='\0';
-  if (e->echochar=='\0') {
+    ptr2 = ptr3 + 1;
+  }
+  ptr3 += 2;
+
+  buff = owl_malloc(ptr3 - ptr1 + 50);
+  strncpy(buff, ptr1, ptr3 - ptr1);
+  buff[ptr3 - ptr1] = '\0';
+  if (e->echochar == '\0') {
     waddstr(e->curswin, buff);
   } else {
     /* translate to echochar, *except* for the locktext */
     int len;
-    int dolocklen=e->lock-(ptr1-e->buff);
-
-    for (i=0; i<dolocklen; i++) {
+    int dolocklen = e->lock - (ptr1 - e->buff);
+
+    for (i = 0; i < dolocklen; i++) {
       waddch(e->curswin, buff[i]);
     }
-    len=strlen(buff);
-    for (i=0; i<len-dolocklen; i++) {
+    len = strlen(buff);
+    for (i = 0; i < len-dolocklen; i++) {
       waddch(e->curswin, e->echochar);
     }
   }
-  wmove(e->curswin, e->buffy-e->topline, e->buffx);
+  wmove(e->curswin, e->buffy-e->topline, e->buffx + _owl_editwin_cursor_adjustment(e));
   wnoutrefresh(e->curswin);
-  if (update==1) {
+  if (update == 1) {
     doupdate();
   }
   owl_free(buff);
+}
+
+/* Remove n bytes at cursor. */
+void _owl_editwin_remove_bytes(owl_editwin *e, int n) /*noproto*/
+{
+  int i = _owl_editwin_get_index_from_xy(e) + n;
+  for (; i < e->bufflen; i++) {
+    e->buff[i-n] = e->buff[i];
+  }
+  
+  e->bufflen -= n;
+  e->buff[e->bufflen] = '\0';
+}
+
+/* Insert n bytes at cursor.*/
+void _owl_editwin_insert_bytes(owl_editwin *e, int n) /*noproto*/
+{
+  int i, z;
+  
+  if ((e->bufflen + n) > (e->allocated - 5)) {
+    _owl_editwin_addspace(e);
+  }
+
+  e->bufflen += n;
+  e->buff[e->bufflen] = '\0';
+  
+  z = _owl_editwin_get_index_from_xy(e);
+  for (i = e->bufflen - 1; i > z; i--) {
+    e->buff[i] = e->buff[i - n];
+  }
 }
 
@@ -313 +344 @@
   int i, z;
 
-  z=_owl_editwin_get_index_from_xy(e);
+  z = _owl_editwin_get_index_from_xy(e);
   /* move back and line wrap the previous word */
-  for (i=z-1; ; i--) {
+  for (i = z - 1; ; i--) {
     /* move back until you find a space or hit the beginning of the line */
-    if (e->buff[i]==' ') {
+    if (e->buff[i] == ' ') {
       /* replace the space with a newline */
-      e->buff[i]='\n';
+      e->buff[i] = '\n';
       e->buffy++;
-      e->buffx=z-i-1;
+      e->buffx = z - i - 1;
       /* were we on the last line */
       return(0);
-    } else if (e->buff[i]=='\n' || i<=e->lock) {
-      /* we hit the begginning of the line or the buffer, we cannot
+    } else if (e->buff[i] == '\n' || i <= e->lock) {
+      /* we hit the beginning of the line or the buffer, we cannot
        * wrap.
        */
@@ -336 +367 @@
  * characters over)
  */
-void owl_editwin_insert_char(owl_editwin *e, char c)
-{
-  
-  int z, i, ret;
+void owl_editwin_insert_char(owl_editwin *e, gunichar c)
+{
+  int z, i, ret, len;
+  char tmp[6];
+  memset(tmp, '\0', 6);
 
   /* \r is \n */
-  if (c=='\r') {
-    c='\n';
-  }
-
-  if (c=='\n' && e->style==OWL_EDITWIN_STYLE_ONELINE) {
+  if (c == '\r') {
+    c = '\n';
+  }
+
+  if (c == '\n' && e->style == OWL_EDITWIN_STYLE_ONELINE) {
     /* perhaps later this will change some state that allows the string
        to be read */
@@ -352 +384 @@
   }
 
+  g_unichar_to_utf8(c, tmp);
+  len = strlen(tmp);
+
   /* make sure there is enough memory for the new text */
-  if ((e->bufflen+1) > (e->allocated-5)) {
+  if ((e->bufflen + len) > (e->allocated - 5)) {
     _owl_editwin_addspace(e);
   }
 
   /* get the insertion point */
-  z=_owl_editwin_get_index_from_xy(e);
+  z = _owl_editwin_get_index_from_xy(e);
 
   /* If we're going to insert at the last column do word wrapping, unless it's a \n */
-  if ((e->buffx+1==e->wrapcol) && (c!='\n')) {
-    ret=_owl_editwin_linewrap_word(e);
-    if (ret==-1) {
+  if ((e->buffx + 1 == e->wrapcol) && (c != '\n')) {
+    ret = _owl_editwin_linewrap_word(e);
+    if (ret == -1) {
       /* we couldn't wrap, insert a hard newline instead */
       owl_editwin_insert_char(e, '\n');
@@ -369 +404 @@
   }
 
-  z=_owl_editwin_get_index_from_xy(e);
   /* shift all the other characters right */
-  for (i=e->bufflen; i>z; i--) {
-    e->buff[i]=e->buff[i-1];
-  }
-
-  /* insert the new one */
-  e->buff[z]=c;
+  if (z != e->bufflen) {
+    _owl_editwin_insert_bytes(e, len);
+  }
+
+  /* insert the new character */
+  for(i = 0; i < len; i++) {
+    e->buff[z + i] = tmp[i];
+  }
 
   /* housekeeping */
-  e->bufflen++;
-  e->buff[e->bufflen]='\0';
-
+  e->bufflen += len;
+  e->buff[e->bufflen] = '\0';
+  
   /* advance the cursor */
-  if (c=='\n') {
-    e->buffx=0;
-    e->buffy++;
-  } else {
-    e->buffx++;
-  }
+  z += len;
+  _owl_editwin_set_xy_by_index(e, z);
 }
 
 /* overwrite the character at the current point with 'c' */
-void owl_editwin_overwrite_char(owl_editwin *e, char c)
-{
-  int z;
-  
+void owl_editwin_overwrite_char(owl_editwin *e, gunichar c)
+{
+  int z, oldlen, newlen, i;
+  char tmp[6];
+  memset(tmp, '\0', 6);
+
   /* \r is \n */
-  if (c=='\r') {
-    c='\n';
-  }
-
-  if (c=='\n' && e->style==OWL_EDITWIN_STYLE_ONELINE) {
+  if (c == '\r') {
+    c = '\n';
+  }
+  
+  if (c == '\n' && e->style == OWL_EDITWIN_STYLE_ONELINE) {
     /* perhaps later this will change some state that allows the string
        to be read */
@@ -407 +441 @@
   }
 
-  z=_owl_editwin_get_index_from_xy(e);
-
-  /* only if we are at the end of the buffer do we create new space */
-  if (z==e->bufflen) {
-    if ((e->bufflen+1) > (e->allocated-5)) {
+  g_unichar_to_utf8(c, tmp);
+  newlen = strlen(tmp);
+
+  z = _owl_editwin_get_index_from_xy(e);
+  {
+    char *t = g_utf8_find_next_char(e->buff + z, NULL);
+    oldlen = (t ? (t - (e->buff + z)) : 0);
+  }
+
+  /* only if we are at the end of the buffer do we create new space here */
+  if (z == e->bufflen) {
+    if ((e->bufflen+newlen) > (e->allocated-5)) {
       _owl_editwin_addspace(e);
     }
   }
-  
-  e->buff[z]=c;
-
-  /* housekeeping if we are at the end of the buffer */
-  if (z==e->bufflen) {
-    e->bufflen++;
-    e->buff[e->bufflen]='\0';
-  }
-
+  /* if not at the end of the buffer, adjust based in char size difference. */ 
+  else if (oldlen > newlen) {
+    _owl_editwin_remove_bytes(e, oldlen-newlen);
+  }
+  else /* oldlen < newlen */ {
+    _owl_editwin_insert_bytes(e, newlen-oldlen);
+  }
+  /* Overwrite the old char*/
+  for (i = 0; i < newlen; i++) {
+    e->buff[z+i] = tmp[i];
+  }
+       
+  /* housekeeping */
+  if (z == e->bufflen) {
+    e->bufflen += newlen;
+    e->buff[e->bufflen] = '\0';
+  }
+  
   /* advance the cursor */
-  if (c=='\n') {
-    e->buffx=0;
-    e->buffy++;
-  } else {
-    e->buffx++;
-  }
-
+  z += newlen;
+  _owl_editwin_set_xy_by_index(e, z);
 }
 
@@ -439 +484 @@
 void owl_editwin_delete_char(owl_editwin *e)
 {
-  int z, i;
-
-  if (e->bufflen==0) return;
+  int z;
+  char *p1, *p2;
+  gunichar c;
+
+  if (e->bufflen == 0) return;
   
   /* get the deletion point */
-  z=_owl_editwin_get_index_from_xy(e);
-
-  if (z==e->bufflen) return;
-
-  for (i=z; i<e->bufflen; i++) {
-    e->buff[i]=e->buff[i+1];
-  }
-  e->bufflen--;
-  e->buff[e->bufflen]='\0';
+  z = _owl_editwin_get_index_from_xy(e);
+
+  if (z == e->bufflen) return;
+
+  p1 = e->buff + z;
+  p2 = g_utf8_next_char(p1);
+  c = g_utf8_get_char(p2);
+  while (g_unichar_ismark(c)) {
+    p2 = g_utf8_next_char(p2);
+    c = g_utf8_get_char(p2);
+  }
+  _owl_editwin_remove_bytes(e, p2-p1);
 }
 
@@ -463 +513 @@
 {
   int z;
-  char tmp;
-
-  if (e->bufflen==0) return;
+  char *p1, *p2, *p3, *tmp;
+
+  if (e->bufflen == 0) return;
   
   /* get the cursor point */
-  z=_owl_editwin_get_index_from_xy(e);
-
-  if (z==e->bufflen) {
+  z = _owl_editwin_get_index_from_xy(e);
+
+  if (z == e->bufflen) {
     /* point is after last character */
     z--;
   }  
 
-  if (z-1 < e->lock) {
+  if (z - 1 < e->lock) {
     /* point is at beginning of buffer, do nothing */
     return;
   }
 
-  tmp=e->buff[z];
-  e->buff[z]=e->buff[z-1];
-  e->buff[z-1]=tmp;
-  owl_editwin_key_right(e);
+  /* Transpose two utf-8 unicode glyphs. */
+  p1 = e->buff + z;
+
+  p2 = g_utf8_find_next_char(p1, NULL);
+  while (p2 != NULL && g_unichar_ismark(g_utf8_get_char(p2))) {
+    p2 = g_utf8_find_next_char(p2, NULL);
+  }
+  if (p2 == NULL) return;
+
+  p3 = g_utf8_find_prev_char(e->buff, p1);
+  while (p3 != NULL && g_unichar_ismark(g_utf8_get_char(p3))) {
+    p3 = g_utf8_find_prev_char(p3, NULL);
+  }
+  if (p3 == NULL) return;
+
+  tmp = owl_malloc(p2 - p3 + 5);
+  *tmp = '\0';
+  strncat(tmp, p1, p2 - p1);
+  strncat(tmp, p3, p1 - p3);
+  strncpy(p3, tmp, p2 - p3);
+  owl_free(tmp);
+  _owl_editwin_set_xy_by_index(e, p3 - e->buff);
 }
 
@@ -491 +559 @@
 void owl_editwin_insert_string(owl_editwin *e, char *string)
 {
-  int i, j;
-
-  j=strlen(string);
-  for (i=0; i<j; i++) {
-    owl_editwin_insert_char(e, string[i]);
+  char *p;
+  gunichar c;
+  if (!g_utf8_validate(string, -1, NULL)) {
+    owl_function_debugmsg("owl_editwin_insert_string: received non-utf-8 string.");
+    return;
+  }
+  p = string;
+  c = g_utf8_get_char(p);
+  while (c) {
+    owl_editwin_process_char(e, c);
+    p = g_utf8_next_char(p);
+    c = g_utf8_get_char(p);
   }
 }
@@ -505 +580 @@
 void owl_editwin_overwrite_string(owl_editwin *e, char *string)
 {
-  int i, j;
-
-  j=strlen(string);
-  for (i=0; i<j; i++) {
-    owl_editwin_overwrite_char(e, string[i]);
+  char *p;
+  gunichar c;
+
+  if (!g_utf8_validate(string, -1, NULL)) {
+    owl_function_debugmsg("owl_editwin_overwrite_string: received non-utf-8 string.");
+    return;
+  }
+  p = string;
+  c = g_utf8_get_char(p);
+  while (c) {
+    owl_editwin_overwrite_char(e, c);
+    p = g_utf8_next_char(p);
+    c = g_utf8_get_char(p);
   }
 }
@@ -520 +603 @@
   int i;
   char *ptr1, *ptr2;
-
-  if (e->bufflen==0) return(0);
+  gunichar c;
+
+  if (e->bufflen == 0) return(0);
   
   /* first go to the yth line */
-  ptr1=e->buff;
-  for (i=0; i<e->buffy; i++) {
-    ptr2=strchr(ptr1, '\n');
+  ptr1 = e->buff;
+  for (i = 0; i < e->buffy; i++) {
+    ptr2= strchr(ptr1, '\n');
     if (!ptr2) {
       /* we're already on the last line */
       break;
     }
-    ptr1=ptr2+1;
-  }
-
-  /* now go to the xth character */
-  ptr2=strchr(ptr1, '\n');
-  if (!ptr2) {
-    ptr2=e->buff+e->bufflen;
-  }
-
-  if ((ptr2-ptr1) < e->buffx) {
-    ptr1=ptr2-1;
-  } else {
-    ptr1+=e->buffx;
-  }
-
-  /* printf("DEBUG: index is %i\r\n", ptr1-e->buff); */
-  return(ptr1-e->buff);
+    ptr1 = ptr2 + 1;
+  }
+
+  /* now go to the xth cell */
+  ptr2 = ptr1;
+  i = 0;
+  while (ptr2 != NULL && i < e->buffx && (ptr2 - e->buff) < e->bufflen) {
+    c = g_utf8_get_char(ptr2);
+    i += (c == '\n' ? 1 : mk_wcwidth(c));
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+  while(ptr2 != NULL && g_unichar_ismark(g_utf8_get_char(ptr2))) {
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+  if (ptr2 == NULL) return e->bufflen;
+  return(ptr2 - e->buff);
 }
 
 void _owl_editwin_set_xy_by_index(owl_editwin *e, int index)
 {
-  int z, i;
-
-  z=_owl_editwin_get_index_from_xy(e);
-  if (index>z) {
-    for (i=0; i<index-z; i++) {
-      owl_editwin_key_right(e);
-    }
-  } else if (index<z) {
-    for (i=0; i<z-index; i++) {
-      owl_editwin_key_left(e);
-    }
-  }
+  char *ptr1, *ptr2, *target;
+  gunichar c;
+
+  e->buffx = 0;
+  e->buffy = 0;
+
+  ptr1 = e->buff;
+  target = ptr1 + index;
+  /* target sanitizing */
+  if ((target[0] & 0x80) && (~target[0] & 0x40)) {
+    /* middle of a utf-8 character, back up to previous character. */
+    target = g_utf8_find_prev_char(e->buff, target);
+  }
+  c = g_utf8_get_char(target);
+  while (g_unichar_ismark(c) && target > e->buff) {
+    /* Adjust the target off of combining characters and the like. */
+    target = g_utf8_find_prev_char(e->buff, target);
+    c = g_utf8_get_char(target);
+  }
+  /* If we start with a mark, something is wrong.*/
+  if (g_unichar_ismark(c)) return;
+
+  /* Now our target should be acceptable. */
+  ptr2 = strchr(ptr1, '\n');
+  while (ptr2 != NULL && ptr2 < target) {
+    e->buffy++;
+    ptr1 = ptr2 + 1;
+    ptr2 = strchr(ptr1, '\n');
+  }
+  ptr2 = ptr1;
+  while (ptr2 != NULL && ptr2 < target) {
+    c = g_utf8_get_char(ptr2);
+    e->buffx += mk_wcwidth(c);
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+}
+
+int _owl_editwin_cursor_adjustment(owl_editwin *e)
+{
+  char *ptr1, *ptr2;
+  gunichar c;
+  int x, i;
+
+  ptr1 = e->buff;
+  ptr2 = strchr(ptr1, '\n');
+  for (i = 0; ptr2 != NULL && i < e->buffy; i++) {
+    ptr1 = ptr2 + 1;
+    ptr2 = strchr(ptr1, '\n');
+  }
+  ptr2 = ptr1;
+  x = 0;
+  while (ptr2 != NULL && x < e->buffx) {
+    if (*ptr2 == '\n') return 0;
+    c = g_utf8_get_char(ptr2);
+    x += mk_wcwidth(c);
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+  return x - e->buffx;
 }
 
@@ -570 +699 @@
   /* if we happen to have the cursor over locked text
    * move it to be out of the locktext region */
-  if (_owl_editwin_get_index_from_xy(e)<e->lock) {
+  if (_owl_editwin_get_index_from_xy(e) < e->lock) {
     _owl_editwin_set_xy_by_index(e, e->lock);
   }
@@ -590 +719 @@
 {
   if (e->buffy > 0) e->buffy--;
-  if (e->buffx >= owl_editwin_get_numchars_on_line(e, e->buffy)) {
-    e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
+  if (e->buffx >= owl_editwin_get_numcells_on_line(e, e->buffy)) {
+    e->buffx=owl_editwin_get_numcells_on_line(e, e->buffy);
   }
 
@@ -608 +737 @@
 
   /* if we're past the last character move back */
-  if (e->buffx >= owl_editwin_get_numchars_on_line(e, e->buffy)) {
-    e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
+  if (e->buffx >= owl_editwin_get_numcells_on_line(e, e->buffy)) {
+    e->buffx=owl_editwin_get_numcells_on_line(e, e->buffy);
   }
 
@@ -623 +752 @@
 void owl_editwin_key_left(owl_editwin *e)
 {
-  /* move left if we can, and maybe up a line */
-  if (e->buffx>0) {
-    e->buffx--;
-  } else if (e->buffy>0) {
-    e->buffy--;
-    e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
-  }
-
-  /* do we need to scroll up? */
-  if (e->buffy-e->topline < 0) {
-    e->topline-=e->winlines/2;
+  int i;
+  char * p;
+  i = _owl_editwin_get_index_from_xy(e);
+  p = e->buff + i;
+  p = g_utf8_find_prev_char(e->buff, p);
+  while (p && g_unichar_ismark(g_utf8_get_char(p))) {
+    p = g_utf8_find_prev_char(e->buff, p);
+  }
+  if (p == NULL) p = e->buff;
+  _owl_editwin_set_xy_by_index(e, p - e->buff);
+
+  if (e->buffy - e->topline < 0) {
+    e->topline -= e->winlines / 2;
   }
 
@@ -643 +774 @@
 {
   int i;
-
-  /* move right if we can, and skip down a line if needed */
-  i=owl_editwin_get_numchars_on_line(e, e->buffy);
-  if (e->buffx < i) {
-    e->buffx++;
-    /*  } else if (e->buffy+1 < owl_editwin_get_numlines(e)) { */
-  } else if (_owl_editwin_get_index_from_xy(e) < e->bufflen) {
-    if (e->style==OWL_EDITWIN_STYLE_MULTILINE) {
-      e->buffx=0;
-      e->buffy++;
-    }
+  char * p;
+  i = _owl_editwin_get_index_from_xy(e);
+  p = e->buff + i;
+  p = g_utf8_find_next_char(p, NULL);
+  while (p && g_unichar_ismark(g_utf8_get_char(p))) {
+    p = g_utf8_find_next_char(p, NULL);
+  }
+  if (p == NULL) {
+    _owl_editwin_set_xy_by_index(e, e->bufflen);
+  }
+  else {
+    _owl_editwin_set_xy_by_index(e, p - e->buff);
   }
 
   /* do we need to scroll down? */
-  if (e->buffy-e->topline >= e->winlines) {
-    e->topline+=e->winlines/2;
+  if (e->buffy - e->topline >= e->winlines) {
+    e->topline += e->winlines / 2;
   }
 }
@@ -664 +796 @@
 void owl_editwin_move_to_nextword(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   int i, x;
 
@@ -703 +836 @@
 void owl_editwin_move_to_previousword(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   int i, x;
 
@@ -738 +872 @@
 void owl_editwin_delete_nextword(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   int z;
 
@@ -768 +903 @@
 void owl_editwin_delete_previousword(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   /* go backwards to the last non-space character, then delete chars */
   int i, startpos, endpos;
@@ -781 +917 @@
 void owl_editwin_delete_to_endofline(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   int i;
 
-  if (owl_editwin_get_numchars_on_line(e, e->buffy)>e->buffx) {
+  if (owl_editwin_get_numchars_on_line(e, e->buffy) > e->buffx) {
     /* normal line */
     i=_owl_editwin_get_index_from_xy(e);
@@ -804 +941 @@
 void owl_editwin_move_to_line_end(owl_editwin *e)
 {
-  e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
+  e->buffx=owl_editwin_get_numcells_on_line(e, e->buffy);
 }
 
@@ -817 +954 @@
   /* go to last char */
   e->buffy=owl_editwin_get_numlines(e)-1;
-  e->buffx=owl_editwin_get_numchars_on_line(e, e->buffy);
+  e->buffx=owl_editwin_get_numcells_on_line(e, e->buffy);
   owl_editwin_key_right(e);
 
@@ -841 +978 @@
 void owl_editwin_fill_paragraph(owl_editwin *e)
 {
+  /* asedeno: needs fixing for utf-8*/
   int i, save;
 
@@ -857 +995 @@
   /* main loop */
   while (1) {
-    i=_owl_editwin_get_index_from_xy(e);
+    i = _owl_editwin_get_index_from_xy(e);
 
     /* bail if we hit the end of the buffer */
-    if (i>=e->bufflen) break;
+    if (i >= e->bufflen || e->buff[i] == '\0') break;
 
     /* bail if we hit the end of the paragraph */
-    if (e->buff[i]=='\n' && e->buff[i+1]=='\n') break;
+    if (e->buff[i] == '\n' && e->buff[i+1] == '\n') break;
 
     /* if we've travelled too far, linewrap */
@@ -871 +1009 @@
 
     /* did we hit the end of a line too soon? */
-    i=_owl_editwin_get_index_from_xy(e);
-    if (e->buff[i]=='\n' && e->buffx<e->fillcol-1) {
+    i = _owl_editwin_get_index_from_xy(e);
+    if (e->buff[i] == '\n' && e->buffx < e->fillcol - 1) {
       /* ********* we need to make sure we don't pull in a word that's too long ***********/
       e->buff[i]=' ';
@@ -878 +1016 @@
     
     /* fix spacing */
-    i=_owl_editwin_get_index_from_xy(e);
-    if (e->buff[i]==' ' && e->buff[i+1]==' ') {
-      if (e->buff[i-1]=='.' || e->buff[i-1]=='!' || e->buff[i-1]=='?') {
+    i = _owl_editwin_get_index_from_xy(e);
+    if (e->buff[i] == ' ' && e->buff[i+1] == ' ') {
+      if (e->buff[i-1] == '.' || e->buff[i-1] == '!' || e->buff[i-1] == '?') {
         owl_editwin_key_right(e);
       } else {
         owl_editwin_delete_char(e);
         /* if we did this ahead of the save point, adjust it */
-        if (i<save) save--;
+        if (i < save) save--;
       }
     } else {
@@ -911 +1049 @@
 int owl_editwin_check_dotsend(owl_editwin *e)
 {
-  int i;
+  char *p, *p_n, *p_p;
+  gunichar c;
 
   if (!e->dotsend) return(0);
-  for (i=e->bufflen-1; i>0; i--) {
-    if (e->buff[i] == '.' 
-        && (e->buff[i-1] == '\n' || e->buff[i-1] == '\r')
-        && (e->buff[i+1] == '\n' || e->buff[i+1] == '\r')) {
-      e->bufflen = i;
-      e->buff[i] = '\0';
+
+  p = g_utf8_find_prev_char(e->buff, e->buff + e->bufflen);
+  p_n = g_utf8_find_next_char(p, NULL);
+  p_p = g_utf8_find_prev_char(e->buff, p);
+  c = g_utf8_get_char(p);
+  while (p != NULL) {
+    if (*p == '.'
+        && p_p != NULL && (*p_p == '\n' || *p_p == '\r')
+        && p_n != NULL && (*p_n == '\n' || *p_n == '\r')) {
+      e->bufflen = p - e->buff;
+      e->buff[e->bufflen] = '\0';
       return(1);
     }
-    if (!isspace((int) e->buff[i])) {
-      return(0);
-    }
+    if (c != '\0' && !g_unichar_isspace(c)) return(0);
+    p_n = p;
+    p = p_p;
+    c = g_utf8_get_char(p);
+    p_p = g_utf8_find_prev_char(e->buff, p);
   }
   return(0);
 }
 
-void owl_editwin_post_process_char(owl_editwin *e, int j)
+void owl_editwin_post_process_char(owl_editwin *e, gunichar j)
 {
   /* check if we need to scroll down */
@@ -942 +1088 @@
 }
 
-void owl_editwin_process_char(owl_editwin *e, int j)
+void owl_editwin_process_char(owl_editwin *e, gunichar j)
 {
   if (j == ERR) return;
-  if (j>127 || ((j<32) && (j!=10) && (j!=13))) {
+  if (g_unichar_iscntrl(j) && (j != 10) && (j != 13)) {
     return;
-  } else {
+  }
+  else {
     owl_editwin_insert_char(e, j);
   }
@@ -975 +1122 @@
   }
 
-  /* now go to the xth character */
-  ptr2=strchr(ptr1, '\n');
-  if (!ptr2) {
-    return(e->buff + e->bufflen - ptr1);
-  }
-  return(ptr2-ptr1); /* don't count the newline for now */
+  /* now count characters */
+  i = 0;
+  ptr2 = ptr1;
+  while (ptr2 - e->buff < e->bufflen
+         && *ptr2 != '\n') {
+    ++i;
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+  return i;
+}
+
+int owl_editwin_get_numcells_on_line(owl_editwin *e, int line)
+{
+  int i;
+  char *ptr1, *ptr2;
+  gunichar c;
+
+  if (e->bufflen==0) return(0);
+  
+  /* first go to the yth line */
+  ptr1=e->buff;
+  for (i=0; i<line; i++) {
+    ptr2=strchr(ptr1, '\n');
+    if (!ptr2) {
+      /* we're already on the last line */
+      return(0);
+    }
+    ptr1=ptr2+1;
+  }
+
+  /* now count cells */
+  i = 0;
+  ptr2 = ptr1;
+  while (ptr2 - e->buff < e->bufflen
+         && *ptr2 != '\n') {
+    c = g_utf8_get_char(ptr2);
+    i += mk_wcwidth(c);
+    ptr2 = g_utf8_next_char(ptr2);
+  }
+  return i;
 }
 

fmtext.c

@@ -8 +8 @@
 void owl_fmtext_init_null(owl_fmtext *f)
 {
-  f->textlen=0;
-  f->bufflen=5;
-  f->textbuff=owl_malloc(5);
-  f->fmbuff=owl_malloc(5);
-  f->fgcolorbuff=owl_malloc(5 * sizeof(short));
-  f->bgcolorbuff=owl_malloc(5 * sizeof(short));
-  f->textbuff[0]=0;
-  f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE;
-  f->fgcolorbuff[0]=OWL_COLOR_DEFAULT;
-  f->bgcolorbuff[0]=OWL_COLOR_DEFAULT;
+  f->textlen = 0;
+  f->bufflen = 5;
+  f->textbuff = owl_malloc(5);
+  f->textbuff[0] = 0;
+  f->default_attrs = OWL_FMTEXT_ATTR_NONE;
+  f->default_fgcolor = OWL_COLOR_DEFAULT;
+  f->default_fgcolor = OWL_COLOR_DEFAULT;
 }
 
@@ -24 +21 @@
 void owl_fmtext_clear(owl_fmtext *f)
 {
-    f->textlen = 0;
-    f->textbuff[0] = 0;
-    f->fmbuff[0]=OWL_FMTEXT_ATTR_NONE;
-    f->fgcolorbuff[0]=OWL_COLOR_DEFAULT;
-    f->bgcolorbuff[0]=OWL_COLOR_DEFAULT;
-}
-
-/* Internal function.  Set the attribute 'attr' from index 'first' to
- * index 'last'
- */
-void _owl_fmtext_set_attr(owl_fmtext *f, int attr, int first, int last)
-{
-  int i;
-  for (i=first; i<=last; i++) {
-    f->fmbuff[i]=(unsigned char) attr;
-  }
-}
-
-/* Internal function.  Add the attribute 'attr' to the existing
- * attributes from index 'first' to index 'last'
- */
-void _owl_fmtext_add_attr(owl_fmtext *f, int attr, int first, int last)
-{
-  int i;
-  for (i=first; i<=last; i++) {
-    f->fmbuff[i]|=(unsigned char) attr;
-  }
-}
-
-/* Internal function.  Set the color to be 'color' from index 'first'
- * to index 'last
- */
-void _owl_fmtext_set_fgcolor(owl_fmtext *f, int color, int first, int last)
-{
-  int i;
-  for (i=first; i<=last; i++) {
-    f->fgcolorbuff[i]=(short)color;
-  }
-}
-
-void _owl_fmtext_set_bgcolor(owl_fmtext *f, int color, int first, int last)
-{
-  int i;
-  for (i=first; i<=last; i++) {
-    f->bgcolorbuff[i]=(short)color;
-  }
+  f->textlen = 0;
+  f->textbuff[0] = 0;
+  f->default_attrs = OWL_FMTEXT_ATTR_NONE;
+  f->default_fgcolor = OWL_COLOR_DEFAULT;
+  f->default_fgcolor = OWL_COLOR_DEFAULT;
 }
 
@@ -75 +31 @@
 {
     if(newlen + 1 > f->bufflen) {
-      f->textbuff=owl_realloc(f->textbuff, newlen+1);
-      f->fmbuff=owl_realloc(f->fmbuff, newlen+1);
-      f->fgcolorbuff=owl_realloc(f->fgcolorbuff, (newlen+1) * sizeof(short));
-      f->bgcolorbuff=owl_realloc(f->bgcolorbuff, (newlen+1) * sizeof(short));
+      f->textbuff = owl_realloc(f->textbuff, newlen + 1);
       f->bufflen = newlen+1;
   }
 }
 
+int _owl_fmtext_is_format_char(gunichar c) /*noproto*/
+{
+  if ((c & ~OWL_FMTEXT_UC_ATTR_MASK) == OWL_FMTEXT_UC_ATTR) return 1;
+  if ((c & ~(OWL_FMTEXT_UC_ALLCOLOR_MASK)) == OWL_FMTEXT_UC_COLOR_BASE) return 1;
+  return 0;
+}
 /* append text to the end of 'f' with attribute 'attr' and color
  * 'color'
  */
-void owl_fmtext_append_attr(owl_fmtext *f, char *text, int attr, int fgcolor, int bgcolor)
-{
-  int newlen;
-  newlen=strlen(f->textbuff)+strlen(text);
+void owl_fmtext_append_attr(owl_fmtext *f, char *text, char attr, short fgcolor, short bgcolor)
+{
+  char attrbuff[6];
+  int newlen, a = 0, fg = 0, bg = 0;
+  
+  if (attr != OWL_FMTEXT_ATTR_NONE) a=1;
+  if (fgcolor != OWL_COLOR_DEFAULT) fg=1;
+  if (bgcolor != OWL_COLOR_DEFAULT) bg=1;
+
+  /* Plane-16 characters in UTF-8 are 4 bytes long. */
+  newlen = strlen(f->textbuff) + strlen(text) + (8 * (a + fg + bg));
   _owl_fmtext_realloc(f, newlen);
+
+  /* Set attributes */
+  if (a) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
+  if (fg) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
+  if (bg) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
   
   strcat(f->textbuff, text);
-  _owl_fmtext_set_attr(f, attr, f->textlen, newlen);
-  _owl_fmtext_set_fgcolor(f, fgcolor, f->textlen, newlen);
-  _owl_fmtext_set_bgcolor(f, bgcolor, f->textlen, newlen);
+
+  /* Reset attributes */
+  if (bg) strcat(f->textbuff, OWL_FMTEXT_UTF8_BGDEFAULT);
+  if (fg) strcat(f->textbuff, OWL_FMTEXT_UTF8_FGDEFAULT);
+  if (a)  strcat(f->textbuff, OWL_FMTEXT_UTF8_ATTR_NONE);
   f->textlen=newlen;
 }
@@ -129 +114 @@
 }
 
-/* Add the attribute 'attr' to all text in 'f' */
-void owl_fmtext_addattr(owl_fmtext *f, int attr)
+/* Add the attribute 'attr' to the default atts for the text in 'f' */
+void owl_fmtext_addattr(owl_fmtext *f, char attr)
 {
   /* add the attribute to all text */
-  int i, j;
-
-  j=f->textlen;
-  for (i=0; i<j; i++) {
-    f->fmbuff[i] |= attr;
-  }
-}
-
-/* Anywhere the color is NOT ALREDY SET, set the color to 'color'.
- * Other colors are left unchanged
+  f->default_attrs |= attr;
+}
+
+/* Set the default foreground color for this fmtext to 'color'.
+ * Only affects text that is colored default.
  */
 void owl_fmtext_colorize(owl_fmtext *f, int color)
 {
-  /* everywhere the fgcolor is OWL_COLOR_DEFAULT, change it to be 'color' */
-  int i, j;
-
-  j=f->textlen;
-  for(i=0; i<j; i++) {
-    if (f->fgcolorbuff[i]==OWL_COLOR_DEFAULT) f->fgcolorbuff[i] = (short)color;
-  }
-}
-
+  f->default_fgcolor = color;
+}
+
+/* Set the default foreground color for this fmtext to 'color'.
+ * Only affects text that is colored default.
+ */
 void owl_fmtext_colorizebg(owl_fmtext *f, int color)
 {
-  /* everywhere the bgcolor is OWL_COLOR_DEFAULT, change it to be 'color' */
-  int i, j;
-
-  j=f->textlen;
-  for(i=0; i<j; i++) {
-    if (f->bgcolorbuff[i]==OWL_COLOR_DEFAULT) f->bgcolorbuff[i] = (short)color;
-  }
-}
+  f->default_bgcolor = color;
+}
+
+/* Internal function. Parse attrbute character. */
+void _owl_fmtext_update_attributes(gunichar c, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
+{
+  if ((c & OWL_FMTEXT_UC_ATTR) == OWL_FMTEXT_UC_ATTR) {
+    *attr = c & OWL_FMTEXT_UC_ATTR_MASK;
+  }
+  else if ((c & OWL_FMTEXT_UC_FGCOLOR) == OWL_FMTEXT_UC_FGCOLOR) {
+    *fgcolor = (c == OWL_FMTEXT_UC_FGDEFAULT
+                ? OWL_COLOR_DEFAULT
+                : c & OWL_FMTEXT_UC_COLOR_MASK);
+  }
+  else if ((c & OWL_FMTEXT_UC_BGCOLOR) == OWL_FMTEXT_UC_BGCOLOR) {
+    *bgcolor = (c == OWL_FMTEXT_UC_BGDEFAULT
+                ? OWL_COLOR_DEFAULT
+                : c & OWL_FMTEXT_UC_COLOR_MASK);
+  }
+}
+
+/* Internal function. Scan for attribute characters. */
+void _owl_fmtext_scan_attributes(owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
+{
+  char *p;
+  p = strchr(f->textbuff, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+  while (p && p < f->textbuff + start) {
+    _owl_fmtext_update_attributes(g_utf8_get_char(p), attr, fgcolor, bgcolor);
+    p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+  }
+}  
 
 /* Internal function.  Append text from 'in' between index 'start' and
  * 'stop' to the end of 'f'
  */
-void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop)
-{
-  int newlen, i;
-
-  newlen=strlen(f->textbuff)+(stop-start+1);
+void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) /*noproto*/
+{
+  char attrbuff[6];
+  int newlen, a = 0, fg = 0, bg = 0;
+  char attr = 0;
+  short fgcolor = OWL_COLOR_DEFAULT;
+  short bgcolor = OWL_COLOR_DEFAULT;
+
+  _owl_fmtext_scan_attributes(in, start, &attr, &fgcolor, &bgcolor);
+  if (attr != OWL_FMTEXT_ATTR_NONE) a=1;
+  if (fgcolor != OWL_COLOR_DEFAULT) fg=1;
+  if (bgcolor != OWL_COLOR_DEFAULT) bg=1;
+
+  /* We will reset to defaults after appending the text. We may need
+     to set initial attributes. */
+  newlen=strlen(f->textbuff)+(stop-start+1) + (4 * (a + fg + bg)) + 12;
   _owl_fmtext_realloc(f, newlen);
 
+  if (a) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_ATTR | attr, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
+  if (fg) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_FGCOLOR | fgcolor, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
+  if (bg) {
+    memset(attrbuff,0,6);
+    g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff);
+    strcat(f->textbuff, attrbuff);      
+  }
+
   strncat(f->textbuff, in->textbuff+start, stop-start+1);
+
+  /* Reset attributes */
+  strcat(f->textbuff, OWL_FMTEXT_UTF8_BGDEFAULT);
+  strcat(f->textbuff, OWL_FMTEXT_UTF8_FGDEFAULT);
+  strcat(f->textbuff, OWL_FMTEXT_UTF8_ATTR_NONE);
+
   f->textbuff[newlen]='\0';
-  for (i=start; i<=stop; i++) {
-    f->fmbuff[f->textlen+(i-start)]=in->fmbuff[i];
-    f->fgcolorbuff[f->textlen+(i-start)]=in->fgcolorbuff[i];
-    f->bgcolorbuff[f->textlen+(i-start)]=in->bgcolorbuff[i];
-  }
   f->textlen=newlen;
 }
@@ -207 +235 @@
 char *owl_fmtext_print_plain(owl_fmtext *f)
 {
-  return(owl_strdup(f->textbuff));
-}
-
+  return owl_strip_format_chars(f->textbuff);
+}
+
+void _owl_fmtext_wattrset(WINDOW *w, int attrs) /*noproto*/
+{
+  wattrset(w, A_NORMAL);
+  if (attrs & OWL_FMTEXT_ATTR_BOLD) wattron(w, A_BOLD);
+  if (attrs & OWL_FMTEXT_ATTR_REVERSE) wattron(w, A_REVERSE);
+  if (attrs & OWL_FMTEXT_ATTR_UNDERLINE) wattron(w, A_UNDERLINE);
+}
 /* add the formatted text to the curses window 'w'.  The window 'w'
  * must already be initiatlized with curses
  */
-void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w)
-{
-  char *tmpbuff;
-  int position, trans1, trans2, trans3, len, lastsame;
-
+void _owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w, int do_search) /*noproto*/
+{
+  /* char *tmpbuff; */
+  /* int position, trans1, trans2, trans3, len, lastsame; */
+  char *s, *p;
+  char attr;
+  short fg, bg;
+  int search_results, search_len;
+  
   if (w==NULL) {
     owl_function_debugmsg("Hit a null window in owl_fmtext_curs_waddstr.");
@@ -223 +262 @@
   }
 
-  tmpbuff=owl_malloc(f->textlen+10);
-
-  position=0;
-  len=f->textlen;
-  while (position<=len) {
-    /* find the last char with the current format and color */
-    trans1=owl_util_find_trans(f->fmbuff+position, len-position);
-    trans2=owl_util_find_trans_short(f->fgcolorbuff+position, len-position);
-    trans3=owl_util_find_trans_short(f->bgcolorbuff+position, len-position);
-
-    lastsame = (trans1 < trans2) ? trans1 : trans2;
-    lastsame = (lastsame < trans3) ? lastsame : trans3;
-    lastsame += position;
-
-    /* set the format */
-    wattrset(w, A_NORMAL);
-    if (f->fmbuff[position] & OWL_FMTEXT_ATTR_BOLD) {
-      wattron(w, A_BOLD);
-    }
-    if (f->fmbuff[position] & OWL_FMTEXT_ATTR_REVERSE) {
-      wattron(w, A_REVERSE);
-    }
-    if (f->fmbuff[position] & OWL_FMTEXT_ATTR_UNDERLINE) {
-      wattron(w, A_UNDERLINE);
-    }
-
-    /* set the color */
-    /* warning, this is sort of a hack */
-    if (owl_global_get_hascolors(&g)) {
-      short fg, bg, pair;
-      fg = f->fgcolorbuff[position];
-      bg = f->bgcolorbuff[position];
-
-      pair = owl_fmtext_get_colorpair(fg, bg);
-      if (pair != -1) {
-        wcolor_set(w,pair,NULL);
-      }
-    }
-
-    /* add the text */
-    strncpy(tmpbuff, f->textbuff + position, lastsame-position+1);
-    tmpbuff[lastsame-position+1]='\0';
-    waddstr(w, tmpbuff);
-
-    position=lastsame+1;
-  }
-  owl_free(tmpbuff);
-}
-
+  search_results = (do_search
+                    ? owl_fmtext_search(f, 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. */
+  attr = f->default_attrs;
+  fg = f->default_fgcolor;
+  bg = f->default_bgcolor;
+  _owl_fmtext_wattrset(w, attr);
+  if (owl_global_get_hascolors(&g)) {
+    short pair;
+    pair = owl_fmtext_get_colorpair(fg, bg);
+    if (pair != -1) {
+      wcolor_set(w,pair,NULL);
+    }
+  }
+
+  /* Find next possible format character. */
+  p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+  while(p) {
+    if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+      /* Deal with all text from last insert to here. */
+      char tmp;
+   
+      tmp = p[0];
+      p[0] = '\0';
+      if (search_results) {
+        /* Search is active, so highlight search results. */
+        char tmp2, *ss;
+        ss = stristr(s, owl_global_get_search_string(&g));
+        while (ss) {
+          /* Found search string, highlight it. */
+
+          tmp2 = ss[0];
+          ss[0] = '\0';
+          waddstr(w, s);
+          ss[0] = tmp2;
+
+          _owl_fmtext_wattrset(w, attr ^ OWL_FMTEXT_ATTR_REVERSE);
+
+          tmp2 = ss[search_len];
+          ss[search_len] = '\0';
+          waddstr(w, ss);
+          ss[search_len] = tmp2;
+
+          _owl_fmtext_wattrset(w,attr);
+
+          s = ss + search_len;
+          ss = stristr(s, owl_global_get_search_string(&g));
+        }
+      }
+      /* Deal with remaining part of string. */
+      waddstr(w, s);
+      p[0] = tmp;
+
+      /* Deal with new attributes. Initialize to defaults, then
+         process all consecutive formatting characters. */
+      attr = f->default_attrs;
+      fg = f->default_fgcolor;
+      bg = f->default_bgcolor;
+      while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+        _owl_fmtext_update_attributes(g_utf8_get_char(p), &attr, &fg, &bg);
+        p = g_utf8_next_char(p);
+      }
+      _owl_fmtext_wattrset(w, attr | f->default_attrs);
+      if (owl_global_get_hascolors(&g)) {
+        if (fg == OWL_COLOR_DEFAULT) fg = f->default_fgcolor;
+        if (bg == OWL_COLOR_DEFAULT) bg = f->default_bgcolor;
+        short pair;
+        pair = owl_fmtext_get_colorpair(fg, bg);
+        if (pair != -1) {
+          wcolor_set(w,pair,NULL);
+        }
+      }
+      /* Advance to next non-formatting character. */
+      s = p;
+      p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+    }
+    else {
+      p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+    }
+  }
+  if (s) {
+    waddstr(w, s);
+  }
+}
+
+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
@@ -282 +371 @@
   
   /* find the starting line */
-  ptr1=in->textbuff;
-  if (aline!=0) {
-    for (i=0; i<aline; i++) {
-      ptr1=strchr(ptr1, '\n');
-      if (!ptr1) return(-1);
-      ptr1++;
-    }
-  }
+  ptr1 = in->textbuff;
+  for (i = 0; i < aline; i++) {
+    ptr1 = strchr(ptr1, '\n');
+    if (!ptr1) return(-1);
+    ptr1++;
+  }
+  
   /* ptr1 now holds the starting point */
 
   /* copy in the next 'lines' lines */
-  if (lines<1) return(-1);
-
-  for (i=0; i<lines; i++) {
-    offset=ptr1-in->textbuff;
-    ptr2=strchr(ptr1, '\n');
+  if (lines < 1) return(-1);
+
+  for (i = 0; i < lines; i++) {
+    offset = ptr1 - in->textbuff;
+    ptr2 = strchr(ptr1, '\n');
     if (!ptr2) {
-      _owl_fmtext_append_fmtext(out, in, offset, (in->textlen)-1);
+      _owl_fmtext_append_fmtext(out, in, offset, (in->textlen) - 1);
       return(-1);
     }
-    _owl_fmtext_append_fmtext(out, in, offset, (ptr2-ptr1)+offset);
-    ptr1=ptr2+1;
+    _owl_fmtext_append_fmtext(out, in, offset, (ptr2 - ptr1) + offset);
+    ptr1 = ptr2 + 1;
   }
   return(0);
@@ -311 +399 @@
  * ends at 'bcol' or sooner.  The first column is number 0.  The new
  * message is placed in 'out'.  The message is * expected to end in a
- * new line for now
+ * new line for now. NOTE: This needs to be modified to deal with
+ * backing up if we find a SPACING COMBINING MARK at the end of a
+ * line. If that happens, we should back up to the last non-mark
+ * character and stop there.
  */
 void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
 {
-  char *ptr1, *ptr2, *last;
-  int len, offset;
+  char *ptr_s, *ptr_e, *ptr_c, *last;
+  int col, st, padding, chwidth;
 
   last=in->textbuff+in->textlen-1;
-  ptr1=in->textbuff;
-  while (ptr1<=last) {
-    ptr2=strchr(ptr1, '\n');
-    if (!ptr2) {
+  ptr_s=in->textbuff;
+  while (ptr_s <= last) {
+    ptr_e=strchr(ptr_s, '\n');
+    if (!ptr_e) {
       /* but this shouldn't happen if we end in a \n */
       break;
     }
     
-    if (ptr2==ptr1) {
+    if (ptr_e == ptr_s) {
       owl_fmtext_append_normal(out, "\n");
-      ptr1++;
+      ++ptr_s;
       continue;
     }
 
-    /* we need to check that we won't run over here */
-    len=bcol-acol;
-    if (len > (ptr2-(ptr1+acol))) {
-      /* the whole line fits with room to spare, don't take a full 'len' */
-      len=ptr2-(ptr1+acol);
-    }
-    if (len>last-ptr1) {
-      /* the whole rest of the text fits with room to spare, adjust for it */
-      len-=(last-ptr1);
-    }
-    if (len<=0) {
-      /* saftey check */
+    col = 0;
+    st = 0;
+    padding = 0;
+    chwidth = 0;
+    ptr_c = ptr_s;
+    while(ptr_c < ptr_e) {
+      gunichar c = g_utf8_get_char(ptr_c);
+      if (!_owl_fmtext_is_format_char(c)) {
+        chwidth = mk_wcwidth(c);
+        if (col + chwidth > bcol) break;
+        
+        if (col >= acol) {
+          if (st == 0) {
+            ptr_s = ptr_c;
+            padding = col - acol;
+            ++st;
+          }
+        }
+        col += chwidth;
+        chwidth = 0;
+      }
+      ptr_c = g_utf8_next_char(ptr_c);
+    }
+    if (st) {
+      /* lead padding */
+      owl_fmtext_append_spaces(out, padding);
+      if (ptr_c == ptr_e) {
+        /* We made it to the newline. */
+        _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 {
+          /* Last char fits perfectly, leave alone.*/
+          _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
+        }
+      }
+    }
+    else {
       owl_fmtext_append_normal(out, "\n");
-      ptr1=ptr2+1;
-      continue;
-    }
-
-    offset=ptr1-in->textbuff;
-    _owl_fmtext_append_fmtext(out, in, offset+acol, offset+acol+len);
-
-    ptr1=ptr2+1;
+    }
+    ptr_s = g_utf8_next_char(ptr_e);
   }
 }
@@ -381 +497 @@
 
 /* set the charater at 'index' to be 'char'.  If index is out of
- * bounds don't do anything */
-void owl_fmtext_set_char(owl_fmtext *f, int index, int ch)
+ * bounds don't do anything. If c or char at index is not ASCII, don't
+ * do anything because it's not UTF-8 safe. */
+void owl_fmtext_set_char(owl_fmtext *f, int index, char ch)
 {
   if ((index < 0) || (index > f->textlen-1)) return;
+  /* NOT ASCII*/
+  if (f->textbuff[index] & 0x80 || ch & 0x80) return; 
   f->textbuff[index]=ch;
 }
@@ -400 +519 @@
   dst->textlen=src->textlen;
   dst->textbuff=owl_malloc(mallocsize);
-  dst->fmbuff=owl_malloc(mallocsize);
-  dst->fgcolorbuff=owl_malloc(mallocsize * sizeof(short));
-  dst->bgcolorbuff=owl_malloc(mallocsize * sizeof(short));
   memcpy(dst->textbuff, src->textbuff, src->textlen+1);
-  memcpy(dst->fmbuff, src->fmbuff, src->textlen);
-  memcpy(dst->fgcolorbuff, src->fgcolorbuff, src->textlen * sizeof(short));
-  memcpy(dst->bgcolorbuff, src->bgcolorbuff, src->textlen * sizeof(short));
-}
-
-/* highlight all instances of "string".  Return the number of
- * instances found.  This is a case insensitive search.
- */
-int owl_fmtext_search_and_highlight(owl_fmtext *f, char *string)
-{
-
-  int found, len;
-  char *ptr1, *ptr2;
-
-  len=strlen(string);
-  found=0;
-  ptr1=f->textbuff;
-  while (ptr1-f->textbuff <= f->textlen) {
-    ptr2=stristr(ptr1, string);
-    if (!ptr2) return(found);
-
-    found++;
-    _owl_fmtext_add_attr(f, OWL_FMTEXT_ATTR_REVERSE,
-                         ptr2 - f->textbuff,
-                         ptr2 - f->textbuff + len - 1);
-
-    ptr1=ptr2+len;
-  }
-  return(found);
+  dst->default_attrs = src->default_attrs;
+  dst->default_fgcolor = src->default_fgcolor;
+  dst->default_bgcolor = src->default_bgcolor;
 }
 
@@ -440 +530 @@
 int owl_fmtext_search(owl_fmtext *f, char *string)
 {
-
   if (stristr(f->textbuff, string)) return(1);
   return(0);
@@ -681 +770 @@
 {
   if (f->textbuff) owl_free(f->textbuff);
-  if (f->fmbuff) owl_free(f->fmbuff);
-  if (f->fgcolorbuff) owl_free(f->fgcolorbuff);
-  if (f->bgcolorbuff) owl_free(f->bgcolorbuff);
 }
 

functions.c

@@ -1606 +1606 @@
           sprintf(buff, "  Field %i   : ", i+1);
           
-          ptr=owl_zephyr_get_field(n, i+1);
+          ptr=owl_zephyr_get_field_as_utf8(n, i+1);
           len=strlen(ptr);
           if (len<30) {
@@ -2187 +2187 @@
 void owl_function_start_command(char *line)
 {
-  int i, j;
   owl_editwin *tw;
 
@@ -2198 +2197 @@
   owl_global_set_needrefresh(&g);
 
-  j=strlen(line);
-  for (i=0; i<j; i++) {
-    owl_editwin_process_char(tw, line[i]);
-  }
+  owl_editwin_insert_string(tw, line);
   owl_editwin_redisplay(tw, 0);
 
@@ -2599 +2595 @@
   }
   /* downcase it */
-  downstr(filtname);
+  {
+    char *temp = g_utf8_strdown(filtname, -1);
+    if (temp) {
+      owl_free(filtname);
+      filtname = temp;
+    }
+  }
   /* turn spaces, single quotes, and double quotes into dots */
   owl_text_tr(filtname, ' ', '.');
@@ -3024 +3026 @@
   char *quoted;
 
-  buff=malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
+  buff=owl_malloc(strlen(class)+strlen(inst)+strlen(recip)+100);
   strcpy(buff, "class");
   if (!strcmp(class, "*")) {
@@ -3328 +3330 @@
           if (ret==0) {
             for (x=0; x<numlocs; x++) {
-              line=malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
+              line=owl_malloc(strlen(location[x].host)+strlen(location[x].time)+strlen(location[x].tty)+100);
               tmp=short_zuser(user);
               sprintf(line, "  %-10.10s %-24.24s %-12.12s  %20.20s\n",
@@ -3371 +3373 @@
   owl_view *v;
   FILE *file;
+  char *plaintext;
 
   v=owl_global_get_current_view(&g);
@@ -3393 +3396 @@
   for (i=0; i<j; i++) {
     m=owl_view_get_element(v, i);
-    fputs(owl_message_get_text(m), file);
+    plaintext = owl_strip_format_chars(owl_message_get_text(m));
+    if (plaintext) {
+      fputs(plaintext, file);
+      owl_free(plaintext);
+    }
   }
   fclose(file);
@@ -3434 +3441 @@
           _exit(127);
         }
-        parsed=realloc(parsed, sizeof(*parsed) * (myargc+1));
+        parsed=owl_realloc(parsed, sizeof(*parsed) * (myargc+1));
         parsed[myargc] = NULL;
         

global.c

@@ -549 +549 @@
     len+=strlen(argv[i])+5;
   }
-  g->startupargs=malloc(len+5);
+  g->startupargs=owl_malloc(len+5);
 
   strcpy(g->startupargs, "");

keymap.c

@@ -5 +5 @@
 
 /* returns 0 on success */
-int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int))
+int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   if (!name || !desc) return(-1);
@@ -151 +151 @@
 }
 
-owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(int), void (*prealways_fn)(int), void (*postalways_fn)(int))
+owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   owl_keymap *km;
@@ -202 +202 @@
 /* processes a keypress.  returns 0 if the keypress was handled,
  * 1 if not handled, -1 on error, and -2 if j==ERR. */
-int owl_keyhandler_process(owl_keyhandler *kh, int j)
+int owl_keyhandler_process(owl_keyhandler *kh, owl_input j)
 {
   owl_keymap     *km;
@@ -214 +214 @@
 
   /* temporarily disallow C-`/C-SPACE until we fix associated bugs */
-  if (j==ERR || j==0) {
+  if (j.ch == ERR || j.ch == 0) {
         return(-1);
   }
@@ -224 +224 @@
 
   /* deal with ESC prefixing */
-  if (!kh->in_esc && j==27) {
+  if (!kh->in_esc && j.ch == 27) {
     kh->in_esc = 1;
     return(0);
   }
   if (kh->in_esc) {
-    j = OWL_META(j);
+    j.ch = OWL_META(j.ch);
     kh->in_esc = 0;
   }
   
-  kh->kpstack[++(kh->kpstackpos)] = j;
+  kh->kpstack[++(kh->kpstackpos)] = j.ch;
   if (kh->kpstackpos >= OWL_KEYMAP_MAXSTACK) {
     owl_keyhandler_reset(kh);
@@ -260 +260 @@
       } else if (match == 2) {  /* exact match */
         /* owl_function_debugmsg("processkey: found exact match in %s", km->name); */
-        owl_keybinding_execute(kb, j);
+        owl_keybinding_execute(kb, j.ch);
         owl_keyhandler_reset(kh);
         if (km->postalways_fn) {

keypress.c

@@ -148 +148 @@
   }
   if (!*kb) {
-    if (j&OWL_META(0)) {
+    if (j & OWL_META(0)) {
       strcat(kb, "M-");
       j &= ~OWL_META(0);
@@ -163 +163 @@
       strcat(kb, kb2);    
     }
+    
   }  
   if (!*kb) {

keys.c

@@ -294 +294 @@
 /****************************************************************/
 
-void owl_keys_recwin_prealways(int j) {
+void owl_keys_recwin_prealways(owl_input j) {
   /* Clear the message line on subsequent key presses */
   owl_function_makemsg("");
 }
 
-void owl_keys_editwin_default(int j) {
+void owl_keys_editwin_default(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))) {
-    owl_editwin_process_char(e, j);
+  if (NULL != (e=owl_global_get_typwin(&g))
+      && j.ch < 0x100) {
+       owl_editwin_process_char(e, j.uch);
   }
 }
 
-void owl_keys_editwin_postalways(int j) {
+void owl_keys_editwin_postalways(owl_input j) {
   owl_editwin *e;
-  if (NULL != (e=owl_global_get_typwin(&g))) {
-    owl_editwin_post_process_char(e, j);
+  if (NULL != (e=owl_global_get_typwin(&g))
+      && j.ch < 0x100) {
+    owl_editwin_post_process_char(e, j.uch);
   }  
   owl_global_set_needrefresh(&g);
 }
 
-void owl_keys_popless_postalways(int j) {
+void owl_keys_popless_postalways(owl_input j) {
   owl_viewwin *v = owl_global_get_viewwin(&g);
   owl_popwin *pw = owl_global_get_popwin(&g);
@@ -323 +325 @@
 }
 
-void owl_keys_default_invalid(int j) {
-  if (j==ERR) return;
-  if (j==410) return;
+void owl_keys_default_invalid(owl_input j) {
+  if (j.ch==ERR) return;
+  if (j.ch==410) return;
   owl_keyhandler_invalidkey(owl_global_get_keyhandler(&g));
 }

logging.c

@@ -155 +155 @@
     to = owl_sprintf("jabber:%s", owl_message_get_recipient(m));
   } else if (owl_message_is_type_aim(m)) {
+    char *temp2;
     temp = owl_aim_normalize_screenname(owl_message_get_recipient(m));
-    downstr(temp);
-    to = owl_sprintf("aim:%s", temp);
+    temp2 = g_utf8_strdown(temp,-1);
+    to = owl_sprintf("aim:%s", temp2);
+    owl_free(temp2);
     owl_free(temp);
   } else {
@@ -267 +269 @@
   } else if (owl_message_is_type_aim(m)) {
     /* we do not yet handle chat rooms */
-    char *normalto;
-    normalto=owl_aim_normalize_screenname(owl_message_get_sender(m));
-    downstr(normalto);
+    char *normalto, *temp;
+    temp = owl_aim_normalize_screenname(owl_message_get_sender(m));
+    normalto = g_utf8_strdown(temp, -1);
     from=frombuff=owl_sprintf("aim:%s", normalto);
     owl_free(normalto);
+    owl_free(temp);
   } else if (owl_message_is_type_loopback(m)) {
     from=frombuff=owl_strdup("loopback");
@@ -290 +293 @@
 
   ch=frombuff[0];
-  if (!isalnum(ch)) from="weird";
+  if (!g_ascii_isalnum(ch)) from="weird";
 
   for (i=0; i<len; i++) {
@@ -299 +302 @@
 
   if (!personal) {
-    if (strcmp(from, "weird")) downstr(from);
+    if (strcmp(from, "weird")) {
+      char* temp = g_utf8_strdown(frombuff, -1);
+      if (temp) {
+        owl_free(frombuff);
+        from = frombuff = temp;
+      }
+    }
   }
 

message.c

@@ -79 +79 @@
     owl_list_append_element(&(m->attributes), pair);
   }
-  owl_pair_set_value(pair, owl_strdup(attrvalue));
+  owl_pair_set_value(pair, owl_validate_or_convert(attrvalue));
 }
 
@@ -493 +493 @@
 {
   if(m->zwriteline) owl_free(m->zwriteline);
-  m->zwriteline=strdup(line);
+  m->zwriteline=owl_strdup(line);
 }
 
@@ -535 +535 @@
   owl_fmtext_init_null(&b);
   
-  owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline+1, &a);
+  owl_fmtext_truncate_lines(&(m->fmtext->fmtext), aline, bline-aline, &a);
   owl_fmtext_truncate_cols(&a, acol, bcol, &b);
-  if (fgcolor!=OWL_COLOR_DEFAULT) {
-    owl_fmtext_colorize(&b, fgcolor);
-  }
-  if (bgcolor!=OWL_COLOR_DEFAULT) {
-    owl_fmtext_colorizebg(&b, bgcolor);
-  }
-
-  if (owl_global_is_search_active(&g)) {
-    owl_fmtext_search_and_highlight(&b, owl_global_get_search_string(&g));
-  }
-      
+  owl_fmtext_colorize(&b, fgcolor);
+  owl_fmtext_colorizebg(&b, bgcolor);
+
   owl_fmtext_curs_waddstr(&b, win);
 
@@ -890 +882 @@
   }
 
-  m->zwriteline=strdup("");
+  m->zwriteline=owl_strdup("");
 
   /* save the hostname */
@@ -972 +964 @@
   }
 
-  m->zwriteline=strdup("");
+  m->zwriteline=owl_strdup("");
 
   owl_message_set_body(m, "<uninitialized>");

owl.c

@@ -48 +48 @@
 #include <termios.h>
 #include <sys/stat.h>
+#include <locale.h>
 #include "owl.h"
 
@@ -69 +70 @@
   owl_editwin *tw;
   owl_popwin *pw;
-  int j, ret, initialsubs, debug, argcsave, followlast;
+  int ret, initialsubs, debug, argcsave, followlast;
+  owl_input j;
   int newmsgs, nexttimediff;
   struct sigaction sigact;
@@ -84 +86 @@
   int newstderr;
 #endif
+  
+  if (!GLIB_CHECK_VERSION (2, 12, 0))
+    g_error ("GLib version 2.12.0 or above is needed.");
 
   argcsave=argc;
@@ -92 +97 @@
   debug=0;
   initialsubs=1;
+
+  setlocale(LC_ALL, "");
+  
   if (argc>0) {
     argv++;
@@ -538 +546 @@
      * little bit, but otherwise do not.  This lets input be grabbed
      * as quickly as possbile */
-    j=wgetch(typwin);
-    if (j==ERR) {
+    j.ch = wgetch(typwin);
+    if (j.ch == ERR) {
       usleep(10000);
     } else {
+      j.uch = '\0';
+      if (j.ch >= KEY_MIN && j.ch <= KEY_MAX) {
+        /* This is a curses control character. */
+      }
+      else if (j.ch > 0x7f && j.ch < 0xfe) {
+        /* Pull in a full utf-8 character. */
+        int bytes, i;
+        char *utf8buf[7];
+        memset(utf8buf, '\0', 7);
+
+        utf8buf[0] = j.ch;
+
+        if ((j.ch & 0xc0) && (~j.ch & 0x20)) bytes = 2;
+        else if ((j.ch & 0xe0) && (~j.ch & 0x10)) bytes = 3;
+        else if ((j.ch & 0xf0) && (~j.ch & 0x08)) bytes = 4;
+        else if ((j.ch & 0xf8) && (~j.ch & 0x04)) bytes = 5;
+        else if ((j.ch & 0xfc) && (~j.ch & 0x02)) bytes = 6;
+        else bytes = 1;
+        
+        for (i = 1; i < bytes; i++) {
+          utf8buf[i] = wgetch(typwin);
+        }
+        if (g_utf8_validate(utf8buf, -1, NULL)) {
+          j.uch = g_utf8_get_char(utf8buf);
+        }
+        else {
+          j.ch = ERR;
+        }
+      }
+      else if (j.ch <= 0x7f) {
+        j.uch = j.ch;
+      }
+      
       owl_global_update_lastinputtime(&g);
       /* find and activate the current keymap.

owl.h

@@ -52 +52 @@
 #include <termios.h>
 #include <libfaim/aim.h>
+#include <wchar.h>
 #include "config.h"
+#include "glib.h"
 #ifdef HAVE_LIBZEPHYR
 #include <zephyr/zephyr.h>
@@ -98 +100 @@
 #define OWL_FMTEXT_ATTR_REVERSE   2
 #define OWL_FMTEXT_ATTR_UNDERLINE 4
+
+#define OWL_FMTEXT_UC_BASE 0x100000 /* Unicode Plane 16 - Supplementary Private Use Area-B*/
+#define OWL_FMTEXT_UC_ATTR ( OWL_FMTEXT_UC_BASE | 0x800 )
+#define OWL_FMTEXT_UC_ATTR_MASK 0x7
+#define OWL_FMTEXT_UC_COLOR_BASE ( OWL_FMTEXT_UC_BASE | 0x400 )
+#define OWL_FMTEXT_UC_FGCOLOR OWL_FMTEXT_UC_COLOR_BASE
+#define OWL_FMTEXT_UC_BGCOLOR ( OWL_FMTEXT_UC_COLOR_BASE | 0x200 )
+#define OWL_FMTEXT_UC_DEFAULT_COLOR 0x100
+#define OWL_FMTEXT_UC_FGDEFAULT ( OWL_FMTEXT_UC_FGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )
+#define OWL_FMTEXT_UC_BGDEFAULT ( OWL_FMTEXT_UC_BGCOLOR | OWL_FMTEXT_UC_DEFAULT_COLOR )
+#define OWL_FMTEXT_UC_COLOR_MASK 0xFF
+#define OWL_FMTEXT_UC_ALLCOLOR_MASK ( OWL_FMTEXT_UC_COLOR_MASK | OWL_FMTEXT_UC_DEFAULT_COLOR | 0x200)
+#define OWL_FMTEXT_UC_STARTBYTE_UTF8 '\xf4'
+
+#define OWL_FMTEXT_UTF8_ATTR_NONE "\xf4\x80\xa0\x80"
+#define OWL_FMTEXT_UTF8_FGDEFAULT "\xf4\x80\x94\x80"
+#define OWL_FMTEXT_UTF8_BGDEFAULT "\xf4\x80\x96\x80"
+
+
+
 
 #define OWL_COLOR_BLACK     0
@@ -250 +272 @@
 } owl_variable;
 
+typedef struct _owl_input {
+  int ch;
+  char utf8buf[8];
+  gunichar uch;
+} owl_input;
+
 typedef struct _owl_fmtext {
   int textlen;
   int bufflen;
   char *textbuff;
-  char *fmbuff;
-  short *fgcolorbuff;
-  short *bgcolorbuff;
+  char default_attrs;
+  short default_fgcolor;
+  short default_bgcolor;
 } owl_fmtext;
 
@@ -489 +517 @@
   owl_list  bindings;           /* key bindings */
   struct _owl_keymap *submap;   /* submap */
-  void (*default_fn)(int j);    /* default action (takes a keypress) */
-  void (*prealways_fn)(int j);  /* always called before a keypress is received */
-  void (*postalways_fn)(int j); /* always called after keypress is processed */
+  void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
+  void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
+  void (*postalways_fn)(owl_input  j);  /* always called after keypress is processed */
 } owl_keymap;
 

perlconfig.c

@@ -55 +55 @@
     j=owl_zephyr_get_num_fields(owl_message_get_notice(m));
     for (i=0; i<j; i++) {
-      ptr=owl_zephyr_get_field(owl_message_get_notice(m), i+1);
+      ptr=owl_zephyr_get_field_as_utf8(owl_message_get_notice(m), i+1);
       av_push(av_zfields, newSVpvn(ptr, strlen(ptr)));
       owl_free(ptr);

text.c

@@ -50 +50 @@
 void owl_text_truncate_cols(char *out, char *in, int acol, int bcol)
 {
-  char *ptr1, *ptr2, *tmpbuff, *last;
-  int len;
-
+  char *ptr_s, *ptr_e, *ptr_c, *tmpbuff, *last;
+  int col, cnt, padding;
+  
   tmpbuff=owl_malloc(strlen(in)+20);
 
   strcpy(tmpbuff, "");
   last=in+strlen(in)-1;
-  ptr1=in;
-  while (ptr1<last) {
-    ptr2=strchr(ptr1, '\n');
-    if (!ptr2) {
+  ptr_s=in;
+  while (ptr_s<last) {
+    ptr_e=strchr(ptr_s, '\n');
+    if (!ptr_e) {
       /* but this shouldn't happen if we end in a \n */
       break;
     }
     
-    if (ptr2==ptr1) {
+    if (ptr_e==ptr_s) {
       strcat(tmpbuff, "\n");
-      ptr1++;
-      continue;
-    }
-
+      ptr_s++;
+      continue;
+    }
+
+    col = 0;
+    cnt = 0;
+    padding = 0;
+    ptr_c = ptr_s;
+    while(col < bcol && ptr_c < ptr_e) {
+      gunichar c = g_utf8_get_char(ptr_c);
+      if (col + mk_wcwidth(c) > bcol) break;
+      col += mk_wcwidth(c);
+      ptr_c = g_utf8_next_char(ptr_c);
+      if (col >= acol) {
+        if (cnt == 0) {
+          ptr_s = ptr_c;
+          padding = col - acol;
+        }
+        ++cnt;
+      }
+    }
+    if (cnt) {
+      while(padding-- > 0) {
+        strcat(tmpbuff, " ");
+      }
+      strncat(tmpbuff, ptr_s, ptr_c - ptr_s - 1);
+    }
+    strcat(tmpbuff, "\n");
+    ptr_s = ptr_e + 1;
+#if 0
     /* we need to check that we won't run over here */
-    if ( (ptr2-ptr1) < (bcol-acol) ) {
-      len=ptr2-(ptr1+acol);
+    if ( (ptr_e-ptr_s) < (bcol-acol) ) {
+      len=ptr_e-(ptr_s+acol);
     } else {
       len=bcol-acol;
     }
-    if ((ptr1+len)>=last) {
-      len-=last-(ptr1+len);
-    }
-
-    strncat(tmpbuff, ptr1+acol, len);
+    if ((ptr_s+len)>=last) {
+      len-=last-(ptr_s+len);
+    }
+
+    strncat(tmpbuff, ptr_s+acol, len);
     strcat(tmpbuff, "\n");
 
-    ptr1=ptr2+1;
+    ptr_s=ptr_e+1;
+#endif
   }
   strcpy(out, tmpbuff);
@@ -275 +302 @@
 char *stristr(char *a, char *b)
 {
-  char *x, *y, *ret;
-
-  if ((x=owl_strdup(a))==NULL) return(NULL);
-  if ((y=owl_strdup(b))==NULL) return(NULL);
-  downstr(x);
-  downstr(y);
-  ret=strstr(x, y);
-  if (ret==NULL) {
-    owl_free(x);
-    owl_free(y);
-    return(NULL);
-  }
-  ret=ret-x+a;
-  owl_free(x);
-  owl_free(y);
+  char *x, *y;
+  char *ret = NULL;
+  if ((x = g_utf8_casefold(a, -1)) != NULL) {
+    if ((y = g_utf8_casefold(b, -1)) != NULL) {
+      ret = strstr(x, y);
+      if (ret != NULL) {
+        ret = ret - x + a;
+      }
+      g_free(y);
+    }
+    g_free(x);
+  }
   return(ret);
 }
@@ -296 +320 @@
 int only_whitespace(char *s)
 {
-  int i;
-  for (i=0; s[i]; i++) {
-    if (!isspace((int) s[i])) return(0);
+  if (g_utf8_validate(s,-1,NULL)) {
+    char *p;
+    for(p = s; p[0]; p=g_utf8_next_char(p)) {
+      if (!g_unichar_isspace(g_utf8_get_char(p))) return 0;
+    }
+  }
+  else {
+    int i;
+    for (i=0; s[i]; i++) {
+      if (!isspace((int) s[i])) return(0);
+    }
   }
   return(1);
@@ -327 +359 @@
   tolen  = strlen(to);
   fromlen  = strlen(from);
-  out = malloc(outlen);
+  out = owl_malloc(outlen);
 
   while (in[inpos]) {

util.c

@@ -399 +399 @@
 }
 
-/* downcase the string 'foo' */
-void downstr(char *foo)
-{
-  int i;
-  for (i=0; foo[i]!='\0'; i++) {
-    foo[i]=tolower(foo[i]);
-  }
-}
-
 /* Caller must free response. 
  * Takes in strings which are space-separated lists of tokens
@@ -446 +437 @@
 void *owl_malloc(size_t size)
 {
-  return(malloc(size));
+  return(g_malloc(size));
 }
 
 void owl_free(void *ptr)
 {
-  free(ptr);
+  g_free(ptr);
 }
 
 char *owl_strdup(const char *s1)
 {
-  return(strdup(s1));
+  return(g_strdup(s1));
 }
 
 void *owl_realloc(void *ptr, size_t size)
 {
-  return(realloc(ptr, size));
+  return(g_realloc(ptr, size));
 }
 
 /* allocates memory and returns the string or null.
  * caller must free the string. 
- * from Linux sprintf man page. 
  */
 char *owl_sprintf(const char *fmt, ...)
 {
-  int n, size = 100;
-  char *p;
   va_list ap;
-  if ((p = owl_malloc (size)) == NULL) return (NULL);
-  while (1) {
-    /* Try to print in the allocated space. */
-    va_start(ap, fmt);
-    n = vsnprintf (p, size, fmt, ap);
-    va_end(ap);
-    /* If that worked, return the string. */
-    if (n > -1 && n < size)
-      return p;
-    /* Else try again with more space. */
-    if (n > -1)    /* glibc 2.1 */
-      size = n+1; /* precisely what is needed */
-    else           /* glibc 2.0 */
-      size *= 2;  /* twice the old size */
-    if ((p = owl_realloc (p, size)) == NULL)
-      return NULL;
-  }
-}
+  char *ret = NULL;
+  va_start(ap, fmt);
+  ret = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+  return ret;
+}
+
 
 /* Return the owl color associated with the named color.  Return -1
@@ -776 +753 @@
 }
 
-char * owl_get_datadir() {
-    char * datadir = getenv("BARNOWL_DATA_DIR");
-    if(datadir != NULL)
-        return strchr(datadir, '=') + 1;
-    return DATADIR;
+char * owl_get_datadir()
+{
+  char * datadir = getenv("BARNOWL_DATA_DIR");
+  if(datadir != NULL)
+    return strchr(datadir, '=') + 1;
+  return DATADIR;
+}
+
+/* Strips format characters from a valid utf-8 string. Returns the
+   empty string if 'in' does not validate. */
+char * owl_strip_format_chars(char *in)
+{
+  char *r;
+  if (g_utf8_validate(in, -1, NULL)) {
+    char *s, *p;
+    r = owl_malloc(strlen(in)+1);
+    r[0] = '\0';
+    s = in;
+    p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+    while(p) {
+      /* If it's a format character, copy up to it, and skip all
+         immediately following format characters. */
+      if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+        strncat(r, s, p-s);
+        p = g_utf8_next_char(p);
+        while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+          p = g_utf8_next_char(p);
+        }
+        s = p;
+        p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+      }
+      else {
+        p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+      }
+    }
+    if (s) strcat(r,s);
+  }
+  else {
+    r = owl_strdup("");
+  }
+  return r;
+}
+
+/* If in is not UTF-8, convert from ISO-8859-1. We may want to allow
+ * the caller to specify an alternative in the future. We also strip
+ * out characters in Unicode Plane 16, as we use that plane internally
+ * for formatting.
+ */
+char * owl_validate_or_convert(char *in)
+{
+  if (g_utf8_validate(in, -1, NULL)) {
+    return owl_strip_format_chars(in);
+  }
+  else {
+    return g_convert(in, -1,
+                     "UTF-8", "ISO-8859-1",
+                     NULL, NULL, NULL);
+  }
+}
+/* Attempts to convert 'in' to ISO-8859-1. Returns that if possible,
+   else returns UTF-8.
+ */
+char * owl_get_iso_8859_1_if_possible(char *in)
+{
+  char *out;
+  if (g_utf8_validate(in, -1, NULL)) {
+    out = g_convert(in, -1,
+                    "ISO-8859-1", "UTF-8",
+                    NULL, NULL, NULL);
+    if (!out) {
+      out = owl_strdup(in);
+    }
+  }
+  else {
+    out = owl_strdup("");
+  }
+  return out;
 }
 

viewwin.c

@@ -73 +73 @@
   owl_fmtext_truncate_cols(&fm1, v->rightshift, v->wincols-1+v->rightshift, &fm2);
 
-  owl_fmtext_curs_waddstr(&fm2, v->curswin);
+  owl_fmtext_curs_waddstr_without_search(&fm2, v->curswin);
 
   /* print the message at the bottom */

zcrypt.c

@@ -385 +385 @@
 
 /* Build a space-separated string from argv from elements between start  *
- * and end - 1.  malloc()'s the returned string. */
+ * and end - 1.  owl_malloc()'s the returned string. */
 char *BuildArgString(char **argv, int start, int end) {
   int len = 1;
@@ -397 +397 @@
 
   /* Allocate memory */
-  result = (char *)malloc(len);
+  result = (char *)owl_malloc(len);
   if (result) {
     /* Build the string */
@@ -482 +482 @@
       /* Prepare result to be returned */
       char *temp = keyfile;
-      keyfile = (char *)malloc(strlen(temp) + 1);
+      keyfile = (char *)owl_malloc(strlen(temp) + 1);
       if (keyfile) {
         strcpy(keyfile, temp);
@@ -611 +611 @@
       }
       use_buffer = TRUE;
-      if ((inptr = inbuff = (char *)malloc(MAX_RESULT)) == NULL) {
+      if ((inptr = inbuff = (char *)owl_malloc(MAX_RESULT)) == NULL) {
         printf("Memory allocation error\n");
         return FALSE;
@@ -639 +639 @@
       printf("Could not run zwrite\n");
       if (freein && inbuff) {
-        free(inbuff);
+        owl_free(inbuff);
       }
       return(FALSE);
@@ -685 +685 @@
 
   /* Free the input buffer, if necessary */
-  if (freein && inbuff) free(inbuff);
+  if (freein && inbuff) owl_free(inbuff);
 
   return(!error);

zephyr.c

@@ -354 +354 @@
   return(owl_strdup(""));
 }
+
+char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)
+{
+  int i, count, save;
+
+  /* If there's no message here, just run along now */
+  if (n->z_message_len == 0)
+    return(owl_strdup(""));
+
+  count=save=0;
+  for (i = 0; i < n->z_message_len; i++) {
+    if (n->z_message[i]=='\0') {
+      count++;
+      if (count == j) {
+        /* just found the end of the field we're looking for */
+        return(owl_validate_or_convert(n->z_message + save));
+      } else {
+        save = i + 1;
+      }
+    }
+  }
+  /* catch the last field, which might not be null terminated */
+  if (count == j - 1) {
+    char *tmp, *out;
+    tmp = owl_malloc(n->z_message_len-save+5);
+    memcpy(tmp, n->z_message+save, n->z_message_len-save);
+    tmp[n->z_message_len-save]='\0';
+    out = owl_validate_or_convert(tmp);
+    owl_free(tmp);
+    return out;
+  }
+
+  return(owl_strdup(""));
+}
 #else
 char *owl_zephyr_get_field(void *n, int j)
 {
   return(owl_strdup(""));
+}
+char *owl_zephyr_get_field_as_utf8(ZNotice_t *n, int j)
+{
+  return owl_zephyr_get_field(n, j);
 }
 #endif

zwrite.c

@@ -44 +44 @@
         break;
       }
-      z->class=owl_strdup(myargv[1]);
+      z->class=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -52 +52 @@
         break;
       }
-      z->inst=owl_strdup(myargv[1]);
+      z->inst=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -60 +60 @@
         break;
       }
-      z->realm=owl_strdup(myargv[1]);
+      z->realm=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -68 +68 @@
         break;
       }
-      z->zsig=owl_strdup(myargv[1]);
+      z->zsig=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -76 +76 @@
         break;
       }
-      z->opcode=owl_strdup(myargv[1]);
+      z->opcode=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -93 +93 @@
       myargv++;
       myargc--;
-      z->message=owl_strdup("");
+      z->message=owl_get_iso_8859_1_if_possible("");
       while (myargc) {
-        z->message=realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
+        z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
         strcat(z->message, myargv[0]);
         strcat(z->message, " ");
@@ -113 +113 @@
     } else {
       /* anything unattached is a recipient */
-      owl_list_append_element(&(z->recips), strdup(myargv[0]));
+      owl_list_append_element(&(z->recips), owl_get_iso_8859_1_if_possible(myargv[0]));
       myargv++;
       myargc--;
@@ -146 +146 @@
 
     if (zsigowlvar && *zsigowlvar) {
-      z->zsig=owl_strdup(zsigowlvar);
+      z->zsig=owl_get_iso_8859_1_if_possible(zsigowlvar);
     } else if (zsigproc && *zsigproc) {
       FILE *file;
@@ -161 +161 @@
       if (!file) {
         if (zsigzvar && *zsigzvar) {
-          z->zsig=owl_strdup(zsigzvar);
+          z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
         }
       } else {
@@ -175 +175 @@
       }
     } else if (zsigzvar) {
-      z->zsig=owl_strdup(zsigzvar);
+      z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
     } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=strdup(pw->pw_gecos);
+      z->zsig=owl_get_iso_8859_1_if_possible(pw->pw_gecos);
       ptr=strchr(z->zsig, ',');
       if (ptr) {
@@ -218 +218 @@
   int i, j;
   char toline[LINE];
+  char *tmp = NULL;
 
   if (z->message) owl_free(z->message);
@@ -231 +232 @@
       }
     }
-    z->message=owl_sprintf("%s\n%s", toline, msg);
+    tmp = owl_get_iso_8859_1_if_possible(msg);
+    z->message=owl_sprintf("%s\n%s", toline, tmp);
   } else {
-    z->message=owl_strdup(msg);
-  }
+    z->message=owl_get_iso_8859_1_if_possible(msg);
+  }
+  if (tmp) owl_free(tmp);
 }
 
@@ -305 +308 @@
 {
   if (z->opcode) owl_free(z->opcode);
-  z->opcode=owl_strdup(opcode);
+  z->opcode=owl_get_iso_8859_1_if_possible(opcode);
 }