[rpms/ibus] autotool: Fix wrong cursor location in gtk3

[rpms/ibus] autotool: Fix wrong cursor location in gtk3

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : c80d2f9342eb6846f8221d5f90e9a0c779aa527c
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2021-09-01T12:21:31+09:00
Stats  : +37/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/c80d2f9342eb6846f8221d5f90e9a0c779aa527c?branch=autotool

Log:
Fix wrong cursor location in gtk3

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index e21ffdc..8688e6c 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -1,3 +1,36 @@
+From 571e3b6e4f386abf12d3db70b9468e092c8d72bd Mon Sep 17 00:00:00 2001
+From: Alynx Zhou <alynx.zhou@gmail.com>
+Date: Tue, 24 Aug 2021 10:12:52 +0800
+Subject: [PATCH] client/gtk2/ibusimcontext: Fix wrong cursor location in gtk3
+ apps
+
+If you apply this patch in your tarball, please also apply this to
+client/gtk3/ibusimcontext.c besides client/gtk2/ibusimcontext.c .
+
+BUG=https://github.com/ibus/ibus/issues/2337
+---
+ client/gtk2/ibusimcontext.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c
+index da9a402f..b1ccede9 100644
+--- a/client/gtk2/ibusimcontext.c
++++ b/client/gtk2/ibusimcontext.c
+@@ -1497,7 +1497,10 @@ _set_cursor_location_internal (IBusIMContext *ibusimcontext)
+ 
+ #if GTK_CHECK_VERSION (3, 98, 4)
+ #elif GTK_CHECK_VERSION (2, 91, 0)
+-    area.y += gdk_window_get_height (ibusimcontext->client_window);
++    if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
++        area.x = 0;
++        area.y += gdk_window_get_height (ibusimcontext->client_window);
++    }
+ #else
+     if (area.x == -1 && area.y == -1 && area.width == 0 && area.height == 0) {
+         gint w, h;
+-- 
+2.31.1
+
 From 943d37444d9cc0881cb5fff87bdd4b9efd5abdb4 Mon Sep 17 00:00:00 2001
 From: fujiwarat <takao.fujiwara1@gmail.com>
 Date: Mon, 9 Aug 2021 12:49:15 +0900

diff --git a/ibus.spec b/ibus.spec
index a46a111..f3186df 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -38,7 +38,7 @@
 
 Name:           ibus
 Version:        1.5.25
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -512,6 +512,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Wed Sep 01 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-3
+- Fix wrong cursor location in gtk3
+
 * Fri Aug 27 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-2
 - Add --screendump option in ibus-desktop-testing-runner