aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Resize fixes. Now SIGWINCH only sets a flag that a resize check is needed.

Browse Source 
Resizes are checked/done 2 times a second.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1671 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-07-29 02:25:55 +00:00 committed by cras
parent 97fa63a569
commit d06cd9ddbb
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/fe-text/screen.c
View File

@ -42,6 +42,12 @@
# define COLOR_PAIRS 64 # define COLOR_PAIRS 64
#endif #endif
#if defined (TIOCGWINSZ) && defined (HAVE_CURSES_RESIZETERM)
# define USE_RESIZE_TERM
#endif
#define RESIZE_TIMEOUT 500 /* how often to check if the terminal has been resized */
#define MIN_SCREEN_WIDTH 20 #define MIN_SCREEN_WIDTH 20
struct _SCREEN_WINDOW { struct _SCREEN_WINDOW {
@ -60,18 +66,28 @@ static void deinit_screen_int(void);
#ifdef SIGWINCH #ifdef SIGWINCH
static void sig_winch(int p) static int resize_timeout_tag, resize_needed;
static int resize_timeout(void)
{ {
#if defined (TIOCGWINSZ) && defined (HAVE_CURSES_RESIZETERM) #ifdef USE_RESIZE_TERM
struct winsize ws; struct winsize ws;
#endif
if (!resize_needed)
return TRUE;
resize_needed = FALSE;
#ifdef USE_RESIZE_TERM
/* Get new window size */ /* Get new window size */
if (ioctl(0, TIOCGWINSZ, &ws) < 0) if (ioctl(0, TIOCGWINSZ, &ws) < 0)
return; return TRUE;
if (ws.ws_row == LINES && ws.ws_col == COLS) { if (ws.ws_row == LINES && ws.ws_col == COLS) {
/* Same size, abort. */ /* Same size, abort. */
return; return TRUE;
} }
if (ws.ws_col < MIN_SCREEN_WIDTH) if (ws.ws_col < MIN_SCREEN_WIDTH)
@ -79,16 +95,22 @@ static void sig_winch(int p)
/* Resize curses terminal */ /* Resize curses terminal */
resizeterm(ws.ws_row, ws.ws_col); resizeterm(ws.ws_row, ws.ws_col);
screen_width = COLS;
screen_height = LINES;
#else #else
deinit_screen_int(); deinit_screen_int();
init_screen_int(); init_screen_int();
mainwindows_recreate(); mainwindows_recreate();
#endif #endif
screen_width = COLS;
screen_height = LINES;
mainwindows_resize(COLS, LINES); mainwindows_resize(COLS, LINES);
return TRUE;
}
static void sig_winch(int p)
{
resize_needed = TRUE;
} }
#endif #endif
@ -108,7 +130,7 @@ static int init_curses(void)
{ {
char ansi_tab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 }; char ansi_tab[8] = { 0, 4, 2, 6, 1, 5, 3, 7 };
int num; int num;
#ifndef WIN32 #if !defined (WIN32) && defined(SIGWINCH)
struct sigaction act; struct sigaction act;
#endif #endif
@ -189,6 +211,10 @@ int init_screen(void)
signal_add("beep", (SIGNAL_FUNC) beep); signal_add("beep", (SIGNAL_FUNC) beep);
signal_add("setup changed", (SIGNAL_FUNC) read_settings); signal_add("setup changed", (SIGNAL_FUNC) read_settings);
#ifdef SIGWINCH
resize_timeout_tag = g_timeout_add(RESIZE_TIMEOUT,
(GSourceFunc) resize_timeout, NULL);
#endif
return init_screen_int(); return init_screen_int();
} }
@ -197,6 +223,10 @@ void deinit_screen(void)
{ {
deinit_screen_int(); deinit_screen_int();
#ifdef SIGWINCH
g_source_remove(resize_timeout_tag);
#endif
signal_remove("beep", (SIGNAL_FUNC) beep); signal_remove("beep", (SIGNAL_FUNC) beep);
signal_remove("setup changed", (SIGNAL_FUNC) read_settings); signal_remove("setup changed", (SIGNAL_FUNC) read_settings);
} }