emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

watch: remove arbitrary terminal size restriction

Browse Source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-03-08 22:41:23 +01:00
parent 94fa402d4b
commit dbedc905fe
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
watch.c
View File

@ -63,7 +63,7 @@
#endif #endif
static int curses_started = 0; static int curses_started = 0;
static int height = 24, width = 80; static long height = 24, width = 80;
static int screen_size_changed = 0; static int screen_size_changed = 0;
static int first_screen = 1; static int first_screen = 1;
static int show_title = 2; /* number of lines used, 2 or 0 */ static int show_title = 2; /* number of lines used, 2 or 0 */
@ -195,10 +195,10 @@ static void get_terminal_size(void)
long t; long t;
char *endptr; char *endptr;
t = strtol(s, &endptr, 0); t = strtol(s, &endptr, 0);
if (!*endptr && (t > 0) && (t < (long)666)) if (!*endptr && 0 < t)
incoming_cols = (int)t; incoming_cols = t;
width = incoming_cols; width = incoming_cols;
snprintf(env_col_buf, sizeof env_col_buf, "COLUMNS=%d", snprintf(env_col_buf, sizeof env_col_buf, "COLUMNS=%ld",
width); width);
putenv(env_col_buf); putenv(env_col_buf);
} }
@ -211,26 +211,26 @@ static void get_terminal_size(void)
long t; long t;
char *endptr; char *endptr;
t = strtol(s, &endptr, 0); t = strtol(s, &endptr, 0);
if (!*endptr && (t > 0) && (t < (long)666)) if (!*endptr && 0 < t)
incoming_rows = (int)t; incoming_rows = t;
height = incoming_rows; height = incoming_rows;
snprintf(env_row_buf, sizeof env_row_buf, "LINES=%d", snprintf(env_row_buf, sizeof env_row_buf, "LINES=%ld",
height); height);
putenv(env_row_buf); putenv(env_row_buf);
} }
} }
if (incoming_cols < 0 || incoming_rows < 0) { if (ioctl(STDERR_FILENO, TIOCGWINSZ, &w) == 0) {
if (ioctl(STDERR_FILENO, TIOCGWINSZ, &w) == 0) { if (incoming_cols < 0 || incoming_rows < 0) {
if (incoming_rows < 0 && w.ws_row > 0) { if (incoming_rows < 0 && w.ws_row > 0) {
height = w.ws_row; height = w.ws_row;
snprintf(env_row_buf, sizeof env_row_buf, snprintf(env_row_buf, sizeof env_row_buf,
"LINES=%d", height); "LINES=%ld", height);
putenv(env_row_buf); putenv(env_row_buf);
} }
if (incoming_cols < 0 && w.ws_col > 0) { if (incoming_cols < 0 && w.ws_col > 0) {
width = w.ws_col; width = w.ws_col;
snprintf(env_col_buf, sizeof env_col_buf, snprintf(env_col_buf, sizeof env_col_buf,
"COLUMNS=%d", width); "COLUMNS=%ld", width);
putenv(env_col_buf); putenv(env_col_buf);
} }
} }