Changeset 87d7e14

Timestamp:

Feb 1, 2012, 1:43:40 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

39a531d (diff), 822e9bd (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 822e9bd3723b41b99b95e23a2e7c84e7b76add0d into 39a531dbab5fa35e3e3ad8b92a43e40ecac6012d

Files:

• perl/modules/Jabber/lib/XML/Stream.pm (modified) (2 diffs)
• commands.c (modified) (2 diffs)
• doc/barnowl.1 (modified) (1 diff)
• functions.c (modified) (4 diffs)
• global.c (modified) (4 diffs)
• mainwin.c (modified) (2 diffs)
• message.c (modified) (1 diff)
• messagelist.c (modified) (1 diff)
• owl.c (modified) (3 diffs)
• owl.h (modified) (3 diffs)
• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (1 diff)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• variable.c (modified) (2 diffs)
• view.c (modified) (6 diffs)
• zephyr.c (modified) (4 diffs)
• zwrite.c (modified) (3 diffs)

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

@@ -2112 +2112 @@
 
     return unless defined($mechanisms);
+
+    # Here we assume that if 'to' is available, then a domain is being
+    # specified that does not match the hostname of the jabber server
+    # and that we should use that to form the bare JID for SASL auth.
+    my $domain .=  $self->{SIDS}->{$sid}->{to}
+        ? $self->{SIDS}->{$sid}->{to}
+        : $self->{SIDS}->{$sid}->{hostname};
+
+    my $authname = $username . '@' . $domain;
     
     my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
                                 callback=>{
-#                                           authname => $username."@".$self->{SIDS}->{$sid}->{hostname},
+                                           authname => $authname,
+
                                            user     => $username,
                                            pass     => $password
@@ -2121 +2131 @@
                                );
 
-    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $self->{SIDS}->{$sid}->{hostname});
+    $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $domain);
     $self->{SIDS}->{$sid}->{sasl}->{username} = $username;
     $self->{SIDS}->{$sid}->{sasl}->{password} = $password;

commands.c

