Changeset 89ab5c8

Timestamp:

May 23, 2010, 12:47:20 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

7cc1092

Parents:

aa0a0b5 (diff), ecaec21 (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:

Merge remote branch 'origin/narrow-cc'

Files:

• functions.c (modified) (2 diffs)
• logging.c (modified) (3 diffs)
• message.c (modified) (6 diffs)
• Makefile.am (modified) (2 diffs)
• commands.c (modified) (15 diffs)
• doc/releasing-barnowl.txt (modified) (1 diff)
• global.c (modified) (7 diffs)
• obarray.c (deleted)
• owl.c (modified) (7 diffs)
• owl.h (modified) (5 diffs)
• perl/lib/BarnOwl/Hooks.pm (modified) (3 diffs)
• perl/lib/BarnOwl/MainLoopCompatHook.pm (added)
• perl/lib/BarnOwl/Timer.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Message/Jabber.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (27 diffs)
• perlconfig.c (modified) (1 diff)
• popwin.c (modified) (1 diff)
• scripts/do-release (modified) (1 diff)
• select.c (modified) (1 diff)
• tester.c (modified) (4 diffs)
• variable.c (modified) (7 diffs)
• zephyr.c (modified) (1 diff)

functions.c

@@ -2501 +2501 @@
 }
 
+static char *owl_function_smartfilter_cc(const owl_message *m) {
+  const char *ccs;
+  char *filtname;
+  char *text;
+  owl_filter *f;
+
+  ccs = owl_message_get_attribute_value(m, "zephyr_ccs");
+
+  filtname = owl_sprintf("conversation-%s", ccs);
+  owl_text_tr(filtname, ' ', '-');
+
+  if (owl_global_get_filter(&g, filtname)) {
+    return filtname;
+  }
+
+  text = owl_sprintf("type ^zephyr$ and filter personal and "
+                     "zephyr_ccs ^%s%s%s$",
+                     owl_getquoting(ccs), ccs, owl_getquoting(ccs));
+
+  f = owl_filter_new_fromstring(filtname, text);
+
+  owl_global_add_filter(&g, f);
+
+  owl_free(text);
+
+  return filtname;
+}
+
 /* Create a filter based on the current message.  Returns the name of
  * a filter or null.  The caller must free this name.
@@ -2554 +2582 @@
   if (owl_message_is_type_zephyr(m)) {
     if (owl_message_is_personal(m) || owl_message_is_loginout(m)) {
+      if (owl_message_get_attribute_value(m, "zephyr_ccs") != NULL) {
+        return owl_function_smartfilter_cc(m);
+      }
+
       if (owl_message_is_direction_in(m)) {
         zperson=short_zuser(owl_message_get_sender(m));

logging.c

@@ -128 +128 @@
   char filename[MAXPATHLEN], *logpath;
   char *to, *temp;
+  GList *cc;
 
   /* expand ~ in path names */
@@ -135 +136 @@
   if (owl_message_is_type_zephyr(m)) {
     /* 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) {
-      temp = strtok(to, " ");
-      while (temp != NULL) {
-          temp = short_zuser(temp);
-          snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
-          owl_log_append(m, filename);
-          temp = strtok(NULL, " ");
-      }
-      owl_free(to);
-    }
+    cc = owl_message_get_cc_without_recipient(m);
+    while (cc != NULL) {
+      temp = short_zuser(cc->data);
+      snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
+      owl_log_append(m, filename);
+
+      owl_free(cc->data);
+      cc = g_list_delete_link(cc, cc);
+    }
+
     to = short_zuser(owl_message_get_recipient(m));
   } else if (owl_message_is_type_jabber(m)) {
@@ -325 +325 @@
      * the sender, as well.
      */
-    char *cc, *temp;
+    char *temp;
+    GList *cc;
     cc = owl_message_get_cc_without_recipient(m);
-    if (cc != NULL) {
-      temp = strtok(cc, " ");
-      while (temp != NULL) {
-        temp = short_zuser(temp);
-        if (strcasecmp(temp, frombuff) != 0) {
-          snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
-          owl_log_append(m, filename);
-        }
-        temp = strtok(NULL, " ");
+    while (cc != NULL) {
+      temp = short_zuser(cc->data);
+      if (strcasecmp(temp, frombuff) != 0) {
+        snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
+        owl_log_append(m, filename);
       }
-      owl_free(cc);
+
+      owl_free(cc->data);
+      cc = g_list_delete_link(cc, cc);
     }
   }

message.c

@@ -593 +593 @@
 
 /* caller must free return value */
-char *owl_message_get_cc_without_recipient(const owl_message *m)
-{
-  char *cc, *out, *end, *shortuser, *recip;
+GList *owl_message_get_cc_without_recipient(const owl_message *m)
+{
+  char *cc, *shortuser, *recip;
   const char *user;
+  GList *out = NULL;
 
   cc = owl_message_get_cc(m);
@@ -603 +604 @@
 
   recip = short_zuser(owl_message_get_recipient(m));
-  out = owl_malloc(strlen(cc) + 2);
-  end = out;
 
   user = strtok(cc, " ");
@@ -610 +609 @@
     shortuser = short_zuser(user);
     if (strcasecmp(shortuser, recip) != 0) {
-      strcpy(end, user);
-      end[strlen(user)] = ' ';
-      end += strlen(user) + 1;
+      out = g_list_prepend(out, owl_strdup(user));
     }
     owl_free(shortuser);
     user = strtok(NULL, " ");
   }
-  end[0] = '\0';
 
   owl_free(recip);
   owl_free(cc);
-
-  if (strlen(out) == 0) {
-    owl_free(out);
-    out = NULL;
-  }
 
   return(out);
@@ -741 +732 @@
   owl_message_set_recipient(m, "looprecip");
   owl_message_set_isprivate(m);
+}
+
+void owl_message_save_ccs(owl_message *m) {
+  GList *cc;
+  char *tmp;
+
+  cc = owl_message_get_cc_without_recipient(m);
+
+  if (cc != NULL) {
+    GString *recips = g_string_new("");
+    cc = g_list_prepend(cc, short_zuser(owl_message_get_sender(m)));
+    cc = g_list_prepend(cc, short_zuser(owl_message_get_recipient(m)));
+    cc = g_list_sort(cc, (GCompareFunc)strcasecmp);
+
+    while(cc != NULL) {
+      /* Collapse any identical entries */
+      while (cc->next && strcasecmp(cc->data, cc->next->data) == 0) {
+        owl_free(cc->data);
+        cc = g_list_delete_link(cc, cc);
+      }
+
+      tmp = short_zuser(cc->data);
+      g_string_append(recips, tmp);
+
+      owl_free(tmp);
+      owl_free(cc->data);
+      cc = g_list_delete_link(cc, cc);
+
+      if (cc)
+        g_string_append_c(recips, ' ');
+    }
+
+    owl_message_set_attribute(m, "zephyr_ccs", recips->str);
+    g_string_free(recips, true);
+  }
 }
 
@@ -878 +904 @@
     }
   }
