X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=1c1eb60e94340224f161393b57cd3ba59309993d;hb=27c5d8b3d159ddccad61981ac0559bdfe1f1e4fa;hp=4296435fedf9d2cc737a7543823d05534c17b5c3;hpb=d3ffd17946b172b64b2abc646176510a0773bc5f;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index 4296435..1c1eb60 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" @@ -112,8 +114,8 @@ void resize_systray(void *obj) Panel *panel = sysbar->area.panel; TrayWindow *traywin; GSList *l; - int count, posx, posy; - int icon_size; + int count, icon_size; + int icons_per_column=1, icons_per_row=1, marging=0; if (panel_horizontal) icon_size = sysbar->area.height; @@ -132,9 +134,12 @@ void resize_systray(void *obj) if (panel_horizontal) { if (!count) systray.area.width = 0; else { - int icons_per_column = (sysbar->area.height - 2*sysbar->area.bg->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.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * row_count) + ((row_count-1) * systray.area.paddingx); + 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); } systray.area.posx = panel->area.width - panel->area.bg->border.width - panel->area.paddingxlr - systray.area.width; @@ -148,9 +153,12 @@ void resize_systray(void *obj) else { if (!count) systray.area.height = 0; else { - int icons_per_row = (sysbar->area.width - 2*sysbar->area.bg->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.bg->border.width) + (2 * systray.area.paddingxlr) + (icon_size * column_count) + ((column_count-1) * systray.area.paddingx); + 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); } systray.area.posy = panel->area.bg->border.width + panel->area.paddingxlr; @@ -162,19 +170,18 @@ void resize_systray(void *obj) #endif } - int max_line_pos; + 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) { - max_line_pos = sysbar->area.posy+sysbar->area.height - sysbar->area.bg->border.width - sysbar->area.paddingy - icon_size; - posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy; + posy = start; posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr; } else { - max_line_pos = sysbar->area.posx+sysbar->area.width - sysbar->area.bg->border.width - sysbar->area.paddingy - icon_size; - posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy; + posx = start; posy = systray.area.posy + systray.area.bg->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; @@ -183,19 +190,19 @@ void resize_systray(void *obj) traywin->width = icon_size; traywin->height = icon_size; if (panel_horizontal) { - if (posy + icon_size + sysbar->area.paddingxlr < max_line_pos) + if (i % icons_per_column) posy += icon_size + sysbar->area.paddingx; else { + posy = start; posx += (icon_size + systray.area.paddingx); - posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy; } } else { - if (posx + icon_size + sysbar->area.paddingxlr < max_line_pos) + if (i % icons_per_row) posx += icon_size + systray.area.paddingx; else { + posx = start; posy += (icon_size + systray.area.paddingx); - posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy; } } @@ -203,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; } @@ -418,7 +427,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! @@ -429,10 +437,10 @@ gboolean add_icon(Window id) } // show the window - if (!traywin->hide) { - XMapRaised(server.dsp, traywin->tray_id); + 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->area.resize = 1; @@ -448,7 +456,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); @@ -459,7 +466,7 @@ void remove_icon(TrayWindow *traywin) error = FALSE; old = XSetErrorHandler(window_error_handler); if (!traywin->hide) - XUnmapWindow(server.dsp, traywin->id); + 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); @@ -508,15 +515,32 @@ 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 = XRenderFindVisualFormat(server.dsp, DefaultVisual(server.dsp, 0)); + else + f = XRenderFindVisualFormat(server.dsp, server.visual); + 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) @@ -532,17 +556,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); + } } @@ -553,9 +590,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 - XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True); + systray_render_icon(traywin); } }