|
|
|
|
#define _POSIX_C_SOURCE 200809L
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
#include <fcntl.h>
|
|
|
|
|
#include <stdbool.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
#include <sys/wait.h>
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#include <wlr/types/wlr_output_layout.h>
|
|
|
|
|
#include <wlr/types/wlr_output.h>
|
|
|
|
|
#include "sway/config.h"
|
|
|
|
|
#include "sway/output.h"
|
|
|
|
|
#include "sway/tree/root.h"
|
|
|
|
|
#include "log.h"
|
|
|
|
|
#include "util.h"
|
|
|
|
|
|
|
|
|
|
int output_name_cmp(const void *item, const void *data) {
|
|
|
|
|
const struct output_config *output = item;
|
|
|
|
|
const char *name = data;
|
|
|
|
|
|
|
|
|
|
return strcmp(output->name, name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void output_get_identifier(char *identifier, size_t len,
|
|
|
|
|
struct sway_output *output) {
|
|
|
|
|
struct wlr_output *wlr_output = output->wlr_output;
|
|
|
|
|
snprintf(identifier, len, "%s %s %s", wlr_output->make, wlr_output->model,
|
|
|
|
|
wlr_output->serial);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct output_config *new_output_config(const char *name) {
|
|
|
|
|
struct output_config *oc = calloc(1, sizeof(struct output_config));
|
|
|
|
|
if (oc == NULL) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
oc->name = strdup(name);
|
|
|
|
|
if (oc->name == NULL) {
|
|
|
|
|
free(oc);
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
oc->enabled = -1;
|
|
|
|
|
oc->width = oc->height = -1;
|
|
|
|
|
oc->refresh_rate = -1;
|
|
|
|
|
oc->x = oc->y = -1;
|
|
|
|
|
oc->scale = -1;
|
|
|
|
|
oc->transform = -1;
|
|
|
|
|
oc->subpixel = WL_OUTPUT_SUBPIXEL_UNKNOWN;
|
|
|
|
|
return oc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void merge_output_config(struct output_config *dst, struct output_config *src) {
|
|
|
|
|
if (src->enabled != -1) {
|
|
|
|
|
dst->enabled = src->enabled;
|
|
|
|
|
}
|
|
|
|
|
if (src->width != -1) {
|
|
|
|
|
dst->width = src->width;
|
|
|
|
|
}
|
|
|
|
|
if (src->height != -1) {
|
|
|
|
|
dst->height = src->height;
|
|
|
|
|
}
|
|
|
|
|
if (src->x != -1) {
|
|
|
|
|
dst->x = src->x;
|
|
|
|
|
}
|
|
|
|
|
if (src->y != -1) {
|
|
|
|
|
dst->y = src->y;
|
|
|
|
|
}
|
|
|
|
|
if (src->scale != -1) {
|
|
|
|
|
dst->scale = src->scale;
|
|
|
|
|
}
|
|
|
|
|
if (src->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN) {
|
|
|
|
|
dst->subpixel = src->subpixel;
|
|
|
|
|
}
|
|
|
|
|
if (src->refresh_rate != -1) {
|
|
|
|
|
dst->refresh_rate = src->refresh_rate;
|
|
|
|
|
}
|
|
|
|
|
if (src->transform != -1) {
|
|
|
|
|
dst->transform = src->transform;
|
|
|
|
|
}
|
|
|
|
|
if (src->background) {
|
|
|
|
|
free(dst->background);
|
|
|
|
|
dst->background = strdup(src->background);
|
|
|
|
|
}
|
|
|
|
|
if (src->background_option) {
|
|
|
|
|
free(dst->background_option);
|
|
|
|
|
dst->background_option = strdup(src->background_option);
|
|
|
|
|
}
|
|
|
|
|
if (src->background_fallback) {
|
|
|
|
|
free(dst->background_fallback);
|
|
|
|
|
dst->background_fallback = strdup(src->background_fallback);
|
|
|
|
|
}
|
|
|
|
|
if (src->dpms_state != 0) {
|
|
|
|
|
dst->dpms_state = src->dpms_state;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void merge_wildcard_on_all(struct output_config *wildcard) {
|
|
|
|
|
for (int i = 0; i < config->output_configs->length; i++) {
|
|
|
|
|
struct output_config *oc = config->output_configs->items[i];
|
|
|
|
|
if (strcmp(wildcard->name, oc->name) != 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Merging output * config on %s", oc->name);
|
|
|
|
|
merge_output_config(oc, wildcard);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void merge_id_on_name(struct output_config *oc) {
|
|
|
|
|
char *id_on_name = NULL;
|
|
|
|
|
char id[128];
|
|
|
|
|
char *name = NULL;
|
|
|
|
|
struct sway_output *output;
|
|
|
|
|
wl_list_for_each(output, &root->all_outputs, link) {
|
|
|
|
|
name = output->wlr_output->name;
|
|
|
|
|
output_get_identifier(id, sizeof(id), output);
|
|
|
|
|
if (strcmp(name, oc->name) != 0 || strcmp(id, oc->name) != 0) {
|
|
|
|
|
size_t length = snprintf(NULL, 0, "%s on %s", id, name) + 1;
|
|
|
|
|
id_on_name = malloc(length);
|
|
|
|
|
if (!id_on_name) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Failed to allocate id on name string");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
snprintf(id_on_name, length, "%s on %s", id, name);
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!id_on_name) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Merging on top of existing id on name config");
|
|
|
|
|
merge_output_config(config->output_configs->items[i], oc);
|
|
|
|
|
} else {
|
|
|
|
|
// If both a name and identifier config, exist generate an id on name
|
|
|
|
|
int ni = list_seq_find(config->output_configs, output_name_cmp, name);
|
|
|
|
|
int ii = list_seq_find(config->output_configs, output_name_cmp, id);
|
|
|
|
|
if ((ni >= 0 && ii >= 0) || (ni >= 0 && strcmp(oc->name, id) == 0)
|
|
|
|
|
|| (ii >= 0 && strcmp(oc->name, name) == 0)) {
|
|
|
|
|
struct output_config *ion_oc = new_output_config(id_on_name);
|
|
|
|
|
if (ni >= 0) {
|
|
|
|
|
merge_output_config(ion_oc, config->output_configs->items[ni]);
|
|
|
|
|
}
|
|
|
|
|
if (ii >= 0) {
|
|
|
|
|
merge_output_config(ion_oc, config->output_configs->items[ii]);
|
|
|
|
|
}
|
|
|
|
|
merge_output_config(ion_oc, oc);
|
|
|
|
|
list_add(config->output_configs, ion_oc);
|
|
|
|
|
sway_log(SWAY_DEBUG, "Generated id on name output config \"%s\""
|
|
|
|
|
" (enabled: %d) (%dx%d@%fHz position %d,%d scale %f "
|
|
|
|
|
"transform %d) (bg %s %s) (dpms %d)", ion_oc->name,
|
|
|
|
|
ion_oc->enabled, ion_oc->width, ion_oc->height,
|
|
|
|
|
ion_oc->refresh_rate, ion_oc->x, ion_oc->y, ion_oc->scale,
|
|
|
|
|
ion_oc->transform, ion_oc->background,
|
|
|
|
|
ion_oc->background_option, ion_oc->dpms_state);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
free(id_on_name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct output_config *store_output_config(struct output_config *oc) {
|
|
|
|
|
bool wildcard = strcmp(oc->name, "*") == 0;
|
|
|
|
|
if (wildcard) {
|
|
|
|
|
merge_wildcard_on_all(oc);
|
|
|
|
|
} else {
|
|
|
|
|
merge_id_on_name(oc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int i = list_seq_find(config->output_configs, output_name_cmp, oc->name);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Merging on top of existing output config");
|
|
|
|
|
struct output_config *current = config->output_configs->items[i];
|
|
|
|
|
merge_output_config(current, oc);
|
|
|
|
|
free_output_config(oc);
|
|
|
|
|
oc = current;
|
|
|
|
|
} else if (!wildcard) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Adding non-wildcard output config");
|
|
|
|
|
i = list_seq_find(config->output_configs, output_name_cmp, "*");
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Merging on top of output * config");
|
|
|
|
|
struct output_config *current = new_output_config(oc->name);
|
|
|
|
|
merge_output_config(current, config->output_configs->items[i]);
|
|
|
|
|
merge_output_config(current, oc);
|
|
|
|
|
free_output_config(oc);
|
|
|
|
|
oc = current;
|
|
|
|
|
}
|
|
|
|
|
list_add(config->output_configs, oc);
|
|
|
|
|
} else {
|
|
|
|
|
// New wildcard config. Just add it
|
|
|
|
|
sway_log(SWAY_DEBUG, "Adding output * config");
|
|
|
|
|
list_add(config->output_configs, oc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "Config stored for output %s (enabled: %d) (%dx%d@%fHz "
|
|
|
|
|
"position %d,%d scale %f subpixel %s transform %d) (bg %s %s) (dpms %d)",
|
|
|
|
|
oc->name, oc->enabled, oc->width, oc->height, oc->refresh_rate,
|
|
|
|
|
oc->x, oc->y, oc->scale, sway_wl_output_subpixel_to_string(oc->subpixel),
|
|
|
|
|
oc->transform, oc->background, oc->background_option, oc->dpms_state);
|
|
|
|
|
|
|
|
|
|
return oc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool set_mode(struct wlr_output *output, int width, int height,
|
|
|
|
|
float refresh_rate) {
|
|
|
|
|
int mhz = (int)(refresh_rate * 1000);
|
|
|
|
|
if (wl_list_empty(&output->modes)) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Assigning custom mode to %s", output->name);
|
|
|
|
|
return wlr_output_set_custom_mode(output, width, height, mhz);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct wlr_output_mode *mode, *best = NULL;
|
|
|
|
|
wl_list_for_each(mode, &output->modes, link) {
|
|
|
|
|
if (mode->width == width && mode->height == height) {
|
|
|
|
|
if (mode->refresh == mhz) {
|
|
|
|
|
best = mode;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
best = mode;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (!best) {
|
|
|
|
|
sway_log(SWAY_ERROR, "Configured mode for %s not available", output->name);
|
|
|
|
|
sway_log(SWAY_INFO, "Picking default mode instead");
|
|
|
|
|
best = wl_container_of(output->modes.prev, mode, link);
|
|
|
|
|
} else {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Assigning configured mode to %s", output->name);
|
|
|
|
|
}
|
|
|
|
|
return wlr_output_set_mode(output, best);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void handle_swaybg_client_destroy(struct wl_listener *listener,
|
|
|
|
|
void *data) {
|
|
|
|
|
struct sway_output *output =
|
|
|
|
|
wl_container_of(listener, output, swaybg_client_destroy);
|
|
|
|
|
wl_list_remove(&output->swaybg_client_destroy.link);
|
|
|
|
|
wl_list_init(&output->swaybg_client_destroy.link);
|
|
|
|
|
output->swaybg_client = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool set_cloexec(int fd, bool cloexec) {
|
|
|
|
|
int flags = fcntl(fd, F_GETFD);
|
|
|
|
|
if (flags == -1) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "fcntl failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (cloexec) {
|
|
|
|
|
flags = flags | FD_CLOEXEC;
|
|
|
|
|
} else {
|
|
|
|
|
flags = flags & ~FD_CLOEXEC;
|
|
|
|
|
}
|
|
|
|
|
if (fcntl(fd, F_SETFD, flags) == -1) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "fcntl failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static bool spawn_swaybg(struct sway_output *output, char *const cmd[]) {
|
|
|
|
|
int sockets[2];
|
|
|
|
|
if (socketpair(AF_UNIX, SOCK_STREAM, 0, sockets) != 0) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "socketpair failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (!set_cloexec(sockets[0], true) || !set_cloexec(sockets[1], true)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
output->swaybg_client = wl_client_create(server.wl_display, sockets[0]);
|
|
|
|
|
if (output->swaybg_client == NULL) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "wl_client_create failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
output->swaybg_client_destroy.notify = handle_swaybg_client_destroy;
|
|
|
|
|
wl_client_add_destroy_listener(output->swaybg_client,
|
|
|
|
|
&output->swaybg_client_destroy);
|
|
|
|
|
|
|
|
|
|
pid_t pid = fork();
|
|
|
|
|
if (pid < 0) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "fork failed");
|
|
|
|
|
return false;
|
|
|
|
|
} else if (pid == 0) {
|
|
|
|
|
pid = fork();
|
|
|
|
|
if (pid < 0) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "fork failed");
|
|
|
|
|
_exit(EXIT_FAILURE);
|
|
|
|
|
} else if (pid == 0) {
|
|
|
|
|
if (!set_cloexec(sockets[1], false)) {
|
|
|
|
|
_exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char wayland_socket_str[16];
|
|
|
|
|
snprintf(wayland_socket_str, sizeof(wayland_socket_str),
|
|
|
|
|
"%d", sockets[1]);
|
|
|
|
|
setenv("WAYLAND_SOCKET", wayland_socket_str, true);
|
|
|
|
|
|
|
|
|
|
execvp(cmd[0], cmd);
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "execvp failed");
|
|
|
|
|
_exit(EXIT_FAILURE);
|
|
|
|
|
}
|
|
|
|
|
_exit(EXIT_SUCCESS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (close(sockets[1]) != 0) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "close failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (waitpid(pid, NULL, 0) < 0) {
|
|
|
|
|
sway_log_errno(SWAY_ERROR, "waitpid failed");
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool apply_output_config(struct output_config *oc, struct sway_output *output) {
|
|
|
|
|
if (output == root->noop_output) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
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 wlr_output *wlr_output = output->wlr_output;
|
|
|
|
|
|
|
|
|
|
if (oc && !oc->enabled) {
|
|
|
|
|
// Output is configured to be disabled
|
|
|
|
|
if (output->enabled) {
|
|
|
|
|
output_disable(output);
|
|
|
|
|
wlr_output_layout_remove(root->output_layout, wlr_output);
|
|
|
|
|
}
|
|
|
|
|
wlr_output_enable(wlr_output, false);
|
|
|
|
|
return true;
|
|
|
|
|
} else if (!output->enabled) {
|
|
|
|
|
// Output is not enabled. Enable it, output_enable will call us again.
|
|
|
|
|
if (!oc || oc->dpms_state != DPMS_OFF) {
|
|
|
|
|
wlr_output_enable(wlr_output, true);
|
|
|
|
|
}
|
|
|
|
|
output_enable(output, oc);
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (oc && oc->dpms_state == DPMS_ON) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Turning on screen");
|
|
|
|
|
wlr_output_enable(wlr_output, true);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool modeset_success;
|
|
|
|
|
if (oc && oc->width > 0 && oc->height > 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Set %s mode to %dx%d (%f GHz)", oc->name, oc->width,
|
|
|
|
|
oc->height, oc->refresh_rate);
|
|
|
|
|
modeset_success =
|
|
|
|
|
set_mode(wlr_output, oc->width, oc->height, oc->refresh_rate);
|
|
|
|
|
} else if (!wl_list_empty(&wlr_output->modes)) {
|
|
|
|
|
struct wlr_output_mode *mode =
|
|
|
|
|
wl_container_of(wlr_output->modes.prev, mode, link);
|
|
|
|
|
modeset_success = wlr_output_set_mode(wlr_output, mode);
|
|
|
|
|
} else {
|
|
|
|
|
// Output doesn't support modes
|
|
|
|
|
modeset_success = true;
|
|
|
|
|
}
|
|
|
|
|
if (!modeset_success) {
|
|
|
|
|
// Failed to modeset, maybe the output is missing a CRTC. Leave the
|
|
|
|
|
// output disabled for now and try again when the output gets the mode
|
|
|
|
|
// we asked for.
|
|
|
|
|
sway_log(SWAY_ERROR, "Failed to modeset output %s", wlr_output->name);
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (oc && oc->scale > 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Set %s scale to %f", oc->name, oc->scale);
|
|
|
|
|
wlr_output_set_scale(wlr_output, oc->scale);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (oc && (oc->subpixel != WL_OUTPUT_SUBPIXEL_UNKNOWN || config->reloading)) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Set %s subpixel to %s", oc->name,
|
|
|
|
|
sway_wl_output_subpixel_to_string(oc->subpixel));
|
|
|
|
|
wlr_output_set_subpixel(wlr_output, oc->subpixel);
|
|
|
|
|
output_damage_whole(output);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (oc && oc->transform >= 0) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Set %s transform to %d", oc->name, oc->transform);
|
|
|
|
|
wlr_output_set_transform(wlr_output, oc->transform);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Find position for it
|
|
|
|
|
if (oc && (oc->x != -1 || oc->y != -1)) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Set %s position to %d, %d", oc->name, oc->x, oc->y);
|
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
|
|
|
wlr_output_layout_add(root->output_layout, wlr_output, oc->x, oc->y);
|
|
|
|
|
} else {
|
Implement type safe arguments and demote sway_container
This commit changes the meaning of sway_container so that it only refers
to layout containers and view containers. Workspaces, outputs and the
root are no longer known as containers. Instead, root, outputs,
workspaces and containers are all a type of node, and containers come in
two types: layout containers and view containers.
In addition to the above, this implements type safe variables. This
means we use specific types such as sway_output and sway_workspace
instead of generic containers or nodes. However, it's worth noting that
in a few places places (eg. seat focus and transactions) referring to
them in a generic way is unavoidable which is why we still use nodes in
some places.
If you want a TL;DR, look at node.h, as well as the struct definitions
for root, output, workspace and container. Note that sway_output now
contains a workspaces list, and workspaces now contain a tiling and
floating list, and containers now contain a pointer back to the
workspace.
There are now functions for seat_get_focused_workspace and
seat_get_focused_container. The latter will return NULL if a workspace
itself is focused. Most other seat functions like seat_get_focus and
seat_set_focus now accept and return nodes.
In the config->handler_context struct, current_container has been
replaced with three pointers: node, container and workspace. node is the
same as what current_container was, while workspace is the workspace
that the node resides on and container is the actual container, which
may be NULL if a workspace itself is focused.
The global root_container variable has been replaced with one simply
called root, which is a pointer to the sway_root instance.
The way outputs are created, enabled, disabled and destroyed has
changed. Previously we'd wrap the sway_output in a container when it is
enabled, but as we don't have containers any more it needs a different
approach. The output_create and output_destroy functions previously
created/destroyed the container, but now they create/destroy the
sway_output. There is a new function output_disable to disable an output
without destroying it.
Containers have a new view property. If this is populated then the
container is a view container, otherwise it's a layout container. Like
before, this property is immutable for the life of the container.
Containers have both a `sway_container *parent` and
`sway_workspace *workspace`. As we use specific types now, parent cannot
point to a workspace so it'll be NULL for containers which are direct
children of the workspace. The workspace property is set for all
containers, except those which are hidden in the scratchpad as they have
no workspace.
In some cases we need to refer to workspaces in a container-like way.
For example, workspaces have layout and children, but when using
specific types this makes it difficult. Likewise, it's difficult for a
container to get its parent's layout when the parent could be another
container or a workspace. To make it easier, some helper functions have
been created: container_parent_layout and container_get_siblings.
container_remove_child has been renamed to container_detach and
container_replace_child has been renamed to container_replace.
`container_handle_fullscreen_reparent(con, old_parent)` has had the
old_parent removed. We now unfullscreen the workspace when detaching the
container, so this function is simplified and only needs one argument
now.
container_notify_subtree_changed has been renamed to
container_update_representation. This is more descriptive of its
purpose. I also wanted to be able to call it with whatever container was
changed rather than the container's parent, which makes bubbling up to
the workspace easier.
There are now state structs per node thing. ie. sway_output_state,
sway_workspace_state and sway_container_state.
The focus, move and layout commands have been completely refactored to
work with the specific types. I considered making these a separate PR,
but I'd be backporting my changes only to replace them again, and it's
easier just to test everything at once.
6 years ago
|
|
|
wlr_output_layout_add_auto(root->output_layout, wlr_output);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Update output->{lx, ly, width, height}
|
|
|
|
|
struct wlr_box *output_box =
|
|
|
|
|
wlr_output_layout_get_box(root->output_layout, wlr_output);
|
|
|
|
|
output->lx = output_box->x;
|
|
|
|
|
output->ly = output_box->y;
|
|
|
|
|
wlr_output_transformed_resolution(wlr_output,
|
|
|
|
|
&output->width, &output->height);
|
|
|
|
|
|
|
|
|
|
if (output->swaybg_client != NULL) {
|
|
|
|
|
wl_client_destroy(output->swaybg_client);
|
|
|
|
|
}
|
|
|
|
|
if (oc && oc->background && config->swaybg_command) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Setting background for output %s to %s",
|
|
|
|
|
wlr_output->name, oc->background);
|
|
|
|
|
|
|
|
|
|
char *const cmd[] = {
|
|
|
|
|
config->swaybg_command,
|
|
|
|
|
wlr_output->name,
|
|
|
|
|
oc->background,
|
|
|
|
|
oc->background_option,
|
|
|
|
|
oc->background_fallback ? oc->background_fallback : NULL,
|
|
|
|
|
NULL,
|
|
|
|
|
};
|
|
|
|
|
if (!spawn_swaybg(output, cmd)) {
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (oc && oc->dpms_state == DPMS_OFF) {
|
|
|
|
|
sway_log(SWAY_DEBUG, "Turning off screen");
|
|
|
|
|
wlr_output_enable(wlr_output, false);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void default_output_config(struct output_config *oc,
|
|
|
|
|
struct wlr_output *wlr_output) {
|
|
|
|
|
oc->enabled = 1;
|
|
|
|
|
if (!wl_list_empty(&wlr_output->modes)) {
|
|
|
|
|
struct wlr_output_mode *mode =
|
|
|
|
|
wl_container_of(wlr_output->modes.prev, mode, link);
|
|
|
|
|
oc->width = mode->width;
|
|
|
|
|
oc->height = mode->height;
|
|
|
|
|
oc->refresh_rate = mode->refresh;
|
|
|
|
|
}
|
|
|
|
|
oc->x = oc->y = -1;
|
|
|
|
|
oc->scale = 1;
|
|
|
|
|
struct sway_output *output = wlr_output->data;
|
|
|
|
|
oc->subpixel = output->detected_subpixel;
|
|
|
|
|
oc->transform = WL_OUTPUT_TRANSFORM_NORMAL;
|
|
|
|
|
oc->dpms_state = DPMS_ON;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct output_config *get_output_config(char *identifier,
|
|
|
|
|
struct sway_output *sway_output) {
|
|
|
|
|
const char *name = sway_output->wlr_output->name;
|
|
|
|
|
|
|
|
|
|
struct output_config *oc_id_on_name = NULL;
|
|
|
|
|
struct output_config *oc_name = NULL;
|
|
|
|
|
struct output_config *oc_id = NULL;
|
|
|
|
|
|
|
|
|
|
size_t length = snprintf(NULL, 0, "%s on %s", identifier, name) + 1;
|
|
|
|
|
char *id_on_name = malloc(length);
|
|
|
|
|
snprintf(id_on_name, length, "%s on %s", identifier, name);
|
|
|
|
|
int i = list_seq_find(config->output_configs, output_name_cmp, id_on_name);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
oc_id_on_name = config->output_configs->items[i];
|
|
|
|
|
} else {
|
|
|
|
|
i = list_seq_find(config->output_configs, output_name_cmp, name);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
oc_name = config->output_configs->items[i];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
i = list_seq_find(config->output_configs, output_name_cmp, identifier);
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
oc_id = config->output_configs->items[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct output_config *result = new_output_config("temp");
|
|
|
|
|
if (config->reloading) {
|
|
|
|
|
default_output_config(result, sway_output->wlr_output);
|
|
|
|
|
}
|
|
|
|
|
if (oc_id_on_name) {
|
|
|
|
|
// Already have an identifier on name config, use that
|
|
|
|
|
free(result->name);
|
|
|
|
|
result->name = strdup(id_on_name);
|
|
|
|
|
merge_output_config(result, oc_id_on_name);
|
|
|
|
|
} else if (oc_name && oc_id) {
|
|
|
|
|
// Generate a config named `<identifier> on <name>` which contains a
|
|
|
|
|
// merged copy of the identifier on name. This will make sure that both
|
|
|
|
|
// identifier and name configs are respected, with identifier getting
|
|
|
|
|
// priority
|
|
|
|
|
struct output_config *temp = new_output_config(id_on_name);
|
|
|
|
|
merge_output_config(temp, oc_name);
|
|
|
|
|
merge_output_config(temp, oc_id);
|
|
|
|
|
list_add(config->output_configs, temp);
|
|
|
|
|
|
|
|
|
|
free(result->name);
|
|
|
|
|
result->name = strdup(id_on_name);
|
|
|
|
|
merge_output_config(result, temp);
|
|
|
|
|
|
|
|
|
|
sway_log(SWAY_DEBUG, "Generated output config \"%s\" (enabled: %d)"
|
|
|
|
|
" (%dx%d@%fHz position %d,%d scale %f transform %d) (bg %s %s)"
|
|
|
|
|
" (dpms %d)", result->name, result->enabled, result->width,
|
|
|
|
|
result->height, result->refresh_rate, result->x, result->y,
|
|
|
|
|
result->scale, result->transform, result->background,
|
|
|
|
|
result->background_option, result->dpms_state);
|
|
|
|
|
} else if (oc_name) {
|
|
|
|
|
// No identifier config, just return a copy of the name config
|
|
|
|
|
free(result->name);
|
|
|
|
|
result->name = strdup(name);
|
|
|
|
|
merge_output_config(result, oc_name);
|
|
|
|
|
} else if (oc_id) {
|
|
|
|
|
// No name config, just return a copy of the identifier config
|
|
|
|
|
free(result->name);
|
|
|
|
|
result->name = strdup(identifier);
|
|
|
|
|
merge_output_config(result, oc_id);
|
|
|
|
|
} else {
|
|
|
|
|
i = list_seq_find(config->output_configs, output_name_cmp, "*");
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
// No name or identifier config, but there is a wildcard config
|
|
|
|
|
free(result->name);
|
|
|
|
|
result->name = strdup("*");
|
|
|
|
|
merge_output_config(result, config->output_configs->items[i]);
|
|
|
|
|
} else if (!config->reloading) {
|
|
|
|
|
// No name, identifier, or wildcard config. Since we are not
|
|
|
|
|
// reloading with defaults, the output config will be empty, so
|
|
|
|
|
// just return NULL
|
|
|
|
|
free_output_config(result);
|
|
|
|
|
result = NULL;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free(id_on_name);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
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 *find_output_config(struct sway_output *output) {
|
|
|
|
|
char id[128];
|
|
|
|
|
output_get_identifier(id, sizeof(id), output);
|
|
|
|
|
return get_output_config(id, output);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void apply_output_config_to_outputs(struct output_config *oc) {
|
|
|
|
|
// Try to find the output container and apply configuration now. If
|
|
|
|
|
// this is during startup then there will be no container and config
|
|
|
|
|
// will be applied during normal "new output" event from wlroots.
|
|
|
|
|
bool wildcard = strcmp(oc->name, "*") == 0;
|
|
|
|
|
char id[128];
|
|
|
|
|
struct sway_output *sway_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
|
|
|
wl_list_for_each(sway_output, &root->all_outputs, link) {
|
|
|
|
|
char *name = sway_output->wlr_output->name;
|
|
|
|
|
output_get_identifier(id, sizeof(id), sway_output);
|
|
|
|
|
if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {
|
|
|
|
|
struct output_config *current = get_output_config(id, sway_output);
|
|
|
|
|
if (!current) {
|
|
|
|
|
// No stored output config matched, apply oc directly
|
|
|
|
|
sway_log(SWAY_DEBUG, "Applying oc directly");
|
|
|
|
|
current = new_output_config(oc->name);
|
|
|
|
|
merge_output_config(current, 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
|
|
|
apply_output_config(current, sway_output);
|
|
|
|
|
free_output_config(current);
|
|
|
|
|
|
|
|
|
|
if (!wildcard) {
|
|
|
|
|
// Stop looking if the output config isn't applicable to all
|
|
|
|
|
// outputs
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void reset_outputs(void) {
|
|
|
|
|
struct output_config *oc = NULL;
|
|
|
|
|
int i = list_seq_find(config->output_configs, output_name_cmp, "*");
|
|
|
|
|
if (i >= 0) {
|
|
|
|
|
oc = config->output_configs->items[i];
|
|
|
|
|
} else {
|
|
|
|
|
oc = store_output_config(new_output_config("*"));
|
|
|
|
|
}
|
|
|
|
|
apply_output_config_to_outputs(oc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void free_output_config(struct output_config *oc) {
|
|
|
|
|
if (!oc) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
free(oc->name);
|
|
|
|
|
free(oc->background);
|
|
|
|
|
free(oc->background_option);
|
|
|
|
|
free(oc);
|
|
|
|
|
}
|
