int systray_max_icon_size;
// background pixmap if we render ourselves the icons
-static Pixmap render_background = 0;
+static Pixmap render_background;
+void default_systray()
+{
+ 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;
+}
+
+void cleanup_systray()
+{
+ 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;
+ }
+}
+
void init_systray()
{
start_net();
systray.alpha = 100;
systray.brightness = systray.saturation = 0;
}
- systray.area._draw_foreground = draw_systray;
- systray.area._resize = resize_systray;
systray.area.resize = 1;
systray.area.redraw = 1;
systray.area.on_screen = 1;
}
-void cleanup_systray()
+void draw_systray(void *obj, cairo_t *c)
{
- 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;
+ // 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;
+ for (i=1, l = systray.list_icons; l ; i++, l = l->next) {
+ traywin = (TrayWindow*)l->data;
+ if (traywin->hide) continue;
-void draw_systray(void *obj, cairo_t *c)
-{
- if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ traywin->y = posy;
+ traywin->x = posx;
+ traywin->width = icon_size;
+ traywin->height = icon_size;
+ 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);
+ }
+ }
+
+ // 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);
+ }
+
+ 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);
}
-void resize_systray(void *obj)
+int resize_systray(void *obj)
{
Systraybar *sysbar = obj;
- Panel *panel = sysbar->area.panel;
- TrayWindow *traywin;
GSList *l;
int count, icon_size;
int icons_per_column=1, icons_per_row=1, marging=0;
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);
}
-
- systray.area.posx = panel->area.width - panel->area.bg->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
}
else {
if (!count) systray.area.height = 0;
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);
}
-
- systray.area.posy = panel->area.bg->border.width + panel->area.paddingxlr;
- if (panel->clock.area.on_screen)
- systray.area.posy += (panel->clock.area.height + panel->area.paddingx);
-#ifdef ENABLE_BATTERY
- if (panel->battery.area.on_screen)
- systray.area.posy += (panel->battery.area.height + panel->area.paddingx);
-#endif
- }
-
- int i, posx, posy;
- 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;
- }
-
- 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;
- 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);
- }
- }
-
- // 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);
- }
- // resize force the redraw
- systray.area.redraw = 1;
+ return 1;
}
// v0.3 trayer specification. tint2 always horizontal.
// Vertical panel will draw the systray horizontal.
- int orient = 0;
+ 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))
if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE;
unsigned long mask = 0;
XSetWindowAttributes set_attr;
- printf("icon with depth: %d\n", attr.depth);
+ 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 = 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);
+ 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);
XSendEvent(server.dsp, id, False, 0xFFFFFF, &e);
}
- printf("Adding systray with window: %d\n", id);
traywin = g_new0(TrayWindow, 1);
traywin->id = parent_window;
traywin->tray_id = id;
// 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) {
+ 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);
}
{
XErrorHandler old;
- printf("Removing systray with window: %d\n", traywin->tray_id);
// remove from our list
systray.list_icons = g_slist_remove(systray.list_icons, traywin);
systray.area.resize = 1;
return;
}
Picture pict_image;
- if (real_transparency)
- pict_image = XRenderCreatePicture(server.dsp, traywin->id, f, 0, 0);
- else
- pict_image = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0);
+ //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);
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) {
void systray_render_icon(TrayWindow* traywin)
{
- if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
+ 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);