Cleanup previous PR

This commit is contained in:
Kovid Goyal
2025-09-03 21:46:47 +05:30
parent 2ca7b505f4
commit 315562d73d
3 changed files with 7 additions and 4 deletions

View File

@@ -165,6 +165,9 @@ Detailed list of changes
- Wayland: Update bundled copy of libwayland to 1.24 from 1.23.1 because the - Wayland: Update bundled copy of libwayland to 1.24 from 1.23.1 because the
just released mesa 25.2.0 breaks with libwayland < 1.24 (:iss:`8884`) just released mesa 25.2.0 breaks with libwayland < 1.24 (:iss:`8884`)
- macOS: Pass the :kbd:`Cmd+C` shortcut to the application running in the
terminal when no text is selected (:pull:`8946`)
0.42.2 [2025-07-16] 0.42.2 [2025-07-16]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@@ -3726,7 +3726,7 @@ to :kbd:`Ctrl+C`. It will copy only if there is a selection and send an
interrupt otherwise. Similarly, :ac:`copy_and_clear_or_interrupt` will copy interrupt otherwise. Similarly, :ac:`copy_and_clear_or_interrupt` will copy
and clear the selection or send an interrupt if there is no selection. and clear the selection or send an interrupt if there is no selection.
The :ac:`copy_or_noop` action will copy if there is a selection and pass The :ac:`copy_or_noop` action will copy if there is a selection and pass
the key through to the application if there is no selection. the key through to the application running in the terminal if there is no selection.
''' '''
) )
map('Copy to clipboard or pass through', map('Copy to clipboard or pass through',

View File

@@ -2142,14 +2142,14 @@ class Window:
self.scroll_end() self.scroll_end()
self.write_to_child(self.encoded_key(KeyEvent(key=ord('c'), mods=GLFW_MOD_CONTROL))) self.write_to_child(self.encoded_key(KeyEvent(key=ord('c'), mods=GLFW_MOD_CONTROL)))
@ac('cp', 'Copy the selected text from the active window to the clipboard, if no selection, pass the key through to the application') @ac('cp', 'Copy the selected text from the active window to the clipboard, if no selection,'
' pass the key through to the application running in the terminal.')
def copy_or_noop(self) -> bool: def copy_or_noop(self) -> bool:
text = self.text_for_selection() text = self.text_for_selection()
if text: if text:
set_clipboard_string(text) set_clipboard_string(text)
return False return False
else: return True
return True
@ac('cp', 'Copy the selected text from the active window to the clipboard and clear selection, if no selection, send SIGINT (aka :kbd:`ctrl+c`)') @ac('cp', 'Copy the selected text from the active window to the clipboard and clear selection, if no selection, send SIGINT (aka :kbd:`ctrl+c`)')
def copy_and_clear_or_interrupt(self) -> None: def copy_and_clear_or_interrupt(self) -> None: