Fix the space bar to insert spaces in ibus-chewing

src/IBusChewingEngine.gob

 requires 2.0.0
 
 %alltop{
 /*
  * Copyright © 2009  Red Hat, Inc. All rights reserved.
  * Copyright © 2009  Ding-Yi Chen <dchen at redhat.com>
  *
  * This file is part of the ibus-chewing Project.
  *
  * This program is free software; you can redistribute it and/or
@@ skipping 90 matching lines @@
 /**
  * EngineStatus:
  * @INITIALIZED:        Engine is initialized.
  */
 enum ENGINE_STATUS{
     INITIALIZED=                0x1,
     ENABLED=                    0x2,
     FOCUS_IN=                   0x4,
     SHOW_CANDIDATE=             0x8,
     NEED_COMMIT=                0x10,
+    FORCE_COMMIT=               0x20,
 } Engine:Status;
 
 %h{
 #include "maker-dialog.h"
 #define GCONF_KEY_PREFIX "/desktop/ibus/engine/Chewing/"
 /* For easy symbol input work around */
 #define EASY_SYMBOL_INPUT_WORK_AROUND
 
 extern PropertySpec propSpecs[];
 extern const gchar *page_labels[];
@@ skipping 311 matching lines @@
             ibus_engine_show_lookup_table(IBUS_ENGINE(self));
             ibus_chewing_engine_set_status_flag(self,ENGINE_STATUS_SHOW_CANDIDATE);
         }else{
             ibus_engine_hide_lookup_table(IBUS_ENGINE(self));
             ibus_chewing_engine_clear_status_flag(self,ENGINE_STATUS_SHOW_CANDIDATE);
         }
     }
 
     private void update_lookup_table(self){
         if (!self->table){
-            self->table=ibus_lookup_table_new(1,0,FALSE,TRUE);
+            self->table=ibus_lookup_table_new(1,0,TRUE,TRUE);
             g_object_ref_sink(self->table);
         }
         ibus_lookup_table_clear(self->table);
         int choicePerPage=chewing_cand_ChoicePerPage(self->context);
         int i=0;
         char *candidate=NULL;
         IBusText *iText=NULL;
 
         G_DEBUG_MSG(4,"[I4] update_lookup_table() TotalChoice=%d CurrentPage=%d",
                 chewing_cand_TotalChoice(self->context),chewing_cand_CurrentPage(self->context));
@@ skipping 60 matching lines @@
         return iText;
     }
 
     private void update_aux_string(self, IBusText *preeditIText){
         G_DEBUG_MSG(4,"[I4] update_aux_string() statusFlags=%x", self->_priv->statusFlags);
         IBusText *iText=NULL;
         switch (self->_priv->inputStyle){
             case CHEWING_INPUT_STYLE_IN_APPLICATION:
                 if (chewing_aux_Length(self->context)>0){
                     gchar *aux_string=chewing_aux_String(self->context);
-                    iText=ibus_text_new_from_string (aux_string);
                     iText=g_object_ref_sink(ibus_text_new_from_string (aux_string));
                     ibus_engine_update_auxiliary_text(IBUS_ENGINE(self),iText,TRUE);
                     g_object_unref (iText);
                     ibus_engine_show_auxiliary_text(IBUS_ENGINE(self));
                     g_free(aux_string);
                 }else{
                     ibus_engine_hide_auxiliary_text(IBUS_ENGINE(self));
                 }
                 break;
             case CHEWING_INPUT_STYLE_IN_CANDIDATE:
@@ skipping 14 matching lines @@
                 break;
         }
         G_DEBUG_MSG(5,"[I5]  update_preedit(): return");
     }
 
     protected gboolean update(self){
         G_DEBUG_MSG(3,"[I3] update() statusFlags=%x", self->_priv->statusFlags);
         self_determine_input_mode(self);
         gint chiSymbolCursor;
         glong zhuyin_item_written;
+        self_commit(self);
         gchar *preeditBuf=self_make_preedit_string(self, &zhuyin_item_written);
         IBusText *iText=self_decorate_preedit(self, preeditBuf, &chiSymbolCursor, zhuyin_item_written);
         if (g_object_is_floating(iText)){
             g_object_ref_sink(iText);
         }
 
         self_update_aux_string(self, iText);
         self_update_preedit(self, iText, chiSymbolCursor);
         g_object_unref (iText);
         uint16 *phoneSeq=(chewing_get_phoneSeqLen(self->context)>0)? chewing_get_phoneSeq(self->context): NULL;
         G_DEBUG_MSG(4,"[I4]  update() inputMode=%d nPhoneSeq=%d statusFlags=%u",
                 self->inputMode,
                 chewing_get_phoneSeqLen(self->context),
                 self->_priv->statusFlags);
         if (phoneSeq){
             int i=0;
             for(i=0;i<chewing_get_phoneSeqLen(self->context);i++){
                 G_DEBUG_MSG(5,"[I5]  update() phoneSeq[%d]=%x",i,phoneSeq[i]);
             }
             free(phoneSeq);
         }
         self_update_lookup_table(self);
-        self_commit(self);
+        //self_commit(self);
         gboolean ret=TRUE;
 
         if (chewing_keystroke_CheckAbsorb(self->context)){
             ret=TRUE;
         }else if (chewing_keystroke_CheckIgnore(self->context)){
             ret=FALSE;
         }
         G_DEBUG_MSG(4,"[I4]  update() return %s",(ret)? "TRUE": "FALSE");
         return ret;
     }
