Changeset 217a43e for variable.c

Timestamp:

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

Author:

Erik Nygren <nygren@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:

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".

File:

• variable.c (modified) (3 diffs)

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);  
 }