window-to-window corner snapping!

[chaz/openbox] / src / Window.cc

diff --git a/src/Window.cc b/src/Window.cc
index 47809ea900240747bb6411324ab9526f77b08965..86898d542124bd2c36166873edd9dd35b04e91b0 100644 (file)
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2537,25 +2537,61 @@ void BlackboxWindow::motionNotifyEvent(XMotionEvent *me) {
                dtop = std::abs(wbottom - winrect.top()),
             dbottom = std::abs(wtop - winrect.bottom());
 
-          // snap left?
+          // snap left of other window?
           if (dleft < snap_distance && dleft <= dright) {
             dx = winrect.left() - frame.rect.width();
+
+            // try corner-snap to its other sides
+            dtop = std::abs(wtop - winrect.top());
+            dbottom = std::abs(wbottom - winrect.bottom());
+            if (dtop < snap_distance && dtop <= dbottom)
+              dy = winrect.top();
+            else if (dbottom < snap_distance)
+              dy = winrect.bottom() - frame.rect.height();
+
             continue;
           }
-          // snap right?
+          // snap right of other window?
           else if (dright < snap_distance) {
             dx = winrect.right() + 1;
+
+            // try corner-snap to its other sides
+            dtop = std::abs(wtop - winrect.top());
+            dbottom = std::abs(wbottom - winrect.bottom());
+            if (dtop < snap_distance && dtop <= dbottom)
+              dy = winrect.top();
+            else if (dbottom < snap_distance)
+              dy = winrect.bottom() - frame.rect.height();
+
             continue;
           }
 
-          // snap top?
+          // snap top of other window?
           if (dtop < snap_distance && dtop <= dbottom) {
             dy = winrect.top() - frame.rect.height();
+
+            // try corner-snap to its other sides
+            dleft = std::abs(wleft - winrect.left());
+            dright = std::abs(wright - winrect.right());
+            if (dleft < snap_distance && dleft <= dright)
+              dx = winrect.left();
+            else if (dright < snap_distance)
+              dx = winrect.right() - frame.rect.width();
+
             continue;
           }
-          // snap bottom?
+          // snap bottom of other window?
           else if (dbottom < snap_distance) {
             dy = winrect.bottom() + 1;
+            
+            // try corner-snap to its other sides
+            dleft = std::abs(wleft - winrect.left());
+            dright = std::abs(wright - winrect.right());
+            if (dleft < snap_distance && dleft <= dright)
+              dx = winrect.left();
+            else if (dright < snap_distance)
+              dx = winrect.right() - frame.rect.width();
+
             continue;
           }
         }
@@ -2582,26 +2618,28 @@ void BlackboxWindow::motionNotifyEvent(XMotionEvent *me) {
         else if (dbottom < snap_distance)
           dy = srect.bottom() - frame.rect.height() + 1;
 
-        srect = screen->getRect(); // now get the full screen
+        if (! screen->doFullMax()) {
+          srect = screen->getRect(); // now get the full screen
 
-        dleft = std::abs(wleft - srect.left()),
-        dright = std::abs(wright - srect.right()),
-        dtop = std::abs(wtop - srect.top()),
-        dbottom = std::abs(wbottom - srect.bottom());
+          dleft = std::abs(wleft - srect.left()),
+          dright = std::abs(wright - srect.right()),
+          dtop = std::abs(wtop - srect.top()),
+          dbottom = std::abs(wbottom - srect.bottom());
 
-        // snap left?
-        if (dleft < snap_distance && dleft <= dright)
-          dx = srect.left();
-        // snap right?
-        else if (dright < snap_distance)
-          dx = srect.right() - frame.rect.width() + 1;
+          // snap left?
+          if (dleft < snap_distance && dleft <= dright)
+            dx = srect.left();
+          // snap right?
+          else if (dright < snap_distance)
+            dx = srect.right() - frame.rect.width() + 1;
 
-        // snap top?
-        if (dtop < snap_distance && dtop <= dbottom)
-          dy = srect.top();
-        // snap bottom?
-        else if (dbottom < snap_distance)
-          dy = srect.bottom() - frame.rect.height() + 1;
+          // snap top?
+          if (dtop < snap_distance && dtop <= dbottom)
+            dy = srect.top();
+          // snap bottom?
+          else if (dbottom < snap_distance)
+            dy = srect.bottom() - frame.rect.height() + 1;
+        }
       }
 
       if (screen->doOpaqueMove()) {
@@ -2698,7 +2736,7 @@ void BlackboxWindow::shapeEvent(XShapeEvent *) {
 #endif // SHAPE
 
 
-bool BlackboxWindow::validateClient(void) {
+bool BlackboxWindow::validateClient(void) const {
   XSync(blackbox->getXDisplay(), False);
 
   XEvent e;
@@ -2802,21 +2840,37 @@ void BlackboxWindow::changeBlackboxHints(BlackboxHints *net) {
 
     default:
     case DecorNormal:
-      decorations |= Decor_Titlebar | Decor_Handle | Decor_Border |
-                     Decor_Iconify | Decor_Maximize;
+      decorations |= Decor_Titlebar | Decor_Border | Decor_Iconify;
+  
+      decorations = ((functions & Func_Resize) && !isTransient() ?
+                     decorations | Decor_Handle :
+                     decorations &= ~Decor_Handle);
+      decorations = (functions & Func_Maximize ?
+                     decorations | Decor_Maximize :
+                     decorations &= ~Decor_Maximize);
 
       break;
 
     case DecorTiny:
       decorations |= Decor_Titlebar | Decor_Iconify;
-      decorations &= ~(Decor_Border | Decor_Handle | Decor_Maximize);
+      decorations &= ~(Decor_Border | Decor_Handle);
+      
+      decorations = (functions & Func_Maximize ?
+                     decorations | Decor_Maximize :
+                     decorations &= ~Decor_Maximize);
 
       break;
 
     case DecorTool:
       decorations |= Decor_Titlebar;
-      decorations &= ~(Decor_Iconify | Decor_Border | Decor_Handle);
-      functions |= Func_Move;
+      decorations &= ~(Decor_Iconify | Decor_Border);
+
+      decorations = ((functions & Func_Resize) && !isTransient() ?
+                     decorations | Decor_Handle :
+                     decorations &= ~Decor_Handle);
+      decorations = (functions & Func_Maximize ?
+                     decorations | Decor_Maximize :
+                     decorations &= ~Decor_Maximize);
 
       break;
     }