diff options
| -rw-r--r-- | include/border.h | 1 | ||||
| -rw-r--r-- | sway/border.c | 6 | ||||
| -rw-r--r-- | sway/focus.c | 23 |
3 files changed, 7 insertions, 23 deletions
diff --git a/include/border.h b/include/border.h index b72dc5dc..c30c9da3 100644 --- a/include/border.h +++ b/include/border.h @@ -22,7 +22,6 @@ void border_clear(struct border *border); void update_container_border(swayc_t *container); 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); bool should_hide_top_border(swayc_t *con, double y); diff --git a/sway/border.c b/sway/border.c index 46343d61..304f8b87 100644 --- a/sway/border.c +++ b/sway/border.c @@ -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) { swayc_t *c = swayc_by_handle(view); diff --git a/sway/focus.c b/sway/focus.c index 6583f802..1ea88ad4 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -29,8 +29,6 @@ static void update_focus(swayc_t *c) { // Case where output changes case C_OUTPUT: - // update borders for views in prev - container_map(prev, map_update_view_border, NULL); wlc_output_focus(c->handle); break; @@ -54,8 +52,6 @@ static void update_focus(swayc_t *c) { default: case C_VIEW: case C_CONTAINER: - // TODO whatever to do when container changes - // for example, stacked and tabbing change stuff. break; } } @@ -110,18 +106,17 @@ bool set_focused_container(swayc_t *c) { 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 *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, // 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) { // dispatch a window event 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. - 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 if (focused->type == C_VIEW) { 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) { wlc_view_set_state(c->handle, WLC_BIT_ACTIVATED, true); } - // set focus if view_focus is unlocked + // set focus wlc_view_focus(c->handle); if (c->parent->layout != L_TABBED && c->parent->layout != L_STACKED) { update_container_border(c); @@ -161,10 +156,6 @@ bool set_focused_container(swayc_t *c) { arrange_backgrounds(); 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) { |