mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
* fix(portal): establish locked desktop control before capture * test(portal): preserve v4 pixel inventory after deferred capture settings * fix(control): refresh lock state after viewer Echo handshake * fix(portal): announce desktop target before locked capture wait * ci: run the desktop_power native test under ASan/UBSan Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * input: skip the Portal release sweep while no session is bound The first locked connection creates its peer before any Portal exists; the sweep then logged two failed injections and a 'reset incomplete' warning for nothing. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * docs: describe locked cold connections, auto unlock limits and iPhone status Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(portal): treat a cached screen with a closed Portal session as not ready begin() now marks the state as waiting when the cached session is dead, and permission/video/clipboard consumers honor it instead of reporting Allow and starting the stale video path before maintain() has rebuilt capture. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(portal): gate input on a ready desktop and share recovery backoff Input dispatch kept only the cached screen and dropped State.waiting, so a closed Portal passed the gate once the screen unlocked. The supervisor's recover() and the encoder's stream-loss recovery now share failure backoff and a terminal-denial flag, so a denied consent is not re-prompted by the other path. Co-Authored-By: Claude Sonnet 5.5 <[email protected]> * fix(control): keep unknown lock state unlocked, stop waits on Closing, never drop capture settings - QuerySystemState with no logind lock state (Xvfb/linger) reports unlocked as before. - The Portal wait loop also exits while the channel is Closing. - Capture-setting requests back-pressure instead of try_send dropping the latest setting. Co-Authored-By: Claude Opus 5.5 <[email protected]> --------- Co-authored-by: Claude Sonnet 5.5 <[email protected]> Co-authored-by: VallierDev <[email protected]>
155 lines
5.3 KiB
C
155 lines
5.3 KiB
C
#include <gio/gio.h>
|
|
#include <stdlib.h>
|
|
|
|
#define CALL_TIMEOUT_MS 3000
|
|
#define MUTTER_DEST "org.gnome.Mutter.DisplayConfig"
|
|
#define MUTTER_PATH "/org/gnome/Mutter/DisplayConfig"
|
|
#define SESSION_DEST "org.gnome.SessionManager"
|
|
#define SESSION_PATH "/org/gnome/SessionManager"
|
|
#define SESSION_IFACE "org.gnome.SessionManager"
|
|
|
|
enum {
|
|
UU_POWER_OK = 0,
|
|
UU_POWER_SESSION_BUS = 1,
|
|
UU_POWER_CALL_FAILED = 2,
|
|
};
|
|
|
|
struct uu_idle_inhibitor {
|
|
GDBusConnection *connection;
|
|
guint32 cookie;
|
|
};
|
|
|
|
struct setup_timeout {
|
|
GMutex lock;
|
|
GCond cond;
|
|
gboolean finished;
|
|
GCancellable *cancellable;
|
|
};
|
|
|
|
static gpointer cancel_setup_on_timeout(gpointer data) {
|
|
struct setup_timeout *timeout = data;
|
|
gint64 deadline = g_get_monotonic_time() + CALL_TIMEOUT_MS * G_TIME_SPAN_MILLISECOND;
|
|
g_mutex_lock(&timeout->lock);
|
|
while (!timeout->finished &&
|
|
g_cond_wait_until(&timeout->cond, &timeout->lock, deadline)) {}
|
|
gboolean expired = !timeout->finished;
|
|
g_mutex_unlock(&timeout->lock);
|
|
if (expired) g_cancellable_cancel(timeout->cancellable);
|
|
return NULL;
|
|
}
|
|
|
|
static void finish_setup_timeout(struct setup_timeout *timeout, GThread *thread) {
|
|
g_mutex_lock(&timeout->lock);
|
|
timeout->finished = TRUE;
|
|
g_cond_signal(&timeout->cond);
|
|
g_mutex_unlock(&timeout->lock);
|
|
g_thread_join(thread);
|
|
g_cond_clear(&timeout->cond);
|
|
g_mutex_clear(&timeout->lock);
|
|
g_object_unref(timeout->cancellable);
|
|
}
|
|
|
|
/* Use a dedicated connection so closing this inhibitor cannot affect another app's bus state. */
|
|
static GDBusConnection *private_session_bus(int *error_code) {
|
|
struct setup_timeout timeout = {0};
|
|
g_mutex_init(&timeout.lock);
|
|
g_cond_init(&timeout.cond);
|
|
timeout.cancellable = g_cancellable_new();
|
|
GThread *timer = g_thread_new("uu-dbus-connect-timeout", cancel_setup_on_timeout, &timeout);
|
|
|
|
GError *error = NULL;
|
|
gchar *address = g_dbus_address_get_for_bus_sync(G_BUS_TYPE_SESSION, timeout.cancellable, &error);
|
|
if (!address) {
|
|
g_clear_error(&error);
|
|
finish_setup_timeout(&timeout, timer);
|
|
*error_code = UU_POWER_SESSION_BUS;
|
|
return NULL;
|
|
}
|
|
|
|
GDBusConnection *connection = g_dbus_connection_new_for_address_sync(
|
|
address,
|
|
G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT |
|
|
G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION,
|
|
NULL, timeout.cancellable, &error);
|
|
g_free(address);
|
|
finish_setup_timeout(&timeout, timer);
|
|
if (!connection) {
|
|
g_clear_error(&error);
|
|
*error_code = UU_POWER_SESSION_BUS;
|
|
return NULL;
|
|
}
|
|
g_dbus_connection_set_exit_on_close(connection, FALSE);
|
|
return connection;
|
|
}
|
|
|
|
static void close_private_bus(GDBusConnection *connection) {
|
|
if (!connection) return;
|
|
g_dbus_connection_close(connection, NULL, NULL, NULL);
|
|
g_object_unref(connection);
|
|
}
|
|
|
|
int uu_desktop_power_wake(void) {
|
|
int error_code = UU_POWER_OK;
|
|
GDBusConnection *connection = private_session_bus(&error_code);
|
|
if (!connection) return error_code;
|
|
|
|
GError *error = NULL;
|
|
GVariant *reply = g_dbus_connection_call_sync(
|
|
connection, MUTTER_DEST, MUTTER_PATH, "org.freedesktop.DBus.Properties", "Set",
|
|
g_variant_new("(ssv)", "org.gnome.Mutter.DisplayConfig", "PowerSaveMode",
|
|
g_variant_new_int32(0)),
|
|
G_VARIANT_TYPE("()"), G_DBUS_CALL_FLAGS_NONE, CALL_TIMEOUT_MS, NULL, &error);
|
|
if (!reply) error_code = UU_POWER_CALL_FAILED;
|
|
if (reply) g_variant_unref(reply);
|
|
g_clear_error(&error);
|
|
close_private_bus(connection);
|
|
return error_code;
|
|
}
|
|
|
|
struct uu_idle_inhibitor *uu_desktop_idle_inhibitor_acquire(int *error_code) {
|
|
if (!error_code) return NULL;
|
|
*error_code = UU_POWER_OK;
|
|
GDBusConnection *connection = private_session_bus(error_code);
|
|
if (!connection) return NULL;
|
|
|
|
GError *error = NULL;
|
|
GVariant *reply = g_dbus_connection_call_sync(
|
|
connection, SESSION_DEST, SESSION_PATH, SESSION_IFACE, "Inhibit",
|
|
g_variant_new("(susu)", "uu-remote-linux", 0u,
|
|
"Remote desktop session is active", 8u),
|
|
G_VARIANT_TYPE("(u)"), G_DBUS_CALL_FLAGS_NONE, CALL_TIMEOUT_MS, NULL, &error);
|
|
if (!reply) {
|
|
*error_code = UU_POWER_CALL_FAILED;
|
|
g_clear_error(&error);
|
|
close_private_bus(connection);
|
|
return NULL;
|
|
}
|
|
|
|
struct uu_idle_inhibitor *inhibitor = calloc(1, sizeof(*inhibitor));
|
|
if (!inhibitor) {
|
|
*error_code = UU_POWER_CALL_FAILED;
|
|
g_variant_unref(reply);
|
|
close_private_bus(connection);
|
|
return NULL;
|
|
}
|
|
g_variant_get(reply, "(u)", &inhibitor->cookie);
|
|
g_variant_unref(reply);
|
|
inhibitor->connection = connection;
|
|
return inhibitor;
|
|
}
|
|
|
|
void uu_desktop_idle_inhibitor_release(struct uu_idle_inhibitor *inhibitor) {
|
|
if (!inhibitor) return;
|
|
GError *error = NULL;
|
|
GVariant *reply = g_dbus_connection_call_sync(
|
|
inhibitor->connection, SESSION_DEST, SESSION_PATH, SESSION_IFACE, "Uninhibit",
|
|
g_variant_new("(u)", inhibitor->cookie), G_VARIANT_TYPE("()"),
|
|
G_DBUS_CALL_FLAGS_NONE, CALL_TIMEOUT_MS, NULL, &error);
|
|
if (reply) g_variant_unref(reply);
|
|
g_clear_error(&error);
|
|
|
|
/* Closing the private bus also revokes the cookie if Uninhibit failed or the host exits. */
|
|
close_private_bus(inhibitor->connection);
|
|
free(inhibitor);
|
|
}
|