* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser 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 <http://www.gnu.org/licenses/>.
*/
/*
* http://www.freedesktop.org/wiki/Standards/systemtray-spec
*/
-#include <config.h>
+#include "config.h"
+
+#include <math.h>
#include <string.h>
-#include <libintl.h>
+
+#include "x11/gdkx.h"
+#include <X11/Xatom.h>
+#include <cairo-xlib.h>
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtktrayicon.h"
-
-#include "gtkalias.h"
-
-#include "x11/gdkx.h"
-#include <X11/Xatom.h>
+#include "gtktestutils.h"
+#include "gtkdebug.h"
+#include "gtktypebuiltins.h"
#define SYSTEM_TRAY_REQUEST_DOCK 0
#define SYSTEM_TRAY_BEGIN_MESSAGE 1
enum {
PROP_0,
- PROP_ORIENTATION
+ PROP_ORIENTATION,
+ PROP_FG_COLOR,
+ PROP_ERROR_COLOR,
+ PROP_WARNING_COLOR,
+ PROP_SUCCESS_COLOR,
+ PROP_PADDING,
+ PROP_ICON_SIZE
};
struct _GtkTrayIconPrivate
Atom manager_atom;
Atom system_tray_opcode_atom;
Atom orientation_atom;
+ Atom visual_atom;
+ Atom colors_atom;
+ Atom padding_atom;
+ Atom icon_size_atom;
Window manager_window;
+ GdkVisual *manager_visual;
+ gboolean manager_visual_rgba;
GtkOrientation orientation;
+ GdkRGBA fg_color;
+ GdkRGBA error_color;
+ GdkRGBA warning_color;
+ GdkRGBA success_color;
+ gint padding;
+ gint icon_size;
};
-
+
+static void gtk_tray_icon_constructed (GObject *object);
+static void gtk_tray_icon_dispose (GObject *object);
+
static void gtk_tray_icon_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
static void gtk_tray_icon_realize (GtkWidget *widget);
-static void gtk_tray_icon_unrealize (GtkWidget *widget);
+static void gtk_tray_icon_style_updated (GtkWidget *widget);
static gboolean gtk_tray_icon_delete (GtkWidget *widget,
GdkEventAny *event);
-static gboolean gtk_tray_icon_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gtk_tray_icon_draw (GtkWidget *widget,
+ cairo_t *cr);
-static void gtk_tray_icon_update_manager_window (GtkTrayIcon *icon,
- gboolean dock_if_realized);
+static void gtk_tray_icon_clear_manager_window (GtkTrayIcon *icon);
+static void gtk_tray_icon_update_manager_window (GtkTrayIcon *icon);
static void gtk_tray_icon_manager_window_destroyed (GtkTrayIcon *icon);
+static GdkFilterReturn gtk_tray_icon_manager_filter (GdkXEvent *xevent,
+ GdkEvent *event,
+ gpointer user_data);
+
+
G_DEFINE_TYPE (GtkTrayIcon, gtk_tray_icon, GTK_TYPE_PLUG)
static void
GtkWidgetClass *widget_class = (GtkWidgetClass *)class;
gobject_class->get_property = gtk_tray_icon_get_property;
+ gobject_class->constructed = gtk_tray_icon_constructed;
+ gobject_class->dispose = gtk_tray_icon_dispose;
- widget_class->realize = gtk_tray_icon_realize;
- widget_class->unrealize = gtk_tray_icon_unrealize;
+ widget_class->realize = gtk_tray_icon_realize;
+ widget_class->style_updated = gtk_tray_icon_style_updated;
widget_class->delete_event = gtk_tray_icon_delete;
- widget_class->expose_event = gtk_tray_icon_expose;
+ widget_class->draw = gtk_tray_icon_draw;
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
GTK_ORIENTATION_HORIZONTAL,
GTK_PARAM_READABLE));
+ g_object_class_install_property (gobject_class,
+ PROP_FG_COLOR,
+ g_param_spec_boxed ("fg-color",
+ P_("Foreground color"),
+ P_("Foreground color for symbolic icons"),
+ GDK_TYPE_RGBA,
+ GTK_PARAM_READABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_ERROR_COLOR,
+ g_param_spec_boxed ("error-color",
+ P_("Error color"),
+ P_("Error color for symbolic icons"),
+ GDK_TYPE_RGBA,
+ GTK_PARAM_READABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_WARNING_COLOR,
+ g_param_spec_boxed ("warning-color",
+ P_("Warning color"),
+ P_("Warning color for symbolic icons"),
+ GDK_TYPE_RGBA,
+ GTK_PARAM_READABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_SUCCESS_COLOR,
+ g_param_spec_boxed ("success-color",
+ P_("Success color"),
+ P_("Success color for symbolic icons"),
+ GDK_TYPE_RGBA,
+ GTK_PARAM_READABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_PADDING,
+ g_param_spec_int ("padding",
+ P_("Padding"),
+ P_("Padding that should be put around icons in the tray"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READABLE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_ICON_SIZE,
+ g_param_spec_int ("icon-size",
+ P_("Icon Size"),
+ P_("The pixel size that icons should be forced to, or zero"),
+ 0,
+ G_MAXINT,
+ 0,
+ GTK_PARAM_READABLE));
+
g_type_class_add_private (class, sizeof (GtkTrayIconPrivate));
}
{
icon->priv = G_TYPE_INSTANCE_GET_PRIVATE (icon, GTK_TYPE_TRAY_ICON,
GtkTrayIconPrivate);
-
+
icon->priv->stamp = 1;
icon->priv->orientation = GTK_ORIENTATION_HORIZONTAL;
+ icon->priv->fg_color.red = 0.0;
+ icon->priv->fg_color.green = 0.0;
+ icon->priv->fg_color.blue = 0.0;
+ icon->priv->fg_color.alpha = 1.0;
+ icon->priv->error_color.red = 0.7968;
+ icon->priv->error_color.green = 0.0;
+ icon->priv->error_color.blue = 0.0;
+ icon->priv->error_color.alpha = 1.0;
+ icon->priv->warning_color.red = 0.9570;
+ icon->priv->warning_color.green = 0.4726;
+ icon->priv->warning_color.blue = 0.2421;
+ icon->priv->warning_color.alpha = 1.0;
+ icon->priv->success_color.red = 0.3047;
+ icon->priv->success_color.green = 0.6016;
+ icon->priv->success_color.blue = 0.0234;
+ icon->priv->success_color.alpha = 1.0;
+ icon->priv->padding = 0;
+ icon->priv->icon_size = 0;
gtk_widget_set_app_paintable (GTK_WIDGET (icon), TRUE);
- gtk_widget_set_double_buffered (GTK_WIDGET (icon), FALSE);
gtk_widget_add_events (GTK_WIDGET (icon), GDK_PROPERTY_CHANGE_MASK);
}
+static void
+gtk_tray_icon_constructed (GObject *object)
+{
+ /* Do setup that depends on the screen; screen has been set at this point */
+
+ GtkTrayIcon *icon = GTK_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->priv->selection_atom = XInternAtom (xdisplay, buffer, False);
+
+ icon->priv->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
+
+ icon->priv->system_tray_opcode_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_OPCODE",
+ False);
+
+ icon->priv->orientation_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_ORIENTATION",
+ False);
+
+ icon->priv->visual_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_VISUAL",
+ False);
+
+ icon->priv->colors_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_COLORS",
+ False);
+
+ icon->priv->padding_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_PADDING",
+ False);
+
+ icon->priv->icon_size_atom = XInternAtom (xdisplay,
+ "_NET_SYSTEM_TRAY_ICON_SIZE",
+ False);
+
+ /* Add a root window filter so that we get changes on MANAGER */
+ gdk_window_add_filter (root_window,
+ gtk_tray_icon_manager_filter, icon);
+
+ gtk_tray_icon_update_manager_window (icon);
+}
+
+static void
+gtk_tray_icon_clear_manager_window (GtkTrayIcon *icon)
+{
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (icon));
+
+ if (icon->priv->manager_window != None)
+ {
+ GdkWindow *gdkwin;
+
+ gdkwin = gdk_x11_window_lookup_for_display (display,
+ icon->priv->manager_window);
+
+ gdk_window_remove_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
+
+ icon->priv->manager_window = None;
+ icon->priv->manager_visual = NULL;
+ }
+}
+
+static void
+gtk_tray_icon_dispose (GObject *object)
+{
+ GtkTrayIcon *icon = GTK_TRAY_ICON (object);
+ GtkWidget *widget = GTK_WIDGET (object);
+ GdkWindow *root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
+
+ gtk_tray_icon_clear_manager_window (icon);
+
+ gdk_window_remove_filter (root_window, gtk_tray_icon_manager_filter, icon);
+
+ G_OBJECT_CLASS (gtk_tray_icon_parent_class)->dispose (object);
+}
+
static void
gtk_tray_icon_get_property (GObject *object,
guint prop_id,
case PROP_ORIENTATION:
g_value_set_enum (value, icon->priv->orientation);
break;
+ case PROP_FG_COLOR:
+ g_value_set_boxed (value, &icon->priv->fg_color);
+ break;
+ case PROP_ERROR_COLOR:
+ g_value_set_boxed (value, &icon->priv->error_color);
+ break;
+ case PROP_WARNING_COLOR:
+ g_value_set_boxed (value, &icon->priv->warning_color);
+ break;
+ case PROP_SUCCESS_COLOR:
+ g_value_set_boxed (value, &icon->priv->success_color);
+ break;
+ case PROP_PADDING:
+ g_value_set_int (value, icon->priv->padding);
+ break;
+ case PROP_ICON_SIZE:
+ g_value_set_int (value, icon->priv->icon_size);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
static gboolean
-gtk_tray_icon_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_tray_icon_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- gdk_window_clear_area (widget->window, event->area.x, event->area.y,
- event->area.width, event->area.height);
+ GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
+ GtkWidget *focus_child;
+ GdkWindow *window;
+ gint border_width;
+ gboolean retval = FALSE;
+ cairo_surface_t *target;
+
+ window = gtk_widget_get_window (widget);
+ target = cairo_get_group_target (cr);
+
+ if (icon->priv->manager_visual_rgba ||
+ cairo_surface_get_type (target) != CAIRO_SURFACE_TYPE_XLIB ||
+ cairo_xlib_surface_get_drawable (target) != GDK_WINDOW_XID (window))
+ {
+ /* Clear to transparent */
+ cairo_set_source_rgba (cr, 0, 0, 0, 0);
+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+ cairo_paint (cr);
+ }
+ else
+ {
+ GdkRectangle clip;
+
+ if (gdk_cairo_get_clip_rectangle (cr, &clip))
+ {
+ /* Clear to parent-relative pixmap
+ * We need to use direct X access here because GDK doesn't know about
+ * the parent realtive pixmap. */
+ cairo_surface_flush (target);
+
+ XClearArea (GDK_WINDOW_XDISPLAY (window),
+ GDK_WINDOW_XID (window),
+ clip.x, clip.y,
+ clip.width, clip.height,
+ False);
+ cairo_surface_mark_dirty_rectangle (target,
+ clip.x, clip.y,
+ clip.width, clip.height);
+ }
+ }
- if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->expose_event)
- return GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->expose_event (widget, event);
+ if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw)
+ retval = GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->draw (widget, cr);
- return FALSE;
+ focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget));
+ if (focus_child && gtk_widget_has_visible_focus (focus_child))
+ {
+ GtkStyleContext *context;
+
+ border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ context = gtk_widget_get_style_context (widget);
+
+ gtk_render_focus (context, cr, border_width, border_width,
+ gtk_widget_get_allocated_width (widget) - 2 * border_width,
+ gtk_widget_get_allocated_height (widget) - 2 * border_width);
+ }
+
+ return retval;
}
static void
gtk_tray_icon_get_orientation_property (GtkTrayIcon *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 {
g_assert (icon->priv->manager_window != None);
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
gdk_error_trap_push ();
type = None;
result = XGetWindowProperty (xdisplay,
if (error || result != Success)
return;
- if (type == XA_CARDINAL)
+ if (type == XA_CARDINAL && nitems == 1 && format == 32)
{
GtkOrientation orientation;
}
}
- if (prop.prop)
+ if (type != None)
+ XFree (prop.prop);
+}
+
+static void
+gtk_tray_icon_get_visual_property (GtkTrayIcon *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;
+
+ g_assert (icon->priv->manager_window != None);
+
+ gdk_error_trap_push ();
+ type = None;
+ result = XGetWindowProperty (xdisplay,
+ icon->priv->manager_window,
+ icon->priv->visual_atom,
+ 0, G_MAXLONG, FALSE,
+ XA_VISUALID,
+ &type, &format, &nitems,
+ &bytes_after, &(prop.prop_ch));
+ error = gdk_error_trap_pop ();
+
+ if (!error && result == Success &&
+ type == XA_VISUALID && nitems == 1 && format == 32)
+ {
+ VisualID visual_id;
+ GdkVisual *visual;
+ gint red_prec, green_prec, blue_prec;
+
+ visual_id = prop.prop[0];
+ visual = gdk_x11_screen_lookup_visual (screen, visual_id);
+ gdk_visual_get_red_pixel_details (visual, NULL, NULL, &red_prec);
+ gdk_visual_get_green_pixel_details (visual, NULL, NULL, &green_prec);
+ gdk_visual_get_blue_pixel_details (visual, NULL, NULL, &blue_prec);
+ icon->priv->manager_visual = visual;
+ icon->priv->manager_visual_rgba =
+ (red_prec + blue_prec + green_prec < gdk_visual_get_depth (visual));
+ }
+ else
+ {
+ icon->priv->manager_visual = NULL;
+ icon->priv->manager_visual_rgba = FALSE;
+ }
+
+ /* 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->priv->manager_visual_rgba);
+
+ if (type != None)
+ XFree (prop.prop);
+}
+
+static void
+gtk_tray_icon_get_colors_property (GtkTrayIcon *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;
+
+ g_assert (icon->priv->manager_window != None);
+
+ gdk_error_trap_push ();
+ type = None;
+ result = XGetWindowProperty (xdisplay,
+ icon->priv->manager_window,
+ icon->priv->colors_atom,
+ 0, G_MAXLONG, FALSE,
+ XA_CARDINAL,
+ &type, &format, &nitems,
+ &bytes_after, &(prop.prop_ch));
+ error = gdk_error_trap_pop ();
+
+ if (error || result != Success)
+ return;
+
+ if (type == XA_CARDINAL && nitems == 12 && format == 32)
+ {
+ GdkRGBA color;
+
+ g_object_freeze_notify (G_OBJECT (icon));
+
+ color.red = prop.prop[0] / 65535.0;
+ color.green = prop.prop[1] / 65535.0;
+ color.blue = prop.prop[2] / 65535.0;
+
+ if (!gdk_rgba_equal (&icon->priv->fg_color, &color))
+ {
+ icon->priv->fg_color = color;
+
+ g_object_notify (G_OBJECT (icon), "fg-color");
+ }
+
+ color.red = prop.prop[3] / 65535.0;
+ color.green = prop.prop[4] / 65535.0;
+ color.blue = prop.prop[5] / 65535.0;
+
+ if (!gdk_rgba_equal (&icon->priv->error_color, &color))
+ {
+ icon->priv->error_color = color;
+
+ g_object_notify (G_OBJECT (icon), "error-color");
+ }
+
+ color.red = prop.prop[6] / 65535.0;
+ color.green = prop.prop[7] / 65535.0;
+ color.blue = prop.prop[8] / 65535.0;
+
+ if (!gdk_rgba_equal (&icon->priv->warning_color, &color))
+ {
+ icon->priv->warning_color = color;
+
+ g_object_notify (G_OBJECT (icon), "warning-color");
+ }
+
+ color.red = prop.prop[9] / 65535.0;
+ color.green = prop.prop[10] / 65535.0;
+ color.blue = prop.prop[11] / 65535.0;
+
+ if (!gdk_rgba_equal (&icon->priv->success_color, &color))
+ {
+ icon->priv->success_color = color;
+
+ g_object_notify (G_OBJECT (icon), "success-color");
+ }
+
+ g_object_thaw_notify (G_OBJECT (icon));
+ }
+
+ if (type != None)
+ XFree (prop.prop);
+}
+
+static void
+gtk_tray_icon_get_padding_property (GtkTrayIcon *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;
+
+ g_assert (icon->priv->manager_window != None);
+
+ gdk_error_trap_push ();
+ type = None;
+ result = XGetWindowProperty (xdisplay,
+ icon->priv->manager_window,
+ icon->priv->padding_atom,
+ 0, G_MAXLONG, FALSE,
+ XA_CARDINAL,
+ &type, &format, &nitems,
+ &bytes_after, &(prop.prop_ch));
+ error = gdk_error_trap_pop ();
+
+ if (!error && result == Success &&
+ type == XA_CARDINAL && nitems == 1 && format == 32)
+ {
+ gint padding;
+
+ padding = prop.prop[0];
+
+ if (icon->priv->padding != padding)
+ {
+ icon->priv->padding = padding;
+
+ g_object_notify (G_OBJECT (icon), "padding");
+ }
+ }
+
+ if (type != None)
+ XFree (prop.prop);
+}
+
+static void
+gtk_tray_icon_get_icon_size_property (GtkTrayIcon *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;
+
+ g_assert (icon->priv->manager_window != None);
+
+ gdk_error_trap_push ();
+ type = None;
+ result = XGetWindowProperty (xdisplay,
+ icon->priv->manager_window,
+ icon->priv->icon_size_atom,
+ 0, G_MAXLONG, FALSE,
+ XA_CARDINAL,
+ &type, &format, &nitems,
+ &bytes_after, &(prop.prop_ch));
+ error = gdk_error_trap_pop ();
+
+ if (!error && result == Success &&
+ type == XA_CARDINAL && nitems == 1 && format == 32)
+ {
+ gint icon_size;
+
+ icon_size = prop.prop[0];
+
+ if (icon->priv->icon_size != icon_size)
+ {
+ icon->priv->icon_size = icon_size;
+
+ g_object_notify (G_OBJECT (icon), "icon-size");
+ }
+ }
+
+ if (type != None)
XFree (prop.prop);
}
static GdkFilterReturn
-gtk_tray_icon_manager_filter (GdkXEvent *xevent,
- GdkEvent *event,
+gtk_tray_icon_manager_filter (GdkXEvent *xevent,
+ GdkEvent *event,
gpointer user_data)
{
GtkTrayIcon *icon = user_data;
xev->xclient.message_type == icon->priv->manager_atom &&
xev->xclient.data.l[1] == icon->priv->selection_atom)
{
- gtk_tray_icon_update_manager_window (icon, TRUE);
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: tray manager appeared\n", icon));
+
+ gtk_tray_icon_update_manager_window (icon);
}
else if (xev->xany.window == icon->priv->manager_window)
{
if (xev->xany.type == PropertyNotify &&
xev->xproperty.atom == icon->priv->orientation_atom)
{
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: got PropertyNotify on manager window for orientation atom\n", icon));
+
gtk_tray_icon_get_orientation_property (icon);
}
- if (xev->xany.type == DestroyNotify)
+ else if (xev->xany.type == PropertyNotify &&
+ xev->xproperty.atom == icon->priv->colors_atom)
+ {
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: got PropertyNotify on manager window for colors atom\n", icon));
+
+ gtk_tray_icon_get_colors_property (icon);
+ }
+ else if (xev->xany.type == PropertyNotify &&
+ xev->xproperty.atom == icon->priv->padding_atom)
+ {
+ gtk_tray_icon_get_padding_property (icon);
+ }
+ else if (xev->xany.type == PropertyNotify &&
+ xev->xproperty.atom == icon->priv->icon_size_atom)
+ {
+ gtk_tray_icon_get_icon_size_property (icon);
+ }
+ else if (xev->xany.type == DestroyNotify)
{
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: got DestroyNotify for manager window\n", icon));
+
gtk_tray_icon_manager_window_destroyed (icon);
}
+ else
+ {
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: got other message on manager window\n", icon));
+ }
}
return GDK_FILTER_CONTINUE;
}
-static void
-gtk_tray_icon_unrealize (GtkWidget *widget)
-{
- GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
- GdkWindow *root_window;
-
- if (icon->priv->manager_window != None)
- {
- GdkWindow *gdkwin;
-
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (widget),
- icon->priv->manager_window);
-
- gdk_window_remove_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
- }
-
- root_window = gdk_screen_get_root_window (gtk_widget_get_screen (widget));
-
- gdk_window_remove_filter (root_window, gtk_tray_icon_manager_filter, icon);
-
- if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->unrealize)
- (* GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->unrealize) (widget);
-}
-
static void
gtk_tray_icon_send_manager_message (GtkTrayIcon *icon,
long message,
long data2,
long data3)
{
+ GtkWidget *widget;
XClientMessageEvent ev;
Display *display;
-
+
+ widget = GTK_WIDGET (icon);
+
+ memset (&ev, 0, sizeof (ev));
ev.type = ClientMessage;
ev.window = window;
ev.message_type = icon->priv->system_tray_opcode_atom;
ev.format = 32;
- ev.data.l[0] = gdk_x11_get_server_time (GTK_WIDGET (icon)->window);
+ ev.data.l[0] = gdk_x11_get_server_time (gtk_widget_get_window (widget));
ev.data.l[1] = message;
ev.data.l[2] = data1;
ev.data.l[3] = data2;
ev.data.l[4] = data3;
- display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
+ display = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (widget));
+
gdk_error_trap_push ();
XSendEvent (display,
icon->priv->manager_window, False, NoEventMask, (XEvent *)&ev);
- XSync (display, False);
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
}
static void
gtk_tray_icon_send_dock_request (GtkTrayIcon *icon)
{
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: sending dock request to manager window %lx\n",
+ icon, (gulong) icon->priv->manager_window));
+
gtk_tray_icon_send_manager_message (icon,
SYSTEM_TRAY_REQUEST_DOCK,
icon->priv->manager_window,
}
static void
-gtk_tray_icon_update_manager_window (GtkTrayIcon *icon,
- gboolean dock_if_realized)
+gtk_tray_icon_update_manager_window (GtkTrayIcon *icon)
{
- Display *xdisplay;
-
+ 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);
+
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: updating tray icon manager window, current manager window: %lx\n",
+ icon, (gulong) icon->priv->manager_window));
+
if (icon->priv->manager_window != None)
return;
- xdisplay = GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (icon)));
-
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: trying to find manager window\n", icon));
+
XGrabServer (xdisplay);
icon->priv->manager_window = XGetSelectionOwner (xdisplay,
{
GdkWindow *gdkwin;
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- icon->priv->manager_window);
-
- gdk_window_add_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: is being managed by window %lx\n",
+ icon, (gulong) icon->priv->manager_window));
- if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
- gtk_tray_icon_send_dock_request (icon);
+ gdkwin = gdk_x11_window_lookup_for_display (display,
+ icon->priv->manager_window);
+
+ gdk_window_add_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
gtk_tray_icon_get_orientation_property (icon);
+ gtk_tray_icon_get_visual_property (icon);
+ gtk_tray_icon_get_colors_property (icon);
+ gtk_tray_icon_get_padding_property (icon);
+ gtk_tray_icon_get_icon_size_property (icon);
+
+ if (gtk_widget_get_realized (GTK_WIDGET (icon)))
+ {
+ if ((icon->priv->manager_visual == NULL &&
+ gtk_widget_get_visual (widget) == gdk_screen_get_system_visual (screen)) ||
+ (icon->priv->manager_visual == gtk_widget_get_visual (widget)))
+ {
+ /* Already have the right visual, can just dock
+ */
+ gtk_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);
+ }
+ }
+ }
+ else
+ {
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: no tray manager found\n", icon));
}
}
static void
gtk_tray_icon_manager_window_destroyed (GtkTrayIcon *icon)
{
- GdkWindow *gdkwin;
-
g_return_if_fail (icon->priv->manager_window != None);
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- icon->priv->manager_window);
-
- gdk_window_remove_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: tray manager window destroyed\n", icon));
- icon->priv->manager_window = None;
-
- gtk_tray_icon_update_manager_window (icon, TRUE);
+ gtk_tray_icon_clear_manager_window (icon);
}
-static gboolean
+static gboolean
gtk_tray_icon_delete (GtkWidget *widget,
GdkEventAny *event)
{
+#ifdef G_ENABLE_DEBUG
GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
- GdkWindow *gdkwin;
+#endif
+
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: delete notify, tray manager window %lx\n",
+ icon, (gulong) icon->priv->manager_window));
+
+ /* 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;
+}
- if (icon->priv->manager_window != None)
- {
- gdkwin = gdk_window_lookup_for_display (gtk_widget_get_display (GTK_WIDGET (icon)),
- icon->priv->manager_window);
-
- gdk_window_remove_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
-
- icon->priv->manager_window = None;
- }
+static void
+gtk_tray_icon_set_visual (GtkTrayIcon *icon)
+{
+ GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
+ GdkVisual *visual = icon->priv->manager_visual;
- gtk_tray_icon_update_manager_window (icon, TRUE);
+ /* 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 && gdk_visual_get_visual_type (visual) != GDK_VISUAL_TRUE_COLOR)
+ visual = NULL;
- return TRUE;
+ if (visual == NULL)
+ visual = gdk_screen_get_system_visual (screen);
+
+ gtk_widget_set_visual (GTK_WIDGET (icon), visual);
}
static void
gtk_tray_icon_realize (GtkWidget *widget)
{
GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
- GdkScreen *screen;
- GdkDisplay *display;
- Display *xdisplay;
- char buffer[256];
- GdkWindow *root_window;
-
- if (GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->realize)
- GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->realize (widget);
+ GdkWindow *window;
- screen = gtk_widget_get_screen (widget);
- display = gdk_screen_get_display (screen);
- xdisplay = gdk_x11_display_get_xdisplay (display);
+ /* Set our visual before realizing */
+ gtk_tray_icon_set_visual (icon);
- /* Now see if there's a manager window around */
- g_snprintf (buffer, sizeof (buffer),
- "_NET_SYSTEM_TRAY_S%d",
- gdk_screen_get_number (screen));
+ GTK_WIDGET_CLASS (gtk_tray_icon_parent_class)->realize (widget);
+ window = gtk_widget_get_window (widget);
+ if (icon->priv->manager_visual_rgba)
+ {
+ /* Set a transparent background */
+ GdkRGBA transparent = { 0.0, 0.0, 0.0, 0.0 };
+ gdk_window_set_background_rgba (window, &transparent);
+ }
+ else
+ {
+ /* Set a parent-relative background pixmap */
+ gdk_window_set_background_pattern (window, NULL);
+ }
- icon->priv->selection_atom = XInternAtom (xdisplay, buffer, False);
-
- icon->priv->manager_atom = XInternAtom (xdisplay, "MANAGER", False);
-
- icon->priv->system_tray_opcode_atom = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_OPCODE",
- False);
+ GTK_NOTE (PLUGSOCKET,
+ g_print ("GtkStatusIcon %p: realized, window: %lx, socket window: %lx\n",
+ widget,
+ (gulong) GDK_WINDOW_XID (window),
+ gtk_plug_get_socket_window (GTK_PLUG (icon)) ?
+ (gulong) GDK_WINDOW_XID (gtk_plug_get_socket_window (GTK_PLUG (icon))) : 0UL));
- icon->priv->orientation_atom = XInternAtom (xdisplay,
- "_NET_SYSTEM_TRAY_ORIENTATION",
- False);
-
- gtk_tray_icon_update_manager_window (icon, FALSE);
- gtk_tray_icon_send_dock_request (icon);
+ if (icon->priv->manager_window != None)
+ gtk_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,
- gtk_tray_icon_manager_filter, icon);
+static void
+gtk_tray_icon_style_updated (GtkWidget *widget)
+{
+ /* 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
gint len)
{
guint stamp;
-
+ Display *xdisplay;
+
g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0);
g_return_val_if_fail (timeout >= 0, 0);
g_return_val_if_fail (message != NULL, 0);
-
+
if (icon->priv->manager_window == None)
return 0;
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 = (Window)gtk_plug_get_id (GTK_PLUG (icon));
ev.format = 8;
}
XSendEvent (xdisplay,
- icon->priv->manager_window, False,
+ icon->priv->manager_window, False,
StructureNotifyMask, (XEvent *)&ev);
- XSync (xdisplay, False);
}
-
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
return stamp;
}
return icon->priv->orientation;
}
+gint
+_gtk_tray_icon_get_padding (GtkTrayIcon *icon)
+{
+ g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0);
+
+ return icon->priv->padding;
+}
-#define __GTK_TRAY_ICON_X11_C__
-#include "gtkaliasdef.c"
+gint
+_gtk_tray_icon_get_icon_size (GtkTrayIcon *icon)
+{
+ g_return_val_if_fail (GTK_IS_TRAY_ICON (icon), 0);
+ return icon->priv->icon_size;
+}
projects / ~andy / gtk / blobdiff