X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=9592fdc9e58c2b416a37e2163e39e323f3d10b78;hb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;hp=454245af3456192777349a34e3c2a7dbb2d9ee2e;hpb=c1041d7d49d93ed151830bdd93e9b007622d2578;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index 454245a..9592fdc 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" @@ -40,17 +42,41 @@ GSList *icons; #define SYSTEM_TRAY_CANCEL_MESSAGE 2 // selection window -Window net_sel_win = None, hint_win = None; +Window net_sel_win = None; // freedesktop specification doesn't allow multi systray 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; +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() { @@ -59,8 +85,11 @@ void init_systray() if (!systray_enabled) return; - systray.area._draw_foreground = draw_systray; - systray.area._resize = resize_systray; + 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.resize = 1; systray.area.redraw = 1; systray.area.on_screen = 1; @@ -73,54 +102,44 @@ void init_systray_panel(void *p) Panel *panel =(Panel*)p; if (panel_horizontal) { - systray.area.posy = panel->area.pix.border.width + panel->area.paddingy; + systray.area.posy = panel->area.bg->border.width + panel->area.paddingy; systray.area.height = panel->area.height - (2 * systray.area.posy); } else { - systray.area.posx = panel->area.pix.border.width + panel->area.paddingy; - systray.area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy); + systray.area.posx = panel->area.bg->border.width + panel->area.paddingy; + systray.area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy); } systray.area.parent = p; systray.area.panel = p; } -void cleanup_systray() -{ - systray_enabled = 0; - systray.area.on_screen = 0; - free_area(&systray.area); - if (render_background) XFreePixmap(server.dsp, render_background); -} - - -void draw_systray(void *obj, cairo_t *c, int active) +void draw_systray(void *obj, cairo_t *c) { - 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) { 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.pmap, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0); + XCopyArea(server.dsp, systray.area.pix, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0); } - // tint2 don't draw systray icons. just the background. refresh_systray = 1; } -void resize_systray(void *obj) +int resize_systray(void *obj) { Systraybar *sysbar = 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; else icon_size = sysbar->area.width; - icon_size = icon_size - (2 * sysbar->area.pix.border.width) - (2 * sysbar->area.paddingy); + icon_size = icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy); if (systray_max_icon_size > 0 && icon_size > systray_max_icon_size) icon_size = systray_max_icon_size; count = 0; @@ -133,12 +152,15 @@ 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.pix.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.pix.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.pix.border.width - panel->area.paddingxlr - systray.area.width; + 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 @@ -149,12 +171,15 @@ void resize_systray(void *obj) else { if (!count) systray.area.height = 0; else { - int icons_per_row = (sysbar->area.width - 2*sysbar->area.pix.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.pix.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.pix.border.width + panel->area.paddingxlr; + 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 @@ -163,19 +188,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.pix.border.width - sysbar->area.paddingy - icon_size; - posy = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy; - posx = systray.area.posx + systray.area.pix.border.width + systray.area.paddingxlr; + 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.pix.border.width - sysbar->area.paddingy - icon_size; - posx = panel->area.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy; - posy = systray.area.posy + systray.area.pix.border.width + systray.area.paddingxlr; + 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; @@ -184,19 +208,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.pix.border.width + panel->area.paddingy + systray.area.pix.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.pix.border.width + panel->area.paddingy + systray.area.pix.border.width + systray.area.paddingy; } } @@ -204,6 +228,7 @@ 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); } + return 1; } @@ -250,11 +275,15 @@ void start_net() // init systray protocol net_sel_win = XCreateSimpleWindow(server.dsp, server.root_win, -1, -1, 1, 1, 0, 0, 0); - // v0.2 trayer specification. tint2 always horizontal. + // 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 = 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); @@ -341,10 +370,14 @@ 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 ) { + 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; @@ -355,13 +388,14 @@ gboolean add_icon(Window id) 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); XSetErrorHandler(old); if (error != FALSE) { fprintf(stderr, "tint2 : not icon_swallow\n"); + XDestroyWindow(server.dsp, parent_window); return FALSE; } @@ -384,6 +418,7 @@ gboolean add_icon(Window id) } else { fprintf(stderr, "tint2 : xembed error\n"); + XDestroyWindow(server.dsp, parent_window); return FALSE; } } @@ -417,21 +452,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) { + 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); } // 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; @@ -447,7 +481,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); @@ -458,11 +491,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 @@ -498,20 +533,52 @@ void net_message(XClientMessageEvent *e) } } -void systray_render_icon_now(TrayWindow* traywin) +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; // good systray icons support 32 bit depth, but some icons are still 24 bit. // 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 (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); + 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; 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) { @@ -520,25 +587,36 @@ void systray_render_icon_now(TrayWindow* traywin) if (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) 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.pmap, 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.pmap); - imlib_render_image_on_drawable(traywin->x-systray.area.posx, traywin->y-systray.area.posy); - } - else { - render_image(systray.area.pix.pmap, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height); - } - XCopyArea(server.dsp, systray.area.pix.pmap, panel->main_win, server.gc, traywin->x-systray.area.posx, traywin->y-systray.area.posy, traywin->width, traywin->height, traywin->x, traywin->y); + 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); + 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); + 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 (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); + } + 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); + } } @@ -549,12 +627,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->id, 0, 0, traywin->width, traywin->height, True); - } -// -// if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) -// XFlush(server.dsp); + systray_render_icon(traywin); + } }