From fc04f152a6041cc8459549e741b2b05dccbdff58 Mon Sep 17 00:00:00 2001 From: Andreas Fink Date: Sat, 30 Jan 2010 23:06:07 +0000 Subject: [PATCH] *fix* maybe issue 212 --- src/config.c | 3 --- src/systray/systraybar.c | 29 +++++++++++++++-------------- src/taskbar/taskbar.c | 2 +- src/tint.c | 2 +- 4 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/config.c b/src/config.c index c159a30..b436214 100644 --- a/src/config.c +++ b/src/config.c @@ -87,9 +87,6 @@ void init_config() pango_font_description_free(panel_config.g_task.font_desc); } memset(&panel_config, 0, sizeof(Panel)); - int i; - for (i=0; irender_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); + } } @@ -559,16 +570,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 { - // 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); - } + systray_render_icon(traywin); } } diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c index feeb18c..02c5c8e 100644 --- a/src/taskbar/taskbar.c +++ b/src/taskbar/taskbar.c @@ -64,7 +64,7 @@ void init_taskbar() panel->g_taskbar.area.bg = panel->g_taskbar.bg; } if (panel->g_taskbar.bg_active == 0) - panel->g_taskbar.bg_active = &g_array_index(backgrounds, Background, 0); + panel->g_taskbar.bg_active = panel->g_taskbar.bg; if (panel->g_task.area.bg == 0) panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0); diff --git a/src/tint.c b/src/tint.c index 502c7b1..fef466a 100644 --- a/src/tint.c +++ b/src/tint.c @@ -821,7 +821,7 @@ int main (int argc, char *argv[]) XDamageNotifyEvent* de = &event_union.de; for (l = systray.list_icons; l ; l = l->next) { traywin = (TrayWindow*)l->data; - if ( traywin->id == de->drawable && !de->more ) { + if ( traywin->id == de->drawable ) { systray_render_icon(traywin); break; } -- 2.45.2