itycodes
/
wlseeds
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix laggy move-resize in xdg-shell

Browse Source
master
emersion 7 years ago
parent 80caaf8fcc
commit 3e3209cba2
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
3 changed files with 62 additions and 42 deletions
Show Stats Download Patch File Download Diff File

6
include/rootston/view.h
Unescape View File

@ -26,6 +26,12 @@ struct roots_xdg_surface_v6 {
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener request_move; struct wl_listener request_move;
struct wl_listener request_resize; struct wl_listener request_resize;
struct {
bool needs_move;
double x, y;
uint32_t width, height;
} move_resize;
}; };
struct roots_xwayland_surface { struct roots_xwayland_surface {

76
rootston/xdg_shell_v6.c
Unescape View File

@ -12,27 +12,26 @@
static void get_size(struct roots_view *view, struct wlr_box *box) { static void get_size(struct roots_view *view, struct wlr_box *box) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
// TODO: surf->geometry can be NULL // TODO: surface->geometry can be NULL
memcpy(box, surf->geometry, sizeof(struct wlr_box)); memcpy(box, surface->geometry, sizeof(struct wlr_box));
} }
static void activate(struct roots_view *view, bool active) { static void activate(struct roots_view *view, bool active) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_v6_set_activated(surf, active); wlr_xdg_toplevel_v6_set_activated(surface, active);
} }
} }
static void apply_size_constraints(struct wlr_xdg_surface_v6 *surf, static void apply_size_constraints(struct wlr_xdg_surface_v6 *surface,
uint32_t width, uint32_t height, uint32_t *dest_width, uint32_t width, uint32_t height, uint32_t *dest_width,
uint32_t *dest_height) { uint32_t *dest_height) {
*dest_width = width; *dest_width = width;
*dest_height = height; *dest_height = height;
struct wlr_xdg_toplevel_v6_state *state = struct wlr_xdg_toplevel_v6_state *state = &surface->toplevel_state->current;
&surf->toplevel_state->current;
if (width < state->min_width) { if (width < state->min_width) {
*dest_width = state->min_width; *dest_width = state->min_width;
} else if (state->max_width > 0 && } else if (state->max_width > 0 &&
@ -49,46 +48,50 @@ static void apply_size_constraints(struct wlr_xdg_surface_v6 *surf,
static void resize(struct roots_view *view, uint32_t width, uint32_t height) { static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
return; return;
} }
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(surf, width, height, &contrained_width, apply_size_constraints(surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height); wlr_xdg_toplevel_v6_set_size(surface, constrained_width,
constrained_height);
} }
static void move_resize(struct roots_view *view, double x, double y, static void move_resize(struct roots_view *view, double x, double y,
uint32_t width, uint32_t height) { uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct roots_xdg_surface_v6 *roots_surface = view->roots_xdg_surface_v6;
if (surf->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surface->role != WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
return; return;
} }
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(surf, width, height, &contrained_width, apply_size_constraints(surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
x = x + width - contrained_width; x = x + width - constrained_width;
y = y + height - contrained_height; y = y + height - constrained_height;
// TODO: we should wait for an ack_configure event before updating the roots_surface->move_resize.needs_move = true;
// position roots_surface->move_resize.x = x;
view->x = x; roots_surface->move_resize.y = y;
view->y = y; roots_surface->move_resize.width = constrained_width;
roots_surface->move_resize.height = constrained_height;
wlr_xdg_toplevel_v6_set_size(surf, contrained_width, contrained_height); wlr_xdg_toplevel_v6_set_size(surface, constrained_width,
constrained_height);
} }
static void close(struct roots_view *view) { static void close(struct roots_view *view) {
assert(view->type == ROOTS_XDG_SHELL_V6_VIEW); assert(view->type == ROOTS_XDG_SHELL_V6_VIEW);
struct wlr_xdg_surface_v6 *surf = view->xdg_surface_v6; struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (surf->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) { if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
wlr_xdg_toplevel_v6_send_close(surf); wlr_xdg_toplevel_v6_send_close(surface);
} }
} }
@ -119,7 +122,18 @@ static void handle_request_resize(struct wl_listener *listener, void *data) {
} }
static void handle_commit(struct wl_listener *listener, void *data) { static void handle_commit(struct wl_listener *listener, void *data) {
// TODO is there anything we need to do here? struct roots_xdg_surface_v6 *roots_surface =
wl_container_of(listener, roots_surface, commit);
struct roots_view *view = roots_surface->view;
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
if (roots_surface->move_resize.needs_move) {
view->x = roots_surface->move_resize.x +
roots_surface->move_resize.width - surface->geometry->width;
view->y = roots_surface->move_resize.y +
roots_surface->move_resize.height - surface->geometry->height;
roots_surface->move_resize.needs_move = false;
}
} }
static void handle_destroy(struct wl_listener *listener, void *data) { static void handle_destroy(struct wl_listener *listener, void *data) {

22
rootston/xwayland.c
Unescape View File

@ -52,13 +52,13 @@ static void resize(struct roots_view *view, uint32_t width, uint32_t height) {
assert(view->type == ROOTS_XWAYLAND_VIEW); assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface; struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(xwayland_surface, width, height, &contrained_width, apply_size_constraints(xwayland_surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface, wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
xwayland_surface->x, xwayland_surface->y, contrained_width, xwayland_surface->x, xwayland_surface->y, constrained_width,
contrained_height); constrained_height);
} }
static void move_resize(struct roots_view *view, double x, double y, static void move_resize(struct roots_view *view, double x, double y,
@ -66,18 +66,18 @@ static void move_resize(struct roots_view *view, double x, double y,
assert(view->type == ROOTS_XWAYLAND_VIEW); assert(view->type == ROOTS_XWAYLAND_VIEW);
struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface; struct wlr_xwayland_surface *xwayland_surface = view->xwayland_surface;
uint32_t contrained_width, contrained_height; uint32_t constrained_width, constrained_height;
apply_size_constraints(xwayland_surface, width, height, &contrained_width, apply_size_constraints(xwayland_surface, width, height, &constrained_width,
&contrained_height); &constrained_height);
x = x + width - contrained_width; x = x + width - constrained_width;
y = y + height - contrained_height; y = y + height - constrained_height;
view->x = x; view->x = x;
view->y = y; view->y = y;
wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface, wlr_xwayland_surface_configure(view->desktop->xwayland, xwayland_surface,
x, y, contrained_width, contrained_height); x, y, constrained_width, constrained_height);
} }
static void close(struct roots_view *view) { static void close(struct roots_view *view) {

Write Preview
Loading…
Cancel
Save