Changeset e778351 for zephyr.c

Timestamp:

Mar 25, 2011, 10:58:23 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Parents:

f27b044

Message:

Ability to set exposure arbitrarily (like "zctl set exposure")

A zephyr variable 'exposure' has been added.  It defaults to the value
in ~/.zephyr.vars, if there is one, or to realm-visible.  Setting this
variable does not affect the value in ~/.zephyr.vars.

Additionally, OWLVAR_STRING_FULL has been modified to allow custom
setting of validset.

This fixes ticket # 65.

File:

• zephyr.c (modified) (2 diffs)

zephyr.c

@@ -1019 +1019 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  char *exposure, *eset;
   Code_t ret;
 
   ZResetAuthentication();
 
-  eset = EXPOSE_REALMVIS;
-  exposure = ZGetVariable(zstr("exposure"));
-  if (exposure)
-    exposure = ZParseExposureLevel(exposure);
-  if (exposure)
-    eset = exposure;
-   
-  ret = ZSetLocation(eset);
+  ret = ZSetLocation(zstr(owl_global_get_exposure(&g)));
+
   if (ret != ZERR_NONE)
     owl_function_error("Error setting location: %s", error_message(ret));
@@ -1153 +1146 @@
 #ifdef HAVE_LIBZEPHYR
   ZInitLocationInfo(zstr(host), zstr(val));
+#endif
+}
+
+int owl_zephyr_set_exposure(const char *exposure)
+{
+#ifdef HAVE_LIBZEPHYR
+  Code_t ret;
+  if (exposure == NULL)
+    return -1;
+  exposure = ZParseExposureLevel(zstr(exposure));
+  if (exposure == NULL)
+    return -1;
+  ret = ZSetLocation(zstr(exposure));
+  if (ret != ZERR_NONE) {
+    owl_function_debugmsg("Unable to set exposure location to %s (%s)", exposure, error_message(ret));
+    return -1; /* I don't like this.  We should return -1, because we failed,
+                * but the user gets a message that implies that the value they
+                * gave is wrong.
+                */
+  }
+  ret = ZSetVariable(zstr("exposure"), zstr(exposure));
+  if (ret != ZERR_NONE) {
+    owl_function_debugmsg("Unable to set exposure variable to %s (%s)", exposure, error_message(ret));
+    return -1; /* ditto the above comment */
+  }
+#endif
+  return 0;
+}
+
+const char *owl_zephyr_get_exposure(void)
+{
+#ifdef HAVE_LIBZEPHYR
+  const char *exposure = ZParseExposureLevel(ZGetVariable(zstr("exposure")));
+  if (exposure == NULL)
+    exposure = EXPOSE_REALMVIS;
+  return exposure;
+#else
+  return "";
 #endif
 }