mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-03-21 05:33:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ForEach: initialize view query window_type correctly

Browse source 
Before this patch, the window type would be checked even if
not actually requested to do so.

Fixes: #1852
This commit is contained in:
Consolatis 2024-05-27 19:55:16 +02:00 • committed by Johan Malm
parent 95e4c0d8d7
commit 6f3f2aae27
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
include/view.h
View file

@ -305,6 +305,13 @@ enum lab_view_criteria {
*/ */
struct view *view_from_wlr_surface(struct wlr_surface *surface); struct view *view_from_wlr_surface(struct wlr_surface *surface);
/**
* view_query_create() - Create a new heap allocated view query with
* all members initialized to their default values (window_type = -1,
* NULL for strings)
*/
struct view_query *view_query_create(void);
/** /**
* view_query_free() - Free a given view query * view_query_free() - Free a given view query
* @query: Query to be freed. * @query: Query to be freed.

2
src/config/rcxml.c
View file

@ -313,7 +313,7 @@ fill_action_query(char *nodename, char *content, struct action *action)
action_arg_add_querylist(action, "query"); action_arg_add_querylist(action, "query");
queries = action_get_querylist(action, "query"); queries = action_get_querylist(action, "query");
} }
current_view_query = znew(*current_view_query); current_view_query = view_query_create();
wl_list_append(queries, &current_view_query->link); wl_list_append(queries, &current_view_query->link);
} }

8
src/view.c
View file

@ -53,6 +53,14 @@ view_from_wlr_surface(struct wlr_surface *surface)
return NULL; return NULL;
} }
struct view_query *
view_query_create(void)
{
struct view_query *query = znew(*query);
query->window_type = -1;
return query;
}
void void
view_query_free(struct view_query *query) view_query_free(struct view_query *query)
{ {