Changeset 4b660cc

Timestamp:

Dec 23, 2003, 4:13:43 PM (20 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

8b16467

Parents:

c65d81e

Message:

Now have a set of 'aaway' commands and variables just like the
  'zaway' ones (except that changing the 'aaway' variable talks to
  the server)
The new 'away' command does everything for both AIM *and* zephyr.
  There is a known funkiness here, where if you turn one away on,
  and then use 'away' (or 'A') to toggle, you will turn on off and
  the other on.  Just leaving it for now.  Should do better in the
  next patch.
The 'A' key is bound to 'away'
Status bar can now read AWAY, Z-AWAY or A-AWAY.

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (2 diffs)
• functions.c (modified) (2 diffs)
• owl.h (modified) (1 diff)
• util.c (modified) (1 diff)
• variable.c (modified) (2 diffs)

ChangeLog

@@ -8 +8 @@
           what most clients seem to do, in that an away reply is sent for
           each message received.  Most clients only reply to the first one
-          per away-session.  Also, it's completely tied to the zaway
-          functions, it should probably be separated out into aaway
-          functions with a new "away" function that will get everything.
-          Loop detection stuff should work and has been tested, but I'm
-          not completely sure I did this right ... so odd behavior should
-          be reported.
-        New 'away' command, just an alias to zaway for now.
-        'A' key now bound to 'away' command.
-        In status bar "ZAWAY" is now "AWAY"
+          per away-session.
+        Now have a set of 'aaway' commands and variables just like the
+          'zaway' ones (except that changing the 'aaway' variable talks to
+          the server)
+        The new 'away' command does everything for both AIM *and* zephyr.
+          There is a known funkiness here, where if you turn one away on,
+          and then use 'away' (or 'A') to toggle, you will turn on off and
+          the other on.  Just leaving it for now.  Should do better in the
+          next patch.
+        The 'A' key is bound to 'away'
+        Status bar can now read AWAY, Z-AWAY or A-AWAY.
         
 2.1.1-pre-1

commands.c

@@ -451 +451 @@
 
   OWLCMD_ARGS("zaway", owl_command_zaway, OWL_CTX_INTERACTIVE,
-              "running a command from the shell",
+              "Set, enable or disable zephyr away message",
               "zaway [ on | off | toggle ]\n"
               "zaway <message>",
-              "Turn on or off the default zaway message.  If a message is\n"
-              "specified turn on zaway with that message\n"),
-  OWLCMD_ALIAS("away", "zaway"),
+              "Turn on or off a zaway message.  If 'message' is\n"
+              "specified turn on zaway with that message, otherwise\n"
+              "use the default.\n"),
+
+  OWLCMD_ARGS("aaway", owl_command_aaway, OWL_CTX_INTERACTIVE,
+              "Set, enable or disable AIM away message",
+              "aaway [ on | off | toggle ]\n"
+              "aaway <message>",
+              "Turn on or off the AIM away message.  If 'message' is\n"
+              "specified turn on aaway with that message, otherwise\n"
+              "use the default.\n"),
+
+  OWLCMD_ARGS("away", owl_command_away, OWL_CTX_INTERACTIVE,
+              "Set, enable or disable both AIM and zephyr away messages",
+              "away [ on | off | toggle ]\n"
+              "away <message>",
+              "Turn on or off the AIM and zephyr away message.  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"),
 
   OWLCMD_ARGS("load-subs", owl_command_loadsubs, OWL_CTX_ANY,
@@ -1343 +1364 @@
 }
 
+
+char *owl_command_aaway(int argc, char **argv, char *buff)
+{
+  if ((argc==1) ||
+      ((argc==2) && !strcmp(argv[1], "on"))) {
+    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
+    owl_function_aaway_on();
+    return NULL;
+  }
+
+  if (argc==2 && !strcmp(argv[1], "off")) {
+    owl_function_aaway_off();
+    return NULL;
+  }
+
+  if (argc==2 && !strcmp(argv[1], "toggle")) {
+    owl_function_aaway_toggle();
+    return NULL;
+  }
+
+  buff = skiptokens(buff, 1);
+  owl_global_set_aaway_msg(&g, buff);
+  owl_function_aaway_on();
+  return NULL;
+}
+
+
+char *owl_command_away(int argc, char **argv, char *buff)
+{
+  owl_command_zaway(argc, argv, buff);
+  owl_command_aaway(argc, argv, buff);
+  return NULL;
+}
 
 char *owl_command_set(int argc, char **argv, char *buff)

