/*
* Copyright (C) 2007 Jan Arne Petersen <jap@gnome.org>
* Copyright (C) 2008 Bastien Nocera <hadess@hadess.net>
+ * 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
#include "config.h"
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <string.h>
-
#include "ev-media-player-keys.h"
-#include "ev-marshal.h"
+#include <string.h>
+#include <glib.h>
+#include <gio/gio.h>
+
+#define SD_NAME "org.gnome.SettingsDaemon"
+#define SD_OBJECT_PATH "/org/gnome/SettingsDaemon/MediaKeys"
+#define SD_INTERFACE "org.gnome.SettingsDaemon.MediaKeys"
enum {
KEY_PRESSED,
struct _EvMediaPlayerKeys
{
GObject parent;
-
- DBusGProxy *proxy;
+
+ GDBusProxy *proxy;
+ gboolean has_name_owner;
};
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)
{
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,
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)
+ev_media_player_keys_update_has_name_owner (EvMediaPlayerKeys *keys)
{
- if (strcmp ("Evince", application) == 0) {
- g_signal_emit (keys, signals[KEY_PRESSED], 0, key);
+ gchar *name_owner;
+
+ if (!keys->proxy) {
+ keys->has_name_owner = FALSE;
+ return;
}
+
+ name_owner = g_dbus_proxy_get_name_owner (keys->proxy);
+ keys->has_name_owner = (name_owner != NULL);
+ g_free (name_owner);
}
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);
+ if (!keys->has_name_owner)
+ return;
+
+ /*
+ * 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);
+ if (!keys->has_name_owner)
+ return;
+
+ 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;
+
+ if (!g_variant_is_of_type (parameters, G_VARIANT_TYPE ("(ss)")))
+ return;
+
+ 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_name_owner_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
+{
+ EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
+
+ ev_media_player_keys_update_has_name_owner (keys);
+}
+
+static void
+mediakeys_service_appeared_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (user_data);
+ GDBusProxy *proxy;
+
+ proxy = g_dbus_proxy_new_for_bus_finish (res, NULL);
- 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;
- }
-
+ if (proxy == NULL) {
return;
}
- g_object_add_weak_pointer (G_OBJECT (keys->proxy),
- (gpointer) &(keys->proxy));
+ g_signal_connect (proxy, "g-signal",
+ G_CALLBACK (media_player_key_pressed_cb),
+ keys);
+ g_signal_connect (proxy, "notify::g-name-owner",
+ G_CALLBACK (mediakeys_name_owner_changed),
+ keys);
+ keys->proxy = proxy;
+ ev_media_player_keys_update_has_name_owner (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);
-
- 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)
+{
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
+ SD_NAME,
+ SD_OBJECT_PATH,
+ SD_INTERFACE,
+ NULL,
+ mediakeys_service_appeared_cb,
+ keys);
}
void
ev_media_player_keys_focused (EvMediaPlayerKeys *keys)
{
- if (!keys->proxy)
+ if (keys->proxy == NULL)
return;
ev_media_player_keys_grab_keys (keys);
{
EvMediaPlayerKeys *keys = EV_MEDIA_PLAYER_KEYS (object);
- if (keys->proxy) {
+ if (keys->proxy != NULL) {
ev_media_player_keys_release_keys (keys);
- g_object_unref (keys->proxy);
+ g_object_unref (keys->proxy);
keys->proxy = NULL;
+ keys->has_name_owner = FALSE;
}
G_OBJECT_CLASS (ev_media_player_keys_parent_class)->finalize (object);
https://www.fi.muni.cz/~kas/git / evince.git / blobdiff