Attachment 929865 Details for Bug 1128912 – 0001-Pass-IBus.KEY_KP_Enter-to-the-application-if-the-pre.patch

[patch] 0001-Pass-IBus.KEY_KP_Enter-to-the-application-if-the-pre.patch

0001-Pass-IBus.KEY_KP_Enter-to-the-application-if-the-pre.patch (text/plain), 3.52 KB, created by Mike FABIAN on 2014-08-23 12:36:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mike FABIAN

Created: 2014-08-23 12:36:03 UTC

Size: 3.52 KB

patch

obsolete

>From f97883e0d970ae42df2623b58a505e7fe274a0c1 Mon Sep 17 00:00:00 2001
>From: Mike FABIAN <mfabian@redhat.com>
>Date: Sat, 23 Aug 2014 14:18:43 +0200
>Subject: [PATCH] Pass IBus.KEY_KP_Enter to the application if the preedit is
> empty
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Resolves: rhbz#1128912 comment#30
>See: https://bugzilla.redhat.com/show_bug.cgi?id=1128912#c30
>
>If IBus.KEY_KP_Enter is typed:
>
>â¢ if the preÃ«dit is empty, we should always pass the key to the
>  application. *Not* commit and empty string plus os.linesep because
>  that behaves differently in some cases.  For example when typing a
>  message in Pidgin it would insert a linefeed into the message
>  instead of sending the message.
>
>â¢ if the preÃ«dit is not empty:
>  - when auto_select is true (typical for Russian input methods
>    like ârusleâ or âtranslitâ), the pending preÃ«dit should be committed
>    and the IBus.KEY_KP_Enter key passed to the application.
>    For example, when typing âCâ with translit, the preÃ«dit contains
>    Ð¦ because it is still possible that a âhâ is typed next:
>
>        C	Ð¦	1000
>        Ch	Ð§	1000
>        CH	Ð§	1000
>
>    When IBus.KEY_KP_Enter is typed in this state, the Ð¦ should
>    be committed and the IBus.KEY_KP_Enter should be passed to the
>    application. With the old code, typing âCâ followed by
>    IBus.KEY_KP_Enter inserted a Ð¦ and a linefeed in Pidgin instead
>    of sending the message ending with Ð¦.
>  - when auto_select is false (typical for Chinese input methods),
>    the typed tabkeys should be committed (not the Chinese characters
>    in the preÃ«dit) and IBus.KEY_KP_Enter should not be passed
>    to the application.
>---
> engine/table.py | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
>diff --git a/engine/table.py b/engine/table.py
>index 228a543..86d311f 100644
>--- a/engine/table.py
>+++ b/engine/table.py
>@@ -1990,13 +1990,25 @@ class tabengine (IBus.Engine):
>             return True
> 
>         if key.code in (IBus.KEY_Return, IBus.KEY_KP_Enter):
>+            if self._editor.is_empty() and not self._editor.get_preedit_string_complete():
>+                # When IBus.KEY_KP_RETURN is typed,
>+                # IBus.keyval_to_unicode(key.code) returns a non-empty
>+                # string. But when IBus.KEY_KP_Enter is typed it returns
>+                # an empty string. Therefore, when typing IBus.KEY_KP_Enter
>+                # as leading input, the key is not handled by the section
>+                # to handle leading invalid input but it ends up here.
>+                # If it is leading input (i.e. the preÃ«dit is empty) we
>+                # should always pass IBus.KEY_KP_Enter to the application:
>+                return False
>             if self._auto_select:
>                 self._editor.commit_to_preedit()
>-                commit_string = self._editor.get_preedit_string_complete() + os.linesep
>+                commit_string = self._editor.get_preedit_string_complete()
>+                self.commit_string(commit_string)
>+                return False
>             else:
>-                commit_string = self._editor.get_preedit_tabkeys_complete ()
>-            self.commit_string(commit_string)
>-            return True
>+                commit_string = self._editor.get_preedit_tabkeys_complete()
>+                self.commit_string(commit_string)
>+                return True
> 
>         if key.code in (IBus.KEY_Tab, IBus.KEY_KP_Tab) and self._auto_select:
>             # Used for example for the Russian transliteration method
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1128912: 925875 | 929759 | 929865 | 929877