+
+  owl_message_save_ccs(m);
 }
 #else
@@ -972 +1000 @@
     owl_message_set_isprivate(m);
   }
+
+  owl_message_save_ccs(m);
 }
 

Makefile.am

@@ -1 +1 @@
 ACLOCAL_AMFLAGS = -I m4
+CFLAGS += $(EXTRA_CFLAGS)
 
 GIT_DESCRIPTION := $(if $(wildcard .git),$(shell git describe --match='barnowl-*' HEAD 2>/dev/null))
@@ -48 +49 @@
      keypress.c keymap.c keybinding.c cmd.c context.c \
      aim.c buddy.c buddylist.c style.c errqueue.c \
-     zbuddylist.c popexec.c obarray.c select.c wcwidth.c \
+     zbuddylist.c popexec.c select.c wcwidth.c \
      glib_compat.c filterproc.c
 

commands.c

@@ -92 +92 @@
               "Use 'show keymaps' to see the existing keymaps.\n"
               "Key sequences may be things like M-C-t or NPAGE.\n\n"
-              "Ex.: bindkey recv C-b command zwrite -c barnowl"
-              "SEE ALSO: bindkey"),
+              "Ex.: bindkey recv C-b command zwrite -c barnowl\n"
+              "Ex.: bindkey recv m command start-command zwrite -c my-class -i \n\n"
+              "SEE ALSO: unbindkey, start-command"),
 
   OWLCMD_ARGS("unbindkey", owl_command_unbindkey, OWL_CTX_ANY,
@@ -100 +101 @@
               "Removes a binding of a key sequence within a keymap.\n"
               "Use 'show keymaps' to see the existing keymaps.\n"
-              "Ex.: unbindkey recv H"
+              "Ex.: unbindkey recv H\n\n"
               "SEE ALSO: bindkey"),
 
   OWLCMD_ARGS("zwrite", owl_command_zwrite, OWL_CTX_INTERACTIVE,
               "send a zephyr",
-              "zwrite [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcde] [<user> ...] [-m <message...>]",
+              "zwrite [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [<user> ...] [-m <message...>]",
               "Zwrite send a zephyr to the one or more users specified.\n\n"
               "The following options are available:\n\n"
@@ -137 +138 @@
   OWLCMD_ARGS("zcrypt", owl_command_zcrypt, OWL_CTX_INTERACTIVE,
               "send an encrypted zephyr",
-              "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcde] [-m <message...>]\n",
+              "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [-m <message...>]\n",
               "Behaves like zwrite but uses encryption.  Not for use with\n"
               "personal messages\n"),
@@ -147 +148 @@
               "allow editing.\n\n"
               "If 'sender' is specified, reply to the sender.\n\n"
-              "If 'all' or no args are specified, reply publically to the\n"
+              "If 'all' or no args are specified, reply publicly to the\n"
               "same class/instance for non-personal messages and to the\n"
               "sender for personal messages.\n\n"
@@ -265 +266 @@
               "zpunt <class> <instance> [recipient]\n"
               "zpunt <instance>",
-              "The zpunt command will supress message to the specified\n"
+              "The zpunt command will suppress messages to the specified\n"
               "zephyr triplet.  In the second usage messages are suppressed\n"
               "for class MESSAGE and the named instance.\n\n"
@@ -282 +283 @@
               "punt <filter-text>",
               "punt <filter-text (multiple words)>\n"
-              "The punt command will supress message to the specified\n"
+              "The punt command will suppress messages to the specified\n"
               "filter\n\n"
               "SEE ALSO:  unpunt, zpunt, show zpunts\n"),
@@ -585 +586 @@
               "name style after the -s argument.\n"
               "\n"
-              "The other usages listed above are abbreivated forms that simply set\n"
+              "The other usages listed above are abbreviated forms that simply set\n"
               "the filter of the current view. The -d option allows you to write a\n"
               "filter expression that will be dynamically created by owl and then\n"
@@ -593 +594 @@
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
               "view only messages similar to the current message",
-              "smartnarrow [-i | --instance]  [-r | --relatde]",
+              "smartnarrow [-i | --instance]  [-r | --related]",
               "If the curmsg is a personal message narrow\n"
               "   to the conversation with that user.\n"
@@ -613 +614 @@
               "   message, the filter is to that instance.\n"
               "If the curmsg is a class message, the filter is that class.\n"
-              "If the curmsg is a class message and '-i' is specied\n"
+              "If the curmsg is a class message and '-i' is specified\n"
               "    the filter is to that class and instance.\n"),
 
@@ -673 +674 @@
               "for formatting messages.\n\n"
               "Show variables will list the names of all variables.\n\n"
