|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <wayland-server-core.h>
|
|
|
|
|
#include <wlr/types/wlr_box.h>
|
|
|
|
|
#include <wlr/types/wlr_layer_shell_v1.h>
|
|
|
|
|
#include <wlr/types/wlr_output_damage.h>
|
|
|
|
|
#include <wlr/types/wlr_output.h>
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "sway/desktop/transaction.h"
|
|
|
|
|
#include "sway/input/cursor.h"
|
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
|
#include "sway/layers.h"
|
|
|
|
|
#include "sway/output.h"
|
|
|
|
|
#include "sway/server.h"
|
|
|
|
|
#include "sway/tree/arrange.h"
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
|
|
|
|
|
static void apply_exclusive(struct wlr_box *usable_area,
|
|
|
|
|
uint32_t anchor, int32_t exclusive,
|
|
|
|
|
int32_t margin_top, int32_t margin_right,
|
|
|
|
|
int32_t margin_bottom, int32_t margin_left) {
|
|
|
|
|
if (exclusive <= 0) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct {
|
|
|
|
|
uint32_t singular_anchor;
|
|
|
|
|
uint32_t anchor_triplet;
|
|
|
|
|
int *positive_axis;
|
|
|
|
|
int *negative_axis;
|
|
|
|
|
int margin;
|
|
|
|
|
} edges[] = {
|
|
|
|
|
// Top
|
|
|
|
|
{
|
|
|
|
|
.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
|
|
|
|
|
.anchor_triplet =
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP,
|
|
|
|
|
.positive_axis = &usable_area->y,
|
|
|
|
|
.negative_axis = &usable_area->height,
|
|
|
|
|
.margin = margin_top,
|
|
|
|
|
},
|
|
|
|
|
// Bottom
|
|
|
|
|
{
|
|
|
|
|
.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
|
|
|
|
.anchor_triplet =
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
|
|
|
|
.positive_axis = NULL,
|
|
|
|
|
.negative_axis = &usable_area->height,
|
|
|
|
|
.margin = margin_bottom,
|
|
|
|
|
},
|
|
|
|
|
// Left
|
|
|
|
|
{
|
|
|
|
|
.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT,
|
|
|
|
|
.anchor_triplet =
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
|
|
|
|
.positive_axis = &usable_area->x,
|
|
|
|
|
.negative_axis = &usable_area->width,
|
|
|
|
|
.margin = margin_left,
|
|
|
|
|
},
|
|
|
|
|
// Right
|
|
|
|
|
{
|
|
|
|
|
.singular_anchor = ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT,
|
|
|
|
|
.anchor_triplet =
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP |
|
|
|
|
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM,
|
|
|
|
|
.positive_axis = NULL,
|
|
|
|
|
.negative_axis = &usable_area->width,
|
|
|
|
|
.margin = margin_right,
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
for (size_t i = 0; i < sizeof(edges) / sizeof(edges[0]); ++i) {
|
|
|
|
|
if ((anchor == edges[i].singular_anchor || anchor == edges[i].anchor_triplet)
|
|
|
|
|
&& exclusive + edges[i].margin > 0) {
|
|
|
|
|
if (edges[i].positive_axis) {
|
|
|
|
|
*edges[i].positive_axis += exclusive + edges[i].margin;
|
|
|
|
|
}
|
|
|
|
|
if (edges[i].negative_axis) {
|
|
|
|
|
*edges[i].negative_axis -= exclusive + edges[i].margin;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void arrange_layer(struct sway_output *output, struct wl_list *list,
|
|
|
|
|
struct wlr_box *usable_area, bool exclusive) {
|
|
|
|
|
struct sway_layer_surface *sway_layer;
|
|
|
|
|
struct wlr_box full_area = { 0 };
|
|
|
|
|
wlr_output_effective_resolution(output->wlr_output,
|
|
|
|
|
&full_area.width, &full_area.height);
|
|
|
|
|
wl_list_for_each(sway_layer, list, link) {
|
|
|
|
|
struct wlr_layer_surface_v1 *layer = sway_layer->layer_surface;
|
|
|
|
|
struct wlr_layer_surface_v1_state *state = &layer->current;
|
|
|
|
|
if (exclusive != (state->exclusive_zone > 0)) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_box bounds;
|
|
|
|
|
if (state->exclusive_zone == -1) {
|
|
|
|
|
bounds = full_area;
|
|
|
|
|
} else {
|
|
|
|
|
bounds = *usable_area;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_box box = {
|
|
|
|
|
.width = state->desired_width,
|
|
|
|
|
.height = state->desired_height
|
|
|
|
|
};
|
|
|
|
|
// Horizontal axis
|
|
|
|
|
const uint32_t both_horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT
|
|
|
|
|
| ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
|
|
|
|
if ((state->anchor & both_horiz) && box.width == 0) {
|
|
|
|
|
box.x = bounds.x;
|
|
|
|
|
box.width = bounds.width;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
|
|
|
|
|
box.x = bounds.x;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
|
|
|
|
|
box.x = bounds.x + (bounds.width - box.width);
|
|
|
|
|
} else {
|
|
|
|
|
box.x = bounds.x + ((bounds.width / 2) - (box.width / 2));
|
|
|
|
|
}
|
|
|
|
|
// Vertical axis
|
|
|
|
|
const uint32_t both_vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP
|
|
|
|
|
| ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM;
|
|
|
|
|
if ((state->anchor & both_vert) && box.height == 0) {
|
|
|
|
|
box.y = bounds.y;
|
|
|
|
|
box.height = bounds.height;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
|
|
|
|
|
box.y = bounds.y;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
|
|
|
|
|
box.y = bounds.y + (bounds.height - box.height);
|
|
|
|
|
} else {
|
|
|
|
|
box.y = bounds.y + ((bounds.height / 2) - (box.height / 2));
|
|
|
|
|
}
|
|
|
|
|
// Margin
|
|
|
|
|
if ((state->anchor & both_horiz) == both_horiz) {
|
|
|
|
|
box.x += state->margin.left;
|
|
|
|
|
box.width -= state->margin.left + state->margin.right;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT)) {
|
|
|
|
|
box.x += state->margin.left;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT)) {
|
|
|
|
|
box.x -= state->margin.right;
|
|
|
|
|
}
|
|
|
|
|
if ((state->anchor & both_vert) == both_vert) {
|
|
|
|
|
box.y += state->margin.top;
|
|
|
|
|
box.height -= state->margin.top + state->margin.bottom;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP)) {
|
|
|
|
|
box.y += state->margin.top;
|
|
|
|
|
} else if ((state->anchor & ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM)) {
|
|
|
|
|
box.y -= state->margin.bottom;
|
|
|
|
|
}
|
|
|
|
|
if (box.width < 0 || box.height < 0) {
|
|
|
|
|
// TODO: Bubble up a protocol error?
|
|
|
|
|
wlr_layer_surface_v1_close(layer);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// Apply
|
|
|
|
|
sway_layer->geo = box;
|
|
|
|
|
apply_exclusive(usable_area, state->anchor, state->exclusive_zone,
|
|
|
|
|
state->margin.top, state->margin.right,
|
|
|
|
|
state->margin.bottom, state->margin.left);
|
|
|
|
|
wlr_layer_surface_v1_configure(layer, box.width, box.height);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void arrange_layers(struct sway_output *output) {
|
|
|
|
|
struct wlr_box usable_area = { 0 };
|
|
|
|
|
wlr_output_effective_resolution(output->wlr_output,
|
|
|
|
|
&usable_area.width, &usable_area.height);
|
|
|
|
|
|
|
|
|
|
// Arrange exclusive surfaces from top->bottom
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
|
|
|
|
&usable_area, true);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
|
|
|
|
&usable_area, true);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
|
|
|
|
&usable_area, true);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
|
|
|
|
&usable_area, true);
|
|
|
|
|
|
|
|
|
|
if (memcmp(&usable_area, &output->usable_area,
|
|
|
|
|
sizeof(struct wlr_box)) != 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Usable area changed, rearranging output");
|
|
|
|
|
memcpy(&output->usable_area, &usable_area, sizeof(struct wlr_box));
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
arrange_output(output);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Arrange non-exlusive surfaces from top->bottom
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
|
|
|
|
&usable_area, false);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
|
|
|
|
&usable_area, false);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
|
|
|
|
&usable_area, false);
|
|
|
|
|
arrange_layer(output, &output->layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
|
|
|
|
&usable_area, false);
|
|
|
|
|
|
|
|
|
|
// Find topmost keyboard interactive layer, if such a layer exists
|
|
|
|
|
uint32_t layers_above_shell[] = {
|
|
|
|
|
ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY,
|
|
|
|
|
ZWLR_LAYER_SHELL_V1_LAYER_TOP,
|
|
|
|
|
};
|
|
|
|
|
size_t nlayers = sizeof(layers_above_shell) / sizeof(layers_above_shell[0]);
|
|
|
|
|
struct sway_layer_surface *layer, *topmost = NULL;
|
|
|
|
|
for (size_t i = 0; i < nlayers; ++i) {
|
|
|
|
|
wl_list_for_each_reverse(layer,
|
|
|
|
|
&output->layers[layers_above_shell[i]], link) {
|
|
|
|
|
if (layer->layer_surface->current.keyboard_interactive &&
|
|
|
|
|
layer->layer_surface->mapped) {
|
|
|
|
|
topmost = layer;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (topmost != NULL) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
if (topmost != NULL) {
|
|
|
|
|
seat_set_focus_layer(seat, topmost->layer_surface);
|
|
|
|
|
} else if (seat->focused_layer &&
|
|
|
|
|
!seat->focused_layer->current.keyboard_interactive) {
|
|
|
|
|
seat_set_focus_layer(seat, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Fix seat_set_focus_layer crash when disabling output
This fixes the following crash:
#0 0x00007f7daac3af25 in raise () at /usr/lib/libc.so.6
#1 0x00007f7daac24897 in abort () at /usr/lib/libc.so.6
#2 0x00007f7daac24767 in _nl_load_domain.cold () at /usr/lib/libc.so.6
#3 0x00007f7daac33526 in () at /usr/lib/libc.so.6
#4 0x0000555bfbc35029 in seat_set_focus_layer (seat=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#5 0x0000555bfbc35029 in seat_set_focus_layer (seat=seat@entry=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#6 0x0000555bfbc25899 in handle_output_destroy (listener=0x555bfdb90688, data=<optimized out>)
at ../sway/desktop/layer_shell.c:263
layer = 0x555bfdd6b040
sway_layer = 0x555bfdb90610
seat = 0x555bfd76d860
client = 0x555bfdb76d70
set_focus = <optimized out>
#7 0x0000555bfbc5b669 in wl_signal_emit (data=0x555bfd795930, signal=0x555bfd795ae0)
at /usr/include/wayland-server-core.h:472
l = <optimized out>
next = 0x555bfdb6a3e8
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#8 0x0000555bfbc5b669 in output_disable (output=output@entry=0x555bfd795930)
at ../sway/tree/output.c:263
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#9 0x0000555bfbc3b890 in apply_output_config (oc=0x555bfd7d73d0, output=output@entry=0x555bfd795930)
at ../sway/config/output.c:321
wlr_output = 0x555bfd7afaf0
scale = <optimized out>
output_box = <optimized out>
#10 0x0000555bfbc28309 in handle_output_manager_apply
(listener=0x555bfbc7f148 <server+488>, data=0x555bfdca6eb0) at ../sway/desktop/output.c:936
wlr_output = <optimized out>
output = 0x555bfd795930
oc = <optimized out>
server = 0x555bfbc7ef60 <server>
config = 0x555bfdca6eb0
config_head = 0x555bfdb79350
ok = true
#11 0x00007f7dab4fbf7c in wlr_signal_emit_safe (signal=<optimized out>, data=0x555bfdca6eb0)
at ../subprojects/wlroots/util/signal.c:29
pos = 0x555bfbc7f148 <server+488>
l = 0x555bfbc7f148 <server+488>
cursor =
{link = {prev = 0x555bfbc7f148 <server+488>, next = 0x7fff238a8390}, notify = 0x7f7dab4fbef0 <handle_noop>}
end =
{link = {prev = 0x7fff238a8370, next = 0x555bfd7419f8}, notify = 0x7f7dab4fbef0 <handle_noop>}
#12 0x00007f7daa45469a in ffi_call_unix64 () at /usr/lib/libffi.so.6
#13 0x00007f7daa453fb6 in ffi_call () at /usr/lib/libffi.so.6
#14 0x00007f7daae6f82f in () at /usr/lib/libwayland-server.so.0
#15 0x00007f7daae6c193 in () at /usr/lib/libwayland-server.so.0
#16 0x00007f7daae6d7f2 in wl_event_loop_dispatch () at /usr/lib/libwayland-server.so.0
#17 0x00007f7daae6c39c in wl_display_run () at /usr/lib/libwayland-server.so.0
This crash happens because focus can only be set on mapped surfaces.
5 years ago
|
|
|
static struct sway_layer_surface *find_mapped_layer_by_client(
|
|
|
|
|
struct wl_client *client, struct wlr_output *ignore_output) {
|
|
|
|
|
for (int i = 0; i < root->outputs->length; ++i) {
|
|
|
|
|
struct sway_output *output = root->outputs->items[i];
|
|
|
|
|
if (output->wlr_output == ignore_output) {
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
// For now we'll only check the overlay layer
|
|
|
|
|
struct sway_layer_surface *lsurface;
|
|
|
|
|
wl_list_for_each(lsurface,
|
|
|
|
|
&output->layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) {
|
|
|
|
|
struct wl_resource *resource = lsurface->layer_surface->resource;
|
Fix seat_set_focus_layer crash when disabling output
This fixes the following crash:
#0 0x00007f7daac3af25 in raise () at /usr/lib/libc.so.6
#1 0x00007f7daac24897 in abort () at /usr/lib/libc.so.6
#2 0x00007f7daac24767 in _nl_load_domain.cold () at /usr/lib/libc.so.6
#3 0x00007f7daac33526 in () at /usr/lib/libc.so.6
#4 0x0000555bfbc35029 in seat_set_focus_layer (seat=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#5 0x0000555bfbc35029 in seat_set_focus_layer (seat=seat@entry=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#6 0x0000555bfbc25899 in handle_output_destroy (listener=0x555bfdb90688, data=<optimized out>)
at ../sway/desktop/layer_shell.c:263
layer = 0x555bfdd6b040
sway_layer = 0x555bfdb90610
seat = 0x555bfd76d860
client = 0x555bfdb76d70
set_focus = <optimized out>
#7 0x0000555bfbc5b669 in wl_signal_emit (data=0x555bfd795930, signal=0x555bfd795ae0)
at /usr/include/wayland-server-core.h:472
l = <optimized out>
next = 0x555bfdb6a3e8
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#8 0x0000555bfbc5b669 in output_disable (output=output@entry=0x555bfd795930)
at ../sway/tree/output.c:263
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#9 0x0000555bfbc3b890 in apply_output_config (oc=0x555bfd7d73d0, output=output@entry=0x555bfd795930)
at ../sway/config/output.c:321
wlr_output = 0x555bfd7afaf0
scale = <optimized out>
output_box = <optimized out>
#10 0x0000555bfbc28309 in handle_output_manager_apply
(listener=0x555bfbc7f148 <server+488>, data=0x555bfdca6eb0) at ../sway/desktop/output.c:936
wlr_output = <optimized out>
output = 0x555bfd795930
oc = <optimized out>
server = 0x555bfbc7ef60 <server>
config = 0x555bfdca6eb0
config_head = 0x555bfdb79350
ok = true
#11 0x00007f7dab4fbf7c in wlr_signal_emit_safe (signal=<optimized out>, data=0x555bfdca6eb0)
at ../subprojects/wlroots/util/signal.c:29
pos = 0x555bfbc7f148 <server+488>
l = 0x555bfbc7f148 <server+488>
cursor =
{link = {prev = 0x555bfbc7f148 <server+488>, next = 0x7fff238a8390}, notify = 0x7f7dab4fbef0 <handle_noop>}
end =
{link = {prev = 0x7fff238a8370, next = 0x555bfd7419f8}, notify = 0x7f7dab4fbef0 <handle_noop>}
#12 0x00007f7daa45469a in ffi_call_unix64 () at /usr/lib/libffi.so.6
#13 0x00007f7daa453fb6 in ffi_call () at /usr/lib/libffi.so.6
#14 0x00007f7daae6f82f in () at /usr/lib/libwayland-server.so.0
#15 0x00007f7daae6c193 in () at /usr/lib/libwayland-server.so.0
#16 0x00007f7daae6d7f2 in wl_event_loop_dispatch () at /usr/lib/libwayland-server.so.0
#17 0x00007f7daae6c39c in wl_display_run () at /usr/lib/libwayland-server.so.0
This crash happens because focus can only be set on mapped surfaces.
5 years ago
|
|
|
if (wl_resource_get_client(resource) == client
|
|
|
|
|
&& lsurface->layer_surface->mapped) {
|
|
|
|
|
return lsurface;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_output_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *sway_layer =
|
|
|
|
|
wl_container_of(listener, sway_layer, output_destroy);
|
|
|
|
|
// Determine if this layer is being used by an exclusive client. If it is,
|
|
|
|
|
// try and find another layer owned by this client to pass focus to.
|
|
|
|
|
struct sway_seat *seat = input_manager_get_default_seat();
|
|
|
|
|
struct wl_client *client =
|
|
|
|
|
wl_resource_get_client(sway_layer->layer_surface->resource);
|
|
|
|
|
bool set_focus = seat->exclusive_client == client;
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&sway_layer->output_destroy.link);
|
|
|
|
|
wl_list_remove(&sway_layer->link);
|
|
|
|
|
wl_list_init(&sway_layer->link);
|
|
|
|
|
|
|
|
|
|
if (set_focus) {
|
|
|
|
|
struct sway_layer_surface *layer =
|
Fix seat_set_focus_layer crash when disabling output
This fixes the following crash:
#0 0x00007f7daac3af25 in raise () at /usr/lib/libc.so.6
#1 0x00007f7daac24897 in abort () at /usr/lib/libc.so.6
#2 0x00007f7daac24767 in _nl_load_domain.cold () at /usr/lib/libc.so.6
#3 0x00007f7daac33526 in () at /usr/lib/libc.so.6
#4 0x0000555bfbc35029 in seat_set_focus_layer (seat=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#5 0x0000555bfbc35029 in seat_set_focus_layer (seat=seat@entry=0x555bfd76d860, layer=0x555bfdda2ff0)
at ../sway/input/seat.c:1164
__PRETTY_FUNCTION__ = "seat_set_focus_layer"
#6 0x0000555bfbc25899 in handle_output_destroy (listener=0x555bfdb90688, data=<optimized out>)
at ../sway/desktop/layer_shell.c:263
layer = 0x555bfdd6b040
sway_layer = 0x555bfdb90610
seat = 0x555bfd76d860
client = 0x555bfdb76d70
set_focus = <optimized out>
#7 0x0000555bfbc5b669 in wl_signal_emit (data=0x555bfd795930, signal=0x555bfd795ae0)
at /usr/include/wayland-server-core.h:472
l = <optimized out>
next = 0x555bfdb6a3e8
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#8 0x0000555bfbc5b669 in output_disable (output=output@entry=0x555bfd795930)
at ../sway/tree/output.c:263
__PRETTY_FUNCTION__ = "output_disable"
index = <optimized out>
#9 0x0000555bfbc3b890 in apply_output_config (oc=0x555bfd7d73d0, output=output@entry=0x555bfd795930)
at ../sway/config/output.c:321
wlr_output = 0x555bfd7afaf0
scale = <optimized out>
output_box = <optimized out>
#10 0x0000555bfbc28309 in handle_output_manager_apply
(listener=0x555bfbc7f148 <server+488>, data=0x555bfdca6eb0) at ../sway/desktop/output.c:936
wlr_output = <optimized out>
output = 0x555bfd795930
oc = <optimized out>
server = 0x555bfbc7ef60 <server>
config = 0x555bfdca6eb0
config_head = 0x555bfdb79350
ok = true
#11 0x00007f7dab4fbf7c in wlr_signal_emit_safe (signal=<optimized out>, data=0x555bfdca6eb0)
at ../subprojects/wlroots/util/signal.c:29
pos = 0x555bfbc7f148 <server+488>
l = 0x555bfbc7f148 <server+488>
cursor =
{link = {prev = 0x555bfbc7f148 <server+488>, next = 0x7fff238a8390}, notify = 0x7f7dab4fbef0 <handle_noop>}
end =
{link = {prev = 0x7fff238a8370, next = 0x555bfd7419f8}, notify = 0x7f7dab4fbef0 <handle_noop>}
#12 0x00007f7daa45469a in ffi_call_unix64 () at /usr/lib/libffi.so.6
#13 0x00007f7daa453fb6 in ffi_call () at /usr/lib/libffi.so.6
#14 0x00007f7daae6f82f in () at /usr/lib/libwayland-server.so.0
#15 0x00007f7daae6c193 in () at /usr/lib/libwayland-server.so.0
#16 0x00007f7daae6d7f2 in wl_event_loop_dispatch () at /usr/lib/libwayland-server.so.0
#17 0x00007f7daae6c39c in wl_display_run () at /usr/lib/libwayland-server.so.0
This crash happens because focus can only be set on mapped surfaces.
5 years ago
|
|
|
find_mapped_layer_by_client(client, sway_layer->layer_surface->output);
|
|
|
|
|
if (layer) {
|
|
|
|
|
seat_set_focus_layer(seat, layer->layer_surface);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sway_layer->layer_surface->output = NULL;
|
|
|
|
|
wlr_layer_surface_v1_close(sway_layer->layer_surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_surface_commit(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *layer =
|
|
|
|
|
wl_container_of(listener, layer, surface_commit);
|
|
|
|
|
struct wlr_layer_surface_v1 *layer_surface = layer->layer_surface;
|
|
|
|
|
struct wlr_output *wlr_output = layer_surface->output;
|
|
|
|
|
if (wlr_output == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
|
struct wlr_box old_geo = layer->geo;
|
|
|
|
|
arrange_layers(output);
|
|
|
|
|
|
|
|
|
|
bool geo_changed =
|
|
|
|
|
memcmp(&old_geo, &layer->geo, sizeof(struct wlr_box)) != 0;
|
|
|
|
|
bool layer_changed = layer->layer != layer_surface->current.layer;
|
|
|
|
|
if (layer_changed) {
|
|
|
|
|
wl_list_remove(&layer->link);
|
|
|
|
|
wl_list_insert(&output->layers[layer_surface->current.layer],
|
|
|
|
|
&layer->link);
|
|
|
|
|
layer->layer = layer_surface->current.layer;
|
|
|
|
|
}
|
|
|
|
|
if (geo_changed || layer_changed) {
|
|
|
|
|
output_damage_surface(output, old_geo.x, old_geo.y,
|
|
|
|
|
layer_surface->surface, true);
|
|
|
|
|
output_damage_surface(output, layer->geo.x, layer->geo.y,
|
|
|
|
|
layer_surface->surface, true);
|
|
|
|
|
} else {
|
|
|
|
|
output_damage_surface(output, layer->geo.x, layer->geo.y,
|
|
|
|
|
layer_surface->surface, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void unmap(struct sway_layer_surface *sway_layer) {
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
if (seat->focused_layer == sway_layer->layer_surface) {
|
|
|
|
|
seat_set_focus_layer(seat, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cursor_rebase_all();
|
|
|
|
|
|
|
|
|
|
struct wlr_output *wlr_output = sway_layer->layer_surface->output;
|
|
|
|
|
if (wlr_output == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_output *output = wlr_output->data;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (output == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
|
|
|
|
|
sway_layer->layer_surface->surface, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *sway_layer =
|
|
|
|
|
wl_container_of(listener, sway_layer, destroy);
|
|
|
|
|
sway_log(SWAY_DEBUG, "Layer surface destroyed (%s)",
|
|
|
|
|
sway_layer->layer_surface->namespace);
|
|
|
|
|
if (sway_layer->layer_surface->mapped) {
|
|
|
|
|
unmap(sway_layer);
|
|
|
|
|
}
|
|
|
|
|
wl_list_remove(&sway_layer->link);
|
|
|
|
|
wl_list_remove(&sway_layer->destroy.link);
|
|
|
|
|
wl_list_remove(&sway_layer->map.link);
|
|
|
|
|
wl_list_remove(&sway_layer->unmap.link);
|
|
|
|
|
wl_list_remove(&sway_layer->surface_commit.link);
|
|
|
|
|
wl_list_remove(&sway_layer->new_popup.link);
|
|
|
|
|
if (sway_layer->layer_surface->output != NULL) {
|
|
|
|
|
struct sway_output *output = sway_layer->layer_surface->output->data;
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (output != NULL) {
|
|
|
|
|
arrange_layers(output);
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
wl_list_remove(&sway_layer->output_destroy.link);
|
|
|
|
|
sway_layer->layer_surface->output = NULL;
|
|
|
|
|
}
|
|
|
|
|
free(sway_layer);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_map(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *sway_layer = wl_container_of(listener,
|
|
|
|
|
sway_layer, map);
|
|
|
|
|
struct sway_output *output = sway_layer->layer_surface->output->data;
|
|
|
|
|
output_damage_surface(output, sway_layer->geo.x, sway_layer->geo.y,
|
|
|
|
|
sway_layer->layer_surface->surface, true);
|
|
|
|
|
wlr_surface_send_enter(sway_layer->layer_surface->surface,
|
|
|
|
|
sway_layer->layer_surface->output);
|
|
|
|
|
cursor_rebase_all();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_unmap(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *sway_layer = wl_container_of(
|
|
|
|
|
listener, sway_layer, unmap);
|
|
|
|
|
unmap(sway_layer);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct sway_layer_surface *popup_get_layer(
|
|
|
|
|
struct sway_layer_popup *popup) {
|
|
|
|
|
while (popup->parent_type == LAYER_PARENT_POPUP) {
|
|
|
|
|
popup = popup->parent_popup;
|
|
|
|
|
}
|
|
|
|
|
return popup->parent_layer;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_damage(struct sway_layer_popup *layer_popup, bool whole) {
|
|
|
|
|
struct wlr_xdg_popup *popup = layer_popup->wlr_popup;
|
|
|
|
|
struct wlr_surface *surface = popup->base->surface;
|
|
|
|
|
int popup_sx = popup->geometry.x - popup->base->geometry.x;
|
|
|
|
|
int popup_sy = popup->geometry.y - popup->base->geometry.y;
|
|
|
|
|
int ox = popup_sx, oy = popup_sy;
|
|
|
|
|
struct sway_layer_surface *layer;
|
|
|
|
|
while (true) {
|
|
|
|
|
if (layer_popup->parent_type == LAYER_PARENT_POPUP) {
|
|
|
|
|
layer_popup = layer_popup->parent_popup;
|
|
|
|
|
ox += layer_popup->wlr_popup->geometry.x;
|
|
|
|
|
oy += layer_popup->wlr_popup->geometry.y;
|
|
|
|
|
} else {
|
|
|
|
|
layer = layer_popup->parent_layer;
|
|
|
|
|
ox += layer->geo.x;
|
|
|
|
|
oy += layer->geo.y;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
struct wlr_output *wlr_output = layer->layer_surface->output;
|
|
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
|
output_damage_surface(output, ox, oy, surface, whole);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_map(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_popup *popup = wl_container_of(listener, popup, map);
|
|
|
|
|
struct sway_layer_surface *layer = popup_get_layer(popup);
|
|
|
|
|
struct wlr_output *wlr_output = layer->layer_surface->output;
|
|
|
|
|
wlr_surface_send_enter(popup->wlr_popup->base->surface, wlr_output);
|
|
|
|
|
popup_damage(popup, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_unmap(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_popup *popup = wl_container_of(listener, popup, unmap);
|
|
|
|
|
popup_damage(popup, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_commit(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_popup *popup = wl_container_of(listener, popup, commit);
|
|
|
|
|
popup_damage(popup, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_popup *popup =
|
|
|
|
|
wl_container_of(listener, popup, destroy);
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&popup->map.link);
|
|
|
|
|
wl_list_remove(&popup->unmap.link);
|
|
|
|
|
wl_list_remove(&popup->destroy.link);
|
|
|
|
|
wl_list_remove(&popup->commit.link);
|
|
|
|
|
free(popup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_unconstrain(struct sway_layer_popup *popup) {
|
|
|
|
|
struct sway_layer_surface *layer = popup_get_layer(popup);
|
|
|
|
|
struct wlr_xdg_popup *wlr_popup = popup->wlr_popup;
|
|
|
|
|
|
|
|
|
|
struct sway_output *output = layer->layer_surface->output->data;
|
|
|
|
|
|
|
|
|
|
// the output box expressed in the coordinate system of the toplevel parent
|
|
|
|
|
// of the popup
|
|
|
|
|
struct wlr_box output_toplevel_sx_box = {
|
|
|
|
|
.x = -layer->geo.x,
|
|
|
|
|
.y = -layer->geo.y,
|
|
|
|
|
.width = output->width,
|
|
|
|
|
.height = output->height,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
wlr_xdg_popup_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_new_popup(struct wl_listener *listener, void *data);
|
|
|
|
|
|
|
|
|
|
static struct sway_layer_popup *create_popup(struct wlr_xdg_popup *wlr_popup,
|
|
|
|
|
enum layer_parent parent_type, void *parent) {
|
|
|
|
|
struct sway_layer_popup *popup =
|
|
|
|
|
calloc(1, sizeof(struct sway_layer_popup));
|
|
|
|
|
if (popup == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
popup->wlr_popup = wlr_popup;
|
|
|
|
|
popup->parent_type = parent_type;
|
|
|
|
|
popup->parent_layer = parent;
|
|
|
|
|
|
|
|
|
|
popup->map.notify = popup_handle_map;
|
|
|
|
|
wl_signal_add(&wlr_popup->base->events.map, &popup->map);
|
|
|
|
|
popup->unmap.notify = popup_handle_unmap;
|
|
|
|
|
wl_signal_add(&wlr_popup->base->events.unmap, &popup->unmap);
|
|
|
|
|
popup->destroy.notify = popup_handle_destroy;
|
|
|
|
|
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
|
|
|
|
|
popup->commit.notify = popup_handle_commit;
|
|
|
|
|
wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
|
|
|
|
|
popup->new_popup.notify = popup_handle_new_popup;
|
|
|
|
|
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
|
|
|
|
|
|
|
|
|
|
popup_unconstrain(popup);
|
|
|
|
|
|
|
|
|
|
return popup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_popup *sway_layer_popup =
|
|
|
|
|
wl_container_of(listener, sway_layer_popup, new_popup);
|
|
|
|
|
struct wlr_xdg_popup *wlr_popup = data;
|
|
|
|
|
create_popup(wlr_popup, LAYER_PARENT_POPUP, sway_layer_popup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_new_popup(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_layer_surface *sway_layer_surface =
|
|
|
|
|
wl_container_of(listener, sway_layer_surface, new_popup);
|
|
|
|
|
struct wlr_xdg_popup *wlr_popup = data;
|
|
|
|
|
create_popup(wlr_popup, LAYER_PARENT_LAYER, sway_layer_surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_layer_surface *layer_from_wlr_layer_surface_v1(
|
|
|
|
|
struct wlr_layer_surface_v1 *layer_surface) {
|
|
|
|
|
return layer_surface->data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct wlr_layer_surface_v1 *layer_surface = data;
|
|
|
|
|
sway_log(SWAY_DEBUG, "new layer surface: namespace %s layer %d anchor %d "
|
|
|
|
|
"size %dx%d margin %d,%d,%d,%d",
|
|
|
|
|
layer_surface->namespace,
|
|
|
|
|
layer_surface->client_pending.layer,
|
|
|
|
|
layer_surface->client_pending.layer,
|
|
|
|
|
layer_surface->client_pending.desired_width,
|
|
|
|
|
layer_surface->client_pending.desired_height,
|
|
|
|
|
layer_surface->client_pending.margin.top,
|
|
|
|
|
layer_surface->client_pending.margin.right,
|
|
|
|
|
layer_surface->client_pending.margin.bottom,
|
|
|
|
|
layer_surface->client_pending.margin.left);
|
|
|
|
|
|
|
|
|
|
if (!layer_surface->output) {
|
|
|
|
|
// Assign last active output
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
struct sway_output *output = NULL;
|
|
|
|
|
struct sway_seat *seat = input_manager_get_default_seat();
|
|
|
|
|
if (seat) {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
struct sway_workspace *ws = seat_get_focused_workspace(seat);
|
|
|
|
|
if (ws != NULL) {
|
|
|
|
|
output = ws->output;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!output || output == root->noop_output) {
|
|
|
|
|
if (!root->outputs->length) {
|
|
|
|
|
sway_log(SWAY_ERROR,
|
|
|
|
|
"no output to auto-assign layer surface '%s' to",
|
|
|
|
|
layer_surface->namespace);
|
|
|
|
|
wlr_layer_surface_v1_close(layer_surface);
|
|
|
|
|
return;
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
output = root->outputs->items[0];
|
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
layer_surface->output = output->wlr_output;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_layer_surface *sway_layer =
|
|
|
|
|
calloc(1, sizeof(struct sway_layer_surface));
|
|
|
|
|
if (!sway_layer) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sway_layer->surface_commit.notify = handle_surface_commit;
|
|
|
|
|
wl_signal_add(&layer_surface->surface->events.commit,
|
|
|
|
|
&sway_layer->surface_commit);
|
|
|
|
|
|
|
|
|
|
sway_layer->destroy.notify = handle_destroy;
|
|
|
|
|
wl_signal_add(&layer_surface->events.destroy, &sway_layer->destroy);
|
|
|
|
|
sway_layer->map.notify = handle_map;
|
|
|
|
|
wl_signal_add(&layer_surface->events.map, &sway_layer->map);
|
|
|
|
|
sway_layer->unmap.notify = handle_unmap;
|
|
|
|
|
wl_signal_add(&layer_surface->events.unmap, &sway_layer->unmap);
|
|
|
|
|
sway_layer->new_popup.notify = handle_new_popup;
|
|
|
|
|
wl_signal_add(&layer_surface->events.new_popup, &sway_layer->new_popup);
|
|
|
|
|
|
|
|
|
|
sway_layer->layer_surface = layer_surface;
|
|
|
|
|
layer_surface->data = sway_layer;
|
|
|
|
|
|
|
|
|
|
struct sway_output *output = layer_surface->output->data;
|
|
|
|
|
sway_layer->output_destroy.notify = handle_output_destroy;
|
|
|
|
|
wl_signal_add(&output->events.destroy, &sway_layer->output_destroy);
|
|
|
|
|
|
|
|
|
|
wl_list_insert(&output->layers[layer_surface->client_pending.layer],
|
|
|
|
|
&sway_layer->link);
|
|
|
|
|
|
|
|
|
|
// Temporarily set the layer's current state to client_pending
|
|
|
|
|
// So that we can easily arrange it
|
|
|
|
|
struct wlr_layer_surface_v1_state old_state = layer_surface->current;
|
|
|
|
|
layer_surface->current = layer_surface->client_pending;
|
|
|
|
|
arrange_layers(output);
|
|
|
|
|
layer_surface->current = old_state;
|
|
|
|
|
}
|
