X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=4a99b0bc58eecbb27ca21870ae57c743c0a79f80;hb=8b041e2f5c2edc6d295697d129cbc65b9bb2c6b7;hp=2279e57fff0a3ce68fb052c05f296c0cd2246c9d;hpb=116c95b887f0dfcdaa0670565979143ec33ced47;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index 2279e57f..4a99b0bc 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -27,17 +27,55 @@ OBClient::OBClient(Window window)
 
   // the state is kinda assumed to be normal. is this right? XXX
   _wmstate = NormalState;
+  // no default decors or functions, each has to be enabled
+  _decorations = _functions = 0;
   
   getArea();
   getDesktop();
   getType();
+
+  // set the decorations and functions
+  switch (_type) {
+  case Type_Normal:
+    // normal windows retain all of the possible decorations and
+    // functionality
+    _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
+                   Decor_Iconify | Decor_Maximize;
+    _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize;
+
+  case Type_Dialog:
+    // dialogs cannot be maximized
+    _decorations &= ~Decor_Maximize;
+    _functions &= ~Func_Maximize;
+    break;
+
+  case Type_Menu:
+  case Type_Toolbar:
+  case Type_Utility:
+    // these windows get less functionality
+    _decorations &= ~(Decor_Iconify | Decor_Handle);
+    _functions &= ~(Func_Iconify | Func_Resize);
+    break;
+
+  case Type_Desktop:
+  case Type_Dock:
+  case Type_Splash:
+    // none of these windows are manipulated by the window manager
+    _decorations = 0;
+    _functions = 0;
+    break;
+  }
+  
+  getMwmHints(); // this fucks (in good ways) with the decors and functions
   getState();
   getShaped();
 
+  updateProtocols();
   updateNormalHints();
   updateWMHints();
   // XXX: updateTransientFor();
   updateTitle();
+  updateIconTitle();
   updateClass();
 
 #ifdef DEBUG
@@ -54,7 +92,8 @@ OBClient::OBClient(Window window)
          "  shaped:        \t%s\t\t  modal:         \t%s\n"
          "  shaded:        \t%s\t\t  iconic:        \t%s\n"
          "  vert maximized:\t%s\t\t  horz maximized:\t%s\n"
-         "  fullscreen:    \t%s\t\t  floating:      \t%s\n",
+         "  fullscreen:    \t%s\t\t  floating:      \t%s\n"
+         "  requested pos: \t%s\n",
          _window,
          _title.c_str(),
          _icon_title.c_str(),
@@ -81,7 +120,8 @@ OBClient::OBClient(Window window)
          _max_vert ? "yes" : "no",
          _max_horz ? "yes" : "no",
          _fullscreen ? "yes" : "no",
-         _floating ? "yes" : "no");
+         _floating ? "yes" : "no",
+         _positioned ? "yes" : "no");
 #endif
 }
 
@@ -168,12 +208,68 @@ void OBClient::getType()
 }
 
 
+void OBClient::getMwmHints()
+{
+  const otk::OBProperty *property = Openbox::instance->property();
+
+  unsigned long num;
+  MwmHints *hints;
+
+  num = MwmHints::elements;
+  if (!property->get(_window, otk::OBProperty::motif_wm_hints,
+                     otk::OBProperty::motif_wm_hints, &num,
+                     (unsigned long **)&hints))
+    return;
+  
+  if (num < MwmHints::elements) {
+    delete [] hints;
+    return;
+  }
+
+  // retrieved the hints
+  // Mwm Hints are applied subtractively to what has already been chosen for
+  // decor and functionality
+
+  if (hints->flags & MwmFlag_Decorations) {
+    if (! (hints->decorations & MwmDecor_All)) {
+      if (! (hints->decorations & MwmDecor_Border))
+        _decorations &= ~Decor_Border;
+      if (! (hints->decorations & MwmDecor_Handle))
+        _decorations &= ~Decor_Handle;
+      if (! (hints->decorations & MwmDecor_Title))
+        _decorations &= ~Decor_Titlebar;
+      if (! (hints->decorations & MwmDecor_Iconify))
+        _decorations &= ~Decor_Iconify;
+      if (! (hints->decorations & MwmDecor_Maximize))
+        _decorations &= ~Decor_Maximize;
+    }
+  }
+
+  if (hints->flags & MwmFlag_Functions) {
+    if (! (hints->functions & MwmFunc_All)) {
+      if (! (hints->functions & MwmFunc_Resize))
+        _functions &= ~Func_Resize;
+      if (! (hints->functions & MwmFunc_Move))
+        _functions &= ~Func_Move;
+      if (! (hints->functions & MwmFunc_Iconify))
+        _functions &= ~Func_Iconify;
+      if (! (hints->functions & MwmFunc_Maximize))
+        _functions &= ~Func_Maximize;
+      //if (! (hints->functions & MwmFunc_Close))
+      //  _functions &= ~Func_Close;
+    }
+  }
+  delete [] hints;
+}
+
+
 void OBClient::getArea()
 {
   XWindowAttributes wattrib;
   assert(XGetWindowAttributes(otk::OBDisplay::display, _window, &wattrib));
 
   _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
+  _border_width = wattrib.border_width;
 }
 
 
@@ -225,6 +321,33 @@ void OBClient::getShaped()
 }
 
 
+void OBClient::updateProtocols()
+{
+  const otk::OBProperty *property = Openbox::instance->property();
+
+  Atom *proto;
+  int num_return = 0;
+
+  _focus_notify = false;
+  _decorations &= ~Decor_Close;
+  _functions &= ~Func_Close;
+
+  if (XGetWMProtocols(otk::OBDisplay::display, _window, &proto, &num_return)) {
+    for (int i = 0; i < num_return; ++i) {
+      if (proto[i] == property->atom(otk::OBProperty::wm_delete_window)) {
+        _decorations |= Decor_Close;
+        _functions |= Func_Close;
+        // XXX: update the decor?
+      } else if (proto[i] == property->atom(otk::OBProperty::wm_take_focus))
+        // if this protocol is requested, then the window will be notified
+        // by the window manager whenever it receives focus
+        _focus_notify = true;
+    }
+    XFree(proto);
+  }
+}
+
+
 void OBClient::updateNormalHints()
 {
   XSizeHints size;
@@ -235,24 +358,33 @@ void OBClient::updateNormalHints()
   _inc_x = _inc_y = 1;
   _base_x = _base_y = 0;
   _min_x = _min_y = 0;
-  _max_x = _max_y = (unsigned) -1;
+  _max_x = _max_y = INT_MAX;
+
+  // XXX: might want to cancel any interactive resizing of the window at this
+  // point..
 
   // get the hints from the window
   if (XGetWMNormalHints(otk::OBDisplay::display, _window, &size, &ret)) {
+    _positioned = (size.flags & (PPosition|USPosition));
+
     if (size.flags & PWinGravity)
       _gravity = size.win_gravity;
+    
     if (size.flags & PMinSize) {
       _min_x = size.min_width;
       _min_y = size.min_height;
     }
+    
     if (size.flags & PMaxSize) {
       _max_x = size.max_width;
       _max_y = size.max_height;
     }
+    
     if (size.flags & PBaseSize) {
       _base_x = size.base_width;
       _base_y = size.base_height;
     }
+    
     if (size.flags & PResizeInc) {
       _inc_x = size.width_inc;
       _inc_y = size.height_inc;
@@ -309,6 +441,25 @@ void OBClient::updateTitle()
 }
 
 
+void OBClient::updateIconTitle()
+{
+  const otk::OBProperty *property = Openbox::instance->property();
+
+  _icon_title = "";
+  
+  // try netwm
+  if (! property->get(_window, otk::OBProperty::net_wm_icon_name,
+                      otk::OBProperty::utf8, &_icon_title)) {
+    // try old x stuff
+    property->get(_window, otk::OBProperty::wm_icon_name,
+                  otk::OBProperty::ascii, &_icon_title);
+  }
+
+  if (_title.empty())
+    _icon_title = _("Unnamed Window");
+}
+
+
 void OBClient::updateClass()
 {
   const otk::OBProperty *property = Openbox::instance->property();
@@ -337,13 +488,17 @@ void OBClient::update(const XPropertyEvent &e)
   else if (e.atom == XA_WM_HINTS)
     updateWMHints();
   else if (e.atom == property->atom(otk::OBProperty::net_wm_name) ||
-           e.atom == property->atom(otk::OBProperty::wm_name) ||
-           e.atom == property->atom(otk::OBProperty::net_wm_icon_name) ||
-           e.atom == property->atom(otk::OBProperty::wm_icon_name))
+           e.atom == property->atom(otk::OBProperty::wm_name))
     updateTitle();
+  else if (e.atom == property->atom(otk::OBProperty::net_wm_icon_name) ||
+           e.atom == property->atom(otk::OBProperty::wm_icon_name))
+    updateIconTitle();
   else if (e.atom == property->atom(otk::OBProperty::wm_class))
     updateClass();
+  else if (e.atom == property->atom(otk::OBProperty::wm_protocols))
+    updateProtocols();
   // XXX: transient for hint
+  // XXX: strut hint
 }