*/
#include "config.h"
+
+#include <math.h>
#include <string.h>
+#include "x11/gdkx.h"
+#include <X11/Xatom.h>
+#include <cairo-xlib.h>
+
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtktrayicon.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
GParamSpec *pspec);
static void gtk_tray_icon_realize (GtkWidget *widget);
-static void gtk_tray_icon_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+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_clear_manager_window (GtkTrayIcon *icon);
static void gtk_tray_icon_update_manager_window (GtkTrayIcon *icon);
gobject_class->dispose = gtk_tray_icon_dispose;
widget_class->realize = gtk_tray_icon_realize;
- widget_class->style_set = gtk_tray_icon_style_set;
+ 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,
{
GdkWindow *gdkwin;
- gdkwin = gdk_window_lookup_for_display (display,
- icon->priv->manager_window);
+ gdkwin = gdk_x11_window_lookup_for_display (display,
+ icon->priv->manager_window);
gdk_window_remove_filter (gdkwin, gtk_tray_icon_manager_filter, icon);
}
static gboolean
-gtk_tray_icon_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_tray_icon_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
GtkWidget *focus_child;
- gint border_width, x, y, width, height;
+ GdkWindow *window;
+ gint border_width;
gboolean retval = FALSE;
+ cairo_surface_t *target;
- if (icon->priv->manager_visual_rgba)
+ 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_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);
+ cairo_paint (cr);
}
else
{
- /* Clear to parent-relative pixmap */
- gdk_window_clear_area (widget->window, event->area.x, event->area.y,
- event->area.width, event->area.height);
+ 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)
- retval = 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);
focus_child = gtk_container_get_focus_child (GTK_CONTAINER (widget));
if (focus_child && gtk_widget_has_focus (focus_child))
{
+ GtkStyleContext *context;
+ GtkStateFlags state;
+
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
+ context = gtk_widget_get_style_context (widget);
+ state = gtk_widget_get_state_flags (widget);
- x = widget->allocation.x + border_width;
- y = widget->allocation.y + border_width;
+ gtk_style_context_save (context);
+ gtk_style_context_set_state (context, state);
- width = widget->allocation.width - 2 * border_width;
- height = widget->allocation.height - 2 * border_width;
+ 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);
- gtk_paint_focus (widget->style, widget->window,
- gtk_widget_get_state (widget),
- &event->area, widget, "tray_icon",
- x, y, width, height);
+ gtk_style_context_restore (context);
}
return retval;
gulong bytes_after;
int error, result;
GdkVisual *visual;
+ gint red_prec;
+ gint green_prec;
+ gint blue_prec;
g_assert (icon->priv->manager_window != None);
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 = visual != NULL &&
- (visual->red_prec + visual->blue_prec + visual->green_prec < visual->depth);
+ (red_prec + blue_prec + green_prec < gdk_visual_get_depth (visual));
/* For the background-relative hack we use when we aren't using a real RGBA
* visual, we can't be double-buffered */
g_object_notify (G_OBJECT (icon), "error-color");
}
- g_object_thaw_notify (G_OBJECT (icon));
-
color.red = prop.prop[6];
color.green = prop.prop[7];
color.blue = prop.prop[8];
g_object_notify (G_OBJECT (icon), "warning-color");
}
- g_object_thaw_notify (G_OBJECT (icon));
-
color.red = prop.prop[9];
color.green = prop.prop[10];
color.blue = prop.prop[11];
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);
- gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
}
static void
GdkWindow *gdkwin;
GTK_NOTE (PLUGSOCKET,
- g_print ("GtkStatusIcon %p: is being managed by window %lx\n",
- icon, (gulong) icon->priv->manager_window));
+ g_print ("GtkStatusIcon %p: is being managed by window %lx\n",
+ icon, (gulong) icon->priv->manager_window));
+
+ gdkwin = gdk_x11_window_lookup_for_display (display,
+ icon->priv->manager_window);
- gdkwin = gdk_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);
}
static void
-gtk_tray_icon_set_colormap (GtkTrayIcon *icon)
+gtk_tray_icon_set_visual (GtkTrayIcon *icon)
{
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (icon));
- GdkColormap *colormap;
GdkVisual *visual = icon->priv->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)
+ if (visual && gdk_visual_get_visual_type (visual) != 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_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 (visual == NULL)
+ visual = gdk_screen_get_system_visual (screen);
- if (new_colormap)
- g_object_unref (colormap);
+ gtk_widget_set_visual (GTK_WIDGET (icon), visual);
}
static void
gtk_tray_icon_realize (GtkWidget *widget)
{
GtkTrayIcon *icon = GTK_TRAY_ICON (widget);
+ GdkWindow *window;
- /* Set our colormap before realizing */
- gtk_tray_icon_set_colormap (icon);
+ /* Set our visual before realizing */
+ gtk_tray_icon_set_visual (icon);
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 */
GdkColor transparent = { 0, 0, 0, 0 }; /* Only pixel=0 matters */
- gdk_window_set_background (widget->window, &transparent);
+ gdk_window_set_background (window, &transparent);
}
else
{
/* Set a parent-relative background pixmap */
- gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
+ gdk_window_set_background_pattern (window, NULL);
}
GTK_NOTE (PLUGSOCKET,
g_print ("GtkStatusIcon %p: realized, window: %lx, socket window: %lx\n",
widget,
- (gulong) GDK_WINDOW_XWINDOW (widget->window),
- GTK_PLUG (icon)->socket_window ?
- (gulong) GDK_WINDOW_XWINDOW (GTK_PLUG (icon)->socket_window) : 0UL));
+ (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));
if (icon->priv->manager_window != None)
gtk_tray_icon_send_dock_request (icon);
}
static void
-gtk_tray_icon_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+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
icon->priv->manager_window, False,
StructureNotifyMask, (XEvent *)&ev);
}
- gdk_display_sync (gtk_widget_get_display (GTK_WIDGET (icon)));
- gdk_error_trap_pop ();
+ gdk_error_trap_pop_ignored ();
return stamp;
}
projects / ~andy / gtk / blobdiff