@@ skipping 194 matching lines @@
         }
         g_free(str_ptr);
         G_DEBUG_MSG(3, "[I3]  determine_input_mode() return: zhuyin_latest=%s zhuyin_tone=%d inputMode=%d",
                 self->_priv->zhuyin_latest,zhuyin_tone,self->inputMode);
     }
 
     /* commit string */
     protected gboolean commit(self){
         gint commit=chewing_commit_Check(self->context);
         G_DEBUG_MSG(2,"[I2] commit() %s statusFlags=%x", (commit) ? "TRUE": "FALSE", self->_priv->statusFlags);
-        if (commit && (self->_priv->statusFlags & ENGINE_STATUS_NEED_COMMIT)){
+        if ((self->_priv->statusFlags & ENGINE_STATUS_NEED_COMMIT) && commit){
             IBusText *iText=NULL;
 
             gchar *commit_string=chewing_commit_String(self->context);
             G_DEBUG_MSG(3,"[I3]  commit() commit_string=%s", commit_string);
             iText=g_object_ref_sink(ibus_text_new_from_string(commit_string));
             ibus_engine_commit_text(IBUS_ENGINE(self),iText);
             g_free(commit_string);
             g_object_unref(iText);
-            ibus_chewing_engine_clear_status_flag(self, ENGINE_STATUS_NEED_COMMIT);
+            if (!chewing_buffer_Check(self->context)){
+                /* Buffer is clean */
+                ibus_chewing_engine_clear_status_flag(self, ENGINE_STATUS_NEED_COMMIT | ENGINE_STATUS_FORCE_COMMIT );
+            }else if (self->_priv->statusFlags & ENGINE_STATUS_FORCE_COMMIT){
+                /* Flush the buffer  */
+                chewing_handle_Enter(self->context);
+                commit_string=chewing_commit_String(self->context);
+                iText=g_object_ref_sink(ibus_text_new_from_string(commit_string));
+                ibus_engine_commit_text(IBUS_ENGINE(self),iText);
+                g_free(commit_string);
+                g_object_unref(iText);
+                ibus_chewing_engine_clear_status_flag(self, ENGINE_STATUS_FORCE_COMMIT );
+            }
         }
         return commit;
     }
 
     protected void force_commit(self){
         G_DEBUG_MSG(3,"[I3] force_commit() buffer=%d, commit=%d statusFlags=%x",
                 chewing_buffer_Check(self->context),chewing_commit_Check(self->context), self->_priv->statusFlags);
         /* Remove the incomplete zhuyin symbol */
         if (self->inputMode==CHEWING_INPUT_MODE_EDITING)
             chewing_handle_Esc(self->context);
         if (chewing_buffer_Check(self->context)){
             if (!chewing_commit_Check(self->context)){
                 /* Close candidate window */
                 if (self->_priv->statusFlags & ENGINE_STATUS_SHOW_CANDIDATE){
                     chewing_handle_Esc(self->context);
                 }
                 chewing_handle_Enter(self->context);
             }
-            ibus_chewing_engine_set_status_flag(self, ENGINE_STATUS_NEED_COMMIT);
+            ibus_chewing_engine_set_status_flag(self, ENGINE_STATUS_NEED_COMMIT | ENGINE_STATUS_FORCE_COMMIT);
             self_update(self);
         }
     }
 
     /*============================================
      * Overridden Parent (IBusEngine) methods
      */
     override (IBus:Engine) void
     reset(IBus:Engine *engine){
         G_DEBUG_MSG(1,"[I1] reset");
         Self *self=SELF(engine);
+        if (self->_priv->statusFlags & ENGINE_STATUS_NEED_COMMIT){
+            /* Force commit non-empty preedit buffer */
+            self_force_commit(self);
+        }
         ibus_lookup_table_clear(self->table);
         /* Save KBType type, becaue chewing_Reset() will reset it to default.
          */
         int kbType=chewing_get_KBType(self->context);
         chewing_Reset(self->context);
         chewing_set_KBType(self->context,kbType);
         ibus_engine_hide_auxiliary_text(IBUS_ENGINE(engine));
         ibus_engine_hide_lookup_table(IBUS_ENGINE(self));
     }
 
@@ skipping 140 matching lines @@
         IBusProperty *prop=self_get_iBusProperty(self, prop_name);
         ibus_property_set_visible(prop,FALSE);
         ibus_engine_update_property(engine,prop);
     }
 }
 
 %{
 #include "IBusChewingEngine-keys.c"
 %}