Merge remote-tracking branch 'refs/remotes/origin/master'

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 * [Unreleased](#unreleased)
+* [1.24.0](#1-24-0)
 * [1.23.1](#1-23-1)
 * [1.23.0](#1-23-0)
 * [1.22.3](#1-22-3)
@@ -67,10 +68,28 @@
 
 ## Unreleased
 ### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+### Contributors
+
+
+## 1.24.0
+
+### Added
+
+* The `uppercase-regex-insert` option controls whether an uppercase hint
+  character will insert the selected text into the prompt in `regex-copy`
+  or `show-urls-copy` mode. It defaults to `true`. ([#2159][2159]).
+
+[2159]: https://codeberg.org/dnkl/foot/issues/2159
+
 ### Changed
 
 * The label letters are no longer sorted before being assigned to URLs
-  ([#2140]2140[]).
+  ([#2140][2140]).
 * Sending SIGUSR1/SIGUSR2 to a `foot --server` process now causes
   newly spawned client instances to use the selected theme, instead of
   the original one.
@@ -80,12 +99,18 @@
 [2156]: https://codeberg.org/dnkl/foot/issues/2156
 
 
-### Deprecated
-### Removed
 ### Fixed
-### Security
+
+* Invalid configuration values overriding valid ones in surprising
+  ways.
+* Bug where the libutempter utmp backend did not record logouts
+  correctly.
+
 ### Contributors
 
+* Ryan Roden-Corrent
+* Tobias Mock
+
 
 ## 1.23.1
 

config.c

@@ -483,8 +483,12 @@ str_to_ulong(const char *s, int base, unsigned long *res)
     errno = 0;
     char *end = NULL;
 
-    *res = strtoul(s, &end, base);
-    return errno == 0 && *end == '\0';
+    unsigned long v = strtoul(s, &end, base);
+    if (!(errno == 0 && *end == '\0'))
+        return false;
+
+    *res = v;
+    return true;
 }
 
 static bool NOINLINE
@@ -553,12 +557,13 @@ value_to_float(struct context *ctx, float *res)
     errno = 0;
     char *end = NULL;
 
-    *res = strtof(s, &end);
+    float v = strtof(s, &end);
     if (!(errno == 0 && *end == '\0')) {
         LOG_CONTEXTUAL_ERR("invalid decimal value");
         return false;
     }
 
+    *res = v;
     return true;
 }
 
@@ -650,7 +655,6 @@ value_to_enum(struct context *ctx, const char **value_map, int *res)
         valid_values[idx - 2] = '\0';
 
     LOG_CONTEXTUAL_ERR("not one of %s", valid_values);
-    *res = -1;
     return false;
 }
 
@@ -699,14 +703,18 @@ value_to_two_colors(struct context *ctx,
         goto out;
     }
 
+    uint32_t a, b;
+
     ctx->value = first_as_str;
-    if (!value_to_color(ctx, first, allow_alpha))
+    if (!value_to_color(ctx, &a, allow_alpha))
         goto out;
 
     ctx->value = second_as_str;
-    if (!value_to_color(ctx, second, allow_alpha))
+    if (!value_to_color(ctx, &b, allow_alpha))
         goto out;
 
+    *first = a;
+    *second = b;
     ret = true;
 
 out:
@@ -1134,6 +1142,9 @@ parse_section_main(struct context *ctx)
                              (int *)&conf->initial_color_theme);
     }
 
+    else if (streq(key, "uppercase-regex-insert"))
+        return value_to_bool(ctx, &conf->uppercase_regex_insert);
+
     else {
         LOG_CONTEXTUAL_ERR("not a valid option: %s", key);
         return false;
@@ -3453,6 +3464,7 @@ config_load(struct config *conf, const char *conf_path,
         .strikeout_thickness = {.pt = 0., .px = -1},
         .dpi_aware = false,
         .gamma_correct = false,
+        .uppercase_regex_insert = true,
         .security = {
             .osc52 = OSC52_ENABLED,
         },

config.h

@@ -261,6 +261,7 @@ struct config {
 
     bool dpi_aware;
     bool gamma_correct;
+    bool uppercase_regex_insert;
     struct config_font_list fonts[4];
     struct font_size_adjustment font_size_adjustment;
 

doc/foot.ini.5.scd

@@ -231,6 +231,13 @@ empty string to be set, but it must be quoted: *KEY=""*)
 	
 	Default: _no_.
 
+*uppercase-regex-insert*
+	Boolean. When enabled, inputting an uppercase hint character in
+	*show-urls-copy* or *regex-copy* mode will insert the selected
+	text into the prompt in addition to copying it to the clipboard.
+
+	Default: _yes_
+
 *box-drawings-uses-font-glyphs*
 	Boolean. When disabled, foot generates box/line drawing characters
 	itself. The are several advantages to doing this instead of using

foot.ini

@@ -40,6 +40,8 @@
 # utmp-helper=/usr/lib/utempter/utempter  # When utmp backend is ‘libutempter’ (Linux)
 # utmp-helper=/usr/libexec/ulog-helper    # When utmp backend is ‘ulog’ (FreeBSD)
 
+# uppercase-regex-insert=yes
+
 [environment]
 # name=value
 

input.c

@@ -1889,7 +1889,7 @@ keyboard_modifiers(void *data, struct wl_keyboard *wl_keyboard, uint32_t serial,
 UNITTEST
 {
     int chan[2];
-    pipe2(chan, O_CLOEXEC);
+    xassert(pipe2(chan, O_CLOEXEC) == 0);
 
     xassert(chan[0] >= 0);
     xassert(chan[1] >= 0);

meson.build

@@ -1,5 +1,5 @@
 project('foot', 'c',
-        version: '1.23.1',
+        version: '1.24.0',
         license: 'MIT',
         meson_version: '>=0.59.0',
         default_options: [
@@ -53,7 +53,7 @@ if utmp_backend == 'none'
 elif utmp_backend == 'libutempter'
   utmp_add = 'add'
   utmp_del = 'del'
-  utmp_del_have_argument = true
+  utmp_del_have_argument = false
   if utmp_default_helper_path == 'auto'
     utmp_default_helper_path = join_paths('/usr', get_option('libdir'), 'utempter', 'utempter')
   endif

terminal.c

@@ -199,7 +199,7 @@ add_utmp_record(const struct config *conf, struct reaper *reaper, int ptmx)
         return true;
 
     char *const argv[] = {conf->utmp_helper_path, UTMP_ADD, getenv("WAYLAND_DISPLAY"), NULL};
-    return spawn(reaper, NULL, argv, ptmx, ptmx, -1, NULL, NULL, NULL) >= 0;
+    return spawn(reaper, NULL, argv, ptmx, -1, -1, NULL, NULL, NULL) >= 0;
 #else
     return true;
 #endif
@@ -223,7 +223,7 @@ del_utmp_record(const struct config *conf, struct reaper *reaper, int ptmx)
         ;
 
     char *const argv[] = {conf->utmp_helper_path, UTMP_DEL, del_argument, NULL};
-    return spawn(reaper, NULL, argv, ptmx, ptmx, -1, NULL, NULL, NULL) >= 0;
+    return spawn(reaper, NULL, argv, ptmx, -1, -1, NULL, NULL, NULL) >= 0;
 #else
     return true;
 #endif

tests/test-config.c

@@ -491,6 +491,7 @@ test_section_main(void)
     test_boolean(&ctx, &parse_section_main, "locked-title", &conf.locked_title);
     test_boolean(&ctx, &parse_section_main, "dpi-aware", &conf.dpi_aware);
     test_boolean(&ctx, &parse_section_main, "gamma-correct-blending", &conf.gamma_correct);
+    test_boolean(&ctx, &parse_section_main, "uppercase-regex-insert", &conf.uppercase_regex_insert);
 
     test_pt_or_px(&ctx, &parse_section_main, "font-size-adjustment", &conf.font_size_adjustment.pt_or_px);  /* TODO: test ‘N%’ values too */
     test_pt_or_px(&ctx, &parse_section_main, "line-height", &conf.line_height);

url-mode.c

@@ -283,7 +283,8 @@ urls_input(struct seat *seat, struct terminal *term,
 
     if (match) {
         // If the last hint character was uppercase, copy and paste
-        activate_url(seat, term, match, serial, wc == toc32upper(wc));
+        bool insert = term->conf->uppercase_regex_insert && wc == toc32upper(wc);
+        activate_url(seat, term, match, serial, insert);
 
         switch (match->action) {
         case URL_ACTION_COPY: