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

Fix STR #2587: under Xlib, the X input method must be reset by the Fl::compose_reset() function.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8522 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2011-03-21 16:32:37 +00:00
parent a36bca971a
commit dfc067ecfc
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl.H
+1 -7
View File
@@ -678,13 +678,7 @@ public:
static int event_length() {return e_length;}
static int compose(int &del);
/**
If the user moves the cursor, be sure to call Fl::compose_reset().
The next call to Fl::compose() will start out in an initial state. In
particular it will not set "del" to non-zero. This call is very fast
so it is ok to call it many times and in many places.
*/
static void compose_reset() {compose_state = 0;}
static void compose_reset();
static int event_inside(int,int,int,int);
static int event_inside(const Fl_Widget*);
static int test_shortcut(Fl_Shortcut);
src/Fl_compose.cxx
+18
View File
@@ -33,6 +33,10 @@
int Fl::compose_state = 0;
#endif
#if !defined(WIN32) && !defined(__APPLE__)
extern XIC fl_xim_ic;
#endif
/** Any text editing widget should call this for each FL_KEYBOARD event.
Use of this function is very simple.
@@ -76,6 +80,20 @@ int Fl::compose(int& del) {
return 1;
}
/**
If the user moves the cursor, be sure to call Fl::compose_reset().
The next call to Fl::compose() will start out in an initial state. In
particular it will not set "del" to non-zero. This call is very fast
so it is ok to call it many times and in many places.
*/
void Fl::compose_reset()
{
Fl::compose_state = 0;
#if !defined(WIN32) && !defined(__APPLE__)
if (fl_xim_ic) XmbResetIC(fl_xim_ic);
#endif
}
//
// End of "$Id$"
//