Ticket #40: ime.diff

configure.cmd

@@ -902 +902 @@
 
     G.QCONFIG_FLAGS = Join(G.QCONFIG_FLAGS,,
         "QT_NO_TABLET QT_NO_SYSTEMSEMAPHORE QT_NO_SHAREDMEMORY",
-        "QT_NO_IM QT_NO_LPR")
+        "QT_NO_LPR")
 
     G.CFG_PHONON = "no"
     G.CFG_MULTIMEDIA = "no"

src/gui/kernel/qapplication_pm.cpp

@@ -65 +65 @@
 #include "qcursor_p.h"
 #include "qdnd_p.h"
 
+
+
+
+
+
 #define WM_KBDLAYERCHANGED   0x0BD4 // defined in OS2TK45/h/pmbidi.h
 
 //#define QT_DEBUGMSGFLOW
@@ -394 +399 @@
 
     if (QApplication::desktopSettingsAware())
         qt_set_pm_resources();
+
+
+
+
 }
 
 /*****************************************************************************
@@ -422 +431 @@
            qt_total_blit_ms, qt_total_blit_pixels,
            qt_total_blit_pixels / qt_total_blit_ms);
 #endif
+
+
+
+
+
 }
 
 /*****************************************************************************
@@ -1034 +1048 @@
             }
 
             case WM_QUERYCONVERTPOS: { // IME input box position request
-                // @todo the proper detection of the caret position in the
-                // current widget requires implementing QInputContext. For now,
-                // just send the IME box to the lower left corner of the
-                // top-level window
                 PRECTL pcp = (PRECTL)mp1;
                 memset(pcp, 0xFF, sizeof(RECTL));
                 pcp->xLeft = 0;
                 pcp->yBottom = 0;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 return (MRESULT)QCP_CONVERT;
             }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             case WM_PAINT: { // paint event
                 if (widget->translatePaintEvent(qmsg))
                     return (MRESULT)TRUE;

src/gui/inputmethod/qos2inputcontext_pm.cpp

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/gui/inputmethod/inputmethod.pri

@@ -15 +15 @@
     HEADERS += inputmethod/qwininputcontext_p.h
     SOURCES += inputmethod/qwininputcontext_win.cpp
 }
+
+
+
+
 embedded {
     HEADERS += inputmethod/qwsinputcontext_p.h
     SOURCES += inputmethod/qwsinputcontext_qws.cpp

src/gui/inputmethod/qinputcontextfactory.cpp

@@ -68 +68 @@
 #ifdef Q_WS_WIN
 #include "qwininputcontext_p.h"
 #endif
+
+
+
 #ifdef Q_WS_MAC
 #include "qmacinputcontext_p.h"
 #endif
@@ -143 +146 @@
         result = new QWinInputContext;
     }
 #endif
+
+
+
+
+
 #if defined(Q_WS_MAC)
     if (key == QLatin1String("mac")) {
         result = new QMacInputContext;
@@ -187 +195 @@
 #if defined(Q_WS_WIN) && !defined(QT_NO_XIM)
     result << QLatin1String("win");
 #endif
+
+
+
 #if defined(Q_WS_MAC)
     result << QLatin1String("mac");
 #endif
@@ -260 +271 @@
     if (key == QLatin1String("win"))
         return QStringList(QString());
 #endif
+
+
+
+
 #if defined(Q_WS_MAC)
     if (key == QLatin1String("mac"))
         return QStringList(QString());
@@ -331 +346 @@
     if (key == QLatin1String("win"))
         return QInputContext::tr( "Windows input method" );
 #endif
+
+
+
+
 #if defined(Q_WS_MAC)
     if (key == QLatin1String("mac"))
         return QInputContext::tr( "Mac OS X input method" );

src/gui/inputmethod/qos2inputcontext_p.h

@@ +1 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

include/QtGui/private/qos2inputcontext_p.h

@@ +1 @@
+