From ab21fdca7d9a3e8fd32e4d9ef796327c98f0c0ab Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 19 Feb 2019 16:08:56 +0100 Subject: [PATCH] Add control-enter patch --- firefox-patches/patches-60/control-enter | 27 ++++++++++++++++++ firefox-patches/series-60 | 1 + firefox-patches/version | 2 +- thunderbird-patches/patches-52/control-enter | 25 +++++++++++++++++ thunderbird-patches/patches-60/control-enter | 29 ++++++++++++++++++++ thunderbird-patches/series-52 | 1 + thunderbird-patches/series-60 | 2 +- thunderbird-patches/version | 2 +- 8 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 firefox-patches/patches-60/control-enter create mode 100644 thunderbird-patches/patches-52/control-enter create mode 100644 thunderbird-patches/patches-60/control-enter diff --git a/firefox-patches/patches-60/control-enter b/firefox-patches/patches-60/control-enter new file mode 100644 index 0000000..8712339 --- /dev/null +++ b/firefox-patches/patches-60/control-enter @@ -0,0 +1,27 @@ +commit b2d9ab56ace0f4ceeac9e0d23f8c09e4cd70f2b6 +Author: Samuel Thibault +Date: Fri Feb 15 14:45:18 2019 +0100 + + atk key: Always convert control character events into key names + + including when the control modifier is present, i.e. when one is typing + control-I for instance. + + Orca would convert them back to the corresponding ASCII letter anyway, and + when pressing control-tab, we do want to pass "tab", not pass "\t" that Orca + would erroneously convert to "control-I". + +Index: firefox-esr-60.5.1esr-1/accessible/atk/UtilInterface.cpp +=================================================================== +--- firefox-esr-60.5.1esr-1.orig/accessible/atk/UtilInterface.cpp ++++ firefox-esr-60.5.1esr-1/accessible/atk/UtilInterface.cpp +@@ -161,8 +161,7 @@ static AtkKeyEventStruct *atk_key_event_ + event->keyval = key->keyval; + event->length = key->length; + if (key->string && key->string[0] && +- (key->state & GDK_CONTROL_MASK || +- g_unichar_isgraph(g_utf8_get_char(key->string)))) { ++ g_unichar_isgraph(g_utf8_get_char(key->string))) { + event->string = key->string; + } else if (key->type == GDK_KEY_PRESS || key->type == GDK_KEY_RELEASE) { + event->string = gdk_keyval_name(key->keyval); diff --git a/firefox-patches/series-60 b/firefox-patches/series-60 index c039747..ac5df2c 100644 --- a/firefox-patches/series-60 +++ b/firefox-patches/series-60 @@ -4,3 +4,4 @@ blur scrollto scrollsubstringto #jumpedline +control-enter diff --git a/firefox-patches/version b/firefox-patches/version index d00491f..0cfbf08 100644 --- a/firefox-patches/version +++ b/firefox-patches/version @@ -1 +1 @@ -1 +2 diff --git a/thunderbird-patches/patches-52/control-enter b/thunderbird-patches/patches-52/control-enter new file mode 100644 index 0000000..a84de0b --- /dev/null +++ b/thunderbird-patches/patches-52/control-enter @@ -0,0 +1,25 @@ +commit b2d9ab56ace0f4ceeac9e0d23f8c09e4cd70f2b6 +Author: Samuel Thibault +Date: Fri Feb 15 14:45:18 2019 +0100 + + atk key: Always convert control character events into key names + + including when the control modifier is present, i.e. when one is typing + control-I for instance. + + Orca would convert them back to the corresponding ASCII letter anyway, and + when pressing control-tab, we do want to pass "tab", not pass "\t" that Orca + would erroneously convert to "control-I". + +--- a/mozilla/accessible/atk/UtilInterface.cpp ++++ b/mozilla/accessible/atk/UtilInterface.cpp +@@ -184,8 +184,7 @@ atk_key_event_from_gdk_event_key (GdkEve + event->keyval = key->keyval; + event->length = key->length; + if (key->string && key->string [0] && +- (key->state & GDK_CONTROL_MASK || +- g_unichar_isgraph (g_utf8_get_char (key->string)))) { ++ g_unichar_isgraph (g_utf8_get_char (key->string))) { + event->string = key->string; + } + else if (key->type == GDK_KEY_PRESS || diff --git a/thunderbird-patches/patches-60/control-enter b/thunderbird-patches/patches-60/control-enter new file mode 100644 index 0000000..e5129c5 --- /dev/null +++ b/thunderbird-patches/patches-60/control-enter @@ -0,0 +1,29 @@ +commit b2d9ab56ace0f4ceeac9e0d23f8c09e4cd70f2b6 +Author: Samuel Thibault +Date: Fri Feb 15 14:45:18 2019 +0100 + + atk key: Always convert control character events into key names + + including when the control modifier is present, i.e. when one is typing + control-I for instance. + + Orca would convert them back to the corresponding ASCII letter anyway, and + when pressing control-tab, we do want to pass "tab", not pass "\t" that Orca + would erroneously convert to "control-I". + +--- + accessible/atk/UtilInterface.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/accessible/atk/UtilInterface.cpp ++++ b/accessible/atk/UtilInterface.cpp +@@ -161,8 +161,7 @@ static AtkKeyEventStruct *atk_key_event_ + event->keyval = key->keyval; + event->length = key->length; + if (key->string && key->string[0] && +- (key->state & GDK_CONTROL_MASK || +- g_unichar_isgraph(g_utf8_get_char(key->string)))) { ++ g_unichar_isgraph(g_utf8_get_char(key->string))) { + event->string = key->string; + } else if (key->type == GDK_KEY_PRESS || key->type == GDK_KEY_RELEASE) { + event->string = gdk_keyval_name(key->keyval); diff --git a/thunderbird-patches/series-52 b/thunderbird-patches/series-52 index 0b8af11..b998a72 100644 --- a/thunderbird-patches/series-52 +++ b/thunderbird-patches/series-52 @@ -1 +1,2 @@ twisties +control-enter diff --git a/thunderbird-patches/series-60 b/thunderbird-patches/series-60 index 38775c7..f54d72f 100644 --- a/thunderbird-patches/series-60 +++ b/thunderbird-patches/series-60 @@ -1 +1 @@ -# rien! +control-enter diff --git a/thunderbird-patches/version b/thunderbird-patches/version index d00491f..0cfbf08 100644 --- a/thunderbird-patches/version +++ b/thunderbird-patches/version @@ -1 +1 @@ -1 +2 -- GitLab