X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=cut-n-paste%2Ftotem-screensaver%2Ftotem-scrsaver.c;h=07c21c205bee24d3dc1a9812613ab2c346583e30;hb=c53e0983d86042d243786f7f8dd4872f83706390;hp=2b6c0d3f50cee245d22ae8f84b9f2a2bee230a57;hpb=2085e3e413cc926551b9ba6ce91689f9b9e236ce;p=evince.git diff --git a/cut-n-paste/totem-screensaver/totem-scrsaver.c b/cut-n-paste/totem-screensaver/totem-scrsaver.c index 2b6c0d3f..07c21c20 100644 --- a/cut-n-paste/totem-screensaver/totem-scrsaver.c +++ b/cut-n-paste/totem-screensaver/totem-scrsaver.c @@ -2,6 +2,7 @@ Copyright (C) 2004-2006 Bastien Nocera Copyright © 2010 Christian Persch + Copyright © 2010 Carlos Garcia Campos The Gnome Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -18,10 +19,11 @@ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - Author: Bastien Nocera + Authors: Bastien Nocera + Christian Persch + Carlos Garcia Campos */ - #include "config.h" #include @@ -45,15 +47,21 @@ #define XSCREENSAVER_MIN_TIMEOUT 60 +enum { + PROP_0, + PROP_REASON +}; + static void totem_scrsaver_finalize (GObject *object); struct TotemScrsaverPrivate { /* Whether the screensaver is disabled */ gboolean disabled; + /* The reason for the inhibition */ + char *reason; GDBusProxy *gs_proxy; gboolean have_screensaver_dbus; - guint watch_id; guint32 cookie; gboolean old_dbus_api; @@ -91,12 +99,13 @@ on_inhibit_cb (GObject *source_object, if (!value) { if (!scr->priv->old_dbus_api && g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) { + g_return_if_fail (scr->priv->reason != NULL); /* try the old API */ scr->priv->old_dbus_api = TRUE; g_dbus_proxy_call (proxy, "InhibitActivation", g_variant_new ("(s)", - _("Running in presentation mode")), + scr->priv->reason), G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, @@ -106,6 +115,7 @@ on_inhibit_cb (GObject *source_object, g_warning ("Problem inhibiting the screensaver: %s", error->message); } g_error_free (error); + g_object_unref (scr); return; } @@ -116,6 +126,8 @@ on_inhibit_cb (GObject *source_object, else scr->priv->cookie = 0; g_variant_unref (value); + + g_object_unref (scr); } static void @@ -146,6 +158,7 @@ on_uninhibit_cb (GObject *source_object, g_warning ("Problem uninhibiting the screensaver: %s", error->message); } g_error_free (error); + g_object_unref (scr); return; } @@ -153,6 +166,8 @@ on_uninhibit_cb (GObject *source_object, /* clear the cookie */ scr->priv->cookie = 0; g_variant_unref (value); + + g_object_unref (scr); } static void @@ -165,13 +180,15 @@ screensaver_inhibit_dbus (TotemScrsaver *scr, return; scr->priv->old_dbus_api = FALSE; + g_object_ref (scr); if (inhibit) { + g_return_if_fail (scr->priv->reason != NULL); g_dbus_proxy_call (priv->gs_proxy, "Inhibit", g_variant_new ("(ss)", - "Evince", - _("Running in presentation mode")), + g_get_application_name (), + scr->priv->reason), G_DBUS_CALL_FLAGS_NO_AUTO_START, -1, NULL, @@ -202,65 +219,73 @@ screensaver_disable_dbus (TotemScrsaver *scr) } static void -screensaver_dbus_appeared_cb (GDBusConnection *connection, - const gchar *name, - const gchar *name_owner, - GDBusProxy *proxy, - gpointer user_data) +screensaver_update_dbus_presence (TotemScrsaver *scr) { - TotemScrsaver *scr = TOTEM_SCRSAVER (user_data); TotemScrsaverPrivate *priv = scr->priv; + gchar *name_owner; - priv->gs_proxy = g_object_ref (proxy); + name_owner = g_dbus_proxy_get_name_owner (priv->gs_proxy); + if (name_owner) { + priv->have_screensaver_dbus = TRUE; + g_free (name_owner); - priv->have_screensaver_dbus = TRUE; + /* screensaver just appeared, or reappeared */ + if (priv->reason != NULL) + screensaver_disable_dbus (scr); + } else { + priv->have_screensaver_dbus = FALSE; + } } static void -screensaver_dbus_disappeared_cb (GDBusConnection *connection, - const gchar *name, - gpointer user_data) +screensaver_dbus_owner_changed_cb (GObject *object, + GParamSpec *pspec, + gpointer user_data) { TotemScrsaver *scr = TOTEM_SCRSAVER (user_data); - TotemScrsaverPrivate *priv = scr->priv; - if (priv->gs_proxy) { - g_object_unref (priv->gs_proxy); - priv->gs_proxy = NULL; - } - - priv->have_screensaver_dbus = FALSE; + screensaver_update_dbus_presence (scr); } static void -screensaver_init_dbus (TotemScrsaver *scr) +screensaver_dbus_proxy_new_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) { + TotemScrsaver *scr = TOTEM_SCRSAVER (user_data); TotemScrsaverPrivate *priv = scr->priv; - priv->watch_id = g_bus_watch_proxy (G_BUS_TYPE_SESSION, - GS_SERVICE, - G_BUS_NAME_WATCHER_FLAGS_NONE, - GS_PATH, - GS_INTERFACE, - G_TYPE_DBUS_PROXY, - G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | - G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS, - screensaver_dbus_appeared_cb, - screensaver_dbus_disappeared_cb, - scr, NULL); + priv->gs_proxy = g_dbus_proxy_new_for_bus_finish (result, NULL); + if (!priv->gs_proxy) + return; + + screensaver_update_dbus_presence (scr); + + g_signal_connect (priv->gs_proxy, "notify::g-name-owner", + G_CALLBACK (screensaver_dbus_owner_changed_cb), + scr); } static void -screensaver_finalize_dbus (TotemScrsaver *scr) +screensaver_init_dbus (TotemScrsaver *scr) { - TotemScrsaverPrivate *priv = scr->priv; + g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, + NULL, + GS_SERVICE, + GS_PATH, + GS_INTERFACE, + NULL, + screensaver_dbus_proxy_new_cb, + scr); +} +static void +screensaver_finalize_dbus (TotemScrsaver *scr) +{ if (scr->priv->gs_proxy) { g_object_unref (scr->priv->gs_proxy); } - - if (priv->watch_id > 0) - g_bus_unwatch_proxy (priv->watch_id); } #ifdef GDK_WINDOWING_X11 @@ -276,13 +301,13 @@ screensaver_enable_x11 (TotemScrsaver *scr) } #endif /* HAVE_XTEST */ - XLockDisplay (GDK_DISPLAY()); - XSetScreenSaver (GDK_DISPLAY(), + XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), scr->priv->timeout, scr->priv->interval, scr->priv->prefer_blanking, scr->priv->allow_exposures); - XUnlockDisplay (GDK_DISPLAY()); + XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); } #ifdef HAVE_XTEST @@ -291,12 +316,12 @@ fake_event (TotemScrsaver *scr) { if (scr->priv->disabled) { - XLockDisplay (GDK_DISPLAY()); - XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode, + XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode, True, CurrentTime); - XTestFakeKeyEvent (GDK_DISPLAY(), *scr->priv->keycode, + XTestFakeKeyEvent (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), *scr->priv->keycode, False, CurrentTime); - XUnlockDisplay (GDK_DISPLAY()); + XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); /* Swap the keycode */ if (scr->priv->keycode == &scr->priv->keycode1) scr->priv->keycode = &scr->priv->keycode2; @@ -315,12 +340,12 @@ screensaver_disable_x11 (TotemScrsaver *scr) #ifdef HAVE_XTEST if (scr->priv->have_xtest != FALSE) { - XLockDisplay (GDK_DISPLAY()); - XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout, + XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout, &scr->priv->interval, &scr->priv->prefer_blanking, &scr->priv->allow_exposures); - XUnlockDisplay (GDK_DISPLAY()); + XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); if (scr->priv->timeout != 0) { g_timeout_add_seconds (scr->priv->timeout / 2, @@ -334,14 +359,14 @@ screensaver_disable_x11 (TotemScrsaver *scr) } #endif /* HAVE_XTEST */ - XLockDisplay (GDK_DISPLAY()); - XGetScreenSaver(GDK_DISPLAY(), &scr->priv->timeout, + XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + XGetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &scr->priv->timeout, &scr->priv->interval, &scr->priv->prefer_blanking, &scr->priv->allow_exposures); - XSetScreenSaver(GDK_DISPLAY(), 0, 0, + XSetScreenSaver(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, DontPreferBlanking, DontAllowExposures); - XUnlockDisplay (GDK_DISPLAY()); + XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); } static void @@ -350,24 +375,24 @@ screensaver_init_x11 (TotemScrsaver *scr) #ifdef HAVE_XTEST int a, b, c, d; - XLockDisplay (GDK_DISPLAY()); - scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY(), &a, &b, &c, &d) == True); + XLockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); + scr->priv->have_xtest = (XTestQueryExtension (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &a, &b, &c, &d) == True); if (scr->priv->have_xtest != FALSE) { - scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L); + scr->priv->keycode1 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L); if (scr->priv->keycode1 == 0) { g_warning ("scr->priv->keycode1 not existant"); } - scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_R); + scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_R); if (scr->priv->keycode2 == 0) { - scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY(), XK_Alt_L); + scr->priv->keycode2 = XKeysymToKeycode (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XK_Alt_L); if (scr->priv->keycode2 == 0) { g_warning ("scr->priv->keycode2 not existant"); } } scr->priv->keycode = &scr->priv->keycode1; } - XUnlockDisplay (GDK_DISPLAY()); + XUnlockDisplay (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); #endif /* HAVE_XTEST */ } @@ -378,6 +403,47 @@ screensaver_finalize_x11 (TotemScrsaver *scr) } #endif +static void +totem_scrsaver_get_property (GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + TotemScrsaver *scr; + + scr = TOTEM_SCRSAVER (object); + + switch (property_id) + { + case PROP_REASON: + g_value_set_string (value, scr->priv->reason); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + +static void +totem_scrsaver_set_property (GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + TotemScrsaver *scr; + + scr = TOTEM_SCRSAVER (object); + + switch (property_id) + { + case PROP_REASON: + g_free (scr->priv->reason); + scr->priv->reason = g_value_dup_string (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + } +} + static void totem_scrsaver_class_init (TotemScrsaverClass *klass) { @@ -385,7 +451,14 @@ totem_scrsaver_class_init (TotemScrsaverClass *klass) g_type_class_add_private (klass, sizeof (TotemScrsaverPrivate)); + object_class->set_property = totem_scrsaver_set_property; + object_class->get_property = totem_scrsaver_get_property; object_class->finalize = totem_scrsaver_finalize; + + g_object_class_install_property (object_class, PROP_REASON, + g_param_spec_string ("reason", NULL, NULL, + NULL, G_PARAM_READWRITE)); + } /** @@ -452,7 +525,7 @@ totem_scrsaver_enable (TotemScrsaver *scr) if (screensaver_is_running_dbus (scr) != FALSE) screensaver_enable_dbus (scr); - else + else #ifdef GDK_WINDOWING_X11 screensaver_enable_x11 (scr); #else @@ -480,6 +553,8 @@ totem_scrsaver_finalize (GObject *object) { TotemScrsaver *scr = TOTEM_SCRSAVER (object); + g_free (scr->priv->reason); + screensaver_finalize_dbus (scr); #ifdef GDK_WINDOWING_X11 screensaver_finalize_x11 (scr);