From e833ab06d658d9741a80b0a42a413243a61626b6 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Sat, 5 Jan 2008 18:31:01 +0100 Subject: [PATCH] Revert "honor configrequest" This reverts commit 1eebcd74cd00d4d28d962fa1d3204323449cf735. --- event.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/event.c b/event.c index 56e1cf8c..a82e3eac 100644 --- a/event.c +++ b/event.c @@ -143,29 +143,33 @@ handle_event_configurerequest(XEvent * e) if((c = get_client_bywin(globalconf.clients, ev->window))) { - if(ev->value_mask & CWX) - c->rx = c->x = ev->x - c->border; - if(ev->value_mask & CWY) - c->ry = c->y = ev->y - c->border; - if(ev->value_mask & CWWidth) - c->rw = c->w = ev->width; - if(ev->value_mask & CWHeight) - c->rh = c->h = ev->height; - if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))) - window_configure(c->win, c->x, c->y, c->w, c->h, c->border); - /* recompute screen */ - old_screen = c->screen; - c->screen = get_screen_bycoord(c->x, c->y); - if(old_screen != c->screen) + if(c->isfixed) { - move_client_to_screen(c, c->screen, False); - statusbar_draw_all(old_screen); - statusbar_draw_all(c->screen); + if(ev->value_mask & CWX) + c->rx = c->x = ev->x - c->border; + if(ev->value_mask & CWY) + c->ry = c->y = ev->y - c->border; + if(ev->value_mask & CWWidth) + c->rw = c->w = ev->width; + if(ev->value_mask & CWHeight) + c->rh = c->h = ev->height; + if((ev->value_mask & (CWX | CWY)) && !(ev->value_mask & (CWWidth | CWHeight))) + window_configure(c->win, c->x, c->y, c->w, c->h, c->border); + /* recompute screen */ + old_screen = c->screen; + c->screen = get_screen_bycoord(c->x, c->y); + if(old_screen != c->screen) + { + move_client_to_screen(c, c->screen, False); + statusbar_draw_all(old_screen); + statusbar_draw_all(c->screen); + } + tag_client_with_rules(c); + XMoveResizeWindow(e->xany.display, c->win, c->rx, c->ry, c->rw, c->rh); + arrange(c->screen); } - tag_client_with_rules(c); - XMoveResizeWindow(e->xany.display, c->win, c->rx, c->ry, c->rw, c->rh); - arrange(c->screen); - window_configure(c->win, c->x, c->y, c->w, c->h, c->border); + else + window_configure(c->win, c->x, c->y, c->w, c->h, c->border); } else {