-              "Show errors will show a list of errors ecountered by Owl.\n\n"
+              "Show errors will show a list of errors encountered by Owl.\n\n"
               "SEE ALSO: filter, view, alias, bindkey, help\n"),
   
@@ -742 +743 @@
               "set the search highlight string without searching",
               "setsearch <string>",
-              "The setsearch command highlights all occurences of its\n"
+              "The setsearch command highlights all occurrences of its\n"
           "argument and makes it the default argument for future\n"
           "search commands, but does not move the cursor.  With\n"
@@ -1294 +1295 @@
   char opt;
   int instance = 0, related = 0, i;
-  char **tmp_argv = owl_malloc(sizeof(char *) * argc);
+  const char **tmp_argv = owl_malloc(sizeof(char *) * argc);
 
   for (i = 0; i < argc; i++)
-    tmp_argv[i] = owl_strdup(argv[i]);
-
-  static struct option options[] = {
+    tmp_argv[i] = argv[i];
+
+  static const struct option options[] = {
     {"instance", 0, 0, 'i'},
     {"related",  0, 0, 'r'},
     {NULL,       0, 0, 0}};
-  while ((opt = getopt_long(argc, tmp_argv, "ir", options, NULL)) != -1) {
+
+  optind = 0;
+  while ((opt = getopt_long(argc, (char **)tmp_argv, "ir", options, NULL)) != -1) {
     switch (opt) {
       case 'i':
@@ -1317 +1320 @@
   }
 
-  for (i = 0; i < argc; i++)
-    owl_free(tmp_argv[i]);
-  owl_free(tmp_argv);
-
   filtname = owl_function_smartfilter(instance, related);
 
@@ -1329 +1328 @@
 
 done:
-  optind = 0; /* reset getopt */
+  owl_free(tmp_argv);
+
   return NULL;
 }
@@ -1608 +1608 @@
 char *owl_command_exec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 0);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 1);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_exec(argc, argv, buff, 2);
