should fixed issue 208

[chaz/tint2] / src / systray / systraybar.c

diff --git a/src/systray/systraybar.c b/src/systray/systraybar.c
index b92f38b10008cf9176b2880534c0a8fbd489e324..2e34f3e63a5353d10035c76387bab190903a7250 100644 (file)
--- a/src/systray/systraybar.c
+++ b/src/systray/systraybar.c
@@ -73,12 +73,12 @@ 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;
@@ -94,15 +94,14 @@ void cleanup_systray()
 }
 
 
-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 (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;
 }
 
@@ -113,14 +112,14 @@ 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;
        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 +132,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 +151,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 +168,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 +188,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 +208,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;
 }
 
 
@@ -362,6 +368,7 @@ gboolean add_icon(Window id)
        XSetErrorHandler(old);
        if (error != FALSE) {
                fprintf(stderr, "tint2 : not icon_swallow\n");
+               XDestroyWindow(server.dsp, parent_window);
                return FALSE;
        }
 
@@ -384,6 +391,7 @@ gboolean add_icon(Window id)
                }
                else {
                        fprintf(stderr, "tint2 : xembed error\n");
+                       XDestroyWindow(server.dsp, parent_window);
                        return FALSE;
                }
        }
@@ -417,7 +425,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!
@@ -428,10 +435,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;
@@ -447,7 +454,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,7 +464,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);
@@ -521,18 +527,19 @@ void systray_render_icon_now(void* t)
        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);
+       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.pmap);
+               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.pmap, 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.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, 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();
 
-       XDamageSubtract(server.dsp, traywin->damage, None, None);
+       if (traywin->damage)
+               XDamageSubtract(server.dsp, traywin->damage, None, None);
        XFlush(server.dsp);
 }
 
@@ -554,7 +561,14 @@ void refresh_systray_icon()
                if (traywin->hide) continue;
                if (real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)
                        systray_render_icon(traywin);
-               else
+               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);
+               }
        }
 }