Adds on screen display support to keyboard backlight controls

author: William Brown <[email protected]> 2012-11-20 19:40:46 +1030
committer: William Brown <[email protected]> 2012-11-21 10:16:14 +1030
commit: cc5f970075a80bd31ab0dcafe7fa6544082ace96 (patch)
tree: 383e6de0a679261b354d7fa98d5a31935f2f480d
parent: 5fdd6e52207bbf236e3888884cdd6a85c45ab4fd (diff)
download: mate-power-manager-cc5f970075a80bd31ab0dcafe7fa6544082ace96.tar.bz2
mate-power-manager-cc5f970075a80bd31ab0dcafe7fa6544082ace96.tar.xz
1 files changed, 128 insertions, 20 deletions
diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c
index 4ed3fcf..d958751 100644
--- a/src/gpm-kbd-backlight.c
+++ b/src/gpm-kbd-backlight.c
@@ -23,11 +23,13 @@
 #include <glib.h>
 #include <libupower-glib/upower.h>
 
+#include "egg-debug.h"
 #include "gpm-button.h"
 #include "gpm-common.h"
 #include "gpm-control.h"
 #include "gpm-idle.h"
 #include "gpm-kbd-backlight.h"
+#include "gsd-media-keys-window.h"
 
 static const gchar *kbd_backlight_introspection = ""
 "<?xml version=\"1.0\" encoding=\"UTF-8\"?>""<node name=\"/\">"
@@ -48,23 +50,24 @@ static const gchar *kbd_backlight_introspection = ""
 
 struct GpmKbdBacklightPrivate
 {
- UpClient *client;
- GpmButton *button;
- GSettings *settings;
- GSettings *settings_gsd;
- GpmControl *control;
- GpmIdle *idle;
- gboolean can_dim;
- gboolean system_is_idle;
- GTimer *idle_timer;
- guint idle_dim_timeout;
- guint master_percentage;
- guint brightness;
- guint max_brightness;
- guint brightness_percent;
- GDBusProxy *upower_proxy;
- GDBusConnection *bus_connection;
- guint bus_object_id;
+ UpClient *client;
+ GpmButton *button;
+ GSettings *settings;
+ GSettings *settings_gsd;
+ GpmControl *control;
+ GpmIdle *idle;
+ gboolean can_dim;
+ gboolean system_is_idle;
+ GTimer *idle_timer;
+ guint idle_dim_timeout;
+ guint master_percentage;
+ guint brightness;
+ guint max_brightness;
+ guint brightness_percent;
+ GDBusProxy *upower_proxy;
+ GDBusConnection *bus_connection;
+ guint bus_object_id;
+ GtkWidget *popup;
 };
 
 enum {
@@ -149,6 +152,90 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight,
 return TRUE;
 }
 
+/** 
+ * gpm_kbd_backlight_dialog_init
+ **/
+static void
+gpm_kbd_backlight_dialog_init (GpmKbdBacklight *backlight) 
+{ 
+ if (backlight->priv->popup != NULL
+ && !gsd_media_keys_window_is_valid (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup))) {
+ gtk_widget_destroy (backlight->priv->popup);
+ backlight->priv->popup = NULL;
+ }
+
+ if (backlight->priv->popup == NULL) {
+ backlight->priv->popup= gsd_media_keys_window_new ();
+ gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+ "gpm-brightness-kbd",
+ TRUE);
+ gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE);
+
+ }
+}
+/**
+ * gpm_kbd_backlight_dialog_show:
+ *
+ * Show the brightness popup, and place it nicely on the screen.
+ **/
+static void
+gpm_kbd_backlight_dialog_show (GpmKbdBacklight *backlight)
+{
+ int orig_w;
+ int orig_h;
+ int screen_w;
+ int screen_h;
+ int x;
+ int y;
+ int pointer_x;
+ int pointer_y;
+ GtkRequisition win_req;
+ GdkScreen *pointer_screen;
+ GdkRectangle geometry;
+ int monitor;
+
+ /*
+ * get the window size
+ * if the window hasn't been mapped, it doesn't necessarily
+ * know its true size, yet, so we need to jump through hoops
+ */
+ gtk_window_get_default_size (GTK_WINDOW (backlight->priv->popup), &orig_w, &orig_h);
+ gtk_widget_size_request (backlight->priv->popup, &win_req);
+
+ if (win_req.width > orig_w) {
+ orig_w = win_req.width;
+ }
+ if (win_req.height > orig_h) {
+ orig_h = win_req.height;
+ }
+
+ pointer_screen = NULL;
+ gdk_display_get_pointer (gtk_widget_get_display (backlight->priv->popup),
+ &pointer_screen,
+ &pointer_x,
+ &pointer_y,
+ NULL);
+ monitor = gdk_screen_get_monitor_at_point (pointer_screen,
+ pointer_x,
+ pointer_y);
+
+ gdk_screen_get_monitor_geometry (pointer_screen,
+ monitor,
+ &geometry);
+
+ screen_w = geometry.width;
+ screen_h = geometry.height;
+
+ x = ((screen_w - orig_w) / 2) + geometry.x;
+ y = geometry.y + (screen_h / 2) + (screen_h / 2 - orig_h) / 2;
+
+ gtk_window_move (GTK_WINDOW (backlight->priv->popup), x, y);
+
+ gtk_widget_show (backlight->priv->popup);
+
+ gdk_display_sync (gtk_widget_get_display (backlight->priv->popup));
+}
+
 /**
 * gpm_kbd_backlight_brightness_up:
 **/