@@ -96 +96 @@
   OWLCMD_ARGS("unbindkey", owl_command_unbindkey, OWL_CTX_ANY,
               "removes a binding in a keymap",
-              "bindkey <keymap> <keyseq>",
+              "unbindkey <keymap> <keyseq>",
               "Removes a binding of a key sequence within a keymap.\n"
               "Use 'show keymaps' to see the existing keymaps.\n"
@@ -1778 +1778 @@
 
   if (argc < 3) {
-    owl_function_makemsg("Usage: bindkey <keymap> <binding>");
+    owl_function_makemsg("Usage: unbindkey <keymap> <binding>");
     return NULL;
   }

doc/barnowl.1

@@ -35 +35 @@
 .TP
 \fB\-c\fP, \fB\-\-config\-file\fP=\fIFILE\fP
-Specify an alternate config file for \fBBarnOwl\fP to use.  By default,
-\fBBarnOwl\fP uses \fI~/.barnowlconf\fP if it exists, and \fI~/.owlconf\fP otherwise.
+Specify an alternate config file for \fBBarnOwl\fP to use.  The config file is
+an arbitrary Perl script evaluated in the \fImain\fP package, and if it 
+overrides the \fIBarnOwl::startup\fP method that is run when \fBBarnOwl\fP 
+starts.  (Compare \fI~/.owl/startup\fP, which contains \fBBarnOwl\fP commands 
+that are run at startup after the config file is loaded.)
+
+By default, \fBBarnOwl\fP uses the first of \fI~/.owl/init.pl\fP, 
+\fI~/.barnowlconf\fP, or \fI~/.owlconf\fP that exists.
 
 .TP

functions.c

@@ -216 +216 @@
 void owl_function_add_outgoing_zephyrs(const owl_zwrite *z)
 {
-  if (z->cc || owl_zwrite_get_numrecips(z) == 0) {
+  if (z->cc && owl_zwrite_is_personal(z)) {
     /* create the message */
     owl_message *m = g_new(owl_message, 1);
@@ -225 +225 @@
     int i;
     for (i = 0; i < owl_zwrite_get_numrecips(z); i++) {
+      owl_message *m;
+
+      if (!owl_zwrite_recip_is_personal(owl_zwrite_get_recip_n(z, i)))
+        continue;
+
       /* create the message */
-      owl_message *m = g_new(owl_message, 1);
+      m = g_new(owl_message, 1);
       owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
 
@@ -373 +378 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* create the outgoing message */
-    owl_function_add_outgoing_zephyrs(z);
-  }
+  /* create the outgoing message */
+  owl_function_add_outgoing_zephyrs(z);
 }
 #else
@@ -427 +429 @@
   owl_function_makemsg("Waiting for ack...");
 
-  /* If it's personal */
-  if (owl_zwrite_is_personal(z)) {
-    /* Create the outgoing message. Restore the un-crypted message for display. */
-    owl_zwrite_set_message_raw(z, old_msg);
-    owl_function_add_outgoing_zephyrs(z);
-  }
-
-  /* free the zwrite */
+  /* Create the outgoing message. Restore the un-crypted message for display. */
+  owl_zwrite_set_message_raw(z, old_msg);
+  owl_function_add_outgoing_zephyrs(z);
+
+  /* Clean up. */
   g_free(cryptmsg);
+  g_free(old_msg);
 }
 

global.c

@@ -75 +75 @@
   g_free(cd);
 
-  owl_messagelist_create(&(g->msglist));
+  g->msglist = owl_messagelist_new();
 
   _owl_global_init_windows(g);
@@ -109 +109 @@
 
   /* Create the widgets */
-  owl_mainwin_init(&(g->mw), g->mainpanel.recwin);
+  g->mw = owl_mainwin_new(g->mainpanel.recwin);
   owl_msgwin_init(&(g->msgwin), g->mainpanel.msgwin);
   owl_sepbar_init(g->mainpanel.sepwin);
@@ -241 +241 @@
 /* windows */
 
-owl_mainwin *owl_global_get_mainwin(owl_global *g) {
-  return(&(g->mw));
+owl_mainwin *owl_global_get_mainwin(owl_global *g)
+{
+  return g->mw;
 }
 
@@ -256 +257 @@
 
 owl_messagelist *owl_global_get_msglist(owl_global *g) {
-  return(&(g->msglist));
+  return g->msglist;
 }
 

mainwin.c

@@ -4 +4 @@
 static void owl_mainwin_resized(owl_window *w, void *user_data);
 
-void owl_mainwin_init(owl_mainwin *mw, owl_window *window)
+CALLER_OWN owl_mainwin *owl_mainwin_new(owl_window *window)
 {
+  owl_mainwin *mw = g_new(owl_mainwin, 1);
   mw->curtruncated=0;
   mw->lastdisplayed=-1;
@@ -16 +17 @@
   /* For now, we do not bother with connecting up dependencies; that'll be a
    * future refactor of the mainwin */
+
+  return mw;
 }
 

message.c

@@ -836 +836 @@
 
   
-  /* set the "isprivate" attribute if it's a private zephyr.
-   ``private'' means recipient is non-empty and doesn't start wit 
-   `@' */
-  if (*n->z_recipient && *n->z_recipient != '@') {
+  /* set the "isprivate" attribute if it's a private zephyr. */
+  if (owl_zwrite_recip_is_personal(n->z_recipient)) {
     owl_message_set_isprivate(m);
   }

messagelist.c

@@ -1 +1 @@
 #include "owl.h"
 
-void owl_messagelist_create(owl_messagelist *ml)
+CALLER_OWN owl_messagelist *owl_messagelist_new(void)
 {
+  owl_messagelist *ml = g_new(owl_messagelist, 1);
   ml->list = g_ptr_array_new();
+  return ml;
 }
 
-void owl_messagelist_cleanup(owl_messagelist *ml, bool free_messages)
+void owl_messagelist_delete(owl_messagelist *ml, bool free_messages)
 {
   if (free_messages)
     g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL);
   g_ptr_array_free(ml->list, true);
+  g_free(ml);
 }
 

owl.c

@@ -41 +41 @@
   fprintf(stderr, "  -v,--version        print the Barnowl version number and exit\n");
   fprintf(stderr, "  -h,--help           print this help message\n");
-  fprintf(stderr, "  -c,--config-file    specify an alternate config file\n");
   fprintf(stderr, "  -s,--config-dir     specify an alternate config dir (default ~/.owl)\n");
+  fprintf(stderr, "  -c,--config-file    specify an alternate config file (default ~/.owl/init.pl)\n");
   fprintf(stderr, "  -t,--tty            set the tty name\n");
 }
@@ -585 +585 @@
   );
 
+  owl_function_debugmsg("startup: setting context interactive");
+
+  owl_global_pop_context(&g);
+  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
+
   /* process the startup file */
   owl_function_debugmsg("startup: processing startup file");
@@ -596 +601 @@
       owl_function_error("No such style: %s", owl_global_get_default_style(&g));
 
-  owl_function_debugmsg("startup: setting context interactive");
-
-  owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
-
   source = owl_window_redraw_source_new();
   g_source_attach(source, NULL);

owl.h

@@ -452 +452 @@
   char *name;
   owl_filter *filter;
-  owl_messagelist ml;
+  owl_messagelist *ml;
   const owl_style *style;
   int cachedmsgid;
@@ -533 +533 @@
 
 typedef struct _owl_global {
-  owl_mainwin mw;
+  owl_mainwin *mw;
   owl_popwin *pw;
   owl_msgwin msgwin;
@@ -551 +551 @@
   int curmsg_vert_offset;
   owl_view current_view;
-  owl_messagelist msglist;
+  owl_messagelist *msglist;
   WINDOW *input_pad;
   owl_mainpanel mainpanel;

perl/lib/BarnOwl.pm

@@ -329 +329 @@
 our @all_commands;
 
-if(!$configfile && -f $ENV{HOME} . "/.barnowlconf") {
-    $configfile = $ENV{HOME} . "/.barnowlconf";
-}
-$configfile ||= $ENV{HOME}."/.owlconf";
+if(!$configfile) {
+    if (-f get_config_dir() . "/init.pl") {
+        $configfile = get_config_dir() . "/init.pl";
+    } elsif (-f $ENV{HOME} . "/.barnowlconf") {
+        $configfile = $ENV{HOME} . "/.barnowlconf";
+    } else {
+        $configfile = $ENV{HOME}."/.owlconf";
+    }
+}
 
 # populate global variable space for legacy owlconf files

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -171 +171 @@
         $class = $self->class;
         $instance = $self->instance;
-        if ($self->recipient eq '*' || $self->recipient eq '') {
-            $to = '';
-        } elsif ($self->recipient =~ /^@/) {
+        if ($self->recipient eq '' || $self->recipient =~ /^@/) {
             $to = $self->recipient;
         } else {

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

@@ -1482 +1482 @@
 }
 
+sub complete_jabberlogout {
+    my $ctx = shift;
+    if($ctx->word == 1) {
+        return ("-A", complete_account() );
+    } else {
+        return ();
+    }
+}
+
 BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_) });
