Merge branch 'control-shift-u'

Closes #1183

CHANGELOG.md

@@ -64,6 +64,10 @@
 ### Changed
 
 * Minimum required meson version is now 0.59 ([#1371][1371]).
+* `Control+Shift+u` is now bound to `unicode-input` instead of
+  `show-urls-launch`, to follow the convention established in GTK and
+  Qt ([#1183][1183]).
+* `show-urls-launch` now bound to `Control+Shift+o` ([#1183][1183]).
 * Kitty keyboard protocol: F3 is now encoded as `CSI 13~` instead of
   `CSI R`. The kitty keyboard protocol originally allowed F3 to be
   encoded as `CSI R`, but this was removed from the specification
@@ -92,6 +96,7 @@
   removed.
 
 [1371]: https://codeberg.org/dnkl/foot/pulls/1371
+[1183]: https://codeberg.org/dnkl/foot/issues/1183
 [1360]: https://codeberg.org/dnkl/foot/issues/1360
 [1383]: https://codeberg.org/dnkl/foot/issues/1383
 
@@ -121,6 +126,9 @@
   0` ([#1377][1377]).
 * Crash when scrolling up while running something that generates a lot
   of output (for example, `yes`) ([#1380][1380]).
+* Default key binding for URL mode conflicting with Unicode input on
+  some DEs; `show-urls-launched` is now mapped to `Control+Shift+o` by
+  default, instead of `Control+Shift+u` ([#1183][1183]).
 
 [1317]: https://codeberg.org/dnkl/foot/issues/1317
 [1355]: https://codeberg.org/dnkl/foot/issues/1355

README.md

@@ -164,10 +164,13 @@ These are the default shortcuts. See `man foot.ini` and the example
   sequence](https://codeberg.org/dnkl/foot/wiki#user-content-spawning-new-terminal-instances-in-the-current-working-directory),
   the new terminal will start in the current working directory.
 
-<kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>u</kbd>
+<kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>o</kbd>
 : Enter URL mode, where all currently visible URLs are tagged with a
   jump label with a key sequence that will open the URL.
 
+<kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>u</kbd>
+: Enter Unicode input mode.
+
 <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>z</kbd>
 : Jump to the previous, currently not visible, prompt. Requires [shell
   integration](https://codeberg.org/dnkl/foot/wiki#user-content-jumping-between-prompts).
@@ -299,7 +302,7 @@ Foot supports URL detection. But, unlike many other terminal
 emulators, where URLs are highlighted when they are hovered and opened
 by clicking on them, foot uses a keyboard driven approach.
 
-Pressing <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>u</kbd> enters _“URL
+Pressing <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>o</kbd> enters _“URL
 mode”_, where all currently visible URLs are underlined, and is
 associated with a _“jump-label”_. The jump-label indicates the _key
 sequence_ (e.g. **”AF”**) to use to activate the URL.

config.c

@@ -2807,7 +2807,8 @@ add_default_key_bindings(struct config *conf)
         {BIND_ACTION_FONT_SIZE_RESET, m_ctrl, {{XKB_KEY_0}}},
         {BIND_ACTION_FONT_SIZE_RESET, m_ctrl, {{XKB_KEY_KP_0}}},
         {BIND_ACTION_SPAWN_TERMINAL, m_ctrl_shift, {{XKB_KEY_n}}},
-        {BIND_ACTION_SHOW_URLS_LAUNCH, m_ctrl_shift, {{XKB_KEY_u}}},
+        {BIND_ACTION_SHOW_URLS_LAUNCH, m_ctrl_shift, {{XKB_KEY_o}}},
+        {BIND_ACTION_UNICODE_INPUT, m_ctrl_shift, {{XKB_KEY_u}}},
         {BIND_ACTION_PROMPT_PREV, m_ctrl_shift, {{XKB_KEY_z}}},
         {BIND_ACTION_PROMPT_NEXT, m_ctrl_shift, {{XKB_KEY_x}}},
     };

doc/foot.1.scd

@@ -202,9 +202,12 @@ default) available; see *foot.ini*(5).
 	_OSC 7_ escape sequence, the new terminal will start in the
 	current working directory.
 
-*ctrl*+*shift*+*u*
+*ctrl*+*shift*+*o*
 	Activate URL mode, allowing you to "launch" URLs.
 
+*ctrl*+*shift*+*u*
+	Activate Unicode input.
+
 *ctrl*+*shift*+*z*
 	Jump to the previous, currently not visible, prompt. Requires
 	shell integration.
@@ -310,7 +313,7 @@ Foot supports URL detection. But, unlike many other terminal
 emulators, where URLs are highlighted when they are hovered and opened
 by clicking on them, foot uses a keyboard driven approach.
 
-Pressing *ctrl*+*shift*+*u* enters _“URL mode”_, where all currently
+Pressing *ctrl*+*shift*+*o* enters _“Open URL mode”_, where all currently
 visible URLs are underlined, and is associated with a
 _“jump-label”_. The jump-label indicates the _key sequence_
 (e.g. *”AF”*) to use to activate the URL.

doc/foot.ini.5.scd

@@ -834,7 +834,7 @@ e.g. *search-start=none*.
 *show-urls-launch*
 	Enter URL mode, where all currently visible URLs are tagged with a
 	jump label with a key sequence that will open the URL (and exit
-	URL mode). Default: _Control+Shift+u_.
+	URL mode). Default: _Control+Shift+o_.
 
 *show-urls-persistent*
 	Similar to *show-urls-launch*, but does not automatically exit URL
@@ -877,7 +877,7 @@ e.g. *search-start=none*.
 	fallback. The preferred way of entering Unicode characters, emojis
 	etc is by using an IME.
 	
-	Default: _none_.
+	Default: _Control+Shift+u_.
 
 # SECTION: search-bindings
 

foot.ini

@@ -152,12 +152,12 @@
 # pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none
 # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none
 # pipe-selected=[xargs -r firefox] none
-# show-urls-launch=Control+Shift+u
+# show-urls-launch=Control+Shift+o
 # show-urls-copy=none
 # show-urls-persistent=none
 # prompt-prev=Control+Shift+z
 # prompt-next=Control+Shift+x
-# unicode-input=none
+# unicode-input=Control+Shift+u
 # noop=none
 
 [search-bindings]