add updateIconTitle

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index f391746c3b90b7156dd54761a93bdccb6b083d3e..4a99b0bc58eecbb27ca21870ae57c743c0a79f80 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -33,7 +33,40 @@ OBClient::OBClient(Window window)
   getArea();
   getDesktop();
   getType();
-  getMwmHints();
+
+  // 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();
 
@@ -42,6 +75,7 @@ OBClient::OBClient(Window window)
   updateWMHints();
   // XXX: updateTransientFor();
   updateTitle();
+  updateIconTitle();
   updateClass();
 
 #ifdef DEBUG
@@ -171,12 +205,10 @@ void OBClient::getType()
     //else
       _type = Type_Normal;
   }
-
-  // set the decorations and functions based on the type of the window
 }
 
 
-void OBClient::getMWMHints()
+void OBClient::getMwmHints()
 {
   const otk::OBProperty *property = Openbox::instance->property();
 
@@ -198,7 +230,7 @@ void OBClient::getMWMHints()
   // Mwm Hints are applied subtractively to what has already been chosen for
   // decor and functionality
 
-  if (hints->flags & MwmDecorations) {
+  if (hints->flags & MwmFlag_Decorations) {
     if (! (hints->decorations & MwmDecor_All)) {
       if (! (hints->decorations & MwmDecor_Border))
         _decorations &= ~Decor_Border;
@@ -213,22 +245,18 @@ void OBClient::getMWMHints()
     }
   }
 
-  _mwm_functions = 0xffffffff; // everything!
-
-  if (hints->flags & MwmFunctions) {
+  if (hints->flags & MwmFlag_Functions) {
     if (! (hints->functions & MwmFunc_All)) {
-      _mwm_functions = hints->functions;
-      
       if (! (hints->functions & MwmFunc_Resize))
-        functions &= ~Func_Resize;
+        _functions &= ~Func_Resize;
       if (! (hints->functions & MwmFunc_Move))
-        functions &= ~Func_Move;
+        _functions &= ~Func_Move;
       if (! (hints->functions & MwmFunc_Iconify))
-        functions &= ~Func_Iconify;
+        _functions &= ~Func_Iconify;
       if (! (hints->functions & MwmFunc_Maximize))
-        functions &= ~Func_Maximize;
-      if (! (hints->functions & MwmFunc_Close))
-        functions &= ~Func_Close;
+        _functions &= ~Func_Maximize;
+      //if (! (hints->functions & MwmFunc_Close))
+      //  _functions &= ~Func_Close;
     }
   }
   delete [] hints;
@@ -301,17 +329,15 @@ void OBClient::updateProtocols()
   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)) {
-        // add the close button/functionality only if the mwm hints didnt
-        // exclude it
-        if (_mwm_functions & MwmFunc_Close) {
-          decorations |= Decor_Close;
-          functions |= Func_Close;
-          // XXX: update the decor?
-        }
+        _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
@@ -415,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();
@@ -443,10 +488,11 @@ 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))