Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

1 files changed, 47 insertions, 36 deletions

diff --git a/src/Window.cc b/src/Window.cc
index edc2b8e..34b92e1 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -113,7 +113,7 @@ typedef struct scanargs {
 } scanargs;
 
 // look for valid enter or leave events (that may invalidate the earlier one we are interested in)
-static Bool queueScanner(Display *, XEvent *e, char *args) {
+extern "C" int queueScanner(Display *, XEvent *e, char *args) {
     if (e->type == LeaveNotify &&
         e->xcrossing.window == ((scanargs *) args)->w &&
         e->xcrossing.mode == NotifyNormal) {
@@ -187,8 +187,9 @@ void lowerFluxboxWindow(FluxboxWindow &win) {
         win.screen().layerManager().lock();
 
     // lower the windows from the top down, so they don't change stacking order
-    WinClient::TransientList::const_reverse_iterator it = win.winClient().transientList().rbegin();
-    WinClient::TransientList::const_reverse_iterator it_end = win.winClient().transientList().rend();
+    const WinClient::TransientList& transients = win.winClient().transientList();
+    WinClient::TransientList::const_reverse_iterator it =     transients.rbegin();
+    WinClient::TransientList::const_reverse_iterator it_end = transients.rend();
     for (; it != it_end; ++it) {
         if ((*it)->fbwindow() && !(*it)->fbwindow()->isIconic())
             // TODO: should we also check if it is the active client?
@@ -259,7 +260,7 @@ private:
     int m_mode;
 };
 
-};
+}
 
 
 int FluxboxWindow::s_num_grabs = 0;
@@ -1107,11 +1108,11 @@ void FluxboxWindow::updateMWMHintsFromClient(WinClient &client) {
         if (hint->decorations & MwmDecorAll) {
             decorations.titlebar = decorations.handle = decorations.border =
                 decorations.iconify = decorations.maximize =
-                decorations.close = decorations.menu = true;
+                decorations.menu = true;
         } else {
             decorations.titlebar = decorations.handle = decorations.border =
                 decorations.iconify = decorations.maximize =
-                decorations.close = decorations.tab = false;
+                decorations.tab = false;
             decorations.menu = true;
             if (hint->decorations & MwmDecorBorder)
                 decorations.border = true;
@@ -1213,6 +1214,9 @@ void FluxboxWindow::moveResize(int new_x, int new_y,
     if (!moving) {
         m_last_resize_x = new_x;
         m_last_resize_y = new_y;
+
+        /* Ignore all EnterNotify events until the pointer actually moves */
+        screen().focusControl().ignoreAtPointer();
     }
 
 }
@@ -1670,6 +1674,10 @@ void FluxboxWindow::lower() {
 #ifdef DEBUG
     cerr<<"FluxboxWindow("<<title()<<")::lower()"<<endl;
 #endif // DEBUG
+
+    /* Ignore all EnterNotify events until the pointer actually moves */
+    screen().focusControl().ignoreAtPointer();
+
     // get root window
     WinClient *client = getRootTransientFor(m_client);
 
@@ -1690,15 +1698,10 @@ void FluxboxWindow::tempRaise() {
 }
 
 
-void FluxboxWindow::raiseLayer() {
-    moveToLayer(m_state.layernum-1);
+void FluxboxWindow::changeLayer(int diff) {
+    moveToLayer(m_state.layernum+diff);
 }
 
-void FluxboxWindow::lowerLayer() {
-    moveToLayer(m_state.layernum+1);
-}
-
-
 void FluxboxWindow::moveToLayer(int layernum, bool force) {
 #ifdef DEBUG
     cerr<<"FluxboxWindow("<<title()<<")::moveToLayer("<<layernum<<")"<<endl;
@@ -2401,10 +2404,9 @@ void FluxboxWindow::buttonPressEvent(XButtonEvent &be) {
         } else if (frame().handle() == be.window)
             raise();
 
+        FbTk::Menu::hideShownMenu();
         if (!m_focused && acceptsFocus() && m_click_focus) //check focus
             focus();
-
-        menu().hide();
     }
 }
 
@@ -2684,13 +2686,17 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
             sa.enter = sa.leave = False;
             XCheckIfEvent(display, &dummy, queueScanner, (char *) &sa);
 
-            if ((!sa.leave || sa.inferior) && !screen().focusControl().isCycling() ) {
+            if ((!sa.leave || sa.inferior) &&
+                !screen().focusControl().isCycling() &&
+                !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
                 focus();
             }
         }
     }
 
-    if (screen().focusControl().isMouseTabFocus() && client && client != m_client) {
+    if (screen().focusControl().isMouseTabFocus() &&
+        client && client != m_client &&
+        !screen().focusControl().isIgnored(ev.x_root, ev.y_root) ) {
         setCurrentClient(*client, isFocused());
     }
 
@@ -2805,6 +2811,7 @@ void FluxboxWindow::setDecorationMask(unsigned int mask, bool apply) {
     decorations.shade    = mask & WindowState::DECORM_SHADE;
     decorations.tab      = mask & WindowState::DECORM_TAB;
     decorations.enabled  = mask & WindowState::DECORM_ENABLED;
+
     // we don't want to do this during initialization
     if (apply)
         applyDecorations();
@@ -3569,7 +3576,7 @@ void FluxboxWindow::updateButtons() {
 
             switch (dir[i]) {
             case WinButton::MINIMIZE:
-                if (isIconifiable()) {
+                if (isIconifiable() && (m_state.deco_mask & WindowState::DECORM_ICONIFY)) {
                     winbtn = new WinButton(*this, m_button_theme,
                                            screen().pressedWinButtonTheme(),
                                            WinButton::MINIMIZE,
@@ -3579,7 +3586,7 @@ void FluxboxWindow::updateButtons() {
                 }
                 break;
             case WinButton::MAXIMIZE:
-                if (isMaximizable()) {
+                if (isMaximizable() && (m_state.deco_mask & WindowState::DECORM_MAXIMIZE) ) {
                     winbtn = new WinButton(*this, m_button_theme,
                                            screen().pressedWinButtonTheme(),
                                            dir[i],
@@ -3592,7 +3599,7 @@ void FluxboxWindow::updateButtons() {
                 }
                 break;
             case WinButton::CLOSE:
-                if (m_client->isClosable()) {
+                if (m_client->isClosable() && (m_state.deco_mask & WindowState::DECORM_CLOSE)) {
                     winbtn = new WinButton(*this, m_button_theme,
                                            screen().pressedWinButtonTheme(),
                                            dir[i],
@@ -3604,23 +3611,27 @@ void FluxboxWindow::updateButtons() {
                 }
                 break;
             case WinButton::STICK:
-                winbtn =  new WinButton(*this, m_button_theme,
-                                        screen().pressedWinButtonTheme(),
-                                        dir[i],
-                                        frame().titlebar(),
-                                        0, 0, 10, 10);
-
-                stateSig().attach(winbtn);
-                winbtn->setOnClick(stick_cmd);
+                if (m_state.deco_mask & WindowState::DECORM_STICKY) {
+                    winbtn =  new WinButton(*this, m_button_theme,
+                            screen().pressedWinButtonTheme(),
+                            dir[i],
+                            frame().titlebar(),
+                            0, 0, 10, 10);
+
+                    stateSig().attach(winbtn);
+                    winbtn->setOnClick(stick_cmd);
+                }
                 break;
             case WinButton::SHADE:
-                winbtn = new WinButton(*this, m_button_theme,
-                                       screen().pressedWinButtonTheme(),
-                                       dir[i],
-                                       frame().titlebar(),
-                                       0, 0, 10, 10);
-                stateSig().attach(winbtn);
-                winbtn->setOnClick(shade_cmd);
+                if (m_state.deco_mask & WindowState::DECORM_SHADE) {
+                    winbtn = new WinButton(*this, m_button_theme,
+                            screen().pressedWinButtonTheme(),
+                            dir[i],
+                            frame().titlebar(),
+                            0, 0, 10, 10);
+                    stateSig().attach(winbtn);
+                    winbtn->setOnClick(shade_cmd);
+                }
                 break;
             case WinButton::MENUICON:
                 winbtn = new WinButton(*this, m_button_theme,
@@ -3718,7 +3729,7 @@ FluxboxWindow::ReferenceCorner FluxboxWindow::getCorner(string str) {
         return RIGHT;
     if (str == "leftbottom" || str == "bottomleft" || str == "lowerleft")
         return LEFTBOTTOM;
-    if (str == "bottom" || str == "bottomcenter")
+    if (str == "bottom" || str == "lower" || str == "bottomcenter")
         return BOTTOM;
     if (str == "rightbottom" || str == "bottomright" || str == "lowerright")
         return RIGHTBOTTOM;