X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=src%2Fsystray%2Fsystraybar.c;h=f1a69c423d9dd2f02163b8055e382d39f76b48d1;hb=103fc2b078cab5be759798d034deeda681629416;hp=a0c1f3c716ee275136da229a10b7ed7513de9051;hpb=14bb7c359cd5d07fb27cd36f6dae19991bb6836f;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index a0c1f3c..f1a69c4 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -27,6 +27,8 @@ #include #include #include +#include + #include "systraybar.h" #include "server.h" @@ -208,6 +210,8 @@ void resize_systray(void *obj) 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; } @@ -348,7 +352,8 @@ gboolean add_icon(Window id) 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 ) { +// printf("icon with depth: %d\n", attr.depth); + if (attr.depth != server.depth ) { set_attr.colormap = attr.colormap; set_attr.background_pixel = 0; set_attr.border_pixel = 0; @@ -423,7 +428,6 @@ gboolean add_icon(Window id) else systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows); systray.area.resize = 1; - systray.area.redraw = 1; //printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons)); // watch for the icon trying to resize itself! @@ -453,7 +457,6 @@ void remove_icon(TrayWindow *traywin) // remove from our list systray.list_icons = g_slist_remove(systray.list_icons, traywin); systray.area.resize = 1; - systray.area.redraw = 1; //printf("remove_icon id %lx, %d\n", traywin->id); XSelectInput(server.dsp, traywin->tray_id, NoEventMask); @@ -506,6 +509,7 @@ void net_message(XClientMessageEvent *e) 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 TrayWindow* traywin = t; traywin->render_timeout = 0; @@ -513,15 +517,36 @@ void systray_render_icon_now(void* t) // 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); + + // 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, server.depth); + 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 = XRenderCreatePicture(server.dsp, traywin->tray_id, f, 0, 0); + Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual), 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_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); imlib_image_set_has_alpha(1); DATA32* data = imlib_image_get_data(); - if (traywin->depth == 24) { + if (traywin->depth == 24 && server.depth != 24) { createHeuristicMask(data, traywin->width, traywin->height); } if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) @@ -537,17 +562,30 @@ void systray_render_icon_now(void* t) } 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); - XDamageSubtract(server.dsp, traywin->damage, None, None); + if (traywin->damage) + 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); + if (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); + } } @@ -558,16 +596,6 @@ void refresh_systray_icon() for (l = systray.list_icons; l ; l = l->next) { traywin = (TrayWindow*)l->data; if (traywin->hide) continue; - if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) - systray_render_icon(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); - } + systray_render_icon(traywin); } }