[openoffice.org/f14/master] Resolves: rhbz#635918 While inputting Hangul (Korean alphabet) with ibus, cursor does't move

[David Tardon]

commit 8df9097a1ff28645159e032b34f9799ec28eead3
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Oct 22 07:49:31 2010 +0200

    Resolves: rhbz#635918 While inputting Hangul (Korean alphabet) with ibus, cursor does't move

 ...ce.org-3.3.0.rh635918.vcl.fix-im-handling.patch |   46 ++++++++++++++++++++
 openoffice.org.spec                                |    8 +++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch b/openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch
new file mode 100644
index 0000000..29ecf98
--- /dev/null
+++ b/openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# Parent 4e3c54a077e3b5268fecad0def2c45cba8e5bb72
+fix IM handling
+
+diff -r 4e3c54a077e3 vcl/unx/gtk/window/gtkframe.cxx
+--- a/vcl/unx/gtk/window/gtkframe.cxx	Thu Oct 21 16:14:09 2010 +0200
++++ b/vcl/unx/gtk/window/gtkframe.cxx	Fri Oct 22 07:39:49 2010 +0200
+@@ -3539,6 +3539,10 @@
+     // open a block that will end the GTK_YIELD_GRAB before calling preedit changed again
+     {
+         GTK_YIELD_GRAB();
++
++        const bool bWasPreedit =
++            (pThis->m_aInputEvent.mpTextAttr != 0) ||
++            pThis->m_bPreeditJustChanged;
+         
+         pThis->m_aInputEvent.mnTime 			= 0;
+         pThis->m_aInputEvent.mpTextAttr 		= 0;
+@@ -3563,9 +3567,6 @@
+          *  or because there never was a preedit.
+          */
+         bool bSingleCommit = false;
+-        bool bWasPreedit =
+-            (pThis->m_aInputEvent.mpTextAttr != 0) ||
+-            pThis->m_bPreeditJustChanged;
+         if( ! bWasPreedit
+             && pThis->m_aInputEvent.maText.Len() == 1
+             && ! pThis->m_aPrevKeyPresses.empty()
+diff -r 4e3c54a077e3 vcl/unx/inc/plugins/gtk/gtkframe.hxx
+--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx	Thu Oct 21 16:14:09 2010 +0200
++++ b/vcl/unx/inc/plugins/gtk/gtkframe.hxx	Fri Oct 22 07:39:49 2010 +0200
+@@ -117,11 +117,12 @@
+                 return (event != NULL)
+                     && (event->window == window)
+                     && (event->send_event == send_event)
+-                    && (event->state == state)
++                    // ignore non-Gdk state bits, e.g., these used by IBus
++                    && ((event->state & GDK_MODIFIER_MASK) == (state & GDK_MODIFIER_MASK))
+                     && (event->keyval == keyval)
+                     && (event->hardware_keycode == hardware_keycode)
+                     && (event->group == group)
+-                    && (event->time - time < 3)
++                    && (event->time - time < 300)
+                     ;
+             }
+         };
diff --git a/openoffice.org.spec b/openoffice.org.spec
index b4ec142..a358379 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 11
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -128,6 +128,7 @@ Patch42: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
 Patch43: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
 Patch44: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
 Patch45: LibO-backport-eapifix.patch
+Patch46: openoffice.org-3.3.0.rh635918.vcl.fix-im-handling.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1661,6 +1662,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch43 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
 %patch44 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
 %patch45 -p1 -b .LibO-backport-eapifix.patch
+%patch46 -p1 -b .rh635918.vcl.fix-im-handling.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3860,6 +3862,10 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Oct 22 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-11.2
+- Resolves: rhbz#635918 While inputting Hangul (Korean alphabet) with
+  ibus, cursor does't move (dtardon)
+
 * Mon Oct 18 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-11.1
 - latest milestone