nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert r751 and add workaround for systray rendering artifacts

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@755 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
o9000 2015-04-13 20:18:28 +00:00 committed by mrovi9000@gmail.com
parent d95fbdc2b2
commit 45d6463315
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/systray/systraybar.c
View file

@ -41,6 +41,8 @@ GSList *icons;
#define SYSTEM_TRAY_BEGIN_MESSAGE 1 #define SYSTEM_TRAY_BEGIN_MESSAGE 1
#define SYSTEM_TRAY_CANCEL_MESSAGE 2 #define SYSTEM_TRAY_CANCEL_MESSAGE 2
#define FORCE_COMPOSITED_RENDERING 1
// selection window // selection window
Window net_sel_win = None; Window net_sel_win = None;
@ -119,7 +121,7 @@ void init_systray_panel(void *p)
void draw_systray(void *obj, cairo_t *c) void draw_systray(void *obj, cairo_t *c)
{ {
if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { if (FORCE_COMPOSITED_RENDERING || server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
if (render_background) XFreePixmap(server.dsp, render_background); if (render_background) XFreePixmap(server.dsp, render_background);
render_background = XCreatePixmap(server.dsp, server.root_win, systray.area.width, systray.area.height, server.depth); 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); XCopyArea(server.dsp, systray.area.pix, render_background, server.gc, 0, 0, systray.area.width, systray.area.height, 0, 0);
@ -217,9 +219,8 @@ void on_change_systray (void *obj)
} }
// position and size the icon window // position and size the icon window
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); XResizeWindow(server.dsp, traywin->tray_id, sysbar->icon_size, sysbar->icon_size);
traywin->ignore_remaps = 2;
XReparentWindow(server.dsp, traywin->tray_id, ((Panel*)systray.area.panel)->main_win, traywin->x, traywin->y);
} }
} }
@ -272,7 +273,7 @@ void start_net()
long 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); XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
VisualID vid; VisualID vid;
if (server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0)) if (server.visual32 && (FORCE_COMPOSITED_RENDERING || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0))
vid = XVisualIDFromVisual(server.visual32); vid = XVisualIDFromVisual(server.visual32);
else else
vid = XVisualIDFromVisual(server.visual); vid = XVisualIDFromVisual(server.visual);
@ -374,7 +375,7 @@ gboolean add_icon(Window id)
Visual* visual = server.visual; 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, width %d, height %d\n", attr.depth, attr.width, attr.height);
//printf("icon with depth: %d\n", attr.depth); //printf("icon with depth: %d\n", attr.depth);
if (attr.depth != server.depth || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { if (attr.depth != server.depth || FORCE_COMPOSITED_RENDERING || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) {
visual = attr.visual; visual = attr.visual;
set_attr.colormap = attr.colormap; set_attr.colormap = attr.colormap;
set_attr.background_pixel = 0; set_attr.background_pixel = 0;
@ -385,7 +386,8 @@ gboolean add_icon(Window id)
set_attr.background_pixmap = ParentRelative; set_attr.background_pixmap = ParentRelative;
mask = CWBackPixmap; mask = CWBackPixmap;
} }
Window parent_window = panel->main_win; Window parent_window;
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); old = XSetErrorHandler(window_error_handler);
XReparentWindow(server.dsp, id, parent_window, 0, 0); XReparentWindow(server.dsp, id, parent_window, 0, 0);
// watch for the icon trying to resize itself / closing again! // watch for the icon trying to resize itself / closing again!
@ -394,6 +396,7 @@ gboolean add_icon(Window id)
XSetErrorHandler(old); XSetErrorHandler(old);
if (error != FALSE) { if (error != FALSE) {
fprintf(stderr, "tint2 : not icon_swallow\n"); fprintf(stderr, "tint2 : not icon_swallow\n");
XDestroyWindow(server.dsp, parent_window);
return FALSE; return FALSE;
} }
@ -416,6 +419,7 @@ gboolean add_icon(Window id)
} }
else { else {
fprintf(stderr, "tint2 : xembed error\n"); fprintf(stderr, "tint2 : xembed error\n");
XDestroyWindow(server.dsp, parent_window);
return FALSE; return FALSE;
} }
} }
@ -436,6 +440,7 @@ gboolean add_icon(Window id)
} }
traywin = g_new0(TrayWindow, 1); traywin = g_new0(TrayWindow, 1);
traywin->id = parent_window;
traywin->tray_id = id; traywin->tray_id = id;
traywin->hide = hide; traywin->hide = hide;
traywin->depth = attr.depth; traywin->depth = attr.depth;
@ -452,9 +457,16 @@ gboolean add_icon(Window id)
systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows); systray.list_icons = g_slist_insert_sorted(systray.list_icons, traywin, compare_traywindows);
//printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons)); //printf("add_icon id %lx, %d\n", id, g_slist_length(systray.list_icons));
if (FORCE_COMPOSITED_RENDERING || 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 // show the window
if (!traywin->hide) if (!traywin->hide)
XMapWindow(server.dsp, traywin->tray_id); XMapWindow(server.dsp, traywin->tray_id);
if (!traywin->hide && !panel->is_hidden)
XMapRaised(server.dsp, traywin->id);
// changed in systray // changed in systray
systray.area.resize = 1; systray.area.resize = 1;
@ -481,6 +493,7 @@ void remove_icon(TrayWindow *traywin)
if (!traywin->hide) if (!traywin->hide)
XUnmapWindow(server.dsp, traywin->tray_id); XUnmapWindow(server.dsp, traywin->tray_id);
XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0); XReparentWindow(server.dsp, traywin->tray_id, server.root_win, 0, 0);
XDestroyWindow(server.dsp, traywin->id);
XSync(server.dsp, False); XSync(server.dsp, False);
XSetErrorHandler(old); XSetErrorHandler(old);
if (traywin->render_timeout) if (traywin->render_timeout)
@ -604,18 +617,15 @@ void systray_render_icon_now(void* t)
void systray_render_icon(TrayWindow* traywin) void systray_render_icon(TrayWindow* traywin)
{ {
if (server.real_transparency || systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0) { if (FORCE_COMPOSITED_RENDERING || 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 // wine tray icons update whenever mouse is over them, so we limit the updates to 50 ms
if (traywin->render_timeout == 0) if (traywin->render_timeout == 0)
traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin); traywin->render_timeout = add_timeout(50, 0, systray_render_icon_now, traywin);
} }
else { else {
// comment by andreas: I'm still not sure, what exactly we need to do here... Somehow trayicons which do not // Pixmap pix = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, server.depth);
// offer the same depth as tint2 does, need to draw a background pixmap, but this cannot be done with // XCopyArea(server.dsp, panel->temp_pmap, pix, server.gc, traywin->x, traywin->y, traywin->width, traywin->height, 0, 0);
// XCopyArea... So we actually need XRenderComposite??? // XSetWindowBackgroundPixmap(server.dsp, traywin->id, pix);
// 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); XClearArea(server.dsp, traywin->tray_id, 0, 0, traywin->width, traywin->height, True);
} }
} }

