From e4ed98589459018a8b4fc9eb35a5cf22e3e93396 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Thu, 21 Feb 2013 23:49:24 +0100 Subject: function key macro support for GTK+ interface * also revised the way in which unhandled keys are interpreted (use gdk_keyval_to_unicode() instead of deprecated GdkEventKey::string) * keep in sync with Curses key handling --- src/interface-ncurses.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/interface-ncurses.cpp') diff --git a/src/interface-ncurses.cpp b/src/interface-ncurses.cpp index 3458813..b0a5276 100644 --- a/src/interface-ncurses.cpp +++ b/src/interface-ncurses.cpp @@ -401,9 +401,9 @@ InterfaceNCurses::event_loop(void) * Function key macros */ #define FN(KEY) case KEY_##KEY: cmdline_fnmacro(#KEY); break - FN(DOWN); FN(UP); FN(LEFT); FN(RIGHT); - FN(SLEFT); FN(SRIGHT); - FN(HOME); FN(SHOME); +#define FNS(KEY) FN(KEY); FN(S##KEY) + FN(DOWN); FN(UP); FNS(LEFT); FNS(RIGHT); + FNS(HOME); case KEY_F(0)...KEY_F(63): { gchar macro_name[3+1]; @@ -412,14 +412,14 @@ InterfaceNCurses::event_loop(void) cmdline_fnmacro(macro_name); break; } - FN(DC); FN(SDC); - FN(IC); FN(SIC); + FNS(DC); + FNS(IC); FN(NPAGE); FN(PPAGE); - FN(PRINT); FN(SPRINT); + FNS(PRINT); FN(A1); FN(A3); FN(B2); FN(C1); FN(C3); - FN(COMMAND); FN(SCOMMAND); - FN(END); FN(SEND); - FN(HELP); FN(SHELP); + FNS(END); + FNS(HELP); +#undef FNS #undef FN /* -- cgit v1.2.3