mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-23 06:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
commit 10c2c09cf6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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;
char id[128];
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;
output_get_identifier(id, sizeof(id), sway_output);
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) {
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;
struct output_config *oc = new_output_config(name);
default_output_config(oc, sway_output->wlr_output);