From b55ac81f5130563949db0c8120a08b42fcdf5547 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Tue, 11 Jan 2011 16:43:52 +0000 Subject: Attempt to fix the dead_key/special_key issue. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8259 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_win32.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 272aad33c..954b599f4 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1068,12 +1068,14 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar } } } else if ((lParam & (1<<31))==0){ - //buffer[0] = 0; - //Fl::e_length = 0; - xchar u = (xchar) wParam; -// Fl::e_length = fl_unicode2utf(&u, 1, buffer); - Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); - buffer[Fl::e_length] = 0; + if ((lParam & (1<<24))==0) { // clear if dead key (always?) + xchar u = (xchar) wParam; + Fl::e_length = fl_utf8fromwc(buffer, 1024, &u, 1); + buffer[Fl::e_length] = 0; + } else { // set if "extended key" (never printable?) + buffer[0] = 0; + Fl::e_length = 0; + } } Fl::e_text = buffer; if (lParam & (1<<31)) { // key up events. -- cgit v1.2.3