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

rename container_for_each_descendent

This commit is contained in:
Tony Crisci 2018-03-29 23:08:59 -04:00
parent 4c394a0e9e
commit 92c58b1e63
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ struct sway_container *container_at(struct sway_container *parent,
/** /**
* Apply the function for each child of the container breadth first. * Apply the function for each child of the container breadth first.
*/ */
void container_for_each(struct sway_container *container, void container_for_each_descendent(struct sway_container *container,
void (*f)(struct sway_container *container, void *data), void *data); void (*f)(struct sway_container *container, void *data), void *data);
#endif #endif

2
sway/criteria.c
View File

@ -435,7 +435,7 @@ list_t *container_for_crit_tokens(list_t *tokens) {
struct list_tokens list_tokens = struct list_tokens list_tokens =
(struct list_tokens){create_list(), tokens}; (struct list_tokens){create_list(), tokens};
container_for_each(&root_container, container_for_each_descendent(&root_container,
(void (*)(struct sway_container *, void *))container_match_add, (void (*)(struct sway_container *, void *))container_match_add,
&list_tokens); &list_tokens);

2
sway/input/seat.c
View File

@ -130,7 +130,7 @@ struct sway_seat *sway_seat_create(struct sway_input_manager *input,
// init the focus stack // init the focus stack
wl_list_init(&seat->focus_stack); wl_list_init(&seat->focus_stack);
container_for_each(&root_container, collect_focus_iter, seat); container_for_each_descendent(&root_container, collect_focus_iter, seat);
wl_signal_add(&root_container.sway_root->events.new_container, wl_signal_add(&root_container.sway_root->events.new_container,
&seat->new_container); &seat->new_container);

6
sway/tree/container.c
View File

@ -154,7 +154,7 @@ struct sway_container *container_output_create(
struct sway_container *container_workspace_create( struct sway_container *container_workspace_create(
struct sway_container *output, const char *name) { struct sway_container *output, const char *name) {
if (!sway_assert(output, if (!sway_assert(output,
"container_workspace_create called with null output")) { "container_workspace_create called with null output")) {
return NULL; return NULL;
} }
wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name); wlr_log(L_DEBUG, "Added workspace %s for output %s", name, output->name);
@ -178,7 +178,7 @@ struct sway_container *container_workspace_create(
struct sway_container *container_view_create(struct sway_container *sibling, struct sway_container *container_view_create(struct sway_container *sibling,
struct sway_view *sway_view) { struct sway_view *sway_view) {
if (!sway_assert(sibling, if (!sway_assert(sibling,
"container_view_create called with NULL sibling/parent")) { "container_view_create called with NULL sibling/parent")) {
return NULL; return NULL;
} }
const char *title = view_get_title(sway_view); const char *title = view_get_title(sway_view);
@ -400,7 +400,7 @@ struct sway_container *container_at(struct sway_container *parent,
return NULL; return NULL;
} }
void container_for_each(struct sway_container *con, void container_for_each_descendent(struct sway_container *con,
void (*f)(struct sway_container *con, void *data), void *data) { void (*f)(struct sway_container *con, void *data), void *data) {
list_t *queue = get_bfs_queue(); list_t *queue = get_bfs_queue();
if (!queue) { if (!queue) {

2
sway/tree/layout.c
View File

@ -592,7 +592,7 @@ static struct sway_container *get_swayc_in_direction_under(
} }
} else { } else {
wlr_log(L_DEBUG, wlr_log(L_DEBUG,
"%s cont %d-%p dir %i sibling %d: %p", __func__, idx, "cont %d-%p dir %i sibling %d: %p", idx,
container, dir, desired, parent->children->items[desired]); container, dir, desired, parent->children->items[desired]);
return parent->children->items[desired]; return parent->children->items[desired];
} }

2
sway/tree/view.c
View File

@ -45,7 +45,7 @@ void view_set_size(struct sway_view *view, int width, int height) {
} }
} }
// TODO make view coordinates // TODO make view coordinates in layout coordinates
void view_set_position(struct sway_view *view, double ox, double oy) { void view_set_position(struct sway_view *view, double ox, double oy) {
if (view->iface.set_position) { if (view->iface.set_position) {
struct wlr_box box = { struct wlr_box box = {