X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fsystray%2Fsystraybar.c;h=22fc50ba978a126ee7d328b001f7019d25cfeb72;hb=616c9da1e11226d2b98478ee644d12339489813a;hp=cc1412294ffa75737704b680d5c817ffb125cdf5;hpb=e050df33d29de6f7890b7111f6ea871aa5247743;p=chaz%2Ftint2 diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c index cc14122..22fc50b 100644 --- a/src/systray/systraybar.c +++ b/src/systray/systraybar.c @@ -56,18 +56,18 @@ static Pixmap render_background; 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() { -printf("*** cleanup_systray()\n"); + stop_net(); systray_enabled = 0; systray_max_icon_size = 0; systray.area.on_screen = 0; @@ -90,106 +90,35 @@ void init_systray() systray.alpha = 100; systray.brightness = systray.saturation = 0; } - systray.area.resize = 1; - systray.area.redraw = 1; - systray.area.on_screen = 1; - refresh_systray = 0; } void init_systray_panel(void *p) { - Panel *panel =(Panel*)p; - - if (panel_horizontal) { - 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.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 draw_systray(void *obj, cairo_t *c) -{ - 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, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0); - } - - refresh_systray = 1; -} - - -void resize_systray(void *obj) -{ - Systraybar *sysbar = obj; - Panel *panel = sysbar->area.panel; - TrayWindow *traywin; + GSList *l; - 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.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; + int count = 0; for (l = systray.list_icons; l ; l = l->next) { if (!((TrayWindow*)l->data)->hide) count++; } - //printf("count %d\n", count); - - if (panel_horizontal) { - if (!count) systray.area.width = 0; - else { - 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; - if (panel->clock.area.on_screen) - systray.area.posx -= (panel->clock.area.width + panel->area.paddingx); -#ifdef ENABLE_BATTERY - if (panel->battery.area.on_screen) - systray.area.posx -= (panel->battery.area.width + panel->area.paddingx); -#endif - } - else { - if (!count) systray.area.height = 0; - else { - 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); - } + if (count == 0) + hide(&systray.area); + else + show(&systray.area); + refresh_systray = 0; +} - 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 - if (panel->battery.area.on_screen) - systray.area.posy += (panel->battery.area.height + panel->area.paddingx); -#endif - } +void draw_systray(void *obj, cairo_t *c) +{ + // here, sysbar's position is defined. so we can calculate position of tray icon. + Systraybar *sysbar = obj; + Panel *panel = sysbar->area.panel; int i, posx, posy; - int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +marging/2; + int start = panel->area.bg->border.width + panel->area.paddingy + systray.area.bg->border.width + systray.area.paddingy +sysbar->marging/2; if (panel_horizontal) { posy = start; posx = systray.area.posx + systray.area.bg->border.width + systray.area.paddingxlr; @@ -199,37 +128,85 @@ void resize_systray(void *obj) posy = systray.area.posy + systray.area.bg->border.width + systray.area.paddingxlr; } + TrayWindow *traywin; + GSList *l; for (i=1, l = systray.list_icons; l ; i++, l = l->next) { traywin = (TrayWindow*)l->data; if (traywin->hide) continue; traywin->y = posy; traywin->x = posx; - traywin->width = icon_size; - traywin->height = icon_size; + traywin->width = sysbar->icon_size; + traywin->height = sysbar->icon_size; if (panel_horizontal) { - if (i % icons_per_column) - posy += icon_size + sysbar->area.paddingx; + if (i % sysbar->icons_per_column) + posy += sysbar->icon_size + sysbar->area.paddingx; else { posy = start; - posx += (icon_size + systray.area.paddingx); + posx += (sysbar->icon_size + systray.area.paddingx); } } else { - if (i % icons_per_row) - posx += icon_size + systray.area.paddingx; + if (i % sysbar->icons_per_row) + posx += sysbar->icon_size + systray.area.paddingx; else { posx = start; - posy += (icon_size + systray.area.paddingx); + posy += (sysbar->icon_size + systray.area.paddingx); } } // position and size the icon window - XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, icon_size, icon_size); - XResizeWindow(server.dsp, traywin->tray_id, icon_size, icon_size); + XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, sysbar->icon_size, sysbar->icon_size); + XResizeWindow(server.dsp, traywin->tray_id, sysbar->icon_size, sysbar->icon_size); + } + + 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, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0); + } + + refresh_systray = 1; +} + + +int resize_systray(void *obj) +{ + Systraybar *sysbar = obj; + GSList *l; + int count; + + if (panel_horizontal) + sysbar->icon_size = sysbar->area.height; + else + sysbar->icon_size = sysbar->area.width; + sysbar->icon_size = sysbar->icon_size - (2 * sysbar->area.bg->border.width) - (2 * sysbar->area.paddingy); + if (systray_max_icon_size > 0 && sysbar->icon_size > systray_max_icon_size) + sysbar->icon_size = systray_max_icon_size; + count = 0; + for (l = systray.list_icons; l ; l = l->next) { + if (!((TrayWindow*)l->data)->hide) + count++; } - // resize force the redraw - systray.area.redraw = 1; + //printf("count %d\n", count); + + if (panel_horizontal) { + int height = sysbar->area.height - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; + // here icons_per_column always higher than 0 + sysbar->icons_per_column = (height+sysbar->area.paddingx) / (sysbar->icon_size+sysbar->area.paddingx); + sysbar->marging = height - (sysbar->icons_per_column-1)*(sysbar->icon_size+sysbar->area.paddingx) - sysbar->icon_size; + sysbar->icons_per_row = count / sysbar->icons_per_column + (count%sysbar->icons_per_column != 0); + systray.area.width = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (sysbar->icon_size * sysbar->icons_per_row) + ((sysbar->icons_per_row-1) * systray.area.paddingx); + } + else { + int width = sysbar->area.width - 2*sysbar->area.bg->border.width - 2*sysbar->area.paddingy; + // here icons_per_row always higher than 0 + sysbar->icons_per_row = (width+sysbar->area.paddingx) / (sysbar->icon_size+sysbar->area.paddingx); + sysbar->marging = width - (sysbar->icons_per_row-1)*(sysbar->icon_size+sysbar->area.paddingx) - sysbar->icon_size; + sysbar->icons_per_column = count / sysbar->icons_per_row+ (count%sysbar->icons_per_row != 0); + systray.area.height = (2 * systray.area.bg->border.width) + (2 * systray.area.paddingxlr) + (sysbar->icon_size * sysbar->icons_per_column) + ((sysbar->icons_per_column-1) * systray.area.paddingx); + } + return 1; } @@ -278,7 +255,7 @@ void start_net() // 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)) @@ -374,8 +351,11 @@ gboolean add_icon(Window id) if ( XGetWindowAttributes(server.dsp, id, &attr) == False ) return FALSE; unsigned long mask = 0; XSetWindowAttributes set_attr; - printf("icon with depth: %d\n", attr.depth); + 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; @@ -386,7 +366,7 @@ 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); @@ -436,7 +416,6 @@ 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; @@ -444,13 +423,15 @@ gboolean add_icon(Window id) traywin->depth = attr.depth; traywin->damage = 0; + if (systray.area.on_screen == 0) + show(&systray.area); + if (systray.sort == 3) systray.list_icons = g_slist_prepend(systray.list_icons, traywin); else if (systray.sort == 2) systray.list_icons = g_slist_append(systray.list_icons, traywin); else systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows); - systray.area.resize = 1; //printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons)); // watch for the icon trying to resize itself! @@ -466,8 +447,8 @@ gboolean add_icon(Window id) if (!traywin->hide && !panel->is_hidden) XMapRaised(server.dsp, traywin->id); - // changed in systray force resize on panel - panel->area.resize = 1; + // changed in systray + systray.area.resize = 1; panel_refresh = 1; return TRUE; } @@ -477,10 +458,8 @@ 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; //printf("remove_icon id %lx, %d\n", traywin->id); XSelectInput(server.dsp, traywin->tray_id, NoEventMask); @@ -500,9 +479,18 @@ void remove_icon(TrayWindow *traywin) stop_timeout(traywin->render_timeout); g_free(traywin); - // changed in systray force resize on panel - Panel *panel = systray.area.panel; - panel->area.resize = 1; + // check empty systray + int count = 0; + GSList *l; + for (l = systray.list_icons; l ; l = l->next) { + if (!((TrayWindow*)l->data)->hide) + count++; + } + if (count == 0) + hide(&systray.area); + + // changed in systray + systray.area.resize = 1; panel_refresh = 1; } @@ -559,10 +547,10 @@ void systray_render_icon_now(void* t) 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); @@ -577,6 +565,8 @@ void systray_render_icon_now(void* t) 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) {