diff --git a/CHANGELOG.md b/CHANGELOG.md index 65dd2542..31c05401 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,10 @@ * Workaround for Sway bug [#6960][sway-6960]: scrollback search and the OSC-555 (“flash”) escape sequence leaves dimmed (search) and yellow (flash) artifacts ([#1046][1046]). +* `Control+Shift+v` and `XF86Paste` have been added to the default set + of key bindings that paste from the clipboard into the scrollback + search buffer. This is in addition to the pre-existing `Control+v` + and `Control+y` bindings. [sway-6960]: https://github.com/swaywm/sway/issues/6960 [1046]: https://codeberg.org/dnkl/foot/issues/1046 diff --git a/README.md b/README.md index 5b819bf5..227c528c 100644 --- a/README.md +++ b/README.md @@ -182,7 +182,7 @@ These are the default shortcuts. See `man foot.ini` and the example : Same as ctrl+w, except that the only word separating characters are whitespace characters. -ctrl+v +ctrl+v, ctrl+shift+v, ctrl+y, XF86Paste : Paste from clipboard into the search buffer. shift+insert diff --git a/config.c b/config.c index 10b899e0..c5fad01a 100644 --- a/config.c +++ b/config.c @@ -2686,7 +2686,9 @@ add_default_search_bindings(struct config *conf) {BIND_ACTION_SEARCH_EXTEND_WORD, m_ctrl, {{XKB_KEY_w}}}, {BIND_ACTION_SEARCH_EXTEND_WORD_WS, m_ctrl_shift, {{XKB_KEY_w}}}, {BIND_ACTION_SEARCH_CLIPBOARD_PASTE, m_ctrl, {{XKB_KEY_v}}}, + {BIND_ACTION_SEARCH_CLIPBOARD_PASTE, m_ctrl_shift, {{XKB_KEY_v}}}, {BIND_ACTION_SEARCH_CLIPBOARD_PASTE, m_ctrl, {{XKB_KEY_y}}}, + {BIND_ACTION_SEARCH_CLIPBOARD_PASTE, m_none, {{XKB_KEY_XF86Paste}}}, {BIND_ACTION_SEARCH_PRIMARY_PASTE, m_shift, {{XKB_KEY_Insert}}}, }; diff --git a/doc/foot.1.scd b/doc/foot.1.scd index dfbc6651..837da048 100644 --- a/doc/foot.1.scd +++ b/doc/foot.1.scd @@ -224,7 +224,7 @@ default) available; see *foot.ini*(5). Same as *ctrl*+*w*, except that the only word separating characters are whitespace characters. -*ctrl*+*v*, *ctrl*+*y* +*ctrl*+*v*, *ctrl*+*shift*+*v*, *ctrl*+*y*, *XF86Paste* Paste from clipboard into the search buffer. *shift*+*insert* diff --git a/foot.ini b/foot.ini index abd3c412..21c49174 100644 --- a/foot.ini +++ b/foot.ini @@ -162,7 +162,7 @@ # delete-next-word=Mod1+d Control+Delete # extend-to-word-boundary=Control+w # extend-to-next-whitespace=Control+Shift+w -# clipboard-paste=Control+v Control+y +# clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste # primary-paste=Shift+Insert [url-bindings]