diff options
| author | Petr Uzel | 2012-05-15 10:49:03 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-05-15 11:32:53 +0200 |
| commit | e872e32064b9ade685417f6a36af08dc2baa8694 (patch) | |
| tree | 1057c8638d5b6d9a94363c73aed5bbc7550b6641 | |
| parent | libuuid: move read_all to include/all-io.h (diff) | |
| download | kernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.tar.gz kernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.tar.xz kernel-qcow2-util-linux-e872e32064b9ade685417f6a36af08dc2baa8694.zip | |
include: move get_terminal_width() to ttyutils.h
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
| -rw-r--r-- | include/ttyutils.h | 29 | ||||
| -rw-r--r-- | lib/tt.c | 28 |
2 files changed, 30 insertions, 27 deletions
diff --git a/include/ttyutils.h b/include/ttyutils.h index f638aa0d9..15809e85a 100644 --- a/include/ttyutils.h +++ b/include/ttyutils.h @@ -1,7 +1,11 @@ #ifndef UTIL_LINUX_TTYUTILS_H #define UTIL_LINUX_TTYUTILS_H +#include <stdlib.h> #include <termios.h> +#ifdef HAVE_SYS_IOCTL_H +#include <sys/ioctl.h> +#endif #define UL_TTY_KEEPCFLAGS (1 << 1) #define UL_TTY_UTF8 (1 << 2) @@ -74,4 +78,29 @@ static inline void reset_virtual_console(struct termios *tp, int flags) tp->c_cc[VEOL2] = _POSIX_VDISABLE; } +static inline int get_terminal_width(void) +{ +#ifdef TIOCGSIZE + struct ttysize t_win; +#endif +#ifdef TIOCGWINSZ + struct winsize w_win; +#endif + const char *cp; + +#ifdef TIOCGSIZE + if (ioctl (0, TIOCGSIZE, &t_win) == 0) + return t_win.ts_cols; +#endif +#ifdef TIOCGWINSZ + if (ioctl (0, TIOCGWINSZ, &w_win) == 0) + return w_win.ws_col; +#endif + cp = getenv("COLUMNS"); + if (cp) + return strtol(cp, NULL, 10); + return 0; +} + + #endif /* UTIL_LINUX_TTYUTILS_H */ @@ -16,15 +16,13 @@ #include <string.h> #include <termios.h> #include <ctype.h> -#ifdef HAVE_SYS_IOCTL_H -#include <sys/ioctl.h> -#endif #include "c.h" #include "nls.h" #include "widechar.h" #include "tt.h" #include "mbsalign.h" +#include "ttyutils.h" struct tt_symbols { const char *branch; @@ -253,30 +251,6 @@ int tt_line_set_data(struct tt_line *ln, int colnum, const char *data) return 0; } -static int get_terminal_width(void) -{ -#ifdef TIOCGSIZE - struct ttysize t_win; -#endif -#ifdef TIOCGWINSZ - struct winsize w_win; -#endif - const char *cp; - -#ifdef TIOCGSIZE - if (ioctl (0, TIOCGSIZE, &t_win) == 0) - return t_win.ts_cols; -#endif -#ifdef TIOCGWINSZ - if (ioctl (0, TIOCGWINSZ, &w_win) == 0) - return w_win.ws_col; -#endif - cp = getenv("COLUMNS"); - if (cp) - return strtol(cp, NULL, 10); - return 0; -} - int tt_line_set_userdata(struct tt_line *ln, void *data) { if (!ln) |