X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=89e5fee029ba76a9ca5d1c96c393ffe93db50863;hb=36c66653da9eb0461ff38ffb3318955bf4b51bf6;hp=dde3dc86d62511c756e850f28289c8c6da91c81f;hpb=381a9697e3d7196409c14823a72d252348ba7497;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index dde3dc8..89e5fee 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" @@ -46,7 +48,7 @@ Window net_sel_win = None; Systraybar systray; int refresh_systray; int systray_enabled; -int systray_max_icon_size = 0; +int systray_max_icon_size; // background pixmap if we render ourselves the icons static Pixmap render_background = 0; @@ -59,6 +61,11 @@ void init_systray() if (!systray_enabled) return; + if (!server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) { + printf("No 32 bit visual for your X implementation. 'systray_asb = 100 0 0' will be forced\n"); + systray.alpha = 100; + systray.brightness = systray.saturation = 0; + } systray.area._draw_foreground = draw_systray; systray.area._resize = resize_systray; systray.area.resize = 1; @@ -88,9 +95,13 @@ void init_systray_panel(void *p) void cleanup_systray() { 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); + if (render_background) { + XFreePixmap(server.dsp, render_background); + render_background = 0; + } } @@ -113,7 +124,7 @@ void resize_systray(void *obj) TrayWindow *traywin; GSList *l; int count, icon_size; - int icons_per_column, icons_per_row, marging; + int icons_per_column=1, icons_per_row=1, marging=0; if (panel_horizontal) icon_size = sysbar->area.height; @@ -133,13 +144,9 @@ void resize_systray(void *obj) if (!count) systray.area.width = 0; else { int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; - icons_per_column = height / (icon_size+sysbar->area.paddingx); - if (icons_per_column) - marging = height - (icons_per_column-1)*(icon_size+sysbar->area.paddingx) - icon_size; - else { - marging = height - icon_size; - icons_per_column = 1; - } + // 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); } @@ -156,13 +163,9 @@ void resize_systray(void *obj) if (!count) systray.area.height = 0; else { int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; - icons_per_row = width / (icon_size+sysbar->area.paddingx); - if (icons_per_row) - marging = width - (icons_per_row-1)*(icon_size+sysbar->area.paddingx) - icon_size; - else { - marging = width - icon_size; - icons_per_row = 1; - } + // 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); } @@ -177,12 +180,13 @@ void resize_systray(void *obj) } 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 = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; + posy = start; posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr; } else { - posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; + posx = start; posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr; } @@ -198,7 +202,7 @@ void resize_systray(void *obj) if (i % icons_per_column) posy += icon_size + sysbar->area.paddingx; else { - posy = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; + posy = start; posx += (icon_size + systray.area.paddingx); } } @@ -206,7 +210,7 @@ void resize_systray(void *obj) if (i % icons_per_row) posx += icon_size + systray.area.paddingx; else { - posx = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; + posx = start; posy += (icon_size + systray.area.paddingx); } } @@ -215,6 +219,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; } @@ -265,7 +271,11 @@ void start_net() // 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); + VisualID vid; + if (server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) + vid = XVisualIDFromVisual(server.visual32); + else + 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); @@ -352,10 +362,11 @@ gboolean add_icon(Window id) error = FALSE; XWindowAttributes attr; - XGetWindowAttributes(server.dsp, id, &attr); + if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE; 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 || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { set_attr.colormap = attr.colormap; set_attr.background_pixel = 0; set_attr.border_pixel = 0; @@ -416,6 +427,7 @@ gboolean add_icon(Window id) 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; @@ -430,21 +442,20 @@ 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! 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, XDamageReportNonEmpty); + traywin->damage = XDamageCreate(server.dsp, traywin->id, XDamageReportRawRectangles); XCompositeRedirectWindow(server.dsp, traywin->id, CompositeRedirectManual); } // 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; @@ -457,10 +468,10 @@ void remove_icon(TrayWindow *traywin) { 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; - systray.area.redraw = 1; //printf("remove_icon id %lx, %d\n", traywin->id); XSelectInput(server.dsp, traywin->tray_id, NoEventMask); @@ -471,11 +482,13 @@ 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); XSetErrorHandler(old); + if (traywin->render_timeout) + stop_timeout(traywin->render_timeout); g_free(traywin); // changed in systray force resize on panel @@ -513,6 +526,8 @@ 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 + // we made also sure, that we always have a 32 bit visual, i.e. we can safely create 32 bit pixmaps here TrayWindow* traywin = t; traywin->render_timeout = 0; @@ -520,8 +535,35 @@ 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, 32); + 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; + 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); + 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); + XRenderFreePicture(server.dsp, pict_drawable); + // end of the ugly hack and we can continue as before + + imlib_context_set_visual(server.visual32); + imlib_context_set_colormap(server.colormap32); + 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; @@ -535,26 +577,35 @@ void systray_render_icon_now(void* t) adjust_asb(data, traywin->width, traywin->height, systray.alpha, (float)systray.saturation/100, (float)systray.brightness/100); imlib_image_put_back_data(data); XCopyArea(server.dsp, render_background, systray.area.pix, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x-systray.area.posx, traywin->y-systray.area.posy); - if ( !real_transparency ) { - imlib_context_set_drawable(systray.area.pix); - imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy); - } - else { - render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height); - } + render_image(systray.area.pix, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height); 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); + imlib_context_set_visual(server.visual); + imlib_context_set_colormap(server.colormap); - 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); + } } @@ -565,9 +616,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); } }