Commit: 21d033997577184c47c3938e99cab1e466961aa1 - uim (git)

A multilingual input method framework

Commit MetaInfo

• Revision: 21d033997577184c47c3938e99cab1e466961aa1 (tree)
• Time: 2006-06-06 20:12:16
• Author: ekato <ekato@ff9a...>
• Commiter: ekato

Log Message

* qt/immodule-qhelpermanager.{cpp,h}
* qt/immodule-quiminputcontext.{cpp.h}

- Merge r3565:3567 from trunk.

Change Summary

• modified: qt/immodule-qhelpermanager.cpp
• modified: qt/immodule-qhelpermanager.h
• modified: qt/immodule-quiminputcontext.cpp
• modified: qt/immodule-quiminputcontext.h

Incremental Difference

--- a/qt/immodule-qhelpermanager.cpp
+++ b/qt/immodule-qhelpermanager.cpp
@@ -168,6 +168,7 @@ void QUimHelperManager::parseHelperStrImChange( const QString &str )
     QUimInputContext * cc;
     QStringList list = QStringList::split( "\n", str );
     QString im_name = list[ 1 ];
+    QString im_name_sym = "'" + im_name;
 
     if ( str.startsWith( "im_change_this_text_area_only" ) )
     {
@@ -184,6 +185,9 @@ void QUimHelperManager::parseHelperStrImChange( const QString &str )
         {
             uim_switch_im( cc->uimContext(), ( const char* ) im_name );
             cc->readIMConf();
+            uim_prop_update_custom( cc->uimContext(),
+	                            "custom-preserved-default-im-name",
+				    ( const char* ) im_name_sym );
         }
     }
     else if ( str.startsWith( "im_change_this_application_only" ) )
@@ -194,6 +198,9 @@ void QUimHelperManager::parseHelperStrImChange( const QString &str )
             {
                 uim_switch_im( cc->uimContext(), ( const char* ) im_name );
                 cc->readIMConf();
+                uim_prop_update_custom( cc->uimContext(),
+                                        "custom-preserved-default-im-name",
+                                        ( const char* ) im_name_sym );
             }
         }
     }
@@ -227,6 +234,14 @@ void QUimHelperManager::sendImList()
     uim_helper_send_message( im_uim_fd, ( const char* ) msg.utf8() );
 }
 
+void QUimHelperManager::send_im_change_whole_desktop( const char *name )
+{
+    QString msg;
+
+    msg.sprintf("im_change_whole_desktop\n%s\n", name);
+    uim_helper_send_message( im_uim_fd, ( const char* ) msg );
+}
+
 void QUimHelperManager::helper_disconnect_cb()
 {
     im_uim_fd = -1;

--- a/qt/immodule-qhelpermanager.h
+++ b/qt/immodule-qhelpermanager.h
@@ -55,6 +55,7 @@ public:
     static void helper_disconnect_cb();
     static void update_prop_list_cb( void *ptr, const char *str );
     static void update_prop_label_cb( void *ptr, const char *str );
+    static void send_im_change_whole_desktop( const char *str );
 
 public slots:
     void slotStdinActivated( int );

--- a/qt/immodule-quiminputcontext.cpp
+++ b/qt/immodule-quiminputcontext.cpp
@@ -136,6 +136,11 @@ uim_context QUimInputContext::createUimContext( const char *imname )
 
     uim_set_prop_list_update_cb( uc, QUimHelperManager::update_prop_list_cb );
     uim_set_prop_label_update_cb( uc, QUimHelperManager::update_prop_label_cb );
+
+    uim_set_im_switch_request_cb( uc,
+                                  QUimInputContext::switch_app_global_im_cb,
+                                  QUimInputContext::switch_system_global_im_cb);
+
     uim_prop_list_update( uc );
 
     return uc;
@@ -453,6 +458,18 @@ void QUimInputContext::cand_deactivate_cb( void *ptr )
     ic->candidateDeactivate();
 }
 
+void QUimInputContext::switch_app_global_im_cb( void *ptr, const char *name )
+{
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    ic->switch_app_global_im( name );
+}
+
+void QUimInputContext::switch_system_global_im_cb( void *ptr, const char *name )
+{
+    QUimInputContext *ic = ( QUimInputContext* ) ptr;
+    ic->switch_system_global_im( name );
+}
+
 void QUimInputContext::commitString( const QString& str )
 {
     if ( !isComposing() )
@@ -622,6 +639,29 @@ void QUimInputContext::candidateDeactivate()
     candwinIsActive = false;
 }
 
+void QUimInputContext::switch_app_global_im( const char *name )
+{
+    QUimInputContext *cc;
+    QString im_name_sym;
+
+    im_name_sym.sprintf( "'%s", name);
+
+    for ( cc = contextList.first(); cc; cc = contextList.next() )
+    {
+        if (cc != this) {
+            uim_switch_im( cc->uimContext(), name );
+            cc->readIMConf();
+        }
+    }
+    uim_prop_update_custom(this->uimContext(), "custom-preserved-default-im-name", ( const char* ) im_name_sym );
+}
+
+void QUimInputContext::switch_system_global_im( const char *name )
+{
+    switch_app_global_im( name );
+    QUimHelperManager::send_im_change_whole_desktop( name );
+}
+
 void QUimInputContext::createUimInfo()
 {
     if ( !uimInfo.isEmpty() )

--- a/qt/immodule-quiminputcontext.h
+++ b/qt/immodule-quiminputcontext.h
@@ -36,9 +36,10 @@ SUCH DAMAGE.
 #include <qinputcontext.h>
 #include <qptrlist.h>
 
-#include <uim/uim.h>
-#include <uim/uim-util.h>
-#include <uim/uim-helper.h>
+#include "uim/uim.h"
+#include "uim/uim-util.h"
+#include "uim/uim-helper.h"
+#include "uim/uim-im-switcher.h"
 
 class CandidateWindow;
 class QUimHelperManager;
@@ -104,6 +105,9 @@ private:
     static void cand_select_cb( void *ptr, int index );
     static void cand_shift_page_cb( void* ptr, int index );
     static void cand_deactivate_cb( void *ptr );
+    //imsw
+    static void switch_app_global_im_cb( void *ptr, const char *str );
+    static void switch_system_global_im_cb( void *ptr, const char *str );
     /* real functions for callbacks (correspond order) */
     //preedit
     void clearPreedit();
@@ -113,6 +117,9 @@ private:
     void candidateActivate( int nr, int displayLimit );
     void candidateSelect( int index );
     void candidateDeactivate();
+    //imsw
+    void switch_app_global_im( const char *str );
+    void switch_system_global_im( const char *str );
 
 protected:
     QString m_imname;