diff options
Diffstat (limited to 'osdep/getch2.c')
-rw-r--r-- | osdep/getch2.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/osdep/getch2.c b/osdep/getch2.c index 8b87e79c76..e3b1179fdf 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -30,11 +30,11 @@ #include <errno.h> #include <sys/ioctl.h> -#ifdef HAVE_TERMIOS -#ifdef HAVE_TERMIOS_H +#if HAVE_TERMIOS +#if HAVE_TERMIOS_H #include <termios.h> #endif -#ifdef HAVE_SYS_TERMIOS_H +#if HAVE_SYS_TERMIOS_H #include <sys/termios.h> #endif #endif @@ -47,7 +47,7 @@ #include "mpvcore/input/keycodes.h" #include "getch2.h" -#ifdef HAVE_TERMIOS +#if HAVE_TERMIOS static volatile struct termios tio_orig; static volatile int tio_orig_set; #endif @@ -71,12 +71,13 @@ typedef struct { static keycode_map getch2_keys; -#ifdef HAVE_TERMCAP +#if HAVE_TERMINFO || HAVE_TERMCAP + static char *term_rmkx = NULL; static char *term_smkx = NULL; -#ifdef HAVE_TERMINFO +#if HAVE_TERMINFO #include <curses.h> #endif #include <term.h> @@ -138,7 +139,7 @@ static keycode_st* keys_push_once(char *p, int code) { return st; } -#ifdef HAVE_TERMCAP +#if HAVE_TERMINFO || HAVE_TERMCAP typedef struct { char *buf; @@ -228,9 +229,9 @@ static void termcap_add_extra_f_keys(void) { #endif int load_termcap(char *termtype){ -#ifdef HAVE_TERMCAP +#if HAVE_TERMINFO || HAVE_TERMCAP -#ifdef HAVE_TERMINFO +#if HAVE_TERMINFO use_env(TRUE); int ret; if (setupterm(termtype, 1, &ret) != OK) { @@ -445,12 +446,12 @@ static void do_activate_getch2(void) if (getch2_active) return; -#ifdef HAVE_TERMCAP +#if HAVE_TERMINFO || HAVE_TERMCAP if (term_smkx) tputs(term_smkx, 1, putchar); #endif -#ifdef HAVE_TERMIOS +#if HAVE_TERMIOS struct termios tio_new; tcgetattr(0,&tio_new); @@ -473,12 +474,12 @@ static void do_deactivate_getch2(void) if (!getch2_active) return; -#ifdef HAVE_TERMCAP +#if HAVE_TERMINFO || HAVE_TERMCAP if (term_rmkx) tputs(term_rmkx, 1, putchar); #endif -#ifdef HAVE_TERMIOS +#if HAVE_TERMIOS if (tio_orig_set) { // once set, it will never be set again // so we can cast away volatile here |