3 files changed, 68 insertions, 54 deletions

diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 9136d20..3a3dc86 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -78,11 +78,9 @@ FbWinFrame::FbWinFrame(BScreen &screen,
                  ButtonMotionMask | ExposureMask |
                  EnterWindowMask | LeaveWindowMask),
     m_bevel(1),
-    m_decoration_mask(DECOR_NORMAL),
     m_use_titlebar(true),
     m_use_tabs(true),
     m_use_handle(true),
-    m_focused(false),
     m_visible(false),
     m_button_pm(0),
     m_tabmode(screen.getDefaultInternalTabs()?INTERNAL:EXTERNAL),
@@ -91,7 +89,6 @@ FbWinFrame::FbWinFrame(BScreen &screen,
     m_need_render(true),
     m_button_size(1),
     m_height_before_shade(1),
-    m_shaded(false),
     m_focused_alpha(AlphaAcc(*theme.focusedTheme(), &FbWinFrameTheme::alpha)),
     m_unfocused_alpha(AlphaAcc(*theme.unfocusedTheme(), &FbWinFrameTheme::alpha)),
     m_shape(m_window, theme->shapePlace()),
@@ -203,8 +200,8 @@ void FbWinFrame::shade() {
         return;
 
     // toggle shade
-    m_shaded = !m_shaded;
-    if (m_shaded) { // i.e. should be shaded now
+    m_state.shaded = !m_state.shaded;
+    if (m_state.shaded) { // i.e. should be shaded now
         m_height_before_shade = m_window.height();
         m_window.resize(m_window.width(), m_titlebar.height());
         alignTabs();
@@ -250,7 +247,7 @@ void FbWinFrame::moveResize(int x, int y, unsigned int width, unsigned int heigh
     if (move && x == window().x() && y == window().y())
         move = false;
 
-    if (resize && (m_shaded || width == FbWinFrame::width() &&
+    if (resize && (m_state.shaded || width == FbWinFrame::width() &&
                                height == FbWinFrame::height()))
         resize = false;
 
@@ -412,7 +409,7 @@ void FbWinFrame::alignTabs() {
 
 void FbWinFrame::notifyMoved(bool clear) {
     // not important if no alpha...
-    unsigned char alpha = getAlpha(m_focused);
+    unsigned char alpha = getAlpha(m_state.focused);
     if (alpha == 255)
         return;
 
@@ -469,14 +466,14 @@ void FbWinFrame::clearAll() {
 }
 
 void FbWinFrame::setFocus(bool newvalue) {
-    if (m_focused == newvalue)
+    if (m_state.focused == newvalue)
         return;
 
-    m_focused = newvalue;
+    m_state.focused = newvalue;
 
     if (FbTk::Transparent::haveRender() && 
         getAlpha(true) != getAlpha(false)) { // different alpha for focused and unfocused
-        unsigned char alpha = getAlpha(m_focused);
+        unsigned char alpha = getAlpha(m_state.focused);
         if (FbTk::Transparent::haveComposite()) {
             m_tab_container.setAlpha(255);
             m_window.setOpaque(alpha);
@@ -498,12 +495,12 @@ void FbWinFrame::setAlpha(bool focused, unsigned char alpha) {
     else
         m_unfocused_alpha = alpha;
 
-    if (m_focused == focused)
+    if (m_state.focused == focused)
         applyAlpha();
 }
 
 void FbWinFrame::applyAlpha() {
-    unsigned char alpha = getAlpha(m_focused);
+    unsigned char alpha = getAlpha(m_state.focused);
     if (FbTk::Transparent::haveComposite())
         m_window.setOpaque(alpha);
     else {
@@ -845,7 +842,7 @@ void FbWinFrame::reconfigure() {
     m_bevel = theme()->bevelWidth();
     setBorderWidth();
 
-    if (m_decoration_mask & DECORM_HANDLE && theme()->handleWidth() != 0)
+    if (m_state.deco_mask & DECORM_HANDLE && theme()->handleWidth() != 0)
         showHandle();
     else
         hideHandle();
@@ -889,7 +886,7 @@ void FbWinFrame::reconfigure() {
     }
 
     // leave client+grips alone if we're shaded (it'll get fixed when we unshade)
-    if (!m_shaded) {
+    if (!m_state.shaded) {
         int client_top = 0;
         int client_height = m_window.height();
         if (m_use_titlebar) {
@@ -945,7 +942,7 @@ void FbWinFrame::reconfigure() {
         // update transparency settings
         if (FbTk::Transparent::haveRender()) {
             unsigned char alpha =
-                getAlpha(m_focused);
+                getAlpha(m_state.focused);
             if (FbTk::Transparent::haveComposite()) {
                 m_tab_container.setAlpha(255);
                 m_window.setOpaque(alpha);
@@ -1160,7 +1157,7 @@ void FbWinFrame::applyTitlebar() {
     getCurrentFocusPixmap(label_pm, title_pm,
                           label_color, title_color);
 
-    unsigned char alpha = getAlpha (m_focused);
+    unsigned char alpha = getAlpha (m_state.focused);
     m_titlebar.setAlpha(alpha);
     m_label.setAlpha(alpha);
 
@@ -1212,12 +1209,12 @@ void FbWinFrame::renderHandles() {
 
 void FbWinFrame::applyHandles() {
 
-    unsigned char alpha = getAlpha (m_focused);
+    unsigned char alpha = getAlpha(m_state.focused);
     m_handle.setAlpha(alpha);
     m_grip_left.setAlpha(alpha);
     m_grip_right.setAlpha(alpha);
 
-    if (m_focused) {
+    if (m_state.focused) {
 
         if (m_handle_focused_pm) {
             m_handle.setBackgroundPixmap(m_handle_focused_pm);
@@ -1302,7 +1299,7 @@ void FbWinFrame::init() {
 
     m_clientarea.setBorderWidth(0);
     m_label.setBorderWidth(0);
-    m_shaded = false;
+    m_state.shaded = false;
 
     setTabMode(NOTSET);
 
@@ -1327,13 +1324,13 @@ void FbWinFrame::applyButton(FbTk::Button &btn) {
     else
         btn.setPressedColor(m_button_pressed_color);
 
-    Pixmap pm = m_focused ? m_button_pm : m_button_unfocused_pm;
-    btn.setAlpha(getAlpha(m_focused));
+    Pixmap pm = m_state.focused ? m_button_pm : m_button_unfocused_pm;
+    btn.setAlpha(getAlpha(m_state.focused));
     btn.setGC(theme()->buttonPicGC());
     if (pm)
         btn.setBackgroundPixmap(pm);
     else
-        btn.setBackgroundColor(m_focused ? m_button_color
+        btn.setBackgroundColor(m_state.focused ? m_button_color
                                          : m_button_unfocused_color);
 }
 
@@ -1355,7 +1352,7 @@ void FbWinFrame::render(const FbTk::Texture &tex, FbTk::Color &col, Pixmap &pm,
 
 void FbWinFrame::getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
                                        FbTk::Color &label_color, FbTk::Color &title_color) {
-    if (m_focused) {
+    if (m_state.focused) {
         if (m_label_focused_pm != 0)
             label_pm = m_label_focused_pm;
         else
@@ -1379,12 +1376,12 @@ void FbWinFrame::getCurrentFocusPixmap(Pixmap &label_pm, Pixmap &title_pm,
 }
 
 void FbWinFrame::applyTabContainer() {
-    m_tab_container.setAlpha(getAlpha(m_focused));
+    m_tab_container.setAlpha(getAlpha(m_state.focused));
 
     // do the parent container
     Pixmap tabcontainer_pm = None;
     FbTk::Color *tabcontainer_color = NULL;
-    if (m_focused) {
+    if (m_state.focused) {
         if (m_tabcontainer_focused_pm != 0)
             tabcontainer_pm = m_tabcontainer_focused_pm;
         else
@@ -1421,13 +1418,13 @@ void FbWinFrame::applyDecorations() {
     // tab deocration only affects if we're external
     // must do before the setTabMode in case it goes
     // to external and is meant to be hidden
-    if (m_decoration_mask & DECORM_TAB)
+    if (m_state.deco_mask & DECORM_TAB)
         client_move |= showTabs();
     else
         client_move |= hideTabs();
 
     // we rely on frame not doing anything if it is already shown/hidden
-    if (m_decoration_mask & DECORM_TITLEBAR) {
+    if (m_state.deco_mask & DECORM_TITLEBAR) {
         client_move |= showTitlebar();
         if (m_screen.getDefaultInternalTabs())
             client_move |= setTabMode(INTERNAL);
@@ -1435,11 +1432,11 @@ void FbWinFrame::applyDecorations() {
             client_move |= setTabMode(EXTERNAL);
     } else {
         client_move |= hideTitlebar();
-        if (m_decoration_mask & DECORM_TAB)
+        if (m_state.deco_mask & DECORM_TAB)
             client_move |= setTabMode(EXTERNAL);
     }
 
-    if (m_decoration_mask & DECORM_HANDLE)
+    if (m_state.deco_mask & DECORM_HANDLE)
         client_move |= showHandle();
     else
         client_move |= hideHandle();
@@ -1461,7 +1458,7 @@ void FbWinFrame::applyDecorations() {
 
 bool FbWinFrame::setBorderWidth(bool do_move) {
     unsigned int border_width = theme()->border().width();
-    unsigned int win_bw = m_decoration_mask & DECORM_BORDER ? border_width : 0;
+    unsigned int win_bw = m_state.deco_mask & DECORM_BORDER ? border_width : 0;
 
     if (border_width &&
         theme()->border().color().pixel() != window().borderColor()) {
@@ -1598,7 +1595,7 @@ void FbWinFrame::gravityTranslate(int &x, int &y,
 }
 
 unsigned int FbWinFrame::normalHeight() const {
-    if (m_shaded)
+    if (m_state.shaded)
         return m_height_before_shade;
     return height();
 }
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 3d61860..6d8249a 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -95,25 +95,38 @@ public:
         DECOR_TAB = DECORM_BORDER|DECORM_MENU|DECORM_TAB
     };
 
-    typedef struct SizeHints {
+    class SizeHints {
+    public:
+        SizeHints():
+            min_width(1), max_width(0), min_height(1), max_height(0),
+            width_inc(1), height_inc(1), base_width(0), base_height(0),
+            min_aspect_x(0), max_aspect_x(0),
+            min_aspect_y(0), max_aspect_y(0) { }
+
         void apply(unsigned int &w, unsigned int &h,
                    bool maximizing = false) const;
         bool valid(unsigned int width, unsigned int height) const;
         void displaySize(unsigned int &i, unsigned int &j,
                          unsigned int width, unsigned int height) const;
-        unsigned int min_width;
-        unsigned int max_width;
-        unsigned int min_height;
-        unsigned int max_height;
-        unsigned int width_inc;
-        unsigned int height_inc;
-        unsigned int min_aspect_x;
-        unsigned int max_aspect_x;
-        unsigned int min_aspect_y;
-        unsigned int max_aspect_y;
-        unsigned int base_width;
-        unsigned int base_height;
-    } SizeHints;
+
+        unsigned int min_width, max_width, min_height, max_height,
+                     width_inc, height_inc, base_width, base_height,
+                     min_aspect_x, max_aspect_x, min_aspect_y, max_aspect_y;
+    };
+
+    class State {
+    public:
+        State():
+            size_hints(),
+            deco_mask(DECOR_NORMAL),
+            focused(false),
+            shaded(false), fullscreen(false), maximized(0) { }
+
+        SizeHints size_hints;
+        unsigned int deco_mask;
+        bool focused, shaded, fullscreen;
+        int maximized;
+    };
 
     /// create a top level window
     FbWinFrame(BScreen &screen, FocusableTheme<FbWinFrameTheme> &theme,
@@ -162,6 +175,9 @@ public:
 
     /// set focus/unfocus style
     void setFocus(bool newvalue);
+    void setFullscreen(bool value) { m_state.fullscreen = value; }
+    void setMaximized(int value) { m_state.maximized = value; }
+
     void setFocusTitle(const std::string &str) { m_label.setText(str); }
     bool setTabMode(TabMode tabmode);
     void updateTabProperties() { alignTabs(); }
@@ -205,14 +221,14 @@ public:
     /// remove any handler for the windows
     void removeEventHandler();
 
-    const SizeHints &sizeHints() const { return m_size_hints; }
-    void setSizeHints(const SizeHints &hint) { m_size_hints = hint; }
+    const SizeHints &sizeHints() const { return m_state.size_hints; }
+    void setSizeHints(const SizeHints &hint) { m_state.size_hints = hint; }
 
     void applySizeHints(unsigned int &width, unsigned int &height,
                         bool maximizing = false) const;
     void displaySize(unsigned int width, unsigned int height) const;
 
-    void setDecorationMask(unsigned int mask) { m_decoration_mask = mask; }
+    void setDecorationMask(unsigned int mask) { m_state.deco_mask = mask; }
     void applyDecorations();
 
     // this function translates its arguments according to win_gravity
@@ -271,8 +287,8 @@ public:
     FbTk::FbWindow &gripLeft() { return m_grip_left; }
     const FbTk::FbWindow &gripRight() const { return m_grip_right; }
     FbTk::FbWindow &gripRight() { return m_grip_right; }
-    bool focused() const { return m_focused; }
-    bool isShaded() const { return m_shaded; }
+    bool focused() const { return m_state.focused; }
+    bool isShaded() const { return m_state.shaded; }
     FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; }
     /// @return titlebar height
     unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_titlebar.borderWidth():0); }
@@ -370,11 +386,9 @@ private:
         m_buttons_right; ///< buttons to the right
     typedef std::list<FbTk::TextButton *> LabelList;
     int m_bevel;  ///< bevel between titlebar items and titlebar
-    unsigned int m_decoration_mask; ///< bitmask of applied decorations
     bool m_use_titlebar; ///< if we should use titlebar
     bool m_use_tabs; ///< if we should use tabs (turns them off in external mode only)
     bool m_use_handle; ///< if we should use handle
-    bool m_focused; ///< focused/unfocused mode
     bool m_visible; ///< if we are currently showing
     ///< do we use screen or window alpha settings ? (0 = window, 1 = default, 2 = default and window never set)
 
@@ -419,12 +433,11 @@ private:
     // last gravity that this window was *actively* placed with
     int m_active_gravity;
     unsigned int m_active_orig_client_bw;
-    SizeHints m_size_hints;
+    State m_state;
 
     bool m_need_render;
     int m_button_size; ///< size for all titlebar buttons
     unsigned int m_height_before_shade; ///< height before shade, so we can restore it when we unshade
-    bool m_shaded; ///< wheter we're shaded or not
     /// alpha values
     typedef FbTk::ConstObjectAccessor<unsigned char, FbWinFrameTheme> AlphaAcc;
     FbTk::DefaultValue<unsigned char, AlphaAcc> m_focused_alpha;
diff --git a/src/Window.cc b/src/Window.cc
index a5ec2dd..866e160 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -1526,6 +1526,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
         sendConfigureNotify();
 
         fullscreen = true;
+        frame().setFullscreen(true);
 
         setFullscreenLayer();
         if (!isFocused())
@@ -1534,6 +1535,7 @@ void FluxboxWindow::setFullscreen(bool flag) {
     } else if (!flag && isFullscreen()) {
 
         fullscreen = false;
+        frame().setFullscreen(false);
 
         frame().setUseShape(true);
         if (m_toggled_decos) {
@@ -1668,6 +1670,7 @@ void FluxboxWindow::setMaximizedState(int type) {
         maximized ^= MAX_HORZ;
     }
 
+    frame().setMaximized(maximized);
     // ensure we apply the sizehints here, otherwise some
     // apps (eg xterm) end up a little bit .. crappy (visually)
 
@@ -3379,6 +3382,7 @@ void FluxboxWindow::startResizing(int x, int y, ResizeDirection dir) {
 
     resizing = true;
     maximized = MAX_NONE;
+    frame().setMaximized(maximized);
 
     const Cursor& cursor = (m_resize_corner == LEFTTOP) ? frame().theme()->upperLeftAngleCursor() :
                            (m_resize_corner == RIGHTTOP) ? frame().theme()->upperRightAngleCursor() :