X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=c3ab3c63a8740f25f677c38aa7c977fae1195b9b;hb=7175ac2b5aec7aface6a2f86df32dd0386e0cc05;hp=34edff3e6e99444e9049006b4e4a3a41a0bbf451;hpb=34cd50ec5173e350b1d8b350fade2948c50113ee;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index 34edff3e..c3ab3c63 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -72,6 +72,10 @@ OBClient::~OBClient()
 {
   const otk::OBProperty *property = Openbox::instance->property();
 
+  // clean up parents reference to this
+  if (_transient_for)
+    _transient_for->_transients.remove(this); // remove from old parent
+  
   if (Openbox::instance->state() != Openbox::State_Exiting) {
     // these values should not be persisted across a window unmapping/mapping
     property->erase(_window, otk::OBProperty::net_wm_desktop);
@@ -85,11 +89,17 @@ void OBClient::getDesktop()
   const otk::OBProperty *property = Openbox::instance->property();
 
   // defaults to the current desktop
-  _desktop = 0; // XXX: change this to the current desktop!
-
-  property->get(_window, otk::OBProperty::net_wm_desktop,
-                otk::OBProperty::Atom_Cardinal,
-                &_desktop);
+  _desktop = Openbox::instance->screen(_screen)->desktop();
+
+  if (!property->get(_window, otk::OBProperty::net_wm_desktop,
+                     otk::OBProperty::Atom_Cardinal,
+                     (long unsigned*)&_desktop)) {
+    // make sure the hint exists
+    Openbox::instance->property()->set(_window,
+                                       otk::OBProperty::net_wm_desktop,
+                                       otk::OBProperty::Atom_Cardinal,
+                                       (unsigned)_desktop);
+  }
 }
 
 
@@ -134,6 +144,8 @@ void OBClient::getType()
 //               property->atom(otk::OBProperty::kde_net_wm_window_type_override))
 //        mwm_decorations = 0; // prevent this window from getting any decor
       // XXX: make this work again
+      if (_type != (WindowType) -1)
+        break; // grab the first known type
     }
     delete val;
   }
@@ -647,8 +659,17 @@ void OBClient::setDesktop(long target)
   assert(target >= 0 || target == (signed)0xffffffff);
   //assert(target == 0xffffffff || target < MAX);
 
-  // XXX: move the window to the new desktop (and set root property)
+  if (!(target >= 0 || target == (signed)0xffffffff)) return;
+  
   _desktop = target;
+
+  Openbox::instance->property()->set(_window,
+                                     otk::OBProperty::net_wm_desktop,
+                                     otk::OBProperty::Atom_Cardinal,
+                                     (unsigned)_desktop);
+  
+  
+  // XXX: move the window to the new desktop
 }
 
 
@@ -871,15 +892,23 @@ void OBClient::clientMessageHandler(const XClientMessageEvent &e)
       setDesktop(e.data.l[0]); // use the original event
   } else if (e.message_type == property->atom(otk::OBProperty::net_wm_state)) {
     // can't compress these
+#ifdef DEBUG
+    printf("net_wm_state for 0x%lx\n", _window);
+#endif
     setState((StateAction)e.data.l[0], e.data.l[1], e.data.l[2]);
   } else if (e.message_type ==
              property->atom(otk::OBProperty::net_close_window)) {
+#ifdef DEBUG
+    printf("net_close_window for 0x%lx\n", _window);
+#endif
     close();
   } else if (e.message_type ==
              property->atom(otk::OBProperty::net_active_window)) {
+#ifdef DEBUG
+    printf("net_active_window for 0x%lx\n", _window);
+#endif
     focus();
     Openbox::instance->screen(_screen)->restack(true, this); // raise
-  } else {
   }
 }
 
@@ -1101,7 +1130,7 @@ void OBClient::unfocus()
 void OBClient::focusHandler(const XFocusChangeEvent &e)
 {
 #ifdef    DEBUG
-  printf("FocusIn for 0x%lx\n", e.window);
+//  printf("FocusIn for 0x%lx\n", e.window);
 #endif // DEBUG
   
   OtkEventHandler::focusHandler(e);
@@ -1116,7 +1145,7 @@ void OBClient::focusHandler(const XFocusChangeEvent &e)
 void OBClient::unfocusHandler(const XFocusChangeEvent &e)
 {
 #ifdef    DEBUG
-  printf("FocusOut for 0x%lx\n", e.window);
+//  printf("FocusOut for 0x%lx\n", e.window);
 #endif // DEBUG
   
   OtkEventHandler::unfocusHandler(e);
@@ -1124,10 +1153,8 @@ void OBClient::unfocusHandler(const XFocusChangeEvent &e)
   frame->unfocus();
   _focused = false;
 
-  if (Openbox::instance->focusedClient() == this) {
-    printf("UNFOCUSED!\n");
-    Openbox::instance->setFocusedClient(this);
-  }
+  if (Openbox::instance->focusedClient() == this)
+    Openbox::instance->setFocusedClient(0);
 }
 
 
@@ -1249,17 +1276,4 @@ void OBClient::reparentHandler(const XReparentEvent &e)
   Openbox::instance->screen(_screen)->unmanageWindow(this);
 }
 
-
-void OBClient::mapRequestHandler(const XMapRequestEvent &e)
-{
-  printf("\nMAP REQUEST\n\n");
-  
-  otk::OtkEventHandler::mapRequestHandler(e);
-
-  if (_shaded)
-    shade(false);
-  // XXX: uniconify the window
-  focus();
-}
-
 }