+BarnOwl::Completion::register_completer(jabberlogout => sub { BarnOwl::Module::Jabber::complete_jabberlogout(@_) });
 
 1;

variable.c

@@ -116 +116 @@
                "both,in,out"),
 
-  OWLVAR_BOOL( "colorztext" /* %OwlVarStub */, 1,
-               "allow @color() in zephyrs to change color",
-               "Note that only messages received after this variable\n"
-               "is set will be affected." ),
+  OWLVAR_BOOL_FULL( "colorztext" /* %OwlVarStub */, 1,
+                    "allow @color() in zephyrs to change color",
+                    NULL, NULL, owl_variable_colorztext_set, NULL),
 
   OWLVAR_BOOL( "fancylines" /* %OwlVarStub */, 1,
@@ -496 +495 @@
   }
   return owl_variable_bool_set_default(v, newval);
+}
+
+int owl_variable_colorztext_set(owl_variable *v, const void *newval)
+{
+  int ret = owl_variable_bool_set_default(v, newval);
+  /* flush the format cache so that we see the update, but only if we're done initializing BarnOwl */
+  if (owl_global_get_msglist(&g) != NULL)
+    owl_messagelist_invalidate_formats(owl_global_get_msglist(&g));
+  if (owl_global_get_mainwin(&g) != NULL) {
+    owl_function_calculate_topmsg(OWL_DIRECTION_DOWNWARDS);
+    owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  }
+  return ret;
 }
 

view.c

@@ -6 +6 @@
   v->filter=f;
   v->style=s;
-  owl_messagelist_create(&(v->ml));
+  v->ml = owl_messagelist_new();
   owl_view_recalculate(v);
 }
@@ -19 +19 @@
 {
   if (owl_filter_message_match(v->filter, m)) {
-    owl_messagelist_append_element(&(v->ml), m);
+    owl_messagelist_append_element(v->ml, m);
   }
 }
@@ -30 +30 @@
   int i, j;
   const owl_messagelist *gml;
-  owl_messagelist *ml;
   owl_message *m;
 
   gml=owl_global_get_msglist(&g);
-  ml=&(v->ml);
 
   /* nuke the old list, don't free the messages */
