Changeset 2142 for libcaca/trunk/cacaTweet

Timestamp:

Dec 16, 2007, 12:55:14 PM (13 years ago)

Author:

Sam Hocevar

Message:

• The SLang and ncurses drivers now put back the TERM environment variable if they modified it.

Location:

libcaca/trunk/caca

Files:

• driver_ncurses.c (modified) (6 diffs)
• driver_slang.c (modified) (4 diffs)

libcaca/trunk/caca/driver_ncurses.c

@@ -197 +197 @@
 #endif
 #if defined HAVE_GETENV && defined HAVE_PUTENV
-static void ncurses_check_terminal(void);
+static void ncurses_install_terminal(caca_display_t *);
+static void ncurses_uninstall_terminal(caca_display_t *);
 #endif
 static void ncurses_write_utf32(uint32_t);
@@ -205 +206 @@
     int attr[16*16];
     mmask_t oldmask;
+    char *term;
 };
 
@@ -237 +239 @@
 
 #if defined HAVE_GETENV && defined HAVE_PUTENV
-    ncurses_check_terminal();
+    ncurses_install_terminal(dp);
 #endif
 
@@ -315 +317 @@
     noraw();
     endwin();
+
+#if defined HAVE_GETENV && defined HAVE_PUTENV
+    ncurses_uninstall_terminal(dp);
+#endif
 
     free(dp->drv.p);
@@ -562 +568 @@
 
 #if defined HAVE_GETENV && defined HAVE_PUTENV
-static void ncurses_check_terminal(void)
+static void ncurses_install_terminal(caca_display_t *dp)
 {
     char *term, *colorterm;
+
+    dp->drv.p->term = NULL;
 
     term = getenv("TERM");
@@ -584 +592 @@
         endwin();
         (void)putenv("TERM=xterm-16color");
+        dp->drv.p->term = strdup(term);
         return;
     }
+}
+
+static void ncurses_uninstall_terminal(caca_display_t *dp)
+{
+    /* Needs to be persistent because we use putenv() */
+    static char termenv[1024];
+
+    if(!dp->drv.p->term)
+        return;
+
+    snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term);
+    free(dp->drv.p->term);
+    (void)putenv(termenv);
 }
 #endif

libcaca/trunk/caca/driver_slang.c

@@ -111 +111 @@
 #endif
 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
-static void slang_check_terminal(void);
-#endif
+static void slang_install_terminal(caca_display_t *);
+static void slang_uninstall_terminal(caca_display_t *);
+#endif
+
+struct driver_private
+{
+    char *term;
+};
 
 static int slang_init_graphics(caca_display_t *dp)
 {
+    dp->drv.p = malloc(sizeof(struct driver_private));
+
 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
-    slang_check_terminal();
+    slang_install_terminal(dp);
 #endif
 
@@ -184 +192 @@
     SLang_reset_tty();
     SLsmg_reset_smg();
+
+#if defined HAVE_GETENV && defined HAVE_PUTENV
+    slang_uninstall_terminal(dp);
+#endif
+
+    free(dp->drv.p);
 
     return 0;
@@ -495 +509 @@
 
 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV)
-static void slang_check_terminal(void)
+static void slang_install_terminal(caca_display_t *dp)
 {
     char *term, *colorterm;
+
+    dp->drv.p->term = NULL;
 
     term = getenv("TERM");
@@ -512 +528 @@
     {
         (void)putenv("TERM=xterm-16color");
+        dp->drv.p->term = strdup(term);
         return;
     }
+}
+
+static void slang_uninstall_terminal(caca_display_t *dp)
+{
+    /* Needs to be persistent because we use putenv() */
+    static char termenv[1024];
+
+    if(!dp->drv.p->term)
+        return;
+
+    snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term);
+    free(dp->drv.p->term);
+    (void)putenv(termenv);
 }
 #endif