Changeset ee310eb

Timestamp:

Feb 3, 2008, 1:08:11 AM (17 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:

99219ed

Parents:

625802a (diff), af1920fd (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 909-923 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r910 | nelhage | 2008-01-29 20:47:41 -0500 (Tue, 29 Jan 2008) | 1 line
  
  Fix IRC -- I forgot to add one ->conn in the last patch
........
  r911 | asedeno | 2008-01-30 15:49:35 -0500 (Wed, 30 Jan 2008) | 5 lines
  
  Jabber Buddy Lists:
  * Query the jabber:show_offline_buddies once when invoking onGetBuddyList()
  * Don't bold online roster entries when hiding offline ones
........
  r922 | asedeno | 2008-02-03 00:49:46 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Bounds checking.
........
  r923 | asedeno | 2008-02-03 01:01:07 -0500 (Sun, 03 Feb 2008) | 1 line
  
  Portability - removing C++ style comments.
........

Files:

• dict.c (modified) (1 diff)
• editwin.c (modified) (2 diffs)
• filter.c (modified) (2 diffs)
• filterelement.c (modified) (2 diffs)
• fmtext.c (modified) (5 diffs)
• functions.c (modified) (1 diff)
• logging.c (modified) (2 diffs)
• obarray.c (modified) (3 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (3 diffs)
• perlconfig.c (modified) (1 diff)
• util.c (modified) (1 diff)
• variable.c (modified) (1 diff)
• 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)
• glib_compat.c (added)
• global.c (modified) (1 diff)
• keymap.c (modified) (6 diffs)
• keypress.c (modified) (2 diffs)
• keys.c (modified) (2 diffs)
• message.c (modified) (5 diffs)
• owl.c (modified) (5 diffs)
• owl.h (modified) (5 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber/Connection.pm (modified) (1 diff)
• perl/modules/Jabber/lib/Net/XMPP/Debug.pm (modified) (1 diff)
• perl/modules/Jabber/lib/Net/XMPP/Message.pm (modified) (1 diff)
• perl/modules/Jabber/lib/XML/Stream.pm (modified) (1 diff)
• text.c (modified) (4 diffs)
• viewwin.c (modified) (1 diff)
• wcwidth.c (added)
• zcrypt.c (modified) (6 diffs)
• zephyr.c (modified) (1 diff)
• zwrite.c (modified) (13 diffs)

dict.c

@@ -179 +179 @@
   owl_dict_free_all(&d, NULL);
 
-  //  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n");
+  /*  if (numfailed) printf("*** WARNING: failures encountered with owl_dict\n"); */
   printf("# END testing owl_dict (%d failures)\n", numfailed);
   return(numfailed);

editwin.c

@@ -36 +36 @@
   e->echochar='\0';
 
+  /* We get initialized multiple times, but we need to hold on to
+     the callbacks, so we can't NULL them here. */
   /*
-    // We get initialized multiple times, but we need to hold on to
-    // the callbacks, so we can't NULL them here.
     e->command = NULL;
     e->callback = NULL;
@@ -116 +116 @@
     owl_function_error("Internal error: No editwin callback!");
   } else {
-    // owl_function_error("text: |%s|", owl_editwin_get_text(e));
+    /* owl_function_error("text: |%s|", owl_editwin_get_text(e)); */
     cb(e);
   }

filter.c

@@ -341 +341 @@
   TEST_FILTER("type ^zephyr$ and direction ^in$ and ( class ^owl$ or instance ^owl$ )", 1);
 
-  // Order of operations and precedence
+  /* Order of operations and precedence */
   TEST_FILTER("not true or false", 0);
   TEST_FILTER("true or true and false", 0);
@@ -352 +352 @@
   TEST_FILTER("filter f1", 1);
 
-  // Test recursion prevention
+  /* Test recursion prevention */
   FAIL_UNLESS("self reference", owl_filter_init_fromstring(&f2, "test", "filter test"));
 
-  // mutual recursion
+  /* mutual recursion */
   owl_filter_init_fromstring(&f3, "f3", "filter f4");
   owl_global_add_filter(&g, &f3);

filterelement.c

@@ -124 +124 @@
 }
 
-// Print methods
+/* Print methods */
 
 static void owl_filterelement_print_true(owl_filterelement *fe, char *buf)
@@ -182 +182 @@
 }
 
