summaryrefslogtreecommitdiff
path: root/src/Fl_compose.cxx
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2006-06-19 07:43:39 +0000
committerMatthias Melcher <fltk@matthiasm.com>2006-06-19 07:43:39 +0000
commitad8d7c4b87f8a8c17752d8ae9b091fd37fa338a4 (patch)
treee15b496a40bb57e43275dbd0e1ff989c596cfa6c /src/Fl_compose.cxx
parent855e42c20f5302c094a3a854043694364414f979 (diff)
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
Diffstat (limited to 'src/Fl_compose.cxx')
-rw-r--r--src/Fl_compose.cxx11
1 files changed, 11 insertions, 0 deletions
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__