commit 89f868a44fa28d9daeb4070faa0f25d47db91fb1
author Pierre Ossman <ossman@cendio.se> Mon Apr 11 11:59:31 2011 +0000
committer Pierre Ossman <ossman@cendio.se> Mon Apr 11 11:59:31 2011 +0000
tree c03b710f71c3c7a57125fe1910dbe80ce28c3cb9
parent c583c044c9cc4b89b36d43dd3795a52c1ef93ef4

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

vncviewer/DesktopWindow.cxx

diff --git a/vncviewer/DesktopWindow.cxx b/vncviewer/DesktopWindow.cxx
index a621e40..113b880 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 @@
     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;
   }