Changes in commands.c [987cf3f:9bd51b8]

File:

• commands.c (modified) (12 diffs)

commands.c

@@ -136 +136 @@
               "Send a local message.\n"),
 
-  OWLCMD_ARGS("zcrypt", owl_command_zwrite, OWL_CTX_INTERACTIVE,
+  OWLCMD_ARGS("zcrypt", owl_command_zcrypt, OWL_CTX_INTERACTIVE,
               "send an encrypted zephyr",
               "zcrypt [-n] [-C] [-c class] [-i instance] [-r realm] [-O opcode] [-m <message...>]\n",
@@ -1371 +1371 @@
 {
   owl_function_full_redisplay();
-  owl_global_set_needrefresh(&g);
 }
 
@@ -1387 +1386 @@
 {
   owl_global_set_rightshift(&g, shift);
-  owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  owl_global_set_needrefresh(&g);
 }
 
@@ -1914 +1911 @@
 char *owl_command_zwrite(int argc, const char *const *argv, const char *buff)
 {
-  owl_zwrite *z;
+  owl_zwrite z;
 
   if (!owl_global_is_havezephyr(&g)) {
@@ -1921 +1918 @@
   }
   /* check for a zwrite -m */
-  z = owl_zwrite_new(buff);
-  if (!z) {
-    owl_function_error("Error in zwrite arguments");
-    return NULL;
-  }
-
-  if (owl_zwrite_is_message_set(z)) {
-    owl_function_zwrite(z, NULL);
-    owl_zwrite_delete(z);
-    return NULL;
-  }
+  owl_zwrite_create_from_line(&z, buff);
+  if (owl_zwrite_is_message_set(&z)) {
+    owl_function_zwrite(buff, NULL);
+    owl_zwrite_cleanup(&z);
+    return (NULL);
+  }
+  owl_zwrite_cleanup(&z);
 
   if (argc < 2) {
-    owl_zwrite_delete(z);
     owl_function_makemsg("Not enough arguments to the zwrite command.");
   } else {
-    owl_function_zwrite_setup(z);
+    owl_function_zwrite_setup(buff);
   }
   return(NULL);
@@ -2024 +2016 @@
 {
   owl_function_loopwrite_setup();
+  return(NULL);
+}
+
+char *owl_command_zcrypt(int argc, const char *const *argv, const char *buff)
+{
+  owl_zwrite z;
+
+  if (!owl_global_is_havezephyr(&g)) {
+    owl_function_makemsg("Zephyr is not available");
+    return(NULL);
+  }
+  /* check for a zcrypt -m */
+  owl_zwrite_create_from_line(&z, buff);
+  if (owl_zwrite_is_message_set(&z)) {
+    owl_function_zcrypt(buff, NULL);
+    owl_zwrite_cleanup(&z);
+    return (NULL);
+  }
+  owl_zwrite_cleanup(&z);
+
+  if (argc < 2) {
+    owl_function_makemsg("Not enough arguments to the zcrypt command.");
+  } else {
+    owl_function_zwrite_setup(buff);
+  }
   return(NULL);
 }
@@ -2693 +2710 @@
   }
 
-  owl_global_set_needrefresh(&g);
   owl_global_pop_context(&g);
 
@@ -2714 +2730 @@
     owl_editwin_clear(e);
     owl_editwin_insert_string(e, ptr);
-    owl_editwin_redisplay(e);
-    owl_global_set_needrefresh(&g);
   } else {
     owl_function_beep();
@@ -2731 +2745 @@
     owl_editwin_clear(e);
     owl_editwin_insert_string(e, ptr);
-    owl_editwin_redisplay(e);
-    owl_global_set_needrefresh(&g);
   } else {
     owl_function_beep();
@@ -2742 +2754 @@
   buff = skiptokens(buff, 1);
   owl_editwin_insert_string(e, buff);
-  owl_editwin_redisplay(e);
-  owl_global_set_needrefresh(&g);  
   return NULL;
 }
@@ -2758 +2768 @@
   owl_global_set_typwin_inactive(&g);
   owl_global_pop_context(&g);
-  owl_global_set_needrefresh(&g);
 
   owl_editwin_do_callback(e);
@@ -2780 +2789 @@
 void owl_command_popless_quit(owl_viewwin *vw)
 {
+  owl_viewwin_cleanup(vw);
   owl_popwin_close(owl_global_get_popwin(&g));
   owl_global_pop_context(&g);
-  owl_viewwin_cleanup(vw);
-  owl_global_set_needrefresh(&g);
-}
+}