Changeset 1392Tweet

Timestamp:

Nov 14, 2006, 12:42:43 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Factored terminal title setting code.
• Do not try to set the terminal title if TERM=linux.

Location:

libcaca/trunk/caca

Files:

• caca_internals.h (modified) (1 diff)
• driver_ncurses.c (modified) (5 diffs)
• driver_slang.c (modified) (5 diffs)
• graphics.c (modified) (2 diffs)

libcaca/trunk/caca/caca_internals.h

@@ -157 +157 @@
 #endif
 
+/* Internal window functions */
+extern void _caca_set_term_title(char const *);
+
 #endif /* __CACA_INTERNALS_H__ */

libcaca/trunk/caca/driver_ncurses.c

@@ -60 +60 @@
 static void ncurses_check_terminal(void);
 #endif
-static void ncurses_set_title(char const *);
 static void ncurses_write_utf32(uint32_t);
 
@@ -111 +110 @@
 #endif
 
-    ncurses_set_title("caca for ncurses");
+    _caca_set_term_title("caca for ncurses");
 
     initscr();
@@ -170 +169 @@
 static int ncurses_end_graphics(caca_display_t *dp)
 {
-    ncurses_set_title("");
+    _caca_set_term_title("");
     mousemask(dp->drv.p->oldmask, NULL);
     curs_set(1);
@@ -183 +182 @@
 static int ncurses_set_display_title(caca_display_t *dp, char const *title)
 {
-    ncurses_set_title(title);
+    _caca_set_term_title(title);
 
     return 0;
@@ -436 +435 @@
 #endif
 
-static void ncurses_set_title(char const *str)
-{
-    fprintf(stdout, "\x1b]0;%s\x07\n", str);
-    fflush(stdout);
-}
-
 static void ncurses_write_utf32(uint32_t ch)
 {

libcaca/trunk/caca/driver_slang.c

@@ -104 +104 @@
  */
 static void slang_init_palette(void);
-static void slang_set_title(char const *);
 static void slang_write_utf32(uint32_t);
 
@@ -126 +125 @@
 #endif
 
-    slang_set_title("caca for S-Lang");
+    _caca_set_term_title("caca for S-Lang");
 
     /* Initialise slang library */
@@ -176 +175 @@
 static int slang_end_graphics(caca_display_t *dp)
 {
-    slang_set_title("");
+    _caca_set_term_title("");
     SLtt_set_mouse_mode(0, 0);
     SLtt_set_cursor_visibility(1);
@@ -187 +186 @@
 static int slang_set_display_title(caca_display_t *dp, char const *title)
 {
-    slang_set_title(title);
+    _caca_set_term_title(title);
 
     return 0;
@@ -448 +447 @@
 }
 
-static void slang_set_title(char const *str)
-{
-    fprintf(stdout, "\x1b]0;%s\x07\n", str);
-    fflush(stdout);
-}
-
 static void slang_write_utf32(uint32_t ch)
 {

libcaca/trunk/caca/graphics.c

@@ -18 +18 @@
 #include "config.h"
 #include "common.h"
+
+#if !defined(__KERNEL__)
+#   include <stdio.h>
+#   include <stdlib.h>
+#   include <string.h>
+#endif
 
 #include "caca.h"
@@ -209 +215 @@
 }
 
+void _caca_set_term_title(char const *str)
+{
+#if defined(HAVE_GETENV)
+    char *term;
+
+    term = getenv("TERM");
+
+    if(!term || !strcmp(term, "linux"))
+        return;
+#endif
+
+    fprintf(stdout, "\x1b]0;%s\x07", str);
+    fflush(stdout);
+}
+