File ibus-pinyin-avoid-superkey-conflict.patch of Package ibus-pinyin.32999
diff -Nura ibus-pinyin-1.5.0/src/PYBopomofoEditor.cc ibus-pinyin-1.5.0_new/src/PYBopomofoEditor.cc
--- ibus-pinyin-1.5.0/src/PYBopomofoEditor.cc 2012-08-02 22:22:38.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYBopomofoEditor.cc 2024-03-14 16:46:19.120069981 +0800
@@ -151,6 +151,9 @@
gboolean
BopomofoEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYBopomofoEngine.cc ibus-pinyin-1.5.0_new/src/PYBopomofoEngine.cc
--- ibus-pinyin-1.5.0/src/PYBopomofoEngine.cc 2024-03-14 16:42:51.732706358 +0800
+++ ibus-pinyin-1.5.0_new/src/PYBopomofoEngine.cc 2024-03-14 17:10:53.792870399 +0800
@@ -74,6 +74,9 @@
gboolean
BopomofoEngine::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
gboolean retval = FALSE;
#if IBUS_CHECK_VERSION (1, 5, 4)
diff -Nura ibus-pinyin-1.5.0/src/PYDoublePinyinEditor.cc ibus-pinyin-1.5.0_new/src/PYDoublePinyinEditor.cc
--- ibus-pinyin-1.5.0/src/PYDoublePinyinEditor.cc 2012-08-02 22:22:38.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYDoublePinyinEditor.cc 2024-03-14 16:51:44.806781872 +0800
@@ -66,6 +66,9 @@
gboolean
DoublePinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
/* handle ';' key */
if (G_UNLIKELY (keyval == IBUS_semicolon)) {
if (cmshm_filter (modifiers) == 0) {
diff -Nura ibus-pinyin-1.5.0/src/PYEditor.cc ibus-pinyin-1.5.0_new/src/PYEditor.cc
--- ibus-pinyin-1.5.0/src/PYEditor.cc 2012-07-09 22:32:10.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYEditor.cc 2024-03-14 16:47:48.858092736 +0800
@@ -38,6 +38,9 @@
gboolean
Editor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
IBUS_SUPER_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYEnglishEditor.cc ibus-pinyin-1.5.0_new/src/PYEnglishEditor.cc
--- ibus-pinyin-1.5.0/src/PYEnglishEditor.cc 2012-07-09 22:32:10.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYEnglishEditor.cc 2024-03-14 16:48:53.870833691 +0800
@@ -375,6 +375,9 @@
gboolean
EnglishEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
//IBUS_SHIFT_MASK is removed.
modifiers &= (IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYExtEditor.cc ibus-pinyin-1.5.0_new/src/PYExtEditor.cc
--- ibus-pinyin-1.5.0/src/PYExtEditor.cc 2024-03-14 16:42:51.737706415 +0800
+++ ibus-pinyin-1.5.0_new/src/PYExtEditor.cc 2024-03-14 16:50:19.981815116 +0800
@@ -76,6 +76,9 @@
gboolean
ExtEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
//IBUS_SHIFT_MASK is removed.
modifiers &= (IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYFallbackEditor.cc ibus-pinyin-1.5.0_new/src/PYFallbackEditor.cc
--- ibus-pinyin-1.5.0/src/PYFallbackEditor.cc 2012-07-09 22:32:10.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYFallbackEditor.cc 2024-03-14 16:51:18.255479264 +0800
@@ -205,6 +205,9 @@
{
gboolean retval = FALSE;
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYPhoneticEditor.cc ibus-pinyin-1.5.0_new/src/PYPhoneticEditor.cc
--- ibus-pinyin-1.5.0/src/PYPhoneticEditor.cc 2024-03-14 16:42:51.742706472 +0800
+++ ibus-pinyin-1.5.0_new/src/PYPhoneticEditor.cc 2024-03-14 16:53:54.579260909 +0800
@@ -204,6 +204,9 @@
gboolean
PhoneticEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
return FALSE;
}
diff -Nura ibus-pinyin-1.5.0/src/PYPinyinEditor.cc ibus-pinyin-1.5.0_new/src/PYPinyinEditor.cc
--- ibus-pinyin-1.5.0/src/PYPinyinEditor.cc 2012-08-02 22:22:38.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYPinyinEditor.cc 2024-03-14 17:00:34.617817949 +0800
@@ -163,6 +163,9 @@
gboolean
PinyinEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
diff -Nura ibus-pinyin-1.5.0/src/PYPinyinEngine.cc ibus-pinyin-1.5.0_new/src/PYPinyinEngine.cc
--- ibus-pinyin-1.5.0/src/PYPinyinEngine.cc 2024-03-14 16:42:51.733706369 +0800
+++ ibus-pinyin-1.5.0_new/src/PYPinyinEngine.cc 2024-03-14 17:13:30.820654241 +0800
@@ -86,6 +86,9 @@
{
gboolean retval = FALSE;
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
#if IBUS_CHECK_VERSION (1, 5, 4)
if (IBUS_INPUT_PURPOSE_PASSWORD == m_input_purpose)
return retval;
diff -Nura ibus-pinyin-1.5.0/src/PYPunctEditor.cc ibus-pinyin-1.5.0_new/src/PYPunctEditor.cc
--- ibus-pinyin-1.5.0/src/PYPunctEditor.cc 2012-07-09 22:32:10.000000000 +0800
+++ ibus-pinyin-1.5.0_new/src/PYPunctEditor.cc 2024-03-14 17:01:16.230291919 +0800
@@ -146,6 +146,9 @@
gboolean
PunctEditor::processKeyEvent (guint keyval, guint keycode, guint modifiers)
{
+ if (modifiers & IBUS_MOD4_MASK)
+ return FALSE;
+
modifiers &= (IBUS_SHIFT_MASK |
IBUS_CONTROL_MASK |
IBUS_MOD1_MASK |
