From 558812966c7c53c4756d3928fd143e8f5cd53b1c Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sun, 16 Dec 2012 10:19:49 +0000 Subject: Mac OS text input: handle modifier keys after dead key. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9758 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_compose.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Fl_compose.cxx b/src/Fl_compose.cxx index 20ff63249..9bda479c4 100644 --- a/src/Fl_compose.cxx +++ b/src/Fl_compose.cxx @@ -51,7 +51,9 @@ int Fl::compose(int& del) { #if defined(__APPLE__) int has_text_key = Fl::compose_state || Fl::e_keysym <= '~' || Fl::e_keysym == FL_Iso_Key || (Fl::e_keysym >= FL_KP && Fl::e_keysym <= FL_KP_Last && Fl::e_keysym != FL_KP_Enter); - if ( Fl::e_state&(FL_META | FL_CTRL) || !has_text_key ) { + if ( Fl::e_state&(FL_META | FL_CTRL) || + (Fl::e_keysym >= FL_Shift_L && Fl::e_keysym <= FL_Alt_R) || // called from flagsChanged + !has_text_key ) { // this stuff is to be treated as a function key return 0; } -- cgit v1.2.3