mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fast search for swayc_by_handle

Browse source
This commit is contained in:
Nicolas Cornu 2016-10-18 10:10:17 +02:00
parent 51d7091874
commit e67a06b8b1
1 changed files with 55 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
sway/container.c
View file

@ -19,6 +19,47 @@
sway_assert (PTR, #PTR "must be non-null") sway_assert (PTR, #PTR "must be non-null")
struct containers_by_handle_element {
wlc_handle handle;
swayc_t *cont;
};
static int compare_wlc_handle_qsort(const void *handle1, const void *handle2) {
return (*(const struct containers_by_handle_element**)handle1)->handle - (*(const struct containers_by_handle_element**)handle2)->handle;
}
static int compare_wlc_handle_bsearch(const void *handle1, const void *handle2) {
return ((struct containers_by_handle_element*)handle1)->handle - (*(const struct containers_by_handle_element**)handle2)->handle;
}
static list_t *containers_by_handle_pointer() {
static list_t *containers = NULL;
if (containers == NULL) {
containers = create_list();
}
return containers;
}
static void containers_by_handle_add_container(wlc_handle handle, swayc_t *cont) {
list_t *containers = containers_by_handle_pointer();
struct containers_by_handle_element *elem = malloc(sizeof(struct containers_by_handle_element));
elem->handle = handle;
elem->cont = cont;
list_add(containers, elem);
list_qsort(containers, &compare_wlc_handle_qsort);
}
static void containers_by_handle_rm_container(wlc_handle handle) {
list_t *containers = containers_by_handle_pointer();
struct containers_by_handle_element elem;
elem.handle = handle;
int index = list_binary_find(containers, &compare_wlc_handle_bsearch, &elem, sizeof(struct containers_by_handle_element));
if (index != -1) {
free(containers->items[index]);
list_del(containers, index);
}
}
static swayc_t *new_swayc(enum swayc_types type) { static swayc_t *new_swayc(enum swayc_types type) {
// next id starts at 1 because 0 is assigned to root_container in layout.c // next id starts at 1 because 0 is assigned to root_container in layout.c
static size_t next_id = 1; static size_t next_id = 1;
@ -158,6 +199,8 @@ swayc_t *new_output(wlc_handle handle) {
output->unmanaged = create_list(); output->unmanaged = create_list();
output->bg_pid = 0; output->bg_pid = 0;
containers_by_handle_add_container(handle, output);
apply_output_config(oc, output); apply_output_config(oc, output);
add_child(&root_container, output); add_child(&root_container, output);
load_swaybars(); load_swaybars();
@ -281,6 +324,9 @@ swayc_t *new_view(swayc_t *sibling, wlc_handle handle) {
} }
const char *title = wlc_view_get_title(handle); const char *title = wlc_view_get_title(handle);
swayc_t *view = new_swayc(C_VIEW); swayc_t *view = new_swayc(C_VIEW);
containers_by_handle_add_container(handle, view);
sway_log(L_DEBUG, "Adding new view %" PRIuPTR ":%s to container %p %d", sway_log(L_DEBUG, "Adding new view %" PRIuPTR ":%s to container %p %d",
handle, title, sibling, sibling ? sibling->type : 0); handle, title, sibling, sibling ? sibling->type : 0);
// Setup values // Setup values
@ -423,6 +469,7 @@ swayc_t *destroy_output(swayc_t *output) {
} }
} }
sway_log(L_DEBUG, "OUTPUT: Destroying output '%" PRIuPTR "'", output->handle); sway_log(L_DEBUG, "OUTPUT: Destroying output '%" PRIuPTR "'", output->handle);
containers_by_handle_rm_container(output->handle);
free_swayc(output); free_swayc(output);
update_root_geometry(); update_root_geometry();
return &root_container; return &root_container;
@ -490,6 +537,7 @@ swayc_t *destroy_view(swayc_t *view) {
} }
sway_log(L_DEBUG, "Destroying view '%p'", view); sway_log(L_DEBUG, "Destroying view '%p'", view);
swayc_t *parent = view->parent; swayc_t *parent = view->parent;
containers_by_handle_rm_container(view->handle);
free_swayc(view); free_swayc(view);
// Destroy empty containers // Destroy empty containers
@ -593,40 +641,14 @@ swayc_t *swayc_focus_by_layout(swayc_t *container, enum swayc_layouts layout) {
return container; return container;
} }
static swayc_t *_swayc_by_handle_helper(wlc_handle handle, swayc_t *parent) {
if (!parent || !parent->children) {
return NULL;
}
int i, len;
swayc_t **child;
if (parent->type == C_WORKSPACE) {
len = parent->floating->length;
child = (swayc_t **)parent->floating->items;
for (i = 0; i < len; ++i, ++child) {
if ((*child)->handle == handle) {
return *child;
}
}
}
len = parent->children->length;
child = (swayc_t**)parent->children->items;
for (i = 0; i < len; ++i, ++child) {
if ((*child)->handle == handle) {
return *child;
} else {
swayc_t *res;
if ((res = _swayc_by_handle_helper(handle, *child))) {
return res;
}
}
}
return NULL;
}
swayc_t *swayc_by_handle(wlc_handle handle) { swayc_t *swayc_by_handle(wlc_handle handle) {
return _swayc_by_handle_helper(handle, &root_container); list_t *containers = containers_by_handle_pointer();
struct containers_by_handle_element elem;
elem.handle = handle;
struct containers_by_handle_element **cont = list_bsearch(containers, &compare_wlc_handle_bsearch, &elem);
if (cont != NULL)
return (*cont)->cont;
return NULL;
} }
swayc_t *swayc_active_output(void) { swayc_t *swayc_active_output(void) {