[gnome-flashback/gnome-3-24] Revert "sound-applet: remove GtkStatusIcon"
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback/gnome-3-24] Revert "sound-applet: remove GtkStatusIcon"
- Date: Tue, 28 Mar 2017 15:09:45 +0000 (UTC)
commit 1688b4314244ef3083ca4c20aaeaa338e392f1a9
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Mar 28 18:04:48 2017 +0300
Revert "sound-applet: remove GtkStatusIcon"
This reverts commit b9d91a03e0eaad5ab612bbd62294de6dfa5af257.
gnome-flashback/libsound-applet/Makefile.am | 2 +
gnome-flashback/libsound-applet/gf-sound-applet.c | 44 +-
.../libsound-applet/gvc-stream-status-icon.c | 797 ++++++++++++++++++++
.../libsound-applet/gvc-stream-status-icon.h | 60 ++
po/POTFILES.in | 1 +
5 files changed, 900 insertions(+), 4 deletions(-)
---
diff --git a/gnome-flashback/libsound-applet/Makefile.am b/gnome-flashback/libsound-applet/Makefile.am
index 149306d..af6a2f3 100644
--- a/gnome-flashback/libsound-applet/Makefile.am
+++ b/gnome-flashback/libsound-applet/Makefile.am
@@ -29,6 +29,8 @@ libsound_applet_la_SOURCES = \
gf-sound-item.h \
gvc-channel-bar.c \
gvc-channel-bar.h \
+ gvc-stream-status-icon.c \
+ gvc-stream-status-icon.h \
$(NULL)
libsound_applet_la_LDFLAGS = \
diff --git a/gnome-flashback/libsound-applet/gf-sound-applet.c
b/gnome-flashback/libsound-applet/gf-sound-applet.c
index aa7e8fb..315333e 100644
--- a/gnome-flashback/libsound-applet/gf-sound-applet.c
+++ b/gnome-flashback/libsound-applet/gf-sound-applet.c
@@ -32,6 +32,7 @@
#include "gf-sound-applet.h"
#include "gvc-mixer-control.h"
+#include "gvc-stream-status-icon.h"
#include "gf-sound-item.h"
static const gchar *output_icons[] =
@@ -54,12 +55,14 @@ static const gchar *input_icons[] =
struct _GfSoundApplet
{
- GObject parent;
+ GObject parent;
- GvcMixerControl *control;
+ GvcStreamStatusIcon *input_status_icon;
+ GvcStreamStatusIcon *output_status_icon;
+ GvcMixerControl *control;
- GfSoundItem *output_item;
- GfSoundItem *input_item;
+ GfSoundItem *output_item;
+ GfSoundItem *input_item;
};
G_DEFINE_TYPE (GfSoundApplet, gf_sound_applet, G_TYPE_OBJECT)
@@ -78,6 +81,10 @@ maybe_show_status_icons (GfSoundApplet *applet)
if (stream == NULL)
show = FALSE;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_visible (GTK_STATUS_ICON (applet->output_status_icon), show);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
if (show)
sn_item_register (SN_ITEM (applet->output_item));
else
@@ -112,6 +119,10 @@ maybe_show_status_icons (GfSoundApplet *applet)
}
}
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_visible (GTK_STATUS_ICON (applet->input_status_icon), show);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
if (show)
sn_item_register (SN_ITEM (applet->input_item));
else
@@ -129,6 +140,7 @@ update_default_sink (GfSoundApplet *applet)
if (stream != NULL)
{
+ gvc_stream_status_icon_set_mixer_stream (applet->output_status_icon, stream);
gf_sound_item_set_mixer_stream (applet->output_item, stream);
maybe_show_status_icons (applet);
}
@@ -147,6 +159,7 @@ update_default_source (GfSoundApplet *applet)
if (stream != NULL)
{
+ gvc_stream_status_icon_set_mixer_stream (applet->input_status_icon, stream);
gf_sound_item_set_mixer_stream (applet->input_item, stream);
maybe_show_status_icons (applet);
}
@@ -258,6 +271,8 @@ gf_sound_applet_dispose (GObject *object)
applet = GF_SOUND_APPLET (object);
+ g_clear_object (&applet->output_status_icon);
+ g_clear_object (&applet->input_status_icon);
g_clear_object (&applet->control);
g_clear_object (&applet->output_item);
@@ -280,8 +295,29 @@ gf_sound_applet_class_init (GfSoundAppletClass *applet_class)
static void
gf_sound_applet_init (GfSoundApplet *applet)
{
+ GvcStreamStatusIcon *icon;
SnItemCategory category;
+ /* Output icon */
+ icon = gvc_stream_status_icon_new (NULL, output_icons);
+ gvc_stream_status_icon_set_display_name (icon, _("Output"));
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_title (GTK_STATUS_ICON (icon), _("Sound Output Volume"));
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ applet->output_status_icon = icon;
+
+ /* Input icon */
+ icon = gvc_stream_status_icon_new (NULL, input_icons);
+ gvc_stream_status_icon_set_display_name (icon, _("Input"));
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_title (GTK_STATUS_ICON (icon), _("Microphone Volume"));
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ applet->input_status_icon = icon;
+
category = SN_ITEM_CATEGORY_HARDWARE;
applet->output_item = gf_sound_item_new (category,
diff --git a/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
b/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
new file mode 100644
index 0000000..ca7ad23
--- /dev/null
+++ b/gnome-flashback/libsound-applet/gvc-stream-status-icon.c
@@ -0,0 +1,797 @@
+/*
+ * Copyright (C) 2008 William Jon McCann
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <math.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+#include <pulse/pulseaudio.h>
+
+#include "gvc-mixer-stream.h"
+#include "gvc-channel-bar.h"
+#include "gvc-stream-status-icon.h"
+
+#define GVC_STREAM_STATUS_ICON_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
GVC_TYPE_STREAM_STATUS_ICON, GvcStreamStatusIconPrivate))
+
+struct GvcStreamStatusIconPrivate
+{
+ char **icon_names;
+ GvcMixerStream *mixer_stream;
+ GtkWidget *dock;
+ GtkWidget *bar;
+ guint current_icon;
+ char *display_name;
+ gboolean thaw;
+};
+
+enum
+{
+ PROP_0,
+ PROP_DISPLAY_NAME,
+ PROP_MIXER_STREAM,
+ PROP_ICON_NAMES,
+};
+
+static void gvc_stream_status_icon_finalize (GObject *object);
+
+G_DEFINE_TYPE (GvcStreamStatusIcon, gvc_stream_status_icon, GTK_TYPE_STATUS_ICON)
+
+static void
+on_adjustment_value_changed (GtkAdjustment *adjustment,
+ GvcStreamStatusIcon *icon)
+{
+ gdouble volume;
+
+ if (icon->priv->thaw)
+ return;
+
+ volume = gtk_adjustment_get_value (adjustment);
+
+ /* Only push the volume if it's actually changed */
+ if (gvc_mixer_stream_set_volume(icon->priv->mixer_stream,
+ (pa_volume_t) round (volume)) != FALSE) {
+ gvc_mixer_stream_push_volume(icon->priv->mixer_stream);
+ }
+}
+
+static void
+update_dock (GvcStreamStatusIcon *icon)
+{
+ GtkAdjustment *adj;
+ gboolean is_muted;
+
+ g_return_if_fail (icon);
+
+ adj = GTK_ADJUSTMENT (gvc_channel_bar_get_adjustment (GVC_CHANNEL_BAR (icon->priv->bar)));
+
+ icon->priv->thaw = TRUE;
+ gtk_adjustment_set_value (adj,
+ gvc_mixer_stream_get_volume (icon->priv->mixer_stream));
+ is_muted = gvc_mixer_stream_get_is_muted (icon->priv->mixer_stream);
+ gvc_channel_bar_set_is_muted (GVC_CHANNEL_BAR (icon->priv->bar), is_muted);
+ icon->priv->thaw = FALSE;
+}
+
+static void
+ungrab (GvcStreamStatusIcon *icon,
+ guint time)
+{
+ GdkDisplay *display;
+ GdkSeat *seat;
+
+ display = gtk_widget_get_display (icon->priv->dock);
+ seat = gdk_display_get_default_seat (display);
+
+ gdk_seat_ungrab (seat);
+
+ gtk_grab_remove (icon->priv->dock);
+
+ /* hide again */
+ gtk_widget_hide (icon->priv->dock);
+}
+
+static gboolean
+popup_dock (GvcStreamStatusIcon *icon,
+ guint time)
+{
+ GdkRectangle area;
+ GtkOrientation orientation;
+ GdkDisplay *display;
+ GdkScreen *screen;
+ gboolean res;
+ int x;
+ int y;
+ int monitor_num;
+ GdkRectangle monitor;
+ GtkRequisition dock_req;
+ GdkWindow *window;
+ GdkSeat *seat;
+ GdkSeatCapabilities capabilities;
+ GdkGrabStatus status;
+
+ update_dock (icon);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ screen = gtk_status_icon_get_screen (GTK_STATUS_ICON (icon));
+ res = gtk_status_icon_get_geometry (GTK_STATUS_ICON (icon),
+ &screen,
+ &area,
+ &orientation);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ if (! res) {
+ g_warning ("Unable to determine geometry of status icon");
+ return FALSE;
+ }
+
+ /* position roughly */
+ gtk_window_set_screen (GTK_WINDOW (icon->priv->dock), screen);
+ gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar),
+ 1 - orientation);
+
+ monitor_num = gdk_screen_get_monitor_at_point (screen, area.x, area.y);
+ gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
+
+ gtk_container_foreach (GTK_CONTAINER (icon->priv->dock),
+ (GtkCallback) gtk_widget_show_all, NULL);
+ gtk_widget_get_preferred_size (icon->priv->dock, &dock_req, NULL);
+
+ if (orientation == GTK_ORIENTATION_VERTICAL) {
+ if (area.x + area.width + dock_req.width <= monitor.x + monitor.width) {
+ x = area.x + area.width;
+ } else {
+ x = area.x - dock_req.width;
+ }
+ if (area.y + dock_req.height <= monitor.y + monitor.height) {
+ y = area.y;
+ } else {
+ y = monitor.y + monitor.height - dock_req.height;
+ }
+ } else {
+ if (area.y + area.height + dock_req.height <= monitor.y + monitor.height) {
+ y = area.y + area.height;
+ } else {
+ y = area.y - dock_req.height;
+ }
+ if (area.x + dock_req.width <= monitor.x + monitor.width) {
+ x = area.x;
+ } else {
+ x = monitor.x + monitor.width - dock_req.width;
+ }
+ }
+
+ gtk_window_move (GTK_WINDOW (icon->priv->dock), x, y);
+
+ /* FIXME: without this, the popup window appears as a square
+ * after changing the orientation
+ */
+ gtk_window_resize (GTK_WINDOW (icon->priv->dock), 1, 1);
+
+ gtk_widget_show_all (icon->priv->dock);
+
+ /* grab focus */
+ gtk_grab_add (icon->priv->dock);
+
+ display = gtk_widget_get_display (icon->priv->dock);
+ window = gtk_widget_get_window (icon->priv->dock);
+ seat = gdk_display_get_default_seat (display);
+
+ capabilities = GDK_SEAT_CAPABILITY_POINTER |
+ GDK_SEAT_CAPABILITY_KEYBOARD;
+
+ status = gdk_seat_grab (seat, window, capabilities, TRUE, NULL,
+ NULL, NULL, NULL);
+
+ if (status != GDK_GRAB_SUCCESS) {
+ ungrab (icon, time);
+ return FALSE;
+ }
+
+ gtk_widget_grab_focus (icon->priv->dock);
+
+ return TRUE;
+}
+
+static void
+on_status_icon_activate (GtkStatusIcon *status_icon,
+ GvcStreamStatusIcon *icon)
+{
+ popup_dock (icon, GDK_CURRENT_TIME);
+}
+
+static void
+on_menu_mute_toggled (GtkMenuItem *item,
+ GvcStreamStatusIcon *icon)
+{
+ gboolean is_muted;
+ is_muted = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item));
+ gvc_channel_bar_set_is_muted (GVC_CHANNEL_BAR (icon->priv->bar), is_muted);
+}
+
+static void
+on_menu_activate_open_volume_control (GtkMenuItem *item,
+ GvcStreamStatusIcon *icon)
+{
+ GAppInfo *app;
+ GdkDisplay *display;
+ GdkAppLaunchContext *context;
+ GError *error;
+
+ error = NULL;
+ display = gdk_display_get_default ();
+ context = gdk_display_get_app_launch_context (display);
+ app = g_app_info_create_from_commandline ("gnome-control-center sound", "Sound preferences", 0,
&error);
+ if (app)
+ g_app_info_launch (app, NULL, G_APP_LAUNCH_CONTEXT (context), &error);
+
+ if (error != NULL) {
+ GtkWidget *dialog;
+
+ dialog = gtk_message_dialog_new (NULL,
+ 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("Failed to start Sound Preferences: %s"),
+ error->message);
+ g_signal_connect (dialog,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
+ gtk_widget_show (dialog);
+ g_error_free (error);
+ }
+
+ g_object_unref (context);
+ g_object_unref (app);
+}
+
+static void
+on_status_icon_popup_menu (GtkStatusIcon *status_icon,
+ guint button,
+ guint activate_time,
+ GvcStreamStatusIcon *icon)
+{
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ menu = gtk_menu_new ();
+
+ item = gtk_check_menu_item_new_with_mnemonic (_("_Mute"));
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
+ gvc_mixer_stream_get_is_muted (icon->priv->mixer_stream));
+ g_signal_connect (item,
+ "toggled",
+ G_CALLBACK (on_menu_mute_toggled),
+ icon);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+ item = gtk_menu_item_new_with_mnemonic (_("_Sound Preferences"));
+ g_signal_connect (item,
+ "activate",
+ G_CALLBACK (on_menu_activate_open_volume_control),
+ icon);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+ gtk_widget_show_all (menu);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_menu_popup (GTK_MENU (menu),
+ NULL,
+ NULL,
+ gtk_status_icon_position_menu,
+ status_icon,
+ button,
+ activate_time);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+}
+
+static gboolean
+on_status_icon_scroll_event (GtkStatusIcon *status_icon,
+ GdkEventScroll *event,
+ GvcStreamStatusIcon *icon)
+{
+ return gvc_channel_bar_scroll (GVC_CHANNEL_BAR (icon->priv->bar), event);
+}
+
+static void
+gvc_icon_release_grab (GvcStreamStatusIcon *icon,
+ GdkEventButton *event)
+{
+ ungrab (icon, event->time);
+}
+
+static gboolean
+on_dock_button_press (GtkWidget *widget,
+ GdkEventButton *event,
+ GvcStreamStatusIcon *icon)
+{
+ if (event->type == GDK_BUTTON_PRESS) {
+ gvc_icon_release_grab (icon, event);
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+static void
+popdown_dock (GvcStreamStatusIcon *icon)
+{
+ ungrab (icon, GDK_CURRENT_TIME);
+}
+
+static gboolean
+on_dock_key_release (GtkWidget *widget,
+ GdkEventKey *event,
+ GvcStreamStatusIcon *icon)
+{
+ if (event->keyval == GDK_KEY_Escape) {
+ popdown_dock (icon);
+ return TRUE;
+ }
+
+#if 0
+ if (!gtk_bindings_activate_event (GTK_OBJECT (widget), event)) {
+ /* The popup hasn't managed the event, pass onto the button */
+ gtk_bindings_activate_event (GTK_OBJECT (user_data), event);
+ }
+#endif
+ return TRUE;
+}
+
+static gboolean
+on_dock_scroll_event (GtkWidget *widget,
+ GdkEventScroll *event,
+ GvcStreamStatusIcon *icon)
+{
+ /* Forward event to the status icon */
+ on_status_icon_scroll_event (NULL, event, icon);
+ return TRUE;
+}
+
+static void
+update_icon (GvcStreamStatusIcon *icon)
+{
+ guint volume;
+ gboolean is_muted;
+ guint n;
+ char *markup;
+ gboolean can_decibel;
+ gdouble db;
+
+ if (icon->priv->mixer_stream == NULL) {
+ return;
+ }
+
+ volume = gvc_mixer_stream_get_volume (icon->priv->mixer_stream);
+ is_muted = gvc_mixer_stream_get_is_muted (icon->priv->mixer_stream);
+ db = gvc_mixer_stream_get_decibel (icon->priv->mixer_stream);
+ can_decibel = gvc_mixer_stream_get_can_decibel (icon->priv->mixer_stream);
+
+ /* select image */
+ if (volume == 0 || is_muted) {
+ n = 0;
+ } else {
+ n = 3 * volume / PA_VOLUME_NORM + 1;
+ if (n < 1) {
+ n = 1;
+ } else if (n > 3) {
+ n = 3;
+ }
+ }
+
+ /* apparently status icon will reset icon even if
+ * if doesn't change */
+ if (icon->priv->current_icon != n) {
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon),
+ icon->priv->icon_names [n]);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ icon->priv->current_icon = n;
+ }
+
+
+ if (is_muted) {
+ markup = g_strdup_printf (
+ "<b>%s: %s</b>\n<small>%s</small>",
+ icon->priv->display_name,
+ _("Muted"),
+ gvc_mixer_stream_get_description (icon->priv->mixer_stream));
+ } else if (can_decibel && (db > PA_DECIBEL_MININFTY)) {
+ markup = g_strdup_printf (
+ "<b>%s: %.0f%%</b>\n<small>%0.2f dB\n%s</small>",
+ icon->priv->display_name,
+ 100 * (float)volume / PA_VOLUME_NORM,
+ db,
+ gvc_mixer_stream_get_description (icon->priv->mixer_stream));
+ } else if (can_decibel) {
+ markup = g_strdup_printf (
+ "<b>%s: %.0f%%</b>\n<small>-∞ dB\n%s</small>",
+ icon->priv->display_name,
+ 100 * (float)volume / PA_VOLUME_NORM,
+ gvc_mixer_stream_get_description (icon->priv->mixer_stream));
+ } else {
+ markup = g_strdup_printf (
+ "<b>%s: %.0f%%</b>\n<small>%s</small>",
+ icon->priv->display_name,
+ 100 * (float)volume / PA_VOLUME_NORM,
+ gvc_mixer_stream_get_description (icon->priv->mixer_stream));
+ }
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_tooltip_markup (GTK_STATUS_ICON (icon), markup);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ g_free (markup);
+}
+
+void
+gvc_stream_status_icon_set_icon_names (GvcStreamStatusIcon *icon,
+ const char **names)
+{
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (icon));
+
+ g_strfreev (icon->priv->icon_names);
+ icon->priv->icon_names = g_strdupv ((char **)names);
+ update_icon (icon);
+ g_object_notify (G_OBJECT (icon), "icon-names");
+}
+
+static void
+on_stream_volume_notify (GObject *object,
+ GParamSpec *pspec,
+ GvcStreamStatusIcon *icon)
+{
+ update_icon (icon);
+ update_dock (icon);
+}
+
+static void
+on_stream_is_muted_notify (GObject *object,
+ GParamSpec *pspec,
+ GvcStreamStatusIcon *icon)
+{
+ update_icon (icon);
+ update_dock (icon);
+}
+
+void
+gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
+ const char *name)
+{
+ g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+
+ g_free (icon->priv->display_name);
+ icon->priv->display_name = g_strdup (name);
+ update_icon (icon);
+ g_object_notify (G_OBJECT (icon), "display-name");
+}
+
+void
+gvc_stream_status_icon_set_mixer_stream (GvcStreamStatusIcon *icon,
+ GvcMixerStream *stream)
+{
+ g_return_if_fail (GVC_STREAM_STATUS_ICON (icon));
+
+ if (stream != NULL) {
+ g_object_ref (stream);
+ }
+
+ if (icon->priv->mixer_stream != NULL) {
+ g_signal_handlers_disconnect_by_func (icon->priv->mixer_stream,
+ G_CALLBACK (on_stream_volume_notify),
+ icon);
+ g_signal_handlers_disconnect_by_func (icon->priv->mixer_stream,
+ G_CALLBACK (on_stream_is_muted_notify),
+ icon);
+ g_object_unref (icon->priv->mixer_stream);
+ icon->priv->mixer_stream = NULL;
+ }
+
+ icon->priv->mixer_stream = stream;
+
+ if (icon->priv->mixer_stream != NULL) {
+ GtkAdjustment *adj;
+
+ g_object_ref (icon->priv->mixer_stream);
+
+ gvc_channel_bar_set_base_volume (GVC_CHANNEL_BAR (icon->priv->bar),
+ gvc_mixer_stream_get_base_volume (stream));
+ gvc_channel_bar_set_is_amplified (GVC_CHANNEL_BAR (icon->priv->bar),
+ gvc_mixer_stream_get_can_decibel (stream));
+
+ icon->priv->thaw = TRUE;
+ adj = GTK_ADJUSTMENT (gvc_channel_bar_get_adjustment (GVC_CHANNEL_BAR (icon->priv->bar)));
+ gtk_adjustment_set_value (adj,
+ gvc_mixer_stream_get_volume (icon->priv->mixer_stream));
+ icon->priv->thaw = FALSE;
+
+ g_signal_connect (icon->priv->mixer_stream,
+ "notify::volume",
+ G_CALLBACK (on_stream_volume_notify),
+ icon);
+ g_signal_connect (icon->priv->mixer_stream,
+ "notify::is-muted",
+ G_CALLBACK (on_stream_is_muted_notify),
+ icon);
+
+ }
+
+ update_icon (icon);
+
+ g_object_notify (G_OBJECT (icon), "mixer-stream");
+}
+
+static void
+gvc_stream_status_icon_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GvcStreamStatusIcon *self = GVC_STREAM_STATUS_ICON (object);
+
+ switch (prop_id) {
+ case PROP_MIXER_STREAM:
+ gvc_stream_status_icon_set_mixer_stream (self, g_value_get_object (value));
+ break;
+ case PROP_DISPLAY_NAME:
+ gvc_stream_status_icon_set_display_name (self, g_value_get_string (value));
+ break;
+ case PROP_ICON_NAMES:
+ gvc_stream_status_icon_set_icon_names (self, g_value_get_boxed (value));
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+gvc_stream_status_icon_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GvcStreamStatusIcon *self = GVC_STREAM_STATUS_ICON (object);
+ GvcStreamStatusIconPrivate *priv = self->priv;
+
+ switch (prop_id) {
+ case PROP_MIXER_STREAM:
+ g_value_set_object (value, priv->mixer_stream);
+ break;
+ case PROP_DISPLAY_NAME:
+ g_value_set_string (value, priv->display_name);
+ break;
+ case PROP_ICON_NAMES:
+ g_value_set_boxed (value, priv->icon_names);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+on_bar_is_muted_notify (GObject *object,
+ GParamSpec *pspec,
+ GvcStreamStatusIcon *icon)
+{
+ gboolean is_muted;
+
+ is_muted = gvc_channel_bar_get_is_muted (GVC_CHANNEL_BAR (object));
+
+ if (gvc_mixer_stream_get_is_muted (icon->priv->mixer_stream) != is_muted) {
+ /* Update the stream before pushing the change */
+ gvc_mixer_stream_set_is_muted (icon->priv->mixer_stream, is_muted);
+ gvc_mixer_stream_change_is_muted (icon->priv->mixer_stream,
+ is_muted);
+ }
+}
+
+static GObject *
+gvc_stream_status_icon_constructor (GType type,
+ guint n_construct_properties,
+ GObjectConstructParam *construct_params)
+{
+ GObject *object;
+ GvcStreamStatusIcon *icon;
+ GtkWidget *frame;
+ GtkWidget *box;
+ GtkAdjustment *adj;
+
+ object = G_OBJECT_CLASS (gvc_stream_status_icon_parent_class)->constructor (type,
n_construct_properties, construct_params);
+
+ icon = GVC_STREAM_STATUS_ICON (object);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ gtk_status_icon_set_from_icon_name (GTK_STATUS_ICON (icon),
+ icon->priv->icon_names[0]);
+ G_GNUC_END_IGNORE_DEPRECATIONS
+
+ /* window */
+ icon->priv->dock = gtk_window_new (GTK_WINDOW_POPUP);
+ gtk_widget_set_name (icon->priv->dock, "gvc-stream-status-icon-popup-window");
+ g_signal_connect (icon->priv->dock,
+ "button-press-event",
+ G_CALLBACK (on_dock_button_press),
+ icon);
+ g_signal_connect (icon->priv->dock,
+ "key-release-event",
+ G_CALLBACK (on_dock_key_release),
+ icon);
+ g_signal_connect (icon->priv->dock,
+ "scroll-event",
+ G_CALLBACK (on_dock_scroll_event),
+ icon);
+
+ gtk_window_set_decorated (GTK_WINDOW (icon->priv->dock), FALSE);
+
+ frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT);
+ gtk_container_add (GTK_CONTAINER (icon->priv->dock), frame);
+
+ box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (box), 2);
+ gtk_container_add (GTK_CONTAINER (frame), box);
+
+ icon->priv->bar = gvc_channel_bar_new ();
+ gvc_channel_bar_set_orientation (GVC_CHANNEL_BAR (icon->priv->bar),
+ GTK_ORIENTATION_VERTICAL);
+
+ gtk_box_pack_start (GTK_BOX (box), icon->priv->bar, TRUE, FALSE, 0);
+ g_signal_connect (icon->priv->bar,
+ "notify::is-muted",
+ G_CALLBACK (on_bar_is_muted_notify),
+ icon);
+
+ adj = GTK_ADJUSTMENT (gvc_channel_bar_get_adjustment (GVC_CHANNEL_BAR (icon->priv->bar)));
+ g_signal_connect (adj,
+ "value-changed",
+ G_CALLBACK (on_adjustment_value_changed),
+ icon);
+
+ return object;
+}
+
+static void
+gvc_stream_status_icon_dispose (GObject *object)
+{
+ GvcStreamStatusIcon *icon = GVC_STREAM_STATUS_ICON (object);
+
+ if (icon->priv->dock != NULL) {
+ gtk_widget_destroy (icon->priv->dock);
+ icon->priv->dock = NULL;
+ }
+
+ if (icon->priv->mixer_stream != NULL) {
+ g_object_unref (icon->priv->mixer_stream);
+ icon->priv->mixer_stream = NULL;
+ }
+
+ G_OBJECT_CLASS (gvc_stream_status_icon_parent_class)->dispose (object);
+}
+
+static void
+gvc_stream_status_icon_class_init (GvcStreamStatusIconClass *klass)
+{
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ object_class->constructor = gvc_stream_status_icon_constructor;
+ object_class->finalize = gvc_stream_status_icon_finalize;
+ object_class->dispose = gvc_stream_status_icon_dispose;
+ object_class->set_property = gvc_stream_status_icon_set_property;
+ object_class->get_property = gvc_stream_status_icon_get_property;
+
+ g_object_class_install_property (object_class,
+ PROP_MIXER_STREAM,
+ g_param_spec_object ("mixer-stream",
+ "mixer stream",
+ "mixer stream",
+ GVC_TYPE_MIXER_STREAM,
+ G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+ g_object_class_install_property (object_class,
+ PROP_DISPLAY_NAME,
+ g_param_spec_string ("display-name",
+ "Display Name",
+ "Name to display for this stream",
+ NULL,
+ G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+ g_object_class_install_property (object_class,
+ PROP_ICON_NAMES,
+ g_param_spec_boxed ("icon-names",
+ "Icon Names",
+ "Name of icon to display for this stream",
+ G_TYPE_STRV,
+ G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
+
+ g_type_class_add_private (klass, sizeof (GvcStreamStatusIconPrivate));
+}
+
+static void
+on_status_icon_visible_notify (GvcStreamStatusIcon *icon)
+{
+ gboolean visible;
+
+ g_object_get (icon, "visible", &visible, NULL);
+ if (! visible) {
+ if (icon->priv->dock != NULL) {
+ gtk_widget_hide (icon->priv->dock);
+ }
+ }
+}
+
+static void
+gvc_stream_status_icon_init (GvcStreamStatusIcon *icon)
+{
+ icon->priv = GVC_STREAM_STATUS_ICON_GET_PRIVATE (icon);
+
+ g_signal_connect (icon,
+ "activate",
+ G_CALLBACK (on_status_icon_activate),
+ icon);
+ g_signal_connect (icon,
+ "popup-menu",
+ G_CALLBACK (on_status_icon_popup_menu),
+ icon);
+ g_signal_connect (icon,
+ "scroll-event",
+ G_CALLBACK (on_status_icon_scroll_event),
+ icon);
+ g_signal_connect (icon,
+ "notify::visible",
+ G_CALLBACK (on_status_icon_visible_notify),
+ NULL);
+
+ icon->priv->thaw = FALSE;
+}
+
+static void
+gvc_stream_status_icon_finalize (GObject *object)
+{
+ GvcStreamStatusIcon *stream_status_icon;
+
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GVC_IS_STREAM_STATUS_ICON (object));
+
+ stream_status_icon = GVC_STREAM_STATUS_ICON (object);
+
+ g_return_if_fail (stream_status_icon->priv != NULL);
+
+ g_strfreev (stream_status_icon->priv->icon_names);
+ g_free (stream_status_icon->priv->display_name);
+
+ G_OBJECT_CLASS (gvc_stream_status_icon_parent_class)->finalize (object);
+}
+
+GvcStreamStatusIcon *
+gvc_stream_status_icon_new (GvcMixerStream *stream,
+ const char **icon_names)
+{
+ GObject *icon;
+ icon = g_object_new (GVC_TYPE_STREAM_STATUS_ICON,
+ "mixer-stream", stream,
+ "icon-names", icon_names,
+ NULL);
+ return GVC_STREAM_STATUS_ICON (icon);
+}
diff --git a/gnome-flashback/libsound-applet/gvc-stream-status-icon.h
b/gnome-flashback/libsound-applet/gvc-stream-status-icon.h
new file mode 100644
index 0000000..6fe7dfe
--- /dev/null
+++ b/gnome-flashback/libsound-applet/gvc-stream-status-icon.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2008 Red Hat, Inc.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GVC_STREAM_STATUS_ICON_H
+#define __GVC_STREAM_STATUS_ICON_H
+
+#include <glib-object.h>
+#include "gvc-mixer-stream.h"
+
+G_BEGIN_DECLS
+
+#define GVC_TYPE_STREAM_STATUS_ICON (gvc_stream_status_icon_get_type ())
+#define GVC_STREAM_STATUS_ICON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GVC_TYPE_STREAM_STATUS_ICON,
GvcStreamStatusIcon))
+#define GVC_STREAM_STATUS_ICON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GVC_TYPE_STREAM_STATUS_ICON,
GvcStreamStatusIconClass))
+#define GVC_IS_STREAM_STATUS_ICON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GVC_TYPE_STREAM_STATUS_ICON))
+#define GVC_IS_STREAM_STATUS_ICON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GVC_TYPE_STREAM_STATUS_ICON))
+#define GVC_STREAM_STATUS_ICON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GVC_TYPE_STREAM_STATUS_ICON,
GvcStreamStatusIconClass))
+
+typedef struct GvcStreamStatusIconPrivate GvcStreamStatusIconPrivate;
+
+typedef struct
+{
+ GtkStatusIcon parent;
+ GvcStreamStatusIconPrivate *priv;
+} GvcStreamStatusIcon;
+
+typedef struct
+{
+ GtkStatusIconClass parent_class;
+} GvcStreamStatusIconClass;
+
+GType gvc_stream_status_icon_get_type (void);
+
+GvcStreamStatusIcon * gvc_stream_status_icon_new (GvcMixerStream *stream,
+ const char **icon_names);
+
+void gvc_stream_status_icon_set_icon_names (GvcStreamStatusIcon *icon,
+ const char **icon_names);
+void gvc_stream_status_icon_set_display_name (GvcStreamStatusIcon *icon,
+ const char *display_name);
+void gvc_stream_status_icon_set_mixer_stream (GvcStreamStatusIcon *icon,
+ GvcMixerStream *stream);
+
+G_END_DECLS
+
+#endif /* __GVC_STREAM_STATUS_ICON_H */
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 894a990..226af03 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,3 +35,4 @@ gnome-flashback/libsound-applet/gf-sound-applet.c
gnome-flashback/libsound-applet/gf-sound-item.c
gnome-flashback/libsound-applet/gvc-channel-bar.c
gnome-flashback/libsound-applet/gvc/gvc-mixer-control.c
+gnome-flashback/libsound-applet/gvc-stream-status-icon.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
