updateClass();
updateStrut();
updateIcons();
+ updateKwmIcon();
// this makes sure that these windows appear on all desktops
if (/*_type == Type_Dock ||*/ _type == Type_Desktop)
} else // no group!
_group = None;
+ if (hints->flags & IconPixmapHint) {
+ updateKwmIcon(); // try get the kwm icon first, this is a fallback only
+ if (_pixmap_icon == None) {
+ _pixmap_icon = hints->icon_pixmap;
+ if (hints->flags & IconMaskHint)
+ _pixmap_icon_mask = hints->icon_mask;
+ else
+ _pixmap_icon_mask = None;
+ }
+ }
+
XFree(hints);
}
if (frame) frame->adjustIcon();
}
+void Client::updateKwmIcon()
+{
+ _pixmap_icon = _pixmap_icon_mask = None;
+
+ unsigned long num = 2;
+ Pixmap *data;
+ if (otk::Property::get(_window, otk::Property::atoms.kwm_win_icon,
+ otk::Property::atoms.kwm_win_icon, &num, &data)) {
+ if (num >= 2) {
+ _pixmap_icon = data[0];
+ _pixmap_icon_mask = data[1];
+ }
+ delete [] data;
+ }
+}
+
void Client::propertyHandler(const XPropertyEvent &e)
{
otk::EventHandler::propertyHandler(e);
updateStrut();
else if (e.atom == otk::Property::atoms.net_wm_icon)
updateIcons();
+ else if (e.atom == otk::Property::atoms.kwm_win_icon)
+ updateKwmIcon();
}
void Client::setWMState(long state)