Changeset 61e79a9

Timestamp:

Sep 2, 2002, 12:10:37 PM (22 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:

5145235

Parents:

c01e477

Message:

The tty variable now controls the zephyr location tty name

Files:

• ChangeLog (modified) (1 diff)
• global.c (modified) (3 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (1 diff)
• util.c (modified) (1 diff)
• variable.c (modified) (1 diff)

ChangeLog

@@ -18 +18 @@
         Moved zsig generation to the zwrite object
         Print the zsig used for outgoing messages
-        Started changes to tty variables *** NOT DONE ***
+        The tty variable now controls the zephyr location tty name
         
 1.2.2

global.c

@@ -63 +63 @@
   strcpy(g->buffercommand, "");
 
+  
   owl_global_set_config_format(g, 0);
   owl_global_set_userclue(g, OWL_USERCLUE_NONE);
@@ -381 +382 @@
 }
 
-/* tty (not fully implemented yet) */
-
-void owl_global_set_tty_old(owl_global *g, char *tty) {
-  if (tty) {
-    strcpy(g->thistty, tty);
-  } else if (getenv("DISPLAY")) {
-    strcpy(g->thistty, getenv("DISPLAY"));
-  } else if (ttyname(fileno(stdout))) {
-    strcpy(g->thistty, ttyname(fileno(stdout)));
-    if (!strncmp(g->thistty, "/dev/", 5)) {
-      strcpy(g->thistty, g->thistty+5);
-    }
-  } else {
-    strcpy(g->thistty, "unknown");
-  }
-    
-#ifdef HAVE_LIBZEPHYR_ZINITLOCATIONINFO
-  ZInitLocationInfo(g->thishost, g->thistty); 
-#endif
-}
-
-
 /* debug */
 
@@ -427 +406 @@
   /* print something nicer later */   
   sprintf(buff, "%i seconds", (int) diff);
+}
+
+char *owl_global_get_hostname(owl_global *g) {
+  return(g->thishost);
 }
 

owl.c

@@ -132 +132 @@
   if (debug) owl_global_set_debug_on(&g);
   owl_global_set_startupargs(&g, argcsave, argvsave);
-  owl_global_set_tty(&g, tty);
   owl_context_set_readconfig(owl_global_get_context(&g));
+  if (tty) {
+    owl_global_set_tty(&g, tty);
+  } else {
+    owl_global_set_tty(&g, owl_util_get_default_tty());
+  }
 
   /* setup the default filters */

owl.h

@@ -368 +368 @@
   int typwinactive;
   char thishost[LINE];
-  char thistty[LINE];
   char homedir[LINE];
   int direction;

util.c

@@ -494 +494 @@
 }
 
+char *owl_util_get_default_tty() {
+  /* call must free the return */
+  char *out;
+
+  if (getenv("DISPLAY")) {
+    out=owl_strdup(getenv("DISPLAY"));
+  } else if (ttyname(fileno(stdout))) {
+    out=strdup(ttyname(fileno(stdout)));
+    if (!strncmp(out, "/dev/", 5)) {
+      owl_free(out);
+      out=strdup(ttyname(fileno(stdout)+5));
+    }
+  } else {
+    out=strdup("unknown");
+  }
+  return(out);
+}
+
+
 void owl_hack_animate() {
   owl_messagelist *ml;

variable.c

@@ -311 +311 @@
 
 int owl_variable_tty_set(owl_variable *v, void *newval) {
-  owl_function_makemsg("This is a test.");
+  ZInitLocationInfo(owl_global_get_hostname(&g), newval);
   return(owl_variable_string_set_default(v, newval));
 }