-// Constructors
+/* Constructors */
 
 void owl_filterelement_create(owl_filterelement *fe) {

fmtext.c

@@ -793 +793 @@
 void owl_fmtext_init_colorpair_mgr(owl_colorpair_mgr *cpmgr)
 {
-  // This could be a bitarray if we wanted to save memory.
+  /* This could be a bitarray if we wanted to save memory. */
   short i, j;
   cpmgr->next = 8;
   
-  // The test is <= because we allocate COLORS+1 entries.
+  /* The test is <= because we allocate COLORS+1 entries. */
   cpmgr->pairs = owl_malloc((COLORS+1) * sizeof(short*));
   for(i = 0; i <= COLORS; i++) {
@@ -823 +823 @@
     cpmgr->next = 8;
     
-    // The test is <= because we allocated COLORS+1 entries.
+    /* The test is <= because we allocated COLORS+1 entries. */
     for(i = 0; i <= COLORS; i++) {
       for(j = 0; j <= COLORS; j++) {
@@ -844 +844 @@
   short pair, default_bg;
 
+  /* Sanity (Bounds) Check */
+  if (fg > COLORS || fg < OWL_COLOR_DEFAULT) fg = OWL_COLOR_DEFAULT;
+  if (bg > COLORS || bg < OWL_COLOR_DEFAULT) bg = OWL_COLOR_DEFAULT;
+            
 #ifdef HAVE_USE_DEFAULT_COLORS
   if (fg == OWL_COLOR_DEFAULT) fg = -1;
@@ -853 +857 @@
 #endif
 
-  // looking for a pair we already set up for this draw.
+  /* looking for a pair we already set up for this draw. */
   cpmgr = owl_global_get_colorpair_mgr(&g);
   pair = cpmgr->pairs[fg+1][bg+1];
   if (!(pair != -1 && pair < cpmgr->next)) {
-/*    owl_global_set_needrefresh(&g);*/
-    // If we didn't find a pair, search for a free one to assign.
+    /* If we didn't find a pair, search for a free one to assign. */
     pair = (cpmgr->next < COLOR_PAIRS) ? cpmgr->next : -1;
     if (pair != -1) {
-      // We found a free pair, initialize it.
+      /* We found a free pair, initialize it. */
       init_pair(pair, fg, bg);
       cpmgr->pairs[fg+1][bg+1] = pair;
@@ -867 +870 @@
     }
     else if (bg != OWL_COLOR_DEFAULT) {
-      // We still don't have a pair, drop the background color. Too bad.
+      /* We still don't have a pair, drop the background color. Too bad. */
       owl_function_debugmsg("colorpairs: color shortage - dropping background color.");
       pair = owl_fmtext_get_colorpair(fg, OWL_COLOR_DEFAULT);
     }
     else {
-      // We still don't have a pair, defaults all around.
+      /* We still don't have a pair, defaults all around. */
       owl_function_debugmsg("colorpairs: color shortage - dropping foreground and background color.");
       pair = 0;

functions.c

@@ -1372 +1372 @@
   redrawwin(owl_global_get_curs_recwin(&g));
   redrawwin(owl_global_get_curs_sepwin(&g));
-  // Work around curses segfualts with windows off the screen
+  /* Work around curses segfualts with windows off the screen */
   if (g.lines >= owl_global_get_typwin_lines(&g)+2)
       redrawwin(owl_global_get_curs_typwin(&g));

logging.c

@@ -139 +139 @@
   /* Figure out what path to log to */
   if (owl_message_is_type_zephyr(m)) {
-    // If this has CC's, do all but the "recipient" which we'll do below
+    /* If this has CC's, do all but the "recipient" which we'll do below */
     to = owl_message_get_cc_without_recipient(m);
     if (to != NULL) {
@@ -326 +326 @@
 
   if (personal && owl_message_is_type_zephyr(m)) {
-    // We want to log to all of the CC'd people who were not us, or
-    // the sender, as well.
+    /* We want to log to all of the CC'd people who were not us, or
+     * the sender, as well.
+     */
     char *cc, *temp;
     cc = owl_message_get_cc_without_recipient(m);

obarray.c

@@ -10 +10 @@
  */
 
-// Helper method: Lookup a key in the obarray. If the key exists,
-// return its index, and the interned value in *val. Otherwise, return
-// the index it should be inserted at.
+/* Helper method: Lookup a key in the obarray. If the key exists,
+ * return its index, and the interned value in *val. Otherwise, return
+ * the index it should be inserted at.
+ */
 int owl_obarray_lookup(owl_obarray *oa, char * key, char ** val) /*noproto*/
 {
@@ -39 +40 @@
 }
 
-// Returns NULL if the string doesn't exist in the obarray
+/* Returns NULL if the string doesn't exist in the obarray */
 char * owl_obarray_find(owl_obarray *oa, char * string)
 {
@@ -47 +48 @@
 }
 
-// Inserts the string into the obarray if it doesn't exist
+/* Inserts the string into the obarray if it doesn't exist */
 char * owl_obarray_insert(owl_obarray *oa, char * string)
 {

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

@@ -162 +162 @@
        );
 
-    if ($conn->connected) {
+    if ($conn->conn->connected) {
         BarnOwl::admin_message("IRC", "Connected to $alias as $nick");
         $ircnets{$alias} = $conn;

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

@@ -137 +137 @@
 }
 
+our $showOffline = 0;
+
 sub blist_listBuddy {
     my $roster = shift;
@@ -152 +154 @@
         $blistStr .= " [" . ( $rq{show} ? $rq{show} : 'online' ) . "]";
         $blistStr .= " " . $rq{status} if $rq{status};
-        $blistStr = BarnOwl::Style::boldify($blistStr);
+        $blistStr = BarnOwl::Style::boldify($blistStr) if $showOffline;
     }
     else {
-        return '' if (BarnOwl::getvar('jabber:show_offline_buddies') eq 'off');
+        return '' unless $showOffline;
         if ($jq{ask}) {
             $blistStr .= " [pending]";
@@ -198 +200 @@
 
 sub onGetBuddyList {
+    $showOffline = BarnOwl::getvar('jabber:show_offline_buddies') eq 'on';
     my $blist = "";
     foreach my $jid ($conn->getJIDs()) {

perlconfig.c

@@ -14 +14 @@
 extern XS(boot_BarnOwl);
 extern XS(boot_DynaLoader);
-// extern XS(boot_DBI);
+/* extern XS(boot_DBI); */
 
 static void owl_perl_xs_init(pTHX)

util.c

@@ -888 +888 @@
               !strcmp("meep foo bar", owl_util_uniq("meep foo", "bar foo meep", "-")));
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_util\n");
+  /* if (numfailed) printf("*** WARNING: failures encountered with owl_util\n"); */
   printf("# END testing owl_util (%d failures)\n", numfailed);
   return(numfailed);

variable.c

@@ -1083 +1083 @@
   owl_variable_dict_free(&vd);
 
-  // if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n");
+  /* if (numfailed) printf("*** WARNING: failures encountered with owl_variable\n"); */
   printf("# END testing owl_variable (%d failures)\n", numfailed);
   return(numfailed);

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.
 

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);
+       owl_editwin_process_char(e, j);
   }
 }
 
-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);
-  }  
+  }
   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 +323 @@
 }
 
-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));
 }

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++;
@@ -530 +538 @@
      * 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++) {
+          int tmp =  wgetch(typwin);
+          /* If what we got was not a byte, or not a continuation byte */
+          if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {
+            /* ill-formed UTF-8 code unit subsequence, put back the
+               char we just got. */
+            ungetch(tmp);
+            j.ch = ERR;
+            break;
+          }
+          utf8buf[i] = tmp;
+        }
+        
+        if (j.ch != ERR) {
+          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_set_lastinputtime(&g, now);
       /* 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>
@@ -100 +102 @@
 #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
@@ -212 +234 @@
 #endif
 
-#define OWL_META(key) ((key)|0200)
+#define OWL_META(key) ((key)|010000)
 /* OWL_CTRL is definied in kepress.c */
 
@@ -252 +274 @@
 } owl_variable;
 
+typedef struct _owl_input {
+  int ch;
+  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;
 
@@ -491 +518 @@
   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;
 

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

@@ -1 +1 @@
 use warnings;
 use strict;
+use utf8;
 
 =head1 NAME

perl/modules/Jabber/lib/Net/XMPP/Debug.pm

@@ -189 +189 @@
                         {
                             $self->{HANDLE}->autoflush(1);
+                            binmode $self->{HANDLE}, ":utf8";
                             $Net::XMPP::Debug::HANDLES{$args{file}} = $self->{HANDLE};
                         }

perl/modules/Jabber/lib/Net/XMPP/Message.pm

@@ -135 +135 @@
                             $Mess->SetMessage(TO=>"bob\@jabber.org",
                                               Subject=>"Lunch",
-                                              BoDy=>"Let's do lunch!");
+                                              Body=>"Let's do lunch!");
                             $Mess->SetMessage(to=>"bob\@jabber.org",
                                               from=>"jabber.org",

perl/modules/Jabber/lib/XML/Stream.pm

@@ -1659 +1659 @@
     {
         $self->debug(3,"Send: can_write");
-        
+
         $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));
 

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]) {

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);
 }