alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #830 from acrisci/feature/simplify-set-focus

Browse source 
Simplify focus setting
This commit is contained in:
Drew DeVault 2016-08-04 07:48:00 -04:00 committed by GitHub
parent 735f3d076e 81eb9ea12c
commit 5ec70458e5
3 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/border.h
View file

@ -22,7 +22,6 @@ void border_clear(struct border *border);
void update_container_border(swayc_t *container); void update_container_border(swayc_t *container);
void render_view_borders(wlc_handle view); void render_view_borders(wlc_handle view);
void map_update_view_border(swayc_t *view, void *data);
int get_font_text_height(const char *font); int get_font_text_height(const char *font);
bool should_hide_top_border(swayc_t *con, double y); bool should_hide_top_border(swayc_t *con, double y);

6
sway/border.c
View file

@ -415,12 +415,6 @@ void update_container_border(swayc_t *container) {
} }
} }
void map_update_view_border(swayc_t *view, void *data) {
if (view->type == C_VIEW) {
update_view_border(view);
}
}
void render_view_borders(wlc_handle view) { void render_view_borders(wlc_handle view) {
swayc_t *c = swayc_by_handle(view); swayc_t *c = swayc_by_handle(view);

23
sway/focus.c
View file

@ -29,8 +29,6 @@ static void update_focus(swayc_t *c) {
// Case where output changes // Case where output changes
case C_OUTPUT: case C_OUTPUT:
// update borders for views in prev
container_map(prev, map_update_view_border, NULL);
wlc_output_focus(c->handle); wlc_output_focus(c->handle);
break; break;
@ -54,8 +52,6 @@ static void update_focus(swayc_t *c) {
default: default:
case C_VIEW: case C_VIEW:
case C_CONTAINER: case C_CONTAINER:
// TODO whatever to do when container changes
// for example, stacked and tabbing change stuff.
break; break;
} }
} }
@ -110,18 +106,17 @@ bool set_focused_container(swayc_t *c) {
active_ws_child_count = active_ws->children->length + active_ws->floating->length; active_ws_child_count = active_ws->children->length + active_ws->floating->length;
} }
swayc_log(L_DEBUG, c, "Setting focus to %p:%" PRIuPTR, c, c->handle);
// Get workspace for c, get that workspaces current focused container.
swayc_t *workspace = swayc_active_workspace_for(c); swayc_t *workspace = swayc_active_workspace_for(c);
swayc_t *focused = get_focused_container(workspace); swayc_t *focused = get_focused_container(&root_container);
if (swayc_is_fullscreen(focused) && focused != c) { if (swayc_is_fullscreen(get_focused_container(workspace))) {
// if switching to a workspace with a fullscreen view, // if switching to a workspace with a fullscreen view,
// focus on the fullscreen view // focus on the fullscreen view
c = focused; c = get_focused_container(workspace);
} }
swayc_log(L_DEBUG, c, "Setting focus to %p:%" PRIuPTR, c, c->handle);
if (c->type == C_VIEW) { if (c->type == C_VIEW) {
// dispatch a window event // dispatch a window event
ipc_event_window(c, "focus"); ipc_event_window(c, "focus");
@ -139,7 +134,7 @@ bool set_focused_container(swayc_t *c) {
} }
// get new focused view and set focus to it. // get new focused view and set focus to it.
if (c->type == C_CONTAINER || (c->type == C_VIEW && !(wlc_view_get_type(p->handle) & WLC_BIT_POPUP))) { if (!(wlc_view_get_type(p->handle) & WLC_BIT_POPUP)) {
// unactivate previous focus // unactivate previous focus
if (focused->type == C_VIEW) { if (focused->type == C_VIEW) {
wlc_view_set_state(focused->handle, WLC_BIT_ACTIVATED, false); wlc_view_set_state(focused->handle, WLC_BIT_ACTIVATED, false);
@ -149,7 +144,7 @@ bool set_focused_container(swayc_t *c) {
if (c->type == C_VIEW) { if (c->type == C_VIEW) {
wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true);
} }
// set focus if view_focus is unlocked // set focus
wlc_view_focus(c->handle); wlc_view_focus(c->handle);
if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) {
update_container_border(c); update_container_border(c);
@ -161,10 +156,6 @@ bool set_focused_container(swayc_t *c) {
arrange_backgrounds(); arrange_backgrounds();
arrange_windows(parent, -1, -1); arrange_windows(parent, -1, -1);
} }
} else if (c->type == C_WORKSPACE) {
// remove previous focus if view_focus is unlocked
update_container_border(c);
wlc_view_focus(0);
} }
if (active_ws != workspace) { if (active_ws != workspace) {