summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Window.cc24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/Window.cc b/src/Window.cc
index bc16271..8871253 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.124 2003/02/22 18:28:32 fluxgen Exp $ 25// $Id: Window.cc,v 1.125 2003/02/22 21:40:35 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -101,16 +101,16 @@ typedef struct scanargs {
101 101
102// look for valid enter or leave events (that may invalidate the earlier one we are interested in) 102// look for valid enter or leave events (that may invalidate the earlier one we are interested in)
103static Bool queueScanner(Display *, XEvent *e, char *args) { 103static Bool queueScanner(Display *, XEvent *e, char *args) {
104 if ((e->type == LeaveNotify) && 104 if (e->type == LeaveNotify &&
105 (e->xcrossing.window == ((scanargs *) args)->w) && 105 e->xcrossing.window == ((scanargs *) args)->w &&
106 (e->xcrossing.mode == NotifyNormal)) { 106 e->xcrossing.mode == NotifyNormal) {
107 ((scanargs *) args)->leave = True; 107 ((scanargs *) args)->leave = true;
108 ((scanargs *) args)->inferior = (e->xcrossing.detail == NotifyInferior); 108 ((scanargs *) args)->inferior = (e->xcrossing.detail == NotifyInferior);
109 } else if ((e->type == EnterNotify) && 109 } else if (e->type == EnterNotify &&
110 (e->xcrossing.mode == NotifyUngrab)) 110 e->xcrossing.mode == NotifyUngrab)
111 ((scanargs *) args)->enter = True; 111 ((scanargs *) args)->enter = true;
112 112
113 return False; 113 return false;
114} 114}
115 115
116/// raise window and do the same for each transient it holds 116/// raise window and do the same for each transient it holds
@@ -277,6 +277,9 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
277 277
278 upsize(); 278 upsize();
279 279
280 m_frame.move(wattrib.x, wattrib.y);
281 m_frame.resizeForClient(wattrib.width, wattrib.height);
282
280 bool place_window = true; 283 bool place_window = true;
281 if (fluxbox->isStartup() || transient || 284 if (fluxbox->isStartup() || transient ||
282 client.normal_hint_flags & (PPosition|USPosition)) { 285 client.normal_hint_flags & (PPosition|USPosition)) {
@@ -314,9 +317,6 @@ FluxboxWindow::FluxboxWindow(Window w, BScreen *s, int screen_num,
314 317
315 positionWindows(); 318 positionWindows();
316 319
317 m_frame.move(wattrib.x, wattrib.y);
318 m_frame.resizeForClient(wattrib.width, wattrib.height);
319
320 if (workspace_number < 0 || workspace_number >= screen->getCount()) 320 if (workspace_number < 0 || workspace_number >= screen->getCount())
321 workspace_number = screen->getCurrentWorkspaceID(); 321 workspace_number = screen->getCurrentWorkspaceID();
322 322