• Pekka Paalanen's avatar
    xwm: do not draw decor twice on map · ad0da459
    Pekka Paalanen authored
    Normal windows enter the MapRequest handler, which schedules drawing the
    decorations. Then Xwayland realizes the window, which ends with a call
    to xserver_map_shell_surface(). The decorations are already drawn, no
    need to draw them a second time. However, MapRequest handler could not
    set the pending state because the weston_surface did not exist at the
    time, because it gets created only when Xwayland realizes the window,
    which happens after XWM has forwarded the MapWindow in MapRequest
    handler. Therefore set the pending state explicitly at the end.
    Scheduling had it done much later anyway.
    Now that the pending state is set much earlier, it seems to be more
    likely that it gets set before Xwayland's first commit is handled. This
    means that -geometry command line option of X11 apps already takes the
    geometry (decorations) into account. I do not think it is reliable yet,
    There is still the race between Xwayland committing and XWM setting the
    pending state assuming the very next commit latches it in appropriately.
    The race exists not because of Wayland, but because WL_SURFACE_ID comes
    via X11, and could be processed after wl_compositor.create_surface and
    wl_surface.commit. That commit/pending race is solved by a following patch.
    For override-redirect windows weston_wm_window_schedule_repaint()
    reduced into a call to weston_wm_window_set_pending_state_OR(), so we
    can just call that directly. It should not matter that the call is moved
    to the end of the function.
    Signed-off-by: Pekka Paalanen's avatarPekka Paalanen <pekka.paalanen@collabora.co.uk>
    Reviewed-by: Louis-Francis Ratté-Boulianne's avatarLouis-Francis Ratté-Boulianne <lfrb@collabora.com>
    Acked-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
Last commit
Last update
dnd.c Loading commit data...
hash.c Loading commit data...
hash.h Loading commit data...
launcher.c Loading commit data...
selection.c Loading commit data...
window-manager.c Loading commit data...
xwayland-api.h Loading commit data...
xwayland-internal-interface.h Loading commit data...
xwayland.h Loading commit data...