Only use natural copy/paste if something to act on (#1588)

jeremypw · web-flow · commit 929a73aa4f96 · 2025-06-04T13:21:34.000-07:00
diff --git a/src/Widgets/Terminal.vala b/src/Widgets/Terminal.vala
@@ -234,10 +234,10 @@ public class Code.Terminal : Gtk.Box {
         }
 
         if (CONTROL_MASK in modifiers && pantheon_terminal_settings.get_boolean ("natural-copy-paste")) {
-            if (match_keycode (Gdk.Key.c, keycode)) {
+            if (match_keycode (Gdk.Key.c, keycode) && terminal.get_has_selection ()) {
                 actions.activate_action (ACTION_COPY, null);
                 return Gdk.EVENT_STOP;
-            } else if (match_keycode (Gdk.Key.v, keycode)) {
+            } else if (match_keycode (Gdk.Key.v, keycode) && current_clipboard.wait_is_text_available ()) {
                 actions.activate_action (ACTION_PASTE, null);
                 return Gdk.EVENT_STOP;
             }

Original file line number	Diff line number	Diff line change
`@@ -234,10 +234,10 @@ public class Code.Terminal : Gtk.Box {`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`if (CONTROL_MASK in modifiers && pantheon_terminal_settings.get_boolean ("natural-copy-paste")) {`
`237`		`- if (match_keycode (Gdk.Key.c, keycode)) {`
	`237`	`+ if (match_keycode (Gdk.Key.c, keycode) && terminal.get_has_selection ()) {`
`238`	`238`	`actions.activate_action (ACTION_COPY, null);`
`239`	`239`	`return Gdk.EVENT_STOP;`
`240`		`- } else if (match_keycode (Gdk.Key.v, keycode)) {`
	`240`	`+ } else if (match_keycode (Gdk.Key.v, keycode) && current_clipboard.wait_is_text_available ()) {`
`241`	`241`	`actions.activate_action (ACTION_PASTE, null);`
`242`	`242`	`return Gdk.EVENT_STOP;`
`243`	`243`	`}`