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

Use _NET_WM_ICON from 32bit apps (xfce4-terminal) correctly

Browse source 
The icons coming from _NET_WM_ICON are argb32. fluxbox uses such icons
in entities such as 'clientmenu', 'iconbar', 'titlebar'. These entities
are not related to the depth of the winclient but to fluxbox's default
depth. Using 'winclient.depth()' is a mistake, since fluxbox is unable
to copy pixmaps from 32bit to 24/16/15bit.

It is not necessary either, because fluxbox should extract the argb32 icon
data directly into the pixmap with the correct depth in the first place.

This fixes (reopened) bug #1852693.

Note: The whole icon code in fluxbox is quite messy, lots of copying and
scaling. It might be simpler and fater to just extract the icon when needed
, in just the size that is needed.
This commit is contained in:
Mathias Gumz 2011-08-11 09:48:08 +02:00
parent 822c02e96a
commit 1da473bab9
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Ewmh.cc
View file

@ -198,13 +198,23 @@ void extractNetWmIcon(Atom net_wm_icon, WinClient& winclient) {
Display* dpy = FbTk::App::instance()->display();
int scrn = winclient.screen().screenNumber();
// the icon will not be used by the client but by
// 'menu', 'iconbar', 'titlebar'. all these entities
// are created based upon the rootwindow and
// the default depth. if we would use winclient.depth()
// and winclient.drawable() here we might get into trouble
// (xfce4-terminal, skype .. 32bit visuals vs 24bit fluxbox
// entities)
Drawable parent = winclient.screen().rootWindow().drawable();
unsigned int depth = DefaultDepth(dpy, scrn);
// pick the smallest icon size atm
// TODO: find a better criteria
width = icon_data.begin()->first.first;
height = icon_data.begin()->first.second;
// tmp image for the pixmap
XImage* img_pm = XCreateImage(dpy, DefaultVisual(dpy, scrn), winclient.depth(),
XImage* img_pm = XCreateImage(dpy, DefaultVisual(dpy, scrn), depth,
ZPixmap,
0, NULL, width, height, 32, 0);
if (!img_pm) {
@ -280,8 +290,8 @@ void extractNetWmIcon(Atom net_wm_icon, WinClient& winclient) {
// the final icon
FbTk::PixmapWithMask icon;
icon.pixmap() = FbTk::FbPixmap(winclient.drawable(), width, height, winclient.depth());
icon.mask() = FbTk::FbPixmap(winclient.drawable(), width, height, 1);
icon.pixmap() = FbTk::FbPixmap(parent, width, height, depth);
icon.mask() = FbTk::FbPixmap(parent, width, height, 1);
FbTk::GContext gc_pm(icon.pixmap());
FbTk::GContext gc_mask(icon.mask());