aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/pool-buffer.c2
-rw-r--r--sway/desktop/layer_shell.c5
-rw-r--r--sway/desktop/output.c25
-rw-r--r--sway/desktop/xwayland.c18
-rw-r--r--sway/input/cursor.c32
-rw-r--r--sway/tree/layout.c2
6 files changed, 49 insertions, 35 deletions
diff --git a/client/pool-buffer.c b/client/pool-buffer.c
index 93cfcfc5..b5ed9c98 100644
--- a/client/pool-buffer.c
+++ b/client/pool-buffer.c
@@ -57,7 +57,7 @@ static struct pool_buffer *create_buffer(struct wl_shm *shm,
char *name;
int fd = create_pool_file(size, &name);
- assert(fd);
+ assert(fd != -1);
void *data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
struct wl_shm_pool *pool = wl_shm_create_pool(shm, fd, size);
buf->buffer = wl_shm_pool_create_buffer(pool, 0,
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 5c96659a..c18f51c7 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -238,11 +238,12 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
wl_list_remove(&sway_layer->unmap.link);
wl_list_remove(&sway_layer->surface_commit.link);
if (sway_layer->layer_surface->output != NULL) {
+ struct sway_output *output = sway_layer->layer_surface->output->data;
+ arrange_layers(output);
+
wl_list_remove(&sway_layer->output_destroy.link);
}
- struct sway_output *output = sway_layer->layer_surface->output->data;
free(sway_layer);
- arrange_layers(output);
}
static void handle_map(struct wl_listener *listener, void *data) {
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c248b29e..0d706c52 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -243,14 +243,25 @@ static void render_output(struct sway_output *output, struct timespec *when,
struct sway_view *view;
wl_list_for_each(view, &root_container.sway_root->unmanaged_views,
unmanaged_view_link) {
- if (view->type == SWAY_XWAYLAND_VIEW) {
- // the only kind of unamanged view right now is xwayland override
- // redirect
- int view_x = view->wlr_xwayland_surface->x;
- int view_y = view->wlr_xwayland_surface->y;
- render_surface(view->surface, wlr_output, &output->last_frame,
- view_x, view_y, 0);
+ if (view->type != SWAY_XWAYLAND_VIEW) {
+ continue;
}
+
+ struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+
+ const struct wlr_box view_box = {
+ .x = xsurface->x,
+ .y = xsurface->y,
+ .width = xsurface->width,
+ .height = xsurface->height,
+ };
+ struct wlr_box intersection;
+ if (!wlr_box_intersection(&view_box, output_box, &intersection)) {
+ continue;
+ }
+
+ render_surface(view->surface, wlr_output, &output->last_frame,
+ view_box.x - output_box->x, view_box.y - output_box->y, 0);
}
// TODO: Consider revising this when fullscreen windows are supported
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 01c993b3..273ca2bf 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -41,7 +41,7 @@ static void set_size(struct sway_view *view, int width, int height) {
view->sway_xwayland_surface->pending_height = height;
struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
- wlr_xwayland_surface_configure(xsurface, view->swayc->x, view->swayc->y,
+ wlr_xwayland_surface_configure(xsurface, xsurface->x, xsurface->y,
width, height);
}
@@ -67,13 +67,10 @@ static void set_position(struct sway_view *view, double ox, double oy) {
view->swayc->x = ox;
view->swayc->y = oy;
- if (view->width == 0 || view->height == 0) {
- return;
- }
-
wlr_xwayland_surface_configure(view->wlr_xwayland_surface,
ox + loutput->x, oy + loutput->y,
- view->width, view->height);
+ view->wlr_xwayland_surface->width,
+ view->wlr_xwayland_surface->height);
}
static void set_activated(struct sway_view *view, bool activated) {
@@ -143,8 +140,11 @@ static void handle_map(struct wl_listener *listener, void *data) {
struct sway_view *view = sway_surface->view;
container_view_destroy(view->swayc);
+ wlr_xwayland_surface_set_maximized(xsurface, true);
+
struct sway_seat *seat = input_manager_current_seat(input_manager);
- struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
+ struct sway_container *focus = sway_seat_get_focus_inactive(seat,
+ &root_container);
struct sway_container *cont = container_view_create(focus, view);
view->swayc = cont;
arrange_windows(cont->parent, -1, -1);
@@ -154,7 +154,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
view_damage_whole(sway_surface->view);
}
-static void handle_configure_request(struct wl_listener *listener, void *data) {
+static void handle_request_configure(struct wl_listener *listener, void *data) {
struct sway_xwayland_surface *sway_surface =
wl_container_of(listener, sway_surface, request_configure);
struct wlr_xwayland_surface_configure_event *ev = data;
@@ -209,7 +209,7 @@ void handle_xwayland_surface(struct wl_listener *listener, void *data) {
wl_signal_add(&xsurface->events.request_configure,
&sway_surface->request_configure);
- sway_surface->request_configure.notify = handle_configure_request;
+ sway_surface->request_configure.notify = handle_request_configure;
wl_signal_add(&xsurface->events.unmap, &sway_surface->unmap);
sway_surface->unmap.notify = handle_unmap;
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 4a3f558d..d608a9cf 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -50,21 +50,23 @@ static struct sway_container *container_at_cursor(struct sway_cursor *cursor,
struct wl_list *unmanaged = &root_container.sway_root->unmanaged_views;
struct sway_view *view;
wl_list_for_each_reverse(view, unmanaged, unmanaged_view_link) {
- if (view->type == SWAY_XWAYLAND_VIEW) {
- struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
- struct wlr_box box = {
- .x = xsurface->x,
- .y = xsurface->y,
- .width = xsurface->width,
- .height = xsurface->height,
- };
-
- if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
- *surface = xsurface->surface;
- *sx = cursor->x - box.x;
- *sy = cursor->y - box.y;
- return NULL;
- }
+ if (view->type != SWAY_XWAYLAND_VIEW) {
+ continue;
+ }
+
+ struct wlr_xwayland_surface *xsurface = view->wlr_xwayland_surface;
+ struct wlr_box box = {
+ .x = xsurface->x,
+ .y = xsurface->y,
+ .width = xsurface->width,
+ .height = xsurface->height,
+ };
+
+ if (wlr_box_contains_point(&box, cursor->x, cursor->y)) {
+ *surface = xsurface->surface;
+ *sx = cursor->x - box.x;
+ *sy = cursor->y - box.y;
+ return NULL;
}
}
diff --git a/sway/tree/layout.c b/sway/tree/layout.c
index 588ceb2d..ce0682dc 100644
--- a/sway/tree/layout.c
+++ b/sway/tree/layout.c
@@ -107,7 +107,7 @@ struct sway_container *container_reap_empty(struct sway_container *container) {
return NULL;
}
wlr_log(L_DEBUG, "reaping %p %s", container, container->name);
- while (container->children->length == 0) {
+ while (container != &root_container && container->children->length == 0) {
if (container->type == C_WORKSPACE) {
if (!workspace_is_visible(container)) {
struct sway_container *parent = container->parent;
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-31 06:18:11 +0000