|
|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <strings.h>
|
|
|
|
|
#include <wayland-server-core.h>
|
|
|
|
|
#include <wlr/render/wlr_renderer.h>
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
#include <wlr/types/wlr_buffer.h>
|
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
|
#include <wlr/types/wlr_server_decoration.h>
|
|
|
|
|
#include <wlr/types/wlr_subcompositor.h>
|
|
|
|
|
#include <wlr/types/wlr_xdg_decoration_v1.h>
|
|
|
|
|
#include "config.h"
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
#include <wlr/xwayland.h>
|
|
|
|
|
#endif
|
|
|
|
|
#include "list.h"
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "sway/criteria.h"
|
|
|
|
|
#include "sway/commands.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/desktop/idle_inhibit_v1.h"
|
|
|
|
|
#include "sway/desktop/launcher.h"
|
|
|
|
|
#include "sway/input/cursor.h"
|
|
|
|
|
#include "sway/ipc-server.h"
|
|
|
|
|
#include "sway/output.h"
|
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
|
#include "sway/server.h"
|
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
|
#include "sway/tree/view.h"
|
|
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
#include "sway/config.h"
|
|
|
|
|
#include "sway/xdg_decoration.h"
|
|
|
|
|
#include "pango.h"
|
|
|
|
|
#include "stringop.h"
|
|
|
|
|
|
|
|
|
|
void view_init(struct sway_view *view, enum sway_view_type type,
|
|
|
|
|
const struct sway_view_impl *impl) {
|
|
|
|
|
view->type = type;
|
|
|
|
|
view->impl = impl;
|
|
|
|
|
view->executed_criteria = create_list();
|
|
|
|
|
wl_list_init(&view->saved_buffers);
|
|
|
|
|
view->allow_request_urgent = true;
|
|
|
|
|
view->shortcuts_inhibit = SHORTCUTS_INHIBIT_DEFAULT;
|
|
|
|
|
wl_signal_init(&view->events.unmap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_destroy(struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(view->surface == NULL, "Tried to free mapped view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (!sway_assert(view->destroying,
|
|
|
|
|
"Tried to free view which wasn't marked as destroying")) {
|
|
|
|
|
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
|
|
|
if (!sway_assert(view->container == NULL,
|
|
|
|
|
"Tried to free view which still has a container "
|
|
|
|
|
"(might have a pending transaction?)")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
wl_list_remove(&view->events.unmap.listener_list);
|
|
|
|
|
if (!wl_list_empty(&view->saved_buffers)) {
|
|
|
|
|
view_remove_saved_buffer(view);
|
|
|
|
|
}
|
|
|
|
|
list_free(view->executed_criteria);
|
|
|
|
|
|
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
|
|
|
free(view->title_format);
|
|
|
|
|
|
|
|
|
|
if (view->impl->destroy) {
|
|
|
|
|
view->impl->destroy(view);
|
|
|
|
|
} else {
|
|
|
|
|
free(view);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_begin_destroy(struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(view->surface == NULL, "Tried to destroy a mapped view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view->destroying = true;
|
|
|
|
|
|
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) {
|
|
|
|
|
view_destroy(view);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *view_get_title(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_string_prop) {
|
|
|
|
|
return view->impl->get_string_prop(view, VIEW_PROP_TITLE);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *view_get_app_id(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_string_prop) {
|
|
|
|
|
return view->impl->get_string_prop(view, VIEW_PROP_APP_ID);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *view_get_class(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_string_prop) {
|
|
|
|
|
return view->impl->get_string_prop(view, VIEW_PROP_CLASS);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *view_get_instance(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_string_prop) {
|
|
|
|
|
return view->impl->get_string_prop(view, VIEW_PROP_INSTANCE);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
uint32_t view_get_x11_window_id(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_int_prop) {
|
|
|
|
|
return view->impl->get_int_prop(view, VIEW_PROP_X11_WINDOW_ID);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint32_t view_get_x11_parent_id(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_int_prop) {
|
|
|
|
|
return view->impl->get_int_prop(view, VIEW_PROP_X11_PARENT_ID);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
const char *view_get_window_role(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_string_prop) {
|
|
|
|
|
return view->impl->get_string_prop(view, VIEW_PROP_WINDOW_ROLE);
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint32_t view_get_window_type(struct sway_view *view) {
|
|
|
|
|
if (view->impl->get_int_prop) {
|
|
|
|
|
return view->impl->get_int_prop(view, VIEW_PROP_WINDOW_TYPE);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *view_get_shell(struct sway_view *view) {
|
|
|
|
|
switch(view->type) {
|
|
|
|
|
case SWAY_VIEW_XDG_SHELL:
|
|
|
|
|
return "xdg_shell";
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
case SWAY_VIEW_XWAYLAND:
|
|
|
|
|
return "xwayland";
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
return "unknown";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_get_constraints(struct sway_view *view, double *min_width,
|
|
|
|
|
double *max_width, double *min_height, double *max_height) {
|
|
|
|
|
if (view->impl->get_constraints) {
|
|
|
|
|
view->impl->get_constraints(view,
|
|
|
|
|
min_width, max_width, min_height, max_height);
|
|
|
|
|
} else {
|
|
|
|
|
*min_width = DBL_MIN;
|
|
|
|
|
*max_width = DBL_MAX;
|
|
|
|
|
*min_height = DBL_MIN;
|
|
|
|
|
*max_height = DBL_MAX;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint32_t view_configure(struct sway_view *view, double lx, double ly, int width,
|
|
|
|
|
int height) {
|
|
|
|
|
if (view->impl->configure) {
|
|
|
|
|
return view->impl->configure(view, lx, ly, width, height);
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool view_inhibit_idle(struct sway_view *view) {
|
|
|
|
|
struct sway_idle_inhibitor_v1 *user_inhibitor =
|
|
|
|
|
sway_idle_inhibit_v1_user_inhibitor_for_view(view);
|
|
|
|
|
|
|
|
|
|
struct sway_idle_inhibitor_v1 *application_inhibitor =
|
|
|
|
|
sway_idle_inhibit_v1_application_inhibitor_for_view(view);
|
|
|
|
|
|
|
|
|
|
if (!user_inhibitor && !application_inhibitor) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!user_inhibitor) {
|
|
|
|
|
return sway_idle_inhibit_v1_is_active(application_inhibitor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!application_inhibitor) {
|
|
|
|
|
return sway_idle_inhibit_v1_is_active(user_inhibitor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sway_idle_inhibit_v1_is_active(user_inhibitor)
|
|
|
|
|
|| sway_idle_inhibit_v1_is_active(application_inhibitor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool view_ancestor_is_only_visible(struct sway_view *view) {
|
|
|
|
|
bool only_visible = true;
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
while (con) {
|
|
|
|
|
enum sway_container_layout layout = container_parent_layout(con);
|
|
|
|
|
if (layout != L_TABBED && layout != L_STACKED) {
|
|
|
|
|
list_t *siblings = container_get_siblings(con);
|
|
|
|
|
if (siblings && siblings->length > 1) {
|
|
|
|
|
only_visible = false;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
only_visible = true;
|
|
|
|
|
}
|
|
|
|
|
con = con->pending.parent;
|
|
|
|
|
}
|
|
|
|
|
return only_visible;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool view_is_only_visible(struct sway_view *view) {
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
while (con) {
|
|
|
|
|
enum sway_container_layout layout = container_parent_layout(con);
|
|
|
|
|
if (layout != L_TABBED && layout != L_STACKED) {
|
|
|
|
|
list_t *siblings = container_get_siblings(con);
|
|
|
|
|
if (siblings && siblings->length > 1) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con = con->pending.parent;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool gaps_to_edge(struct sway_view *view) {
|
|
|
|
|
struct side_gaps gaps = view->container->pending.workspace->current_gaps;
|
|
|
|
|
return gaps.top > 0 || gaps.right > 0 || gaps.bottom > 0 || gaps.left > 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_autoconfigure(struct sway_view *view) {
|
Move view {x,y,width,height} into container struct
This renames/moves the following properties:
* sway_view.{x,y,width,height} ->
sway_container.content_{x,y,width,height}
* This is required to support placeholder containers as they don't
have a view.
* sway_container_state.view_{x,y,width,height} ->
sway_container_state.content_{x,y,width,height}
* To remain consistent with the above.
* sway_container_state.con_{x,y,width,height} ->
sway_container_state.{x,y,width,height}
* The con prefix was there to give it contrast from the view
properties, and is no longer useful.
The function container_set_geometry_from_floating_view has also been
renamed to container_set_geometry_from_content.
6 years ago
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
struct sway_workspace *ws = con->pending.workspace;
|
|
|
|
|
|
|
|
|
|
if (container_is_scratchpad_hidden(con) &&
|
|
|
|
|
con->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_output *output = ws ? ws->output : NULL;
|
|
|
|
|
|
|
|
|
|
if (con->pending.fullscreen_mode == FULLSCREEN_WORKSPACE) {
|
|
|
|
|
con->pending.content_x = output->lx;
|
|
|
|
|
con->pending.content_y = output->ly;
|
|
|
|
|
con->pending.content_width = output->width;
|
|
|
|
|
con->pending.content_height = output->height;
|
|
|
|
|
return;
|
|
|
|
|
} else if (con->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
|
|
|
|
|
con->pending.content_x = root->x;
|
|
|
|
|
con->pending.content_y = root->y;
|
|
|
|
|
con->pending.content_width = root->width;
|
|
|
|
|
con->pending.content_height = root->height;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con->pending.border_top = con->pending.border_bottom = true;
|
|
|
|
|
con->pending.border_left = con->pending.border_right = true;
|
|
|
|
|
double y_offset = 0;
|
|
|
|
|
|
|
|
|
|
if (!container_is_floating_or_child(con) && ws) {
|
|
|
|
|
if (config->hide_edge_borders == E_BOTH
|
|
|
|
|
|| config->hide_edge_borders == E_VERTICAL) {
|
|
|
|
|
con->pending.border_left = con->pending.x != ws->x;
|
|
|
|
|
int right_x = con->pending.x + con->pending.width;
|
|
|
|
|
con->pending.border_right = right_x != ws->x + ws->width;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (config->hide_edge_borders == E_BOTH
|
|
|
|
|
|| config->hide_edge_borders == E_HORIZONTAL) {
|
|
|
|
|
con->pending.border_top = con->pending.y != ws->y;
|
|
|
|
|
int bottom_y = con->pending.y + con->pending.height;
|
|
|
|
|
con->pending.border_bottom = bottom_y != ws->y + ws->height;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool smart = config->hide_edge_borders_smart == ESMART_ON ||
|
|
|
|
|
(config->hide_edge_borders_smart == ESMART_NO_GAPS &&
|
|
|
|
|
!gaps_to_edge(view));
|
|
|
|
|
if (smart) {
|
|
|
|
|
bool show_border = !view_is_only_visible(view);
|
|
|
|
|
con->pending.border_left &= show_border;
|
|
|
|
|
con->pending.border_right &= show_border;
|
|
|
|
|
con->pending.border_top &= show_border;
|
|
|
|
|
con->pending.border_bottom &= show_border;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!container_is_floating(con)) {
|
|
|
|
|
// In a tabbed or stacked container, the container's y is the top of the
|
|
|
|
|
// title area. We have to offset the surface y by the height of the title,
|
|
|
|
|
// bar, and disable any top border because we'll always have the title bar.
|
|
|
|
|
list_t *siblings = container_get_siblings(con);
|
|
|
|
|
bool show_titlebar = (siblings && siblings->length > 1)
|
|
|
|
|
|| !config->hide_lone_tab;
|
|
|
|
|
if (show_titlebar) {
|
|
|
|
|
enum sway_container_layout layout = container_parent_layout(con);
|
|
|
|
|
if (layout == L_TABBED) {
|
|
|
|
|
y_offset = container_titlebar_height();
|
|
|
|
|
con->pending.border_top = false;
|
|
|
|
|
} else if (layout == L_STACKED) {
|
|
|
|
|
y_offset = container_titlebar_height() * siblings->length;
|
|
|
|
|
con->pending.border_top = false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
double x, y, width, height;
|
|
|
|
|
switch (con->pending.border) {
|
|
|
|
|
default:
|
|
|
|
|
case B_CSD:
|
|
|
|
|
case B_NONE:
|
|
|
|
|
x = con->pending.x;
|
|
|
|
|
y = con->pending.y + y_offset;
|
|
|
|
|
width = con->pending.width;
|
|
|
|
|
height = con->pending.height - y_offset;
|
|
|
|
|
break;
|
|
|
|
|
case B_PIXEL:
|
|
|
|
|
x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
|
|
|
|
|
y = con->pending.y + con->pending.border_thickness * con->pending.border_top + y_offset;
|
|
|
|
|
width = con->pending.width
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_left
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_right;
|
|
|
|
|
height = con->pending.height - y_offset
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_top
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_bottom;
|
|
|
|
|
break;
|
|
|
|
|
case B_NORMAL:
|
|
|
|
|
// Height is: 1px border + 3px pad + title height + 3px pad + 1px border
|
|
|
|
|
x = con->pending.x + con->pending.border_thickness * con->pending.border_left;
|
|
|
|
|
width = con->pending.width
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_left
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_right;
|
|
|
|
|
if (y_offset) {
|
|
|
|
|
y = con->pending.y + y_offset;
|
|
|
|
|
height = con->pending.height - y_offset
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_bottom;
|
|
|
|
|
} else {
|
|
|
|
|
y = con->pending.y + container_titlebar_height();
|
|
|
|
|
height = con->pending.height - container_titlebar_height()
|
|
|
|
|
- con->pending.border_thickness * con->pending.border_bottom;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
con->pending.content_x = x;
|
|
|
|
|
con->pending.content_y = y;
|
|
|
|
|
con->pending.content_width = width;
|
|
|
|
|
con->pending.content_height = height;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_set_activated(struct sway_view *view, bool activated) {
|
|
|
|
|
if (view->impl->set_activated) {
|
|
|
|
|
view->impl->set_activated(view, activated);
|
|
|
|
|
}
|
|
|
|
|
if (view->foreign_toplevel) {
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_set_activated(
|
|
|
|
|
view->foreign_toplevel, activated);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_request_activate(struct sway_view *view) {
|
|
|
|
|
struct sway_workspace *ws = view->container->pending.workspace;
|
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 (!ws) { // hidden scratchpad container
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
|
|
|
|
|
switch (config->focus_on_window_activation) {
|
|
|
|
|
case FOWA_SMART:
|
|
|
|
|
if (workspace_is_visible(ws)) {
|
|
|
|
|
seat_set_focus_container(seat, view->container);
|
|
|
|
|
} else {
|
|
|
|
|
view_set_urgent(view, true);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case FOWA_URGENT:
|
|
|
|
|
view_set_urgent(view, true);
|
|
|
|
|
break;
|
|
|
|
|
case FOWA_FOCUS:
|
|
|
|
|
seat_set_focus_container(seat, view->container);
|
|
|
|
|
break;
|
|
|
|
|
case FOWA_NONE:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_set_csd_from_server(struct sway_view *view, bool enabled) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Telling view %p to set CSD to %i", view, enabled);
|
|
|
|
|
if (view->xdg_decoration) {
|
|
|
|
|
uint32_t mode = enabled ?
|
|
|
|
|
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_CLIENT_SIDE :
|
|
|
|
|
WLR_XDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE;
|
|
|
|
|
wlr_xdg_toplevel_decoration_v1_set_mode(
|
|
|
|
|
view->xdg_decoration->wlr_xdg_decoration, mode);
|
|
|
|
|
}
|
|
|
|
|
view->using_csd = enabled;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_update_csd_from_client(struct sway_view *view, bool enabled) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "View %p updated CSD to %i", view, enabled);
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
if (enabled && con && con->pending.border != B_CSD) {
|
|
|
|
|
con->saved_border = con->pending.border;
|
|
|
|
|
if (container_is_floating(con)) {
|
|
|
|
|
con->pending.border = B_CSD;
|
|
|
|
|
}
|
|
|
|
|
} else if (!enabled && con && con->pending.border == B_CSD) {
|
|
|
|
|
con->pending.border = con->saved_border;
|
|
|
|
|
}
|
|
|
|
|
view->using_csd = enabled;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_set_tiled(struct sway_view *view, bool tiled) {
|
|
|
|
|
if (view->impl->set_tiled) {
|
|
|
|
|
view->impl->set_tiled(view, tiled);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_close(struct sway_view *view) {
|
|
|
|
|
if (view->impl->close) {
|
|
|
|
|
view->impl->close(view);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_close_popups(struct sway_view *view) {
|
|
|
|
|
if (view->impl->close_popups) {
|
|
|
|
|
view->impl->close_popups(view);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_damage_from(struct sway_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
|
|
|
for (int i = 0; i < root->outputs->length; ++i) {
|
|
|
|
|
struct sway_output *output = root->outputs->items[i];
|
|
|
|
|
output_damage_from_view(output, view);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_for_each_surface(struct sway_view *view,
|
|
|
|
|
wlr_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
|
if (!view->surface) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (view->impl->for_each_surface) {
|
|
|
|
|
view->impl->for_each_surface(view, iterator, user_data);
|
|
|
|
|
} else {
|
|
|
|
|
wlr_surface_for_each_surface(view->surface, iterator, user_data);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_for_each_popup_surface(struct sway_view *view,
|
|
|
|
|
wlr_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
|
if (!view->surface) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (view->impl->for_each_popup_surface) {
|
|
|
|
|
view->impl->for_each_popup_surface(view, iterator, user_data);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_subsurface_create(struct sway_view *view,
|
|
|
|
|
struct wlr_subsurface *subsurface);
|
|
|
|
|
|
|
|
|
|
static void view_init_subsurfaces(struct sway_view *view,
|
|
|
|
|
struct wlr_surface *surface);
|
|
|
|
|
|
|
|
|
|
static void view_child_init_subsurfaces(struct sway_view_child *view_child,
|
|
|
|
|
struct wlr_surface *surface);
|
|
|
|
|
|
|
|
|
|
static void view_handle_surface_new_subsurface(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view *view =
|
|
|
|
|
wl_container_of(listener, view, surface_new_subsurface);
|
|
|
|
|
struct wlr_subsurface *subsurface = data;
|
|
|
|
|
view_subsurface_create(view, subsurface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool view_has_executed_criteria(struct sway_view *view,
|
|
|
|
|
struct criteria *criteria) {
|
|
|
|
|
for (int i = 0; i < view->executed_criteria->length; ++i) {
|
|
|
|
|
struct criteria *item = view->executed_criteria->items[i];
|
|
|
|
|
if (item == criteria) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_execute_criteria(struct sway_view *view) {
|
|
|
|
|
list_t *criterias = criteria_for_view(view, CT_COMMAND);
|
|
|
|
|
for (int i = 0; i < criterias->length; i++) {
|
|
|
|
|
struct criteria *criteria = criterias->items[i];
|
|
|
|
|
sway_log(SWAY_DEBUG, "Checking criteria %s", criteria->raw);
|
|
|
|
|
if (view_has_executed_criteria(view, criteria)) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Criteria already executed");
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
sway_log(SWAY_DEBUG, "for_window '%s' matches view %p, cmd: '%s'",
|
|
|
|
|
criteria->raw, view, criteria->cmdlist);
|
|
|
|
|
list_add(view->executed_criteria, criteria);
|
|
|
|
|
list_t *res_list = execute_command(
|
|
|
|
|
criteria->cmdlist, NULL, view->container);
|
|
|
|
|
while (res_list->length) {
|
|
|
|
|
struct cmd_results *res = res_list->items[0];
|
|
|
|
|
free_cmd_results(res);
|
|
|
|
|
list_del(res_list, 0);
|
|
|
|
|
}
|
|
|
|
|
list_free(res_list);
|
|
|
|
|
}
|
|
|
|
|
list_free(criterias);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_populate_pid(struct sway_view *view) {
|
|
|
|
|
pid_t pid;
|
|
|
|
|
switch (view->type) {
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
case SWAY_VIEW_XWAYLAND:;
|
|
|
|
|
struct wlr_xwayland_surface *surf =
|
|
|
|
|
wlr_xwayland_surface_from_wlr_surface(view->surface);
|
|
|
|
|
pid = surf->pid;
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
|
|
|
|
case SWAY_VIEW_XDG_SHELL:;
|
|
|
|
|
struct wl_client *client =
|
|
|
|
|
wl_resource_get_client(view->surface->resource);
|
|
|
|
|
wl_client_get_credentials(client, &pid, NULL, NULL);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
view->pid = pid;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
static struct sway_workspace *select_workspace(struct sway_view *view) {
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
|
|
|
|
|
// Check if there's any `assign` criteria for the view
|
|
|
|
|
list_t *criterias = criteria_for_view(view,
|
|
|
|
|
CT_ASSIGN_WORKSPACE | CT_ASSIGN_WORKSPACE_NUMBER | CT_ASSIGN_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_workspace *ws = NULL;
|
|
|
|
|
for (int i = 0; i < criterias->length; ++i) {
|
|
|
|
|
struct criteria *criteria = criterias->items[i];
|
|
|
|
|
if (criteria->type == CT_ASSIGN_OUTPUT) {
|
|
|
|
|
struct sway_output *output = output_by_name_or_id(criteria->target);
|
|
|
|
|
if (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
|
|
|
ws = output_get_active_workspace(output);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// CT_ASSIGN_WORKSPACE(_NUMBER)
|
|
|
|
|
ws = criteria->type == CT_ASSIGN_WORKSPACE_NUMBER ?
|
|
|
|
|
workspace_by_number(criteria->target) :
|
|
|
|
|
workspace_by_name(criteria->target);
|
|
|
|
|
|
|
|
|
|
if (!ws) {
|
|
|
|
|
if (strcasecmp(criteria->target, "back_and_forth") == 0) {
|
|
|
|
|
if (seat->prev_workspace_name) {
|
|
|
|
|
ws = workspace_create(NULL, seat->prev_workspace_name);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ws = workspace_create(NULL, criteria->target);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
list_free(criterias);
|
|
|
|
|
if (ws) {
|
|
|
|
|
remove_workspace_pid(view->pid);
|
|
|
|
|
return ws;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check if there's a PID mapping
|
|
|
|
|
ws = workspace_for_pid(view->pid);
|
|
|
|
|
if (ws) {
|
|
|
|
|
return ws;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Use the focused workspace
|
|
|
|
|
struct sway_node *node = seat_get_focus_inactive(seat, &root->node);
|
|
|
|
|
if (node && node->type == N_WORKSPACE) {
|
|
|
|
|
return node->sway_workspace;
|
|
|
|
|
} else if (node && node->type == N_CONTAINER) {
|
|
|
|
|
return node->sway_container->pending.workspace;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// When there's no outputs connected, the above should match a workspace on
|
|
|
|
|
// the noop output.
|
|
|
|
|
sway_assert(false, "Expected to find a workspace");
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool should_focus(struct sway_view *view) {
|
|
|
|
|
struct sway_seat *seat = input_manager_current_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_container *prev_con = seat_get_focused_container(seat);
|
|
|
|
|
struct sway_workspace *prev_ws = seat_get_focused_workspace(seat);
|
|
|
|
|
struct sway_workspace *map_ws = view->container->pending.workspace;
|
|
|
|
|
|
|
|
|
|
if (view->container->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// View opened "under" fullscreen view should not be given focus.
|
view: handle case where map_ws is NULL
When a criteria places the view into the scratchpad, map_ws is NULL and
trying to access map_ws->fullscreen will result in SIGSEGFAULT with:
#0 0x0000000000455327 in should_focus (view=0x15a6a70) at ../sway/tree/view.c:604
prev_con = 0x0
len = <optimized out>
seat = 0x12233c0
prev_ws = 0x1264c80
map_ws = 0x0
criterias = <optimized out>
seat = <optimized out>
prev_con = <optimized out>
prev_ws = <optimized out>
map_ws = <optimized out>
criterias = <optimized out>
len = <optimized out>
num_children = <optimized out>
#1 view_map (view=view@entry=0x15a6a70, wlr_surface=0x15a5cb0, fullscreen=<optimized out>, fullscreen_output=<optimized out>, decoration=<optimized out>) at ../sway/tree/view.c:809
__PRETTY_FUNCTION__ = "view_map"
ws = <optimized out>
seat = <optimized out>
node = <optimized out>
target_sibling = <optimized out>
container = 0x1625400
set_focus = <optimized out>
app_id = <optimized out>
class = <optimized out>
#2 0x0000000000423a7e in handle_map (listener=0x15a6c78, data=<optimized out>) at ../sway/desktop/xdg_shell.c:454
xdg_shell_view = 0x15a6a70
view = 0x15a6a70
xdg_surface = 0x15a6620
csd = <optimized out>
#3 0x00007f508bd3674c in wlr_signal_emit_safe (signal=signal@entry=0x15a6718, data=data@entry=0x15a6620) at ../subprojects/wlroots/util/signal.c:29
pos = 0x15a6c78
l = 0x15a6c78
cursor = {link = {prev = 0x15a6c78, next = 0x7fff53d58190}, notify = 0x7f508bd366c0 <handle_noop>}
end = {link = {prev = 0x7fff53d58170, next = 0x15a6718}, notify = 0x7f508bd366c0 <handle_noop>}
#4 0x00007f508bd15b29 in handle_xdg_surface_commit (wlr_surface=<optimized out>) at ../subprojects/wlroots/types/xdg_shell/wlr_xdg_surface.c:384
surface = 0x15a6620
#5 0x00007f508bd2e981 in surface_commit_state (surface=surface@entry=0x15a5cb0, next=next@entry=0x15a5e18) at ../subprojects/wlroots/types/wlr_surface.c:455
__PRETTY_FUNCTION__ = "surface_commit_state"
invalid_buffer = <optimized out>
subsurface = 0x15a6038
#6 0x00007f508bd2f53b in surface_commit_pending (surface=0x15a5cb0) at ../subprojects/wlroots/types/wlr_surface.c:474
next_seq = 3
next_seq = <optimized out>
#7 surface_commit (client=<optimized out>, resource=<optimized out>) at ../subprojects/wlroots/types/wlr_surface.c:542
surface = 0x15a5cb0
subsurface = <optimized out>
If map_ws is NULL we assume the view is places into the scratchpad and
return false as well.
4 years ago
|
|
|
if (root->fullscreen_global || !map_ws || map_ws->fullscreen) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Views can only take focus if they are mapped into the active workspace
|
|
|
|
|
if (prev_ws != map_ws) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// If the view is the only one in the focused workspace, it'll get focus
|
|
|
|
|
// regardless of any no_focus criteria.
|
|
|
|
|
if (!view->container->pending.parent && !prev_con) {
|
|
|
|
|
size_t num_children = view->container->pending.workspace->tiling->length +
|
|
|
|
|
view->container->pending.workspace->floating->length;
|
|
|
|
|
if (num_children == 1) {
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check no_focus criteria
|
|
|
|
|
list_t *criterias = criteria_for_view(view, CT_NO_FOCUS);
|
|
|
|
|
size_t len = criterias->length;
|
|
|
|
|
list_free(criterias);
|
|
|
|
|
return len == 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_foreign_activate_request(
|
|
|
|
|
struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_view *view = wl_container_of(
|
|
|
|
|
listener, view, foreign_activate_request);
|
|
|
|
|
struct wlr_foreign_toplevel_handle_v1_activated_event *event = data;
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
if (seat->wlr_seat == event->seat) {
|
|
|
|
|
if (container_is_scratchpad_hidden_or_child(view->container)) {
|
|
|
|
|
root_scratchpad_show(view->container);
|
|
|
|
|
}
|
|
|
|
|
seat_set_focus_container(seat, view->container);
|
|
|
|
|
seat_consider_warp_to_focus(seat);
|
|
|
|
|
container_raise_floating(view->container);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_foreign_fullscreen_request(
|
|
|
|
|
struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_view *view = wl_container_of(
|
|
|
|
|
listener, view, foreign_fullscreen_request);
|
|
|
|
|
struct wlr_foreign_toplevel_handle_v1_fullscreen_event *event = data;
|
|
|
|
|
|
|
|
|
|
// Match fullscreen command behavior for scratchpad hidden views
|
|
|
|
|
struct sway_container *container = view->container;
|
|
|
|
|
if (!container->pending.workspace) {
|
|
|
|
|
while (container->pending.parent) {
|
|
|
|
|
container = container->pending.parent;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (event->fullscreen && event->output && event->output->data) {
|
|
|
|
|
struct sway_output *output = event->output->data;
|
|
|
|
|
struct sway_workspace *ws = output_get_active_workspace(output);
|
|
|
|
|
if (ws && !container_is_scratchpad_hidden(view->container)) {
|
|
|
|
|
if (container_is_floating(view->container)) {
|
|
|
|
|
workspace_add_floating(ws, view->container);
|
|
|
|
|
} else {
|
|
|
|
|
workspace_add_tiling(ws, view->container);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
container_set_fullscreen(container,
|
|
|
|
|
event->fullscreen ? FULLSCREEN_WORKSPACE : FULLSCREEN_NONE);
|
|
|
|
|
if (event->fullscreen) {
|
|
|
|
|
arrange_root();
|
|
|
|
|
} else {
|
|
|
|
|
if (container->pending.parent) {
|
|
|
|
|
arrange_container(container->pending.parent);
|
|
|
|
|
} else if (container->pending.workspace) {
|
|
|
|
|
arrange_workspace(container->pending.workspace);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_foreign_close_request(
|
|
|
|
|
struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_view *view = wl_container_of(
|
|
|
|
|
listener, view, foreign_close_request);
|
|
|
|
|
view_close(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_foreign_destroy(
|
|
|
|
|
struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_view *view = wl_container_of(
|
|
|
|
|
listener, view, foreign_destroy);
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&view->foreign_activate_request.link);
|
|
|
|
|
wl_list_remove(&view->foreign_fullscreen_request.link);
|
|
|
|
|
wl_list_remove(&view->foreign_close_request.link);
|
|
|
|
|
wl_list_remove(&view->foreign_destroy.link);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_map(struct sway_view *view, struct wlr_surface *wlr_surface,
|
|
|
|
|
bool fullscreen, struct wlr_output *fullscreen_output,
|
|
|
|
|
bool decoration) {
|
|
|
|
|
if (!sway_assert(view->surface == NULL, "cannot map mapped view")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view->surface = wlr_surface;
|
|
|
|
|
view_populate_pid(view);
|
|
|
|
|
view->container = container_create(view);
|
|
|
|
|
|
|
|
|
|
// If there is a request to be opened fullscreen on a specific output, try
|
|
|
|
|
// to honor that request. Otherwise, fallback to assigns, pid mappings,
|
|
|
|
|
// focused workspace, etc
|
|
|
|
|
struct sway_workspace *ws = NULL;
|
|
|
|
|
if (fullscreen_output && fullscreen_output->data) {
|
|
|
|
|
struct sway_output *output = fullscreen_output->data;
|
|
|
|
|
ws = output_get_active_workspace(output);
|
|
|
|
|
}
|
|
|
|
|
if (!ws) {
|
|
|
|
|
ws = select_workspace(view);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
struct sway_node *node =
|
|
|
|
|
seat_get_focus_inactive(seat, ws ? &ws->node : &root->node);
|
|
|
|
|
struct sway_container *target_sibling = NULL;
|
|
|
|
|
if (node && node->type == N_CONTAINER) {
|
|
|
|
|
if (container_is_floating(node->sway_container)) {
|
|
|
|
|
// If we're about to launch the view into the floating container, then
|
|
|
|
|
// launch it as a tiled view instead.
|
|
|
|
|
if (ws) {
|
|
|
|
|
target_sibling = seat_get_focus_inactive_tiling(seat, ws);
|
|
|
|
|
if (target_sibling) {
|
|
|
|
|
struct sway_container *con =
|
|
|
|
|
seat_get_focus_inactive_view(seat, &target_sibling->node);
|
|
|
|
|
if (con) {
|
|
|
|
|
target_sibling = con;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ws = seat_get_last_known_workspace(seat);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
target_sibling = node->sway_container;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view->foreign_toplevel =
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_create(server.foreign_toplevel_manager);
|
|
|
|
|
view->foreign_activate_request.notify = handle_foreign_activate_request;
|
|
|
|
|
wl_signal_add(&view->foreign_toplevel->events.request_activate,
|
|
|
|
|
&view->foreign_activate_request);
|
|
|
|
|
view->foreign_fullscreen_request.notify = handle_foreign_fullscreen_request;
|
|
|
|
|
wl_signal_add(&view->foreign_toplevel->events.request_fullscreen,
|
|
|
|
|
&view->foreign_fullscreen_request);
|
|
|
|
|
view->foreign_close_request.notify = handle_foreign_close_request;
|
|
|
|
|
wl_signal_add(&view->foreign_toplevel->events.request_close,
|
|
|
|
|
&view->foreign_close_request);
|
|
|
|
|
view->foreign_destroy.notify = handle_foreign_destroy;
|
|
|
|
|
wl_signal_add(&view->foreign_toplevel->events.destroy,
|
|
|
|
|
&view->foreign_destroy);
|
|
|
|
|
|
|
|
|
|
struct sway_container *container = view->container;
|
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 (target_sibling) {
|
|
|
|
|
container_add_sibling(target_sibling, container, 1);
|
|
|
|
|
} else if (ws) {
|
|
|
|
|
container = workspace_add_tiling(ws, container);
|
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
|
|
|
}
|
|
|
|
|
ipc_event_window(view->container, "new");
|
|
|
|
|
|
|
|
|
|
view_init_subsurfaces(view, wlr_surface);
|
|
|
|
|
wl_signal_add(&wlr_surface->events.new_subsurface,
|
|
|
|
|
&view->surface_new_subsurface);
|
|
|
|
|
view->surface_new_subsurface.notify = view_handle_surface_new_subsurface;
|
|
|
|
|
|
|
|
|
|
if (decoration) {
|
|
|
|
|
view_update_csd_from_client(view, decoration);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (view->impl->wants_floating && view->impl->wants_floating(view)) {
|
|
|
|
|
view->container->pending.border = config->floating_border;
|
|
|
|
|
view->container->pending.border_thickness = config->floating_border_thickness;
|
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_floating(view->container, true);
|
|
|
|
|
} else {
|
|
|
|
|
view->container->pending.border = config->border;
|
|
|
|
|
view->container->pending.border_thickness = config->border_thickness;
|
|
|
|
|
view_set_tiled(view, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (config->popup_during_fullscreen == POPUP_LEAVE &&
|
|
|
|
|
container->pending.workspace &&
|
|
|
|
|
container->pending.workspace->fullscreen &&
|
|
|
|
|
container->pending.workspace->fullscreen->view) {
|
|
|
|
|
struct sway_container *fs = container->pending.workspace->fullscreen;
|
|
|
|
|
if (view_is_transient_for(view, fs->view)) {
|
|
|
|
|
container_set_fullscreen(fs, false);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_update_title(view, false);
|
|
|
|
|
container_update_representation(container);
|
|
|
|
|
|
|
|
|
|
if (fullscreen) {
|
|
|
|
|
container_set_fullscreen(view->container, true);
|
|
|
|
|
arrange_workspace(view->container->pending.workspace);
|
|
|
|
|
} else {
|
|
|
|
|
if (container->pending.parent) {
|
|
|
|
|
arrange_container(container->pending.parent);
|
|
|
|
|
} else if (container->pending.workspace) {
|
|
|
|
|
arrange_workspace(container->pending.workspace);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_execute_criteria(view);
|
|
|
|
|
|
|
|
|
|
bool set_focus = should_focus(view);
|
|
|
|
|
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
if (wlr_surface_is_xwayland_surface(wlr_surface)) {
|
|
|
|
|
struct wlr_xwayland_surface *xsurface =
|
|
|
|
|
wlr_xwayland_surface_from_wlr_surface(wlr_surface);
|
|
|
|
|
set_focus &= wlr_xwayland_icccm_input_model(xsurface) !=
|
|
|
|
|
WLR_ICCCM_INPUT_MODEL_NONE;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
if (set_focus) {
|
|
|
|
|
input_manager_set_focus(&view->container->node);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *app_id;
|
|
|
|
|
const char *class;
|
|
|
|
|
if ((app_id = view_get_app_id(view)) != NULL) {
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, app_id);
|
|
|
|
|
} else if ((class = view_get_class(view)) != NULL) {
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_set_app_id(view->foreign_toplevel, class);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_unmap(struct sway_view *view) {
|
|
|
|
|
wl_signal_emit_mutable(&view->events.unmap, view);
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&view->surface_new_subsurface.link);
|
|
|
|
|
|
|
|
|
|
if (view->urgent_timer) {
|
|
|
|
|
wl_event_source_remove(view->urgent_timer);
|
|
|
|
|
view->urgent_timer = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (view->foreign_toplevel) {
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_destroy(view->foreign_toplevel);
|
|
|
|
|
view->foreign_toplevel = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_container *parent = view->container->pending.parent;
|
|
|
|
|
struct sway_workspace *ws = view->container->pending.workspace;
|
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_begin_destroy(view->container);
|
|
|
|
|
if (parent) {
|
|
|
|
|
container_reap_empty(parent);
|
|
|
|
|
} else if (ws) {
|
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
|
|
|
workspace_consider_destroy(ws);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (root->fullscreen_global) {
|
|
|
|
|
// Container may have been a child of the root fullscreen container
|
|
|
|
|
arrange_root();
|
|
|
|
|
} else if (ws && !ws->node.destroying) {
|
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(ws);
|
|
|
|
|
workspace_detect_urgent(ws);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_seat *seat;
|
|
|
|
|
wl_list_for_each(seat, &server.input->seats, link) {
|
|
|
|
|
seat->cursor->image_surface = NULL;
|
|
|
|
|
if (seat->cursor->active_constraint) {
|
|
|
|
|
struct wlr_surface *constrain_surface =
|
|
|
|
|
seat->cursor->active_constraint->surface;
|
|
|
|
|
if (view_from_wlr_surface(constrain_surface) == view) {
|
|
|
|
|
sway_cursor_constrain(seat->cursor, NULL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
seat_consider_warp_to_focus(seat);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
view->surface = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_update_size(struct sway_view *view) {
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
con->pending.content_width = view->geometry.width;
|
|
|
|
|
con->pending.content_height = view->geometry.height;
|
|
|
|
|
container_set_geometry_from_content(con);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_center_surface(struct sway_view *view) {
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
// We always center the current coordinates rather than the next, as the
|
|
|
|
|
// geometry immediately affects the currently active rendering.
|
|
|
|
|
con->surface_x = fmax(con->current.content_x, con->current.content_x +
|
|
|
|
|
(con->current.content_width - view->geometry.width) / 2);
|
|
|
|
|
con->surface_y = fmax(con->current.content_y, con->current.content_y +
|
|
|
|
|
(con->current.content_height - view->geometry.height) / 2);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_view_child_impl subsurface_impl;
|
|
|
|
|
|
|
|
|
|
static void subsurface_get_view_coords(struct sway_view_child *child,
|
|
|
|
|
int *sx, int *sy) {
|
|
|
|
|
struct wlr_surface *surface = child->surface;
|
|
|
|
|
if (child->parent && child->parent->impl &&
|
|
|
|
|
child->parent->impl->get_view_coords) {
|
|
|
|
|
child->parent->impl->get_view_coords(child->parent, sx, sy);
|
|
|
|
|
} else {
|
|
|
|
|
*sx = *sy = 0;
|
|
|
|
|
}
|
|
|
|
|
struct wlr_subsurface *subsurface =
|
|
|
|
|
wlr_subsurface_from_wlr_surface(surface);
|
|
|
|
|
*sx += subsurface->current.x;
|
|
|
|
|
*sy += subsurface->current.y;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void subsurface_destroy(struct sway_view_child *child) {
|
|
|
|
|
if (!sway_assert(child->impl == &subsurface_impl,
|
|
|
|
|
"Expected a subsurface")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_subsurface *subsurface = (struct sway_subsurface *)child;
|
|
|
|
|
wl_list_remove(&subsurface->destroy.link);
|
|
|
|
|
free(subsurface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const struct sway_view_child_impl subsurface_impl = {
|
|
|
|
|
.get_view_coords = subsurface_get_view_coords,
|
|
|
|
|
.destroy = subsurface_destroy,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static void subsurface_handle_destroy(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_subsurface *subsurface =
|
|
|
|
|
wl_container_of(listener, subsurface, destroy);
|
|
|
|
|
struct sway_view_child *child = &subsurface->child;
|
|
|
|
|
view_child_destroy(child);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_damage(struct sway_view_child *child, bool whole);
|
|
|
|
|
|
|
|
|
|
static void view_subsurface_create(struct sway_view *view,
|
|
|
|
|
struct wlr_subsurface *wlr_subsurface) {
|
|
|
|
|
struct sway_subsurface *subsurface =
|
|
|
|
|
calloc(1, sizeof(struct sway_subsurface));
|
|
|
|
|
if (subsurface == NULL) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Allocation failed");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
view_child_init(&subsurface->child, &subsurface_impl, view,
|
|
|
|
|
wlr_subsurface->surface);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
|
|
|
|
|
subsurface->destroy.notify = subsurface_handle_destroy;
|
|
|
|
|
|
|
|
|
|
subsurface->child.mapped = true;
|
|
|
|
|
|
|
|
|
|
view_child_damage(&subsurface->child, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_subsurface_create(struct sway_view_child *child,
|
|
|
|
|
struct wlr_subsurface *wlr_subsurface) {
|
|
|
|
|
struct sway_subsurface *subsurface =
|
|
|
|
|
calloc(1, sizeof(struct sway_subsurface));
|
|
|
|
|
if (subsurface == NULL) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Allocation failed");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
subsurface->child.parent = child;
|
|
|
|
|
wl_list_insert(&child->children, &subsurface->child.link);
|
|
|
|
|
view_child_init(&subsurface->child, &subsurface_impl, child->view,
|
|
|
|
|
wlr_subsurface->surface);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
|
|
|
|
|
subsurface->destroy.notify = subsurface_handle_destroy;
|
|
|
|
|
|
|
|
|
|
subsurface->child.mapped = true;
|
|
|
|
|
|
|
|
|
|
view_child_damage(&subsurface->child, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool view_child_is_mapped(struct sway_view_child *child) {
|
|
|
|
|
while (child) {
|
|
|
|
|
if (!child->mapped) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
child = child->parent;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_damage(struct sway_view_child *child, bool whole) {
|
|
|
|
|
if (!child || !view_child_is_mapped(child) || !child->view || !child->view->container) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
int sx, sy;
|
|
|
|
|
child->impl->get_view_coords(child, &sx, &sy);
|
|
|
|
|
desktop_damage_surface(child->surface,
|
|
|
|
|
child->view->container->pending.content_x -
|
|
|
|
|
child->view->geometry.x + sx,
|
|
|
|
|
child->view->container->pending.content_y -
|
|
|
|
|
child->view->geometry.y + sy, whole);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_surface_commit(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, surface_commit);
|
|
|
|
|
view_child_damage(child, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_surface_new_subsurface(
|
|
|
|
|
struct wl_listener *listener, void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, surface_new_subsurface);
|
|
|
|
|
struct wlr_subsurface *subsurface = data;
|
|
|
|
|
view_child_subsurface_create(child, subsurface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_surface_destroy(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, surface_destroy);
|
|
|
|
|
view_child_destroy(child);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_init_subsurfaces(struct sway_view *view,
|
|
|
|
|
struct wlr_surface *surface) {
|
|
|
|
|
struct wlr_subsurface *subsurface;
|
|
|
|
|
wl_list_for_each(subsurface, &surface->current.subsurfaces_below,
|
|
|
|
|
current.link) {
|
|
|
|
|
view_subsurface_create(view, subsurface);
|
|
|
|
|
}
|
|
|
|
|
wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
|
|
|
|
|
current.link) {
|
|
|
|
|
view_subsurface_create(view, subsurface);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_init_subsurfaces(struct sway_view_child *view_child,
|
|
|
|
|
struct wlr_surface *surface) {
|
|
|
|
|
struct wlr_subsurface *subsurface;
|
|
|
|
|
wl_list_for_each(subsurface, &surface->current.subsurfaces_below,
|
|
|
|
|
current.link) {
|
|
|
|
|
view_child_subsurface_create(view_child, subsurface);
|
|
|
|
|
}
|
|
|
|
|
wl_list_for_each(subsurface, &surface->current.subsurfaces_above,
|
|
|
|
|
current.link) {
|
|
|
|
|
view_child_subsurface_create(view_child, subsurface);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_surface_map(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, surface_map);
|
|
|
|
|
child->mapped = true;
|
|
|
|
|
view_child_damage(child, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_surface_unmap(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, surface_unmap);
|
|
|
|
|
view_child_damage(child, true);
|
|
|
|
|
child->mapped = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_child_handle_view_unmap(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_view_child *child =
|
|
|
|
|
wl_container_of(listener, child, view_unmap);
|
|
|
|
|
view_child_damage(child, true);
|
|
|
|
|
child->mapped = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_child_init(struct sway_view_child *child,
|
|
|
|
|
const struct sway_view_child_impl *impl, struct sway_view *view,
|
|
|
|
|
struct wlr_surface *surface) {
|
|
|
|
|
child->impl = impl;
|
|
|
|
|
child->view = view;
|
|
|
|
|
child->surface = surface;
|
|
|
|
|
wl_list_init(&child->children);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&surface->events.commit, &child->surface_commit);
|
|
|
|
|
child->surface_commit.notify = view_child_handle_surface_commit;
|
|
|
|
|
wl_signal_add(&surface->events.new_subsurface,
|
|
|
|
|
&child->surface_new_subsurface);
|
|
|
|
|
child->surface_new_subsurface.notify =
|
|
|
|
|
view_child_handle_surface_new_subsurface;
|
|
|
|
|
wl_signal_add(&surface->events.destroy, &child->surface_destroy);
|
|
|
|
|
child->surface_destroy.notify = view_child_handle_surface_destroy;
|
|
|
|
|
|
|
|
|
|
// Not all child views have a map/unmap event
|
|
|
|
|
child->surface_map.notify = view_child_handle_surface_map;
|
|
|
|
|
wl_list_init(&child->surface_map.link);
|
|
|
|
|
child->surface_unmap.notify = view_child_handle_surface_unmap;
|
|
|
|
|
wl_list_init(&child->surface_unmap.link);
|
|
|
|
|
|
|
|
|
|
wl_signal_add(&view->events.unmap, &child->view_unmap);
|
|
|
|
|
child->view_unmap.notify = view_child_handle_view_unmap;
|
|
|
|
|
|
view: Fix null dereference
There seems to be a null pointer access that can happen. I was able to
reproduce this by running the cemu emulator[1] with the new collabora
wine wayland driver[2] and opening and closing some sub menus.
Adding a trival null check seems to do the trick to stop sway from
crashing and returning to tty and everything else works normally.
[1]: http://cemu.info/
[2]: https://www.winehq.org/pipermail/wine-devel/2021-December/203035.html
Stack trace from lldb:
* thread #1, name = 'sway', stop reason = signal SIGSEGV: invalid address (fault address: 0xf8)
frame #0: 0x00005555555c3fc3 sway`view_child_init(child=0x0000555555f67940, impl=0x00005555555ee030, view=0x00005555565bc590, surface=0x00005555565b6940) at view.c:1117:25
1114 wl_signal_add(&view->events.unmap, &child->view_unmap);
1115 child->view_unmap.notify = view_child_handle_view_unmap;
1116
-> 1117 struct sway_workspace *workspace = child->view->container->pending.workspace;
1118 if (workspace) {
1119 wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
1120 }
(lldb) up
error: sway {0x000342ab}: DIE has DW_AT_ranges(DW_FORM_sec_offset 0x67) attribute, but range extraction failed (invalid range list offset 0x67), please file a bug and attach the file at the start of this error message
frame #1: 0x00005555555c39f8 sway`view_child_subsurface_create(child=0x00005555564a10d0, wlr_subsurface=0x0000555556586910) at view.c:985:2
982 }
983 subsurface->child.parent = child;
984 wl_list_insert(&child->children, &subsurface->child.link);
-> 985 view_child_init(&subsurface->child, &subsurface_impl, child->view,
986 wlr_subsurface->surface);
987
988 wl_signal_add(&wlr_subsurface->events.destroy, &subsurface->destroy);
(lldb) up
frame #2: 0x00005555555c3c2a sway`view_child_handle_surface_new_subsurface(listener=0x00005555564a1130, data=0x0000555556586910) at view.c:1031:2
1028 struct sway_view_child *child =
1029 wl_container_of(listener, child, surface_new_subsurface);
1030 struct wlr_subsurface *subsurface = data;
-> 1031 view_child_subsurface_create(child, subsurface);
1032 }
1033
1034 static void view_child_handle_surface_destroy(struct wl_listener *listener,
(lldb) up
frame #3: 0x00007ffff78f4bfe libwlroots.so.10`wlr_signal_emit_safe(signal=0x00005555565b2470, data=0x0000555556586910) at signal.c:29:3
26 wl_list_remove(&cursor.link);
27 wl_list_insert(pos, &cursor.link);
28
-> 29 l->notify(l, data);
30 }
31
32 wl_list_remove(&cursor.link);
(lldb) up
frame #4: 0x00007ffff78e5a41 libwlroots.so.10`subsurface_parent_commit(subsurface=0x0000555556586910) at wlr_surface.c:517:3
514
515 if (!subsurface->added) {
516 subsurface->added = true;
-> 517 wlr_signal_emit_safe(&subsurface->parent->events.new_subsurface,
518 subsurface);
519 }
520 }
(lldb) up
frame #5: 0x00007ffff78e56fa libwlroots.so.10`surface_commit_state(surface=0x00005555565b21b0, next=0x00005555565b2338) at wlr_surface.c:439:3
436 wl_list_insert(&surface->current.subsurfaces_above,
437 &subsurface->current.link);
438
-> 439 subsurface_parent_commit(subsurface);
440 }
441 wl_list_for_each_reverse(subsurface, &surface->pending.subsurfaces_below,
442 pending.link) {
(lldb) up
frame #6: 0x00007ffff78e5b88 libwlroots.so.10`surface_handle_commit(client=0x0000555556564c80, resource=0x0000555556599a20) at wlr_surface.c:555:3
552 if (surface->pending.cached_state_locks > 0 || !wl_list_empty(&surface->cached)) {
553 surface_cache_pending(surface);
554 } else {
-> 555 surface_commit_state(surface, &surface->pending);
556 }
557 }
558
(lldb) up
frame #7: 0x00007ffff7000d4a libffi.so.8`___lldb_unnamed_symbol118 + 82
libffi.so.8`___lldb_unnamed_symbol118:
-> 0x7ffff7000d4a <+82>: leaq 0x18(%rbp), %rsp
0x7ffff7000d4e <+86>: movq (%rbp), %rcx
0x7ffff7000d52 <+90>: movq 0x8(%rbp), %rdi
0x7ffff7000d56 <+94>: movq 0x10(%rbp), %rbp
(lldb) up
frame #8: 0x00007ffff7000267 libffi.so.8`___lldb_unnamed_symbol115 + 439
libffi.so.8`___lldb_unnamed_symbol115:
-> 0x7ffff7000267 <+439>: movq -0x38(%rbp), %rax
0x7ffff700026b <+443>: subq %fs:0x28, %rax
0x7ffff7000274 <+452>: jne 0x7ffff70004e7 ; <+1079>
0x7ffff700027a <+458>: leaq -0x28(%rbp), %rsp
(lldb) up
frame #9: 0x00007ffff795a173 libwayland-server.so.0`___lldb_unnamed_symbol271 + 371
libwayland-server.so.0`___lldb_unnamed_symbol271:
-> 0x7ffff795a173 <+371>: movq 0x8(%r12), %rax
0x7ffff795a178 <+376>: movq 0x8(%rax), %rdi
0x7ffff795a17c <+380>: movl (%r12), %eax
0x7ffff795a180 <+384>: testl %eax, %eax
(lldb) up
frame #10: 0x00007ffff795555c libwayland-server.so.0`___lldb_unnamed_symbol210 + 588
libwayland-server.so.0`___lldb_unnamed_symbol210:
-> 0x7ffff795555c <+588>: jmp 0x7ffff7955435 ; <+293>
0x7ffff7955561 <+593>: nopl (%rax)
0x7ffff7955568 <+600>: callq *0xd76a(%rip)
0x7ffff795556e <+606>: cmpl $0xb, (%rax)
(lldb) up
frame #11: 0x00007ffff795804a libwayland-server.so.0`wl_event_loop_dispatch + 202
libwayland-server.so.0`wl_event_loop_dispatch:
-> 0x7ffff795804a <+202>: addq $0xc, %r15
0x7ffff795804e <+206>: cmpq %r15, %rbp
0x7ffff7958051 <+209>: jne 0x7ffff7958038 ; <+184>
0x7ffff7958053 <+211>: movq 0x8(%rsp), %rcx1
(lldb) up
frame #12: 0x00007ffff7955bc7 libwayland-server.so.0`wl_display_run + 39
libwayland-server.so.0`wl_display_run:
-> 0x7ffff7955bc7 <+39>: movl 0x8(%rbx), %eax
0x7ffff7955bca <+42>: testl %eax, %eax
0x7ffff7955bcc <+44>: jne 0x7ffff7955bb0 ; <+16>
0x7ffff7955bce <+46>: popq %rbx
(lldb) up
frame #13: 0x00005555555756eb sway`server_run(server=0x00005555555f0640) at server.c:296:2
293 void server_run(struct sway_server *server) {
294 sway_log(SWAY_INFO, "Running compositor on wayland display '%s'",
295 server->socket);
-> 296 wl_display_run(server->wl_display);
297 }
(lldb) up
frame #14: 0x0000555555574947 sway`main(argc=1, argv=0x00007fffffffe8d8) at main.c:428:2
425 swaynag_show(&config->swaynag_config_errors);
426 }
427
-> 428 server_run(&server);
429
430 shutdown:
431 sway_log(SWAY_INFO, "Shutting down sway");
(lldb) up
frame #15: 0x00007ffff761db25 libc.so.6`__libc_start_main + 213
libc.so.6`__libc_start_main:
-> 0x7ffff761db25 <+213>: movl %eax, %edi
0x7ffff761db27 <+215>: callq 0x7ffff7635630 ; exit
0x7ffff761db2c <+220>: movq (%rsp), %rax
0x7ffff761db30 <+224>: leaq 0x163929(%rip), %rdi
(lldb) up
frame #16: 0x00005555555656be sway`_start + 46
sway`_start:
-> 0x5555555656be <+46>: hlt
0x5555555656bf: nop
sway`deregister_tm_clones:
0x5555555656c0 <+0>: leaq 0x8aeb9(%rip), %rdi ; optind@GLIBC_2.2.5
0x5555555656c7 <+7>: leaq 0x8aeb2(%rip), %rax ; optind@GLIBC_2.2.5
Signed-off-by: Alexander Orzechowski <orzechowski.alexander@gmail.com>
3 years ago
|
|
|
struct sway_container *container = child->view->container;
|
|
|
|
|
if (container != NULL) {
|
|
|
|
|
struct sway_workspace *workspace = container->pending.workspace;
|
|
|
|
|
if (workspace) {
|
|
|
|
|
wlr_surface_send_enter(child->surface, workspace->output->wlr_output);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view_child_init_subsurfaces(child, surface);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_child_destroy(struct sway_view_child *child) {
|
|
|
|
|
if (view_child_is_mapped(child) && child->view->container != NULL) {
|
|
|
|
|
view_child_damage(child, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (child->parent != NULL) {
|
|
|
|
|
wl_list_remove(&child->link);
|
|
|
|
|
child->parent = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_view_child *subchild, *tmpchild;
|
|
|
|
|
wl_list_for_each_safe(subchild, tmpchild, &child->children, link) {
|
|
|
|
|
wl_list_remove(&subchild->link);
|
|
|
|
|
subchild->parent = NULL;
|
|
|
|
|
// The subchild lost its parent link, so it cannot see that the parent
|
|
|
|
|
// is unmapped. Unmap it directly.
|
|
|
|
|
subchild->mapped = false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
wl_list_remove(&child->surface_commit.link);
|
|
|
|
|
wl_list_remove(&child->surface_destroy.link);
|
|
|
|
|
wl_list_remove(&child->surface_map.link);
|
|
|
|
|
wl_list_remove(&child->surface_unmap.link);
|
|
|
|
|
wl_list_remove(&child->view_unmap.link);
|
|
|
|
|
wl_list_remove(&child->surface_new_subsurface.link);
|
|
|
|
|
|
|
|
|
|
if (child->impl && child->impl->destroy) {
|
|
|
|
|
child->impl->destroy(child);
|
|
|
|
|
} else {
|
|
|
|
|
free(child);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct sway_view *view_from_wlr_surface(struct wlr_surface *wlr_surface) {
|
|
|
|
|
if (wlr_surface_is_xdg_surface(wlr_surface)) {
|
|
|
|
|
struct wlr_xdg_surface *xdg_surface =
|
|
|
|
|
wlr_xdg_surface_from_wlr_surface(wlr_surface);
|
|
|
|
|
if (xdg_surface == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return view_from_wlr_xdg_surface(xdg_surface);
|
|
|
|
|
}
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
|
if (wlr_surface_is_xwayland_surface(wlr_surface)) {
|
|
|
|
|
struct wlr_xwayland_surface *xsurface =
|
|
|
|
|
wlr_xwayland_surface_from_wlr_surface(wlr_surface);
|
|
|
|
|
if (xsurface == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return view_from_wlr_xwayland_surface(xsurface);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
if (wlr_surface_is_subsurface(wlr_surface)) {
|
|
|
|
|
struct wlr_subsurface *subsurface =
|
|
|
|
|
wlr_subsurface_from_wlr_surface(wlr_surface);
|
|
|
|
|
if (subsurface == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return view_from_wlr_surface(subsurface->parent);
|
|
|
|
|
}
|
|
|
|
|
if (wlr_surface_is_layer_surface(wlr_surface)) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *role = wlr_surface->role ? wlr_surface->role->name : NULL;
|
|
|
|
|
sway_log(SWAY_DEBUG, "Surface of unknown type (role %s): %p",
|
|
|
|
|
role, wlr_surface);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *escape_pango_markup(const char *buffer) {
|
|
|
|
|
size_t length = escape_markup_text(buffer, NULL);
|
|
|
|
|
char *escaped_title = calloc(length + 1, sizeof(char));
|
|
|
|
|
escape_markup_text(buffer, escaped_title);
|
|
|
|
|
return escaped_title;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static size_t append_prop(char *buffer, const char *value) {
|
|
|
|
|
if (!value) {
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
// If using pango_markup in font, we need to escape all markup chars
|
|
|
|
|
// from values to make sure tags are not inserted by clients
|
|
|
|
|
if (config->pango_markup) {
|
|
|
|
|
char *escaped_value = escape_pango_markup(value);
|
|
|
|
|
lenient_strcat(buffer, escaped_value);
|
|
|
|
|
size_t len = strlen(escaped_value);
|
|
|
|
|
free(escaped_value);
|
|
|
|
|
return len;
|
|
|
|
|
} else {
|
|
|
|
|
lenient_strcat(buffer, value);
|
|
|
|
|
return strlen(value);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Calculate and return the length of the formatted title.
|
|
|
|
|
* If buffer is not NULL, also populate the buffer with the formatted title.
|
|
|
|
|
*/
|
|
|
|
|
static size_t parse_title_format(struct sway_view *view, char *buffer) {
|
|
|
|
|
if (!view->title_format || strcmp(view->title_format, "%title") == 0) {
|
|
|
|
|
return append_prop(buffer, view_get_title(view));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
size_t len = 0;
|
|
|
|
|
char *format = view->title_format;
|
|
|
|
|
char *next = strchr(format, '%');
|
|
|
|
|
while (next) {
|
|
|
|
|
// Copy everything up to the %
|
|
|
|
|
lenient_strncat(buffer, format, next - format);
|
|
|
|
|
len += next - format;
|
|
|
|
|
format = next;
|
|
|
|
|
|
|
|
|
|
if (strncmp(next, "%title", 6) == 0) {
|
|
|
|
|
len += append_prop(buffer, view_get_title(view));
|
|
|
|
|
format += 6;
|
|
|
|
|
} else if (strncmp(next, "%app_id", 7) == 0) {
|
|
|
|
|
len += append_prop(buffer, view_get_app_id(view));
|
|
|
|
|
format += 7;
|
|
|
|
|
} else if (strncmp(next, "%class", 6) == 0) {
|
|
|
|
|
len += append_prop(buffer, view_get_class(view));
|
|
|
|
|
format += 6;
|
|
|
|
|
} else if (strncmp(next, "%instance", 9) == 0) {
|
|
|
|
|
len += append_prop(buffer, view_get_instance(view));
|
|
|
|
|
format += 9;
|
|
|
|
|
} else if (strncmp(next, "%shell", 6) == 0) {
|
|
|
|
|
len += append_prop(buffer, view_get_shell(view));
|
|
|
|
|
format += 6;
|
|
|
|
|
} else {
|
|
|
|
|
lenient_strcat(buffer, "%");
|
|
|
|
|
++format;
|
|
|
|
|
++len;
|
|
|
|
|
}
|
|
|
|
|
next = strchr(format, '%');
|
|
|
|
|
}
|
|
|
|
|
lenient_strcat(buffer, format);
|
|
|
|
|
len += strlen(format);
|
|
|
|
|
|
|
|
|
|
return len;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_update_title(struct sway_view *view, bool force) {
|
|
|
|
|
const char *title = view_get_title(view);
|
|
|
|
|
|
|
|
|
|
if (!force) {
|
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 (title && view->container->title &&
|
|
|
|
|
strcmp(title, view->container->title) == 0) {
|
|
|
|
|
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
|
|
|
if (!title && !view->container->title) {
|
|
|
|
|
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
|
|
|
free(view->container->title);
|
|
|
|
|
free(view->container->formatted_title);
|
|
|
|
|
|
|
|
|
|
size_t len = parse_title_format(view, NULL);
|
|
|
|
|
|
|
|
|
|
if (len) {
|
|
|
|
|
char *buffer = calloc(len + 1, sizeof(char));
|
|
|
|
|
if (!sway_assert(buffer, "Unable to allocate title string")) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
parse_title_format(view, buffer);
|
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
|
|
|
view->container->formatted_title = buffer;
|
|
|
|
|
} else {
|
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
|
|
|
view->container->formatted_title = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view->container->title = title ? strdup(title) : NULL;
|
|
|
|
|
|
|
|
|
|
// Update title after the global font height is updated
|
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_update_title_textures(view->container);
|
|
|
|
|
|
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
|
|
|
ipc_event_window(view->container, "title");
|
|
|
|
|
|
|
|
|
|
if (view->foreign_toplevel && title) {
|
|
|
|
|
wlr_foreign_toplevel_handle_v1_set_title(view->foreign_toplevel, title);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool view_is_visible(struct sway_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 (view->container->node.destroying) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
struct sway_workspace *workspace = view->container->pending.workspace;
|
|
|
|
|
if (!workspace && view->container->pending.fullscreen_mode != FULLSCREEN_GLOBAL) {
|
|
|
|
|
bool fs_global_descendant = false;
|
|
|
|
|
struct sway_container *parent = view->container->pending.parent;
|
|
|
|
|
while (parent) {
|
|
|
|
|
if (parent->pending.fullscreen_mode == FULLSCREEN_GLOBAL) {
|
|
|
|
|
fs_global_descendant = true;
|
|
|
|
|
}
|
|
|
|
|
parent = parent->pending.parent;
|
|
|
|
|
}
|
|
|
|
|
if (!fs_global_descendant) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!container_is_sticky_or_child(view->container) && workspace &&
|
|
|
|
|
!workspace_is_visible(workspace)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
// Check view isn't in a tabbed or stacked container on an inactive tab
|
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
|
struct sway_container *con = view->container;
|
|
|
|
|
while (con) {
|
|
|
|
|
enum sway_container_layout layout = container_parent_layout(con);
|
|
|
|
|
if ((layout == L_TABBED || layout == L_STACKED)
|
|
|
|
|
&& !container_is_floating(con)) {
|
|
|
|
|
struct sway_node *parent = con->pending.parent ?
|
|
|
|
|
&con->pending.parent->node : &con->pending.workspace->node;
|
|
|
|
|
if (seat_get_active_tiling_child(seat, parent) != &con->node) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
con = con->pending.parent;
|
|
|
|
|
}
|
|
|
|
|
// Check view isn't hidden by another fullscreen view
|
|
|
|
|
struct sway_container *fs = root->fullscreen_global ?
|
|
|
|
|
root->fullscreen_global : workspace->fullscreen;
|
|
|
|
|
if (fs && !container_is_fullscreen_or_child(view->container) &&
|
|
|
|
|
!container_is_transient_for(view->container, fs)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_set_urgent(struct sway_view *view, bool enable) {
|
|
|
|
|
if (view_is_urgent(view) == enable) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (enable) {
|
|
|
|
|
struct sway_seat *seat = input_manager_current_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
|
|
|
if (seat_get_focused_container(seat) == view->container) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &view->urgent);
|
|
|
|
|
} else {
|
|
|
|
|
view->urgent = (struct timespec){ 0 };
|
|
|
|
|
if (view->urgent_timer) {
|
|
|
|
|
wl_event_source_remove(view->urgent_timer);
|
|
|
|
|
view->urgent_timer = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
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_damage_whole(view->container);
|
|
|
|
|
|
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
|
|
|
ipc_event_window(view->container, "urgent");
|
|
|
|
|
|
|
|
|
|
if (!container_is_scratchpad_hidden(view->container)) {
|
|
|
|
|
workspace_detect_urgent(view->container->pending.workspace);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool view_is_urgent(struct sway_view *view) {
|
|
|
|
|
return view->urgent.tv_sec || view->urgent.tv_nsec;
|
|
|
|
|
}
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
|
|
|
|
|
void view_remove_saved_buffer(struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(!wl_list_empty(&view->saved_buffers), "Expected a saved buffer")) {
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
struct sway_saved_buffer *saved_buf, *tmp;
|
|
|
|
|
wl_list_for_each_safe(saved_buf, tmp, &view->saved_buffers, link) {
|
|
|
|
|
wlr_buffer_unlock(&saved_buf->buffer->base);
|
|
|
|
|
wl_list_remove(&saved_buf->link);
|
|
|
|
|
free(saved_buf);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void view_save_buffer_iterator(struct wlr_surface *surface,
|
|
|
|
|
int sx, int sy, void *data) {
|
|
|
|
|
struct sway_view *view = data;
|
|
|
|
|
|
|
|
|
|
if (surface && wlr_surface_has_buffer(surface)) {
|
|
|
|
|
wlr_buffer_lock(&surface->buffer->base);
|
|
|
|
|
struct sway_saved_buffer *saved_buffer = calloc(1, sizeof(struct sway_saved_buffer));
|
|
|
|
|
saved_buffer->buffer = surface->buffer;
|
|
|
|
|
saved_buffer->width = surface->current.width;
|
|
|
|
|
saved_buffer->height = surface->current.height;
|
|
|
|
|
saved_buffer->x = view->container->surface_x + sx;
|
|
|
|
|
saved_buffer->y = view->container->surface_y + sy;
|
|
|
|
|
saved_buffer->transform = surface->current.transform;
|
|
|
|
|
wlr_surface_get_buffer_source_box(surface, &saved_buffer->source_box);
|
|
|
|
|
wl_list_insert(view->saved_buffers.prev, &saved_buffer->link);
|
|
|
|
|
}
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void view_save_buffer(struct sway_view *view) {
|
|
|
|
|
if (!sway_assert(wl_list_empty(&view->saved_buffers), "Didn't expect saved buffer")) {
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
view_remove_saved_buffer(view);
|
|
|
|
|
}
|
|
|
|
|
view_for_each_surface(view, view_save_buffer_iterator, view);
|
Correctly track saved surfaces during multiple transactions
Fixes #2364.
Suppose a view is 600px wide, and we tell it to resize to 601px during a
resize operation. We create a transaction, save the 600px buffer and
send the configure. This buffer is saved into the associated
instruction, and is rendered while we wait for the view to commit a
601px buffer.
Before the view commits the 601px buffer, suppose we tell it to resize
to 602px. The new transaction will also save the buffer, but it's still
the 600px buffer because we haven't received a new one yet.
Then suppose the view commits its original 601px buffer. This completes
the first transaction, so we apply the 601px width to the container.
There's still the second (now only) transaction remaining, so we render
the saved buffer from that. But this is still the 600px buffer, and we
believe it's 601px. Whoops.
The problem here is we can't stack buffers like this. So this commit
removes the saved buffer from the instructions, places it in the view
instead, and re-saves the latest buffer every time the view completes a
transaction and still has further pending transactions.
As saved buffers are now specific to views rather than instructions, the
functions for saving and removing the saved buffer have been moved to
view.c.
The calls to save and restore the buffer have been relocated to more
appropriate functions too, favouring transaction_commit and
transaction_apply rather than transaction_add_container and
transaction_destroy.
6 years ago
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool view_is_transient_for(struct sway_view *child,
|
|
|
|
|
struct sway_view *ancestor) {
|
|
|
|
|
return child->impl->is_transient_for &&
|
|
|
|
|
child->impl->is_transient_for(child, ancestor);
|
|
|
|
|
}
|
