Changeset 217a43e

Timestamp:

Jul 3, 2002, 6:28:46 PM (21 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

8df36cc

Parents:

83a9b63

Message:

	Fixed a bug in the "reply -e" command.
	The "disable-ctrl-d" variable may also be set to "middle"
	        which will result in ctrl-d only sending at the
		end of the message.  This is now the default.
		This also added a command "editmulti:done-or-delete".

Files:

• ChangeLog (modified) (1 diff)
• commands.c (modified) (3 diffs)
• editwin.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• variable.c (modified) (3 diffs)

ChangeLog

@@ -21 +21 @@
         The "Not logged in or subscribing to messages" error 
                 now includes the name of the recipient.
+        Fixed a bug in the "reply -e" command.
+        The "disable-ctrl-d" variable may also be set to "middle"
+                which will result in ctrl-d only sending at the 
+                end of the message.  This is now the default.
+                This also added a command "editmulti:done-or-delete".
                 
 1.2.1-pre-1

commands.c

@@ -622 +622 @@
                   "", ""),
 
+  OWLCMD_VOID_CTX("editmulti:done-or-delete", owl_command_editmulti_done_or_delete, 
+                  OWL_CTX_EDITMULTI,
+                  "completes the command, but only if at end of message",
+                  "", 
+                  "If only whitespace is to the right of the cursor,\n"
+                  "runs 'editmulti:done'.\n"\
+                  "Otherwise runs 'edit:delete-next-char'\n"),
+
   /****************************************************************/
   /********************** POPLESS-SPECIFIC ************************/
@@ -1146 +1154 @@
     edit=1;
     argv++;
+    argc--;
   }
 
@@ -1553 +1562 @@
 }
 
+void owl_command_editmulti_done_or_delete(owl_editwin *e) {
+  if (owl_editwin_is_at_end(e)) {
+    owl_command_editmulti_done(e);
+  } else {
+    owl_editwin_delete_char(e);
+  }
+}
+
 
 /*********************************************************************/

editwin.c

@@ -740 +740 @@
 }
 
+/* returns if only whitespace remains */
+int owl_editwin_is_at_end(owl_editwin *e) {
+  int i, cur;  
+  cur=_owl_editwin_get_index_from_xy(e);
+  if (cur >= e->bufflen) return(1);
+  for (i=e->bufflen-1; i>cur; i--) {
+    if (e->buff[i] != '\r'
+        && e->buff[i] != '\n'
+        && e->buff[i] != ' ') {
+      return(0);
+    }
+  }
+  if (cur==i) return(1);
+  else return(0);
+}
+
 int owl_editwin_check_dotsend(owl_editwin *e) {
   int i;

functions.c

@@ -126 +126 @@
   owl_editwin_new_style(e, OWL_EDITWIN_STYLE_MULTILINE);
 
-  if (!owl_global_is_lockout_ctrld(&g)) {
+  if (!owl_global_get_lockout_ctrld(&g)) {
     owl_function_makemsg("Type your zephyr below.  End with ^D or a dot on a line by itself.  ^C will quit.");
   } else {

keys.c

@@ -94 +94 @@
   /*BIND_CMD("C-c C-c", "editmulti:done", "sends the zephyr");*/
 
-  /* note that changing "disable-ctrl-d" will change this to 
+  /* note that changing "disable-ctrl-d" to "on" will change this to 
    * edit:delete-next-char */
-  BIND_CMD("C-d",     "editmulti:done", "sends the zephyr");
+  BIND_CMD("C-d",     "editmulti:done-or-delete", "sends the zephyr if at the end of the message");
 
 

variable.c

@@ -42 +42 @@
         NULL }
 
+#define OWLVAR_ENUM_FULL(name,default,docstring,validset,validate, set, get) \
+        { name, OWL_VARIABLE_INT, NULL, default, validset, docstring, NULL, \
+        validate, \
+        set, owl_variable_enum_set_fromstring, \
+        get, owl_variable_enum_get_tostring, \
+        NULL }
+
 static owl_variable variables_to_init[] = {
 
@@ -78 +85 @@
                "turn class logging on or off" ),
 
-  OWLVAR_BOOL_FULL( "disable-ctrl-d" /* %OwlVarStub:lockout_ctrld */, 0,
-                    "don't send zephyrs on C-d",
+  OWLVAR_ENUM_FULL( "disable-ctrl-d" /* %OwlVarStub:lockout_ctrld */, 1,
+                    "don't send zephyrs on C-d (or disable if in the middle of the message if set to 'middle')", "off,middle,on",
                     NULL, owl_variable_disable_ctrl_d_set, NULL),
 
@@ -186 +193 @@
  * any user setting of this */
 int owl_variable_disable_ctrl_d_set(owl_variable *v, void *newval) {
-  if (newval && !owl_context_is_startup(owl_global_get_context(&g))
-      && (*(int*)newval == 1 || *(int*)newval == 0)) {
-    if (*(int*)newval) {
+  if (newval && !owl_context_is_startup(owl_global_get_context(&g))) {
+    if (*(int*)newval == 2) {
       owl_function_command_norv("bindkey editmulti C-d command edit:delete-next-char");
+    } else if (*(int*)newval == 1) {
+      owl_function_command_norv("bindkey editmulti C-d command editmulti:done-or-delete");
     } else {
       owl_function_command_norv("bindkey editmulti C-d command editmulti:done");
     }
   }  
-  return owl_variable_bool_set_default(v, newval);  
+  return owl_variable_int_set_default(v, newval);  
 }