+  return owl_function_exec(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 
 char *owl_command_perl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 0);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
 char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 1);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
 char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
 {
-  return owl_function_perl(argc, argv, buff, 2);
+  return owl_function_perl(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 

doc/releasing-barnowl.txt

@@ -1 @@
-DOING A BARNOWL RELEASE
+-*- mode: org *-
+* DOING A BARNOWL RELEASE
+  - [ ] Send mail to barnowl-dev indicating that a release is
+        happening soon, and soliciting any improvements that
+        developers want included in the release.
+  - [ ] Wait a while (a week or so, or more if necessary) for any
+        pending patches to get in.
+  - [ ] Prepare the -rc commit
+   - [ ] Run ./scripts/add-changelog NEW-VERSION PREV-TAG..HEAD
+   - [ ] Edit ChangeLog to combine and filter entries
+   - [ ] Edit configure.ac to bump the version to 1.Nrc1
+  - [ ] Commit with message 'BarnOwl 1.Nrc1'; don't push until after
+        builds all succeed
+  - [ ] Run scripts/do-release with -f (so it won't complain about
+        missing changelog), makes a tarball
+  - [ ] Do a locker build (See DOING A LOCKER BUILD)
+  - [ ] Update configure.ac on master to bump the version to 1.(N+1)dev
+  - [ ] Push git git:
+   - [ ] The RC commit
+   - [ ] The configure.ac change on master
+   - [ ] A release-1.N branch pointing at the RC commit
+  - [ ] Copy tarball into /mit/barnowl/web_scripts/dist
+  - [ ] Send mail announcing the RC to barnowl-dev@mit.edu
+  - [ ] Wait 1-2 weeks, collect any bug reports
+  - [ ] Fix any reported bugs on master
+  - [ ] Cherry-pick/backport appropriate fixes from master onto
+        release-1.N
+  - [ ] If there have been many or large bugfixes, repeat the process
+        for barnowl 1.Nrc2
 
-[ ] Send mail to barnowl-dev indicating that a release is happening
-    soon, and soliciting any improvements that developers want
-    included in the release.
+* DOING THE ACTUAL RELEASE
+  - [ ] Update the changelog and configure.ac for barnowl 1.N
+  - [ ] run ./scripts/do-release
+  - [ ] Do the locker build
+  - [ ] Push the release tag
+  - [ ] Write up release notes
+        (I usually use the previous release's email as a template)
+  - [ ] Update the website
+   - [ ] Add the line that `do-release` printed to the changelog on the home page
+   - [ ] Add your release notes as /release-notes/1.N
+  - [ ] Send the release notes to barnowl-users@mit.edu
 
-[ ] Wait a while (a week or so, or more if necessary) for any pending
-    patches to get in.
+* DOING A LOCKER BUILD
+  - [ ] Copy the tarball to build@nelhage.com
+  - [ ] ssh to build@nelhage.com and kinit
+  - [ ] On build@nelhage.com, run barnowl-build-all TARBALL.
+        This script does builds for all Debathena platforms using chroots
+        on nelhage.com, and ssh's to Athena 9 machines to do the two
+        Athena 9 builds.
+  - [ ] Sanity-check the builds
+   - [ ] Do cursory testing on debathena platforms and both athena9s.
+   - [ ] chroots on nelhage.com also useful
+  - [ ] Update symlinks with locker-update script;
+        - locker-update [-b] [-n] VERSION
+        - e.g. locker-update -b -n barnowl-1.6rc1
+   - [ ] Use -b to update the barnowl-beta name
+   - [ ] Use -n first for dry-run
 
-[ ] Prepare the -rc commit
-
- [ ] Run ./scripts/add-changelog NEW-VERSION PREV-TAG..HEAD
-
- [ ] Edit ChangeLog to combine and filter entries
-
- [ ] Edit configure.ac to bump the version to 1.Nrc1
-
-[ ] Commit with message 'BarnOwl 1.Nrc1'; don't push until after
-    builds all succeed
-
-[ ] Run scripts/do-release with -f (so it won't complain about missing
-    changelog), makes a tarball
-
-[ ] Make all the builds
- 
- [ ] On build@nelhage.com, run barnowl-build-all TARBALL to build for
-     everything with chroots, doesn't do athena 9 builds. Builds into
-     locker parellel to all other versions.
-
- [ ] Do two athena9 builds: solaris and linux, usually use multics (or
-     sun.dialup) for the solaris build, oliver for linux athena9
-
-  [ ] Remember to add gnu; add barnowl
-
-  [ ] eval `barnowl-perl-config` to include the perl modules in the
-      barnowl locker
-
-  [ ] Run scripts/locker-build TARBALL (barnowl-build-all loops over
-      all of them in schroots). It overrides existing one.
-
-[ ] Sanity-check the builds
-
- [ ] Do cursory testing on debathena platforms and both athena9s.
-
- [ ] chroots on nelhage.com also useful
-
-[ ] Update symlinks with locker-update script;
-
-      locker-update [-b] [-n] VERSION
-
-    e.g. locker-update -b -n barnowl-1.6rc1
- 
- [ ] -b for the beta
-
- [ ] -n first for dry-run
-
-[ ] Push the RC commit
-
-[ ] Copy tarball into /mit/barnowl/web_scripts/dist
-
-[ ] Send mail (rcs to barnowl-dev@, release to barnowl-users@)
-
-[ ] Make an actual release about a week after the RC
-
-
-LOCKER LAYOUT
-
-* builds/barnowl-VERSION contains the arch-independent files by
-  version
-
-* arch/SYSNAME/bin/barnowl-VERSION is the actual binary
-
-* arch/SYSNAME/bin/barnowl is a symlink to ../../common/bin/barnowl
-  (wrapper script runs barnowl.real). .../barnowl.real is a symlink to
-  the latest version.
-
-* zcrypt is also installed with a versioned name, but currently
-  barnowl-N will not run zcrypt-N, so we can't change that interface
-  at all.
+* LOCKER LAYOUT
+  - builds/barnowl-VERSION contains the arch-independent files by
+    version
+  - arch/SYSNAME/bin/barnowl-VERSION is the actual binary
+  - arch/SYSNAME/bin/barnowl is a symlink to ../../common/bin/barnowl
+    (wrapper script runs barnowl.real). .../barnowl.real is a symlink
+    to the latest version.
+  - zcrypt is also installed with a versioned name, but currently
+    barnowl-N will not run zcrypt-N, so we can't change that interface
+    at all.

global.c

@@ -53 +53 @@
   g->filterlist = NULL;
   owl_list_create(&(g->puntlist));
-  owl_list_create(&(g->messagequeue));
+  g->messagequeue = g_queue_new();
   owl_dict_create(&(g->styledict));
   g->curmsg_vert_offset=0;
@@ -113 +113 @@
   g->pseudologin_notify = 0;
 
-  owl_obarray_init(&(g->obarray));
-
   owl_message_init_fmtext_cache();
   owl_list_create(&(g->io_dispatch_list));
@@ -120 +118 @@
   g->timerlist = NULL;
   g->interrupted = FALSE;
+
+  /* set up a pad for input */
+  g->input_pad = newpad(1, 1);
+  nodelay(g->input_pad, 1);
+  keypad(g->input_pad, 1);
+  meta(g->input_pad, 1);
 }
 
@@ -179 +183 @@
   idlok(owl_global_get_curs_msgwin(g), FALSE);
 
-  nodelay(owl_global_get_curs_typwin(g), 1);
-  keypad(owl_global_get_curs_typwin(g), TRUE);
   wmove(owl_global_get_curs_typwin(g), 0, 0);
-
-  meta(owl_global_get_curs_typwin(g), TRUE);
 }
 
@@ -862 +862 @@
 void owl_global_messagequeue_addmsg(owl_global *g, owl_message *m)
 {
-  owl_list_append_element(&(g->messagequeue), m);
+  g_queue_push_tail(g->messagequeue, m);
 }
 
@@ -873 +873 @@
   owl_message *out;
 
-  if (owl_list_get_size(&(g->messagequeue))==0) return(NULL);
-  out=owl_list_get_element(&(g->messagequeue), 0);
-  owl_list_remove_element(&(g->messagequeue), 0);
-  return(out);
+  if (g_queue_is_empty(g->messagequeue))
+    return NULL;
+  out = g_queue_pop_head(g->messagequeue);
+  return out;
 }
 
 int owl_global_messagequeue_pending(owl_global *g)
 {
-  if (owl_list_get_size(&(g->messagequeue))==0) return(0);
-  return(1);
+  return !g_queue_is_empty(g->messagequeue);
 }
 
@@ -1010 +1009 @@
 }
 
