X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusicon.c;h=679ca95d04f11d7699fb0daa01482d3715e5ca83;hb=51be6b88dbff3ff6ed83d1247508ad58c0278df6;hp=170c780e056ce8eadc28e47c7b333d3064189e0e;hpb=94e977538daa97ccc92dfed0a5ec2b00c3d3d60a;p=~andy%2Fgtk diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c index 170c780e0..679ca95d0 100644 --- a/gtk/gtkstatusicon.c +++ b/gtk/gtkstatusicon.c @@ -16,9 +16,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . * * Authors: * Mark McLoughlin @@ -30,11 +28,13 @@ #include "config.h" #include +#include #include "gtkstatusicon.h" #include "gtkintl.h" #include "gtkiconfactory.h" +#include "gtkiconhelperprivate.h" #include "gtkmain.h" #include "gtkmarshalers.h" #include "gtksizerequest.h" @@ -131,40 +131,28 @@ struct _GtkStatusIconPrivate #ifdef GDK_WINDOWING_X11 GtkWidget *tray_icon; GtkWidget *image; +#else + GtkWidget *dummy_widget; #endif #ifdef GDK_WINDOWING_WIN32 - GtkWidget *dummy_widget; NOTIFYICONDATAW nid; + gint taskbar_top; gint last_click_x, last_click_y; GtkOrientation orientation; gchar *tooltip_text; gchar *title; #endif - + #ifdef GDK_WINDOWING_QUARTZ - GtkWidget *dummy_widget; GtkQuartzStatusIcon *status_item; gchar *tooltip_text; gchar *title; #endif - gint size; - - gint image_width; - gint image_height; - - GtkImageType storage_type; - - union - { - GdkPixbuf *pixbuf; - gchar *stock_id; - gchar *icon_name; - GIcon *gicon; - } image_data; - - guint visible : 1; + gint size; + GtkIconHelper *icon_helper; + guint visible : 1; }; static GObject* gtk_status_icon_constructor (GType type, @@ -693,7 +681,7 @@ button_callback (gpointer data) gdk_event_free ((GdkEvent *) bc->event); g_free (data); - return FALSE; + return G_SOURCE_REMOVE; } static UINT taskbar_created_msg = 0; @@ -847,64 +835,66 @@ gtk_status_icon_init (GtkStatusIcon *status_icon) GtkStatusIconPrivate); status_icon->priv = priv; - priv->storage_type = GTK_IMAGE_EMPTY; + priv->icon_helper = _gtk_icon_helper_new (); + _gtk_icon_helper_set_force_scale_pixbuf (priv->icon_helper, TRUE); priv->visible = TRUE; #ifdef GDK_WINDOWING_X11 - priv->size = 0; - priv->image_width = 0; - priv->image_height = 0; - - priv->tray_icon = GTK_WIDGET (_gtk_tray_icon_new (NULL)); - - gtk_widget_add_events (GTK_WIDGET (priv->tray_icon), - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | - GDK_SCROLL_MASK); - - g_signal_connect_swapped (priv->tray_icon, "key-press-event", - G_CALLBACK (gtk_status_icon_key_press), status_icon); - g_signal_connect_swapped (priv->tray_icon, "popup-menu", - G_CALLBACK (gtk_status_icon_popup_menu), status_icon); - g_signal_connect_swapped (priv->tray_icon, "notify::embedded", - G_CALLBACK (gtk_status_icon_embedded_changed), status_icon); - g_signal_connect_swapped (priv->tray_icon, "notify::orientation", - G_CALLBACK (gtk_status_icon_orientation_changed), status_icon); - g_signal_connect_swapped (priv->tray_icon, "notify::padding", - G_CALLBACK (gtk_status_icon_padding_changed), status_icon); - g_signal_connect_swapped (priv->tray_icon, "notify::icon-size", - G_CALLBACK (gtk_status_icon_icon_size_changed), status_icon); - g_signal_connect_swapped (priv->tray_icon, "notify::fg-color", - G_CALLBACK (gtk_status_icon_fg_changed), status_icon); - g_signal_connect (priv->tray_icon, "notify::error-color", - G_CALLBACK (gtk_status_icon_color_changed), status_icon); - g_signal_connect (priv->tray_icon, "notify::warning-color", - G_CALLBACK (gtk_status_icon_color_changed), status_icon); - g_signal_connect (priv->tray_icon, "notify::success-color", - G_CALLBACK (gtk_status_icon_color_changed), status_icon); - g_signal_connect_swapped (priv->tray_icon, "button-press-event", - G_CALLBACK (gtk_status_icon_button_press), status_icon); - g_signal_connect_swapped (priv->tray_icon, "button-release-event", - G_CALLBACK (gtk_status_icon_button_release), status_icon); - g_signal_connect_swapped (priv->tray_icon, "scroll-event", - G_CALLBACK (gtk_status_icon_scroll), status_icon); - g_signal_connect_swapped (priv->tray_icon, "query-tooltip", - G_CALLBACK (gtk_status_icon_query_tooltip), status_icon); - g_signal_connect_swapped (priv->tray_icon, "screen-changed", - G_CALLBACK (gtk_status_icon_screen_changed), status_icon); - priv->image = gtk_image_new (); - gtk_widget_set_can_focus (priv->image, TRUE); - gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image); - gtk_widget_show (priv->image); - - /* Force-initialize the symbolic colors */ - g_object_notify (G_OBJECT (priv->tray_icon), "fg-color"); - g_object_notify (G_OBJECT (priv->tray_icon), "error-color"); - g_object_notify (G_OBJECT (priv->tray_icon), "warning-color"); - g_object_notify (G_OBJECT (priv->tray_icon), "success-color"); - - g_signal_connect_swapped (priv->image, "size-allocate", - G_CALLBACK (gtk_status_icon_size_allocate), status_icon); - + if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) + { + priv->size = 0; + priv->tray_icon = GTK_WIDGET (_gtk_tray_icon_new (NULL)); + + gtk_widget_add_events (GTK_WIDGET (priv->tray_icon), + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | + GDK_SCROLL_MASK); + + g_signal_connect_swapped (priv->tray_icon, "key-press-event", + G_CALLBACK (gtk_status_icon_key_press), status_icon); + g_signal_connect_swapped (priv->tray_icon, "popup-menu", + G_CALLBACK (gtk_status_icon_popup_menu), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::embedded", + G_CALLBACK (gtk_status_icon_embedded_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::orientation", + G_CALLBACK (gtk_status_icon_orientation_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::padding", + G_CALLBACK (gtk_status_icon_padding_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::icon-size", + G_CALLBACK (gtk_status_icon_icon_size_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "notify::fg-color", + G_CALLBACK (gtk_status_icon_fg_changed), status_icon); + g_signal_connect (priv->tray_icon, "notify::error-color", + G_CALLBACK (gtk_status_icon_color_changed), status_icon); + g_signal_connect (priv->tray_icon, "notify::warning-color", + G_CALLBACK (gtk_status_icon_color_changed), status_icon); + g_signal_connect (priv->tray_icon, "notify::success-color", + G_CALLBACK (gtk_status_icon_color_changed), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-press-event", + G_CALLBACK (gtk_status_icon_button_press), status_icon); + g_signal_connect_swapped (priv->tray_icon, "button-release-event", + G_CALLBACK (gtk_status_icon_button_release), status_icon); + g_signal_connect_swapped (priv->tray_icon, "scroll-event", + G_CALLBACK (gtk_status_icon_scroll), status_icon); + g_signal_connect_swapped (priv->tray_icon, "query-tooltip", + G_CALLBACK (gtk_status_icon_query_tooltip), status_icon); + g_signal_connect_swapped (priv->tray_icon, "screen-changed", + G_CALLBACK (gtk_status_icon_screen_changed), status_icon); + priv->image = gtk_image_new (); + gtk_widget_set_can_focus (priv->image, TRUE); + gtk_container_add (GTK_CONTAINER (priv->tray_icon), priv->image); + gtk_widget_show (priv->image); + + /* Force-initialize the symbolic colors */ + g_object_notify (G_OBJECT (priv->tray_icon), "fg-color"); + g_object_notify (G_OBJECT (priv->tray_icon), "error-color"); + g_object_notify (G_OBJECT (priv->tray_icon), "warning-color"); + g_object_notify (G_OBJECT (priv->tray_icon), "success-color"); + + g_signal_connect_swapped (priv->image, "size-allocate", + G_CALLBACK (gtk_status_icon_size_allocate), status_icon); + } +#else /* !GDK_WINDOWING_X11 */ + priv->dummy_widget = gtk_label_new (""); #endif #ifdef GDK_WINDOWING_WIN32 @@ -912,23 +902,21 @@ gtk_status_icon_init (GtkStatusIcon *status_icon) /* Get position and orientation of Windows taskbar. */ { APPBARDATA abd; - + abd.cbSize = sizeof (abd); SHAppBarMessage (ABM_GETTASKBARPOS, &abd); if (abd.rc.bottom - abd.rc.top > abd.rc.right - abd.rc.left) priv->orientation = GTK_ORIENTATION_VERTICAL; else priv->orientation = GTK_ORIENTATION_HORIZONTAL; + + priv->taskbar_top = abd.rc.top; } priv->last_click_x = priv->last_click_y = 0; /* Are the system tray icons always 16 pixels square? */ priv->size = 16; - priv->image_width = 16; - priv->image_height = 16; - - priv->dummy_widget = gtk_label_new (""); memset (&priv->nid, 0, sizeof (priv->nid)); @@ -959,14 +947,10 @@ gtk_status_icon_init (GtkStatusIcon *status_icon) #endif #ifdef GDK_WINDOWING_QUARTZ - priv->dummy_widget = gtk_label_new (""); - QUARTZ_POOL_ALLOC; priv->status_item = [[GtkQuartzStatusIcon alloc] initWithStatusIcon:status_icon]; - - priv->image_width = priv->image_height = [priv->status_item getHeight]; - priv->size = priv->image_height; + priv->size = [priv->status_item getHeight]; QUARTZ_POOL_RELEASE; @@ -991,8 +975,8 @@ gtk_status_icon_constructor (GType type, #ifdef GDK_WINDOWING_X11 status_icon = GTK_STATUS_ICON (object); priv = status_icon->priv; - - if (priv->visible) + + if (priv->visible && priv->tray_icon) gtk_widget_show (priv->tray_icon); #endif @@ -1006,36 +990,42 @@ gtk_status_icon_finalize (GObject *object) GtkStatusIconPrivate *priv = status_icon->priv; gtk_status_icon_reset_image_data (status_icon); + g_clear_object (&priv->icon_helper); #ifdef GDK_WINDOWING_X11 - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_key_press, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_popup_menu, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_embedded_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_orientation_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_padding_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_icon_size_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_fg_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_color_changed, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_button_press, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_button_release, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_scroll, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_query_tooltip, status_icon); - g_signal_handlers_disconnect_by_func (priv->tray_icon, - gtk_status_icon_screen_changed, status_icon); - gtk_widget_destroy (priv->image); - gtk_widget_destroy (priv->tray_icon); + if (priv->tray_icon) + { + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_key_press, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_popup_menu, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_embedded_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_orientation_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_padding_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_icon_size_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_fg_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_color_changed, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_press, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_button_release, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_scroll, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_query_tooltip, status_icon); + g_signal_handlers_disconnect_by_func (priv->tray_icon, + gtk_status_icon_screen_changed, status_icon); + gtk_widget_destroy (priv->image); + gtk_widget_destroy (priv->tray_icon); + } +#else /* !GDK_WINDOWING_X11 */ + gtk_widget_destroy (priv->dummy_widget); #endif #ifdef GDK_WINDOWING_WIN32 @@ -1045,11 +1035,9 @@ gtk_status_icon_finalize (GObject *object) DestroyIcon (priv->nid.hIcon); g_free (priv->tooltip_text); - gtk_widget_destroy (priv->dummy_widget); - status_icons = g_slist_remove (status_icons, status_icon); #endif - + #ifdef GDK_WINDOWING_QUARTZ QUARTZ_POOL_ALLOC; [priv->status_item release]; @@ -1116,39 +1104,20 @@ gtk_status_icon_get_property (GObject *object, GParamSpec *pspec) { GtkStatusIcon *status_icon = GTK_STATUS_ICON (object); - GtkStatusIconPrivate *priv = status_icon->priv; - - /* The "getter" functions whine if you try to get the wrong - * storage type. This function is instead robust against that, - * so that GUI builders don't have to jump through hoops - * to avoid g_warning - */ switch (prop_id) { case PROP_PIXBUF: - if (priv->storage_type != GTK_IMAGE_PIXBUF) - g_value_set_object (value, NULL); - else - g_value_set_object (value, gtk_status_icon_get_pixbuf (status_icon)); + g_value_set_object (value, gtk_status_icon_get_pixbuf (status_icon)); break; case PROP_STOCK: - if (priv->storage_type != GTK_IMAGE_STOCK) - g_value_set_string (value, NULL); - else - g_value_set_string (value, gtk_status_icon_get_stock (status_icon)); + g_value_set_string (value, gtk_status_icon_get_stock (status_icon)); break; case PROP_ICON_NAME: - if (priv->storage_type != GTK_IMAGE_ICON_NAME) - g_value_set_string (value, NULL); - else - g_value_set_string (value, gtk_status_icon_get_icon_name (status_icon)); + g_value_set_string (value, gtk_status_icon_get_icon_name (status_icon)); break; case PROP_GICON: - if (priv->storage_type != GTK_IMAGE_GICON) - g_value_set_object (value, NULL); - else - g_value_set_object (value, gtk_status_icon_get_gicon (status_icon)); + g_value_set_object (value, gtk_status_icon_get_gicon (status_icon)); break; case PROP_STORAGE_TYPE: g_value_set_enum (value, gtk_status_icon_get_storage_type (status_icon)); @@ -1167,7 +1136,10 @@ gtk_status_icon_get_property (GObject *object, break; case PROP_ORIENTATION: #ifdef GDK_WINDOWING_X11 - g_value_set_enum (value, _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (status_icon->priv->tray_icon))); + if (status_icon->priv->tray_icon) + g_value_set_enum (value, _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (status_icon->priv->tray_icon))); + else + g_value_set_enum (value, GTK_ORIENTATION_HORIZONTAL); #endif #ifdef GDK_WINDOWING_WIN32 g_value_set_enum (value, status_icon->priv->orientation); @@ -1344,16 +1316,15 @@ emit_size_changed_signal (GtkStatusIcon *status_icon, #endif -#ifdef GDK_WINDOWING_X11 - -static GtkIconSize -find_icon_size (GtkWidget *widget, - gint pixel_size) +/* rounds the pixel size to the nearest size avaiable in the theme */ +static gint +round_pixel_size (GtkWidget *widget, + gint pixel_size) { GdkScreen *screen; GtkSettings *settings; - GtkIconSize s, size; - gint w, h, d, dist; + GtkIconSize s; + gint w, h, d, dist, size; screen = gtk_widget_get_screen (widget); @@ -1361,20 +1332,19 @@ find_icon_size (GtkWidget *widget, return GTK_ICON_SIZE_MENU; settings = gtk_settings_get_for_screen (screen); - + dist = G_MAXINT; - size = GTK_ICON_SIZE_MENU; + size = 0; for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++) { - if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) && - w <= pixel_size && h <= pixel_size) + if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h)) { - d = MAX (pixel_size - w, pixel_size - h); + d = MAX (abs (pixel_size - w), abs (pixel_size - h)); if (d < dist) { dist = d; - size = s; + size = MAX (w, h); } } } @@ -1382,8 +1352,6 @@ find_icon_size (GtkWidget *widget, return size; } -#endif - static void gtk_status_icon_update_image (GtkStatusIcon *status_icon) { @@ -1391,231 +1359,64 @@ gtk_status_icon_update_image (GtkStatusIcon *status_icon) #ifdef GDK_WINDOWING_WIN32 HICON prev_hicon; #endif + GtkStyleContext *context; + GtkWidget *widget; + GdkPixbuf *pixbuf; + gint round_size; - switch (priv->storage_type) - { - case GTK_IMAGE_PIXBUF: - { - GdkPixbuf *pixbuf; - - pixbuf = priv->image_data.pixbuf; - - if (pixbuf) - { - GdkPixbuf *scaled; - gint size; - gint width; - gint height; - - size = priv->size; - - width = gdk_pixbuf_get_width (pixbuf); - height = gdk_pixbuf_get_height (pixbuf); - - if (width > size || height > size) - scaled = gdk_pixbuf_scale_simple (pixbuf, - MIN (size, width), - MIN (size, height), - GDK_INTERP_BILINEAR); - else - scaled = g_object_ref (pixbuf); - -#ifdef GDK_WINDOWING_X11 - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), scaled); -#endif -#ifdef GDK_WINDOWING_WIN32 - prev_hicon = priv->nid.hIcon; - priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (scaled); - priv->nid.uFlags |= NIF_ICON; - if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); - if (prev_hicon) - DestroyIcon (prev_hicon); -#endif -#ifdef GDK_WINDOWING_QUARTZ - QUARTZ_POOL_ALLOC; - [priv->status_item setImage:scaled]; - QUARTZ_POOL_RELEASE; -#endif - - g_object_unref (scaled); - } - else - { #ifdef GDK_WINDOWING_X11 - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL); -#endif -#ifdef GDK_WINDOWING_WIN32 - priv->nid.uFlags &= ~NIF_ICON; - if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); -#endif -#ifdef GDK_WINDOWING_QUARTZ - [priv->status_item setImage:NULL]; + widget = priv->image; +#else + widget = priv->dummy_widget; #endif - } - } - break; - case GTK_IMAGE_STOCK: - { -#ifdef GDK_WINDOWING_X11 - GtkIconSize size = find_icon_size (priv->image, priv->size); - gtk_image_set_from_stock (GTK_IMAGE (priv->image), - priv->image_data.stock_id, - size); -#endif -#ifdef GDK_WINDOWING_WIN32 - { - GdkPixbuf *pixbuf = - gtk_widget_render_icon_pixbuf (priv->dummy_widget, - priv->image_data.stock_id, - GTK_ICON_SIZE_SMALL_TOOLBAR); - - prev_hicon = priv->nid.hIcon; - priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf); - priv->nid.uFlags |= NIF_ICON; - if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); - if (prev_hicon) - DestroyIcon (prev_hicon); - g_object_unref (pixbuf); - } -#endif -#ifdef GDK_WINDOWING_QUARTZ - { - GdkPixbuf *pixbuf; - - pixbuf = gtk_widget_render_icon_pixbuf (priv->dummy_widget, - priv->image_data.stock_id, - GTK_ICON_SIZE_SMALL_TOOLBAR); - QUARTZ_POOL_ALLOC; - [priv->status_item setImage:pixbuf]; - QUARTZ_POOL_RELEASE; - g_object_unref (pixbuf); - } -#endif - } - break; - - case GTK_IMAGE_ICON_NAME: - { -#ifdef GDK_WINDOWING_X11 - GtkIconSize size = find_icon_size (priv->image, priv->size); - gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), - priv->image_data.icon_name, - size); -#endif -#ifdef GDK_WINDOWING_WIN32 - { - GdkPixbuf *pixbuf = - gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - priv->image_data.icon_name, - priv->size, - 0, NULL); - - prev_hicon = priv->nid.hIcon; - priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf); - priv->nid.uFlags |= NIF_ICON; - if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); - if (prev_hicon) - DestroyIcon (prev_hicon); - g_object_unref (pixbuf); - } -#endif -#ifdef GDK_WINDOWING_QUARTZ - { - GdkPixbuf *pixbuf; + if (widget == NULL) + return; - pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), - priv->image_data.icon_name, - priv->size, - 0, NULL); + context = gtk_widget_get_style_context (widget); + round_size = round_pixel_size (widget, priv->size); - QUARTZ_POOL_ALLOC; - [priv->status_item setImage:pixbuf]; - QUARTZ_POOL_RELEASE; - g_object_unref (pixbuf); - } -#endif - - } - break; + _gtk_icon_helper_set_pixel_size (priv->icon_helper, round_size); + pixbuf = _gtk_icon_helper_ensure_pixbuf (priv->icon_helper, context); - case GTK_IMAGE_GICON: - { + if (pixbuf != NULL) + { #ifdef GDK_WINDOWING_X11 - GtkIconSize size = find_icon_size (priv->image, priv->size); - gtk_image_set_from_gicon (GTK_IMAGE (priv->image), - priv->image_data.gicon, - size); + gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), pixbuf); #endif #ifdef GDK_WINDOWING_WIN32 - { - GtkIconInfo *info = - gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), - priv->image_data.gicon, - priv->size, - 0); - GdkPixbuf *pixbuf = gtk_icon_info_load_icon (info, NULL); - - prev_hicon = priv->nid.hIcon; - priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf); - priv->nid.uFlags |= NIF_ICON; - if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); - if (prev_hicon) - DestroyIcon (prev_hicon); - g_object_unref (pixbuf); - } + prev_hicon = priv->nid.hIcon; + priv->nid.hIcon = gdk_win32_pixbuf_to_hicon_libgtk_only (pixbuf); + priv->nid.uFlags |= NIF_ICON; + if (priv->nid.hWnd != NULL && priv->visible) + if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) + g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); + if (prev_hicon) + DestroyIcon (prev_hicon); #endif #ifdef GDK_WINDOWING_QUARTZ - { - GtkIconInfo *info = - gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), - priv->image_data.gicon, - priv->size, - 0); - GdkPixbuf *pixbuf = gtk_icon_info_load_icon (info, NULL); - - QUARTZ_POOL_ALLOC; - [priv->status_item setImage:pixbuf]; - QUARTZ_POOL_RELEASE; - g_object_unref (pixbuf); - } + QUARTZ_POOL_ALLOC; + [priv->status_item setImage:pixbuf]; + QUARTZ_POOL_RELEASE; #endif - - } - break; - - case GTK_IMAGE_EMPTY: + } + else + { #ifdef GDK_WINDOWING_X11 gtk_image_set_from_pixbuf (GTK_IMAGE (priv->image), NULL); #endif #ifdef GDK_WINDOWING_WIN32 priv->nid.uFlags &= ~NIF_ICON; if (priv->nid.hWnd != NULL && priv->visible) - if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) - g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); + if (!Shell_NotifyIconW (NIM_MODIFY, &priv->nid)) + g_warning (G_STRLOC ": Shell_NotifyIcon(NIM_MODIFY) failed"); #endif #ifdef GDK_WINDOWING_QUARTZ - { - QUARTZ_POOL_ALLOC; - [priv->status_item setImage:NULL]; - QUARTZ_POOL_RELEASE; - } + [priv->status_item setImage:NULL]; #endif - break; - default: - g_assert_not_reached (); - break; } + + g_clear_object (&pixbuf); } #ifdef GDK_WINDOWING_X11 @@ -1627,7 +1428,6 @@ gtk_status_icon_size_allocate (GtkStatusIcon *status_icon, GtkStatusIconPrivate *priv = status_icon->priv; GtkOrientation orientation; gint size; - gint xpad, ypad; orientation = _gtk_tray_icon_get_orientation (GTK_TRAY_ICON (priv->tray_icon)); @@ -1636,11 +1436,6 @@ gtk_status_icon_size_allocate (GtkStatusIcon *status_icon, else size = allocation->width; - gtk_misc_get_padding (GTK_MISC (priv->image), &xpad, &ypad); - - priv->image_width = allocation->width - xpad * 2; - priv->image_height = allocation->height - ypad * 2; - if (priv->size != size) { priv->size = size; @@ -1664,10 +1459,6 @@ gtk_status_icon_screen_changed (GtkStatusIcon *status_icon, } } -#endif - -#ifdef GDK_WINDOWING_X11 - static void gtk_status_icon_padding_changed (GtkStatusIcon *status_icon) { @@ -1679,9 +1470,15 @@ gtk_status_icon_padding_changed (GtkStatusIcon *status_icon) padding = _gtk_tray_icon_get_padding (GTK_TRAY_ICON (priv->tray_icon)); if (orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_misc_set_padding (GTK_MISC (priv->image), padding, 0); + { + gtk_widget_set_margin_left (priv->image, padding); + gtk_widget_set_margin_right (priv->image, padding); + } else - gtk_misc_set_padding (GTK_MISC (priv->image), 0, padding); + { + gtk_widget_set_margin_bottom (priv->image, padding); + gtk_widget_set_margin_top (priv->image, padding); + } } static void @@ -1717,11 +1514,13 @@ static void gtk_status_icon_fg_changed (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv = status_icon->priv; - GdkColor *color; + GdkRGBA *rgba; + + g_object_get (priv->tray_icon, "fg-color", &rgba, NULL); - g_object_get (priv->tray_icon, "fg-color", &color, NULL); - gtk_widget_modify_fg (priv->image, GTK_STATE_NORMAL, color); - gdk_color_free (color); + gtk_widget_override_color (priv->image, GTK_STATE_FLAG_NORMAL, rgba); + + gdk_rgba_free (rgba); } static void @@ -1731,7 +1530,6 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray, { GtkStatusIconPrivate *priv = status_icon->priv; const gchar *name; - GdkColor *color; switch (pspec->name[0]) { @@ -1753,13 +1551,9 @@ gtk_status_icon_color_changed (GtkTrayIcon *tray, { GdkRGBA rgba; - g_object_get (priv->tray_icon, pspec->name, &color, NULL); + g_object_get (priv->tray_icon, pspec->name, &rgba, NULL); - rgba.red = color->red / 65535.; - rgba.green = color->green / 65535.; - rgba.blue = color->blue / 65535.; rgba.alpha = 1; - gdk_color_free (color); gtk_widget_override_symbolic_color (priv->image, name, &rgba); } @@ -1793,7 +1587,7 @@ gtk_status_icon_popup_menu (GtkStatusIcon *status_icon) emit_popup_menu_signal (status_icon, 0, gtk_get_current_event_time ()); } -#endif +#endif /* GDK_WINDOWING_X11 */ static gboolean gtk_status_icon_button_press (GtkStatusIcon *status_icon, @@ -1807,14 +1601,14 @@ gtk_status_icon_button_press (GtkStatusIcon *status_icon, if (handled) return TRUE; - if (event->button == 1 && event->type == GDK_BUTTON_PRESS) + if (gdk_event_triggers_context_menu ((GdkEvent *) event)) { - emit_activate_signal (status_icon); + emit_popup_menu_signal (status_icon, event->button, event->time); return TRUE; } - else if (event->button == 3 && event->type == GDK_BUTTON_PRESS) + else if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_BUTTON_PRESS) { - emit_popup_menu_signal (status_icon, event->button, event->time); + emit_activate_signal (status_icon); return TRUE; } @@ -1833,6 +1627,7 @@ gtk_status_icon_button_release (GtkStatusIcon *status_icon, } #ifdef GDK_WINDOWING_X11 + static gboolean gtk_status_icon_scroll (GtkStatusIcon *status_icon, GdkEventScroll *event) @@ -1857,44 +1652,29 @@ gtk_status_icon_query_tooltip (GtkStatusIcon *status_icon, x, y, keyboard_tip, tooltip, &handled); return handled; } + #endif /* GDK_WINDOWING_X11 */ static void gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv = status_icon->priv; + GtkImageType storage_type = _gtk_icon_helper_get_storage_type (priv->icon_helper); - switch (priv->storage_type) + switch (storage_type) { case GTK_IMAGE_PIXBUF: - if (priv->image_data.pixbuf) - g_object_unref (priv->image_data.pixbuf); - priv->image_data.pixbuf = NULL; g_object_notify (G_OBJECT (status_icon), "pixbuf"); break; - case GTK_IMAGE_STOCK: - g_free (priv->image_data.stock_id); - priv->image_data.stock_id = NULL; - g_object_notify (G_OBJECT (status_icon), "stock"); - break; - + break; case GTK_IMAGE_ICON_NAME: - g_free (priv->image_data.icon_name); - priv->image_data.icon_name = NULL; - g_object_notify (G_OBJECT (status_icon), "icon-name"); break; - case GTK_IMAGE_GICON: - if (priv->image_data.gicon) - g_object_unref (priv->image_data.gicon); - priv->image_data.gicon = NULL; - g_object_notify (G_OBJECT (status_icon), "gicon"); break; - case GTK_IMAGE_EMPTY: break; default: @@ -1902,7 +1682,7 @@ gtk_status_icon_reset_image_data (GtkStatusIcon *status_icon) break; } - priv->storage_type = GTK_IMAGE_EMPTY; + _gtk_icon_helper_clear (priv->icon_helper); g_object_notify (G_OBJECT (status_icon), "storage-type"); } @@ -1917,25 +1697,27 @@ gtk_status_icon_set_image (GtkStatusIcon *status_icon, gtk_status_icon_reset_image_data (status_icon); - priv->storage_type = storage_type; g_object_notify (G_OBJECT (status_icon), "storage-type"); + /* the icon size we pass here doesn't really matter, since + * we force a pixel size before doing the actual rendering anyway. + */ switch (storage_type) { case GTK_IMAGE_PIXBUF: - priv->image_data.pixbuf = (GdkPixbuf *)data; + _gtk_icon_helper_set_pixbuf (priv->icon_helper, data); g_object_notify (G_OBJECT (status_icon), "pixbuf"); break; case GTK_IMAGE_STOCK: - priv->image_data.stock_id = g_strdup ((const gchar *)data); + _gtk_icon_helper_set_stock_id (priv->icon_helper, data, GTK_ICON_SIZE_SMALL_TOOLBAR); g_object_notify (G_OBJECT (status_icon), "stock"); break; case GTK_IMAGE_ICON_NAME: - priv->image_data.icon_name = g_strdup ((const gchar *)data); + _gtk_icon_helper_set_icon_name (priv->icon_helper, data, GTK_ICON_SIZE_SMALL_TOOLBAR); g_object_notify (G_OBJECT (status_icon), "icon-name"); break; case GTK_IMAGE_GICON: - priv->image_data.gicon = (GIcon *)data; + _gtk_icon_helper_set_gicon (priv->icon_helper, data, GTK_ICON_SIZE_SMALL_TOOLBAR); g_object_notify (G_OBJECT (status_icon), "gicon"); break; default: @@ -1964,9 +1746,6 @@ gtk_status_icon_set_from_pixbuf (GtkStatusIcon *status_icon, g_return_if_fail (GTK_IS_STATUS_ICON (status_icon)); g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf)); - if (pixbuf) - g_object_ref (pixbuf); - gtk_status_icon_set_image (status_icon, GTK_IMAGE_PIXBUF, (gpointer) pixbuf); } @@ -2058,9 +1837,6 @@ gtk_status_icon_set_from_gicon (GtkStatusIcon *status_icon, g_return_if_fail (GTK_IS_STATUS_ICON (status_icon)); g_return_if_fail (icon != NULL); - if (icon) - g_object_ref (icon); - gtk_status_icon_set_image (status_icon, GTK_IMAGE_GICON, (gpointer) icon); } @@ -2082,7 +1858,7 @@ gtk_status_icon_get_storage_type (GtkStatusIcon *status_icon) { g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), GTK_IMAGE_EMPTY); - return status_icon->priv->storage_type; + return _gtk_icon_helper_get_storage_type (status_icon->priv->icon_helper); } /** * gtk_status_icon_get_pixbuf: @@ -2108,13 +1884,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon) priv = status_icon->priv; - g_return_val_if_fail (priv->storage_type == GTK_IMAGE_PIXBUF || - priv->storage_type == GTK_IMAGE_EMPTY, NULL); - - if (priv->storage_type == GTK_IMAGE_EMPTY) - priv->image_data.pixbuf = NULL; - - return priv->image_data.pixbuf; + return _gtk_icon_helper_peek_pixbuf (priv->icon_helper); } /** @@ -2132,7 +1902,7 @@ gtk_status_icon_get_pixbuf (GtkStatusIcon *status_icon) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_stock (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; @@ -2141,13 +1911,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon) priv = status_icon->priv; - g_return_val_if_fail (priv->storage_type == GTK_IMAGE_STOCK || - priv->storage_type == GTK_IMAGE_EMPTY, NULL); - - if (priv->storage_type == GTK_IMAGE_EMPTY) - priv->image_data.stock_id = NULL; - - return priv->image_data.stock_id; + return _gtk_icon_helper_get_stock_id (priv->icon_helper); } /** @@ -2164,7 +1928,7 @@ gtk_status_icon_get_stock (GtkStatusIcon *status_icon) * * Since: 2.10 **/ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; @@ -2173,13 +1937,7 @@ gtk_status_icon_get_icon_name (GtkStatusIcon *status_icon) priv = status_icon->priv; - g_return_val_if_fail (priv->storage_type == GTK_IMAGE_ICON_NAME || - priv->storage_type == GTK_IMAGE_EMPTY, NULL); - - if (priv->storage_type == GTK_IMAGE_EMPTY) - priv->image_data.icon_name = NULL; - - return priv->image_data.icon_name; + return _gtk_icon_helper_get_icon_name (priv->icon_helper); } /** @@ -2207,13 +1965,7 @@ gtk_status_icon_get_gicon (GtkStatusIcon *status_icon) priv = status_icon->priv; - g_return_val_if_fail (priv->storage_type == GTK_IMAGE_GICON || - priv->storage_type == GTK_IMAGE_EMPTY, NULL); - - if (priv->storage_type == GTK_IMAGE_EMPTY) - priv->image_data.gicon = NULL; - - return priv->image_data.gicon; + return _gtk_icon_helper_peek_gicon (priv->icon_helper); } /** @@ -2259,7 +2011,8 @@ gtk_status_icon_set_screen (GtkStatusIcon *status_icon, g_return_if_fail (GDK_IS_SCREEN (screen)); #ifdef GDK_WINDOWING_X11 - gtk_window_set_screen (GTK_WINDOW (status_icon->priv->tray_icon), screen); + if (status_icon->priv->tray_icon) + gtk_window_set_screen (GTK_WINDOW (status_icon->priv->tray_icon), screen); #endif } @@ -2279,10 +2032,11 @@ gtk_status_icon_get_screen (GtkStatusIcon *status_icon) g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL); #ifdef GDK_WINDOWING_X11 - return gtk_window_get_screen (GTK_WINDOW (status_icon->priv->tray_icon)); -#else - return gdk_screen_get_default (); + if (status_icon->priv->tray_icon) + return gtk_window_get_screen (GTK_WINDOW (status_icon->priv->tray_icon)); + else #endif + return gdk_screen_get_default (); } /** @@ -2311,12 +2065,15 @@ gtk_status_icon_set_visible (GtkStatusIcon *status_icon, priv->visible = visible; #ifdef GDK_WINDOWING_X11 - if (visible) - gtk_widget_show (priv->tray_icon); - else if (gtk_widget_get_realized (priv->tray_icon)) + if (priv->tray_icon) { - gtk_widget_hide (priv->tray_icon); - gtk_widget_unrealize (priv->tray_icon); + if (visible) + gtk_widget_show (priv->tray_icon); + else if (gtk_widget_get_realized (priv->tray_icon)) + { + gtk_widget_hide (priv->tray_icon); + gtk_widget_unrealize (priv->tray_icon); + } } #endif #ifdef GDK_WINDOWING_WIN32 @@ -2373,16 +2130,11 @@ gtk_status_icon_get_visible (GtkStatusIcon *status_icon) gboolean gtk_status_icon_is_embedded (GtkStatusIcon *status_icon) { -#ifdef GDK_WINDOWING_X11 - GtkPlug *plug; -#endif - g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE); #ifdef GDK_WINDOWING_X11 - plug = GTK_PLUG (status_icon->priv->tray_icon); - - if (gtk_plug_get_embedded (plug)) + if (status_icon->priv->tray_icon && + gtk_plug_get_embedded (GTK_PLUG (status_icon->priv->tray_icon))) return TRUE; else return FALSE; @@ -2418,9 +2170,9 @@ gtk_status_icon_position_menu (GtkMenu *menu, gpointer user_data) { #ifdef GDK_WINDOWING_X11 + GtkStatusIcon *status_icon = GTK_STATUS_ICON (user_data); + GtkStatusIconPrivate *priv = status_icon->priv; GtkAllocation allocation; - GtkStatusIcon *status_icon; - GtkStatusIconPrivate *priv; GtkTrayIcon *tray_icon; GtkWidget *widget; GdkScreen *screen; @@ -2429,12 +2181,17 @@ gtk_status_icon_position_menu (GtkMenu *menu, GdkRectangle monitor; GdkWindow *window; gint monitor_num, height, width, xoffset, yoffset; - + g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_STATUS_ICON (user_data)); - status_icon = GTK_STATUS_ICON (user_data); - priv = status_icon->priv; + if (priv->tray_icon == NULL) + { + *x = 0; + *y = 0; + return; + } + tray_icon = GTK_TRAY_ICON (priv->tray_icon); widget = priv->tray_icon; @@ -2449,12 +2206,12 @@ gtk_status_icon_position_menu (GtkMenu *menu, monitor_num = 0; gtk_menu_set_monitor (menu, monitor_num); - gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor); + gdk_screen_get_monitor_workarea (screen, monitor_num, &monitor); gdk_window_get_origin (window, x, y); - gtk_widget_get_preferred_size (GTK_WIDGET (menu), - &menu_req, NULL); + menu_req.width = gtk_widget_get_allocated_width (GTK_WIDGET (menu)); + menu_req.height = gtk_widget_get_allocated_height (GTK_WIDGET (menu)); gtk_widget_get_allocation (widget, &allocation); if (_gtk_tray_icon_get_orientation (tray_icon) == GTK_ORIENTATION_VERTICAL) @@ -2510,6 +2267,7 @@ gtk_status_icon_position_menu (GtkMenu *menu, #ifdef GDK_WINDOWING_WIN32 GtkStatusIcon *status_icon; GtkStatusIconPrivate *priv; + GtkRequisition menu_req; g_return_if_fail (GTK_IS_MENU (menu)); g_return_if_fail (GTK_IS_STATUS_ICON (user_data)); @@ -2517,8 +2275,11 @@ gtk_status_icon_position_menu (GtkMenu *menu, status_icon = GTK_STATUS_ICON (user_data); priv = status_icon->priv; + gtk_widget_size_request (GTK_WIDGET (menu), &menu_req); + *x = priv->last_click_x; - *y = priv->last_click_y; + *y = priv->taskbar_top - menu_req.height; + *push_in = TRUE; #endif } @@ -2553,21 +2314,23 @@ gtk_status_icon_position_menu (GtkMenu *menu, * * Since: 2.10 */ -gboolean +gboolean gtk_status_icon_get_geometry (GtkStatusIcon *status_icon, GdkScreen **screen, GdkRectangle *area, GtkOrientation *orientation) { #ifdef GDK_WINDOWING_X11 + GtkStatusIconPrivate *priv = status_icon->priv; GtkAllocation allocation; GtkWidget *widget; - GtkStatusIconPrivate *priv; gint x, y; g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), FALSE); - priv = status_icon->priv; + if (priv->tray_icon == NULL) + return FALSE; + widget = priv->tray_icon; if (screen) @@ -2615,7 +2378,8 @@ gtk_status_icon_set_has_tooltip (GtkStatusIcon *status_icon, priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - gtk_widget_set_has_tooltip (priv->tray_icon, has_tooltip); + if (priv->tray_icon) + gtk_widget_set_has_tooltip (priv->tray_icon, has_tooltip); #endif #ifdef GDK_WINDOWING_WIN32 if (!has_tooltip && priv->tooltip_text) @@ -2649,7 +2413,8 @@ gtk_status_icon_get_has_tooltip (GtkStatusIcon *status_icon) priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - has_tooltip = gtk_widget_get_has_tooltip (priv->tray_icon); + if (priv->tray_icon) + has_tooltip = gtk_widget_get_has_tooltip (priv->tray_icon); #endif #ifdef GDK_WINDOWING_WIN32 has_tooltip = (priv->tooltip_text != NULL); @@ -2688,9 +2453,8 @@ gtk_status_icon_set_tooltip_text (GtkStatusIcon *status_icon, priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - - gtk_widget_set_tooltip_text (priv->tray_icon, text); - + if (priv->tray_icon) + gtk_widget_set_tooltip_text (priv->tray_icon, text); #endif #ifdef GDK_WINDOWING_WIN32 if (text == NULL) @@ -2743,7 +2507,8 @@ gtk_status_icon_get_tooltip_text (GtkStatusIcon *status_icon) priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - tooltip_text = gtk_widget_get_tooltip_text (priv->tray_icon); + if (priv->tray_icon) + tooltip_text = gtk_widget_get_tooltip_text (priv->tray_icon); #endif #ifdef GDK_WINDOWING_WIN32 if (priv->tooltip_text) @@ -2787,7 +2552,8 @@ gtk_status_icon_set_tooltip_markup (GtkStatusIcon *status_icon, priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - gtk_widget_set_tooltip_markup (priv->tray_icon, markup); + if (priv->tray_icon) + gtk_widget_set_tooltip_markup (priv->tray_icon, markup); #endif #ifdef GDK_WINDOWING_WIN32 if (markup) @@ -2825,7 +2591,8 @@ gtk_status_icon_get_tooltip_markup (GtkStatusIcon *status_icon) priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - markup = gtk_widget_get_tooltip_markup (priv->tray_icon); + if (priv->tray_icon) + markup = gtk_widget_get_tooltip_markup (priv->tray_icon); #endif #ifdef GDK_WINDOWING_WIN32 if (priv->tooltip_text) @@ -2863,11 +2630,14 @@ guint32 gtk_status_icon_get_x11_window_id (GtkStatusIcon *status_icon) { #ifdef GDK_WINDOWING_X11 - gtk_widget_realize (GTK_WIDGET (status_icon->priv->tray_icon)); - return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (status_icon->priv->tray_icon))); -#else - return 0; + if (status_icon->priv->tray_icon) + { + gtk_widget_realize (GTK_WIDGET (status_icon->priv->tray_icon)); + return GDK_WINDOW_XID (gtk_widget_get_window (GTK_WIDGET (status_icon->priv->tray_icon))); + } + else #endif + return 0; } /** @@ -2893,7 +2663,8 @@ gtk_status_icon_set_title (GtkStatusIcon *status_icon, priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - gtk_window_set_title (GTK_WINDOW (priv->tray_icon), title); + if (priv->tray_icon) + gtk_window_set_title (GTK_WINDOW (priv->tray_icon), title); #endif #ifdef GDK_WINDOWING_QUARTZ g_free (priv->title); @@ -2917,24 +2688,28 @@ gtk_status_icon_set_title (GtkStatusIcon *status_icon, * * Since: 2.18 */ -G_CONST_RETURN gchar * +const gchar * gtk_status_icon_get_title (GtkStatusIcon *status_icon) { GtkStatusIconPrivate *priv; + const gchar *title = NULL; g_return_val_if_fail (GTK_IS_STATUS_ICON (status_icon), NULL); priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - return gtk_window_get_title (GTK_WINDOW (priv->tray_icon)); + if (priv->tray_icon) + title = gtk_window_get_title (GTK_WINDOW (priv->tray_icon)); #endif #ifdef GDK_WINDOWING_QUARTZ - return priv->title; + title = priv->title; #endif #ifdef GDK_WINDOWING_WIN32 - return priv->title; + title = priv->title; #endif + + return title; } @@ -2961,6 +2736,20 @@ gtk_status_icon_set_name (GtkStatusIcon *status_icon, priv = status_icon->priv; #ifdef GDK_WINDOWING_X11 - gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name); + if (priv->tray_icon) + { + if (gtk_widget_get_realized (priv->tray_icon)) + { + /* gtk_window_set_wmclass() only operates on non-realized windows, + * so temporarily unrealize the tray here + */ + gtk_widget_hide (priv->tray_icon); + gtk_widget_unrealize (priv->tray_icon); + gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name); + gtk_widget_show (priv->tray_icon); + } + else + gtk_window_set_wmclass (GTK_WINDOW (priv->tray_icon), name, name); + } #endif }