Changeset 2142 for libcaca/trunk/caca
- Timestamp:
- Dec 16, 2007, 12:55:14 PM (13 years ago)
- Location:
- libcaca/trunk/caca
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
libcaca/trunk/caca/driver_ncurses.c
r2138 r2142 197 197 #endif 198 198 #if defined HAVE_GETENV && defined HAVE_PUTENV 199 static void ncurses_check_terminal(void); 199 static void ncurses_install_terminal(caca_display_t *); 200 static void ncurses_uninstall_terminal(caca_display_t *); 200 201 #endif 201 202 static void ncurses_write_utf32(uint32_t); … … 205 206 int attr[16*16]; 206 207 mmask_t oldmask; 208 char *term; 207 209 }; 208 210 … … 237 239 238 240 #if defined HAVE_GETENV && defined HAVE_PUTENV 239 ncurses_ check_terminal();241 ncurses_install_terminal(dp); 240 242 #endif 241 243 … … 315 317 noraw(); 316 318 endwin(); 319 320 #if defined HAVE_GETENV && defined HAVE_PUTENV 321 ncurses_uninstall_terminal(dp); 322 #endif 317 323 318 324 free(dp->drv.p); … … 562 568 563 569 #if defined HAVE_GETENV && defined HAVE_PUTENV 564 static void ncurses_ check_terminal(void)570 static void ncurses_install_terminal(caca_display_t *dp) 565 571 { 566 572 char *term, *colorterm; 573 574 dp->drv.p->term = NULL; 567 575 568 576 term = getenv("TERM"); … … 584 592 endwin(); 585 593 (void)putenv("TERM=xterm-16color"); 594 dp->drv.p->term = strdup(term); 586 595 return; 587 596 } 597 } 598 599 static void ncurses_uninstall_terminal(caca_display_t *dp) 600 { 601 /* Needs to be persistent because we use putenv() */ 602 static char termenv[1024]; 603 604 if(!dp->drv.p->term) 605 return; 606 607 snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term); 608 free(dp->drv.p->term); 609 (void)putenv(termenv); 588 610 } 589 611 #endif -
libcaca/trunk/caca/driver_slang.c
r2138 r2142 111 111 #endif 112 112 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV) 113 static void slang_check_terminal(void); 114 #endif 113 static void slang_install_terminal(caca_display_t *); 114 static void slang_uninstall_terminal(caca_display_t *); 115 #endif 116 117 struct driver_private 118 { 119 char *term; 120 }; 115 121 116 122 static int slang_init_graphics(caca_display_t *dp) 117 123 { 124 dp->drv.p = malloc(sizeof(struct driver_private)); 125 118 126 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV) 119 slang_ check_terminal();127 slang_install_terminal(dp); 120 128 #endif 121 129 … … 184 192 SLang_reset_tty(); 185 193 SLsmg_reset_smg(); 194 195 #if defined HAVE_GETENV && defined HAVE_PUTENV 196 slang_uninstall_terminal(dp); 197 #endif 198 199 free(dp->drv.p); 186 200 187 201 return 0; … … 495 509 496 510 #if defined(HAVE_GETENV) && defined(HAVE_PUTENV) 497 static void slang_ check_terminal(void)511 static void slang_install_terminal(caca_display_t *dp) 498 512 { 499 513 char *term, *colorterm; 514 515 dp->drv.p->term = NULL; 500 516 501 517 term = getenv("TERM"); … … 512 528 { 513 529 (void)putenv("TERM=xterm-16color"); 530 dp->drv.p->term = strdup(term); 514 531 return; 515 532 } 533 } 534 535 static void slang_uninstall_terminal(caca_display_t *dp) 536 { 537 /* Needs to be persistent because we use putenv() */ 538 static char termenv[1024]; 539 540 if(!dp->drv.p->term) 541 return; 542 543 snprintf(termenv, 1023, "TERM=%s", dp->drv.p->term); 544 free(dp->drv.p->term); 545 (void)putenv(termenv); 516 546 } 517 547 #endif
Note: See TracChangeset
for help on using the changeset viewer.