fixup! set-cursor-location-relative

rtcm · Feb 12, 2016 · bb9f34d · bb9f34d
1 parent 6c9d8ac
commit bb9f34d
Showing 1 changed file with 26 additions and 5 deletions.
diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
@@ -30,6 +30,10 @@
 #include <ibus.h>
 #include "ibusimcontext.h"
 
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
+
 #if !GTK_CHECK_VERSION (2, 91, 0)
 #  define DEPRECATED_GDK_KEYSYMS 1
 #endif
@@ -1011,11 +1015,28 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
     }
 
     area = ibusimcontext->cursor_area;
-    ibus_input_context_set_cursor_location_relative (ibusimcontext->ibuscontext,
-                                                     area.x,
-                                                     area.y,
-                                                     area.width,
-                                                     area.height);
+
+#ifdef GDK_WINDOWING_WAYLAND
+    if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) {
+        gdouble px, py;
+        GdkWindow *parent;
+        GdkWindow *window = ibusimcontext->client_window;
+
+        while ((parent = gdk_window_get_effective_parent (window)) != NULL) {
+            gdk_window_coords_to_parent (window, area.x, area.y, &px, &py);
+            area.x = px;
+            area.y = py;
+            window = parent;
+        }
+
+        ibus_input_context_set_cursor_location_relative (ibusimcontext->ibuscontext,
+                                                         area.x,
+                                                         area.y,
+                                                         area.width,
+                                                         area.height);
+        return FALSE;
+    }
+#endif
 
     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
 #if GTK_CHECK_VERSION (2, 91, 0)