mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-29 06:46:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Direct implementation

Browse source
This commit is contained in:
Ryan Dwyer 2018-08-15 22:42:56 +10:00
parent 48ed3cfcf6
commit 748c22e87a
1 changed files with 50 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

100
sway/input/seat.c
View file

@ -138,31 +138,21 @@ void seat_focus_inactive_children_for_each(struct sway_seat *seat,
} }
} }
static struct sway_container *seat_get_focus_inactive_callback( struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
struct sway_seat *seat, struct sway_container *ancestor) {
bool (*callback)(struct sway_container *con, void *data), void *data) { if (ancestor->type == C_VIEW) {
return ancestor;
}
struct sway_seat_container *current; struct sway_seat_container *current;
wl_list_for_each(current, &seat->focus_stack, link) { wl_list_for_each(current, &seat->focus_stack, link) {
if (callback(current->container, data)) { struct sway_container *con = current->container;
return current->container; if (con->type == C_VIEW && container_has_ancestor(con, ancestor)) {
return con;
} }
} }
return NULL; return NULL;
} }
static bool impl_focus_inactive_view(struct sway_container *con, void *data) {
struct sway_container *ancestor = data;
return con->type == C_VIEW && container_has_ancestor(con, ancestor);
}
struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
struct sway_container *container) {
if (container->type == C_VIEW) {
return container;
}
return seat_get_focus_inactive_callback(seat, impl_focus_inactive_view, container);
}
static void handle_seat_container_destroy(struct wl_listener *listener, static void handle_seat_container_destroy(struct wl_listener *listener,
void *data) { void *data) {
struct sway_seat_container *seat_con = struct sway_seat_container *seat_con =
@ -859,11 +849,6 @@ void seat_set_exclusive_client(struct sway_seat *seat,
seat->exclusive_client = client; seat->exclusive_client = client;
} }
static bool impl_focus_inactive(struct sway_container *con, void *data) {
struct sway_container *ancestor = data;
return container_has_ancestor(con, ancestor);
}
struct sway_container *seat_get_focus_inactive(struct sway_seat *seat, struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
struct sway_container *con) { struct sway_container *con) {
if (con->type == C_WORKSPACE && !con->children->length && if (con->type == C_WORKSPACE && !con->children->length &&
@ -873,38 +858,46 @@ struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
if (con->type == C_VIEW) { if (con->type == C_VIEW) {
return con; return con;
} }
return seat_get_focus_inactive_callback(seat, impl_focus_inactive, con); struct sway_seat_container *current;
} wl_list_for_each(current, &seat->focus_stack, link) {
if (container_has_ancestor(current->container, con)) {
static bool impl_focus_inactive_tiling(struct sway_container *con, void *data) { return current->container;
struct sway_container *ancestor = data; }
return con->layout != L_FLOATING && container_has_ancestor(con, ancestor) }
&& !container_is_floating_or_child(con); return NULL;
} }
struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat, struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat,
struct sway_container *container) { struct sway_container *ancestor) {
if (container->type == C_WORKSPACE && !container->children->length) { if (ancestor->type == C_WORKSPACE && !ancestor->children->length) {
return container; return ancestor;
} }
return seat_get_focus_inactive_callback(seat, struct sway_seat_container *current;
impl_focus_inactive_tiling, container); wl_list_for_each(current, &seat->focus_stack, link) {
} struct sway_container *con = current->container;
if (con->layout != L_FLOATING && !container_is_floating_or_child(con) &&
static bool impl_focus_inactive_floating(struct sway_container *con, void *data) { container_has_ancestor(current->container, ancestor)) {
struct sway_container *ancestor = data; return con;
return con->layout != L_FLOATING && container_has_ancestor(con, ancestor) }
&& container_is_floating_or_child(con); }
return NULL;
} }
struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat, struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
struct sway_container *container) { struct sway_container *ancestor) {
if (container->type == C_WORKSPACE && if (ancestor->type == C_WORKSPACE &&
!container->sway_workspace->floating->children->length) { !ancestor->sway_workspace->floating->children->length) {
return NULL; return NULL;
} }
return seat_get_focus_inactive_callback(seat, struct sway_seat_container *current;
impl_focus_inactive_floating, container); wl_list_for_each(current, &seat->focus_stack, link) {
struct sway_container *con = current->container;
if (con->layout != L_FLOATING && container_is_floating_or_child(con) &&
container_has_ancestor(current->container, ancestor)) {
return con;
}
}
return NULL;
} }
static bool impl_focus_active_child(struct sway_container *con, void *data) { static bool impl_focus_active_child(struct sway_container *con, void *data) {
@ -913,11 +906,18 @@ static bool impl_focus_active_child(struct sway_container *con, void *data) {
} }
struct sway_container *seat_get_active_child(struct sway_seat *seat, struct sway_container *seat_get_active_child(struct sway_seat *seat,
struct sway_container *con) { struct sway_container *parent) {
if (con->type == C_VIEW) { if (parent->type == C_VIEW) {
return con; return parent;
} }
return seat_get_focus_inactive_callback(seat, impl_focus_active_child, con); struct sway_seat_container *current;
wl_list_for_each(current, &seat->focus_stack, link) {
struct sway_container *con = current->container;
if (con->parent == parent && con->layout != L_FLOATING) {
return con;
}
}
return NULL;
} }
struct sway_container *seat_get_focus(struct sway_seat *seat) { struct sway_container *seat_get_focus(struct sway_seat *seat) {