Place dock clients on the output corresponding to their geometry request
This commit is contained in:
parent
a33d869885
commit
35e79c87c8
|
@ -83,11 +83,11 @@ Con *con_by_window_id(xcb_window_t window);
|
|||
Con *con_by_frame_id(xcb_window_t frame);
|
||||
|
||||
/**
|
||||
* Returns the first container which wants to swallow this window
|
||||
* Returns the first container below 'con' which wants to swallow this window
|
||||
* TODO: priority
|
||||
*
|
||||
*/
|
||||
Con *con_for_window(i3Window *window, Match **store_match);
|
||||
Con *con_for_window(Con *con, i3Window *window, Match **store_match);
|
||||
|
||||
/**
|
||||
* Returns the number of children of this container.
|
||||
|
|
31
src/con.c
31
src/con.c
|
@ -365,24 +365,41 @@ Con *con_by_frame_id(xcb_window_t frame) {
|
|||
}
|
||||
|
||||
/*
|
||||
* Returns the first container which wants to swallow this window
|
||||
* Returns the first container below 'con' which wants to swallow this window
|
||||
* TODO: priority
|
||||
*
|
||||
*/
|
||||
Con *con_for_window(i3Window *window, Match **store_match) {
|
||||
Con *con;
|
||||
Con *con_for_window(Con *con, i3Window *window, Match **store_match) {
|
||||
Con *child;
|
||||
Match *match;
|
||||
DLOG("searching con for window %p\n", window);
|
||||
DLOG("searching con for window %p starting at con %p\n", window, con);
|
||||
DLOG("class == %s\n", window->class_class);
|
||||
|
||||
TAILQ_FOREACH(con, &all_cons, all_cons)
|
||||
TAILQ_FOREACH(match, &(con->swallow_head), matches) {
|
||||
TAILQ_FOREACH(child, &(con->nodes_head), nodes) {
|
||||
TAILQ_FOREACH(match, &(child->swallow_head), matches) {
|
||||
if (!match_matches_window(match, window))
|
||||
continue;
|
||||
if (store_match != NULL)
|
||||
*store_match = match;
|
||||
return con;
|
||||
return child;
|
||||
}
|
||||
Con *result = con_for_window(child, window, store_match);
|
||||
if (result != NULL)
|
||||
return result;
|
||||
}
|
||||
|
||||
TAILQ_FOREACH(child, &(con->floating_head), floating_windows) {
|
||||
TAILQ_FOREACH(match, &(child->swallow_head), matches) {
|
||||
if (!match_matches_window(match, window))
|
||||
continue;
|
||||
if (store_match != NULL)
|
||||
*store_match = match;
|
||||
return child;
|
||||
}
|
||||
Con *result = con_for_window(child, window, store_match);
|
||||
if (result != NULL)
|
||||
return result;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
12
src/manage.c
12
src/manage.c
|
@ -160,8 +160,18 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
|
|||
|
||||
/* TODO: assignments */
|
||||
/* TODO: two matches for one container */
|
||||
|
||||
/* See if any container swallows this new window */
|
||||
nc = con_for_window(cwindow, &match);
|
||||
Con *search_at = croot;
|
||||
if (cwindow->dock) {
|
||||
/* for dock windows, we start the search at the appropriate output */
|
||||
Output *output = get_output_containing(geom->x, geom->y);
|
||||
if (output != NULL) {
|
||||
DLOG("Starting search at output %s\n", output->name);
|
||||
search_at = output->con;
|
||||
}
|
||||
}
|
||||
nc = con_for_window(search_at, cwindow, &match);
|
||||
if (nc == NULL) {
|
||||
if (focused->type == CT_CON && con_accepts_window(focused)) {
|
||||
LOG("using current container, focused = %p, focused->name = %s\n",
|
||||
|
|
Loading…
Reference in New Issue