Add some milliseconds interval before IME switcher is shown.

Review URL: https://codereview.appspot.com/6826045

diff --git a/data/ibus.schemas.in b/data/ibus.schemas.in
index 53ba05c..d692e67 100644 (file)
--- a/data/ibus.schemas.in
+++ b/data/ibus.schemas.in
@@ -26,6 +26,17 @@
       </locale>
     </schema>
     <schema>
+      <key>/schemas/desktop/ibus/general/switcher-delay-time</key>
+      <applyto>/desktop/ibus/general/switcher-delay-time</applyto>
+      <owner>ibus</owner>
+      <type>int</type>
+      <default>400</default>
+      <locale name="C">
+        <short>Popup delay milliseconds for IME switcher window</short>
+            <long>Set popup delay milliseconds to show IME switcher window</long>
+      </locale>
+    </schema>
+    <schema>
       <key>/schemas/desktop/ibus/general/hotkey/trigger</key>
       <applyto>/desktop/ibus/general/hotkey/trigger</applyto>
       <owner>ibus</owner>

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 6f579ac..0361131 100644 (file)
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -204,6 +204,9 @@ class Panel : IBus.PanelService {
             m_config.watch("panel", "use_custom_font");
             update_engines(m_config.get_value("general", "preload_engines"),
                            m_config.get_value("general", "engines_order"));
+            uint delay_time = (uint) m_config.get_value(
+                    "general", "switcher-delay-time").get_int32();
+            m_switcher.set_popup_delay_time(delay_time);
         } else {
             update_engines(null, null);
         }

diff --git a/ui/gtk3/switcher.vala b/ui/gtk3/switcher.vala
index 2587117..bec50c6 100644 (file)
--- a/ui/gtk3/switcher.vala
+++ b/ui/gtk3/switcher.vala
@@ -73,6 +73,10 @@ class Switcher : Gtk.Window {
     private Gdk.ModifierType m_primary_modifier;
     private GLib.MainLoop m_loop;
     private int m_result;
+    private uint m_popup_delay_time = 400;
+    private uint m_popup_delay_time_id;
+    private int m_root_x;
+    private int m_root_y;
 
     public Switcher() {
         GLib.Object(
@@ -153,19 +157,19 @@ class Switcher : Gtk.Window {
             keyboard = device.get_associated_device();
         }
 
+        get_position(out m_root_x, out m_root_y);
+        // Pull the window from the screen so that the window gets
+        // the key press and release events but mouse does not select
+        // an IME unexpectedly.
+        move(-1000, -1000);
         show_all();
 
-        if (is_composited()) {
-            // Hide the window by set the opactiy to 0.0, because real hiden
-            // window can not grab keyboard and pointer.
-            get_window().set_opacity(0.0);
-
-            // Show window after 1/10 secound
-            GLib.Timeout.add(100, ()=> {
-                get_window().set_opacity(1.0);
-                return false;
-            });
-        }
+        // Restore the window position after m_popup_delay_time
+        m_popup_delay_time_id = GLib.Timeout.add(m_popup_delay_time,
+                                                 () => {
+            restore_window_position("timeout");
+            return false;
+        });
 
         Gdk.GrabStatus status;
         // Grab all keyboard events
@@ -295,6 +299,19 @@ class Switcher : Gtk.Window {
         set_focus(m_buttons[m_selected_engine]);
     }
 
+    private void restore_window_position(string debug_str) {
+        debug("restore_window_position %s: (%ld, %ld)\n",
+                debug_str, m_root_x, m_root_y);
+
+        if (m_popup_delay_time_id == 0) {
+            return;
+        }
+
+        GLib.Source.remove(m_popup_delay_time_id);
+        m_popup_delay_time_id = 0;
+        move(m_root_x, m_root_y);
+    }
+
     /* override virtual functions */
     public override void show() {
         base.show();
@@ -305,6 +322,8 @@ class Switcher : Gtk.Window {
         bool retval = true;
         Gdk.EventKey *pe = &e;
 
+        restore_window_position("pressed");
+
         do {
             uint modifiers = KeybindingManager.MODIFIER_FILTER & pe->state;
 
@@ -357,8 +376,17 @@ class Switcher : Gtk.Window {
             return false;
         }
 
+        if (m_popup_delay_time_id != 0) {
+            GLib.Source.remove(m_popup_delay_time_id);
+            m_popup_delay_time_id = 0;
+        }
+
         m_loop.quit();
         m_result = (int)m_selected_engine;
         return true;
     }
+
+    public void set_popup_delay_time(uint popup_delay_time) {
+        m_popup_delay_time = popup_delay_time;
+    }
 }