From ad8d7c4b87f8a8c17752d8ae9b091fd37fa338a4 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 19 Jun 2006 07:43:39 +0000 Subject: Fixed key compose sequences for shifted keys (STR #1194) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5211 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 2 ++ src/Fl_compose.cxx | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/CHANGES b/CHANGES index c1eb46c51..cc3e3735d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.8 + - Fixed key compose sequences for + shifted keys (STR #1194) - Added text selection and copy to Fl_Help_View. - Fixed position of popup menu titles (STR #1322) - Showing any window will disable the current tooltip diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index 40ad74ec1..684f2fd9b 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -105,6 +105,17 @@ int Fl::compose(int& del) { #endif // __APPLE__ if (compose_state == 1) { // after the compose key + if ( // do not get distracted by any modifier keys + e_keysym==FL_Shift_L|| + e_keysym==FL_Shift_R || + e_keysym==FL_Alt_L || + e_keysym==FL_Alt_R || + e_keysym==FL_Meta_L || + e_keysym==FL_Meta_R || + e_keysym==FL_Control_R || + e_keysym==FL_Control_L || + e_keysym==FL_Menu + ) return 0; if (ascii == ' ') { // space turns into nbsp #ifdef __APPLE__ -- cgit v1.2.3