-const char * owl_global_intern(owl_global *g, const char * string)
-{
-  return owl_obarray_insert(&(g->obarray), string);
-}
-
 owl_list *owl_global_get_io_dispatch_list(owl_global *g)
 {

owl.c

@@ -311 +311 @@
 {
   owl_input j;
-  WINDOW *typwin;
-
-  typwin = owl_global_get_curs_typwin(&g);
 
   while (1) {
-    j.ch = wgetch(typwin);
+    j.ch = wgetch(g.input_pad);
     if (j.ch == ERR) return;
 
@@ -339 +336 @@
       
       for (i = 1; i < bytes; i++) {
-        int tmp =  wgetch(typwin);
+        int tmp = wgetch(g.input_pad);
         /* If what we got was not a byte, or not a continuation byte */
         if (tmp > 0xff || !(tmp & 0x80 && ~tmp & 0x40)) {
@@ -458 +455 @@
 #endif /* OWL_STDERR_REDIR */
 
-void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
-{
-  if (owl_global_is_pseudologins(&g)) {
-    owl_function_debugmsg("Doing zephyr buddy check");
-    owl_function_zephyr_buddy_check(1);
-  }
+static int owl_refresh_pre_select_action(owl_ps_action *a, void *data)
+{
+  /* if a resize has been scheduled, deal with it */
+  owl_global_resize(&g, 0, 0);
+  /* also handle relayouts */
+  owl_global_relayout(&g);
+
+  /* update the terminal if we need to */
+  if (owl_global_is_needrefresh(&g)) {
+    /* these are here in case a relayout changes the windows */
+    WINDOW *sepwin = owl_global_get_curs_sepwin(&g);
+    WINDOW *typwin = owl_global_get_curs_typwin(&g);
+
+    /* push all changed windows to screen */
+    update_panels();
+    /* leave the cursor in the appropriate window */
+    if (!owl_popwin_is_active(owl_global_get_popwin(&g))
+        && owl_global_get_typwin(&g)) {
+      owl_function_set_cursor(typwin);
+    } else {
+      owl_function_set_cursor(sepwin);
+    }
+    doupdate();
+    owl_global_set_noneedrefresh(&g);
+  }
+  return 0;
 }
 
@@ -469 +486 @@
 int main(int argc, char **argv, char **env)
 {
-  WINDOW *sepwin, *typwin;
   int argcsave;
   const char *const *argvsave;
@@ -583 +599 @@
   owl_function_source(NULL);
 
-  update_panels();
-
   /* Set the default style */
   owl_function_debugmsg("startup: setting startup and default style");
@@ -605 +619 @@
   owl_global_push_context(&g, OWL_CTX_READCONFIG|OWL_CTX_RECV, NULL, "recv");
 
-  owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
-
-  /* If we ever deprecate the mainloop hook, remove this. */
-  owl_select_add_timer(0, 1, owl_perlconfig_mainloop, NULL, NULL);
-
+  owl_select_add_pre_select_action(owl_refresh_pre_select_action, NULL, NULL);
   owl_select_add_pre_select_action(owl_process_messages, NULL, NULL);
 
@@ -615 +625 @@
   /* main loop */
   while (1) {
-
-    /* if a resize has been scheduled, deal with it */
-    owl_global_resize(&g, 0, 0);
-    /* also handle relayouts */
-    owl_global_relayout(&g);
-
-    /* these are here in case a relayout changes the windows */
-    sepwin=owl_global_get_curs_sepwin(&g);
-    typwin=owl_global_get_curs_typwin(&g);
-
-    /* update the terminal if we need to */
-    if (owl_global_is_needrefresh(&g)) {
-      /* push all changed windows to screen */
-      update_panels();
-      /* leave the cursor in the appropriate window */
-      if (!owl_popwin_is_active(owl_global_get_popwin(&g))
-          && owl_global_get_typwin(&g)) {
-        owl_function_set_cursor(typwin);
-      } else {
-        owl_function_set_cursor(sepwin);
-      }
-      doupdate();
-      owl_global_set_noneedrefresh(&g);
-    }
-
     /* select on FDs we know about. */
     owl_select();

owl.h

@@ -184 +184 @@
 #define OWL_VARIABLE_BOOL       2
 #define OWL_VARIABLE_STRING     3
+
+#define OWL_OUTPUT_RETURN       0
+#define OWL_OUTPUT_POPUP        1
+#define OWL_OUTPUT_ADMINMSG     2
 
 #define OWL_FILTER_MAX_DEPTH    300
@@ -518 +522 @@
 } owl_colorpair_mgr;
 
-typedef struct _owl_obarray {
-  owl_list strings;
-} owl_obarray;
-
 typedef struct _owl_io_dispatch {
   int fd;                                     /* FD to watch for dispatch. */
@@ -565 +565 @@
   owl_view current_view;
   owl_messagelist msglist;
+  WINDOW *input_pad;
   PANEL *recpan, *seppan, *msgpan, *typpan;
   int needrefresh;
@@ -605 +606 @@
   char *aim_screenname_for_filters;     /* currently logged in AIM screen name */
   owl_buddylist buddylist;  /* list of logged in AIM buddies */
-  owl_list messagequeue;    /* for queueing up aim and other messages */
+  GQueue *messagequeue;     /* for queueing up aim and other messages */
   owl_dict styledict;       /* global dictionary of available styles */
   char *response;           /* response to the last question asked */
@@ -618 +619 @@
   int pseudologin_notify;
   struct termios startup_tio;
-  owl_obarray obarray;
   owl_list io_dispatch_list;
   owl_list psa_list;

perl/lib/BarnOwl/Hooks.pm

@@ -79 +79 @@
 our %EXPORT_TAGS = (all => [@EXPORT_OK]);
 
+use BarnOwl::MainLoopCompatHook;
+
 our $startup = BarnOwl::Hook->new;
 our $shutdown = BarnOwl::Hook->new;
 our $receiveMessage = BarnOwl::Hook->new;
 our $newMessage = BarnOwl::Hook->new;
-our $mainLoop = BarnOwl::Hook->new;
+our $mainLoop = BarnOwl::MainLoopCompatHook->new;
 our $getBuddyList = BarnOwl::Hook->new;
 our $getQuickstart = BarnOwl::Hook->new;
@@ -162 +164 @@
     }
     
+    $mainLoop->check_owlconf();
     $startup->run(0);
     BarnOwl::startup() if *BarnOwl::startup{CODE};
@@ -186 +189 @@
     
     BarnOwl::new_msg($m) if *BarnOwl::new_msg{CODE};
-}
-
-sub _mainloop_hook {
-    $mainLoop->run;
-    BarnOwl::mainloop_hook() if *BarnOwl::mainloop_hook{CODE};
 }
 

perl/lib/BarnOwl/Timer.pm

@@ -21 +21 @@
 }
 
+sub stop {
+    my $self = shift;
+    if(defined($self->{timer})) {
+        BarnOwl::Internal::remove_timer($self->{timer});
+        undef $self->{timer};
+    }
+}
+
 sub do_callback {
     my $self = shift;
@@ -28 +36 @@
 sub DESTROY {
     my $self = shift;
-    if(defined($self->{timer})) {
-        BarnOwl::Internal::remove_timer($self->{timer});
-    }
+    $self->stop;
 }
 

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

@@ -77 +77 @@
     } elsif ($self->jtype eq 'groupchat') {
         my $room = $self->room;
-        $filter = "jabber-room-$room";
-        BarnOwl::command(qw[filter], $filter,
-                         qw[type ^jabber$ and room], "^\Q$room\E\$");
+        if ($inst) {
+            my $subject = $self->subject;
+            $filter = "jabber-room-$room-subject-$subject";
+            BarnOwl::command(qw[filter], $filter,
+                             qw[type ^jabber$ and room], "^\Q$room\E\$",
+                             qw[and subject], "^\Q$subject\E\$");
+        } else {
+            $filter = "jabber-room-$room";
+            BarnOwl::command(qw[filter], $filter,
+                             qw[type ^jabber$ and room], "^\Q$room\E\$");
+        }
         return $filter;
     } elsif ($self->login ne 'none') {

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

@@ -285 +285 @@
         {
             summary => "Send a Jabber Message",
-            usage   => "jwrite <jid> [-t <thread>] [-s <subject>] [-a <account>]"
+            usage   => "jwrite <jid> [-t <thread>] [-s <subject>] [-a <account>] [-m <message>]"
         }
     );
@@ -308 +308 @@
             description => "jmuc sends Jabber commands related to MUC.\n\n"
               . "The following commands are available\n\n"
-              . "join <muc>  Join a MUC.\n\n"
+              . "join <muc>[/<nick>]\n"
+              . "            Join a MUC (with a given nickname, or otherwise your JID).\n\n"
               . "part <muc>  Part a MUC.\n"
               . "            The MUC is taken from the current message if not supplied.\n\n"
@@ -377 +378 @@
         my $cjidStr = $conn->baseJIDExists($jidStr);
         if ($cjidStr) {
-            BarnOwl::error("Already logged in as $cjidStr.");
-            return;
+            die("Already logged in as $cjidStr.\n");
         }
     }
@@ -387 +387 @@
 
     if ( !$uid || !$componentname ) {
-        BarnOwl::error("usage: $cmd JID");
-        return;
+        die("usage: $cmd JID\n");
     }
 
     if ( $conn->jidActive($jidStr) ) {
-        BarnOwl::error("Already logged in as $jidStr.");
-        return;
+        die("Already logged in as $jidStr.\n");
     } elsif ($conn->jidExists($jidStr)) {
         return $conn->tryReconnect($jidStr, 1);
@@ -526 +524 @@
 sub cmd_jlist {
     if ( !( scalar $conn->getJIDs() ) ) {
-        BarnOwl::error("You are not logged in to Jabber.");
-        return;
+        die("You are not logged in to Jabber.\n");
     }
     BarnOwl::popless_ztext( onGetBuddyList() );
@@ -534 +531 @@
 sub cmd_jwrite {
     if ( !$conn->connected() ) {
-        BarnOwl::error("You are not logged in to Jabber.");
-        return;
+        die("You are not logged in to Jabber.\n");
     }
 
@@ -543 +539 @@
     my $jwrite_thread  = "";
     my $jwrite_subject = "";
+    my $jwrite_body;
     my ($to, $from);
     my $jwrite_type    = "chat";
@@ -554 +551 @@
         'subject=s' => \$jwrite_subject,
         'account=s' => \$from,
-        'id=s'     =>  \$jwrite_sid,
+        'id=s'      => \$jwrite_sid,
+        'message=s' => \$jwrite_body,
     ) or die("Usage: jwrite <jid> [-t <thread>] [-s <subject>] [-a <account>]\n");
     $jwrite_type = 'groupchat' if $gc;
 
     if ( scalar @ARGV != 1 ) {
-        BarnOwl::error(
-            "Usage: jwrite <jid> [-t <thread>] [-s <subject>] [-a <account>]");
-        return;
+        die("Usage: jwrite <jid> [-t <thread>] [-s <subject>] [-a <account>]\n");
     }
     else {
@@ -570 +566 @@
 
     unless(scalar @candidates) {
-        die("Unable to resolve JID $to");
+        die("Unable to resolve JID $to\n");
     }
 
@@ -577 +573 @@
     unless(scalar @candidates) {
         if(!$from) {
-            die("You must specify an account with -a");
+            die("You must specify an account with -a\n");
         } else {
-            die("Unable to resolve account $from");
+            die("Unable to resolve account $from\n");
         }
     }
@@ -594 +590 @@
         type    => $jwrite_type
     };
+
+    if (defined($jwrite_body)) {
+        process_owl_jwrite($jwrite_body);
+        return;
+    }
 
     if(scalar @candidates > 1) {
@@ -631 +632 @@
     my $func = $jmuc_commands{$cmd};
     if ( !$func ) {
-        BarnOwl::error("jmuc: Unknown command: $cmd");
-        return;
+        die("jmuc: Unknown command: $cmd\n");
     }
 
@@ -654 +654 @@
         }
         else {
-            BarnOwl::error('You must specify an account with -a <jid>');
+            die("You must specify an account with -a <jid>\n");
         }
         return $func->( $jid, $muc, @ARGV );
@@ -667 +667 @@
 
     $muc = shift @ARGV
-      or die("Usage: jmuc join <muc> [-p <password>] [-a <account>]");
+      or die("Usage: jmuc join <muc> [-p <password>] [-a <account>]\n");
 
     die("Error: Must specify a fully-qualified MUC name (e.g. barnowl\@conference.mit.edu)\n")
@@ -680 +680 @@
                                                    MaxChars => 0
                                                   });
-    $completion_jids{$muc} = 1;
+    $completion_jids{$muc->GetJID('base')} = 1;
     return;
 }
@@ -688 +688 @@
 
     $muc = shift @args if scalar @args;
-    die("Usage: jmuc part [<muc>] [-a <account>]") unless $muc;
+    die("Usage: jmuc part [<muc>] [-a <account>]\n") unless $muc;
 
     if($conn->getConnectionFromJID($jid)->MUCLeave(JID => $muc)) {
         queue_admin_msg("$jid has left $muc.");
     } else {
-        die("Error: Not joined to $muc");
+        die("Error: Not joined to $muc\n");
     }
 }
@@ -703 +703 @@
     $muc = shift @args if scalar @args;
 
-    die('Usage: jmuc invite <jid> [<muc>] [-a <account>]')
+    die("Usage: jmuc invite <jid> [<muc>] [-a <account>]\n")
       unless $muc && $invite_jid;
 
@@ -718 +718 @@
     my ( $jid, $muc, @args ) = @_;
     $muc = shift @args if scalar @args;
-    die("Usage: jmuc configure [<muc>]") unless $muc;
+    die("Usage: jmuc configure [<muc>]\n") unless $muc;
     my $iq = Net::Jabber::IQ->new();
     $iq->SetTo($muc);
@@ -759 +759 @@
 
     $muc = shift @args if scalar @args;
-    die("Usage: jmuc presence [<muc>]") unless $muc;
+    die("Usage: jmuc presence [<muc>]\n") unless $muc;
 
     if ($muc eq '-a') {
@@ -774 +774 @@
     else {
         my $m = $conn->getConnectionFromJID($jid)->FindMUC(jid => $muc);
-        die("No such muc: $muc") unless $m;
+        die("No such muc: $muc\n") unless $m;
         BarnOwl::popless_ztext(jmuc_presence_single($m));
     }
@@ -801 +801 @@
     my $func = $jroster_commands{$cmd};
     if ( !$func ) {
-        BarnOwl::error("jroster: Unknown command: $cmd");
-        return;
+        die("jroster: Unknown command: $cmd\n");
     }
 
@@ -825 +824 @@
         }
         else {
-            BarnOwl::error('You must specify an account with -a <jid>');
+            die("You must specify an account with -a <jid>\n");
         }
         return $func->( $jid, $name, \@groups, $purgeGroups,  @ARGV );
@@ -849 +848 @@
     }
     else {
-        BarnOwl::error('You must specify an account with -a <jid>');
+        die("You must specify an account with -a <jid>\n");
     }
 
@@ -1234 +1233 @@
         $completion_jids{$room} = 1;
 
+        my $muc;
+        if ($dir eq 'in') {
+            my $connection = $conn->getConnectionFromSid($props{sid});
+            $muc = $connection->FindMUC(jid => $from);
+        } else {
+            my $connection = $conn->getConnectionFromJID($props{from});
+            $muc = $connection->FindMUC(jid => $to);
+        }
+        $props{from} = $muc->GetFullJID($from) || $nick || $room;
         $props{sender} = $nick || $room;
         $props{recipient} = $room;
@@ -1331 +1339 @@
         return $givenJIDStr if ($conn->jidExists($givenJIDStr) );
         return resolveConnectedJID($givenJID->GetJID('base')) if $loose;
-        die("Invalid account: $givenJIDStr");
+        die("Invalid account: $givenJIDStr\n");
     }
 
