mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-16 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use output identifier for workspace config

Browse source
This commit is contained in:
Robinhuett 2018-10-27 15:56:06 +02:00
parent 5a98dfee02
commit 0a4cf4748d
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sway/tree/workspace.c
View file

@ -35,6 +35,10 @@ struct sway_output *workspace_get_initial_output(const char *name) {
struct workspace_config *wsc = workspace_find_config(name);
if (wsc && wsc->output) {
struct sway_output *output = output_by_name(wsc->output);
if (!output) {
output = output_by_identifier(wsc->output);
}
if (output) {
return output;
}
@ -143,7 +147,11 @@ void workspace_consider_destroy(struct sway_workspace *ws) {
static bool workspace_valid_on_output(const char *output_name,
const char *ws_name) {
struct workspace_config *wsc = workspace_find_config(ws_name);
return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0;
char identifier[128];
struct sway_output *output = output_by_name(output_name);
output_get_identifier(identifier, sizeof(identifier), output);
return !wsc || !wsc->output || strcmp(wsc->output, output_name) == 0 || strcasecmp(identifier, output_name) == 0;
}
static void workspace_name_from_binding(const struct sway_binding * binding,