* Tint2 : systraybar
*
* Copyright (C) 2009 thierry lorthiois (lorthiois@bbsoft.fr)
+* based on 'docker-1.5' from Ben Jansens.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2
#include <string.h>
#include <glib.h>
#include <Imlib2.h>
+#include <X11/extensions/Xdamage.h>
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xrender.h>
+
#include "systraybar.h"
#include "server.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 refresh_systray;
+int systray_enabled;
+int systray_max_icon_size;
+// background pixmap if we render ourselves the icons
+static Pixmap render_background;
-void init_systray()
+
+void default_systray()
{
- Panel *panel = &panel1[0];
- systray.area.parent = panel;
- systray.area.panel = panel;
+ memset(&systray, 0, sizeof(Systraybar));
+ render_background = 0;
+ systray.alpha = 100;
+ systray.sort = 3;
systray.area._draw_foreground = draw_systray;
+ systray.area.size_mode = SIZE_BY_CONTENT;
systray.area._resize = resize_systray;
-
- if (systray.area.on_screen)
- systray.area.on_screen = init_net();
-
- if (!systray.area.on_screen)
- return;
-
- // configure systray
- // draw only one systray (even with multi panel)
- systray.area.posy = panel->area.pix.border.width + panel->area.paddingy;
- systray.area.height = panel->area.height - (2 * systray.area.posy);
- systray.area.width = 0;
-
- systray.area.posx = panel->area.width - panel->area.paddingxlr - panel->area.pix.border.width - systray.area.width;
- if (panel->clock.area.on_screen)
- systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
-#ifdef ENABLE_BATTERY
- if (panel->battery.area.on_screen)
- systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
-#endif
-
- systray.area.redraw = 1;
}
-
void cleanup_systray()
{
- if (systray.list_icons) {
- GSList *it;
-
- for (it = systray.list_icons; it; it = it->next)
- remove_icon((TrayWindow*)it->data);
+ stop_net();
+ systray_enabled = 0;
+ systray_max_icon_size = 0;
+ systray.area.on_screen = 0;
+ free_area(&systray.area);
+ if (render_background) {
+ XFreePixmap(server.dsp, render_background);
+ render_background = 0;
+ }
+}
- g_slist_free(systray.list_icons);
- systray.list_icons = 0;
- }
+void init_systray()
+{
+ start_net();
- free_area(&systray.area);
+ if (!systray_enabled)
+ return;
- cleanup_net();
+ if (!server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) {
+ printf("No 32 bit visual for your X implementation. 'systray_asb = 100 0 0' will be forced\n");
+ systray.alpha = 100;
+ systray.brightness = systray.saturation = 0;
+ }
}
-void draw_systray(void *obj, cairo_t *c, int active)
+void init_systray_panel(void *p)
{
- Systraybar *sysbar = obj;
- Panel *panel = sysbar->area.panel;
- TrayWindow *traywin;
- GSList *l;
- int icon_size;
+ Panel *panel =(Panel*)p;
- //printf("draw_systray %d %d\n", systray.area.posx, systray.area.width);
- icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
+ if (panel_horizontal) {
+ systray.area.posy = panel->area.bg->border.width + panel->area.paddingy;
+ systray.area.height = panel->area.height - (2 * systray.area.posy);
+ }
+ else {
+ systray.area.posx = panel->area.bg->border.width + panel->area.paddingy;
+ systray.area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
+ }
+ systray.area.parent = p;
+ systray.area.panel = p;
+
+ GSList *l;
+ int count = 0;
for (l = systray.list_icons; l ; l = l->next) {
- traywin = (TrayWindow*)l->data;
-
- // watch for the icon trying to resize itself!
- //XSelectInput(server.dsp, traywin->id, StructureNotifyMask|ResizeRedirectMask);
- XSelectInput(server.dsp, traywin->id, StructureNotifyMask);
-
- // position and size the icon window
- XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
- //printf("icon %d, %d, %d\n", traywin->x, traywin->y, icon_size);
- // ceci intervertie les fonds : le premier icone prend le fond du dernier
- // le dernier prend le fond de l'avant dernier, ...
- XSetWindowBackgroundPixmap (server.dsp, panel->main_win, systray.area.pix.pmap);
-
- // flush before clearing, otherwise the clear isn't effective.
- XFlush(server.dsp);
- // make sure the new child will get the right stuff in its background
- // for ParentRelative.
- XClearWindow(server.dsp, panel->main_win);
-
- // show the window
- XMapRaised(server.dsp, traywin->id);
+ if (!((TrayWindow*)l->data)->hide)
+ count++;
}
+ if (count == 0)
+ systray.area.on_screen = 0;
+ else
+ systray.area.on_screen = 1;
+ refresh_systray = 0;
}
-void resize_systray(void *obj)
+void draw_systray(void *obj, cairo_t *c)
{
+ // TODO : position and size the icon window when position of systray is known
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
+ int i, posx, posy, marging=3, icons_per_column=1, icons_per_row=1;
+ int icon_size = 24;
+ int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2;
+ if (panel_horizontal) {
+ posy = start;
+ posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr;
+ }
+ else {
+ posx = start;
+ posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr;
+ }
+
TrayWindow *traywin;
GSList *l;
- int count, posx, posy;
- int icon_size;
-
- icon_size = sysbar->area.height - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy);
- count = g_slist_length(systray.list_icons);
-
- if (!count) systray.area.width = 0;
- else systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
-
- systray.area.posx = panel->area.width - panel->area.pix.border.width - panel->area.paddingxlr - systray.area.width;
- if (panel->clock.area.on_screen)
- systray.area.posx -= (panel->clock.area.width + panel->area.paddingx);
-#ifdef ENABLE_BATTERY
- if (panel->battery.area.on_screen)
- systray.area.posx -= (panel->battery.area.width + panel->area.paddingx);
-#endif
-
- systray.area.redraw = 1;
-
- posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
- posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr;
- for (l = systray.list_icons; l ; l = l->next) {
+ for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
traywin = (TrayWindow*)l->data;
+ if (traywin->hide) continue;
traywin->y = posy;
traywin->x = posx;
traywin->width = icon_size;
traywin->height = icon_size;
- posx += (icon_size + systray.area.paddingx);
- }
+ if (panel_horizontal) {
+ if (i % icons_per_column)
+ posy += icon_size + sysbar->area.paddingx;
+ else {
+ posy = start;
+ posx += (icon_size + systray.area.paddingx);
+ }
+ }
+ else {
+ if (i % icons_per_row)
+ posx += icon_size + systray.area.paddingx;
+ else {
+ posx = start;
+ posy += (icon_size + systray.area.paddingx);
+ }
+ }
- // resize other objects on panel
- printf("resize_systray %d %d\n", systray.area.posx, systray.area.width);
-}
+ // position and size the icon window
+ XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size);
+ XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size);
+ }
-/*
-void create_hint_win()
-{
- XWMHints hints;
- XClassHint classhints;
- Panel *panel = systray.area.panel;
+ if (server.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, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
+ }
- hint_win = XCreateSimpleWindow(server.dsp, server.root_win, 0, 0, 1, 1, 0, 0, 0);
+ refresh_systray = 1;
+}
- hints.flags = StateHint | WindowGroupHint | IconWindowHint;
- hints.initial_state = WithdrawnState;
- hints.window_group = hint_win;
- hints.icon_window = panel->main_win;
- classhints.res_name = "docker";
- classhints.res_class = "Docker";
+int resize_systray(void *obj)
+{
+ Systraybar *sysbar = obj;
+ GSList *l;
+ int count, icon_size;
+ int icons_per_column=1, icons_per_row=1, marging=0;
+
+ if (panel_horizontal)
+ icon_size = sysbar->area.height;
+ else
+ icon_size = sysbar->area.width;
+ icon_size = icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy);
+ if (systray_max_icon_size > 0 && icon_size > systray_max_icon_size)
+ icon_size = systray_max_icon_size;
+ count = 0;
+ for (l = systray.list_icons; l ; l = l->next) {
+ if (!((TrayWindow*)l->data)->hide)
+ count++;
+ }
+ //printf("count %d\n", count);
+
+ if (panel_horizontal) {
+ int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
+ // here icons_per_column always higher than 0
+ icons_per_column = (height+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+ marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size;
+ icons_per_row = count / icons_per_column + (count%icons_per_column != 0);
+ systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_row) + ((icons_per_row-1) * systray.area.paddingx);
+ }
+ else {
+ int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy;
+ // here icons_per_row always higher than 0
+ icons_per_row = (width+sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+ marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size;
+ icons_per_column = count / icons_per_row+ (count%icons_per_row != 0);
+ systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * icons_per_column) + ((icons_per_column-1) * systray.area.paddingx);
+ }
+ return 1;
+}
- XSetWMProperties(server.dsp, hint_win, NULL, NULL, NULL, 0,
- NULL, &hints, &classhints);
- XMapWindow(server.dsp, hint_win);
-}
-*/
+// ***********************************************
+// systray protocol
-int init_net()
+void start_net()
{
- if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != None) {
- fprintf(stderr, "tint2 : another systray is running\n");
- return 0;
+ if (net_sel_win) {
+ // protocol already started
+ if (!systray_enabled)
+ stop_net();
+ return;
+ }
+ else
+ if (!systray_enabled)
+ return;
+
+ Window win = XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN);
+
+ // freedesktop systray specification
+ if (win != None) {
+ // search pid
+ Atom _NET_WM_PID, actual_type;
+ int actual_format;
+ unsigned long nitems;
+ unsigned long bytes_after;
+ unsigned char *prop = 0;
+ int pid;
+
+ _NET_WM_PID = XInternAtom(server.dsp, "_NET_WM_PID", True);
+ int ret = XGetWindowProperty(server.dsp, win, _NET_WM_PID, 0, 1024, False, AnyPropertyType, &actual_type, &actual_format, &nitems, &bytes_after, &prop);
+
+ fprintf(stderr, "tint2 : another systray is running");
+ if (ret == Success && prop) {
+ pid = prop[1] * 256;
+ pid += prop[0];
+ fprintf(stderr, " pid=%d", pid);
+ }
+ fprintf(stderr, "\n");
+ return;
}
-
- //create_hint_win();
// init systray protocol
- net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
+ net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0);
- // v0.2 trayer specification. tint2 always orizontal.
- int orient = 0;
+ // v0.3 trayer specification. tint2 always horizontal.
+ // Vertical panel will draw the systray horizontal.
+ long orient = 0;
XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+ VisualID vid;
+ if (server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0))
+ vid = XVisualIDFromVisual(server.visual32);
+ else
+ vid = XVisualIDFromVisual(server.visual);
+ XChangeProperty(server.dsp, net_sel_win, XInternAtom(server.dsp, "_NET_SYSTEM_TRAY_VISUAL", False), XA_VISUALID, 32, PropModeReplace, (unsigned char*)&vid, 1);
XSetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN, net_sel_win, CurrentTime);
if (XGetSelectionOwner(server.dsp, server.atom._NET_SYSTEM_TRAY_SCREEN) != net_sel_win) {
+ stop_net();
fprintf(stderr, "tint2 : can't get systray manager\n");
- return 0;
- }
+ return;
+ }
- XClientMessageEvent ev;
+ //fprintf(stderr, "tint2 : systray started\n");
+ XClientMessageEvent ev;
ev.type = ClientMessage;
- ev.window = server.root_win;
+ ev.window = server.root_win;
ev.message_type = server.atom.MANAGER;
ev.format = 32;
ev.data.l[0] = CurrentTime;
ev.data.l[3] = 0;
ev.data.l[4] = 0;
XSendEvent(server.dsp, server.root_win, False, StructureNotifyMask, (XEvent*)&ev);
-
- return 1;
}
-void cleanup_net()
+void stop_net()
{
+ //fprintf(stderr, "tint2 : systray stopped\n");
+ if (systray.list_icons) {
+ // remove_icon change systray.list_icons
+ while(systray.list_icons)
+ remove_icon((TrayWindow*)systray.list_icons->data);
+
+ g_slist_free(systray.list_icons);
+ systray.list_icons = 0;
+ }
+
if (net_sel_win != None) {
- XDestroyWindow(server.dsp, net_sel_win);
- net_sel_win = None;
+ XDestroyWindow(server.dsp, net_sel_win);
+ net_sel_win = None;
}
}
-/*
-void fix_geometry()
-{
- GSList *it;
- Panel *panel = systray.area.panel;
-
- // find the proper width and height
- width = 0;
- height = icon_size;
- for (it = icons; it != NULL; it = g_slist_next(it)) {
- width += icon_size;
- }
-
- XResizeWindow(server.dsp, panel->main_win, width + border * 2, height + border * 2);
-}
-*/
-
gboolean error;
int window_error_handler(Display *d, XErrorEvent *e)
{
}
-gboolean icon_swallow(Window id)
+static gint compare_traywindows(gconstpointer a, gconstpointer b)
{
- XErrorHandler old;
- Panel *panel = systray.area.panel;
-
- error = FALSE;
- old = XSetErrorHandler(window_error_handler);
- XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
- printf("icon_swallow %lx %lx\n", id, panel->main_win);
- XSync(server.dsp, False);
- XSetErrorHandler(old);
+ const TrayWindow * traywin_a = (TrayWindow*)a;
+ const TrayWindow * traywin_b = (TrayWindow*)b;
+ XTextProperty name_a, name_b;
- return !error;
+ if(XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
+ return -1;
+ }
+ else if(XGetWMName(server.dsp, traywin_b->tray_id, &name_b) == 0) {
+ XFree(name_a.value);
+ return 1;
+ }
+ else {
+ gint retval = g_ascii_strncasecmp((char*)name_a.value, (char*)name_b.value, -1) * systray.sort;
+ XFree(name_a.value);
+ XFree(name_b.value);
+ return retval;
+ }
}
-// The traywin must have its id and type set.
gboolean add_icon(Window id)
{
TrayWindow *traywin;
+ XErrorHandler old;
+ Panel *panel = systray.area.panel;
+ int hide = 0;
- if (!icon_swallow(id)) {
+ error = FALSE;
+ XWindowAttributes attr;
+ if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
+ unsigned long mask = 0;
+ XSetWindowAttributes set_attr;
+ Visual* visual = server.visual;
+ //printf("icon with depth: %d, width %d, height %d\n", attr.depth, attr.width, attr.height);
+ //printf("icon with depth: %d\n", attr.depth);
+ if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ visual = attr.visual;
+ set_attr.colormap = attr.colormap;
+ set_attr.background_pixel = 0;
+ set_attr.border_pixel = 0;
+ mask = CWColormap|CWBackPixel|CWBorderPixel;
+ }
+ else {
+ set_attr.background_pixmap = ParentRelative;
+ mask = CWBackPixmap;
+ }
+ Window parent_window;
+ parent_window = XCreateWindow(server.dsp, panel->main_win, 0, 0, 30, 30, 0, attr.depth, InputOutput, visual, mask, &set_attr);
+ old = XSetErrorHandler(window_error_handler);
+ XReparentWindow(server.dsp, id, parent_window, 0, 0);
+ XSync(server.dsp, False);
+ XSetErrorHandler(old);
+ if (error != FALSE) {
fprintf(stderr, "tint2 : not icon_swallow\n");
+ XDestroyWindow(server.dsp, parent_window);
return FALSE;
}
+ {
+ Atom acttype;
+ int actfmt;
+ unsigned long nbitem, bytes;
+ unsigned char *data = 0;
+ int ret;
+
+ ret = XGetWindowProperty(server.dsp, id, server.atom._XEMBED_INFO, 0, 2, False, server.atom._XEMBED_INFO, &acttype, &actfmt, &nbitem, &bytes, &data);
+ if (ret == Success) {
+ if (data) {
+ if (nbitem == 2) {
+ //hide = ((data[1] & XEMBED_MAPPED) == 0);
+ //printf("hide %d\n", hide);
+ }
+ XFree(data);
+ }
+ }
+ else {
+ fprintf(stderr, "tint2 : xembed error\n");
+ XDestroyWindow(server.dsp, parent_window);
+ return FALSE;
+ }
+ }
+ {
+ XEvent e;
+ e.xclient.type = ClientMessage;
+ e.xclient.serial = 0;
+ e.xclient.send_event = True;
+ e.xclient.message_type = server.atom._XEMBED;
+ e.xclient.window = id;
+ e.xclient.format = 32;
+ e.xclient.data.l[0] = CurrentTime;
+ e.xclient.data.l[1] = XEMBED_EMBEDDED_NOTIFY;
+ e.xclient.data.l[2] = 0;
+ e.xclient.data.l[3] = parent_window;
+ e.xclient.data.l[4] = 0;
+ XSendEvent(server.dsp, id, False, 0xFFFFFF, &e);
+ }
+
traywin = g_new0(TrayWindow, 1);
- traywin->id = id;
+ traywin->id = parent_window;
+ traywin->tray_id = id;
+ traywin->hide = hide;
+ traywin->depth = attr.depth;
+ traywin->damage = 0;
+
+ if (systray.area.on_screen == 0)
+ systray.area.on_screen = 1;
+
+ if (systray.sort == 3)
+ systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
+ else if (systray.sort == 2)
+ systray.list_icons = g_slist_append(systray.list_icons, traywin);
+ else
+ systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
+ systray.area.resize = 1;
+ //printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
+
+ // watch for the icon trying to resize itself!
+ XSelectInput(server.dsp, traywin->tray_id, StructureNotifyMask);
+ if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles);
+ XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
+ }
- systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
- printf("ajout d'un icone %d (%lx)\n", g_slist_length(systray.list_icons), id);
- systray.area.resize = 1;
- systray.area.redraw = 1;
+ // show the window
+ if (!traywin->hide)
+ XMapWindow(server.dsp, traywin->tray_id);
+ if (!traywin->hide && !panel->is_hidden)
+ XMapRaised(server.dsp, traywin->id);
// changed in systray force resize on panel
- Panel *panel = systray.area.panel;
panel->area.resize = 1;
panel_refresh = 1;
-
return TRUE;
}
{
XErrorHandler old;
- XSelectInput(server.dsp, traywin->id, NoEventMask);
+ // remove from our list
+ systray.list_icons = g_slist_remove(systray.list_icons, traywin);
+ systray.area.resize = 1;
+ //printf("remove_icon id %lx, %d\n", traywin->id);
+
+ XSelectInput(server.dsp, traywin->tray_id, NoEventMask);
+ if (traywin->damage)
+ XDamageDestroy(server.dsp, traywin->damage);
// reparent to root
error = FALSE;
old = XSetErrorHandler(window_error_handler);
- XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
+ if (!traywin->hide)
+ XUnmapWindow(server.dsp, traywin->tray_id);
+ XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0);
+ XDestroyWindow(server.dsp, traywin->id);
XSync(server.dsp, False);
XSetErrorHandler(old);
-
- // remove from our list
- systray.list_icons = g_slist_remove(systray.list_icons, traywin);
+ if (traywin->render_timeout)
+ stop_timeout(traywin->render_timeout);
g_free(traywin);
- printf("suppression d'un icone %d\n", g_slist_length(systray.list_icons));
- systray.area.resize = 1;
+ // check empty systray
+ int count = 0;
+ GSList *l;
+ for (l = systray.list_icons; l ; l = l->next) {
+ if (!((TrayWindow*)l->data)->hide)
+ count++;
+ }
+ if (count == 0) {
+ systray.area.on_screen = 0;
+ systray.area.width = 0;
+ }
// changed in systray force resize on panel
Panel *panel = systray.area.panel;
panel->area.resize = 1;
panel_refresh = 1;
-
}
break;
default:
- if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA) {
+ if (opcode == server.atom._NET_SYSTEM_TRAY_MESSAGE_DATA)
printf("message from dockapp: %s\n", e->data.b);
- }
else
- printf("SYSTEM_TRAY : unknown message type\n");
+ fprintf(stderr, "SYSTEM_TRAY : unknown message type\n");
break;
}
}
+void systray_render_icon_now(void* t)
+{
+ // we end up in this function only in real transparency mode or if systray_task_asb != 100 0 0
+ // we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here
+ 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;
+
+ // Very ugly hack, but somehow imlib2 is not able to get the image from the traywindow itself,
+ // so we first render the tray window onto a pixmap, and then we tell imlib2 to use this pixmap as
+ // drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
+ Pixmap tmp_pmap = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, 32);
+ XRenderPictFormat* f;
+ if (traywin->depth == 24)
+ f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24);
+ else if (traywin->depth == 32)
+ f = XRenderFindStandardFormat(server.dsp, PictStandardARGB32);
+ else {
+ printf("Strange tray icon found with depth: %d\n", traywin->depth);
+ return;
+ }
+ Picture pict_image;
+ //if (server.real_transparency)
+ //pict_image = XRenderCreatePicture(server.dsp, traywin->id, f, 0, 0);
+ // reverted Rev 407 because here it's breaking alls icon with systray + xcompmgr
+ pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
+ Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual32), 0, 0);
+ XRenderComposite(server.dsp, PictOpSrc, pict_image, None, pict_drawable, 0, 0, 0, 0, 0, 0, traywin->width, traywin->height);
+ XRenderFreePicture(server.dsp, pict_image);
+ XRenderFreePicture(server.dsp, pict_drawable);
+ // end of the ugly hack and we can continue as before
+
+ imlib_context_set_visual(server.visual32);
+ imlib_context_set_colormap(server.colormap32);
+ imlib_context_set_drawable(tmp_pmap);
+ Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 1);
+ if (image == 0)
+ return;
+
+ imlib_context_set_image(image);
+ //if (traywin->depth == 24)
+ //imlib_save_image("/home/thil77/test.jpg");
+ imlib_image_set_has_alpha(1);
+ DATA32* data = imlib_image_get_data();
+ if (traywin->depth == 24) {
+ createHeuristicMask(data, traywin->width, traywin->height);
+ }
+ 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);
+ XCopyArea(server.dsp, render_background, systray.area.pix, 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);
+ render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
+ XCopyArea(server.dsp, systray.area.pix, 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();
+ XFreePixmap(server.dsp, tmp_pmap);
+ imlib_context_set_visual(server.visual);
+ imlib_context_set_colormap(server.colormap);
+
+ if (traywin->damage)
+ XDamageSubtract(server.dsp, traywin->damage, None, None);
+ XFlush(server.dsp);
+}
+
-void refresh_systray()
+void systray_render_icon(TrayWindow* traywin)
+{
+ if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ // 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);
+ }
+ else {
+ // comment by andreas: I'm still not sure, what exactly we need to do here... Somehow trayicons which do not
+ // offer the same depth as tint2 does, need to draw a background pixmap, but this cannot be done with
+ // XCopyArea... So we actually need XRenderComposite???
+// Pixmap pix = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
+// XCopyArea(server.dsp, panel->temp_pmap, pix, server.gc, traywin->x, traywin->y, traywin->width, traywin->height, 0, 0);
+// XSetWindowBackgroundPixmap(server.dsp, traywin->id, pix);
+ XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
+ }
+}
+
+
+void refresh_systray_icon()
{
TrayWindow *traywin;
GSList *l;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
- XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+ if (traywin->hide) continue;
+ systray_render_icon(traywin);
}
}
-
-
projects / chaz / tint2 / blobdiff