diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-19 15:52:46 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-07-19 15:52:46 -0400 |
| commit | 7f741ba919c058ef1106e45ccd60c6554ebd251c (patch) | |
| tree | 16dff84518438563e95ae064ee3608cd7812f85d /openbox | |
| parent | 730062cac9fdb38a3df332fdff06ce7ec9742fe8 (diff) | |
don't resist when resizing terminals with the keyboard
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/moveresize.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/openbox/moveresize.c b/openbox/moveresize.c index 7388107d..11cf563d 100644 --- a/openbox/moveresize.c +++ b/openbox/moveresize.c @@ -531,7 +531,7 @@ static void move_with_keys(gint keycode, gint state) static void resize_with_keys(gint keycode, gint state) { gint dw = 0, dh = 0, pdx = 0, pdy = 0, opx, opy, px, py; - gint dist = 0; + gint dist = 0, resist = 0; ObDirection dir; ObCorner cor; @@ -595,18 +595,30 @@ static void resize_with_keys(gint keycode, gint state) gint distw, disth; /* control means fine grained */ - if (moveresize_client->size_inc.width > 1) + if (moveresize_client->size_inc.width > 1) { distw = moveresize_client->size_inc.width; - else if (state & modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL)) + resist = 1; + } + else if (state & modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL)) { distw = 1; - else + resist = 1; + } + else { distw = KEY_DIST; - if (moveresize_client->size_inc.height > 1) + resist = KEY_DIST; + } + if (moveresize_client->size_inc.height > 1) { disth = moveresize_client->size_inc.height; - else if (state & modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL)) + resist = 1; + } + else if (state & modkeys_key_to_mask(OB_MODKEY_KEY_CONTROL)) { disth = 1; - else + resist = 1; + } + else { disth = KEY_DIST; + resist = KEY_DIST; + } if (key_resize_edge == OB_DIRECTION_WEST) { if (dir == OB_DIRECTION_WEST) @@ -644,7 +656,7 @@ static void resize_with_keys(gint keycode, gint state) else if (key_resize_edge == OB_DIRECTION_SOUTH) cor = OB_CORNER_TOPLEFT; - calc_resize(TRUE, dist, &dw, &dh, cor); + calc_resize(TRUE, resist, &dw, &dh, cor); if (key_resize_edge == OB_DIRECTION_WEST) cur_x -= dw; else if (key_resize_edge == OB_DIRECTION_NORTH) |