Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement surface-invalidation-v1 #269

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement surface-invalidation-v1 #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions include/swaylock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct swaylock_state {
bool run_display;
struct ext_session_lock_manager_v1 *ext_session_lock_manager_v1;
struct ext_session_lock_v1 *ext_session_lock_v1;
struct wp_surface_invalidation_manager_v1 *surface_invalidation_manager_v1;
};

struct swaylock_surface {
Expand All @@ -103,6 +104,8 @@ struct swaylock_surface {
struct wl_subsurface *subsurface;
struct zwlr_layer_surface_v1 *layer_surface;
struct ext_session_lock_surface_v1 *ext_session_lock_surface_v1;
struct wp_surface_invalidation_v1 *surface_inval_surface;
struct wp_surface_invalidation_v1 *surface_inval_child;
struct pool_buffer buffers[2];
struct pool_buffer indicator_buffers[2];
bool frame_pending, dirty;
Expand Down
41 changes: 41 additions & 0 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "wlr-input-inhibitor-unstable-v1-client-protocol.h"
#include "wlr-layer-shell-unstable-v1-client-protocol.h"
#include "ext-session-lock-v1-client-protocol.h"
#include "surface-invalidation-v1-client-protocol.h"

static uint32_t parse_color(const char *color) {
if (color[0] == '#') {
Expand Down Expand Up @@ -126,6 +127,38 @@ static bool surface_is_opaque(struct swaylock_surface *surface) {
return (surface->state->args.colors.background & 0xff) == 0xff;
}

static void surface_invalidation_handle_invalidated(void *data,
struct wp_surface_invalidation_v1 *wp_surface_invalidation_v1, uint32_t serial) {
struct swaylock_surface *surface = data;
wp_surface_invalidation_v1_ack(wp_surface_invalidation_v1, serial);

if (wp_surface_invalidation_v1 == surface->surface_inval_surface) {
render_frame_background(surface);
} else if (wp_surface_invalidation_v1 == surface->surface_inval_child) {
render_frame(surface);
} else {
assert(false);
}
}

static struct wp_surface_invalidation_v1_listener surface_invalidation_listener = {
.invalidated = surface_invalidation_handle_invalidated,
};

struct wp_surface_invalidation_v1 *attach_surface_invalidation(
struct swaylock_surface *surface, struct wl_surface *wl_surface) {
if (!surface->state->surface_invalidation_manager_v1) {
return NULL;
}

struct wp_surface_invalidation_v1 *surface_inval =
wp_surface_invalidation_manager_v1_get_surface_invalidation(
surface->state->surface_invalidation_manager_v1, wl_surface);
wp_surface_invalidation_v1_add_listener(surface_inval,
&surface_invalidation_listener, surface);
return surface_inval;
}

static void create_surface(struct swaylock_surface *surface) {
struct swaylock_state *state = surface->state;

Expand All @@ -140,6 +173,11 @@ static void create_surface(struct swaylock_surface *surface) {
assert(surface->subsurface);
wl_subsurface_set_sync(surface->subsurface);

surface->surface_inval_surface =
attach_surface_invalidation(surface, surface->surface);
surface->surface_inval_child =
attach_surface_invalidation(surface, surface->child);

if (state->ext_session_lock_v1) {
surface->ext_session_lock_surface_v1 = ext_session_lock_v1_get_lock_surface(
state->ext_session_lock_v1, surface->surface, surface->output);
Expand Down Expand Up @@ -373,6 +411,9 @@ static void handle_global(void *data, struct wl_registry *registry,
} else if (strcmp(interface, ext_session_lock_manager_v1_interface.name) == 0) {
state->ext_session_lock_manager_v1 = wl_registry_bind(registry, name,
&ext_session_lock_manager_v1_interface, 1);
} else if (strcmp(interface, wp_surface_invalidation_manager_v1_interface.name) == 0) {
state->surface_invalidation_manager_v1 = wl_registry_bind(registry, name,
&wp_surface_invalidation_manager_v1_interface, 1);
}
}

Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ wayland_scanner_client = generator(
client_protocols = [
wl_protocol_dir / 'stable/xdg-shell/xdg-shell.xml',
wl_protocol_dir / 'staging/ext-session-lock/ext-session-lock-v1.xml',
wl_protocol_dir / 'staging/surface-invalidation/surface-invalidation-v1.xml',
'wlr-layer-shell-unstable-v1.xml',
'wlr-input-inhibitor-unstable-v1.xml',
]
Expand Down