functions.c

@@ -863 +863 @@
 {
   owl_global_set_zaway_on(&g);
-  owl_aim_set_awaymsg(owl_global_get_zaway_msg(&g));
-  owl_function_makemsg("aim and zaway set (%s)", owl_global_get_zaway_msg(&g));
+  owl_function_makemsg("zaway set (%s)", owl_global_get_zaway_msg(&g));
 }
 
@@ -870 +869 @@
 {
   owl_global_set_zaway_off(&g);
-  owl_aim_set_awaymsg("");
-  owl_function_makemsg("aim and zaway off");
+  owl_function_makemsg("zaway off");
+}
+
+void owl_function_aaway_toggle()
+{
+  if (!owl_global_is_aaway(&g)) {
+    owl_global_set_aaway_msg(&g, owl_global_get_aaway_msg_default(&g));
+    owl_function_aaway_on();
+  } else {
+    owl_function_aaway_off();
+  }
+}
+
+void owl_function_aaway_on()
+{
+  owl_global_set_aaway_on(&g);
+  /* owl_aim_set_awaymsg(owl_global_get_zaway_msg(&g)); */
+  owl_function_makemsg("AIM away set (%s)", owl_global_get_aaway_msg(&g));
+}
+
+void owl_function_aaway_off()
+{
+  owl_global_set_aaway_off(&g);
+  /* owl_aim_set_awaymsg(""); */
+  owl_function_makemsg("AIM away off");
 }
 

owl.h

@@ -138 +138 @@
 
 #define OWL_DEFAULT_ZAWAYMSG    "I'm sorry, but I am currently away from the terminal and am\nnot able to receive your message.\n"
+#define OWL_DEFAULT_AAWAYMSG    "I'm sorry, but I am currently away from the terminal and am\nnot able to receive your message.\n"
 
 #define OWL_INCLUDE_REG_TESTS   1  /* whether to build in regression tests */

util.c

@@ -78 +78 @@
   }
 
-  if (owl_global_is_zaway(&g)) {
+  if (owl_global_is_zaway(&g) || owl_global_is_aaway(&g)) {
     getyx(sepwin, y, x);
     wmove(sepwin, y, x+2);
     wattron(sepwin, A_BOLD);
     wattroff(sepwin, A_REVERSE);
-    waddstr(sepwin, " AWAY ");
+    if (owl_global_is_zaway(&g) && owl_global_is_aaway(&g)) {
+      waddstr(sepwin, " AWAY ");
+    } else if (owl_global_is_zaway(&g)) {
+      waddstr(sepwin, " Z-AWAY ");
+    } else if (owl_global_is_aaway(&g)) {
+      waddstr(sepwin, " A-AWAY ");
+    }
     wattron(sepwin, A_REVERSE);
     wattroff(sepwin, A_BOLD);

variable.c

@@ -208 +208 @@
                  OWL_DEFAULT_ZAWAYMSG,
                  "default zaway message", "" ),
+
+  OWLVAR_BOOL_FULL( "aaway" /* %OwlVarStub */, 0,
+                    "Set AIM away status",
+                    "",
+                    NULL, owl_variable_aaway_set, NULL),
+
+  OWLVAR_STRING( "aaway_msg" /* %OwlVarStub */, 
+                 OWL_DEFAULT_AAWAYMSG,
+                 "AIM away msg for responding when away", "" ),
+
+  OWLVAR_STRING( "aaway_msg_default" /* %OwlVarStub */, 
+                 OWL_DEFAULT_AAWAYMSG,
+                 "default AIM away message", "" ),
 
   OWLVAR_STRING( "view_home" /* %OwlVarStub */, "all",
@@ -355 +368 @@
 
 /* debug (cache value in g->debug) */
-
 int owl_variable_debug_set(owl_variable *v, void *newval) {
   if (newval && (*(int*)newval == 1 || *(int*)newval == 0)) {
     g.debug = *(int*)newval;
+  }
+  return owl_variable_bool_set_default(v, newval);
+}
+
+/* When 'aaway' is changed, need to notify the AIM server */
+int owl_variable_aaway_set(owl_variable *v, void *newval) {
+  if (newval) {
+    if (*(int*)newval == 1) {
+      owl_aim_set_awaymsg(owl_global_get_aaway_msg(&g));
+    } else if (*(int*)newval == 0) {
+      owl_aim_set_awaymsg("");
+    }
   }
   return owl_variable_bool_set_default(v, newval);