Skip to content

output: Log output information when connected #8784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

output: Log output information when connected #8784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7965e9
output: Have output_get_identifier take a wlr_output
kennylevinsen Jun 27, 2025
273c122
output: Log output information when connected
kennylevinsen Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/sway/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ struct seat_config *store_seat_config(struct seat_config *seat);
int output_name_cmp(const void *item, const void *data);

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);

Expand Down
2 changes: 1 addition & 1 deletion sway/commands/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
output = new_output_config(sway_output->wlr_output->name);
} else {
char identifier[128];
output_get_identifier(identifier, 128, sway_output);
output_get_identifier(identifier, 128, sway_output->wlr_output);
output = new_output_config(identifier);
}
} else {
Expand Down
7 changes: 3 additions & 4 deletions sway/config/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
#endif

void output_get_identifier(char *identifier, size_t len,
struct sway_output *output) {
struct wlr_output *wlr_output = output->wlr_output;
struct wlr_output *wlr_output) {
snprintf(identifier, len, "%s %s %s",
wlr_output->make ? wlr_output->make : "Unknown",
wlr_output->model ? wlr_output->model : "Unknown",
Expand Down Expand Up @@ -238,7 +237,7 @@ void store_output_config(struct output_config *oc) {

char id[128];
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++) {
Expand Down Expand Up @@ -586,7 +585,7 @@ static struct output_config *find_output_config_from_list(
}

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,
// output config by name, and output config by identifier to form the final
Expand Down
38 changes: 35 additions & 3 deletions sway/desktop/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ bool output_match_name_or_id(struct sway_output *output,
}

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
|| strcasecmp(output->wlr_output->name, name_or_id) == 0;
}
Expand Down Expand Up @@ -523,6 +523,39 @@ static void handle_request_state(struct wl_listener *listener, void *data) {
force_modeset();
}

static void dump_output(struct wlr_output *output) {
bool supports_bt2020 = output->supported_primaries &
WLR_COLOR_NAMED_PRIMARIES_BT2020;
bool supports_pq = output->supported_transfer_functions &
WLR_COLOR_TRANSFER_FUNCTION_ST2084_PQ;
bool supports_color_transform =
server.renderer->features.output_color_transform;

const char *hdr_support = "yes";
if (!supports_bt2020 && !supports_pq) {
hdr_support = "no";
} else if (supports_bt2020 && supports_pq && !supports_color_transform) {
hdr_support = "no (missing renderer color transform support)";
} else if (!supports_bt2020) {
hdr_support = "no (missing BT2020 primaries)";
} else if (!supports_pq) {
hdr_support = "no (missing PQ transfer function)";
}

char id[128];
output_get_identifier(id, sizeof(id), output);

sway_log(SWAY_INFO, "New output: %s", output->name);
sway_log(SWAY_INFO, " Identifier: %s", id);
sway_log(SWAY_INFO, " Dimensions: %dmm x %dmm",
output->phys_width, output->phys_height);
sway_log(SWAY_INFO, " Non-desktop: %s",
output->non_desktop ? "yes" : "no");
sway_log(SWAY_INFO, " Adaptive sync support: %s",
output->adaptive_sync_supported ? "yes" : "no");
sway_log(SWAY_INFO, " HDR support: %s", hdr_support);
}

static unsigned int last_headless_num = 0;

void handle_new_output(struct wl_listener *listener, void *data) {
Expand All @@ -539,8 +572,7 @@ void handle_new_output(struct wl_listener *listener, void *data) {
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);
dump_output(wlr_output);

if (wlr_output->non_desktop) {
sway_log(SWAY_DEBUG, "Not configuring non-desktop output");
Expand Down
6 changes: 3 additions & 3 deletions sway/tree/workspace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ static int find_output(const void *id1, const void *id2) {
static int workspace_output_get_priority(struct sway_workspace *ws,
struct sway_output *output) {
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_name = list_seq_find(ws->output_priority, find_output,
output->wlr_output->name);
Expand All @@ -632,7 +632,7 @@ void workspace_output_raise_priority(struct sway_workspace *ws,
int new_index = workspace_output_get_priority(ws, output);
if (new_index < 0) {
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));
} else if (new_index > old_index) {
char *name = ws->output_priority->items[new_index];
Expand All @@ -645,7 +645,7 @@ void workspace_output_add_priority(struct sway_workspace *workspace,
struct sway_output *output) {
if (workspace_output_get_priority(workspace, output) < 0) {
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));
}
}
Expand Down