[gnome-settings-daemon] media-keys: Add button handling code from gnome-power-manager
- From: Richard Hughes <rhughes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] media-keys: Add button handling code from gnome-power-manager
- Date: Mon, 4 Jul 2011 16:54:52 +0000 (UTC)
commit caae31acdcbd5d3013e0cf164c5679508388d3c7
Author: Richard Hughes <richard hughsie com>
Date: Wed Jun 15 17:33:43 2011 +0100
media-keys: Add button handling code from gnome-power-manager
configure.ac | 11 +-
plugins/media-keys/Makefile.am | 8 +
plugins/media-keys/acme.h | 23 ++
plugins/media-keys/gsd-media-keys-manager.c | 346 +++++++++++++++++++++++++++
4 files changed, 387 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 81c8ae9..ddd176d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,6 +395,15 @@ fi
AC_SUBST(NSS_DATABASE)
+dnl ==============================================
+dnl power section
+dnl ==============================================
+
+# ---------------------------------------------------------------------------
+# UPower
+# ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(UPOWER, upower-glib >= 0.9.1)
+
# ---------------------------------------------------------------------------
# PolicyKit
# ---------------------------------------------------------------------------
@@ -465,7 +474,6 @@ fi
AM_CONDITIONAL(BUILD_PRINT_NOTIFICATIONS, [test x"$enable_cups" = x"yes"])
-
# ---------------------------------------------------------------------------
# Enable Profiling
# ---------------------------------------------------------------------------
@@ -566,6 +574,7 @@ plugins/common/Makefile
plugins/cursor/Makefile
plugins/datetime/Makefile
plugins/dummy/Makefile
+plugins/power/Makefile
plugins/gconf/Makefile
plugins/housekeeping/Makefile
plugins/keybindings/Makefile
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 3607725..9d8ed1c 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -81,9 +81,11 @@ libmedia_keys_la_SOURCES = \
$(NULL)
libmedia_keys_la_CPPFLAGS = \
+ -I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-I$(top_srcdir)/plugins/media-keys/cut-n-paste \
+ -DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -92,6 +94,7 @@ libmedia_keys_la_CPPFLAGS = \
libmedia_keys_la_CFLAGS = \
$(PLUGIN_CFLAGS) \
$(SETTINGS_PLUGIN_CFLAGS) \
+ $(UPOWER_CFLAGS) \
$(AM_CFLAGS)
libmedia_keys_la_LDFLAGS = \
@@ -100,6 +103,7 @@ libmedia_keys_la_LDFLAGS = \
libmedia_keys_la_LIBADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \
+ $(UPOWER_LIBS) \
$(SETTINGS_PLUGIN_LIBS) \
$(XF86MISC_LIBS) \
-lm
@@ -125,6 +129,7 @@ test_media_window_SOURCES = \
$(NULL)
test_media_window_CPPFLAGS = \
+ -I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-I$(top_srcdir)/plugins/media-keys/cut-n-paste \
@@ -158,9 +163,11 @@ test_media_keys_SOURCES = \
$(NULL)
test_media_keys_CPPFLAGS = \
+ -I$(top_srcdir)/data/ \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-I$(top_srcdir)/plugins/media-keys/cut-n-paste \
+ -DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
@@ -175,6 +182,7 @@ test_media_keys_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
$(SETTINGS_DAEMON_LIBS) \
$(SETTINGS_PLUGIN_LIBS) \
+ $(UPOWER_LIBS) \
$(XF86MISC_LIBS) \
$(GST_LIBS) \
-lm
diff --git a/plugins/media-keys/acme.h b/plugins/media-keys/acme.h
index ac58d7b..54ec19b 100644
--- a/plugins/media-keys/acme.h
+++ b/plugins/media-keys/acme.h
@@ -43,6 +43,7 @@ typedef enum {
SEARCH_KEY,
EMAIL_KEY,
SCREENSAVER_KEY,
+ SCREENSAVER2_KEY,
HELP_KEY,
WWW_KEY,
PLAY_KEY,
@@ -65,6 +66,16 @@ typedef enum {
TOGGLE_CONTRAST_KEY,
MAGNIFIER_ZOOM_IN_KEY,
MAGNIFIER_ZOOM_OUT_KEY,
+ POWER_KEY,
+ SLEEP_KEY,
+ SUSPEND_KEY,
+ HIBERNATE_KEY,
+ SCREEN_BRIGHTNESS_UP_KEY,
+ SCREEN_BRIGHTNESS_DOWN_KEY,
+ KEYBOARD_BRIGHTNESS_UP_KEY,
+ KEYBOARD_BRIGHTNESS_DOWN_KEY,
+ KEYBOARD_BRIGHTNESS_TOGGLE_KEY,
+ BATTERY_KEY,
HANDLED_KEYS
} MediaKeyType;
@@ -91,6 +102,7 @@ static struct {
{ SEARCH_KEY, "search", NULL, NULL },
{ EMAIL_KEY, "email", NULL, NULL },
{ SCREENSAVER_KEY, "screensaver", NULL, NULL },
+ { SCREENSAVER2_KEY, NULL, "XF86ScreenSaver", NULL },
{ HELP_KEY, "help", NULL, NULL },
{ WWW_KEY, "www", NULL, NULL },
{ PLAY_KEY, "play", NULL, NULL },
@@ -116,6 +128,17 @@ static struct {
{ TOGGLE_CONTRAST_KEY, "toggle-contrast", NULL, NULL },
{ MAGNIFIER_ZOOM_IN_KEY, "magnifier-zoom-in", NULL, NULL },
{ MAGNIFIER_ZOOM_OUT_KEY, "magnifier-zoom-out", NULL, NULL },
+ { POWER_KEY, NULL, "XF86PowerOff", NULL },
+ /* the kernel / Xorg names really are like this... */
+ { SLEEP_KEY, NULL, "XF86Suspend", NULL },
+ { SUSPEND_KEY, NULL, "XF86Sleep", NULL },
+ { HIBERNATE_KEY, NULL, "XF86Hibernate", NULL },
+ { SCREEN_BRIGHTNESS_UP_KEY, NULL, "XF86MonBrightnessUp", NULL },
+ { SCREEN_BRIGHTNESS_DOWN_KEY, NULL, "XF86MonBrightnessDown", NULL },
+ { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp", NULL },
+ { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown", NULL },
+ { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff", NULL },
+ { BATTERY_KEY, NULL, "XF86Battery", NULL },
};
#endif /* __ACME_H__ */
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index b6e9cf9..0be1539 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -46,6 +46,7 @@
#include "acme.h"
#include "gsd-media-keys-window.h"
#include "gsd-input-helper.h"
+#include "gsd-enums.h"
#ifdef HAVE_PULSE
#include <canberra-gtk.h>
@@ -53,11 +54,17 @@
#include "gvc-mixer-control.h"
#endif /* HAVE_PULSE */
+#include <libupower-glib/upower.h>
+
#define GSD_DBUS_PATH "/org/gnome/SettingsDaemon"
#define GSD_DBUS_NAME "org.gnome.SettingsDaemon"
#define GSD_MEDIA_KEYS_DBUS_PATH GSD_DBUS_PATH "/MediaKeys"
#define GSD_MEDIA_KEYS_DBUS_NAME GSD_DBUS_NAME ".MediaKeys"
+#define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager"
+#define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager"
+#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager"
+
static const gchar introspection_xml[] =
"<node>"
" <interface name='org.gnome.SettingsDaemon.MediaKeys'>"
@@ -74,6 +81,7 @@ static const gchar introspection_xml[] =
"</node>";
#define SETTINGS_INTERFACE_DIR "org.gnome.desktop.interface"
+#define SETTINGS_POWER_DIR "org.gnome.settings-daemon.plugins.power"
#define SETTINGS_XSETTINGS_DIR "org.gnome.settings-daemon.plugins.xsettings"
#define SETTINGS_TOUCHPAD_DIR "org.gnome.settings-daemon.peripherals.touchpad"
#define TOUCHPAD_ENABLED_KEY "touchpad-enabled"
@@ -109,6 +117,12 @@ struct GsdMediaKeysManagerPrivate
char *icon_theme;
char *gtk_theme;
+ /* Power stuff */
+ GSettings *power_settings;
+ UpClient *up_client;
+ GDBusProxy *power_screen_proxy;
+ GDBusProxy *power_keyboard_proxy;
+
/* Multihead stuff */
GdkScreen *current_screen;
GSList *screens;
@@ -1150,6 +1164,239 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
}
}
+static void
+gnome_session_shutdown_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GVariant *result;
+ GError *error = NULL;
+
+ result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+ res,
+ &error);
+ if (result == NULL) {
+ g_warning ("couldn't shutdown using gnome-session: %s",
+ error->message);
+ g_error_free (error);
+ } else {
+ g_variant_unref (result);
+ }
+}
+
+static void
+gnome_session_shutdown (void)
+{
+ GError *error = NULL;
+ GDBusProxy *proxy;
+
+ /* ask gnome-session to show the shutdown dialog with a timeout */
+ proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ NULL,
+ GNOME_SESSION_DBUS_NAME,
+ GNOME_SESSION_DBUS_PATH,
+ GNOME_SESSION_DBUS_INTERFACE,
+ NULL, &error);
+ if (proxy == NULL) {
+ g_warning ("cannot connect to gnome-session: %s",
+ error->message);
+ g_error_free (error);
+ return;
+ }
+ g_dbus_proxy_call (proxy,
+ "Shutdown",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1, NULL,
+ gnome_session_shutdown_cb, NULL);
+ g_object_unref (proxy);
+}
+
+static void
+do_config_power_action (GsdMediaKeysManager *manager,
+ const gchar *config_key)
+{
+ gboolean ret;
+ GError *error = NULL;
+ GsdPowerActionType action_type;
+
+ action_type = g_settings_get_enum (manager->priv->power_settings,
+ config_key);
+ switch (action_type) {
+ case GSD_POWER_ACTION_SUSPEND:
+ ret = up_client_suspend_sync (manager->priv->up_client,
+ NULL, &error);
+ if (!ret) {
+ g_warning ("failed to suspend: %s",
+ error->message);
+ g_error_free (error);
+ }
+ break;
+ case GSD_POWER_ACTION_INTERACTIVE:
+ gnome_session_shutdown ();
+ break;
+ case GSD_POWER_ACTION_HIBERNATE:
+ ret = up_client_hibernate_sync (manager->priv->up_client,
+ NULL, &error);
+ if (!ret) {
+ g_warning ("failed to suspend: %s",
+ error->message);
+ g_error_free (error);
+ }
+ break;
+ case GSD_POWER_ACTION_SHUTDOWN:
+ case GSD_POWER_ACTION_BLANK:
+ case GSD_POWER_ACTION_NOTHING:
+ /* these actions cannot be handled by media-keys and
+ * are not used in this context */
+ g_assert_not_reached ();
+ break;
+ }
+}
+
+static void
+update_screen_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GError *error = NULL;
+ guint percentage;
+ GVariant *new_percentage;
+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
+
+ new_percentage = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+ res, &error);
+ if (new_percentage == NULL) {
+ g_warning ("Failed to set new screen percentage: %s",
+ error->message);
+ g_error_free (error);
+ return;
+ }
+
+ /* update the dialog with the new value */
+ g_variant_get (new_percentage, "(u)", &percentage);
+ dialog_init (manager);
+ gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+ "display-brightness-symbolic",
+ TRUE);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+ percentage);
+ dialog_show (manager);
+ g_variant_unref (new_percentage);
+}
+
+static void
+do_screen_brightness_action (GsdMediaKeysManager *manager,
+ MediaKeyType type)
+{
+ if (manager->priv->connection == NULL ||
+ manager->priv->power_screen_proxy == NULL) {
+ g_warning ("No existing D-Bus connection trying to handle power keys");
+ return;
+ }
+
+ /* call into the power plugin */
+ g_dbus_proxy_call (manager->priv->power_screen_proxy,
+ type == SCREEN_BRIGHTNESS_UP_KEY ? "StepUp" : "StepDown",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ update_screen_cb,
+ manager);
+}
+
+static void
+update_keyboard_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GError *error = NULL;
+ guint percentage;
+ GVariant *new_percentage;
+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
+
+ new_percentage = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
+ res, &error);
+ if (new_percentage == NULL) {
+ g_warning ("Failed to set new keyboard percentage: %s",
+ error->message);
+ g_error_free (error);
+ return;
+ }
+
+ /* update the dialog with the new value */
+ g_variant_get (new_percentage, "(u)", &percentage);
+ dialog_init (manager);
+ gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+ "keyboard-brightness-symbolic",
+ TRUE);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
+ percentage);
+ dialog_show (manager);
+ g_variant_unref (new_percentage);
+}
+
+static void
+do_keyboard_brightness_action (GsdMediaKeysManager *manager,
+ MediaKeyType type)
+{
+ if (manager->priv->connection == NULL ||
+ manager->priv->power_keyboard_proxy == NULL) {
+ g_warning ("No existing D-Bus connection trying to handle power keys");
+ return;
+ }
+
+ /* call into the power plugin */
+ g_dbus_proxy_call (manager->priv->power_keyboard_proxy,
+ type == SCREEN_BRIGHTNESS_UP_KEY ? "StepUp" : "StepDown",
+ NULL,
+ G_DBUS_CALL_FLAGS_NONE,
+ -1,
+ NULL,
+ update_keyboard_cb,
+ manager);
+}
+
+static void
+exec_battery_info (GsdMediaKeysManager *manager)
+{
+ gboolean ret;
+ GError *error = NULL;
+ GAppInfo *app_info;
+ GdkAppLaunchContext *launch_context;
+
+ /* setup the launch context so the startup notification is correct */
+ launch_context = gdk_display_get_app_launch_context (gdk_display_get_default ());
+ app_info = g_app_info_create_from_commandline (BINDIR "/gnome-power-statistics",
+ "gnome-power-statistics",
+ G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION,
+ &error);
+ if (app_info == NULL) {
+ g_warning ("failed to create application info: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+
+ /* launch gnome-control-center */
+ ret = g_app_info_launch (app_info,
+ NULL,
+ G_APP_LAUNCH_CONTEXT (launch_context),
+ &error);
+ if (!ret) {
+ g_warning ("failed to launch gnome-power-statistics: %s",
+ error->message);
+ g_error_free (error);
+ goto out;
+ }
+out:
+ g_object_unref (launch_context);
+ if (app_info != NULL)
+ g_object_unref (app_info);
+}
+
static gboolean
do_action (GsdMediaKeysManager *manager,
MediaKeyType type,
@@ -1220,6 +1467,7 @@ do_action (GsdMediaKeysManager *manager,
do_url_action (manager, "mailto");
break;
case SCREENSAVER_KEY:
+ case SCREENSAVER2_KEY:
if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) {
execute (manager, "gnome-screensaver-command --lock", FALSE, FALSE);
} else {
@@ -1285,6 +1533,30 @@ do_action (GsdMediaKeysManager *manager,
case TOGGLE_CONTRAST_KEY:
do_toggle_contrast_action (manager);
break;
+ case POWER_KEY:
+ do_config_power_action (manager, "button-power");
+ break;
+ case SLEEP_KEY:
+ do_config_power_action (manager, "button-sleep");
+ break;
+ case SUSPEND_KEY:
+ do_config_power_action (manager, "button-suspend");
+ break;
+ case HIBERNATE_KEY:
+ do_config_power_action (manager, "button-hibernate");
+ break;
+ case SCREEN_BRIGHTNESS_UP_KEY:
+ case SCREEN_BRIGHTNESS_DOWN_KEY:
+ do_screen_brightness_action (manager, type);
+ break;
+ case KEYBOARD_BRIGHTNESS_UP_KEY:
+ case KEYBOARD_BRIGHTNESS_DOWN_KEY:
+ case KEYBOARD_BRIGHTNESS_TOGGLE_KEY:
+ do_keyboard_brightness_action (manager, type);
+ break;
+ case BATTERY_KEY:
+ exec_battery_info (manager);
+ break;
case HANDLED_KEYS:
g_assert_not_reached ();
/* Note, no default so compiler catches missing keys */
@@ -1391,6 +1663,10 @@ start_media_keys_idle_cb (GsdMediaKeysManager *manager)
g_signal_connect (G_OBJECT (manager->priv->settings), "changed",
G_CALLBACK (update_kbd_cb), manager);
+ /* for the power plugin interface code */
+ manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);
+ manager->priv->up_client = up_client_new ();
+
/* Logic from http://git.gnome.org/browse/gnome-shell/tree/js/ui/status/accessibility.js#n163 */
manager->priv->interface_settings = g_settings_new (SETTINGS_INTERFACE_DIR);
g_signal_connect (G_OBJECT (manager->priv->interface_settings), "changed::gtk-theme",
@@ -1492,6 +1768,26 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
priv->settings = NULL;
}
+ if (priv->power_settings) {
+ g_object_unref (priv->power_settings);
+ priv->power_settings = NULL;
+ }
+
+ if (priv->power_screen_proxy) {
+ g_object_unref (priv->power_screen_proxy);
+ priv->power_screen_proxy = NULL;
+ }
+
+ if (priv->power_keyboard_proxy) {
+ g_object_unref (priv->power_keyboard_proxy);
+ priv->power_keyboard_proxy = NULL;
+ }
+
+ if (priv->up_client) {
+ g_object_unref (priv->up_client);
+ priv->up_client = NULL;
+ }
+
if (priv->cancellable != NULL) {
g_cancellable_cancel (priv->cancellable);
g_object_unref (priv->cancellable);
@@ -1651,6 +1947,36 @@ xrandr_ready_cb (GObject *source_object,
}
static void
+power_screen_ready_cb (GObject *source_object,
+ GAsyncResult *res,
+ GsdMediaKeysManager *manager)
+{
+ GError *error = NULL;
+
+ manager->priv->power_screen_proxy = g_dbus_proxy_new_finish (res, &error);
+ if (manager->priv->power_screen_proxy == NULL) {
+ g_warning ("Failed to get proxy for power (screen): %s",
+ error->message);
+ g_error_free (error);
+ }
+}
+
+static void
+power_keyboard_ready_cb (GObject *source_object,
+ GAsyncResult *res,
+ GsdMediaKeysManager *manager)
+{
+ GError *error = NULL;
+
+ manager->priv->power_keyboard_proxy = g_dbus_proxy_new_finish (res, &error);
+ if (manager->priv->power_keyboard_proxy == NULL) {
+ g_warning ("Failed to get proxy for power (keyboard): %s",
+ error->message);
+ g_error_free (error);
+ }
+}
+
+static void
on_bus_gotten (GObject *source_object,
GAsyncResult *res,
GsdMediaKeysManager *manager)
@@ -1683,6 +2009,26 @@ on_bus_gotten (GObject *source_object,
NULL,
(GAsyncReadyCallback) xrandr_ready_cb,
manager);
+
+ g_dbus_proxy_new (manager->priv->connection,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.gnome.SettingsDaemon",
+ "/org/gnome/SettingsDaemon/Power",
+ "org.gnome.SettingsDaemon.Power.Screen",
+ NULL,
+ (GAsyncReadyCallback) power_screen_ready_cb,
+ manager);
+
+ g_dbus_proxy_new (manager->priv->connection,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+ "org.gnome.SettingsDaemon",
+ "/org/gnome/SettingsDaemon/Power",
+ "org.gnome.SettingsDaemon.Power.Keyboard",
+ NULL,
+ (GAsyncReadyCallback) power_keyboard_ready_cb,
+ manager);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
