mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename view_get_type to view_get_shell

This commit is contained in:
Ryan Dwyer 2018-05-27 21:59:38 +10:00
parent 484cc189e9
commit d3dd7e5bae
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sway/tree/view.h
View File

@ -201,7 +201,7 @@ const char *view_get_window_role(struct sway_view *view);
uint32_t view_get_window_type(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, void view_configure(struct sway_view *view, double ox, double oy, int width,
int height); int height);

4
sway/criteria.c
View File

@ -56,7 +56,7 @@ static bool criteria_matches_view(struct criteria *criteria,
} }
if (criteria->shell) { 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) { if (!shell || regex_cmp(shell, criteria->shell) != 0) {
return false; return false;
} }
@ -284,7 +284,7 @@ static char *get_focused_prop(enum criteria_token token) {
value = view_get_instance(view); value = view_get_instance(view);
break; break;
case T_SHELL: case T_SHELL:
value = view_get_type(view); value = view_get_shell(view);
break; break;
case T_TITLE: case T_TITLE:
value = view_get_class(view); value = view_get_class(view);

4
sway/tree/view.c
View File

@ -107,7 +107,7 @@ uint32_t view_get_window_type(struct sway_view *view) {
return 0; return 0;
} }
const char *view_get_type(struct sway_view *view) { const char *view_get_shell(struct sway_view *view) {
switch(view->type) { switch(view->type) {
case SWAY_VIEW_XDG_SHELL_V6: case SWAY_VIEW_XDG_SHELL_V6:
return "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 *app_id = view_get_app_id(view);
const char *class = view_get_class(view); const char *class = view_get_class(view);
const char *instance = view_get_instance(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 title_len = title ? strlen(title) : 0;
size_t app_id_len = app_id ? strlen(app_id) : 0; size_t app_id_len = app_id ? strlen(app_id) : 0;
size_t class_len = class ? strlen(class) : 0; size_t class_len = class ? strlen(class) : 0;