From e15e4a9e03dd7b64004b76ca84b07c12c251f67b Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Fri, 5 Jul 2002 01:24:32 +0000
Subject: make iconified windows uniconify on an XMapRequestEvent. sync with
 blackbox cvs.

---
 src/blackbox.cc | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/blackbox.cc')

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 6af1d2d3..0865b681 100644
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -322,7 +322,12 @@ void Blackbox::process_event(XEvent *e) {
 
     BlackboxWindow *win = searchWindow(e->xmaprequest.window);
 
-    if (! win) {
+    if (win) {
+      if (win->isIconic()) {
+        win->deiconify();
+        win->setInputFocus();
+      }
+    } else {
       BScreen *screen = searchScreen(e->xmaprequest.parent);
 
       if (! screen) {
@@ -444,13 +449,9 @@ void Blackbox::process_event(XEvent *e) {
   case PropertyNotify: {
     last_time = e->xproperty.time;
 
-    if (e->xproperty.state != PropertyDelete) {
-      BlackboxWindow *win = searchWindow(e->xproperty.window);
-
-      if (win)
-        win->propertyNotifyEvent(e->xproperty.atom);
-    }
-
+    BlackboxWindow *win = searchWindow(e->xproperty.window);
+    if (win)
+      win->propertyNotifyEvent(&e->xproperty);
     break;
   }
 
-- 
cgit v1.2.3