mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-02 07:15:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: Have output_get_identifier take a wlr_output

Browse source 
We only use wlr_output fields to generate the identifier, and a later
commit will use this function before a sway_output is constructed.
This commit is contained in:
Kenny Levinsen 2025-06-27 11:20:48 +02:00
parent 3d6b9a2848
commit b7965e9a46
5 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/config.h
View file

@ -680,7 +680,7 @@ struct seat_config *store_seat_config(struct seat_config *seat);
int output_name_cmp(const void *item, const void *data); int output_name_cmp(const void *item, const void *data);
void output_get_identifier(char *identifier, size_t len, void output_get_identifier(char *identifier, size_t len,
struct sway_output *output); struct wlr_output *output);
const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter); const char *sway_output_scale_filter_to_string(enum scale_filter_mode scale_filter);

2
sway/commands/output.c
View file

@ -65,7 +65,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
output = new_output_config(sway_output->wlr_output->name); output = new_output_config(sway_output->wlr_output->name);
} else { } else {
char identifier[128]; char identifier[128];
output_get_identifier(identifier, 128, sway_output); output_get_identifier(identifier, 128, sway_output->wlr_output);
output = new_output_config(identifier); output = new_output_config(identifier);
} }
} else { } else {

7
sway/config/output.c
View file

@ -29,8 +29,7 @@
#endif #endif
void output_get_identifier(char *identifier, size_t len, void output_get_identifier(char *identifier, size_t len,
struct sway_output *output) { struct wlr_output *wlr_output) {
struct wlr_output *wlr_output = output->wlr_output;
snprintf(identifier, len, "%s %s %s", snprintf(identifier, len, "%s %s %s",
wlr_output->make ? wlr_output->make : "Unknown", wlr_output->make ? wlr_output->make : "Unknown",
wlr_output->model ? wlr_output->model : "Unknown", wlr_output->model ? wlr_output->model : "Unknown",
@ -238,7 +237,7 @@ void store_output_config(struct output_config *oc) {
char id[128]; char id[128];
if (output) { if (output) {
output_get_identifier(id, sizeof(id), output); output_get_identifier(id, sizeof(id), output->wlr_output);
} }
for (int i = 0; i < config->output_configs->length; i++) { for (int i = 0; i < config->output_configs->length; i++) {
@ -586,7 +585,7 @@ static struct output_config *find_output_config_from_list(
} }
char id[128]; char id[128];
output_get_identifier(id, sizeof(id), sway_output); output_get_identifier(id, sizeof(id), sway_output->wlr_output);
// We take a new config and merge on top, in order, the wildcard config, // We take a new config and merge on top, in order, the wildcard config,
// output config by name, and output config by identifier to form the final // output config by name, and output config by identifier to form the final

2
sway/desktop/output.c
View file

@ -47,7 +47,7 @@ bool output_match_name_or_id(struct sway_output *output,
} }
char identifier[128]; char identifier[128];
output_get_identifier(identifier, sizeof(identifier), output); output_get_identifier(identifier, sizeof(identifier), output->wlr_output);
return strcasecmp(identifier, name_or_id) == 0 return strcasecmp(identifier, name_or_id) == 0
|| strcasecmp(output->wlr_output->name, name_or_id) == 0; || strcasecmp(output->wlr_output->name, name_or_id) == 0;
} }

6
sway/tree/workspace.c
View file

@ -615,7 +615,7 @@ static int find_output(const void *id1, const void *id2) {
static int workspace_output_get_priority(struct sway_workspace *ws, static int workspace_output_get_priority(struct sway_workspace *ws,
struct sway_output *output) { struct sway_output *output) {
char identifier[128]; char identifier[128];
output_get_identifier(identifier, sizeof(identifier), output); output_get_identifier(identifier, sizeof(identifier), output->wlr_output);
int index_id = list_seq_find(ws->output_priority, find_output, identifier); int index_id = list_seq_find(ws->output_priority, find_output, identifier);
int index_name = list_seq_find(ws->output_priority, find_output, int index_name = list_seq_find(ws->output_priority, find_output,
output->wlr_output->name); output->wlr_output->name);
@ -632,7 +632,7 @@ void workspace_output_raise_priority(struct sway_workspace *ws,
int new_index = workspace_output_get_priority(ws, output); int new_index = workspace_output_get_priority(ws, output);
if (new_index < 0) { if (new_index < 0) {
char identifier[128]; char identifier[128];
output_get_identifier(identifier, sizeof(identifier), output); output_get_identifier(identifier, sizeof(identifier), output->wlr_output);
list_insert(ws->output_priority, old_index, strdup(identifier)); list_insert(ws->output_priority, old_index, strdup(identifier));
} else if (new_index > old_index) { } else if (new_index > old_index) {
char *name = ws->output_priority->items[new_index]; char *name = ws->output_priority->items[new_index];
@ -645,7 +645,7 @@ void workspace_output_add_priority(struct sway_workspace *workspace,
struct sway_output *output) { struct sway_output *output) {
if (workspace_output_get_priority(workspace, output) < 0) { if (workspace_output_get_priority(workspace, output) < 0) {
char identifier[128]; char identifier[128];
output_get_identifier(identifier, sizeof(identifier), output); output_get_identifier(identifier, sizeof(identifier), output->wlr_output);
list_add(workspace->output_priority, strdup(identifier)); list_add(workspace->output_priority, strdup(identifier));
} }
} }