void default_systray()
{
-printf("*** default_systray()\n");
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;
}
-void resize_systray(void *obj)
+int resize_systray(void *obj)
{
Systraybar *sysbar = obj;
Panel *panel = sysbar->area.panel;
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;
+ 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;
{
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 (server.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) {