#include <glib.h>
#include <Imlib2.h>
#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xrender.h>
#include <X11/extensions/Xcomposite.h>
#include "systraybar.h"
#define SYSTEM_TRAY_CANCEL_MESSAGE 2
// selection window
-Window net_sel_win = None, hint_win = None;
+Window net_sel_win = None;
// freedesktop specification doesn't allow multi systray
Systraybar systray;
int systray_enabled;
int systray_max_icon_size = 0;
+// background pixmap if we render ourselves the icons
+static Pixmap render_background = 0;
+
void init_systray()
{
systray_enabled = 0;
systray.area.on_screen = 0;
free_area(&systray.area);
+ if (render_background) XFreePixmap(server.dsp, render_background);
}
void draw_systray(void *obj, cairo_t *c, int active)
{
- // tint2 don't draw systray icons. just the background.
+ if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ if (render_background) XFreePixmap(server.dsp, render_background);
+ render_background = XCreatePixmap(server.dsp, server.root_win, systray.area.width, systray.area.height, server.depth);
+ XCopyArea(server.dsp, systray.area.pix.pmap, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
+ }
+
+ // tint2 don't draw systray icons. just the background.
refresh_systray = 1;
}
// init systray protocol
net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
- // v0.2 trayer specification. tint2 always horizontal.
+ // v0.3 trayer specification. tint2 always horizontal.
// Vertical panel will draw the systray horizontal.
int orient = 0;
XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
// watch for the icon trying to resize itself!
XSelectInput(server.dsp, traywin->tray_id, StructureNotifyMask);
if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
- traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
+ traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportNonEmpty);
XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
}
}
}
-
-void systray_render_icons(TrayWindow* traywin)
+void systray_render_icon_now(void* t)
{
+ TrayWindow* traywin = t;
+ traywin->render_timeout = 0;
+
// good systray icons support 32 bit depth, but some icons are still 24 bit.
// We create a heuristic mask for these icons, i.e. we get the rgb value in the top left corner, and
// mask out all pixel with the same rgb value
Panel* panel = systray.area.panel;
imlib_context_set_drawable(traywin->id);
Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 0);
+ if (image == 0)
+ return;
+
imlib_context_set_image(image);
imlib_image_set_has_alpha(1);
DATA32* data = imlib_image_get_data();
if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100);
imlib_image_put_back_data(data);
- imlib_context_set_drawable(panel->main_win);
- imlib_render_image_on_drawable(traywin->x, traywin->y);
- imlib_context_set_drawable(systray.area.pix.pmap);
- imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy);
-
- //TODO: in real_transparency mode imlib_render_image_on_drawable does not the right thing, because
- // it overlays the pixmap with the background of the systray, which is itself transparent. Therefore
- // the icons are not opaque, although they should be...
- // A better solution would be to render them with XRenderComposite and PixtOpOver, but then completely
- // transparent icons do not appear transparent (i do not know why)
-// imlib_free_pixmap_and_mask(pix_image);
-// Picture pict_image = XRenderCreatePicture(server.dsp, test, XRenderFindStandardFormat(server.dsp, PictStandardARGB32), 0, 0);
-// Picture pict_panel = XRenderCreatePicture(server.dsp, panel->main_win, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
-// Picture pict_systray = XRenderCreatePicture(server.dsp, systray.area.pix.pmap, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
-// XRenderComposite(server.dsp, PictOpOver, pict_image, None, pict_panel, 0, 0, 0, 0, traywin->x, traywin->y, traywin->width, traywin->height);
-// XRenderComposite(server.dsp, PictOpOver, pict_image, None, pict_systray, 0, 0, 0, 0, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
-// XFreePixmap(server.dsp, test);
-// XRenderFreePicture(server.dsp, pict_image);
-// XRenderFreePicture(server.dsp, pict_panel);
-// XRenderFreePicture(server.dsp, pict_systray);
- imlib_free_image();
+ XCopyArea(server.dsp, render_background, systray.area.pix.pmap, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy);
+ if ( !real_transparency ) {
+ imlib_context_set_drawable(systray.area.pix.pmap);
+ imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy);
+ }
+ else {
+ render_image(systray.area.pix.pmap, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
+ }
+ XCopyArea(server.dsp, systray.area.pix.pmap, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y);
+ imlib_free_image_and_decache();
+
+ XDamageSubtract(server.dsp, traywin->damage, None, None);
+ XFlush(server.dsp);
+}
+
+
+void systray_render_icon(TrayWindow* traywin)
+{
+ // wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
+ if (traywin->render_timeout == 0)
+ traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin);
}
traywin = (TrayWindow*)l->data;
if (traywin->hide) continue;
if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
- systray_render_icons(traywin);
+ systray_render_icon(traywin);
else
- XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+ XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
}
- if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
- XFlush(server.dsp);
}