support for pixmap icons, kwm_win_icon and the icon in wmhints

[chaz/openbox] / src / frame.cc

diff --git a/src/frame.cc b/src/frame.cc
index d1c206e75cb4d22e7a70973f569cf498851ca760..23742be8496dad705a7bc9bb5f8d7416d7ff3820 100644 (file)
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -557,6 +557,11 @@ void Frame::renderIcon()
   const Icon *icon = _client->icon(otk::Size(geom.button_size,
                                              geom.button_size));
   control->drawImage(*s, icon->w, icon->h, icon->data);
+  if (!icon->data) {
+    Pixmap p = _client->pixmapIcon(), m = _client->pixmapIconMask();
+    if (p != None)
+      control->drawImage(*s, p, m);
+  }
 
   XSetWindowBackgroundPixmap(**otk::display, _icon, s->pixmap());
   XClearWindow(**otk::display, _icon);