diff options
author | Pierre Ossman <ossman@cendio.se> | 2011-04-11 11:59:31 +0000 |
---|---|---|
committer | Pierre Ossman <ossman@cendio.se> | 2011-04-11 11:59:31 +0000 |
commit | 89f868a44fa28d9daeb4070faa0f25d47db91fb1 (patch) | |
tree | c03b710f71c3c7a57125fe1910dbe80ce28c3cb9 /vncviewer/DesktopWindow.cxx | |
parent | c583c044c9cc4b89b36d43dd3795a52c1ef93ef4 (diff) | |
download | tigervnc-89f868a44fa28d9daeb4070faa0f25d47db91fb1.tar.gz tigervnc-89f868a44fa28d9daeb4070faa0f25d47db91fb1.zip |
Handle dead keys more properly (through some fixing in FLTK).
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4365 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer/DesktopWindow.cxx')
-rw-r--r-- | vncviewer/DesktopWindow.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx index a621e405..113b8801 100644 --- a/vncviewer/DesktopWindow.cxx +++ b/vncviewer/DesktopWindow.cxx @@ -38,6 +38,11 @@ #include "parameters.h" #include "keysym2ucs.h" +// FLTK STR #2599 must be fixed for proper dead keys support +#ifndef HAVE_FLTK_DEAD_KEYS +#define event_compose_symbol event_text +#endif + using namespace rfb; extern void exit_vncviewer(); @@ -210,11 +215,11 @@ int DesktopWindow::handle(int event) return 1; case FL_KEYDOWN: - handleKeyEvent(Fl::event_key(), Fl::event_text(), true); + handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), true); return 1; case FL_KEYUP: - handleKeyEvent(Fl::event_key(), Fl::event_text(), false); + handleKeyEvent(Fl::event_key(), Fl::event_compose_symbol(), false); return 1; } |