diff options
Diffstat (limited to 'src/interface-curses/interface.c')
| -rw-r--r-- | src/interface-curses/interface.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/interface-curses/interface.c b/src/interface-curses/interface.c index 5984bcb..f713bc1 100644 --- a/src/interface-curses/interface.c +++ b/src/interface-curses/interface.c @@ -276,7 +276,7 @@ teco_xterm_version(void) static void teco_view_scintilla_notify(void *sci, int iMessage, SCNotification *notify, void *user_data) { - teco_interface_process_notify(notify); + teco_view_process_notify((teco_view_t *)sci, notify); } teco_view_t * @@ -575,13 +575,13 @@ teco_interface_init_screen(void) if (isatty(1)) { teco_interface.stdout_orig = dup(1); g_assert(teco_interface.stdout_orig >= 0); - FILE *stdout_new = g_freopen("/dev/null", "a+", stdout); + G_GNUC_UNUSED FILE *stdout_new = g_freopen("/dev/null", "a+", stdout); g_assert(stdout_new != NULL); } if (isatty(2)) { teco_interface.stderr_orig = dup(2); g_assert(teco_interface.stderr_orig >= 0); - FILE *stderr_new = g_freopen("/dev/null", "a+", stderr); + G_GNUC_UNUSED FILE *stderr_new = g_freopen("/dev/null", "a+", stderr); g_assert(stderr_new != NULL); } } @@ -1706,15 +1706,15 @@ teco_interface_event_loop_iter(void) return; #ifdef __PDCURSES__ - /* - * Especially PDCurses/WinGUI likes to report two keypresses, - * e.g. for CTRL+Shift+6 (CTRL+^). - * Make sure we don't filter out AltGr, which may be reported as CTRL+ALT. - */ - if ((PDC_get_key_modifiers() & - (PDC_KEY_MODIFIER_CONTROL | PDC_KEY_MODIFIER_ALT)) == PDC_KEY_MODIFIER_CONTROL && - !TECO_IS_CTL(key)) - return; + /* + * Especially PDCurses/WinGUI likes to report two keypresses, + * e.g. for CTRL+Shift+6 (CTRL+^). + * Make sure we don't filter out AltGr, which may be reported as CTRL+ALT. + */ + if ((PDC_get_key_modifiers() & + (PDC_KEY_MODIFIER_CONTROL | PDC_KEY_MODIFIER_ALT)) == PDC_KEY_MODIFIER_CONTROL && + !TECO_IS_CTL(key)) + return; #endif /* @@ -1723,10 +1723,10 @@ teco_interface_event_loop_iter(void) */ keybuf[keybuf_i++] = key; gsize len = keybuf_i; - gunichar cp = g_utf8_get_char_validated(keybuf, len); - if (keybuf_i >= sizeof(keybuf) || cp != (gunichar)-2) + gint32 cp = *keybuf ? g_utf8_get_char_validated(keybuf, len) : 0; + if (keybuf_i >= sizeof(keybuf) || cp != -2) keybuf_i = 0; - if ((gint32)cp < 0) + if (cp < 0) /* incomplete or invalid */ return; switch (teco_cmdline_keymacro(keybuf, len, error)) { |