Applied another Unicode patch from Keita Mochizuki.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402362

dlib/gui_core/gui_core_kernel_1.cpp

@@ -1950,6 +1950,24 @@ namespace dlib
         }
     }
 
+// ----------------------------------------------------------------------------------------
+
+    void base_window::
+    set_im_pos (
+        long x,
+        long y
+    )
+    {
+        HIMC hImc = ImmGetContext(hwnd);
+
+        COMPOSITIONFORM cf;
+        cf.dwStyle = CFS_POINT;
+        cf.ptCurrentPos.x = x;
+        cf.ptCurrentPos.y = y;
+        ImmSetCompositionWindow(hImc, &cf);
+        ImmReleaseContext(hwnd, hImc);
+    }
+
 // ----------------------------------------------------------------------------------------
 
     void put_on_clipboard (

dlib/gui_core/gui_core_kernel_1.h

@@ -254,6 +254,11 @@ namespace dlib
         void wait_until_closed (
         ) const;
 
+        void set_im_pos (
+            long x_,
+            long y_
+        );
+
         enum on_close_return_code
         {
             DO_NOT_CLOSE_WINDOW,

dlib/gui_core/gui_core_kernel_2.cpp

@@ -23,6 +23,7 @@
 #include "../sync_extension.h"
 #include "../logger.h"
 #include <vector>
+#include <set>
 
 namespace dlib
 {
@@ -47,7 +48,8 @@ namespace dlib
 
         int depth;
         Display* disp;
-        XIM xim;
+        static XIM xim;
+        static XIMStyle xim_style;
         static Screen* screen;
 
         Atom delete_window; 
@@ -529,6 +531,7 @@ namespace dlib
                             KeySym key;
                             Status status;
 
+                            if (win->x11_stuff.xic) {
                                 std::wstring wstr;
                                 wstr.resize(2);
                                 int len = XwcLookupString(win->x11_stuff.xic,e,&wstr[0],wstr.size(),&key,&status);
@@ -539,8 +542,13 @@ namespace dlib
                                 if (status == XLookupChars){
                                     win->on_string_put(wstr);
                                 }
+                            } else {
+                                char buffer[2];
+                                XLookupString(e, buffer, sizeof(buffer), &key, NULL);
+                                status = XLookupKeySym;
+                            }
 
-                            else if (status == XLookupKeySym || status == XLookupBoth){
+                            if (status == XLookupKeySym || status == XLookupBoth){
 
                                 bool is_printable;
                                 unsigned long result;
@@ -1102,6 +1110,32 @@ namespace dlib
                     }
                     window_table.get_mutex().unlock();
 
+                    if (xim)
+                    {
+                        const static XIMStyle preedit_styles[] =
+                            {XIMPreeditPosition, XIMPreeditNothing, XIMPreeditNone, 0};
+                        const static XIMStyle status_styles[] =
+                            {XIMStatusNothing, XIMStatusNone, 0};
+                        xim_style = 0;
+
+                        XIMStyles *xim_styles;
+                        window_table.get_mutex().lock();
+
+                        XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL);
+                        window_table.get_mutex().unlock();
+                        std::set<XIMStyle> xims;
+                        for (int i = 0; i < xim_styles->count_styles; ++i){
+                            xims.insert(xim_styles->supported_styles[i]);
+                        }
+                        for (int j = 0; status_styles[j]; ++j){
+                            for (int i = 0; preedit_styles[i]; ++i){
+                                xim_style = (status_styles[j] | preedit_styles[i]);
+                                if (xims.count(xim_style)) break;
+                            }
+                            if (xim_style) break;
+                        }
+                    }
+
                     // make this window just so we can send messages to it and trigger
                     // events in the event thread
                     XSetWindowAttributes attr;
@@ -1528,12 +1562,26 @@ namespace dlib
         x11_stuff.xic = NULL;
         if (gui_core_kernel_2_globals::xim)
         {
+            XVaNestedList   xva_nlist;
+            XPoint          xpoint;
+
+            char **mlist;
+            int mcount;
+            char *def_str;
+            char fontset[256];
+            sprintf(fontset, "-*-*-medium-r-normal--%lu-*-*-*-", get_native_font()->height());
+            XFontSet fs = XCreateFontSet(gui_core_kernel_2_globals::disp, fontset, &mlist, &mcount, &def_str);
+            xpoint.x = 0;
+            xpoint.y = 0;
+            xva_nlist = XVaCreateNestedList(0, XNSpotLocation, &xpoint, XNFontSet, fs, NULL);
             x11_stuff.xic = XCreateIC(
                 gui_core_kernel_2_globals::xim,
-                XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                XNInputStyle, gui_core_kernel_2_globals::xim_style,
                 XNClientWindow, x11_stuff.hwnd,
+                XNPreeditAttributes, xva_nlist,
                 NULL
                 );
+            XFree(xva_nlist);
         }
 
         Window temp = x11_stuff.hwnd;
@@ -1542,6 +1590,7 @@ namespace dlib
         
         // query event mask required by input method
         unsigned long event_xim = 0;
+        if (x11_stuff.xic)
              XGetICValues( x11_stuff.xic, XNFilterEvents, &event_xim, NULL );
         
         XSelectInput(
@@ -1601,9 +1650,11 @@ namespace dlib
             has_been_destroyed = true;
 
             gui_core_kernel_2_globals::window_table.destroy(x11_stuff.hwnd);           
-
+            if (x11_stuff.xic)
+            {
                 XDestroyIC(x11_stuff.xic);
                 x11_stuff.xic = 0;
+            }
 
             XDestroyWindow(gui_core_kernel_2_globals::disp,x11_stuff.hwnd);
             x11_stuff.hwnd = 0;
@@ -1864,6 +1915,28 @@ namespace dlib
         }
     }
 
+// ----------------------------------------------------------------------------------------
+
+    void base_window::
+    set_im_pos (
+        long x,
+        long y
+    )
+    {
+        auto_mutex a(wm);
+        if (!x11_stuff.xic || !(gui_core_kernel_2_globals::xim_style & XIMPreeditPosition)) return;
+
+        XVaNestedList   xva_nlist;
+        XPoint          xpoint;
+
+        xpoint.x = x;
+        xpoint.y = y;
+
+        xva_nlist = XVaCreateNestedList(0, XNSpotLocation, &xpoint, NULL);
+        XSetICValues(x11_stuff.xic, XNPreeditAttributes, xva_nlist, NULL);
+        XFree(xva_nlist);
+    }
+
 }
 
 // ----------------------------------------------------------------------------------------

dlib/gui_core/gui_core_kernel_2.h

@@ -262,6 +262,11 @@ namespace dlib
         void wait_until_closed (
         ) const;
 
+        void set_im_pos (
+            long x_,
+            long y_
+        );
+
         bool is_closed (
         ) const;
 

dlib/gui_core/gui_core_kernel_abstract.h

@@ -498,6 +498,16 @@ namespace dlib
                       the given arguments.
         !*/
 
+        void set_im_pos (
+            long x_,
+            long y_
+        );
+        /*!
+            ensures
+                - sets the left-top position of input method rectangle used
+                  for wide character input methods.
+        !*/
+
     protected:
         const rmutex& wm;
 

dlib/gui_widgets/nativefont.h

@@ -2,6 +2,8 @@
 // License: Boost Software License   See LICENSE.txt for the full license.
 #ifndef DLIB_IGG_FONT_RENDERER_H_
 #define DLIB_IGG_FONT_RENDERER_H_
+#include "../platform.h"
+
 
 #include "../gui_widgets.h"
 #include "../unicode.h"
@@ -13,10 +15,10 @@
 #include <stdlib.h>
 #include <locale.h>
 
-#ifdef WIN32
+#if defined(WIN32)
 #include <windows.h>
 #include <mbstring.h>
-#else
+#elif defined(POSIX)
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -116,7 +118,6 @@ namespace nativefont
                     }
                 }
                 istr[len] = L'\0';