-  owl_messagelist_cleanup(ml, false);
-  owl_messagelist_create(&(v->ml));
+  owl_messagelist_delete(v->ml, false);
+  v->ml = owl_messagelist_new();
 
   /* find all the messages we want */
@@ -45 +43 @@
     m=owl_messagelist_get_element(gml, i);
     if (owl_filter_message_match(v->filter, m)) {
-      owl_messagelist_append_element(ml, m);
+      owl_messagelist_append_element(v->ml, m);
     }
   }
@@ -72 +70 @@
 owl_message *owl_view_get_element(const owl_view *v, int index)
 {
-  return(owl_messagelist_get_element(&(v->ml), index));
+  return owl_messagelist_get_element(v->ml, index);
 }
 
 void owl_view_delete_element(owl_view *v, int index)
 {
-  owl_messagelist_delete_element(&(v->ml), index);
+  owl_messagelist_delete_element(v->ml, index);
 }
 
 void owl_view_undelete_element(owl_view *v, int index)
 {
-  owl_messagelist_undelete_element(&(v->ml), index);
+  owl_messagelist_undelete_element(v->ml, index);
 }
 
 int owl_view_get_size(const owl_view *v)
 {
-  return(owl_messagelist_get_size(&(v->ml)));
+  return owl_messagelist_get_size(v->ml);
 }
 
@@ -158 +156 @@
 void owl_view_cleanup(owl_view *v)
 {
-  owl_messagelist_cleanup(&v->ml, false);
+  owl_messagelist_delete(v->ml, false);
   g_free(v->name);
 }

zephyr.c

@@ -697 +697 @@
   Code_t ret;
   ZNotice_t notice;
+  char *zsender = NULL;
     
   memset(&notice, 0, sizeof(notice));
@@ -708 +709 @@
   notice.z_class=zstr(class);
   notice.z_class_inst=zstr(instance);
-  notice.z_sender=NULL;
-  if (!strcmp(recipient, "*") || !strcmp(recipient, "@")) {
+  if (!strcmp(recipient, "@")) {
     notice.z_recipient=zstr("");
-    if (*owl_global_get_zsender(&g))
-        notice.z_sender=zstr(owl_global_get_zsender(&g));
   } else {
     notice.z_recipient=zstr(recipient);
   }
+  if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g))
+    notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));
   notice.z_default_format=zstr("Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2");
   if (opcode) notice.z_opcode=zstr(opcode);
@@ -730 +730 @@
   g_free(notice.z_message);
   ZFreeNotice(&notice);
+  g_free(zsender);
   if (ret != ZERR_NONE) {
     owl_function_error("Error sending zephyr: %s", error_message(ret));
@@ -789 +790 @@
   } else if (!strcmp(retnotice->z_message, ZSRVACK_NOTSENT)) {
     if (retnotice->z_recipient == NULL
-        || *retnotice->z_recipient == 0
-        || *retnotice->z_recipient == '@') {
+        || !owl_zwrite_recip_is_personal(retnotice->z_recipient)) {
       char *buff;
       owl_function_error("No one subscribed to class %s", retnotice->z_class);

zwrite.c

@@ -182 +182 @@
   }
 
-  /* if there are no recipients we won't send a ping, which
-     is what we want */
   for (i = 0; i < z->recips->len; i++) {
     to = owl_zwrite_get_recip_n_with_realm(z, i);
-    send_ping(to, z->class, z->inst);
+    if (owl_zwrite_recip_is_personal(to))
+      send_ping(to, z->class, z->inst);
     g_free(to);
   }
@@ -207 +206 @@
   g_free(z->message);
 
-  if (z->recips->len > 0 && z->cc) {
+  if (z->cc && owl_zwrite_is_personal(z)) {
     message = g_string_new("CC: ");
     for (i = 0; i < z->recips->len; i++) {
@@ -338 +337 @@
 }
 
-int owl_zwrite_is_personal(const owl_zwrite *z)
+bool owl_zwrite_recip_is_personal(const char *recipient)
+{
+  return recipient[0] && recipient[0] != '@';
+}
+
+bool owl_zwrite_is_personal(const owl_zwrite *z)
 {
   /* return true if at least one of the recipients is personal */
   int i;
-  char *recip;
-
-  for (i = 0; i < z->recips->len; i++) {
-    recip = z->recips->pdata[i];
-    if (recip[0] != '@') return 1;
-  }
-  return(0);
+
+  for (i = 0; i < z->recips->len; i++)
+    if (owl_zwrite_recip_is_personal(z->recips->pdata[i]))
+      return true;
+  return false;
 }