2
src/systray/systraybar.h
View file

@ -34,6 +34,7 @@ typedef struct {
typedef struct typedef struct
{ {
Window id;
Window tray_id; Window tray_id;
int x, y; int x, y;
int width, height; int width, height;
@ -42,7 +43,6 @@ typedef struct
int depth; int depth;
Damage damage; Damage damage;
timeout* render_timeout; timeout* render_timeout;
int ignore_remaps;
} TrayWindow; } TrayWindow;

12
src/tint.c
View file

@ -832,9 +832,8 @@ void event_configure_notify (Window win)
traywin = (TrayWindow*)l->data; traywin = (TrayWindow*)l->data;
if (traywin->tray_id == win) { if (traywin->tray_id == win) {
//printf("move tray %d\n", traywin->x); //printf("move tray %d\n", traywin->x);
XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->width); XMoveResizeWindow(server.dsp, traywin->id, traywin->x, traywin->y, traywin->width, traywin->height);
traywin->ignore_remaps = 2; XResizeWindow(server.dsp, traywin->tray_id, traywin->width, traywin->height);
XReparentWindow(server.dsp, traywin->tray_id, ((Panel*)systray.area.panel)->main_win, traywin->x, traywin->y);
panel_refresh = 1; panel_refresh = 1;
return; return;
} }
@ -1265,11 +1264,7 @@ start:
break; break;
for (it = systray.list_icons; it; it = g_slist_next(it)) { for (it = systray.list_icons; it; it = g_slist_next(it)) {
if (((TrayWindow*)it->data)->tray_id == e.xany.window) { if (((TrayWindow*)it->data)->tray_id == e.xany.window) {
if (((TrayWindow*)it->data)->ignore_remaps > 0) {
((TrayWindow*)it->data)->ignore_remaps--;
} else {
remove_icon((TrayWindow*)it->data); remove_icon((TrayWindow*)it->data);
}
break; break;
} }
} }
@ -1413,7 +1408,10 @@ start:
XDamageNotifyEvent* de = &event_union.de; XDamageNotifyEvent* de = &event_union.de;
for (l = systray.list_icons; l ; l = l->next) { for (l = systray.list_icons; l ; l = l->next) {
traywin = (TrayWindow*)l->data; traywin = (TrayWindow*)l->data;
if ( traywin->id == de->drawable ) {
systray_render_icon(traywin); systray_render_icon(traywin);
break;
}
} }
} }
} }