diff options
Diffstat (limited to 'xevents.c')
| -rw-r--r-- | xevents.c | 22 |
1 files changed, 5 insertions, 17 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: xevents.c,v 1.6 2008/03/22 14:09:02 oga Exp $ + * $Id: xevents.c,v 1.7 2008/03/22 15:09:45 oga Exp $ */ /* @@ -330,7 +330,7 @@ xev_handle_buttonpress(struct xevent *xev, XEvent *ee) switch (e->button) { case Button1: - if (altcontrol && !Groupmode) + if (altcontrol) group_sticky_toggle_enter(cc); else { grab_drag(cc); @@ -338,13 +338,8 @@ xev_handle_buttonpress(struct xevent *xev, XEvent *ee) } break; case Button2: - /* XXXSIGH!!! */ - if (Groupmode) - group_click(cc); - else { - grab_sweep(cc); - client_resize(cc); - } + grab_sweep(cc); + client_resize(cc); break; case Button3: client_ptrsave(cc); @@ -360,7 +355,7 @@ xev_handle_buttonrelease(struct xevent *xev, XEvent *ee) { struct client_ctx *cc = client_current(); - if (cc != NULL && !Groupmode) + if (cc != NULL) group_sticky_toggle_exit(cc); xev_register(xev); @@ -394,9 +389,6 @@ xev_handle_keypress(struct xevent *xev, XEvent *ee) break; } - if (kb == NULL && e->window == screen_current()->groupwin) - group_display_keypress(e->keycode); - if (kb == NULL) goto out; @@ -510,15 +502,11 @@ void xev_handle_expose(struct xevent *xev, XEvent *ee) { XExposeEvent *e = &ee->xexpose; - struct screen_ctx *sc = screen_current(); struct client_ctx *cc; if ((cc = client_find(e->window)) != NULL) client_draw_border(cc); - if (sc->groupwin == e->window) - group_display_draw(sc); - xev_register(xev); } |