Changes in commands.c [f271129:ca1fb26a]

File:

• commands.c (modified) (14 diffs)

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"
@@ -479 +479 @@
 
   OWLCMD_ARGS("away", owl_command_away, OWL_CTX_INTERACTIVE,
-              "Set, enable or disable both AIM and zephyr away messages",
+              "Set, enable or disable all away messages",
               "away [ on | off | toggle ]\n"
               "away <message>",
-              "Turn on or off the AIM and zephyr away message.  If\n"
+              "Turn on or off all away messages.  If\n"
               "'message' is specified turn them on with that message,\n"
               "otherwise use the default.\n"
-              "\n"
-              "This command really just runs the 'aaway' and 'zaway'\n"
-              "commands together\n"
               "\n"
               "SEE ALSO: aaway, zaway"),
@@ -1033 +1030 @@
   OWLCMD_ARGS_CTX("popless:start-search", owl_viewwin_command_start_search, OWL_CTX_POPLESS,
                   "starts a command line to search for particular string",
-                  "popless:start-search [-r] [inital-value]",
+                  "popless:start-search [-r] [initial-value]",
                   "Initializes the command-line to search for initial-value. If\n"
                   "-r is used, the search will be performed backwards.\n\n"
@@ -1117 +1114 @@
 void owl_command_version(void)
 {
-  owl_function_makemsg("BarnOwl version %s", OWL_VERSION_STRING);
+  owl_function_makemsg("BarnOwl version %s", version);
 }
 
@@ -1531 +1528 @@
 char *owl_command_away(int argc, const char *const *argv, const char *buff)
 {
-  if ((argc==1) ||
-      ((argc==2) && !strcmp(argv[1], "on"))) {
+  bool away_off;
+  const char *message = NULL;
+
+  if (argc == 1 ||
+      (argc == 2 && !strcmp(argv[1], "on"))) {
+    away_off = false;
     owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
     owl_global_set_zaway_msg(&g, owl_global_get_zaway_msg_default(&g));
+  } else if (argc == 2 && !strcmp(argv[1], "off")) {
+    away_off = true;
+  } else if (argc == 2 && !strcmp(argv[1], "toggle")) {
+    away_off = owl_function_is_away();
+  } else {
+    away_off = false;
+    message = skiptokens(buff, 1);
+  }
+
+  if (away_off) {
+    owl_function_aaway_off();
+    owl_function_zaway_off();
+    owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_off", 0, NULL);
+    owl_function_makemsg("Away messages off.");
+  } else if (message != NULL) {
+    owl_global_set_aaway_msg(&g, message);
+    owl_global_set_zaway_msg(&g, message);
     owl_function_aaway_on();
     owl_function_zaway_on();
+    owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_on", 1, &message);
+    owl_function_makemsg("Away messages set (%s).", message);
+  } else {
+    owl_function_aaway_on();
+    owl_function_zaway_on();
+    owl_perlconfig_perl_call_norv("BarnOwl::Hooks::_away_on", 0, NULL);
     owl_function_makemsg("Away messages set.");
-    return NULL;
-  }
-
-  if (argc==2 && !strcmp(argv[1], "off")) {
-    owl_function_aaway_off();
-    owl_function_zaway_off();
-    return NULL;
-  }
-
-  if (argc==2 && !strcmp(argv[1], "toggle")) {
-    /* if either one is on, turn it off, otherwise toggle both (turn
-     *  them both on)
-     */
-    if (!owl_global_is_zaway(&g) && !owl_global_is_aaway(&g)) {
-      owl_function_aaway_toggle();
-      owl_function_zaway_toggle();
-      owl_function_makemsg("Away messages set.");
-    } else {
-      if (owl_global_is_zaway(&g)) owl_function_zaway_toggle();
-      if (owl_global_is_aaway(&g)) owl_function_aaway_toggle();
-      owl_function_makemsg("Away messages off.");
-    }
-    return NULL;
-  }
-
-  buff = skiptokens(buff, 1);
-  owl_global_set_aaway_msg(&g, buff);
-  owl_global_set_zaway_msg(&g, buff);
-  owl_function_aaway_on();
-  owl_function_zaway_on();
-  owl_function_makemsg("Away messages set.");
+  }
+
   return NULL;
 }
@@ -1604 +1599 @@
   if (v == NULL) {
     if (!silent) owl_function_error("Unknown variable '%s'", var);
-  } else if (requirebool && owl_variable_get_type(v) != OWL_VARIABLE_BOOL) {
+  } else if (requirebool && !v->takes_on_off) {
     if (!silent) owl_function_error("Variable '%s' is not a boolean", var);
   } else {
@@ -1633 +1628 @@
   if (v == NULL) {
     if (!silent) owl_function_error("Unknown variable '%s'", var);
-  } else if (owl_variable_get_type(v) != OWL_VARIABLE_BOOL) {
+  } else if (!v->takes_on_off) {
     if (!silent) owl_function_error("Variable '%s' is not a boolean", var);
   } else {
@@ -1778 +1773 @@
 
   if (argc < 3) {
-    owl_function_makemsg("Usage: bindkey <keymap> <binding>");
+    owl_function_makemsg("Usage: unbindkey <keymap> <binding>");
     return NULL;
   }
@@ -1985 +1980 @@
   }
   /* check for a zwrite -m */
-  z = owl_zwrite_new(buff);
+  z = owl_zwrite_new(argc, argv);
   if (!z) {
     owl_function_error("Error in zwrite arguments");
@@ -2190 +2185 @@
     if (!strcmp(argv[0], "-f")) {
       if (argc<2) {
-        owl_function_makemsg("Too few argments to the view command");
+        owl_function_makemsg("Too few arguments to the view command");
         return(NULL);
       }
@@ -2202 +2197 @@
     } else if (!strcmp(argv[0], "-s")) {
       if (argc<2) {
-        owl_function_makemsg("Too few argments to the view command");
+        owl_function_makemsg("Too few arguments to the view command");
         return(NULL);
       }
@@ -2209 +2204 @@
       argv+=2;
     } else {
-      owl_function_makemsg("Too few argments to the view command");
+      owl_function_makemsg("Too few arguments to the view command");
       return(NULL);
     }
@@ -2796 +2791 @@
     owl_history_store(hist, owl_editwin_get_text(e), false);
 
+  /* Take a reference to the editwin, so that it survives the pop
+   * context. TODO: We should perhaps refcount or otherwise protect
+   * the context so that, even if a command pops a context, the
+   * context itself will last until the command returns. */
+  owl_editwin_ref(e);
   owl_global_pop_context(&g);
+
+  owl_editwin_do_callback(e, false);
+  owl_editwin_unref(e);
 }
 
@@ -2856 +2859 @@
   owl_global_pop_context(&g);
 
-  owl_editwin_do_callback(e);
+  owl_editwin_do_callback(e, true);
   owl_editwin_unref(e);
 }