mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-31 22:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop: handle minimized views better

Browse source
This commit is contained in:
Johan Malm 2020-09-14 17:35:44 +01:00
parent 00a48f83a2
commit c90923a20c
1 changed files with 19 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/desktop.c
View file

@ -42,28 +42,18 @@ static void set_activated(struct wlr_surface *surface, bool activated)
if (!surface) if (!surface)
return; return;
if (wlr_surface_is_xdg_surface(surface)) { if (wlr_surface_is_xdg_surface(surface)) {
struct wlr_xdg_surface *previous; struct wlr_xdg_surface *s;
previous = wlr_xdg_surface_from_wlr_surface(surface); s = wlr_xdg_surface_from_wlr_surface(surface);
wlr_xdg_toplevel_set_activated(previous, activated); wlr_xdg_toplevel_set_activated(s, activated);
} else { } else if (wlr_surface_is_xwayland_surface(surface)) {
struct wlr_xwayland_surface *previous; struct wlr_xwayland_surface *s;
previous = wlr_xwayland_surface_from_wlr_surface(surface); s = wlr_xwayland_surface_from_wlr_surface(surface);
wlr_xwayland_surface_activate(previous, activated); wlr_xwayland_surface_activate(s, activated);
} }
} }
void desktop_focus_view(struct view *view) static void focus_view(struct view *view)
{ {
/* Note: this function only deals with keyboard focus. */
if (!view)
return;
/* TODO: messy - sort out */
if (!view->mapped && view->minimized) {
view_unminimize(view);
return;
}
struct server *server = view->server; struct server *server = view->server;
struct wlr_seat *seat = server->seat; struct wlr_seat *seat = server->seat;
struct wlr_surface *prev_surface; struct wlr_surface *prev_surface;
@ -72,14 +62,6 @@ void desktop_focus_view(struct view *view)
/* Don't re-focus an already focused surface. */ /* Don't re-focus an already focused surface. */
return; return;
} }
if (view->type == LAB_XWAYLAND_VIEW) {
/* Don't focus on menus, etc */
move_to_front(view);
if (!wlr_xwayland_or_surface_wants_focus(
view->xwayland_surface)) {
return;
}
}
if (prev_surface) if (prev_surface)
set_activated(seat->keyboard_state.focused_surface, false); set_activated(seat->keyboard_state.focused_surface, false);
@ -93,11 +75,21 @@ void desktop_focus_view(struct view *view)
move_xwayland_sub_views_to_front(view); move_xwayland_sub_views_to_front(view);
} }
void desktop_focus_view(struct view *view)
{
if (!view)
return;
if (view->minimized)
view_unminimize(view); /* this will unmap+focus */
else if (view->mapped)
focus_view(view);
}
/* /*
* Some xwayland apps produce unmapped surfaces on startup and also leave * Some xwayland apps produce unmapped surfaces on startup and also leave
* some unmapped surfaces kicking around on 'close' (for example * leafpad's * some unmapped surfaces kicking around on 'close' (for example * leafpad's
* "about" dialogue). Whilst this is not normally a problem, we have to be * "about" dialogue). Whilst this is not normally a problem, we have to be
* careful when cycling between views. The only view's we should focus are * careful when cycling between views. The only views we should focus are
* those that are already mapped and those that have been minimized. * those that are already mapped and those that have been minimized.
*/ */
static bool isfocusable(struct view *view) static bool isfocusable(struct view *view)