mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-16 05:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2513 from RyanDwyer/rename-root-outputs

Browse source 
Rename sway_root.outputs to sway_root.all_outputs
This commit is contained in:
Drew DeVault 2018-08-26 10:50:02 -04:00 committed by GitHub
parent df7083a2d0 1e024b91fa
commit 10c2c09cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/tree/root.h
View file

@ -21,7 +21,8 @@ struct sway_root {
struct wlr_texture *debug_tree; struct wlr_texture *debug_tree;
struct wl_list outputs; // sway_output::link // Includes disabled outputs
struct wl_list all_outputs; // sway_output::link
list_t *scratchpad; // struct sway_container list_t *scratchpad; // struct sway_container
list_t *saved_workspaces; // For when there's no connected outputs list_t *saved_workspaces; // For when there's no connected outputs

6
sway/config/output.c
View file

@ -289,7 +289,8 @@ void apply_output_config_to_outputs(struct output_config *oc) {
bool wildcard = strcmp(oc->name, "*") == 0; bool wildcard = strcmp(oc->name, "*") == 0;
char id[128]; char id[128];
struct sway_output *sway_output; struct sway_output *sway_output;
wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { wl_list_for_each(sway_output,
&root_container.sway_root->all_outputs, link) {
char *name = sway_output->wlr_output->name; char *name = sway_output->wlr_output->name;
output_get_identifier(id, sizeof(id), sway_output); output_get_identifier(id, sizeof(id), sway_output);
if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) { if (wildcard || !strcmp(name, oc->name) || !strcmp(id, oc->name)) {
@ -349,7 +350,8 @@ static void default_output_config(struct output_config *oc,
void create_default_output_configs(void) { void create_default_output_configs(void) {
struct sway_output *sway_output; struct sway_output *sway_output;
wl_list_for_each(sway_output, &root_container.sway_root->outputs, link) { wl_list_for_each(sway_output,
&root_container.sway_root->all_outputs, link) {
char *name = sway_output->wlr_output->name; char *name = sway_output->wlr_output->name;
struct output_config *oc = new_output_config(name); struct output_config *oc = new_output_config(name);
default_output_config(oc, sway_output->wlr_output); default_output_config(oc, sway_output->wlr_output);

2
sway/desktop/output.c
View file

@ -556,7 +556,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
wl_signal_add(&wlr_output->events.destroy, &output->destroy); wl_signal_add(&wlr_output->events.destroy, &output->destroy);
output->destroy.notify = handle_destroy; output->destroy.notify = handle_destroy;
wl_list_insert(&root_container.sway_root->outputs, &output->link); wl_list_insert(&root_container.sway_root->all_outputs, &output->link);
if (!wl_list_empty(&wlr_output->modes)) { if (!wl_list_empty(&wlr_output->modes)) {
struct wlr_output_mode *mode = struct wlr_output_mode *mode =

2
sway/ipc-server.c
View file

@ -616,7 +616,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
} }
} }
struct sway_output *output; struct sway_output *output;
wl_list_for_each(output, &root_container.sway_root->outputs, link) { wl_list_for_each(output, &root_container.sway_root->all_outputs, link) {
if (!output->swayc) { if (!output->swayc) {
json_object_array_add(outputs, json_object_array_add(outputs,
ipc_json_describe_disabled_output(output)); ipc_json_describe_disabled_output(output));

2
sway/tree/root.c
View file

@ -32,7 +32,7 @@ void root_create(void) {
root_container.sway_root = calloc(1, sizeof(*root_container.sway_root)); root_container.sway_root = calloc(1, sizeof(*root_container.sway_root));
root_container.sway_root->output_layout = wlr_output_layout_create(); root_container.sway_root->output_layout = wlr_output_layout_create();
wl_list_init(&root_container.sway_root->outputs); wl_list_init(&root_container.sway_root->all_outputs);
#ifdef HAVE_XWAYLAND #ifdef HAVE_XWAYLAND
wl_list_init(&root_container.sway_root->xwayland_unmanaged); wl_list_init(&root_container.sway_root->xwayland_unmanaged);
#endif #endif