Revision: 6499
Author: ek.kato
Date: Wed Jul 14 08:56:43 2010
Log: * helper/eggtrayicon.c
* helper/eggtrayicon.h
- Support transparent and pixmap background with recent
gnome-panel by using code from gtktrayicon-x11.c (bug #28999).
http://code.google.com/p/uim/source/detail?r=6499
Modified:
/trunk/helper/eggtrayicon.c
/trunk/helper/eggtrayicon.h
=======================================
--- /trunk/helper/eggtrayicon.c Wed Mar 24 21:16:04 2010
+++ /trunk/helper/eggtrayicon.c Wed Jul 14 08:56:43 2010
@@ -26,12 +26,9 @@
#include "eggtrayicon.h"
#include <gdkconfig.h>
-#if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h>
#include <X11/Xatom.h>
-#elif defined (GDK_WINDOWING_WIN32)
-#include <gdk/gdkwin32.h>
-#endif
+#include <gtk/gtkversion.h>
#ifndef EGG_COMPILATION
#ifndef _
@@ -60,22 +57,28 @@
static void egg_tray_icon_init (EggTrayIcon *icon);
static void egg_tray_icon_class_init (EggTrayIconClass *klass);
+static void egg_tray_icon_constructed (GObject *object);
+static void egg_tray_icon_dispose (GObject *object);
+
static void egg_tray_icon_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void egg_tray_icon_realize (GtkWidget *widget);
-static void egg_tray_icon_unrealize (GtkWidget *widget);
-
-static void egg_tray_icon_add (GtkContainer *container,
- GtkWidget *widget);
-
-#ifdef GDK_WINDOWING_X11
-static void egg_tray_icon_update_manager_window (EggTrayIcon *icon,
- gboolean
dock_if_realized);
+static void egg_tray_icon_realize (GtkWidget *widget);
+static void egg_tray_icon_style_set (GtkWidget *widget,
+ GtkStyle *previous_style);
+static gboolean egg_tray_icon_delete (GtkWidget *widget,
+ GdkEventAny *event);
+static gboolean egg_tray_icon_expose (GtkWidget *widget,
+ GdkEventExpose *event);
+
+static void egg_tray_icon_clear_manager_window (EggTrayIcon *icon);
+static void egg_tray_icon_update_manager_window (EggTrayIcon *icon);
static void egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon);
-#endif
+static GdkFilterReturn egg_tray_icon_manager_filter (GdkXEvent *xevent,
+ GdkEvent *event,
+ gpointer user_data);
GType
egg_tray_icon_get_type (void)
@@ -109,6 +112,7 @@
icon->stamp = 1;
icon->orientation = GTK_ORIENTATION_HORIZONTAL;
+ gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE);
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
@@ -117,16 +121,17 @@
{
GObjectClass *gobject_class = (GObjectClass *)klass;
GtkWidgetClass *widget_class = (GtkWidgetClass *)klass;
- GtkContainerClass *container_class = (GtkContainerClass *)klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->get_property = egg_tray_icon_get_property;
-
- widget_class->realize = egg_tray_icon_realize;
- widget_class->unrealize = egg_tray_icon_unrealize;
-
- container_class->add = egg_tray_icon_add;
+ gobject_class->constructed = egg_tray_icon_constructed;
+ gobject_class->dispose = egg_tray_icon_dispose;
+
+ widget_class->realize = egg_tray_icon_realize;
+ widget_class->style_set = egg_tray_icon_style_set;
+ widget_class->delete_event = egg_tray_icon_delete;
+ widget_class->expose_event = egg_tray_icon_expose;
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
@@ -137,13 +142,76 @@
GTK_ORIENTATION_HORIZONTAL,
G_PARAM_READABLE));
-#if defined (GDK_WINDOWING_X11)
- /* Nothing */
-#elif defined (GDK_WINDOWING_WIN32)
- g_warning ("Port eggtrayicon to Win32");
-#else
- g_warning ("Port eggtrayicon to this GTK+ backend");
-#endif
+}
+
+static void
+egg_tray_icon_constructed (GObject *object)
+{
+ /* Do setup that depends on the screen; screen has been set at this
point */
+
+ EggTrayIcon *icon = EGG_TRAY_ICON (object);
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (object));
+ GdkWindow *root_window = gdk_screen_get_root_window (screen);
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (object));
+ Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+ char buffer[256];
+
+ g_snprintf (buffer, sizeof (buffer),
+ "_NET_SYSTEM_TRAY_S%d",
+ gdk_screen_get_number (screen));
+
+ icon->selection_atom = XInternAtom (xdisplay, buffer, False);
+
+ icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
+
+ icon->system_tray_opcode_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_OPCODE",
+ False);
+
+ icon->orientation_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_ORIENTATION",
+ False);
+
+ icon->visual_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_VISUAL",
+ False);
+
+ /* Add a root window filter so that we get changes on MANAGER */
+ gdk_window_add_filter (root_window,
+ egg_tray_icon_manager_filter, icon);
+
+ egg_tray_icon_update_manager_window (icon);
+}
+
+static void
+egg_tray_icon_clear_manager_window (EggTrayIcon *icon)
+{
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (icon));
+
+ if (icon->manager_window != None)
+ {
+ GdkWindow *gdkwin;
+
+ gdkwin = gdk_window_lookup_for_display (display,
+ icon->manager_window);
+
+ gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter,
icon);
+
+ icon->manager_window = None;
+ icon->manager_visual = NULL;
+ }
+}
+
+static void
+egg_tray_icon_dispose (GObject *object)
+{
+ EggTrayIcon *icon = EGG_TRAY_ICON (object);
+ GtkWidget *widget = GTK_WIDGET (object);
+ GdkWindow *root_window = gdk_screen_get_root_window
(gtk_widget_get_screen (widget));
+
+ egg_tray_icon_clear_manager_window (icon);
+
+ gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter,
icon);
}
static void
@@ -165,12 +233,63 @@
}
}
-#ifdef GDK_WINDOWING_X11
+static gboolean
+egg_tray_icon_expose (GtkWidget *widget,
+ GdkEventExpose *event)
+{
+ EggTrayIcon *icon = EGG_TRAY_ICON (widget);
+ GtkWidget *focus_child;
+ gint border_width, x, y, width, height;
+ gboolean retval = FALSE;
+
+#if GTK_CHECK_VERSION(2, 8, 0)
+ if (icon->manager_visual_rgba)
+ {
+ /* Clear to transparent */
+ cairo_t *cr = gdk_cairo_create (widget->window);
+ cairo_set_source_rgba (cr, 0, 0, 0, 0);
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ gdk_cairo_region (cr, event->region);
+ cairo_fill (cr);
+ cairo_destroy (cr);
+ }
+ else
+#endif
+ {
+ /* Clear to parent-relative pixmap */
+ gdk_window_clear_area (widget->window, event->area.x, event->area.y,
+ event->area.width, event->area.height);
+ }
+
+ if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+ retval = GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
+ focus_child = GTK_CONTAINER (widget)->focus_child;
+ if (focus_child && GTK_WIDGET_HAS_FOCUS (focus_child))
+ {
+ border_width = GTK_CONTAINER (widget)->border_width;
+
+ x = widget->allocation.x + border_width;
+ y = widget->allocation.y + border_width;
+
+ width = widget->allocation.width - 2 * border_width;
+ height = widget->allocation.height - 2 * border_width;
+
+ gtk_paint_focus (widget->style, widget->window,
+ GTK_WIDGET_STATE (widget),
+ &event->area, widget, "tray_icon",
+ x, y, width, height);
+ }
+ return retval;
+}
static void
egg_tray_icon_get_orientation_property (EggTrayIcon *icon)
{
- Display *xdisplay;
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
+ GdkDisplay *display = gdk_screen_get_display (screen);
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
Atom type;
int format;
union {
@@ -183,8 +302,6 @@
g_assert (icon->manager_window != None);
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET
(icon)));
-
gdk_error_trap_push ();
type = None;
result = XGetWindowProperty (xdisplay,
@@ -215,9 +332,61 @@
}
}
- if (prop.prop)
+ if (type != None)
XFree (prop.prop);
}
+
+static void
+egg_tray_icon_get_visual_property (EggTrayIcon *icon)
+{
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
+ GdkDisplay *display = gdk_screen_get_display (screen);
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
+ Atom type;
+ int format;
+ union {
+ gulong *prop;
+ guchar *prop_ch;
+ } prop = { NULL };
+ gulong nitems;
+ gulong bytes_after;
+ int error, result;
+ GdkVisual *visual;
+
+ g_assert (icon->manager_window != None);
+
+ gdk_error_trap_push ();
+ type = None;
+ result = XGetWindowProperty (xdisplay,
+ icon->manager_window,
+ icon->visual_atom,
+ 0, G_MAXLONG, FALSE,
+ XA_VISUALID,
+ &type, &format, &nitems,
+ &bytes_after, &(prop.prop_ch));
+ error = gdk_error_trap_pop ();
+
+ visual = NULL;
+
+ if (!error && result == Success &&
+ type == XA_VISUALID && nitems == 1 && format == 32)
+ {
+ VisualID visual_id = prop.prop[0];
+ visual = gdk_x11_screen_lookup_visual (screen, visual_id);
+ }
+
+ icon->manager_visual = visual;
+ icon->manager_visual_rgba = visual != NULL &&
+ (visual->red_prec + visual->blue_prec + visual->green_prec <
visual->depth);
+
+ /* For the background-relative hack we use when we aren't using a real
RGBA
+ * visual, we can't be double-buffered */
+ gtk_widget_set_double_buffered (GTK_WIDGET (icon),
icon->manager_visual_rgba);
+
+ if (type != None)
+ XFree (prop.prop);
+}
static GdkFilterReturn
egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer
user_data)
@@ -229,7 +398,7 @@
xev->xclient.message_type == icon->manager_atom &&
xev->xclient.data.l[1] == (long)icon->selection_atom)
{
- egg_tray_icon_update_manager_window (icon, TRUE);
+ egg_tray_icon_update_manager_window (icon);
}
else if (xev->xany.window == icon->manager_window)
{
@@ -238,43 +407,14 @@
{
egg_tray_icon_get_orientation_property (icon);
}
- if (xev->xany.type == DestroyNotify)
+ else if (xev->xany.type == DestroyNotify)
{
egg_tray_icon_manager_window_destroyed (icon);
}
}
+
return GDK_FILTER_CONTINUE;
}
-
-#endif
-
-static void
-egg_tray_icon_unrealize (GtkWidget *widget)
-{
-#ifdef GDK_WINDOWING_X11
- EggTrayIcon *icon = EGG_TRAY_ICON (widget);
- GdkWindow *root_window;
-
- if (icon->manager_window != None)
- {
- GdkWindow *gdkwin;
-
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display
(widget),
- icon->manager_window);
-
- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter,
icon);
- }
-
- root_window = gdk_screen_get_root_window (gtk_widget_get_screen
(widget));
-
- gdk_window_remove_filter (root_window, egg_tray_icon_manager_filter,
icon);
-
- if (GTK_WIDGET_CLASS (parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-#endif
-}
-
-#ifdef GDK_WINDOWING_X11
static void
egg_tray_icon_send_manager_message (EggTrayIcon *icon,
@@ -287,6 +427,7 @@
XClientMessageEvent ev;
Display *display;
+ memset (&ev, 0, sizeof (ev));
ev.type = ClientMessage;
ev.window = window;
ev.message_type = icon->system_tray_opcode_atom;
@@ -302,7 +443,7 @@
gdk_error_trap_push ();
XSendEvent (display,
icon->manager_window, False, NoEventMask, (XEvent *)&ev);
- XSync (display, False);
+ gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_pop ();
}
@@ -317,15 +458,16 @@
}
static void
-egg_tray_icon_update_manager_window (EggTrayIcon *icon,
- gboolean dock_if_realized)
-{
- Display *xdisplay;
+egg_tray_icon_update_manager_window (EggTrayIcon *icon)
+{
+ GtkWidget *widget = GTK_WIDGET (icon);
+ GdkScreen *screen = gtk_widget_get_screen (widget);
+ GdkDisplay *display = gdk_screen_get_display (screen);
+ Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
if (icon->manager_window != None)
return;
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET
(icon)));
XGrabServer (xdisplay);
@@ -348,130 +490,122 @@
gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
- if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
- egg_tray_icon_send_dock_request (icon);
-
egg_tray_icon_get_orientation_property (icon);
+ egg_tray_icon_get_visual_property (icon);
+
+ if (GTK_WIDGET_REALIZED (icon))
+ {
+ if ((icon->manager_visual == NULL &&
+ gtk_widget_get_visual (widget) ==
gdk_screen_get_system_visual (screen)) ||
+ (icon->manager_visual == gtk_widget_get_visual (widget)))
+ {
+ /* Already have the right visual, can just dock
+ */
+ egg_tray_icon_send_dock_request (icon);
+ }
+ else
+ {
+ /* Need to re-realize the widget to get the right visual
+ */
+ gtk_widget_hide (widget);
+ gtk_widget_unrealize (widget);
+ gtk_widget_show (widget);
+ }
+ }
}
}
static void
egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
{
- GdkWindow *gdkwin;
-
g_return_if_fail (icon->manager_window != None);
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display
(GTK_WIDGET (icon)),
- icon->manager_window);
-
- gdk_window_remove_filter (gdkwin, egg_tray_icon_manager_filter, icon);
-
- icon->manager_window = None;
-
- egg_tray_icon_update_manager_window (icon, TRUE);
-}
-
-#endif
+ egg_tray_icon_clear_manager_window (icon);
+}
static gboolean
-transparent_expose_event (GtkWidget *widget, GdkEventExpose *event,
gpointer user_data)
-{
- gdk_window_clear_area (widget->window, event->area.x, event->area.y,
- event->area.width, event->area.height);
- return FALSE;
-}
-
-static void
-make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
- gpointer user_data)
-{
- gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+egg_tray_icon_delete (GtkWidget *widget,
+ GdkEventAny *event)
+{
+ /* A bug in X server versions up to x.org 1.5.0 means that:
+ * XFixesChangeSaveSet(...., SaveSetRoot, SaveSetUnmap) doesn't work
properly
+ * and we'll left mapped in a separate toplevel window if the tray is
destroyed.
+ * For simplicity just get rid of our X window and start over.
+ */
+ gtk_widget_hide (widget);
+ gtk_widget_unrealize (widget);
+ gtk_widget_show (widget);
+
+ /* Handled it, don't destroy the tray icon */
+ return TRUE;
}
static void
-make_transparent (GtkWidget *widget, gpointer user_data)
-{
- if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
- return;
-
- gtk_widget_set_app_paintable (widget, TRUE);
- gtk_widget_set_double_buffered (widget, FALSE);
- gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
- g_signal_connect (widget, "expose_event",
- G_CALLBACK (transparent_expose_event), NULL);
- g_signal_connect_after (widget, "style_set",
- G_CALLBACK (make_transparent_again), NULL);
-}
+egg_tray_icon_set_colormap (EggTrayIcon *icon)
+{
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
+ GdkColormap *colormap;
+ GdkVisual *visual = icon->manager_visual;
+ gboolean new_colormap = FALSE;
+
+ /* To avoid uncertainty about colormaps, _NET_SYSTEM_TRAY_VISUAL is
supposed
+ * to be either the screen default visual or a TrueColor visual; ignore
it
+ * if it is something else
+ */
+ if (visual && visual->type != GDK_VISUAL_TRUE_COLOR)
+ visual = NULL;
+
+ if (visual == NULL || visual == gdk_screen_get_system_visual (screen))
+ colormap = gdk_screen_get_system_colormap (screen);
+ else if (visual == gdk_screen_get_rgb_visual (screen))
+ colormap = gdk_screen_get_rgb_colormap (screen);
+ else if (visual == gdk_screen_get_rgba_visual (screen))
+ colormap = gdk_screen_get_rgba_colormap (screen);
+ else
+ {
+ colormap = gdk_colormap_new (visual, FALSE);
+ new_colormap = TRUE;
+ }
+
+ gtk_widget_set_colormap (GTK_WIDGET (icon), colormap);
+
+ if (new_colormap)
+ g_object_unref (colormap);
+}
static void
egg_tray_icon_realize (GtkWidget *widget)
{
-#ifdef GDK_WINDOWING_X11
EggTrayIcon *icon = EGG_TRAY_ICON (widget);
- GdkScreen *screen;
- GdkDisplay *display;
- Display *xdisplay;
- char buffer[256];
- GdkWindow *root_window;
-
- if (GTK_WIDGET_CLASS (parent_class)->realize)
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
-
- make_transparent (widget, NULL);
-
- screen = gtk_widget_get_screen (widget);
- display = gdk_screen_get_display (screen);
- xdisplay = gdk_x11_display_get_xdisplay (display);
-
- /* Now see if there's a manager window around */
- g_snprintf (buffer, sizeof (buffer),
- "_NET_SYSTEM_TRAY_S%d",
- gdk_screen_get_number (screen));
-
- icon->selection_atom = XInternAtom (xdisplay, buffer, False);
-
- icon->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
- icon->system_tray_opcode_atom = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_OPCODE",
- False);
-
- icon->orientation_atom = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_ORIENTATION",
- False);
-
- egg_tray_icon_update_manager_window (icon, FALSE);
- egg_tray_icon_send_dock_request (icon);
-
- root_window = gdk_screen_get_root_window (screen);
-
- /* Add a root window filter so that we get changes on MANAGER */
- gdk_window_add_filter (root_window,
- egg_tray_icon_manager_filter, icon);
-#endif
+
+ egg_tray_icon_set_colormap (icon);
+
+ GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ if (icon->manager_visual_rgba)
+ {
+ /* Set a transparent background */
+ GdkColor transparent = { 0, 0, 0, 0 }; /* Only pixel=0 matters */
+ gdk_window_set_background (widget->window, &transparent);
+ }
+ else
+ {
+ /* Set a parent-relative background pixmap */
+ gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+ }
+
+ if (icon->manager_window != None)
+ egg_tray_icon_send_dock_request (icon);
}
static void
-egg_tray_icon_add (GtkContainer *container, GtkWidget *widget)
-{
- g_signal_connect (widget, "realize",
- G_CALLBACK (make_transparent), NULL);
- GTK_CONTAINER_CLASS (parent_class)->add (container, widget);
-}
-
-EggTrayIcon *
-egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
-{
- g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
-
- return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title",
name, NULL);
-}
-
-EggTrayIcon*
-egg_tray_icon_new (const gchar *name)
-{
- return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
+egg_tray_icon_style_set (GtkWidget *widget, GtkStyle *previous_style)
+{
+ /* The default handler resets the background according to the style. We
either
+
+ * use a transparent background or a parent-relative background and
ignore the
+
+ * style background. So, just don't chain up.
+ */
}
guint
@@ -481,38 +615,35 @@
gint len)
{
guint stamp;
+ Display *xdisplay;
g_return_val_if_fail (EGG_IS_TRAY_ICON (icon), 0);
g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0);
-#ifdef GDK_WINDOWING_X11
if (icon->manager_window == None)
return 0;
-#endif
if (len < 0)
len = strlen (message);
stamp = icon->stamp++;
-#ifdef GDK_WINDOWING_X11
/* Get ready to send the message */
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_BEGIN_MESSAGE,
- icon->manager_window,
+ (Window)gtk_plug_get_id (GTK_PLUG (icon)),
timeout, len, stamp);
/* Now to send the actual message */
+ xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET
(icon)));
gdk_error_trap_push ();
while (len > 0)
{
XClientMessageEvent ev;
- Display *xdisplay;
-
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET
(icon)));
-
+
+ memset (&ev, 0, sizeof (ev));
ev.type = ClientMessage;
- ev.window = icon->manager_window;
+ ev.window = (Window)gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
ev.message_type = XInternAtom (xdisplay,
"_NET_SYSTEM_TRAY_MESSAGE_DATA", False);
@@ -530,10 +661,9 @@
XSendEvent (xdisplay,
icon->manager_window, False, StructureNotifyMask, (XEvent
*)&ev);
- XSync (xdisplay, False);
- }
+ }
+ gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
gdk_error_trap_pop ();
-#endif
return stamp;
}
@@ -544,11 +674,23 @@
{
g_return_if_fail (EGG_IS_TRAY_ICON (icon));
g_return_if_fail (id > 0);
-#ifdef GDK_WINDOWING_X11
egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
(Window)gtk_plug_get_id (GTK_PLUG (icon)),
id, 0, 0);
-#endif
+}
+
+EggTrayIcon *
+egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name)
+{
+ g_return_val_if_fail (GDK_IS_SCREEN (screen), NULL);
+
+ return g_object_new (EGG_TYPE_TRAY_ICON, "screen", screen, "title",
name, NULL);
+}
+
+EggTrayIcon*
+egg_tray_icon_new (const gchar *name)
+{
+ return g_object_new (EGG_TYPE_TRAY_ICON, "title", name, NULL);
}
GtkOrientation
=======================================
--- /trunk/helper/eggtrayicon.h Thu Jul 30 23:18:22 2009
+++ /trunk/helper/eggtrayicon.h Wed Jul 14 08:56:43 2010
@@ -49,7 +49,11 @@
Atom manager_atom;
Atom system_tray_opcode_atom;
Atom orientation_atom;
+ Atom visual_atom;
Window manager_window;
+ GdkVisual *manager_visual;
+ gboolean manager_visual_rgba;
+
#endif
GtkOrientation orientation;
};
