Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-08 01:46:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

To fix STR #2452

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7878 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2010-11-20 12:59:39 +00:00
parent 523d2c79d0
commit 0b7e706de9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_compose.cxx
+8 -8
View File
@@ -46,25 +46,25 @@ int Fl::compose_state = 0;
#if defined(__APPLE__) || defined(WIN32)
// under Mac OS X and MS Windows, character composition is handled by the OS
int Fl::compose(int& del) {
del = 0;
#ifdef WIN32
unsigned char ascii = (unsigned)e_text[0];
if ((e_state & (FL_ALT|FL_META)) && !(ascii & 128)) return 0;
#elif defined(__APPLE__)
// this stuff is to be treated as a function key
if(Fl::e_length == 0 || Fl::e_keysym == FL_Enter || Fl::e_keysym == FL_KP_Enter ||
Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape || Fl::e_state&FL_META || Fl::e_state&FL_CTRL
#ifdef WIN32
|| Fl::e_state&FL_ALT
#endif
) {
del = 0;
Fl::e_keysym == FL_Tab || Fl::e_keysym == FL_Escape || Fl::e_state&FL_META || Fl::e_state&FL_CTRL ) {
return 0;
}
#endif
if(Fl::compose_state) {
del = 1;
Fl::compose_state = 0;
}
else {
del = 0;
#ifdef WIN32
// Only insert non-control characters:
if (!( e_text[0] & ~31 && e_text[0] != 127) ) { return 0; }
if (! (ascii & ~31 && ascii!=127)) { return 0; }
#endif
}
return 1;