diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2011-01-11 16:43:52 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2011-01-11 16:43:52 +0000 |
| commit | b55ac81f5130563949db0c8120a08b42fcdf5547 (patch) | |
| tree | d756d74cb2366a571e6775401c216777110d6991 /src | |
| parent | 7ada14f3b7a52b90ef5d146ec33cfb6cd32c5714 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_win32.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
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. |
