From e503323dcf36c7b4c173ddc0cd302b8642361f48 Mon Sep 17 00:00:00 2001
From: Dana Jansens <danakj@orodu.net>
Date: Mon, 11 Nov 2002 10:35:59 +0000
Subject: [PATCH] HRM manageExisting() isnt working!

---
 src/frame.cc   | 3 +--
 src/openbox.cc | 2 ++
 src/screen.cc  | 6 +-----
 src/screen.hh  | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/frame.cc b/src/frame.cc
index b802889a..388dcea6 100644
--- a/src/frame.cc
+++ b/src/frame.cc
@@ -405,7 +405,7 @@ void OBFrame::grabClient()
                OBClient::event_mask);
 
   // raise the client above the frame
-  XRaiseWindow(otk::OBDisplay::display, _client->window());
+  //XRaiseWindow(otk::OBDisplay::display, _client->window());
   // map the client so it maps when the frame does
   XMapWindow(otk::OBDisplay::display, _client->window());
   
@@ -454,7 +454,6 @@ Window OBFrame::createChild(Window parent, Cursor cursor)
   Window w = XCreateWindow(otk::OBDisplay::display, parent, 0, 0, 1, 1, 0,
                            _screen->getDepth(), InputOutput,
                            _screen->getVisual(), create_mask, &attrib_create);
-  XRaiseWindow(otk::OBDisplay::display, w); // raise above the parent
   return w;
 }
 
diff --git a/src/openbox.cc b/src/openbox.cc
index e4dd5cb6..5e0bff0c 100644
--- a/src/openbox.cc
+++ b/src/openbox.cc
@@ -129,6 +129,8 @@ Openbox::Openbox(int argc, char **argv)
 
   // initialize all the screens
   _screens.push_back(new OBScreen(0, _config));
+  _screens[0]->manageExisting();
+  // XXX: "change to" the first workspace on the screen to initialize stuff
   
   _state = State_Normal; // done starting
 }
diff --git a/src/screen.cc b/src/screen.cc
index 3c63aa34..2da8c77a 100644
--- a/src/screen.cc
+++ b/src/screen.cc
@@ -92,10 +92,6 @@ OBScreen::OBScreen(int screen, const otk::Configuration &config)
   // the manageExising() function
   setClientList();     // initialize the client lists, which will be empty
   calcArea();          // initialize the available working area
-
-  manageExisting();
-
-  // XXX: "change to" the first workspace to initialize stuff
 }
 
 
@@ -331,7 +327,7 @@ void OBScreen::manageWindow(Window window)
   XWMHints *wmhint;
   XSetWindowAttributes attrib_set;
 
-  // XXX: manage the window, i.e. grab events n shit
+  printf("Managing Window: %lx\n", window);
 
   // is the window a docking app
   if ((wmhint = XGetWMHints(otk::OBDisplay::display, window))) {
diff --git a/src/screen.hh b/src/screen.hh
index c20e676f..91295f32 100644
--- a/src/screen.hh
+++ b/src/screen.hh
@@ -74,8 +74,6 @@ private:
   StrutList _struts;
 
 
-  //! Manage any pre-existing windows on the screen
-  void manageExisting();
   //! Calculate the OBScreen::_area member
   void calcArea();
   //! Set the client list on the root window
@@ -119,6 +117,8 @@ public:
   //! Loads a new style on the screen
   void loadStyle(const otk::Configuration &config);
 
+  //! Manage any pre-existing windows on the screen
+  void manageExisting();
   //! Manage a client window
   /*!
     This gives the window a frame, reparents it, selects events on it, etc.
-- 
2.45.2