diff --git a/tts.c b/tts.c index c55c103..a22e3e1 100644 --- a/tts.c +++ b/tts.c @@ -320,7 +320,7 @@ struct kevent evs[2], rev; } #endif - while (input_char(&c) != ERR) { + while (input_char(stdscr, &c) != ERR) { #ifdef KEY_RESIZE if (c == KEY_RESIZE) continue; @@ -737,7 +737,8 @@ input_macro(s) } int -input_char(c) +input_char(win, c) + WINDOW *win; wchar_t *c; { if (macro_pos) { @@ -749,5 +750,5 @@ input_char(c) macro_text = macro_pos = NULL; } - return get_wch(c); + return wget_wch(win, c); } diff --git a/ui.c b/ui.c index 30b00d6..99181f5 100644 --- a/ui.c +++ b/ui.c @@ -177,7 +177,7 @@ wint_t c; waddwstr(pwin, L" [y/N]? "); wattroff(pwin, A_BOLD); - while (input_char(&c) == ERR + while (input_char(pwin, &c) == ERR #ifdef KEY_RESIZE || (c == KEY_RESIZE) #endif @@ -231,7 +231,7 @@ histent_t *histpos = NULL; wmove(pwin, 0, wcslen(msg) + 1 + pos); wrefresh(pwin); - if (input_char(&c) == ERR) + if (input_char(pwin, &c) == ERR) continue; switch (c) { diff --git a/wide.h b/wide.h index 129fb02..dc4ddcb 100644 --- a/wide.h +++ b/wide.h @@ -18,7 +18,7 @@ #define wsizeof(s) (sizeof(s) / sizeof(wchar_t)) -int input_char(wchar_t *); -void input_macro(wchar_t *); +int input_char (WINDOW *, wchar_t *); +void input_macro (wchar_t *); #endif /* !TTS_WIDE_H */