@@ -1384 +1392 @@
         # Not one of ours.
         else {
-            die("Invalid account: $givenJIDStr");
+            die("Invalid account: $givenJIDStr\n");
         }
 
@@ -1430 +1438 @@
     if($from) {
         $from_jid = resolveConnectedJID($from, 1);
-        die("Unable to resolve account $from") unless $from_jid;
+        die("Unable to resolve account $from\n") unless $from_jid;
         $to_jid = resolveDestJID($to, $from_jid);
         push @matches, [$from_jid, $to_jid] if $to_jid;

perlconfig.c

@@ -582 +582 @@
 }
 
-void owl_perlconfig_mainloop(owl_timer *t, void *data)
-{
-  dSP;
-  if (!owl_perlconfig_is_function("BarnOwl::Hooks::_mainloop_hook"))
-    return;
-  PUSHMARK(SP) ;
-  call_pv("BarnOwl::Hooks::_mainloop_hook", G_DISCARD|G_EVAL);
-  if(SvTRUE(ERRSV)) {
-    owl_function_error("%s", SvPV_nolen(ERRSV));
-  }
-  return;
-}
-
 void owl_perlconfig_io_dispatch(const owl_io_dispatch *d, void *data)
 {

popwin.c

@@ -28 +28 @@
   popwin = newwin(pw->lines-2, pw->cols-2, startline+1, startcol+1);
   pw->poppanel = new_panel(popwin);
-  
-  meta(popwin,TRUE);
-  nodelay(popwin, 1);
-  keypad(popwin, TRUE);
 
   werase(popwin);

scripts/do-release

@@ -94 +94 @@
 NOW=$(date +"%B %d, %Y")
 cat <<EOF
- * '''$NOW''': BarnOwl $VERS Released. [wiki:Download] it here. or see the [/browser/ChangeLog?rev=$COMMIT ChangeLog]
+ * '''$NOW''': BarnOwl $VERS Released. [wiki:Download] it here. or see the [wiki:release-notes/$VERS Release Notes] or [/browser/ChangeLog?rev=barnowl-$VERS ChangeLog].
 EOF

select.c

@@ -273 +273 @@
 
   sigemptyset(&set);
+  sigaddset(&set, SIGWINCH);
+  sigaddset(&set, SIGALRM);
+  sigaddset(&set, SIGPIPE);
+  sigaddset(&set, SIGTERM);
+  sigaddset(&set, SIGHUP);
   sigaddset(&set, SIGINT);
   sigprocmask(SIG_BLOCK, &set, oldmask);

tester.c

@@ -16 +16 @@
 int main(int argc, char **argv, char **env)
 {
-  owl_errqueue_init(owl_global_get_errqueue(&g));
-  owl_obarray_init(&(g.obarray));
-  g.context_stack = NULL;
-  owl_global_push_context(&g, OWL_CTX_STARTUP, NULL, NULL);
+  /* initialize a fake ncurses, detached from std{in,out} */
+  FILE *rnull = fopen("/dev/null", "r");
+  FILE *wnull = fopen("/dev/null", "w");
+  newterm("xterm", wnull, rnull);
+  /* initialize global structures */
+  owl_global_init(&g);
 
   numtests = 0;
@@ -31 +33 @@
   numfailures += owl_variable_regtest();
   numfailures += owl_filter_regtest();
-  numfailures += owl_obarray_regtest();
   numfailures += owl_editwin_regtest();
   if (numfailures) {
@@ -37 +38 @@
   }
   printf("1..%d\n", numtests);
+
+  /* probably not necessary, but tear down the screen */
+  endwin();
+  fclose(rnull);
+  fclose(wnull);
+
   return(numfailures);
 }
@@ -293 +300 @@
 }
 
