From eeb1e8e10e9292546360c7298f21c6bdbcb1bc03 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 23 Feb 2026 17:57:34 +0000 Subject: [PATCH 1/5] Disable Ctrl-R actions when terminal focused --- src/MainWindow.vala | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 1e09bc066..dd3d46c92 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -521,6 +521,9 @@ namespace Scratch { visible = false }; + terminal.terminal.focus_in_event.connect (on_terminal_focus_change); + terminal.terminal.focus_out_event.connect (on_terminal_focus_change); + var view_grid = new Gtk.Grid () { orientation = Gtk.Orientation.VERTICAL }; @@ -734,6 +737,13 @@ namespace Scratch { toolbar.share_menu_button.sensitive = val; } + private bool on_terminal_focus_change () { + var focused = terminal.terminal.has_focus; + Utils.action_from_group (ACTION_SHOW_REPLACE, actions).set_enabled (!focused); + Utils.action_from_group (ACTION_RESTORE_PROJECT_DOCS, actions).set_enabled (!focused); + return false; + } + // Get current document public Scratch.Services.Document? get_current_document () { return document_view.current_document; @@ -1282,6 +1292,10 @@ namespace Scratch { } private void action_show_replace (SimpleAction action) { + if (terminal.terminal.has_focus) { + return; + } + find (); // May have to wait for the search bar to be revealed before we can grab focus From 7f619b510a2646aae9969330f257f676538ff3d6 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 23 Feb 2026 17:59:28 +0000 Subject: [PATCH 2/5] Disable Ctrl-Z actions when terminal focused --- src/MainWindow.vala | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index dd3d46c92..a6b39fca8 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -741,6 +741,8 @@ namespace Scratch { var focused = terminal.terminal.has_focus; Utils.action_from_group (ACTION_SHOW_REPLACE, actions).set_enabled (!focused); Utils.action_from_group (ACTION_RESTORE_PROJECT_DOCS, actions).set_enabled (!focused); + Utils.action_from_group (ACTION_UNDO, actions).set_enabled (!focused); + Utils.action_from_group (ACTION_REDO, actions).set_enabled (!focused); return false; } From b5c501ca91d54d6c4563623766d722be9ff0af51 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 23 Feb 2026 18:04:42 +0000 Subject: [PATCH 3/5] Disable Ctrl-u action when terminal focused --- src/MainWindow.vala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index a6b39fca8..9c9bb6de8 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -739,10 +739,15 @@ namespace Scratch { private bool on_terminal_focus_change () { var focused = terminal.terminal.has_focus; + //r +- shift Utils.action_from_group (ACTION_SHOW_REPLACE, actions).set_enabled (!focused); Utils.action_from_group (ACTION_RESTORE_PROJECT_DOCS, actions).set_enabled (!focused); + //z +- shift Utils.action_from_group (ACTION_UNDO, actions).set_enabled (!focused); Utils.action_from_group (ACTION_REDO, actions).set_enabled (!focused); + + //u + Utils.action_from_group (ACTION_TO_UPPER_CASE, actions).set_enabled (!focused); return false; } From c0d94f0a66c3aefe0cd9925074b8e3c05acaaf92 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 23 Feb 2026 18:10:27 +0000 Subject: [PATCH 4/5] Disable Ctrl-k actions when terminal focused --- src/MainWindow.vala | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 9c9bb6de8..a107c1759 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -748,6 +748,10 @@ namespace Scratch { //u Utils.action_from_group (ACTION_TO_UPPER_CASE, actions).set_enabled (!focused); + + //k +- shift + Utils.action_from_group (ACTION_DUPLICATE_TAB, actions).set_enabled (!focused); + Utils.action_from_group (ACTION_CLEAR_LINES, actions).set_enabled (!focused); return false; } From 1521f93b08e99aa388d3a5a3bb46b0df813c1dd7 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 23 Feb 2026 18:16:45 +0000 Subject: [PATCH 5/5] Disable Ctrl-l action while terminal is focused --- src/MainWindow.vala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index a107c1759..748bdf801 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -752,6 +752,9 @@ namespace Scratch { //k +- shift Utils.action_from_group (ACTION_DUPLICATE_TAB, actions).set_enabled (!focused); Utils.action_from_group (ACTION_CLEAR_LINES, actions).set_enabled (!focused); + + //l + Utils.action_from_group (ACTION_TO_LOWER_CASE, actions).set_enabled (!focused); return false; }