diff options
author | Wolfgang Müller | 2022-11-19 17:44:00 +0100 |
---|---|---|
committer | Wolfgang Müller | 2022-11-19 17:44:00 +0100 |
commit | a2ab0abdbb2d98cc9f458c03213bc22cdc77d6db (patch) | |
tree | 71664bf8730dac72d1ca9dc6e32b6ed11376bff6 /terminal.vala | |
parent | dd8daea59e7f93c8bc17627e5573bd7f7191319b (diff) | |
download | weltschmerz-a2ab0abdbb2d98cc9f458c03213bc22cdc77d6db.tar.gz |
Use spawn_async instead of spawn_sync
The 'spawn_sync' function has been deprecated for a very long time now,
but we could never use its intended replacement as its Vala bindings
were broken [1]. The underlying problem had been identified in [2] a
while ago, but has only been recently fixed in [3] and is now available
in Vala's 0.56 branch.
Since we rely on the child PID as a fallback for opinionated users or
shells that are unaware of OSC 7, we have to pass a callback function to
the 'spawn_async' call so we can capture the PID which is no longer
supplied by the method itself.
[1] https://gitlab.gnome.org/GNOME/vte/issues/227
[2] https://gitlab.gnome.org/GNOME/vala/-/issues/721
[3] https://gitlab.gnome.org/GNOME/vala/-/commit/f058e9e828f494ebf8d60cabff7999f219048623
Diffstat (limited to 'terminal.vala')
-rw-r--r-- | terminal.vala | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/terminal.vala b/terminal.vala index e2c8d48..67256d4 100644 --- a/terminal.vala +++ b/terminal.vala @@ -80,16 +80,26 @@ class Terminal : Gtk.Overlay { var regex = new Vte.Regex.for_match(URL_REGEX, URL_REGEX.length, PCRE2_CASELESS | PCRE2_MULTILINE); vte.match_add_regex(regex, 0); vte.match_set_cursor_name(0, "pointer"); - - var argv = args[1:args.length]; - if (argv.length == 0) { - argv = { Utils.get_shell() }; - } - - vte.spawn_sync(DEFAULT, null, argv, null, SEARCH_PATH, null, out child_pid, null); } catch (Error e) { error(e.message); } + + var argv = args[1:args.length]; + if (argv.length == 0) { + argv = { Utils.get_shell() }; + } + + Vte.TerminalSpawnAsyncCallback callback = this.spawn_terminal_callback; + vte.spawn_async(DEFAULT, null, argv, null, SEARCH_PATH, null, -1, null, callback); + } + + void spawn_terminal_callback(Vte.Terminal terminal, Pid pid, Error? error) { + if (error != null) { + print("weltschmerz: %s\n".printf(error.message)); + Process.exit(1); + } + + this.child_pid = pid; } Gtk.PolicyType get_scrollbar_policy(bool want_scrollbar) { |