-
-int owl_obarray_regtest(void) {
-  int numfailed = 0;
-  const char *p,*p2;
-
-  owl_obarray oa;
-  owl_obarray_init(&oa);
-
-  printf("# BEGIN testing owl_obarray\n");
-
-  p = owl_obarray_insert(&oa, "test");
-  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test"));
-  p2 = owl_obarray_insert(&oa, "test");
-  FAIL_UNLESS("returned string is equal", p2 && !strcmp(p2, "test"));
-  FAIL_UNLESS("returned the same string", p2 && p == p2);
-
-  p = owl_obarray_insert(&oa, "test2");
-  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test2"));
-  p2 = owl_obarray_find(&oa, "test2");
-  FAIL_UNLESS("returned the same string", p2 && !strcmp(p2, "test2"));
-
-  p = owl_obarray_find(&oa, "nothere");
-  FAIL_UNLESS("Didn't find a string that isn't there", p == NULL);
-
-  printf("# END testing owl_obarray (%d failures)\n", numfailed);
-
-  return numfailed;
-}
-
 int owl_editwin_regtest(void) {
   int numfailed = 0;

variable.c

@@ -110 +110 @@
 
   OWLVAR_ENUM( "loggingdirection" /* %OwlVarStub */, OWL_LOGGING_DIRECTION_BOTH,
-               "specifices which kind of messages should be logged",
+               "specifies which kind of messages should be logged",
                "Can be one of 'both', 'in', or 'out'.  If 'in' is\n"
                "selected, only incoming messages are logged, if 'out'\n"
@@ -138 +138 @@
                     "location of users in your .anyone file.  If a user is present\n"
                     "but sent no login message, or a user is not present that sent no\n"
-                    "logout message, a pseudo login or logout message wil be created\n",
+                    "logout message, a pseudo login or logout message will be created\n",
                     NULL, owl_variable_pseudologins_set, NULL),
 
@@ -151 +151 @@
 
                  "If non empty, any messages matching the given filter will be logged.\n"
-                 "This is a completely separate mechanisim from the other logging\n"
+                 "This is a completely separate mechanism from the other logging\n"
                  "variables like logging, classlogging, loglogins, loggingdirection,\n"
                  "etc.  If you want this variable to control all logging, make sure\n"
@@ -198 +198 @@
   OWLVAR_PATH( "newmsgproc" /* %OwlVarStub:newmsgproc */, NULL,
                "name of a program to run when new messages are present",
-               "The named program will be run when owl recevies new.\n"
+               "The named program will be run when owl receives new\n"
                "messages.  It will not be run again until the first\n"
                "instance exits"),
@@ -213 +213 @@
                  "Called every time you start a zephyrgram without an\n"
                  "explicit zsig.  The default setting implements the policy\n"
-                 "descripted in the documentation for the 'zsig' variable.\n"),
+                 "described in the documentation for the 'zsig' variable.\n"),
 
   OWLVAR_STRING( "zsig" /* %OwlVarStub */, "",
@@ -297 +297 @@
               "number of seconds after AIM login to ignore login messages",
               "This specifies the number of seconds to wait after an\n"
-              "AIM login before allowing the recipt of AIM login notifications.\n"
+              "AIM login before allowing the receipt of AIM login notifications.\n"
               "By default this is set to 15.  If you would like to view login\n"
               "notifications of buddies as soon as you login, set it to 0 instead."),
@@ -428 +428 @@
 int owl_variable_pseudologins_set(owl_variable *v, const void *newval)
 {
+  static owl_timer *timer = NULL;
   if (newval) {
     if (*(const int*)newval == 1) {
       owl_function_zephyr_buddy_check(0);
+      if (timer == NULL) {
+        timer = owl_select_add_timer(180, 180, owl_zephyr_buddycheck_timer, NULL, NULL);
+      }
+    } else {
+      if (timer != NULL) {
+        owl_select_remove_timer(timer);
+        timer = NULL;
+      }
     }
   }

zephyr.c

@@ -1364 +1364 @@
 #endif
 
+void owl_zephyr_buddycheck_timer(owl_timer *t, void *data)
+{
+  if (owl_global_is_pseudologins(&g)) {
+    owl_function_debugmsg("Doing zephyr buddy check");
+    owl_function_zephyr_buddy_check(1);
+  } else {
+    owl_function_debugmsg("Warning: owl_zephyr_buddycheck_timer call pointless; timer should have been disabled");
+  }
+}
+
 /*
  * Process zephyrgrams from libzephyr's queue. To prevent starvation,