Skip to content

Voice-to-text dictation app with local (Nvidia Parakeet/Whisper) and cloud models (BYOK). Privacy-first and available cross-platform.

feat: Linux Wayland paste reliability improvements (#351)

Alcahest2b13a6be2da5
diff --git a/resources/linux-fast-paste.c b/resources/linux-fast-paste.c
index 195ef150d..0a55d33fd 100644
--- a/resources/linux-fast-paste.c
+++ b/resources/linux-fast-paste.c
@@ -17,6 +17,323 @@
#include <errno.h>
#endif
+#ifdef HAVE_GIO
+#include <gio/gio.h>
+
+#define PORTAL_BUS "org.freedesktop.portal.Desktop"
+#define PORTAL_PATH "/org/freedesktop/portal/desktop"
+#define PORTAL_IFACE "org.freedesktop.portal.RemoteDesktop"
+#define REQUEST_IFACE "org.freedesktop.portal.Request"
+
+/* evdev keycodes for portal mode */
+#define PORTAL_KEY_LEFTCTRL 29
+#define PORTAL_KEY_LEFTSHIFT 42
+#define PORTAL_KEY_V 47
+
+static int portal_exit_code = 0;
+
+typedef struct {
+ GDBusConnection *conn;
+ GMainLoop *loop;
+ char *session_handle;
+ char *restore_token;
+ guint signal_id;
+ int use_shift;
+} PortalData;
+
+static char *get_sender_path(GDBusConnection *conn)
+{
+ const char *name = g_dbus_connection_get_unique_name(conn);
+ char *path = g_strdup(name + 1);
+ for (char *p = path; *p; p++) {
+ if (*p == '.') *p = '_';
+ }
+ return path;
+}
+
+static guint subscribe_response(PortalData *app, const char *request_path,
+ GDBusSignalCallback callback)
+{
+ return g_dbus_connection_signal_subscribe(
+ app->conn, PORTAL_BUS, REQUEST_IFACE, "Response",
+ request_path, NULL, G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
+ callback, app, NULL);
+}
+
+static void portal_send_paste(PortalData *app)
+{
+ GError *err = NULL;
+ GVariant *opts;
+
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_LEFTCTRL, (guint32)1),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "Ctrl press: %s\n", err->message); g_clear_error(&err); }
+
+ if (app->use_shift) {
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_LEFTSHIFT, (guint32)1),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "Shift press: %s\n", err->message); g_clear_error(&err); }
+ }
+
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_V, (guint32)1),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "V press: %s\n", err->message); g_clear_error(&err); }
+
+ usleep(20000);
+
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_V, (guint32)0),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "V release: %s\n", err->message); g_clear_error(&err); }
+
+ if (app->use_shift) {
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_LEFTSHIFT, (guint32)0),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "Shift release: %s\n", err->message); g_clear_error(&err); }
+ }
+
+ opts = g_variant_new("a{sv}", NULL);
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "NotifyKeyboardKeycode",
+ g_variant_new("(o@a{sv}iu)", app->session_handle, opts,
+ (gint32)PORTAL_KEY_LEFTCTRL, (guint32)0),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+ if (err) { fprintf(stderr, "Ctrl release: %s\n", err->message); g_clear_error(&err); }
+
+ g_main_loop_quit(app->loop);
+}
+
+static void on_start_response(GDBusConnection *conn, const char *sender,
+ const char *object_path, const char *interface_name,
+ const char *signal_name, GVariant *parameters, gpointer user_data)
+{
+ PortalData *app = user_data;
+ guint32 response;
+ GVariant *results;
+
+ g_variant_get(parameters, "(u@a{sv})", &response, &results);
+ g_dbus_connection_signal_unsubscribe(app->conn, app->signal_id);
+
+ if (response != 0) {
+ fprintf(stderr, "Start cancelled (response=%u)\n", response);
+ portal_exit_code = 3;
+ g_variant_unref(results);
+ g_main_loop_quit(app->loop);
+ return;
+ }
+
+ GVariant *token_v = g_variant_lookup_value(results, "restore_token",
+ G_VARIANT_TYPE_STRING);
+ if (token_v) {
+ const char *token = g_variant_get_string(token_v, NULL);
+ printf("%s\n", token);
+ fflush(stdout);
+ g_variant_unref(token_v);
+ }
+
+ g_variant_unref(results);
+ portal_send_paste(app);
+}
+
+static void on_select_devices_response(GDBusConnection *conn, const char *sender,
+ const char *object_path, const char *interface_name,
+ const char *signal_name, GVariant *parameters, gpointer user_data)
+{
+ PortalData *app = user_data;
+ guint32 response;
+ GVariant *results;
+
+ g_variant_get(parameters, "(u@a{sv})", &response, &results);
+ g_dbus_connection_signal_unsubscribe(app->conn, app->signal_id);
+ g_variant_unref(results);
+
+ if (response != 0) {
+ fprintf(stderr, "SelectDevices denied (response=%u)\n", response);
+ portal_exit_code = 2;
+ g_main_loop_quit(app->loop);
+ return;
+ }
+
+ char *sender_path = get_sender_path(app->conn);
+ char *request_path = g_strdup_printf(
+ "/org/freedesktop/portal/desktop/request/%s/start", sender_path);
+ g_free(sender_path);
+
+ app->signal_id = subscribe_response(app, request_path, on_start_response);
+
+ GVariantBuilder opts;
+ g_variant_builder_init(&opts, G_VARIANT_TYPE("a{sv}"));
+ g_variant_builder_add(&opts, "{sv}", "handle_token",
+ g_variant_new_string("start"));
+
+ GError *err = NULL;
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "Start",
+ g_variant_new("(os@a{sv})", app->session_handle, "",
+ g_variant_builder_end(&opts)),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+
+ g_free(request_path);
+ if (err) {
+ fprintf(stderr, "Start call failed: %s\n", err->message);
+ g_error_free(err);
+ portal_exit_code = 1;
+ g_main_loop_quit(app->loop);
+ }
+}
+
+static void on_create_session_response(GDBusConnection *conn, const char *sender,
+ const char *object_path, const char *interface_name,
+ const char *signal_name, GVariant *parameters, gpointer user_data)
+{
+ PortalData *app = user_data;
+ guint32 response;
+ GVariant *results;
+
+ g_variant_get(parameters, "(u@a{sv})", &response, &results);
+ g_dbus_connection_signal_unsubscribe(app->conn, app->signal_id);
+
+ if (response != 0) {
+ fprintf(stderr, "CreateSession denied (response=%u)\n", response);
+ portal_exit_code = 2;
+ g_variant_unref(results);
+ g_main_loop_quit(app->loop);
+ return;
+ }
+
+ GVariant *handle_v = g_variant_lookup_value(results, "session_handle",
+ G_VARIANT_TYPE_STRING);
+ app->session_handle = g_variant_dup_string(handle_v, NULL);
+ g_variant_unref(handle_v);
+ g_variant_unref(results);
+
+ char *sender_path = get_sender_path(app->conn);
+ char *request_path = g_strdup_printf(
+ "/org/freedesktop/portal/desktop/request/%s/selectdevices",
+ sender_path);
+ g_free(sender_path);
+
+ app->signal_id = subscribe_response(app, request_path,
+ on_select_devices_response);
+
+ GVariantBuilder opts;
+ g_variant_builder_init(&opts, G_VARIANT_TYPE("a{sv}"));
+ g_variant_builder_add(&opts, "{sv}", "handle_token",
+ g_variant_new_string("selectdevices"));
+ g_variant_builder_add(&opts, "{sv}", "types",
+ g_variant_new_uint32(1)); /* KEYBOARD only */
+ g_variant_builder_add(&opts, "{sv}", "persist_mode",
+ g_variant_new_uint32(2)); /* persistent */
+
+ if (app->restore_token) {
+ g_variant_builder_add(&opts, "{sv}", "restore_token",
+ g_variant_new_string(app->restore_token));
+ }
+
+ GError *err = NULL;
+ g_dbus_connection_call_sync(app->conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "SelectDevices",
+ g_variant_new("(o@a{sv})", app->session_handle,
+ g_variant_builder_end(&opts)),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+
+ g_free(request_path);
+ if (err) {
+ fprintf(stderr, "SelectDevices call failed: %s\n", err->message);
+ g_error_free(err);
+ portal_exit_code = 1;
+ g_main_loop_quit(app->loop);
+ }
+}
+
+static gboolean on_portal_timeout(gpointer user_data)
+{
+ PortalData *app = user_data;
+ fprintf(stderr, "Timeout waiting for portal response\n");
+ portal_exit_code = 1;
+ g_main_loop_quit(app->loop);
+ return G_SOURCE_REMOVE;
+}
+
+static int paste_via_portal(int use_shift, const char *restore_token)
+{
+ PortalData app = { 0 };
+ app.use_shift = use_shift;
+ if (restore_token) app.restore_token = g_strdup(restore_token);
+
+ GError *err = NULL;
+ app.conn = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &err);
+ if (!app.conn) {
+ fprintf(stderr, "D-Bus connection failed: %s\n", err->message);
+ g_error_free(err);
+ g_free(app.restore_token);
+ return 1;
+ }
+
+ app.loop = g_main_loop_new(NULL, FALSE);
+ g_timeout_add_seconds(10, on_portal_timeout, &app);
+
+ char *sender_path = get_sender_path(app.conn);
+ char *request_path = g_strdup_printf(
+ "/org/freedesktop/portal/desktop/request/%s/createsession",
+ sender_path);
+ g_free(sender_path);
+
+ app.signal_id = subscribe_response(&app, request_path,
+ on_create_session_response);
+
+ GVariantBuilder opts;
+ g_variant_builder_init(&opts, G_VARIANT_TYPE("a{sv}"));
+ g_variant_builder_add(&opts, "{sv}", "handle_token",
+ g_variant_new_string("createsession"));
+ g_variant_builder_add(&opts, "{sv}", "session_handle_token",
+ g_variant_new_string("openwhispr"));
+
+ g_dbus_connection_call_sync(app.conn, PORTAL_BUS, PORTAL_PATH,
+ PORTAL_IFACE, "CreateSession",
+ g_variant_new("(@a{sv})", g_variant_builder_end(&opts)),
+ NULL, G_DBUS_CALL_FLAGS_NONE, -1, NULL, &err);
+
+ g_free(request_path);
+ if (err) {
+ fprintf(stderr, "CreateSession failed: %s\n", err->message);
+ g_error_free(err);
+ g_main_loop_unref(app.loop);
+ g_free(app.restore_token);
+ g_object_unref(app.conn);
+ return 1;
+ }
+
+ g_main_loop_run(app.loop);
+
+ g_main_loop_unref(app.loop);
+ g_free(app.session_handle);
+ g_free(app.restore_token);
+ g_object_unref(app.conn);
+
+ return portal_exit_code;
+}
+#endif /* HAVE_GIO */
+
static const char *terminal_classes[] = {
"konsole", "gnome-terminal", "terminal", "kitty", "alacritty",
"terminator", "xterm", "urxvt", "rxvt", "tilix", "terminology",
@@ -56,7 +373,6 @@ static Window get_active_window(Display *dpy) {
return focused;
}
-/* Send _NET_ACTIVE_WINDOW client message then fall back to XSetInputFocus */
static void activate_window(Display *dpy, Window win) {
Atom net_active = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
XEvent ev;
@@ -65,7 +381,7 @@ static void activate_window(Display *dpy, Window win) {
ev.xclient.window = win;
ev.xclient.message_type = net_active;
ev.xclient.format = 32;
- ev.xclient.data.l[0] = 2; /* source: pager / direct call */
+ ev.xclient.data.l[0] = 2; /* source: pager */
ev.xclient.data.l[1] = CurrentTime;
ev.xclient.data.l[2] = 0;
@@ -73,10 +389,8 @@ static void activate_window(Display *dpy, Window win) {
SubstructureNotifyMask | SubstructureRedirectMask, &ev);
XFlush(dpy);
- /* Give the WM time to process the activation request */
usleep(50000);
- /* Fallback: also set X input focus directly */
XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
XFlush(dpy);
usleep(20000);
@@ -90,7 +404,7 @@ static void emit(int fd, int type, int code, int val) {
ie.code = code;
ie.value = val;
if (write(fd, &ie, sizeof(ie)) < 0) {
- /* best-effort: logged by caller via exit code */
+ /* best-effort */
}
}
@@ -122,7 +436,6 @@ static int paste_via_uinput(int use_shift) {
return 4;
}
- /* Let the kernel register the virtual device */
usleep(50000);
emit(fd, EV_KEY, KEY_LEFTCTRL, 1);
@@ -163,6 +476,8 @@ static int paste_via_uinput(int use_shift) {
int main(int argc, char *argv[]) {
int force_terminal = 0;
int use_uinput = 0;
+ int use_portal = 0;
+ const char *restore_token = NULL;
Window target_window = None;
for (int i = 1; i < argc; i++) {
@@ -170,11 +485,24 @@ int main(int argc, char *argv[]) {
force_terminal = 1;
} else if (strcmp(argv[i], "--uinput") == 0) {
use_uinput = 1;
+ } else if (strcmp(argv[i], "--portal") == 0) {
+ use_portal = 1;
+ } else if (strcmp(argv[i], "--restore-token") == 0 && i + 1 < argc) {
+ restore_token = argv[++i];
} else if (strcmp(argv[i], "--window") == 0 && i + 1 < argc) {
target_window = (Window)strtoul(argv[++i], NULL, 0);
}
}
+ if (use_portal) {
+#ifdef HAVE_GIO
+ return paste_via_portal(force_terminal, restore_token);
+#else
+ fprintf(stderr, "portal support not compiled in\n");
+ return 5;
+#endif
+ }
+
if (use_uinput) {
#ifdef HAVE_UINPUT
return paste_via_uinput(force_terminal);
diff --git a/scripts/build-linux-fast-paste.js b/scripts/build-linux-fast-paste.js
index ca3ebaf4c..f41e5bc19 100755
--- a/scripts/build-linux-fast-paste.js
+++ b/scripts/build-linux-fast-paste.js
@@ -60,11 +60,43 @@ function hasUinputHeaders() {
return false;
}
+function hasGio() {
+ try {
+ const result = spawnSync("pkg-config", ["--exists", "gio-2.0"], {
+ stdio: "pipe",
+ });
+ return result.status === 0;
+ } catch {}
+ return false;
+}
+
+function getGioFlags() {
+ try {
+ const cflags = spawnSync("pkg-config", ["--cflags", "gio-2.0"], {
+ stdio: "pipe",
+ });
+ const libs = spawnSync("pkg-config", ["--libs", "gio-2.0"], {
+ stdio: "pipe",
+ });
+ if (cflags.status === 0 && libs.status === 0) {
+ return [
+ ...cflags.stdout.toString().trim().split(/\s+/),
+ ...libs.stdout.toString().trim().split(/\s+/),
+ ].filter(Boolean);
+ }
+ } catch {}
+ return [];
+}
+
const uinputAvailable = hasUinputHeaders();
+const gioAvailable = hasGio();
function computeBuildHash() {
const sourceContent = fs.readFileSync(cSource, "utf8");
- const flags = uinputAvailable ? "uinput" : "nouinput";
+ const flags = [
+ uinputAvailable ? "uinput" : "nouinput",
+ gioAvailable ? "gio" : "nogio",
+ ].join("+");
return crypto
.createHash("sha256")
.update(sourceContent + flags)
@@ -111,6 +143,13 @@ if (uinputAvailable) {
log("uinput headers not found, building without uinput support");
}
+if (gioAvailable) {
+ log("gio-2.0 found, enabling portal support");
+ compileArgs.push("-DHAVE_GIO", ...getGioFlags());
+} else {
+ log("gio-2.0 not found, building without portal support");
+}
+
let result = attemptCompile("gcc", compileArgs);
if (result.status !== 0) {
diff --git a/src/components/ui/MarkdownTextarea.tsx b/src/components/ui/MarkdownTextarea.tsx
index 18b713582..55445a31f 100644
--- a/src/components/ui/MarkdownTextarea.tsx
+++ b/src/components/ui/MarkdownTextarea.tsx
@@ -255,8 +255,10 @@ export function MarkdownTextarea({
applyChange(ta, start, end, "**");
ta.setSelectionRange(start + 1, start + 1);
} else if (
- val[start - 1] === "*" && val[start - 2] !== "*" &&
- val[end] === "*" && val[end + 1] !== "*"
+ val[start - 1] === "*" &&
+ val[start - 2] !== "*" &&
+ val[end] === "*" &&
+ val[end + 1] !== "*"
) {
applyChange(ta, start - 1, end + 1, sel);
ta.setSelectionRange(start - 1, start - 1 + sel.length);
diff --git a/src/helpers/clipboard.js b/src/helpers/clipboard.js
index 793373e3e..cb20b97d9 100644
--- a/src/helpers/clipboard.js
+++ b/src/helpers/clipboard.js
@@ -3,6 +3,7 @@ const { spawn, spawnSync } = require("child_process");
const { killProcess } = require("../utils/process");
const path = require("path");
const fs = require("fs");
+const os = require("os");
const debugLogger = require("./debugLogger");
const CACHE_TTL_MS = 30000;
@@ -240,6 +241,24 @@ class ClipboardManager {
}
}
+ _isYdotoolLegacy() {
+ if (this._ydotoolLegacyChecked !== undefined) return this._ydotoolLegacyChecked;
+ try {
+ const result = spawnSync("ydotool", ["help"], { stdio: "pipe", timeout: 2000 });
+ const output = (result.stdout?.toString() || "") + (result.stderr?.toString() || "");
+ // ydotool 1.0.x has 'bakers' subcommand that 0.1.x doesn't
+ this._ydotoolLegacyChecked = !output.includes("bakers");
+ } catch {
+ this._ydotoolLegacyChecked = false;
+ }
+ debugLogger.debug(
+ "ydotool version detection",
+ { legacy: this._ydotoolLegacyChecked },
+ "clipboard"
+ );
+ return this._ydotoolLegacyChecked;
+ }
+
_canAccessUinput() {
if (process.platform !== "linux") return false;
const now = Date.now();
@@ -255,6 +274,97 @@ class ClipboardManager {
return accessible;
}
+ _getPortalTokenPath() {
+ const cacheDir = path.join(
+ process.env.XDG_CACHE_HOME || path.join(os.homedir(), ".cache"),
+ "openwhispr"
+ );
+ return path.join(cacheDir, "portal-paste-token");
+ }
+
+ _readPortalToken() {
+ try {
+ return fs.readFileSync(this._getPortalTokenPath(), "utf8").trim() || null;
+ } catch {
+ return null;
+ }
+ }
+
+ _savePortalToken(token) {
+ try {
+ const tokenPath = this._getPortalTokenPath();
+ const dir = path.dirname(tokenPath);
+ if (!fs.existsSync(dir)) {
+ fs.mkdirSync(dir, { recursive: true });
+ }
+ fs.writeFileSync(tokenPath, token);
+ } catch (err) {
+ debugLogger.warn("Failed to save portal-paste token", { error: err.message }, "clipboard");
+ }
+ }
+
+ _runPortalPaste(fastPasteBinary, useShift) {
+ return new Promise((resolve, reject) => {
+ const args = ["--portal"];
+ if (useShift) args.push("--terminal");
+
+ const restoreToken = this._readPortalToken();
+ if (restoreToken) {
+ args.push("--restore-token", restoreToken);
+ }
+
+ debugLogger.debug(
+ "Attempting linux-fast-paste --portal (RemoteDesktop D-Bus)",
+ { binary: fastPasteBinary, hasToken: !!restoreToken },
+ "clipboard"
+ );
+
+ const proc = spawn(fastPasteBinary, args);
+ let stdout = "";
+ let stderr = "";
+
+ proc.stdout?.on("data", (data) => {
+ stdout += data.toString();
+ });
+
+ proc.stderr?.on("data", (data) => {
+ stderr += data.toString();
+ });
+
+ let timedOut = false;
+ const timeoutId = setTimeout(() => {
+ timedOut = true;
+ killProcess(proc, "SIGKILL");
+ }, 15000); // Portal may show a user dialog, allow more time
+
+ proc.on("close", (code) => {
+ if (timedOut) return reject(new Error("linux-fast-paste --portal timed out"));
+ clearTimeout(timeoutId);
+ if (code === 0) {
+ const newToken = stdout.trim();
+ if (newToken) {
+ this._savePortalToken(newToken);
+ }
+ resolve(newToken || null);
+ } else if (code === 5) {
+ reject(new Error("portal support not compiled in"));
+ } else {
+ reject(
+ new Error(
+ `linux-fast-paste --portal exited with code ${code}${stderr ? `: ${stderr.trim()}` : ""}`
+ )
+ );
+ }
+ });
+
+ proc.on("error", (error) => {
+ if (timedOut) return;
+ clearTimeout(timeoutId);
+ reject(error);
+ });
+ });
+ }
+
_detectKdeWindowClass() {
if (this.commandExists("kdotool")) {
try {
@@ -385,8 +495,7 @@ class ClipboardManager {
}
await this.pasteWindows(originalClipboard);
} else {
- method = this.resolveLinuxFastPasteBinary() ? "linux-xtest" : "linux-tools";
- await this.pasteLinux(originalClipboard, options);
+ method = (await this.pasteLinux(originalClipboard, options)) || "linux-tools";
}
this.safeLog("✅ Paste operation complete", {
@@ -924,6 +1033,29 @@ class ClipboardManager {
});
if (isWayland) {
+ // On GNOME/KDE Wayland, try portal mode first (RemoteDesktop D-Bus portal).
+ // uinput events are accepted by the kernel but Mutter doesn't reliably
+ // route them to focused native Wayland windows (issue #292).
+ if ((isGnome || isKde) && linuxFastPaste) {
+ try {
+ const portalResult = await this._runPortalPaste(linuxFastPaste, earlyIsTerminal);
+ this.safeLog("✅ Paste successful using linux-fast-paste --portal (RemoteDesktop)");
+ debugLogger.info(
+ "Paste successful",
+ { tool: "linux-fast-paste", method: "portal", token: !!portalResult },
+ "clipboard"
+ );
+ restoreClipboard();
+ return "portal";
+ } catch (portalError) {
+ debugLogger.warn(
+ "linux-fast-paste --portal failed, falling back to uinput",
+ { error: portalError?.message },
+ "clipboard"
+ );
+ }
+ }
+
const uinputArgs = ["--uinput"];
if (earlyIsTerminal) uinputArgs.push("--terminal");
@@ -936,7 +1068,7 @@ class ClipboardManager {
"clipboard"
);
restoreClipboard();
- return;
+ return "uinput";
} catch (uinputError) {
debugLogger.warn("uinput paste failed", { error: uinputError?.message }, "clipboard");
@@ -954,7 +1086,7 @@ class ClipboardManager {
"clipboard"
);
restoreClipboard();
- return;
+ return "xtest-xwayland";
} catch (xtestError) {
debugLogger.warn(
"XTest/XWayland fallback also failed",
@@ -982,7 +1114,7 @@ class ClipboardManager {
"clipboard"
);
restoreClipboard();
- return;
+ return "xtest";
} catch (error) {
this.safeLog(
`⚠️ Native linux-fast-paste failed: ${error?.message || error}, falling back to system tools`
@@ -1007,7 +1139,10 @@ class ClipboardManager {
};
const inTerminal = isTerminal();
- const pasteKeys = inTerminal ? "ctrl+shift+v" : "ctrl+v";
+ // On Wayland, when window class is unknown, use Shift+Insert as universal paste
+ // (works in both terminals and GUI apps, avoids Ctrl+V printing ^V in terminals)
+ const useShiftInsert = isWayland && !detectedWindowClass;
+ const pasteKeys = useShiftInsert ? "shift+Insert" : inTerminal ? "ctrl+shift+v" : "ctrl+v";
const canUseWtype = isWayland && isWlroots;
const canUseYdotool = ydotoolDaemonRunning;
@@ -1024,22 +1159,31 @@ class ClipboardManager {
);
}
- // Raw keycodes work across both ydotool 0.1.x and 1.0.x (key names silently fail on 1.0.x)
- // 29 = KEY_LEFTCTRL, 42 = KEY_LEFTSHIFT, 47 = KEY_V
- const ydotoolArgs = inTerminal
- ? ["key", "29:1", "42:1", "47:1", "47:0", "42:0", "29:0"]
- : ["key", "29:1", "47:1", "47:0", "29:0"];
-
- const wtypeEntry = canUseWtype
- ? [
- inTerminal
- ? {
- cmd: "wtype",
- args: ["-M", "ctrl", "-M", "shift", "-k", "v", "-m", "shift", "-m", "ctrl"],
- }
- : { cmd: "wtype", args: ["-M", "ctrl", "-k", "v", "-m", "ctrl"] },
- ]
- : [];
+ // ydotool 0.1.x (Ubuntu 24.04) uses key names; 1.0.x uses raw keycodes
+ // 29 = KEY_LEFTCTRL, 42 = KEY_LEFTSHIFT, 47 = KEY_V, 110 = KEY_INSERT
+ const legacyYdotool = this._isYdotoolLegacy();
+ let ydotoolArgs;
+ if (useShiftInsert) {
+ ydotoolArgs = legacyYdotool
+ ? ["key", "shift+Insert"]
+ : ["key", "42:1", "110:1", "110:0", "42:0"];
+ } else if (inTerminal) {
+ ydotoolArgs = legacyYdotool
+ ? ["key", "ctrl+shift+v"]
+ : ["key", "29:1", "42:1", "47:1", "47:0", "42:0", "29:0"];
+ } else {
+ ydotoolArgs = legacyYdotool ? ["key", "ctrl+v"] : ["key", "29:1", "47:1", "47:0", "29:0"];
+ }
+
+ let wtypeArgs;
+ if (useShiftInsert) {
+ wtypeArgs = ["-M", "shift", "-k", "Insert", "-m", "shift"];
+ } else if (inTerminal) {
+ wtypeArgs = ["-M", "ctrl", "-M", "shift", "-k", "v", "-m", "shift", "-m", "ctrl"];
+ } else {
+ wtypeArgs = ["-M", "ctrl", "-k", "v", "-m", "ctrl"];
+ }
+ const wtypeEntry = canUseWtype ? [{ cmd: "wtype", args: wtypeArgs }] : [];
const xdotoolEntry = canUseXdotool ? [{ cmd: "xdotool", args: xdotoolArgs }] : [];
const ydotoolEntry = canUseYdotool ? [{ cmd: "ydotool", args: ydotoolArgs }] : [];
@@ -1066,6 +1210,7 @@ class ClipboardManager {
targetWindowId,
detectedWindowClass,
inTerminal,
+ useShiftInsert,
pasteKeys,
},
"clipboard"
@@ -1164,7 +1309,7 @@ class ClipboardManager {
await pasteWith(tool);
this.safeLog(`✅ Paste successful using ${tool.cmd}`);
debugLogger.info("Paste successful", { tool: tool.cmd }, "clipboard");
- return;
+ return tool.cmd;
} catch (error) {
const failureInfo = {
tool: tool.cmd,
@@ -1199,7 +1344,7 @@ class ClipboardManager {
await pasteWith({ cmd: "xdotool", args: typeArgs });
this.safeLog("✅ Paste successful using xdotool type fallback");
debugLogger.info("Terminal paste successful via xdotool type", {}, "clipboard");
- return;
+ return "xdotool-type";
} catch (error) {
const fallbackFailure = {
tool: "xdotool type",
diff --git a/src/helpers/windowConfig.js b/src/helpers/windowConfig.js
index 4ce7867d2..82f1cb0f1 100644
--- a/src/helpers/windowConfig.js
+++ b/src/helpers/windowConfig.js
@@ -1,5 +1,10 @@
const path = require("path");
+const isGnomeWayland =
+ process.platform === "linux" &&
+ process.env.XDG_SESSION_TYPE === "wayland" &&
+ /gnome|ubuntu|unity/i.test(process.env.XDG_CURRENT_DESKTOP || "");
+
const WINDOW_SIZES = {
BASE: { width: 96, height: 96 },
WITH_MENU: { width: 240, height: 280 },
@@ -30,7 +35,13 @@ const MAIN_WINDOW_CONFIG = {
hasShadow: false,
acceptsFirstMouse: true,
type:
- process.platform === "darwin" ? "panel" : process.platform === "linux" ? "toolbar" : "normal",
+ process.platform === "darwin"
+ ? "panel"
+ : process.platform === "linux"
+ ? isGnomeWayland
+ ? "normal"
+ : "toolbar"
+ : "normal",
};
// Control panel window configuration
@@ -98,6 +109,8 @@ class WindowPositionUtil {
}
} else if (process.platform === "win32") {
window.setAlwaysOnTop(true, "pop-up-menu");
+ } else if (isGnomeWayland) {
+ window.setAlwaysOnTop(true, "floating");
} else {
window.setAlwaysOnTop(true, "screen-saver");
}
diff --git a/src/helpers/ydotoolService.js b/src/helpers/ydotoolService.js
index 7d372b788..3bf65a054 100644
--- a/src/helpers/ydotoolService.js
+++ b/src/helpers/ydotoolService.js
@@ -102,7 +102,11 @@ async function tryStartYdotoold(log) {
log.info("ydotoold started", {}, "clipboard");
return;
} catch (error) {
- log.debug("ydotoold start failed, retrying after cleanup", { error: error.message }, "clipboard");
+ log.debug(
+ "ydotoold start failed, retrying after cleanup",
+ { error: error.message },
+ "clipboard"
+ );
}
// Cleanup stale state — scoped to current user via systemctl