@@ -462,15 +549,30 @@ gpm_kbd_backlight_button_pressed_cb (GpmButton *button,
 GpmKbdBacklight *backlight)
 {
 static guint saved_brightness;
+ gboolean ret;
 
 saved_brightness = backlight->priv->master_percentage;
 
 if (g_strcmp0 (type, GPM_BUTTON_KBD_BRIGHT_UP) == 0) {
- gpm_kbd_backlight_brightness_up (backlight);
+ ret = gpm_kbd_backlight_brightness_up (backlight);
+ 
+ if (ret) {
+ egg_debug("Going to display OSD");
+ gpm_kbd_backlight_dialog_init (backlight);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), backlight->priv->brightness_percent);
+ gpm_kbd_backlight_dialog_show (backlight);
+ }
 
 } else if (g_strcmp0 (type, GPM_BUTTON_KBD_BRIGHT_DOWN) == 0) {
- gpm_kbd_backlight_brightness_down (backlight);
-
+ ret = gpm_kbd_backlight_brightness_down (backlight);
+
+ if (ret) {
+ egg_debug("Going to display OSD");
+ gpm_kbd_backlight_dialog_init (backlight);
+ gsd_media_keys_window_set_volume_level (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup), backlight->priv->brightness_percent);
+ gpm_kbd_backlight_dialog_show (backlight);
+ }
+ 
 } else if (g_strcmp0 (type, GPM_BUTTON_KBD_BRIGHT_TOGGLE) == 0) {
 if (backlight->priv->master_percentage == 0) {
 /* backlight is off turn it back on */
@@ -707,6 +809,12 @@ noerr:
 g_signal_connect (backlight->priv->idle, "idle-changed",
 G_CALLBACK (gpm_kbd_backlight_idle_changed_cb), backlight);
 
+ /* use a visual widget */
+ backlight->priv->popup = gsd_media_keys_window_new ();
+ gsd_media_keys_window_set_action_custom (GSD_MEDIA_KEYS_WINDOW (backlight->priv->popup),
+ "gpm-brightness-kbd", TRUE);
+ gtk_window_set_position (GTK_WINDOW (backlight->priv->popup), GTK_WIN_POS_NONE);
+
 /* since gpm is just starting we can pretty safely assume that we're not idle */
 backlight->priv->system_is_idle = FALSE;
 backlight->priv->idle_dim_timeout = g_settings_get_int (backlight->priv->settings_gsd, GPM_SETTINGS_IDLE_DIM_TIME);
author	William Brown <[email protected]>	2012-11-20 19:40:46 +1030
committer	William Brown <[email protected]>	2012-11-21 10:16:14 +1030
commit	cc5f970075a80bd31ab0dcafe7fa6544082ace96 (patch)
tree	383e6de0a679261b354d7fa98d5a31935f2f480d
parent	5fdd6e52207bbf236e3888884cdd6a85c45ab4fd (diff)
download	mate-power-manager-cc5f970075a80bd31ab0dcafe7fa6544082ace96.tar.bz2 mate-power-manager-cc5f970075a80bd31ab0dcafe7fa6544082ace96.tar.xz