|
|
|
|
#define _POSIX_C_SOURCE 199309L
|
|
|
|
|
#include <float.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <wayland-server.h>
|
|
|
|
|
#include <wlr/types/wlr_xdg_shell_v6.h>
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "sway/decoration.h"
|
|
|
|
|
#include "sway/desktop.h"
|
Prepare arrange code for type safe arguments
This commit changes the arrange code in a way that will support type
safe arguments.
The arrange_output et al functions are now public, however I opted not
to use them directly yet. I've kept the generic arrange_windows there
for convenience until type safety is fully implemented. This means this
patch has much less risk of breaking things as it would otherwise.
To be type safe, arrange_children_of cannot exist in its previous form
because the thing passed to it could be either a workspace or a
container. So it's now renamed to arrange_children and accepts a list_t,
as well as the parent layout and parent's box.
There was some code which checked the grandparent's layout to see if it
was tabbed or stacked and adjusted the Y offset of the grandchild
accordingly. Accessing the grandparent layout isn't easy when using type
safe arguments, and it seemed odd to even need to do this. I determined
that this was needed because a child of a tabbed container would have a
swayc Y matching the top of the tab bar. I've changed this so a child of
a tabbed container will have a swayc Y matching the bottom of the tab
bar, which means we don't need to access the grandparent layout. Some
tweaks to the rendering and autoconfigure code have been made to
implement this, and the container_at code appears to work without
needing any changes.
arrange_children_of (now arrange_children) would check if the parent had
gaps and would copy them to the child, effectively making the
workspace's gaps recurse into all children. We can't do this any more
without passing has_gaps, gaps_inner and gaps_outer as arguments to
arrange_children, so I've changed the add_gaps function to retrieve it
from the workspace directly.
apply_tabbed_or_stacked_layout has been split into two functions, as it
had different logic depending on the layout.
Lastly, arrange.h had an unnecessary include of transaction.h. I've
removed it, which means I've had to add it to several other files.
6 years ago
|
|
|
#include "sway/desktop/transaction.h"
|
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
|
#include "sway/input/seat.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/output.h"
|
|
|
|
|
#include "sway/server.h"
|
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
|
#include "sway/tree/view.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 const struct sway_view_child_impl popup_impl;
|
|
|
|
|
|
|
|
|
|
static void popup_get_root_coords(struct sway_view_child *child,
|
|
|
|
|
int *root_sx, int *root_sy) {
|
|
|
|
|
struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child;
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = popup->wlr_xdg_surface_v6;
|
|
|
|
|
|
|
|
|
|
int x_offset = -child->view->geometry.x - surface->geometry.x;
|
|
|
|
|
int y_offset = -child->view->geometry.y - surface->geometry.y;
|
|
|
|
|
|
|
|
|
|
wlr_xdg_popup_v6_get_toplevel_coords(surface->popup,
|
|
|
|
|
x_offset + surface->popup->geometry.x,
|
|
|
|
|
y_offset + surface->popup->geometry.y,
|
|
|
|
|
root_sx, root_sy);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_destroy(struct sway_view_child *child) {
|
|
|
|
|
if (!sway_assert(child->impl == &popup_impl,
|
|
|
|
|
"Expected an xdg_shell_v6 popup")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_xdg_popup_v6 *popup = (struct sway_xdg_popup_v6 *)child;
|
|
|
|
|
wl_list_remove(&popup->new_popup.link);
|
|
|
|
|
wl_list_remove(&popup->destroy.link);
|
|
|
|
|
free(popup);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_view_child_impl popup_impl = {
|
|
|
|
|
.get_root_coords = popup_get_root_coords,
|
|
|
|
|
.destroy = popup_destroy,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static struct sway_xdg_popup_v6 *popup_create(
|
|
|
|
|
struct wlr_xdg_popup_v6 *wlr_popup, struct sway_view *view);
|
|
|
|
|
|
|
|
|
|
static void popup_handle_new_popup(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_popup_v6 *popup =
|
|
|
|
|
wl_container_of(listener, popup, new_popup);
|
|
|
|
|
struct wlr_xdg_popup_v6 *wlr_popup = data;
|
|
|
|
|
popup_create(wlr_popup, popup->child.view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_popup_v6 *popup = wl_container_of(listener, popup, destroy);
|
|
|
|
|
view_child_destroy(&popup->child);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void popup_unconstrain(struct sway_xdg_popup_v6 *popup) {
|
|
|
|
|
struct sway_view *view = popup->child.view;
|
|
|
|
|
struct wlr_xdg_popup_v6 *wlr_popup = popup->wlr_xdg_surface_v6->popup;
|
|
|
|
|
|
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 = view->container->workspace->output;
|
|
|
|
|
|
|
|
|
|
// the output box expressed in the coordinate system of the toplevel parent
|
|
|
|
|
// of the popup
|
|
|
|
|
struct wlr_box output_toplevel_sx_box = {
|
|
|
|
|
.x = output->lx - view->x,
|
|
|
|
|
.y = output->ly - view->y,
|
|
|
|
|
.width = output->width,
|
|
|
|
|
.height = output->height,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
wlr_xdg_popup_v6_unconstrain_from_box(wlr_popup, &output_toplevel_sx_box);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct sway_xdg_popup_v6 *popup_create(
|
|
|
|
|
struct wlr_xdg_popup_v6 *wlr_popup, struct sway_view *view) {
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface = wlr_popup->base;
|
|
|
|
|
|
|
|
|
|
struct sway_xdg_popup_v6 *popup =
|
|
|
|
|
calloc(1, sizeof(struct sway_xdg_popup_v6));
|
|
|
|
|
if (popup == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
view_child_init(&popup->child, &popup_impl, view, xdg_surface->surface);
|
|
|
|
|
popup->wlr_xdg_surface_v6 = xdg_surface;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xdg_surface->events.new_popup, &popup->new_popup);
|
|
|
|
|
popup->new_popup.notify = popup_handle_new_popup;
|
|
|
|
|
wl_signal_add(&xdg_surface->events.destroy, &popup->destroy);
|
|
|
|
|
popup->destroy.notify = popup_handle_destroy;
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&xdg_surface->events.map, &popup->child.surface_map);
|
|
|
|
|
wl_signal_add(&xdg_surface->events.unmap, &popup->child.surface_unmap);
|
|
|
|
|
|
|
|
|
|
popup_unconstrain(popup);
|
|
|
|
|
|
|
|
|
|
return popup;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static struct sway_xdg_shell_v6_view *xdg_shell_v6_view_from_view(
|
|
|
|
|
struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(view->type == SWAY_VIEW_XDG_SHELL_V6,
|
|
|
|
|
"Expected xdg_shell_v6 view")) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return (struct sway_xdg_shell_v6_view *)view;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void get_constraints(struct sway_view *view, double *min_width,
|
|
|
|
|
double *max_width, double *min_height, double *max_height) {
|
|
|
|
|
struct wlr_xdg_toplevel_v6_state *state =
|
|
|
|
|
&view->wlr_xdg_surface_v6->toplevel->current;
|
|
|
|
|
*min_width = state->min_width > 0 ? state->min_width : DBL_MIN;
|
|
|
|
|
*max_width = state->max_width > 0 ? state->max_width : DBL_MAX;
|
|
|
|
|
*min_height = state->min_height > 0 ? state->min_height : DBL_MIN;
|
|
|
|
|
*max_height = state->max_height > 0 ? state->max_height : DBL_MAX;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *get_string_prop(struct sway_view *view,
|
|
|
|
|
enum sway_view_prop prop) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
switch (prop) {
|
|
|
|
|
case VIEW_PROP_TITLE:
|
|
|
|
|
return view->wlr_xdg_surface_v6->toplevel->title;
|
|
|
|
|
case VIEW_PROP_APP_ID:
|
|
|
|
|
return view->wlr_xdg_surface_v6->toplevel->app_id;
|
|
|
|
|
default:
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint32_t configure(struct sway_view *view, double lx, double ly,
|
|
|
|
|
int width, int height) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
xdg_shell_v6_view_from_view(view);
|
|
|
|
|
if (xdg_shell_v6_view == NULL) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return wlr_xdg_toplevel_v6_set_size(
|
|
|
|
|
view->wlr_xdg_surface_v6, width, height);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_activated(struct sway_view *view, bool activated) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6;
|
|
|
|
|
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
|
|
|
|
|
wlr_xdg_toplevel_v6_set_activated(surface, activated);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_tiled(struct sway_view *view, bool tiled) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6;
|
|
|
|
|
wlr_xdg_toplevel_v6_set_maximized(surface, tiled);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void set_fullscreen(struct sway_view *view, bool fullscreen) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6;
|
|
|
|
|
wlr_xdg_toplevel_v6_set_fullscreen(surface, fullscreen);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool wants_floating(struct sway_view *view) {
|
|
|
|
|
struct wlr_xdg_toplevel_v6 *toplevel =
|
|
|
|
|
view->wlr_xdg_surface_v6->toplevel;
|
|
|
|
|
struct wlr_xdg_toplevel_v6_state *state = &toplevel->current;
|
|
|
|
|
return (state->min_width != 0 && state->min_height != 0
|
|
|
|
|
&& (state->min_width == state->max_width
|
|
|
|
|
|| state->min_height == state->max_height))
|
|
|
|
|
|| toplevel->parent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void for_each_surface(struct sway_view *view,
|
|
|
|
|
wlr_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
wlr_xdg_surface_v6_for_each_surface(view->wlr_xdg_surface_v6, iterator,
|
|
|
|
|
user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void for_each_popup(struct sway_view *view,
|
|
|
|
|
wlr_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
wlr_xdg_surface_v6_for_each_popup(view->wlr_xdg_surface_v6, iterator,
|
|
|
|
|
user_data);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool is_transient_for(struct sway_view *child,
|
|
|
|
|
struct sway_view *ancestor) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(child) == NULL) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = child->wlr_xdg_surface_v6;
|
|
|
|
|
while (surface) {
|
|
|
|
|
if (surface->toplevel->parent == ancestor->wlr_xdg_surface_v6) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
surface = surface->toplevel->parent;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void _close(struct sway_view *view) {
|
|
|
|
|
if (xdg_shell_v6_view_from_view(view) == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_surface_v6 *surface = view->wlr_xdg_surface_v6;
|
|
|
|
|
if (surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL) {
|
|
|
|
|
wlr_xdg_surface_v6_send_close(surface);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void close_popups_iterator(struct wlr_surface *surface,
|
|
|
|
|
int sx, int sy, void *data) {
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface_v6 =
|
|
|
|
|
wlr_xdg_surface_v6_from_wlr_surface(surface);
|
|
|
|
|
wlr_xdg_surface_v6_send_close(xdg_surface_v6);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void close_popups(struct sway_view *view) {
|
|
|
|
|
wlr_xdg_surface_v6_for_each_popup(view->wlr_xdg_surface_v6,
|
|
|
|
|
close_popups_iterator, NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void destroy(struct sway_view *view) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
xdg_shell_v6_view_from_view(view);
|
|
|
|
|
if (xdg_shell_v6_view == NULL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
free(xdg_shell_v6_view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_view_impl view_impl = {
|
|
|
|
|
.get_constraints = get_constraints,
|
|
|
|
|
.get_string_prop = get_string_prop,
|
|
|
|
|
.configure = configure,
|
|
|
|
|
.set_activated = set_activated,
|
|
|
|
|
.set_tiled = set_tiled,
|
|
|
|
|
.set_fullscreen = set_fullscreen,
|
|
|
|
|
.wants_floating = wants_floating,
|
|
|
|
|
.for_each_surface = for_each_surface,
|
|
|
|
|
.for_each_popup = for_each_popup,
|
|
|
|
|
.is_transient_for = is_transient_for,
|
|
|
|
|
.close = _close,
|
|
|
|
|
.close_popups = close_popups,
|
|
|
|
|
.destroy = destroy,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void handle_commit(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, commit);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface_v6 = view->wlr_xdg_surface_v6;
|
|
|
|
|
|
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 (view->container->node.instruction) {
|
|
|
|
|
wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &view->geometry);
|
|
|
|
|
transaction_notify_view_ready_by_serial(view,
|
|
|
|
|
xdg_surface_v6->configure_serial);
|
|
|
|
|
} else {
|
|
|
|
|
struct wlr_box new_geo;
|
|
|
|
|
wlr_xdg_surface_v6_get_geometry(xdg_surface_v6, &new_geo);
|
|
|
|
|
|
|
|
|
|
if ((new_geo.width != view->width || new_geo.height != view->height) &&
|
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
|
|
|
container_is_floating(view->container)) {
|
|
|
|
|
// A floating view has unexpectedly sent a new size
|
|
|
|
|
desktop_damage_view(view);
|
|
|
|
|
view_update_size(view, new_geo.width, new_geo.height);
|
|
|
|
|
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
|
|
|
|
|
desktop_damage_view(view);
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
} else {
|
|
|
|
|
memcpy(&view->geometry, &new_geo, sizeof(struct wlr_box));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_damage_from(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_title(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, set_title);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
view_update_title(view, false);
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_set_app_id(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, set_app_id);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_new_popup(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, new_popup);
|
|
|
|
|
struct wlr_xdg_popup_v6 *wlr_popup = data;
|
|
|
|
|
popup_create(wlr_popup, &xdg_shell_v6_view->view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_fullscreen(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, request_fullscreen);
|
|
|
|
|
struct wlr_xdg_toplevel_v6_set_fullscreen_event *e = data;
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface =
|
|
|
|
|
xdg_shell_v6_view->view.wlr_xdg_surface_v6;
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
|
|
|
|
|
if (!sway_assert(xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_TOPLEVEL,
|
|
|
|
|
"xdg_shell_v6 requested fullscreen of surface with role %i",
|
|
|
|
|
xdg_surface->role)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!xdg_surface->mapped) {
|
|
|
|
|
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
|
|
|
container_set_fullscreen(view->container, e->fullscreen);
|
|
|
|
|
|
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_workspace(view->container->workspace);
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_move(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, request_move);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
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 (!container_is_floating(view->container)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_toplevel_v6_move_event *e = data;
|
|
|
|
|
struct sway_seat *seat = e->seat->seat->data;
|
|
|
|
|
if (e->serial == seat->last_button_serial) {
|
|
|
|
|
seat_begin_move_floating(seat, view->container, seat->last_button);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_request_resize(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, request_resize);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
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 (!container_is_floating(view->container)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_xdg_toplevel_v6_resize_event *e = data;
|
|
|
|
|
struct sway_seat *seat = e->seat->seat->data;
|
|
|
|
|
if (e->serial == seat->last_button_serial) {
|
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
|
|
|
seat_begin_resize_floating(seat, view->container,
|
|
|
|
|
seat->last_button, e->edges);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_unmap(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, unmap);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
|
|
|
|
|
if (!sway_assert(view->surface, "Cannot unmap unmapped view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_unmap(view);
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->commit.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->new_popup.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->request_fullscreen.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->request_move.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->request_resize.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->set_title.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->set_app_id.link);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_map(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, map);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface = view->wlr_xdg_surface_v6;
|
|
|
|
|
|
|
|
|
|
view->natural_width = view->wlr_xdg_surface_v6->geometry.width;
|
|
|
|
|
view->natural_height = view->wlr_xdg_surface_v6->geometry.height;
|
|
|
|
|
if (!view->natural_width && !view->natural_height) {
|
|
|
|
|
view->natural_width = view->wlr_xdg_surface_v6->surface->current.width;
|
|
|
|
|
view->natural_height = view->wlr_xdg_surface_v6->surface->current.height;
|
|
|
|
|
}
|
|
|
|
|
struct sway_server_decoration *deco =
|
|
|
|
|
decoration_from_surface(xdg_surface->surface);
|
|
|
|
|
bool csd = !deco || deco->wlr_server_decoration->mode
|
|
|
|
|
== WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
|
|
|
|
|
|
|
|
|
|
view_map(view, view->wlr_xdg_surface_v6->surface,
|
|
|
|
|
xdg_surface->toplevel->client_pending.fullscreen, csd);
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->commit.notify = handle_commit;
|
|
|
|
|
wl_signal_add(&xdg_surface->surface->events.commit,
|
|
|
|
|
&xdg_shell_v6_view->commit);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->new_popup.notify = handle_new_popup;
|
|
|
|
|
wl_signal_add(&xdg_surface->events.new_popup,
|
|
|
|
|
&xdg_shell_v6_view->new_popup);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->request_fullscreen.notify = handle_request_fullscreen;
|
|
|
|
|
wl_signal_add(&xdg_surface->toplevel->events.request_fullscreen,
|
|
|
|
|
&xdg_shell_v6_view->request_fullscreen);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->request_move.notify = handle_request_move;
|
|
|
|
|
wl_signal_add(&xdg_surface->toplevel->events.request_move,
|
|
|
|
|
&xdg_shell_v6_view->request_move);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->request_resize.notify = handle_request_resize;
|
|
|
|
|
wl_signal_add(&xdg_surface->toplevel->events.request_resize,
|
|
|
|
|
&xdg_shell_v6_view->request_resize);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->set_title.notify = handle_set_title;
|
|
|
|
|
wl_signal_add(&xdg_surface->toplevel->events.set_title,
|
|
|
|
|
&xdg_shell_v6_view->set_title);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->set_app_id.notify = handle_set_app_id;
|
|
|
|
|
wl_signal_add(&xdg_surface->toplevel->events.set_app_id,
|
|
|
|
|
&xdg_shell_v6_view->set_app_id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
wl_container_of(listener, xdg_shell_v6_view, destroy);
|
|
|
|
|
struct sway_view *view = &xdg_shell_v6_view->view;
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->destroy.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->map.link);
|
|
|
|
|
wl_list_remove(&xdg_shell_v6_view->unmap.link);
|
|
|
|
|
view->wlr_xdg_surface_v6 = NULL;
|
|
|
|
|
view_begin_destroy(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_view *view_from_wlr_xdg_surface_v6(
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface_v6) {
|
|
|
|
|
return xdg_surface_v6->data;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void handle_xdg_shell_v6_surface(struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_server *server = wl_container_of(listener, server,
|
|
|
|
|
xdg_shell_v6_surface);
|
|
|
|
|
struct wlr_xdg_surface_v6 *xdg_surface = data;
|
|
|
|
|
|
|
|
|
|
if (xdg_surface->role == WLR_XDG_SURFACE_V6_ROLE_POPUP) {
|
|
|
|
|
wlr_log(WLR_DEBUG, "New xdg_shell_v6 popup");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wlr_log(WLR_DEBUG, "New xdg_shell_v6 toplevel title='%s' app_id='%s'",
|
|
|
|
|
xdg_surface->toplevel->title, xdg_surface->toplevel->app_id);
|
|
|
|
|
wlr_xdg_surface_v6_ping(xdg_surface);
|
|
|
|
|
|
|
|
|
|
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
|
|
|
|
|
calloc(1, sizeof(struct sway_xdg_shell_v6_view));
|
|
|
|
|
if (!sway_assert(xdg_shell_v6_view, "Failed to allocate view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_init(&xdg_shell_v6_view->view, SWAY_VIEW_XDG_SHELL_V6, &view_impl);
|
|
|
|
|
xdg_shell_v6_view->view.wlr_xdg_surface_v6 = xdg_surface;
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->map.notify = handle_map;
|
|
|
|
|
wl_signal_add(&xdg_surface->events.map, &xdg_shell_v6_view->map);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->unmap.notify = handle_unmap;
|
|
|
|
|
wl_signal_add(&xdg_surface->events.unmap, &xdg_shell_v6_view->unmap);
|
|
|
|
|
|
|
|
|
|
xdg_shell_v6_view->destroy.notify = handle_destroy;
|
|
|
|
|
wl_signal_add(&xdg_surface->events.destroy, &xdg_shell_v6_view->destroy);
|
|
|
|
|
|
|
|
|
|
xdg_surface->data = xdg_shell_v6_view;
|
|
|
|
|
}
|
