|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
#include <assert.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <strings.h>
|
|
|
|
#include <time.h>
|
|
|
|
#include <wayland-server-core.h>
|
|
|
|
#include <wlr/config.h>
|
|
|
|
#include <wlr/backend/headless.h>
|
|
|
|
#include <wlr/render/swapchain.h>
|
|
|
|
#include <wlr/render/wlr_renderer.h>
|
|
|
|
#include <wlr/types/wlr_buffer.h>
|
|
|
|
#include <wlr/types/wlr_gamma_control_v1.h>
|
|
|
|
#include <wlr/types/wlr_matrix.h>
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
#include <wlr/types/wlr_output.h>
|
|
|
|
#include <wlr/types/wlr_presentation_time.h>
|
|
|
|
#include <wlr/types/wlr_compositor.h>
|
|
|
|
#include <wlr/util/region.h>
|
|
|
|
#include <wlr/util/transform.h>
|
|
|
|
#include "config.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "sway/config.h"
|
Prepare arrange code for type safe arguments
This commit changes the arrange code in a way that will support type
safe arguments.
The arrange_output et al functions are now public, however I opted not
to use them directly yet. I've kept the generic arrange_windows there
for convenience until type safety is fully implemented. This means this
patch has much less risk of breaking things as it would otherwise.
To be type safe, arrange_children_of cannot exist in its previous form
because the thing passed to it could be either a workspace or a
container. So it's now renamed to arrange_children and accepts a list_t,
as well as the parent layout and parent's box.
There was some code which checked the grandparent's layout to see if it
was tabbed or stacked and adjusted the Y offset of the grandchild
accordingly. Accessing the grandparent layout isn't easy when using type
safe arguments, and it seemed odd to even need to do this. I determined
that this was needed because a child of a tabbed container would have a
swayc Y matching the top of the tab bar. I've changed this so a child of
a tabbed container will have a swayc Y matching the bottom of the tab
bar, which means we don't need to access the grandparent layout. Some
tweaks to the rendering and autoconfigure code have been made to
implement this, and the container_at code appears to work without
needing any changes.
arrange_children_of (now arrange_children) would check if the parent had
gaps and would copy them to the child, effectively making the
workspace's gaps recurse into all children. We can't do this any more
without passing has_gaps, gaps_inner and gaps_outer as arguments to
arrange_children, so I've changed the add_gaps function to retrieve it
from the workspace directly.
apply_tabbed_or_stacked_layout has been split into two functions, as it
had different logic depending on the layout.
Lastly, arrange.h had an unnecessary include of transaction.h. I've
removed it, which means I've had to add it to several other files.
6 years ago
|
|
|
#include "sway/desktop/transaction.h"
|
|
|
|
#include "sway/input/input-manager.h"
|
|
|
|
#include "sway/input/seat.h"
|
|
|
|
#include "sway/ipc-server.h"
|
|
|
|
#include "sway/layers.h"
|
|
|
|
#include "sway/output.h"
|
|
|
|
#include "sway/server.h"
|
|
|
|
#include "sway/surface.h"
|
|
|
|
#include "sway/tree/arrange.h"
|
|
|
|
#include "sway/tree/container.h"
|
|
|
|
#include "sway/tree/root.h"
|
|
|
|
#include "sway/tree/view.h"
|
|
|
|
#include "sway/tree/workspace.h"
|
|
|
|
|
|
|
|
#if WLR_HAS_DRM_BACKEND
|
|
|
|
#include <wlr/backend/drm.h>
|
|
|
|
#include <wlr/types/wlr_drm_lease_v1.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
bool output_match_name_or_id(struct sway_output *output,
|
|
|
|
const char *name_or_id) {
|
|
|
|
if (strcmp(name_or_id, "*") == 0) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
char identifier[128];
|
|
|
|
output_get_identifier(identifier, sizeof(identifier), output);
|
|
|
|
return strcasecmp(identifier, name_or_id) == 0
|
|
|
|
|| strcasecmp(output->wlr_output->name, name_or_id) == 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct sway_output *output_by_name_or_id(const char *name_or_id) {
|
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];
|
|
|
|
if (output_match_name_or_id(output, name_or_id)) {
|
|
|
|
return output;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct sway_output *all_output_by_name_or_id(const char *name_or_id) {
|
|
|
|
struct sway_output *output;
|
|
|
|
wl_list_for_each(output, &root->all_outputs, link) {
|
|
|
|
if (output_match_name_or_id(output, name_or_id)) {
|
|
|
|
return output;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct surface_iterator_data {
|
|
|
|
sway_surface_iterator_func_t user_iterator;
|
|
|
|
void *user_data;
|
|
|
|
|
|
|
|
struct sway_output *output;
|
|
|
|
struct sway_view *view;
|
|
|
|
double ox, oy;
|
|
|
|
int width, height;
|
|
|
|
};
|
|
|
|
|
|
|
|
static bool get_surface_box(struct surface_iterator_data *data,
|
|
|
|
struct wlr_surface *surface, int sx, int sy,
|
|
|
|
struct wlr_box *surface_box) {
|
|
|
|
struct sway_output *output = data->output;
|
|
|
|
|
|
|
|
if (!wlr_surface_has_buffer(surface)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
int sw = surface->current.width;
|
|
|
|
int sh = surface->current.height;
|
|
|
|
|
|
|
|
struct wlr_box box = {
|
|
|
|
.x = floor(data->ox + sx),
|
|
|
|
.y = floor(data->oy + sy),
|
|
|
|
.width = sw,
|
|
|
|
.height = sh,
|
|
|
|
};
|
|
|
|
if (surface_box != NULL) {
|
|
|
|
memcpy(surface_box, &box, sizeof(struct wlr_box));
|
|
|
|
}
|
|
|
|
|
|
|
|
struct wlr_box output_box = {
|
|
|
|
.width = output->width,
|
|
|
|
.height = output->height,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct wlr_box intersection;
|
|
|
|
return wlr_box_intersection(&intersection, &output_box, &box);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void output_for_each_surface_iterator(struct wlr_surface *surface,
|
|
|
|
int sx, int sy, void *_data) {
|
|
|
|
struct surface_iterator_data *data = _data;
|
|
|
|
|
|
|
|
struct wlr_box box;
|
|
|
|
bool intersects = get_surface_box(data, surface, sx, sy, &box);
|
|
|
|
if (!intersects) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->user_iterator(data->output, data->view, surface, &box,
|
|
|
|
data->user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_surface_for_each_surface(struct sway_output *output,
|
|
|
|
struct wlr_surface *surface, double ox, double oy,
|
|
|
|
sway_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = NULL,
|
|
|
|
.ox = ox,
|
|
|
|
.oy = oy,
|
|
|
|
.width = surface->current.width,
|
|
|
|
.height = surface->current.height,
|
|
|
|
};
|
|
|
|
|
|
|
|
wlr_surface_for_each_surface(surface,
|
|
|
|
output_for_each_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_view_for_each_surface(struct sway_output *output,
|
|
|
|
struct sway_view *view, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = view,
|
|
|
|
.ox = view->container->surface_x - output->lx
|
|
|
|
- view->geometry.x,
|
|
|
|
.oy = view->container->surface_y - output->ly
|
|
|
|
- view->geometry.y,
|
|
|
|
.width = view->container->current.content_width,
|
|
|
|
.height = view->container->current.content_height,
|
|
|
|
};
|
|
|
|
|
|
|
|
view_for_each_surface(view, output_for_each_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_view_for_each_popup_surface(struct sway_output *output,
|
|
|
|
struct sway_view *view, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = view,
|
|
|
|
.ox = view->container->surface_x - output->lx
|
|
|
|
- view->geometry.x,
|
|
|
|
.oy = view->container->surface_y - output->ly
|
|
|
|
- view->geometry.y,
|
|
|
|
.width = view->container->current.content_width,
|
|
|
|
.height = view->container->current.content_height,
|
|
|
|
};
|
|
|
|
|
|
|
|
view_for_each_popup_surface(view, output_for_each_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_layer_for_each_surface(struct sway_output *output,
|
|
|
|
struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct sway_layer_surface *layer_surface;
|
|
|
|
wl_list_for_each(layer_surface, layer_surfaces, link) {
|
|
|
|
struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
|
|
|
|
layer_surface->layer_surface;
|
|
|
|
struct wlr_surface *surface = wlr_layer_surface_v1->surface;
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = NULL,
|
|
|
|
.ox = layer_surface->geo.x,
|
|
|
|
.oy = layer_surface->geo.y,
|
|
|
|
.width = surface->current.width,
|
|
|
|
.height = surface->current.height,
|
|
|
|
};
|
|
|
|
wlr_layer_surface_v1_for_each_surface(wlr_layer_surface_v1,
|
|
|
|
output_for_each_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_layer_for_each_toplevel_surface(struct sway_output *output,
|
|
|
|
struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct sway_layer_surface *layer_surface;
|
|
|
|
wl_list_for_each(layer_surface, layer_surfaces, link) {
|
|
|
|
struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
|
|
|
|
layer_surface->layer_surface;
|
|
|
|
output_surface_for_each_surface(output, wlr_layer_surface_v1->surface,
|
|
|
|
layer_surface->geo.x, layer_surface->geo.y, iterator,
|
|
|
|
user_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void output_layer_for_each_popup_surface(struct sway_output *output,
|
|
|
|
struct wl_list *layer_surfaces, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct sway_layer_surface *layer_surface;
|
|
|
|
wl_list_for_each(layer_surface, layer_surfaces, link) {
|
|
|
|
struct wlr_layer_surface_v1 *wlr_layer_surface_v1 =
|
|
|
|
layer_surface->layer_surface;
|
|
|
|
struct wlr_surface *surface = wlr_layer_surface_v1->surface;
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = NULL,
|
|
|
|
.ox = layer_surface->geo.x,
|
|
|
|
.oy = layer_surface->geo.y,
|
|
|
|
.width = surface->current.width,
|
|
|
|
.height = surface->current.height,
|
|
|
|
};
|
|
|
|
wlr_layer_surface_v1_for_each_popup_surface(wlr_layer_surface_v1,
|
|
|
|
output_for_each_surface_iterator, &data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
void output_unmanaged_for_each_surface(struct sway_output *output,
|
|
|
|
struct wl_list *unmanaged, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct sway_xwayland_unmanaged *unmanaged_surface;
|
|
|
|
wl_list_for_each(unmanaged_surface, unmanaged, link) {
|
|
|
|
struct wlr_xwayland_surface *xsurface =
|
|
|
|
unmanaged_surface->wlr_xwayland_surface;
|
|
|
|
double ox = unmanaged_surface->lx - output->lx;
|
|
|
|
double oy = unmanaged_surface->ly - output->ly;
|
|
|
|
|
|
|
|
output_surface_for_each_surface(output, xsurface->surface, ox, oy,
|
|
|
|
iterator, user_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void output_drag_icons_for_each_surface(struct sway_output *output,
|
|
|
|
struct wl_list *drag_icons, sway_surface_iterator_func_t iterator,
|
|
|
|
void *user_data) {
|
|
|
|
struct sway_drag_icon *drag_icon;
|
|
|
|
wl_list_for_each(drag_icon, drag_icons, link) {
|
|
|
|
double ox = drag_icon->x - output->lx;
|
|
|
|
double oy = drag_icon->y - output->ly;
|
|
|
|
|
|
|
|
if (drag_icon->wlr_drag_icon->surface->mapped) {
|
|
|
|
output_surface_for_each_surface(output,
|
|
|
|
drag_icon->wlr_drag_icon->surface, ox, oy,
|
|
|
|
iterator, user_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void for_each_surface_container_iterator(struct sway_container *con,
|
|
|
|
void *_data) {
|
|
|
|
if (!con->view || !view_is_visible(con->view)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct surface_iterator_data *data = _data;
|
|
|
|
output_view_for_each_surface(data->output, con->view,
|
|
|
|
data->user_iterator, data->user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void output_for_each_surface(struct sway_output *output,
|
|
|
|
sway_surface_iterator_func_t iterator, void *user_data) {
|
|
|
|
if (server.session_lock.locked) {
|
|
|
|
if (server.session_lock.lock == NULL) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct wlr_session_lock_surface_v1 *lock_surface;
|
|
|
|
wl_list_for_each(lock_surface, &server.session_lock.lock->surfaces, link) {
|
|
|
|
if (lock_surface->output != output->wlr_output) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (!lock_surface->surface->mapped) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
output_surface_for_each_surface(output, lock_surface->surface,
|
|
|
|
0.0, 0.0, iterator, user_data);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (output_has_opaque_overlay_layer_surface(output)) {
|
|
|
|
goto overlay;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct surface_iterator_data data = {
|
|
|
|
.user_iterator = iterator,
|
|
|
|
.user_data = user_data,
|
|
|
|
.output = output,
|
|
|
|
.view = NULL,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct sway_workspace *workspace = output_get_active_workspace(output);
|
|
|
|
struct sway_container *fullscreen_con = root->fullscreen_global;
|
|
|
|
if (!fullscreen_con) {
|
|
|
|
if (!workspace) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
fullscreen_con = workspace->current.fullscreen;
|
|
|
|
}
|
|
|
|
if (fullscreen_con) {
|
|
|
|
for_each_surface_container_iterator(fullscreen_con, &data);
|
|
|
|
container_for_each_child(fullscreen_con,
|
|
|
|
for_each_surface_container_iterator, &data);
|
|
|
|
|
|
|
|
// TODO: Show transient containers for fullscreen global
|
|
|
|
if (fullscreen_con == workspace->current.fullscreen) {
|
|
|
|
for (int i = 0; i < workspace->current.floating->length; ++i) {
|
|
|
|
struct sway_container *floater =
|
|
|
|
workspace->current.floating->items[i];
|
|
|
|
if (container_is_transient_for(floater, fullscreen_con)) {
|
|
|
|
for_each_surface_container_iterator(floater, &data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
|
|
|
|
iterator, user_data);
|
|
|
|
#endif
|
|
|
|
} else {
|
|
|
|
output_layer_for_each_surface(output,
|
|
|
|
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND],
|
|
|
|
iterator, user_data);
|
|
|
|
output_layer_for_each_surface(output,
|
|
|
|
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM],
|
|
|
|
iterator, user_data);
|
|
|
|
|
|
|
|
workspace_for_each_container(workspace,
|
|
|
|
for_each_surface_container_iterator, &data);
|
|
|
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
output_unmanaged_for_each_surface(output, &root->xwayland_unmanaged,
|
|
|
|
iterator, user_data);
|
|
|
|
#endif
|
|
|
|
output_layer_for_each_surface(output,
|
|
|
|
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_TOP],
|
|
|
|
iterator, user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
overlay:
|
|
|
|
output_layer_for_each_surface(output,
|
|
|
|
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY],
|
|
|
|
iterator, user_data);
|
|
|
|
output_drag_icons_for_each_surface(output, &root->drag_icons,
|
|
|
|
iterator, user_data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int scale_length(int length, int offset, float scale) {
|
|
|
|
return roundf((offset + length) * scale) - roundf(offset * scale);
|
|
|
|
}
|
|
|
|
|
|
|
|
void scale_box(struct wlr_box *box, float scale) {
|
|
|
|
box->width = scale_length(box->width, box->x, scale);
|
|
|
|
box->height = scale_length(box->height, box->y, scale);
|
|
|
|
box->x = roundf(box->x * scale);
|
|
|
|
box->y = roundf(box->y * scale);
|
|
|
|
}
|
|
|
|
|
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 *output_get_active_workspace(struct sway_output *output) {
|
|
|
|
struct sway_seat *seat = input_manager_current_seat();
|
|
|
|
struct sway_node *focus = seat_get_active_tiling_child(seat, &output->node);
|
|
|
|
if (!focus) {
|
|
|
|
if (!output->workspaces->length) {
|
|
|
|
return 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
|
|
|
return output->workspaces->items[0];
|
|
|
|
}
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
return focus->sway_workspace;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool output_has_opaque_overlay_layer_surface(struct sway_output *output) {
|
|
|
|
struct sway_layer_surface *sway_layer_surface;
|
|
|
|
wl_list_for_each(sway_layer_surface,
|
|
|
|
&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], link) {
|
|
|
|
struct wlr_surface *wlr_surface = sway_layer_surface->layer_surface->surface;
|
|
|
|
pixman_box32_t output_box = {
|
|
|
|
.x2 = output->width,
|
|
|
|
.y2 = output->height,
|
|
|
|
};
|
|
|
|
pixman_region32_t surface_opaque_box;
|
|
|
|
pixman_region32_init(&surface_opaque_box);
|
|
|
|
pixman_region32_copy(&surface_opaque_box, &wlr_surface->opaque_region);
|
|
|
|
pixman_region32_translate(&surface_opaque_box,
|
|
|
|
sway_layer_surface->geo.x, sway_layer_surface->geo.y);
|
|
|
|
pixman_region_overlap_t contains =
|
|
|
|
pixman_region32_contains_rectangle(&surface_opaque_box, &output_box);
|
|
|
|
pixman_region32_fini(&surface_opaque_box);
|
|
|
|
|
|
|
|
if (contains == PIXMAN_REGION_IN) {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct send_frame_done_data {
|
|
|
|
struct timespec when;
|
|
|
|
int msec_until_refresh;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void send_frame_done_iterator(struct sway_output *output,
|
|
|
|
struct sway_view *view, struct wlr_surface *surface,
|
|
|
|
struct wlr_box *box, void *user_data) {
|
|
|
|
int view_max_render_time = 0;
|
|
|
|
if (view != NULL) {
|
|
|
|
view_max_render_time = view->max_render_time;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct send_frame_done_data *data = user_data;
|
|
|
|
|
|
|
|
int delay = data->msec_until_refresh - output->max_render_time
|
|
|
|
- view_max_render_time;
|
|
|
|
|
|
|
|
if (output->max_render_time == 0 || view_max_render_time == 0 || delay < 1) {
|
|
|
|
wlr_surface_send_frame_done(surface, &data->when);
|
|
|
|
} else {
|
|
|
|
struct sway_surface *sway_surface = surface->data;
|
|
|
|
wl_event_source_timer_update(sway_surface->frame_done_timer, delay);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void send_frame_done(struct sway_output *output, struct send_frame_done_data *data) {
|
|
|
|
output_for_each_surface(output, send_frame_done_iterator, data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void count_surface_iterator(struct sway_output *output,
|
|
|
|
struct sway_view *view, struct wlr_surface *surface,
|
|
|
|
struct wlr_box *box, void *data) {
|
|
|
|
size_t *n = data;
|
|
|
|
(*n)++;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool scan_out_fullscreen_view(struct sway_output *output,
|
|
|
|
struct wlr_output_state *pending, struct sway_view *view) {
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
struct sway_workspace *workspace = output->current.active_workspace;
|
|
|
|
if (!sway_assert(workspace, "Expected an active workspace")) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (server.session_lock.locked) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wl_list_empty(&view->saved_buffers)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (int i = 0; i < workspace->current.floating->length; ++i) {
|
|
|
|
struct sway_container *floater =
|
|
|
|
workspace->current.floating->items[i];
|
|
|
|
if (container_is_transient_for(floater, view->container)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#if HAVE_XWAYLAND
|
|
|
|
if (!wl_list_empty(&root->xwayland_unmanaged)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (!wl_list_empty(&output->shell_layers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY])) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (!wl_list_empty(&root->drag_icons)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct wlr_surface *surface = view->surface;
|
|
|
|
if (surface == NULL) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
size_t n_surfaces = 0;
|
|
|
|
output_view_for_each_surface(output, view,
|
|
|
|
count_surface_iterator, &n_surfaces);
|
|
|
|
if (n_surfaces != 1) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
size_t n_popups = 0;
|
|
|
|
output_view_for_each_popup_surface(output, view,
|
|
|
|
count_surface_iterator, &n_popups);
|
|
|
|
if (n_popups > 0) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (surface->buffer == NULL) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((float)surface->current.scale != wlr_output->scale ||
|
|
|
|
surface->current.transform != wlr_output->transform) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wlr_output_is_direct_scanout_allowed(wlr_output)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_output_state_set_buffer(pending, &surface->buffer->base);
|
|
|
|
|
|
|
|
if (!wlr_output_test_state(wlr_output, pending)) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_presentation_surface_scanned_out_on_output(surface,
|
|
|
|
wlr_output);
|
|
|
|
|
|
|
|
return wlr_output_commit_state(wlr_output, pending);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void get_frame_damage(struct sway_output *output,
|
|
|
|
pixman_region32_t *frame_damage) {
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &width, &height);
|
|
|
|
|
|
|
|
pixman_region32_init(frame_damage);
|
|
|
|
|
|
|
|
enum wl_output_transform transform =
|
|
|
|
wlr_output_transform_invert(wlr_output->transform);
|
|
|
|
wlr_region_transform(frame_damage, &output->damage_ring.current,
|
|
|
|
transform, width, height);
|
|
|
|
|
|
|
|
if (debug.damage != DAMAGE_DEFAULT) {
|
|
|
|
pixman_region32_union_rect(frame_damage, frame_damage,
|
|
|
|
0, 0, wlr_output->width, wlr_output->height);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int output_repaint_timer_handler(void *data) {
|
|
|
|
struct sway_output *output = data;
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
if (wlr_output == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_output->frame_pending = false;
|
|
|
|
|
|
|
|
if (!wlr_output->needs_frame &&
|
|
|
|
!output->gamma_lut_changed &&
|
|
|
|
!pixman_region32_not_empty(&output->damage_ring.current)) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct sway_workspace *workspace = output->current.active_workspace;
|
|
|
|
if (workspace == NULL) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct sway_container *fullscreen_con = root->fullscreen_global;
|
|
|
|
if (!fullscreen_con) {
|
|
|
|
fullscreen_con = workspace->current.fullscreen;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct wlr_output_state pending = {0};
|
|
|
|
|
|
|
|
if (output->gamma_lut_changed) {
|
|
|
|
output->gamma_lut_changed = false;
|
|
|
|
struct wlr_gamma_control_v1 *gamma_control =
|
|
|
|
wlr_gamma_control_manager_v1_get_control(
|
|
|
|
server.gamma_control_manager_v1, wlr_output);
|
|
|
|
if (!wlr_gamma_control_v1_apply(gamma_control, &pending)) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!wlr_output_test_state(wlr_output, &pending)) {
|
|
|
|
wlr_output_state_finish(&pending);
|
|
|
|
pending = (struct wlr_output_state){0};
|
|
|
|
wlr_gamma_control_v1_send_failed_and_destroy(gamma_control);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pending.committed |= WLR_OUTPUT_STATE_DAMAGE;
|
|
|
|
get_frame_damage(output, &pending.damage);
|
|
|
|
|
|
|
|
if (fullscreen_con && fullscreen_con->view && !debug.noscanout) {
|
|
|
|
// Try to scan-out the fullscreen view
|
|
|
|
static bool last_scanned_out = false;
|
|
|
|
bool scanned_out =
|
|
|
|
scan_out_fullscreen_view(output, &pending, fullscreen_con->view);
|
|
|
|
|
|
|
|
if (scanned_out && !last_scanned_out) {
|
|
|
|
sway_log(SWAY_DEBUG, "Scanning out fullscreen view on %s",
|
|
|
|
output->wlr_output->name);
|
|
|
|
}
|
|
|
|
if (last_scanned_out && !scanned_out) {
|
|
|
|
sway_log(SWAY_DEBUG, "Stopping fullscreen view scan out on %s",
|
|
|
|
output->wlr_output->name);
|
|
|
|
output_damage_whole(output);
|
|
|
|
}
|
|
|
|
last_scanned_out = scanned_out;
|
|
|
|
|
|
|
|
if (scanned_out) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wlr_output_configure_primary_swapchain(wlr_output, &pending, &wlr_output->swapchain)) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
int buffer_age;
|
|
|
|
struct wlr_buffer *buffer = wlr_swapchain_acquire(wlr_output->swapchain, &buffer_age);
|
|
|
|
if (buffer == NULL) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct wlr_render_pass *render_pass = wlr_renderer_begin_buffer_pass(
|
|
|
|
wlr_output->renderer, buffer, NULL);
|
|
|
|
if (render_pass == NULL) {
|
|
|
|
wlr_buffer_unlock(buffer);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
pixman_region32_t damage;
|
|
|
|
pixman_region32_init(&damage);
|
|
|
|
wlr_damage_ring_get_buffer_damage(&output->damage_ring, buffer_age, &damage);
|
|
|
|
|
|
|
|
if (debug.damage == DAMAGE_RERENDER) {
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(wlr_output, &width, &height);
|
|
|
|
pixman_region32_union_rect(&damage, &damage, 0, 0, width, height);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct render_context ctx = {
|
|
|
|
.output_damage = &damage,
|
|
|
|
.renderer = wlr_output->renderer,
|
|
|
|
.output = output,
|
|
|
|
.pass = render_pass,
|
|
|
|
};
|
|
|
|
|
|
|
|
struct timespec now;
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
|
|
|
|
|
|
|
output_render(&ctx);
|
|
|
|
|
|
|
|
pixman_region32_fini(&damage);
|
|
|
|
|
|
|
|
if (!wlr_render_pass_submit(render_pass)) {
|
|
|
|
wlr_buffer_unlock(buffer);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_output_state_set_buffer(&pending, buffer);
|
|
|
|
wlr_buffer_unlock(buffer);
|
|
|
|
|
|
|
|
if (!wlr_output_commit_state(wlr_output, &pending)) {
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_damage_ring_rotate(&output->damage_ring);
|
|
|
|
output->last_frame = now;
|
|
|
|
|
|
|
|
out:
|
|
|
|
wlr_output_state_finish(&pending);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_damage(struct wl_listener *listener, void *user_data) {
|
|
|
|
struct sway_output *output =
|
|
|
|
wl_container_of(listener, output, damage);
|
|
|
|
struct wlr_output_event_damage *event = user_data;
|
|
|
|
if (wlr_damage_ring_add(&output->damage_ring, event->damage)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_frame(struct wl_listener *listener, void *user_data) {
|
|
|
|
struct sway_output *output =
|
|
|
|
wl_container_of(listener, output, frame);
|
|
|
|
if (!output->enabled || !output->wlr_output->enabled) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Compute predicted milliseconds until the next refresh. It's used for
|
|
|
|
// delaying both output rendering and surface frame callbacks.
|
|
|
|
int msec_until_refresh = 0;
|
|
|
|
|
|
|
|
if (output->max_render_time != 0) {
|
|
|
|
struct timespec now;
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &now);
|
|
|
|
|
|
|
|
const long NSEC_IN_SECONDS = 1000000000;
|
|
|
|
struct timespec predicted_refresh = output->last_presentation;
|
|
|
|
predicted_refresh.tv_nsec += output->refresh_nsec % NSEC_IN_SECONDS;
|
|
|
|
predicted_refresh.tv_sec += output->refresh_nsec / NSEC_IN_SECONDS;
|
|
|
|
if (predicted_refresh.tv_nsec >= NSEC_IN_SECONDS) {
|
|
|
|
predicted_refresh.tv_sec += 1;
|
|
|
|
predicted_refresh.tv_nsec -= NSEC_IN_SECONDS;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the predicted refresh time is before the current time then
|
|
|
|
// there's no point in delaying.
|
|
|
|
//
|
|
|
|
// We only check tv_sec because if the predicted refresh time is less
|
|
|
|
// than a second before the current time, then msec_until_refresh will
|
|
|
|
// end up slightly below zero, which will effectively disable the delay
|
|
|
|
// without potential disastrous negative overflows that could occur if
|
|
|
|
// tv_sec was not checked.
|
|
|
|
if (predicted_refresh.tv_sec >= now.tv_sec) {
|
|
|
|
long nsec_until_refresh
|
|
|
|
= (predicted_refresh.tv_sec - now.tv_sec) * NSEC_IN_SECONDS
|
|
|
|
+ (predicted_refresh.tv_nsec - now.tv_nsec);
|
|
|
|
|
|
|
|
// We want msec_until_refresh to be conservative, that is, floored.
|
|
|
|
// If we have 7.9 msec until refresh, we better compute the delay
|
|
|
|
// as if we had only 7 msec, so that we don't accidentally delay
|
|
|
|
// more than necessary and miss a frame.
|
|
|
|
msec_until_refresh = nsec_until_refresh / 1000000;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int delay = msec_until_refresh - output->max_render_time;
|
|
|
|
|
|
|
|
// If the delay is less than 1 millisecond (which is the least we can wait)
|
|
|
|
// then just render right away.
|
|
|
|
if (delay < 1) {
|
|
|
|
output_repaint_timer_handler(output);
|
|
|
|
} else {
|
|
|
|
output->wlr_output->frame_pending = true;
|
|
|
|
wl_event_source_timer_update(output->repaint_timer, delay);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Send frame done to all visible surfaces
|
|
|
|
struct send_frame_done_data data = {0};
|
|
|
|
clock_gettime(CLOCK_MONOTONIC, &data.when);
|
|
|
|
data.msec_until_refresh = msec_until_refresh;
|
|
|
|
send_frame_done(output, &data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_needs_frame(struct wl_listener *listener, void *user_data) {
|
|
|
|
struct sway_output *output =
|
|
|
|
wl_container_of(listener, output, needs_frame);
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_damage_whole(struct sway_output *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
|
|
|
// The output can exist with no wlr_output if it's just been disconnected
|
|
|
|
// and the transaction to evacuate it has't completed yet.
|
|
|
|
if (output != NULL && output->wlr_output != NULL) {
|
|
|
|
wlr_damage_ring_add_whole(&output->damage_ring);
|
|
|
|
wlr_output_schedule_frame(output->wlr_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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void damage_surface_iterator(struct sway_output *output,
|
|
|
|
struct sway_view *view, struct wlr_surface *surface,
|
|
|
|
struct wlr_box *_box, void *_data) {
|
|
|
|
bool *data = _data;
|
|
|
|
bool whole = *data;
|
|
|
|
|
|
|
|
struct wlr_box box = *_box;
|
|
|
|
scale_box(&box, output->wlr_output->scale);
|
|
|
|
|
|
|
|
pixman_region32_t damage;
|
|
|
|
pixman_region32_init(&damage);
|
|
|
|
wlr_surface_get_effective_damage(surface, &damage);
|
|
|
|
wlr_region_scale(&damage, &damage, output->wlr_output->scale);
|
|
|
|
if (ceilf(output->wlr_output->scale) > surface->current.scale) {
|
|
|
|
// When scaling up a surface, it'll become blurry so we need to
|
|
|
|
// expand the damage region
|
|
|
|
wlr_region_expand(&damage, &damage,
|
|
|
|
ceilf(output->wlr_output->scale) - surface->current.scale);
|
|
|
|
}
|
|
|
|
pixman_region32_translate(&damage, box.x, box.y);
|
|
|
|
if (wlr_damage_ring_add(&output->damage_ring, &damage)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
pixman_region32_fini(&damage);
|
|
|
|
|
|
|
|
if (whole) {
|
|
|
|
if (wlr_damage_ring_add_box(&output->damage_ring, &box)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wl_list_empty(&surface->current.frame_callback_list)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_damage_surface(struct sway_output *output, double ox, double oy,
|
|
|
|
struct wlr_surface *surface, bool whole) {
|
|
|
|
output_surface_for_each_surface(output, surface, ox, oy,
|
|
|
|
damage_surface_iterator, &whole);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_damage_from_view(struct sway_output *output,
|
|
|
|
struct sway_view *view) {
|
|
|
|
if (!view_is_visible(view)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
bool whole = false;
|
|
|
|
output_view_for_each_surface(output, view, damage_surface_iterator, &whole);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Expecting an unscaled box in layout coordinates
|
|
|
|
void output_damage_box(struct sway_output *output, struct wlr_box *_box) {
|
|
|
|
struct wlr_box box;
|
|
|
|
memcpy(&box, _box, sizeof(struct wlr_box));
|
|
|
|
box.x -= output->lx;
|
|
|
|
box.y -= output->ly;
|
|
|
|
scale_box(&box, output->wlr_output->scale);
|
|
|
|
if (wlr_damage_ring_add_box(&output->damage_ring, &box)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void damage_child_views_iterator(struct sway_container *con,
|
|
|
|
void *data) {
|
|
|
|
if (!con->view || !view_is_visible(con->view)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct sway_output *output = data;
|
|
|
|
bool whole = true;
|
|
|
|
output_view_for_each_surface(output, con->view, damage_surface_iterator,
|
|
|
|
&whole);
|
|
|
|
}
|
|
|
|
|
|
|
|
void output_damage_whole_container(struct sway_output *output,
|
|
|
|
struct sway_container *con) {
|
|
|
|
// Pad the box by 1px, because the width is a double and might be a fraction
|
|
|
|
struct wlr_box box = {
|
|
|
|
.x = con->current.x - output->lx - 1,
|
|
|
|
.y = con->current.y - output->ly - 1,
|
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
|
|
|
.width = con->current.width + 2,
|
|
|
|
.height = con->current.height + 2,
|
|
|
|
};
|
|
|
|
scale_box(&box, output->wlr_output->scale);
|
|
|
|
if (wlr_damage_ring_add_box(&output->damage_ring, &box)) {
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
// Damage subsurfaces as well, which may extend outside the box
|
|
|
|
if (con->view) {
|
|
|
|
damage_child_views_iterator(con, output);
|
|
|
|
} else {
|
|
|
|
container_for_each_child(con, damage_child_views_iterator, output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_output_manager_config(struct sway_server *server) {
|
|
|
|
struct wlr_output_configuration_v1 *config =
|
|
|
|
wlr_output_configuration_v1_create();
|
|
|
|
|
|
|
|
struct sway_output *output;
|
|
|
|
wl_list_for_each(output, &root->all_outputs, link) {
|
|
|
|
if (output == root->fallback_output) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
struct wlr_output_configuration_head_v1 *config_head =
|
|
|
|
wlr_output_configuration_head_v1_create(config, output->wlr_output);
|
|
|
|
struct wlr_box output_box;
|
|
|
|
wlr_output_layout_get_box(root->output_layout,
|
|
|
|
output->wlr_output, &output_box);
|
|
|
|
// We mark the output enabled when it's switched off but not disabled
|
|
|
|
config_head->state.enabled = !wlr_box_empty(&output_box);
|
|
|
|
config_head->state.x = output_box.x;
|
|
|
|
config_head->state.y = output_box.y;
|
|
|
|
}
|
|
|
|
|
|
|
|
wlr_output_manager_v1_set_configuration(server->output_manager_v1, config);
|
|
|
|
|
|
|
|
ipc_event_output();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void begin_destroy(struct sway_output *output) {
|
|
|
|
struct sway_server *server = output->server;
|
|
|
|
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
if (output->enabled) {
|
|
|
|
output_disable(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
output_begin_destroy(output);
|
|
|
|
|
|
|
|
wl_list_remove(&output->link);
|
|
|
|
|
|
|
|
wl_list_remove(&output->layout_destroy.link);
|
|
|
|
wl_list_remove(&output->destroy.link);
|
|
|
|
wl_list_remove(&output->commit.link);
|
|
|
|
wl_list_remove(&output->present.link);
|
|
|
|
wl_list_remove(&output->damage.link);
|
|
|
|
wl_list_remove(&output->frame.link);
|
|
|
|
wl_list_remove(&output->needs_frame.link);
|
|
|
|
wl_list_remove(&output->request_state.link);
|
|
|
|
|
|
|
|
wlr_damage_ring_finish(&output->damage_ring);
|
|
|
|
|
|
|
|
output->wlr_output->data = NULL;
|
|
|
|
output->wlr_output = 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
|
|
|
transaction_commit_dirty();
|
|
|
|
|
|
|
|
update_output_manager_config(server);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_output *output = wl_container_of(listener, output, destroy);
|
|
|
|
begin_destroy(output);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_layout_destroy(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_output *output = wl_container_of(listener, output, layout_destroy);
|
|
|
|
begin_destroy(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
|
|
|
static void update_textures(struct sway_container *con, void *data) {
|
|
|
|
container_update_title_textures(con);
|
|
|
|
container_update_marks_textures(con);
|
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 void update_output_scale_iterator(struct sway_output *output,
|
|
|
|
struct sway_view *view, struct wlr_surface *surface,
|
|
|
|
struct wlr_box *box, void *user_data) {
|
|
|
|
surface_update_outputs(surface);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_commit(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_output *output = wl_container_of(listener, output, commit);
|
|
|
|
struct wlr_output_event_commit *event = data;
|
|
|
|
|
|
|
|
if (!output->enabled) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (event->state->committed & WLR_OUTPUT_STATE_SCALE) {
|
|
|
|
output_for_each_container(output, update_textures, NULL);
|
|
|
|
output_for_each_surface(output, update_output_scale_iterator, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (event->state->committed & (
|
|
|
|
WLR_OUTPUT_STATE_MODE |
|
|
|
|
WLR_OUTPUT_STATE_TRANSFORM |
|
|
|
|
WLR_OUTPUT_STATE_SCALE)) {
|
|
|
|
arrange_layers(output);
|
|
|
|
arrange_output(output);
|
|
|
|
transaction_commit_dirty();
|
|
|
|
|
|
|
|
update_output_manager_config(output->server);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (event->state->committed & (
|
|
|
|
WLR_OUTPUT_STATE_MODE |
|
|
|
|
WLR_OUTPUT_STATE_TRANSFORM)) {
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(output->wlr_output, &width, &height);
|
|
|
|
wlr_damage_ring_set_bounds(&output->damage_ring, width, height);
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Next time the output is enabled, try to re-apply the gamma LUT
|
|
|
|
if ((event->state->committed & WLR_OUTPUT_STATE_ENABLED) && !output->wlr_output->enabled) {
|
|
|
|
output->gamma_lut_changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_present(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_output *output = wl_container_of(listener, output, present);
|
|
|
|
struct wlr_output_event_present *output_event = data;
|
|
|
|
|
|
|
|
if (!output->enabled || !output_event->presented) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
output->last_presentation = *output_event->when;
|
|
|
|
output->refresh_nsec = output_event->refresh;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_request_state(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_output *output =
|
|
|
|
wl_container_of(listener, output, request_state);
|
|
|
|
const struct wlr_output_event_request_state *event = data;
|
|
|
|
wlr_output_commit_state(output->wlr_output, event->state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static unsigned int last_headless_num = 0;
|
|
|
|
|
|
|
|
void handle_new_output(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_server *server = wl_container_of(listener, server, new_output);
|
|
|
|
struct wlr_output *wlr_output = data;
|
|
|
|
|
|
|
|
if (wlr_output == root->fallback_output->wlr_output) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wlr_output_is_headless(wlr_output)) {
|
|
|
|
char name[64];
|
|
|
|
snprintf(name, sizeof(name), "HEADLESS-%u", ++last_headless_num);
|
|
|
|
wlr_output_set_name(wlr_output, name);
|
|
|
|
}
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "New output %p: %s (non-desktop: %d)",
|
|
|
|
wlr_output, wlr_output->name, wlr_output->non_desktop);
|
|
|
|
|
|
|
|
if (wlr_output->non_desktop) {
|
|
|
|
sway_log(SWAY_DEBUG, "Not configuring non-desktop output");
|
|
|
|
struct sway_output_non_desktop *non_desktop = output_non_desktop_create(wlr_output);
|
|
|
|
#if WLR_HAS_DRM_BACKEND
|
|
|
|
if (server->drm_lease_manager) {
|
|
|
|
wlr_drm_lease_v1_manager_offer_output(server->drm_lease_manager,
|
|
|
|
wlr_output);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
list_add(root->non_desktop_outputs, non_desktop);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!wlr_output_init_render(wlr_output, server->allocator,
|
|
|
|
server->renderer)) {
|
|
|
|
sway_log(SWAY_ERROR, "Failed to init output render");
|
|
|
|
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
|
|
|
struct sway_output *output = output_create(wlr_output);
|
|
|
|
if (!output) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
output->server = server;
|
|
|
|
wlr_damage_ring_init(&output->damage_ring);
|
|
|
|
|
|
|
|
wl_signal_add(&root->output_layout->events.destroy, &output->layout_destroy);
|
|
|
|
output->layout_destroy.notify = handle_layout_destroy;
|
|
|
|
wl_signal_add(&wlr_output->events.destroy, &output->destroy);
|
|
|
|
output->destroy.notify = handle_destroy;
|
|
|
|
wl_signal_add(&wlr_output->events.commit, &output->commit);
|
|
|
|
output->commit.notify = handle_commit;
|
|
|
|
wl_signal_add(&wlr_output->events.present, &output->present);
|
|
|
|
output->present.notify = handle_present;
|
|
|
|
wl_signal_add(&wlr_output->events.damage, &output->damage);
|
|
|
|
output->damage.notify = handle_damage;
|
|
|
|
wl_signal_add(&wlr_output->events.frame, &output->frame);
|
|
|
|
output->frame.notify = handle_frame;
|
|
|
|
wl_signal_add(&wlr_output->events.needs_frame, &output->needs_frame);
|
|
|
|
output->needs_frame.notify = handle_needs_frame;
|
|
|
|
wl_signal_add(&wlr_output->events.request_state, &output->request_state);
|
|
|
|
output->request_state.notify = handle_request_state;
|
|
|
|
|
|
|
|
output->repaint_timer = wl_event_loop_add_timer(server->wl_event_loop,
|
|
|
|
output_repaint_timer_handler, output);
|
|
|
|
|
Fix output config retrieval for new outputs
This removes `output_find_config`, which would take the first matching
output config it found. This is fine if only a name output config,
identifier output config, or even just wildcard exist, but if there is
a name output config and identifier output config, they are not merged.
Instead, this introduces find_output_config, which is just a wrapper
for `get_output_config`. This ensures that both the name and identifier
output configs are respected.
This fixes the following case:
- For simplicity in this example, remove all output configs from config
- Run `swaymsg output <name> bg #ff0000 solid_color`
- Run `swaymsg output <identifier> scale 2`
- Disconnect and reconnect output
Without this, the output will have the background, but not the scale.
With this, the output will have both the background and scale
6 years ago
|
|
|
struct output_config *oc = find_output_config(output);
|
|
|
|
apply_output_config(oc, output);
|
|
|
|
free_output_config(oc);
|
|
|
|
|
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
|
|
|
transaction_commit_dirty();
|
|
|
|
|
|
|
|
int width, height;
|
|
|
|
wlr_output_transformed_resolution(output->wlr_output, &width, &height);
|
|
|
|
wlr_damage_ring_set_bounds(&output->damage_ring, width, height);
|
|
|
|
update_output_manager_config(server);
|
|
|
|
}
|
|
|
|
|
|
|
|
void handle_output_layout_change(struct wl_listener *listener,
|
|
|
|
void *data) {
|
|
|
|
struct sway_server *server =
|
|
|
|
wl_container_of(listener, server, output_layout_change);
|
|
|
|
update_output_manager_config(server);
|
|
|
|
}
|
|
|
|
|
|
|
|
void handle_gamma_control_set_gamma(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_server *server =
|
|
|
|
wl_container_of(listener, server, gamma_control_set_gamma);
|
|
|
|
const struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
|
|
|
|
|
|
|
|
struct sway_output *output = event->output->data;
|
gamma_control_v1: handle destroyed output
In case a display is unplugged, the sway output may be removed from the
userdata before the gamma_control can be reset. In this case we can't
schedule a commit on the output, simply return within the function.
backtrace full:
#0 handle_gamma_control_set_gamma (listener=0x4856a8 <server+616>, data=0x7ffce1ed59c0) at ../sway/desktop/output.c:1105
server = 0x485440 <server>
event = 0x7ffce1ed59c0
output = 0x0
#1 0x00007f430d1dca0c in wl_signal_emit_mutable ()
from /nix/store/ky1g6ylzr2m4bq8fy0gzrnqmjr6948k5-wayland-1.22.0/lib/libwayland-server.so.0
No symbol table info available.
#2 0x00007f430d142370 in gamma_control_destroy (gamma_control=0x29eb9b0) at ../types/wlr_gamma_control_v1.c:37
manager = 0x27e33e0
output = 0x2a10770
event = {output = 0x2a10770, control = 0x0}
#3 0x00007f430d14239b in gamma_control_handle_output_destroy (listener=<optimized out>, data=<optimized out>)
at ../types/wlr_gamma_control_v1.c:59
gamma_control = <optimized out>
#4 0x00007f430d1dca0c in wl_signal_emit_mutable ()
from /nix/store/ky1g6ylzr2m4bq8fy0gzrnqmjr6948k5-wayland-1.22.0/lib/libwayland-server.so.0
No symbol table info available.
#5 0x00007f430d12a0e0 in wlr_output_destroy (output=output@entry=0x2a10770) at ../types/output/output.c:384
cursor = <optimized out>
tmp_cursor = <optimized out>
layer = <optimized out>
tmp_layer = <optimized out>
#6 0x00007f430d114ecf in disconnect_drm_connector (conn=conn@entry=0x2a10770) at ../backend/drm/drm.c:1757
__PRETTY_FUNCTION__ = "disconnect_drm_connector"
#7 0x00007f430d117078 in scan_drm_connectors (drm=drm@entry=0x1eebab0, event=event@entry=0x7ffce1ed5c1c) at ../backend/drm/drm.c:1597
c = <optimized out>
wlr_conn = 0x2a10770
drm_conn = 0x2e760d0
conn_id = <optimized out>
index = 4
i = 4
res = 0x2e761f0
seen_len = 5
seen = {true, true, true, true, true, false}
new_outputs_len = 0
new_outputs = 0x7ffce1ed5ab0
conn = <optimized out>
tmp_conn = <optimized out>
index = <optimized out>
#8 0x00007f430d113425 in handle_dev_change (listener=0x1eebbb0, data=0x7ffce1ed5c18) at ../backend/drm/backend.c:157
drm = 0x1eebab0
change = 0x7ffce1ed5c18
#9 0x00007f430d1dca0c in wl_signal_emit_mutable ()
from /nix/store/ky1g6ylzr2m4bq8fy0gzrnqmjr6948k5-wayland-1.22.0/lib/libwayland-server.so.0
No symbol table info available.
#10 0x00007f430d111696 in handle_udev_event (fd=<optimized out>, mask=<optimized out>, data=<optimized out>)
at ../backend/session/session.c:213
event = {type = WLR_DEVICE_HOTPLUG, {hotplug = {connector_id = 0, prop_id = 0}}}
devnum = <optimized out>
dev = 0x1ed9460
session = <optimized out>
udev_dev = 0x2e70db0
sysname = 0x2e73c60 "card0"
devnode = <optimized out>
action = 0x7f430d6677b5 "change"
seat = <optimized out>
__PRETTY_FUNCTION__ = "handle_udev_event"
#11 0x00007f430d1de8e2 in wl_event_loop_dispatch ()
from /nix/store/ky1g6ylzr2m4bq8fy0gzrnqmjr6948k5-wayland-1.22.0/lib/libwayland-server.so.0
No symbol table info available.
#12 0x00007f430d1dc445 in wl_display_run () from /nix/store/ky1g6ylzr2m4bq8fy0gzrnqmjr6948k5-wayland-1.22.0/lib/libwayland-server.so.0
No symbol table info available.
#13 0x000000000041daa5 in server_run (server=server@entry=0x485440 <server>) at ../sway/server.c:338
No locals.
#14 0x000000000041cf4d in main (argc=<optimized out>, argv=0x7ffce1ed5fe8) at ../sway/main.c:415
verbose = false
debug = false
validate = false
allow_unsupported_gpu = false
config_path = 0x0
c = <optimized out>
where event->output->data is NULL:
(gdb) p event->output->data
$5 = (void *) 0x0
1 year ago
|
|
|
|
|
|
|
if(!output) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
output->gamma_lut_changed = true;
|
|
|
|
wlr_output_schedule_frame(output->wlr_output);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void output_manager_apply(struct sway_server *server,
|
|
|
|
struct wlr_output_configuration_v1 *config, bool test_only) {
|
|
|
|
// TODO: perform atomic tests on the whole backend atomically
|
|
|
|
|
|
|
|
struct wlr_output_configuration_head_v1 *config_head;
|
|
|
|
// First disable outputs we need to disable
|
|
|
|
bool ok = true;
|
|
|
|
wl_list_for_each(config_head, &config->heads, link) {
|
|
|
|
struct wlr_output *wlr_output = config_head->state.output;
|
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
if (!output->enabled || config_head->state.enabled) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
struct output_config *oc = new_output_config(output->wlr_output->name);
|
|
|
|
oc->enabled = false;
|
|
|
|
|
|
|
|
if (test_only) {
|
|
|
|
ok &= test_output_config(oc, output);
|
|
|
|
} else {
|
|
|
|
oc = store_output_config(oc);
|
|
|
|
ok &= apply_output_config(oc, output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Then enable outputs that need to
|
|
|
|
wl_list_for_each(config_head, &config->heads, link) {
|
|
|
|
struct wlr_output *wlr_output = config_head->state.output;
|
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
if (!config_head->state.enabled) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
struct output_config *oc = new_output_config(output->wlr_output->name);
|
|
|
|
oc->enabled = true;
|
|
|
|
if (config_head->state.mode != NULL) {
|
|
|
|
struct wlr_output_mode *mode = config_head->state.mode;
|
|
|
|
oc->width = mode->width;
|
|
|
|
oc->height = mode->height;
|
|
|
|
oc->refresh_rate = mode->refresh / 1000.f;
|
|
|
|
} else {
|
|
|
|
oc->width = config_head->state.custom_mode.width;
|
|
|
|
oc->height = config_head->state.custom_mode.height;
|
|
|
|
oc->refresh_rate =
|
|
|
|
config_head->state.custom_mode.refresh / 1000.f;
|
|
|
|
}
|
|
|
|
oc->x = config_head->state.x;
|
|
|
|
oc->y = config_head->state.y;
|
|
|
|
oc->transform = config_head->state.transform;
|
|
|
|
oc->scale = config_head->state.scale;
|
|
|
|
oc->adaptive_sync = config_head->state.adaptive_sync_enabled;
|
|
|
|
|
|
|
|
if (test_only) {
|
|
|
|
ok &= test_output_config(oc, output);
|
|
|
|
} else {
|
|
|
|
oc = store_output_config(oc);
|
|
|
|
ok &= apply_output_config(oc, output);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ok) {
|
|
|
|
wlr_output_configuration_v1_send_succeeded(config);
|
|
|
|
} else {
|
|
|
|
wlr_output_configuration_v1_send_failed(config);
|
|
|
|
}
|
|
|
|
wlr_output_configuration_v1_destroy(config);
|
|
|
|
|
|
|
|
if (!test_only) {
|
|
|
|
update_output_manager_config(server);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void handle_output_manager_apply(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_server *server =
|
|
|
|
wl_container_of(listener, server, output_manager_apply);
|
|
|
|
struct wlr_output_configuration_v1 *config = data;
|
|
|
|
|
|
|
|
output_manager_apply(server, config, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
void handle_output_manager_test(struct wl_listener *listener, void *data) {
|
|
|
|
struct sway_server *server =
|
|
|
|
wl_container_of(listener, server, output_manager_test);
|
|
|
|
struct wlr_output_configuration_v1 *config = data;
|
|
|
|
|
|
|
|
output_manager_apply(server, config, 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
|
|
|
}
|
|
|
|
|
|
|
|
void handle_output_power_manager_set_mode(struct wl_listener *listener,
|
|
|
|
void *data) {
|
|
|
|
struct wlr_output_power_v1_set_mode_event *event = data;
|
|
|
|
struct sway_output *output = event->output->data;
|
|
|
|
|
|
|
|
struct output_config *oc = new_output_config(output->wlr_output->name);
|
|
|
|
switch (event->mode) {
|
|
|
|
case ZWLR_OUTPUT_POWER_V1_MODE_OFF:
|
|
|
|
oc->power = 0;
|
|
|
|
break;
|
|
|
|
case ZWLR_OUTPUT_POWER_V1_MODE_ON:
|
|
|
|
oc->power = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
oc = store_output_config(oc);
|
|
|
|
apply_output_config(oc, output);
|
|
|
|
}
|