diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2014-05-06 08:50:47 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2014-05-12 23:34:05 -0700 |
| commit | 5befdda84fe7cb2fb6d5d8986a5b8552a1372b8a (patch) | |
| tree | 91b4d64e1f880f5e1aeb8162dc8aa9c8721bff4f /clients/window.c | |
| parent | ab2c10813766e3cd3f5228385eb4984565fb2f26 (diff) | |
| download | weston-5befdda84fe7cb2fb6d5d8986a5b8552a1372b8a.tar.gz | |
xdg-shell: Turn the resizing heuristics into an explicit state
Currently, there's a race condition. When resizing from the left, and
a client attaches a buffer after the resize ends, you suddenly see the
buffer jump to the right, because the resize ended while multiple
attaches were in-flight. Making resize a state can fix this, as the
server can now know exactly when the resize ended, and whether a commit
was before or after that place.
We don't implement the correct tracking in this commit; that's left as
an exercise to the reader.
Additionally, clients like terminals might want to display resize popups
to display the number of cells when in a resize. They can use the hint
here to figure out whether they are resizing.
Diffstat (limited to 'clients/window.c')
| -rw-r--r-- | clients/window.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/clients/window.c b/clients/window.c index 9ec12c7e..6149618a 100644 --- a/clients/window.c +++ b/clients/window.c @@ -2387,7 +2387,6 @@ frame_handle_status(struct window_frame *frame, struct input *input, if ((status & FRAME_STATUS_RESIZE) && window->xdg_surface) { input_ungrab(input); - window->resizing = 1; xdg_surface_resize(window->xdg_surface, input_get_seat(input), window->display->serial, @@ -2623,12 +2622,6 @@ pointer_handle_enter(void *data, struct wl_pointer *pointer, input->pointer_enter_serial = serial; input->pointer_focus = window; - if (window->resizing) { - window->resizing = 0; - /* Schedule a redraw to free the pool */ - window_schedule_redraw(window); - } - input->sx = sx; input->sy = sy; @@ -3873,6 +3866,7 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface, window->maximized = 0; window->fullscreen = 0; + window->resizing = 0; wl_array_for_each(p, states) { uint32_t state = *p; @@ -3883,6 +3877,9 @@ handle_surface_configure(void *data, struct xdg_surface *xdg_surface, case XDG_SURFACE_STATE_FULLSCREEN: window->fullscreen = 1; break; + case XDG_SURFACE_STATE_RESIZING: + window->resizing = 1; + break; default: /* Unknown state */ break; |