merge

7 files changed, 40 insertions, 16 deletions

diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index f49f7fd..f57513d 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -67,13 +67,17 @@ struct Name2WinProperty {
     ClientPattern::WinProperty prop;
 };
 
-const Name2WinProperty name_2_winproperties[] = { // sorted for 'bsearch'
+// sorted alphabetically for 'bsearch'
+const Name2WinProperty name_2_winproperties[] = {
     { "class", ClientPattern::CLASS },
     { "focushidden", ClientPattern::FOCUSHIDDEN },
+    { "fullscreen", ClientPattern::FULLSCREEN },
     { "head", ClientPattern::HEAD },
     { "iconhidden", ClientPattern::ICONHIDDEN },
     { "layer", ClientPattern::LAYER },
     { "maximized", ClientPattern::MAXIMIZED },
+    { "maximizedhorizontal", ClientPattern::HORZMAX },
+    { "maximizedvertical", ClientPattern::VERTMAX },
     { "minimized", ClientPattern::MINIMIZED },
     { "name", ClientPattern::NAME },
     { "role", ClientPattern::ROLE },
@@ -132,6 +136,9 @@ Prop2String property_2_strings[] = { // sorted by 'prop'
     { ClientPattern::URGENT, "urgent" },
     { ClientPattern::SCREEN, "screen" },
     { ClientPattern::XPROP, "@" },
+    { ClientPattern::FULLSCREEN, "fullscreen" },
+    { ClientPattern::VERTMAX, "maximizedvertical" },
+    { ClientPattern::HORZMAX, "maximizedhorizontal" },
 };
 
 
@@ -411,6 +418,15 @@ FbTk::FbString ClientPattern::getProperty(WinProperty prop, const Focusable &cli
     case MINIMIZED:
         result = (fbwin && fbwin->isIconic()) ? "yes" : "no";
         break;
+    case FULLSCREEN:
+        result = (fbwin && fbwin->isFullscreen()) ? "yes" : "no";
+        break;
+    case VERTMAX:
+        result = (fbwin && fbwin->isMaximizedVert()) ? "yes" : "no";
+        break;
+    case HORZMAX:
+        result = (fbwin && fbwin->isMaximizedHorz()) ? "yes" : "no";
+        break;
     case SHADED:
         result = (fbwin && fbwin->isShaded()) ? "yes" : "no";
         break;
diff --git a/src/ClientPattern.hh b/src/ClientPattern.hh
index 315edb1..a5b7206 100644
--- a/src/ClientPattern.hh
+++ b/src/ClientPattern.hh
@@ -55,7 +55,7 @@ public:
         TITLE = 0, CLASS, NAME, ROLE, TRANSIENT,
         MAXIMIZED, MINIMIZED, SHADED, STUCK, FOCUSHIDDEN, ICONHIDDEN,
         WORKSPACE, WORKSPACENAME, HEAD, LAYER, URGENT, SCREEN,
-        XPROP
+        XPROP, FULLSCREEN, VERTMAX, HORZMAX
     };
 
     /// Does this client match this pattern?
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 5bf113f..383de61 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -53,7 +53,7 @@ namespace {
 
 bool doSkipWindow(const Focusable &win, const ClientPattern *pat) {
     const FluxboxWindow *fbwin = win.fbwindow();
-    if (!fbwin || fbwin->isFocusHidden())
+    if (!fbwin || fbwin->isFocusHidden() || fbwin->isModal())
         return true; // skip if no fbwindow or if focushidden
     if (pat && !pat->match(win))
         return true; // skip if it doesn't match the pattern
diff --git a/src/Focusable.hh b/src/Focusable.hh
index 679e00b..fd0705b 100644
--- a/src/Focusable.hh
+++ b/src/Focusable.hh
@@ -54,8 +54,10 @@ public:
 
     /// @return true if the focusable has input focus
     virtual bool isFocused() const { return m_focused; }
-    /// @return return true if it can be focused
+    /// @return true if it can be focused
     virtual bool acceptsFocus() const { return true; }
+    /// @return true if temporarily prevented from being focused
+    virtual bool isModal() const { return false; }
 
     /// @return true if icon button should appear focused
     bool getAttentionState() const { return m_attention_state; }
diff --git a/src/Window.cc b/src/Window.cc
index f5a2fe2..747c909 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3306,6 +3306,10 @@ bool FluxboxWindow::acceptsFocus() const {
     return (m_client ? m_client->acceptsFocus() : false);
 }
 
+bool FluxboxWindow::isModal() const {
+    return (m_client ? m_client->isModal() : true);
+}
+
 const FbTk::PixmapWithMask &FluxboxWindow::icon() const {
     return (m_client ? m_client->icon() : m_icon);
 }
@@ -3609,15 +3613,16 @@ void FluxboxWindow::updateButtons() {
                 }
                 break;
             case WinButton::MENUICON:
-                winbtn = new WinButton(*this, m_button_theme,
-                                       screen().pressedWinButtonTheme(),
-                                       dir[i],
-                                       frame().titlebar(),
-                                       0, 0, 10, 10);
-                winbtn->join(titleSig(),
+                if (m_state.deco_mask & WindowState::DECORM_MENU) {
+                    winbtn = new WinButton(*this, m_button_theme,
+                            screen().pressedWinButtonTheme(),
+                            dir[i],
+                            frame().titlebar(),
+                            0, 0, 10, 10);
+                    winbtn->join(titleSig(),
                              FbTk::MemFunIgnoreArgs(*winbtn, &WinButton::updateAll));
-
-                winbtn->setOnClick(show_menu_cmd);
+                    winbtn->setOnClick(show_menu_cmd);
+                }
                 break;
             }
 
diff --git a/src/Window.hh b/src/Window.hh
index 0d2cadd..8c97c7b 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -414,6 +414,7 @@ public:
     FbTk::FbWindow &parent() { return m_parent; }
 
     bool acceptsFocus() const;
+    bool isModal() const;
     const FbTk::PixmapWithMask &icon() const;
     const FbTk::BiDiString &title() const;
     const FbTk::FbString &getWMClassName() const;
diff --git a/src/WindowState.hh b/src/WindowState.hh
index 58664fa..6b45a44 100644
--- a/src/WindowState.hh
+++ b/src/WindowState.hh
@@ -90,10 +90,10 @@ public:
     enum Decoration {
         DECOR_NONE = 0,
         DECOR_NORMAL = DECORM_LAST - 1,
-        DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY|DECORM_MENU|DECORM_TAB,
-        DECOR_TOOL = DECORM_TITLEBAR|DECORM_MENU,
-        DECOR_BORDER = DECORM_BORDER|DECORM_MENU,
-        DECOR_TAB = DECORM_BORDER|DECORM_MENU|DECORM_TAB
+        DECOR_TINY = DECORM_TITLEBAR|DECORM_ICONIFY,
+        DECOR_TOOL = DECORM_TITLEBAR,
+        DECOR_BORDER = DECORM_BORDER,
+        DECOR_TAB = DECORM_BORDER|DECORM_TAB
     };
 
     enum WindowType {