#include <string.h>
#include <glib.h>
#include <Imlib2.h>
+#include <X11/extensions/Xdamage.h>
+#include <X11/extensions/Xcomposite.h>
#include "systraybar.h"
#include "server.h"
// freedesktop specification doesn't allow multi systray
Systraybar systray;
int refresh_systray;
+int systray_enabled;
+int systray_max_icon_size = 0;
void init_systray()
{
- if (systray.area.on_screen)
- systray.area.on_screen = init_net();
+ start_net();
- if (!systray.area.on_screen)
+ if (!systray_enabled)
return;
systray.area._draw_foreground = draw_systray;
systray.area._resize = resize_systray;
systray.area.resize = 1;
systray.area.redraw = 1;
+ systray.area.on_screen = 1;
refresh_systray = 0;
}
void cleanup_systray()
{
- 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;
- }
-
+ systray_enabled = 0;
+ systray.area.on_screen = 0;
free_area(&systray.area);
- cleanup_net();
}
else
icon_size = sysbar->area.width;
icon_size = icon_size - (2 * sysbar->area.pix.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)
if (panel_horizontal) {
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);
+ else {
+ int icons_per_column = (sysbar->area.height - 2*sysbar->area.pix.border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+ int row_count = count / icons_per_column + (count%icons_per_column != 0);
+ systray.area.width = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * row_count) + ((row_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)
}
else {
if (!count) systray.area.height = 0;
- else systray.area.height = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * count) + ((count-1) * systray.area.paddingx);
+ else {
+ int icons_per_row = (sysbar->area.width - 2*sysbar->area.pix.border.width - 2*sysbar->area.paddingy + sysbar->area.paddingx) / (icon_size+sysbar->area.paddingx);
+ int column_count = count / icons_per_row+ (count%icons_per_row != 0);
+ systray.area.height = (2 * systray.area.pix.border.width) + (2 * systray.area.paddingxlr) + (icon_size * column_count) + ((column_count-1) * systray.area.paddingx);
+ }
systray.area.posy = panel->area.pix.border.width + panel->area.paddingxlr;
if (panel->clock.area.on_screen)
#endif
}
+ int max_line_pos;
if (panel_horizontal) {
+ max_line_pos = sysbar->area.posy+sysbar->area.height - sysbar->area.pix.border.width - sysbar->area.paddingy - icon_size;
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;
}
else {
+ max_line_pos = sysbar->area.posx+sysbar->area.width - sysbar->area.pix.border.width - sysbar->area.paddingy - icon_size;
posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
posy = systray.area.posy + systray.area.pix.border.width + systray.area.paddingxlr;
}
+
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
if (traywin->hide) continue;
traywin->x = posx;
traywin->width = icon_size;
traywin->height = icon_size;
- if (panel_horizontal)
- posx += (icon_size + systray.area.paddingx);
- else
- posy += (icon_size + systray.area.paddingx);
+ if (panel_horizontal) {
+ if (posy + icon_size + sysbar->area.paddingxlr < max_line_pos)
+ posy += icon_size + sysbar->area.paddingx;
+ else {
+ posx += (icon_size + systray.area.paddingx);
+ posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+ }
+ }
+ else {
+ if (posx + icon_size + sysbar->area.paddingxlr < max_line_pos)
+ posx += icon_size + systray.area.paddingx;
+ else {
+ posy += (icon_size + systray.area.paddingx);
+ posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy;
+ }
+ }
// 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);
}
}
// ***********************************************
// systray protocol
-int init_net()
+void start_net()
{
+ 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
fprintf(stderr, " pid=%d", pid);
}
fprintf(stderr, "\n");
- return 0;
+ return;
}
// init systray protocol
// 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);
+ VisualID 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;
}
+ //fprintf(stderr, "tint2 : systray started\n");
XClientMessageEvent ev;
ev.type = ClientMessage;
ev.window = server.root_win;
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;
const TrayWindow * traywin_b = (TrayWindow*)b;
XTextProperty name_a, name_b;
- if(XGetWMName(server.dsp, traywin_a->id, &name_a) == 0) {
+ if(XGetWMName(server.dsp, traywin_a->tray_id, &name_a) == 0) {
return -1;
}
- else if(XGetWMName(server.dsp, traywin_b->id, &name_b) == 0) {
+ else if(XGetWMName(server.dsp, traywin_b->tray_id, &name_b) == 0) {
XFree(name_a.value);
return 1;
}
int hide = 0;
error = FALSE;
+ XWindowAttributes attr;
+ XGetWindowAttributes(server.dsp, id, &attr);
+ unsigned long mask = 0;
+ XSetWindowAttributes set_attr;
+ if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0 ) {
+ 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, attr.visual, mask, &set_attr);
old = XSetErrorHandler(window_error_handler);
- XReparentWindow(server.dsp, id, panel->main_win, 0, 0);
+ XReparentWindow(server.dsp, id, parent_window, 0, 0);
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error != FALSE) {
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] = panel->main_win;
+ 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.sort == 3)
systray.list_icons = g_slist_prepend(systray.list_icons, traywin);
//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->id, StructureNotifyMask);
+ 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);
+ XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual);
+ }
// show the window
- if (!traywin->hide)
+ if (!traywin->hide) {
+ XMapRaised(server.dsp, traywin->tray_id);
XMapRaised(server.dsp, traywin->id);
+ }
// changed in systray force resize on panel
panel->area.resize = 1;
// remove from our list
systray.list_icons = g_slist_remove(systray.list_icons, traywin);
- g_free(traywin);
systray.area.resize = 1;
systray.area.redraw = 1;
//printf("remove_icon id %lx, %d\n", traywin->id);
- XSelectInput(server.dsp, traywin->id, NoEventMask);
+ 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);
if (!traywin->hide)
XUnmapWindow(server.dsp, traywin->id);
- XReparentWindow(server.dsp, traywin->id, server.root_win, 0, 0);
+ XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0);
+ XDestroyWindow(server.dsp, traywin->id);
XSync(server.dsp, False);
XSetErrorHandler(old);
+ g_free(traywin);
// changed in systray force resize on panel
Panel *panel = systray.area.panel;
}
+void systray_render_icons(TrayWindow* traywin)
+{
+ // 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);
+ imlib_context_set_image(image);
+ 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);
+ if ( !real_transparency ) {
+ 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);
+ }
+ else {
+ render_image(panel->main_win, traywin->x, traywin->y, traywin->width, traywin->height);
+ render_image(systray.area.pix.pmap, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height);
+ }
+ imlib_free_image();
+}
+
+
void refresh_systray_icon()
{
TrayWindow *traywin;
for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data;
if (traywin->hide) continue;
- XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
+ if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
+ systray_render_icons(traywin);
+ else
+ XClearArea(server.dsp, traywin->id, 0, 0, traywin->width, traywin->height, True);
}
+ if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
+ XFlush(server.dsp);
}
-
-
projects / chaz / tint2 / blobdiff