X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWindow.cc;h=5a28d23254053874f2bb3a565d2de027ed4c4458;hb=098fae70a6d8d15877938080437f0fc20f52bbf5;hp=f722902a232df9d91cb5178dcc80e6209e143d83;hpb=0be1c1e8d72f5c5d8ef73c5c6a924e1f540a205a;p=chaz%2Fopenbox

diff --git a/src/Window.cc b/src/Window.cc
index f722902a..5a28d232 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -56,6 +56,9 @@
 #endif // SLIT
 #include "Util.h"
 
+#include <iostream>
+using namespace std;
+
 /*
  * Initializes the class with default values/the window's set initial values.
  */
@@ -1390,7 +1393,7 @@ Bool OpenboxWindow::setInputFocus(void) {
       XSetInputFocus(display, screen->getRootWindow(),
 		     RevertToNone, CurrentTime);
 
-    openbox.setFocusedWindow(this);
+    openbox.focusWindow(this);
 
     if (flags.send_focus_message) {
       XEvent ce;
@@ -1527,6 +1530,9 @@ void OpenboxWindow::withdraw(void) {
 
 
 void OpenboxWindow::maximize(unsigned int button) {
+  if (flags.moving)
+    endMove();
+  
   // handle case where menu is open then the max button is used instead
   if (windowmenu && windowmenu->isVisible()) windowmenu->hide();
 
@@ -2283,6 +2289,9 @@ void OpenboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
     openbox.grab();
     if (! validateClient()) return;
 
+    if (flags.moving)
+      endMove();
+    
     XChangeSaveSet(display, client.window, SetModeDelete);
     XSelectInput(display, client.window, NoEventMask);
 
@@ -2318,6 +2327,8 @@ void OpenboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
 
 void OpenboxWindow::destroyNotifyEvent(XDestroyWindowEvent *de) {
   if (de->window == client.window) {
+    if (flags.moving)
+      endMove();
     XUnmapWindow(display, frame.window);
 
     delete this;
@@ -2754,9 +2765,8 @@ void OpenboxWindow::startMove(int x, int y) {
   ASSERT(!flags.moving);
 
   // make sure only one window is moving at a time
-  OpenboxWindow *w;
-  if ((w = openbox.getMaskedWindow()) != (OpenboxWindow *) 0 &&
-      w->flags.moving)
+  OpenboxWindow *w = openbox.getMaskedWindow();
+  if (w != (OpenboxWindow *) 0 && w->flags.moving)
     w->endMove();
   
   XGrabPointer(display, frame.window, False, PointerMotionMask |