diff options
| author | Vito Caputo <vcaputo@gnugeneration.com> | 2016-11-10 19:04:39 -0800 |
|---|---|---|
| committer | Vito Caputo <vcaputo@gnugeneration.com> | 2016-11-10 19:25:08 -0800 |
| commit | 95bfa88795a34b177fc8c31ad920186528d43ebc (patch) | |
| tree | 3e031697d99616113969f8cce38d30880c4e5522 /src/key.c | |
| parent | a1aba8e0fe5c94ebf04258b609666c92b756954f (diff) | |
key: decrement key_is_grabbed release of multi-Alt
Upon releasing all keys concluding a grab the counter gets reset so this isn't
generally observed as being a problem.
Sometimes the second Alt is released by itself, restoring the origin, and the
original grabbing single Alt persists for subsequent window management
operations. It's in this situation when the bug manifests. If the final Alt
release occurred with a focused window/desktop differing from the origin, on
the final Alt release an unexpected restore to the origin occurred.
Usually this goes unnoticed, because typically the lone Alt release occurs
immediately following the other one, and the second restore to origin happens
to be idempotent.
Diffstat (limited to 'src/key.c')
| -rw-r--r-- | src/key.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -57,10 +57,13 @@ void vwm_key_released(vwm_t *vwm, Window win, XKeyReleasedEvent *keyrelease) VWM_TRACE("XK_Alt_[LR] released"); /* aborted? try restore focused_origin */ - if (key_is_grabbed > 1 && vwm->focused_origin) { - VWM_TRACE("restoring %p on %p", vwm->focused_origin, vwm->focused_origin->desktop); - vwm_desktop_focus(vwm, vwm->focused_origin->desktop); - vwm_win_focus(vwm, vwm->focused_origin); + if (key_is_grabbed > 1) { + key_is_grabbed--; /* This is important to prevent treating the final lone Alt release as another cancel/rollback. */ + if (vwm->focused_origin) { + VWM_TRACE("restoring %p on %p", vwm->focused_origin, vwm->focused_origin->desktop); + vwm_desktop_focus(vwm, vwm->focused_origin->desktop); + vwm_win_focus(vwm, vwm->focused_origin); + } } /* make the focused window the most recently used */ |