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

Better error handling in systray rendering and fall back to non-composited rendering in case of errors

Browse source
This commit is contained in:
o9000 2015-06-12 12:24:19 +02:00
parent b4ff007e42
commit 80361a121e
1 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/systray/systraybar.c
View file

@ -88,7 +88,7 @@ void init_systray()
if (!systray_enabled) if (!systray_enabled)
return; return;
systray_composited = !server.disable_transparency && server.visual32; systray_composited = !server.disable_transparency && server.visual32 && server.colormap32;
printf("Systray composited rendering %s\n", systray_composited ? "on" : "off"); printf("Systray composited rendering %s\n", systray_composited ? "on" : "off");
if (!systray_composited) { if (!systray_composited) {
@ -582,8 +582,6 @@ gboolean reparent_icon(TrayWindow *traywin)
void remove_icon(TrayWindow *traywin) void remove_icon(TrayWindow *traywin)
{ {
XErrorHandler old;
// remove from our list // remove from our list
systray.list_icons = g_slist_remove(systray.list_icons, traywin); systray.list_icons = g_slist_remove(systray.list_icons, traywin);
printf("remove_icon: %lu\n", traywin->win); printf("remove_icon: %lu\n", traywin->win);
@ -595,7 +593,7 @@ void remove_icon(TrayWindow *traywin)
// reparent to root // reparent to root
XSync(server.dsp, False); XSync(server.dsp, False);
error = FALSE; error = FALSE;
old = XSetErrorHandler(window_error_handler); XErrorHandler old = XSetErrorHandler(window_error_handler);
if (!traywin->hide) if (!traywin->hide)
XUnmapWindow(server.dsp, traywin->win); XUnmapWindow(server.dsp, traywin->win);
XReparentWindow(server.dsp, traywin->win, server.root_win, 0, 0); XReparentWindow(server.dsp, traywin->win, server.root_win, 0, 0);
@ -715,7 +713,10 @@ void systray_render_icon_composited(void* t)
// so we first render the tray window onto a pixmap, and then we tell imlib2 to use this pixmap as // 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 ;) // 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); Pixmap tmp_pmap = XCreatePixmap(server.dsp, server.root_win, traywin->width, traywin->height, 32);
XRenderPictFormat* f; if (!tmp_pmap) {
goto on_error;
}
XRenderPictFormat *f;
if (traywin->depth == 24) { if (traywin->depth == 24) {
f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24); f = XRenderFindStandardFormat(server.dsp, PictStandardRGB24);
} else if (traywin->depth == 32) { } else if (traywin->depth == 32) {
@ -724,12 +725,32 @@ void systray_render_icon_composited(void* t)
printf("Strange tray icon found with depth: %d\n", traywin->depth); printf("Strange tray icon found with depth: %d\n", traywin->depth);
return; return;
} }
Picture pict_image; XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32);
if (!f || !f32) {
XFreePixmap(server.dsp, tmp_pmap);
goto on_error;
}
XSync(server.dsp, False);
error = FALSE;
XErrorHandler old = XSetErrorHandler(window_error_handler);
//if (server.real_transparency) //if (server.real_transparency)
//pict_image = XRenderCreatePicture(server.dsp, traywin->parent, f, 0, 0); //Picture pict_image = XRenderCreatePicture(server.dsp, traywin->parent, f, 0, 0);
// reverted Rev 407 because here it's breaking alls icon with systray + xcompmgr // reverted Rev 407 because here it's breaking alls icon with systray + xcompmgr
pict_image = XRenderCreatePicture(server.dsp, traywin->win, f, 0, 0); Picture pict_image = XRenderCreatePicture(server.dsp, traywin->win, f, 0, 0);
if (!pict_image) {
XFreePixmap(server.dsp, tmp_pmap);
XSetErrorHandler(old);
goto on_error;
}
Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual32), 0, 0); Picture pict_drawable = XRenderCreatePicture(server.dsp, tmp_pmap, XRenderFindVisualFormat(server.dsp, server.visual32), 0, 0);
if (!pict_drawable) {
XRenderFreePicture(server.dsp, pict_image);
XFreePixmap(server.dsp, tmp_pmap);
XSetErrorHandler(old);
goto on_error;
}
XRenderComposite(server.dsp, PictOpSrc, pict_image, None, pict_drawable, 0, 0, 0, 0, 0, 0, traywin->width, traywin->height); 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_image);
XRenderFreePicture(server.dsp, pict_drawable); XRenderFreePicture(server.dsp, pict_drawable);
@ -739,8 +760,13 @@ void systray_render_icon_composited(void* t)
imlib_context_set_colormap(server.colormap32); imlib_context_set_colormap(server.colormap32);
imlib_context_set_drawable(tmp_pmap); imlib_context_set_drawable(tmp_pmap);
Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 1); Imlib_Image image = imlib_create_image_from_drawable(0, 0, 0, traywin->width, traywin->height, 1);
if (image == 0) if (!image) {
return; imlib_context_set_visual(server.visual);
imlib_context_set_colormap(server.colormap);
XFreePixmap(server.dsp, tmp_pmap);
XSetErrorHandler(old);
goto on_error;
}
imlib_context_set_image(image); imlib_context_set_image(image);
//if (traywin->depth == 24) //if (traywin->depth == 24)
@ -764,6 +790,21 @@ void systray_render_icon_composited(void* t)
if (traywin->damage) if (traywin->damage)
XDamageSubtract(server.dsp, traywin->damage, None, None); XDamageSubtract(server.dsp, traywin->damage, None, None);
XFlush(server.dsp); XFlush(server.dsp);
XSync(server.dsp, False);
XSetErrorHandler(old);
if (error)
goto on_error;
return;
on_error:
printf("systray: rendering error. Disabling compositing and restarting systray...\n");
systray_composited = 0;
stop_net();
start_net();
return;
} }