From 51865c00c862f6810117eb59376272fac7a67d9b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 May 2018 09:50:38 +1000 Subject: Add %app_id to title_format --- sway/tree/view.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sway/tree') diff --git a/sway/tree/view.c b/sway/tree/view.c index 812d7740..d72a2235 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -654,10 +654,12 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) { return title ? strlen(title) : 0; } const char *title = view_get_title(view); + const char *app_id = view_get_app_id(view); const char *class = view_get_class(view); const char *instance = view_get_instance(view); const char *shell = view_get_type(view); size_t title_len = title ? strlen(title) : 0; + size_t app_id_len = app_id ? strlen(app_id) : 0; size_t class_len = class ? strlen(class) : 0; size_t instance_len = instance ? strlen(instance) : 0; size_t shell_len = shell ? strlen(shell) : 0; @@ -675,6 +677,10 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) { lenient_strcat(buffer, title); len += title_len; format += 6; + } else if (strncmp(next, "%app_id", 7) == 0) { + lenient_strcat(buffer, app_id); + len += app_id_len; + format += 7; } else if (strncmp(next, "%class", 6) == 0) { lenient_strcat(buffer, class); len += class_len; -- cgit v1.2.3 From d3dd7e5bae374cb890f80836d872229a37ef639f Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sun, 27 May 2018 21:59:38 +1000 Subject: Rename view_get_type to view_get_shell --- include/sway/tree/view.h | 2 +- sway/criteria.c | 4 ++-- sway/tree/view.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sway/tree') diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 0fb8f1b3..a8bf4955 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h @@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view); uint32_t view_get_window_type(struct sway_view *view); -const char *view_get_type(struct sway_view *view); +const char *view_get_shell(struct sway_view *view); void view_configure(struct sway_view *view, double ox, double oy, int width, int height); diff --git a/sway/criteria.c b/sway/criteria.c index 9317a180..dec5fed7 100644 --- a/sway/criteria.c +++ b/sway/criteria.c @@ -56,7 +56,7 @@ static bool criteria_matches_view(struct criteria *criteria, } if (criteria->shell) { - const char *shell = view_get_type(view); + const char *shell = view_get_shell(view); if (!shell || regex_cmp(shell, criteria->shell) != 0) { return false; } @@ -284,7 +284,7 @@ static char *get_focused_prop(enum criteria_token token) { value = view_get_instance(view); break; case T_SHELL: - value = view_get_type(view); + value = view_get_shell(view); break; case T_TITLE: value = view_get_class(view); diff --git a/sway/tree/view.c b/sway/tree/view.c index d72a2235..d91182ed 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -107,7 +107,7 @@ uint32_t view_get_window_type(struct sway_view *view) { return 0; } -const char *view_get_type(struct sway_view *view) { +const char *view_get_shell(struct sway_view *view) { switch(view->type) { case SWAY_VIEW_XDG_SHELL_V6: return "xdg_shell_v6"; @@ -657,7 +657,7 @@ static size_t parse_title_format(struct sway_view *view, char *buffer) { const char *app_id = view_get_app_id(view); const char *class = view_get_class(view); const char *instance = view_get_instance(view); - const char *shell = view_get_type(view); + const char *shell = view_get_shell(view); size_t title_len = title ? strlen(title) : 0; size_t app_id_len = app_id ? strlen(app_id) : 0; size_t class_len = class ? strlen(class) : 0; -- cgit v1.2.3