fix nextFocus problem with tabbed windows

1 files changed, 19 insertions, 29 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 5c40cc0..01f99f4 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.152 2003/04/27 12:31:43 fluxgen Exp $
+// $Id: Window.cc,v 1.153 2003/04/27 14:36:04 rathnor Exp $
 
 #include "Window.hh"
 
@@ -702,16 +702,15 @@ void FluxboxWindow::prevClient() {
     setInputFocus();
 }
 
-void FluxboxWindow::setCurrentClient(WinClient &client) {
+bool FluxboxWindow::setCurrentClient(WinClient &client, bool setinput) {
     // make sure it's in our list
     if (client.m_win != this)
-        return;
+        return false;
 
     m_client = &client;
     m_client->raise();
-    Fluxbox::instance()->setFocusedWindow(this);
     m_frame.setLabelButtonFocus(*m_labelbuttons[m_client]);
-    setInputFocus();
+    return setinput && setInputFocus();
 }
 
 bool FluxboxWindow::isGroupable() const {
@@ -2321,21 +2320,15 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
             doSnapping(dx, dy);
             
             if (! screen.doOpaqueMove()) {
-                XDrawRectangle(display, screen.getRootWindow(),
-                               screen.rootTheme().opGC(),
+                XDrawRectangle(display, screen.getRootWindow(), screen.rootTheme().opGC(),
                                last_move_x, last_move_y, 
-                               m_frame.width() + 
-                               2*frame().window().borderWidth() - 1,
-                               m_frame.height() + 
-                               2*frame().window().borderWidth() - 1);
+                               m_frame.width() + 2*frame().window().borderWidth()-1,
+                               m_frame.height() + 2*frame().window().borderWidth()-1);
 
-                XDrawRectangle(display, screen.getRootWindow(), 
-                               screen.rootTheme().opGC(),
+                XDrawRectangle(display, screen.getRootWindow(), screen.rootTheme().opGC(),
                                dx, dy, 
-                               m_frame.width() + 
-                               2*frame().window().borderWidth()-1,
-                               m_frame.height() + 
-                               2*frame().window().borderWidth()-1);
+                               m_frame.width() + 2*frame().window().borderWidth()-1,
+                               m_frame.height() + 2*frame().window().borderWidth()-1);
                 last_move_x = dx;
                 last_move_y = dy;
             } else {
@@ -2356,8 +2349,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
             startResizing(me.window, me.x, me.y, left); 
         } else if (resizing) {
             // draw over old rect
-            XDrawRectangle(display, screen.getRootWindow(), 
-                           screen.rootTheme().opGC(),
+            XDrawRectangle(display, screen.getRootWindow(), screen.rootTheme().opGC(),
                            last_resize_x, last_resize_y,
                            last_resize_w - 1 + 2 * m_frame.window().borderWidth(),
                            last_resize_h - 1 + 2 * m_frame.window().borderWidth());
@@ -2385,8 +2377,7 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) {
             }
 
             // draw resize rectangle
-            XDrawRectangle(display, screen.getRootWindow(),
-                           screen.rootTheme().opGC(),
+            XDrawRectangle(display, screen.getRootWindow(), screen.rootTheme().opGC(),
                            last_resize_x, last_resize_y,
                            last_resize_w - 1 + 2 * m_frame.window().borderWidth(), 
                            last_resize_h - 1 + 2 * m_frame.window().borderWidth());
@@ -2477,6 +2468,7 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
         ev.window == m_client->window()) {
         if ((screen.isSloppyFocus() || screen.isSemiSloppyFocus()) 
             && !isFocused()) {
+           
             
             // check that there aren't any subsequent leave notify events in the 
             // X event queue
@@ -2488,6 +2480,7 @@ void FluxboxWindow::enterNotifyEvent(XCrossingEvent &ev) {
     
             if ((!sa.leave || sa.inferior) && setInputFocus())
                 installColormap(True);
+            
            
         }        
     }
@@ -2653,18 +2646,15 @@ void FluxboxWindow::stopMoving() {
 
    
     if (! screen.doOpaqueMove()) {
-        XDrawRectangle(FbTk::App::instance()->display(),
-                       screen.getRootWindow(), screen.rootTheme().opGC(),
+        XDrawRectangle(FbTk::App::instance()->display(), screen.getRootWindow(), screen.rootTheme().opGC(),
                        last_move_x, last_move_y, 
-                       frame().width() + 2*frame().window().borderWidth() - 1,
-                       frame().height() + 2*frame().window().borderWidth() - 1);
-
+                       frame().width() + 2*frame().window().borderWidth()-1,
+                       frame().height() + 2*frame().window().borderWidth()-1);
         moveResize(last_move_x, last_move_y, m_frame.width(), m_frame.height());
-        
         if (workspace_number != getScreen().getCurrentWorkspaceID()) {
-            deiconify(true, false);
+            screen.reassociateWindow(this, getScreen().getCurrentWorkspaceID(), true);
+            m_frame.show();
         }
-        
         fluxbox->ungrab();
     } else
         moveResize(m_frame.x(), m_frame.y(), m_frame.width(), m_frame.height());