hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

surface: add WLR_SURFACE_STATE_OFFSET

Browse source 
This indicates whether the surface offset has changed.
This commit is contained in:
Simon Ser 2021-06-29 13:26:31 +02:00
parent 98cf38601f
commit 42d68d7532
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/wlr/types/wlr_compositor.h
View file

@ -28,6 +28,7 @@ enum wlr_surface_state_field {
WLR_SURFACE_STATE_SCALE = 1 << 6, WLR_SURFACE_STATE_SCALE = 1 << 6,
WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 1 << 7, WLR_SURFACE_STATE_FRAME_CALLBACK_LIST = 1 << 7,
WLR_SURFACE_STATE_VIEWPORT = 1 << 8, WLR_SURFACE_STATE_VIEWPORT = 1 << 8,
WLR_SURFACE_STATE_OFFSET = 1 << 9,
}; };
struct wlr_surface_state { struct wlr_surface_state {

12
types/wlr_compositor.c
View file

@ -53,7 +53,8 @@ static void surface_handle_attach(struct wl_client *client,
} }
} }
surface->pending.committed |= WLR_SURFACE_STATE_BUFFER; surface->pending.committed |=
WLR_SURFACE_STATE_BUFFER | WLR_SURFACE_STATE_OFFSET;
surface->pending.dx = dx; surface->pending.dx = dx;
surface->pending.dy = dy; surface->pending.dy = dy;
@ -279,11 +280,14 @@ static void surface_state_move(struct wlr_surface_state *state,
if (next->committed & WLR_SURFACE_STATE_TRANSFORM) { if (next->committed & WLR_SURFACE_STATE_TRANSFORM) {
state->transform = next->transform; state->transform = next->transform;
} }
if (next->committed & WLR_SURFACE_STATE_BUFFER) { if (next->committed & WLR_SURFACE_STATE_OFFSET) {
state->dx = next->dx; state->dx = next->dx;
state->dy = next->dy; state->dy = next->dy;
next->dx = next->dy = 0; next->dx = next->dy = 0;
} else {
state->dx = state->dy = 0;
}
if (next->committed & WLR_SURFACE_STATE_BUFFER) {
wlr_buffer_unlock(state->buffer); wlr_buffer_unlock(state->buffer);
state->buffer = NULL; state->buffer = NULL;
if (next->buffer) { if (next->buffer) {
@ -291,8 +295,6 @@ static void surface_state_move(struct wlr_surface_state *state,
} }
wlr_buffer_unlock(next->buffer); wlr_buffer_unlock(next->buffer);
next->buffer = NULL; next->buffer = NULL;
} else {
state->dx = state->dy = 0;
} }
if (next->committed & WLR_SURFACE_STATE_SURFACE_DAMAGE) { if (next->committed & WLR_SURFACE_STATE_SURFACE_DAMAGE) {
pixman_region32_copy(&state->surface_damage, &next->surface_damage); pixman_region32_copy(&state->surface_damage, &next->surface_damage);