X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-media-player-keys.c;h=efc32dcb3c13fe84421a217b337049e94a0aa9f3;hb=1d0de30170119eade2a7305ffa8ec6d9a3e4af32;hp=04d858f3217215875bb82138151d13c269027fa9;hpb=e01d6f5fd8c8682948d87cbfe3456a424652ad71;p=evince.git diff --git a/shell/ev-media-player-keys.c b/shell/ev-media-player-keys.c index 04d858f3..efc32dcb 100644 --- a/shell/ev-media-player-keys.c +++ b/shell/ev-media-player-keys.c @@ -2,6 +2,7 @@ /* * Copyright (C) 2007 Jan Arne Petersen * Copyright (C) 2008 Bastien Nocera + * Copyright © 2010 Christian Persch * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,13 +22,15 @@ #include "config.h" -#include -#include -#include - #include "ev-media-player-keys.h" -#include "ev-marshal.h" +#include +#include +#include + +#define SD_NAME "org.gnome.SettingsDaemon" +#define SD_OBJECT_PATH "/org/gnome/SettingsDaemon/MediaKeys" +#define SD_INTERFACE "org.gnome.SettingsDaemon.MediaKeys" enum { KEY_PRESSED, @@ -37,8 +40,9 @@ enum { struct _EvMediaPlayerKeys { GObject parent; - - DBusGProxy *proxy; + + GDBusProxy *proxy; + guint watch_id; }; struct _EvMediaPlayerKeysClass @@ -50,7 +54,7 @@ struct _EvMediaPlayerKeysClass const gchar *key); }; -static guint signals[LAST_SIGNAL] = { 0 }; +static guint signals[LAST_SIGNAL]; G_DEFINE_TYPE (EvMediaPlayerKeys, ev_media_player_keys, G_TYPE_OBJECT) @@ -61,6 +65,8 @@ ev_media_player_keys_class_init (EvMediaPlayerKeysClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + object_class->finalize = ev_media_player_keys_finalize; + signals[KEY_PRESSED] = g_signal_new ("key_pressed", EV_TYPE_MEDIA_PLAYER_KEYS, @@ -70,99 +76,109 @@ ev_media_player_keys_class_init (EvMediaPlayerKeysClass *klass) g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); - - object_class->finalize = ev_media_player_keys_finalize; -} - -static void -on_media_player_key_pressed (DBusGProxy *proxy, - const gchar *application, - const gchar *key, - EvMediaPlayerKeys *keys) -{ - if (strcmp ("Evince", application) == 0) { - g_signal_emit (keys, signals[KEY_PRESSED], 0, key); - } } static void ev_media_player_keys_grab_keys (EvMediaPlayerKeys *keys) { - dbus_g_proxy_call (keys->proxy, - "GrabMediaPlayerKeys", NULL, - G_TYPE_STRING, "Evince", - G_TYPE_UINT, 0, - G_TYPE_INVALID, G_TYPE_INVALID); + /* + * The uint as second argument is time. We give a very low value so that + * if a media player is there it gets higher priority on the keys (0 is + * a special value having maximum priority). + */ + g_dbus_proxy_call (keys->proxy, + "GrabMediaPlayerKeys", + g_variant_new ("(su)", "Evince", 1), + G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, + NULL, NULL, NULL); } static void ev_media_player_keys_release_keys (EvMediaPlayerKeys *keys) { - dbus_g_proxy_call (keys->proxy, - "ReleaseMediaPlayerKeys", NULL, - G_TYPE_STRING, "Evince", - G_TYPE_INVALID, G_TYPE_INVALID); + g_dbus_proxy_call (keys->proxy, + "ReleaseMediaPlayerKeys", + g_variant_new ("(s)", "Evince"), + G_DBUS_CALL_FLAGS_NO_AUTO_START, + -1, + NULL, NULL, NULL); } static void -ev_media_player_keys_init (EvMediaPlayerKeys *keys) +media_player_key_pressed_cb (GDBusProxy *proxy, + gchar *sender_name, + gchar *signal_name, + GVariant *parameters, + gpointer user_data) { - DBusGConnection *connection; - GError *err = NULL; + const char *application, *key; - connection = dbus_g_bus_get (DBUS_BUS_SESSION, &err); - if (connection == NULL) { - g_warning ("Error connecting to D-Bus: %s", err->message); - return; - } + if (g_strcmp0 (sender_name, SD_NAME) != 0) + return; - /* Try the gnome-settings-daemon version, - * then the gnome-control-center version of things */ - keys->proxy = dbus_g_proxy_new_for_name_owner (connection, - "org.gnome.SettingsDaemon", - "/org/gnome/SettingsDaemon/MediaKeys", - "org.gnome.SettingsDaemon.MediaKeys", - NULL); - if (keys->proxy == NULL) { - keys->proxy = dbus_g_proxy_new_for_name_owner (connection, - "org.gnome.SettingsDaemon", - "/org/gnome/SettingsDaemon", - "org.gnome.SettingsDaemon", - &err); - } + if (g_strcmp0 (signal_name, "MediaPlayerKeyPressed") != 0) + return; - dbus_g_connection_unref (connection); - if (err != NULL) { - g_warning ("Failed to create dbus proxy for org.gnome.SettingsDaemon: %s", - err->message); - g_error_free (err); - - if (keys->proxy) { - g_object_unref (keys->proxy); - keys->proxy = NULL; - } - - return; - } + if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(ss)"))) + return; - g_object_add_weak_pointer (G_OBJECT (keys->proxy), - (gpointer) &(keys->proxy)); + g_variant_get (parameters, "(&s&s)", &application, &key); + + if (strcmp ("Evince", application) == 0) { + g_signal_emit (user_data, signals[KEY_PRESSED], 0, key); + } +} + +static void +mediakeys_service_appeared_cb (GDBusConnection *connection, + const gchar *name, + const gchar *name_owner, + GDBusProxy *proxy, + gpointer user_data) +{ + EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data); + + keys->proxy = g_object_ref (proxy); + g_signal_connect (keys->proxy, "g-signal", + G_CALLBACK (media_player_key_pressed_cb), + keys); ev_media_player_keys_grab_keys (keys); +} - dbus_g_object_register_marshaller (ev_marshal_VOID__STRING_STRING, - G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); - dbus_g_proxy_add_signal (keys->proxy, "MediaPlayerKeyPressed", - G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); +static void +mediakeys_service_disappeared_cb (GDBusConnection *connection, + const gchar *name, + gpointer user_data) +{ + EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data); + + if (keys->proxy) { + g_object_unref (keys->proxy); + keys->proxy = NULL; + } +} - dbus_g_proxy_connect_signal (keys->proxy, "MediaPlayerKeyPressed", - G_CALLBACK (on_media_player_key_pressed), keys, NULL); +static void +ev_media_player_keys_init (EvMediaPlayerKeys *keys) +{ + keys->watch_id = g_bus_watch_proxy (G_BUS_TYPE_SESSION, + SD_NAME, + G_BUS_NAME_WATCHER_FLAGS_NONE, + SD_OBJECT_PATH, + SD_INTERFACE, + G_TYPE_DBUS_PROXY, + G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, + mediakeys_service_appeared_cb, + mediakeys_service_disappeared_cb, + keys, NULL); } void ev_media_player_keys_focused (EvMediaPlayerKeys *keys) { - if (!keys->proxy) + if (keys->proxy == NULL) return; ev_media_player_keys_grab_keys (keys); @@ -173,10 +189,12 @@ ev_media_player_keys_finalize (GObject *object) { EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object); - if (keys->proxy) { + if (keys->watch_id > 0) + g_bus_unwatch_proxy (keys->watch_id); + + if (keys->proxy != NULL) { ev_media_player_keys_release_keys (keys); - g_object_unref (keys->proxy); - keys->proxy = NULL; + g_object_unref (keys->proxy); } G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);