X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fframe.hh;h=45916a1d9a3b1391bc02b92a15eaff947d2f85f4;hb=afe1d9e3a88610d5d3ae351dd2648aedfd2537b2;hp=c5a9a312adc28c5c7c84d92c65f6c8d85c7d2967;hpb=f89831466220b6219a15fa3e670149191055ba5a;p=chaz%2Fopenbox

diff --git a/src/frame.hh b/src/frame.hh
index c5a9a312..45916a1d 100644
--- a/src/frame.hh
+++ b/src/frame.hh
@@ -9,6 +9,7 @@ extern "C" {
 #include <X11/Xlib.h>
 }
 
+#include "client.hh"
 #include "python.hh"
 #include "otk/strut.hh"
 #include "otk/rect.hh"
@@ -22,8 +23,6 @@ extern "C" {
 
 namespace ob {
 
-class Client;
-
 //! Varius geometry settings in the frame decorations
 struct FrameGeometry {
   int width; // title and handle
@@ -66,6 +65,9 @@ private:
   otk::Rect _area;
 
   bool _visible;
+
+  //! The decorations that are being displayed in the frame.
+  Client::DecorationFlags _decorations;
   
   // decoration windows
   Window  _frame;   // sits under everything
@@ -93,7 +95,7 @@ private:
   otk::Surface  *_icon_sur;
   otk::Surface  *_close_sur;
 
-  std::string _layout; // layout of the titlebar
+  otk::ustring _layout; // layout of the titlebar
 
   bool _max_press;
   bool _desk_press;
@@ -144,6 +146,7 @@ public:
   void adjustState();
   void adjustFocus();
   void adjustTitle();
+  void adjustIcon();
 
   //! Applies gravity to the client's position to find where the frame should
   //! be positioned.