-                        //                      printf("unicount:%d, len:%d wcslen:%d\n", unicount, len, wcslen(istr));
             }
 
             ~create_helper(){
@@ -130,7 +131,6 @@ namespace nativefont
             create_helper(dlib::unichar *str){
                 len = (int)wcslen((wchar_t *)str);
                 istr = (type_t *)str;
-                        //                      printf("len:%d\n", len);
             }
             ~create_helper(){}
         };
@@ -298,7 +298,7 @@ namespace nativefont
                 ~vals_internal(){
                     destroy();
                 }
-#else
+#elif defined(POSIX)
                 XImage *ximg;
                 Display *d;
                 GC gc;
@@ -588,13 +588,6 @@ namespace nativefont
 // ----------------------------------------------------------------------------------------
 
 }
-// history
-// 2006/07/10 ver 1.10 Win32 と X11 で共通している部分の重複を無くした
-// 2007/08/15 dlib用に修正
-// 2007/12/16 unicode(UTF32)に対応した
-// 2008/01/02 ver 2.00 dlib ver 16.1 で任意のフォントクラスをアプリケーション側で
-//            指定できるようになり、dlibとこのクラスを分離して扱えるよう
-//            になった。この変更に合わせて、名前空間を変更した。
 
 #endif // DLIB_IGG_FONT_RENDERER_H_
 

dlib/gui_widgets/widgets.cpp

@@ -1410,6 +1410,8 @@ namespace dlib
             mfont->compute_size(text_,text_width,height,text_pos);
         }
 
+        parent.set_im_pos(rect.left()+cursor_x, rect.top());
+
         if (old_cursor_pos != cursor_pos)
         {
             if (shift_pos != -1)