struct wlr_xwayland_surface *xsurface);
void view_init_position(struct view *view);
+
/**
* view_get_surface_geometry - geometry relative to view
* @view: toplevel containing the surface to process
void view_resize(struct view *view, struct wlr_box geo);
void view_minimize(struct view *view);
void view_unminimize(struct view *view);
-void view_focus(struct view *view);
-struct view *view_next(struct server *server, struct view *current);
bool view_hasfocus(struct view *view);
-struct view *view_at(struct server *server, double lx, double ly,
- struct wlr_surface **surface, double *sx, double *sy,
- int *view_area);
+
+void desktop_focus_view(struct view *view);
+
+/**
+ * desktop_next_view - return next view
+ * @current: view used as reference point for defining 'next'
+ * Note: If current==NULL, the list's second view is returned
+ */
+struct view *desktop_next_view(struct server *server, struct view *current);
+struct view *desktop_view_at(struct server *server, double lx, double ly,
+ struct wlr_surface **surface, double *sx,
+ double *sy, int *view_area);
void seat_init(struct wlr_seat *seat);
void seat_focus_surface(struct wlr_surface *surface);
if (!strcasecmp(keybind->action, "Exit")) {
wl_display_terminate(server->wl_display);
} else if (!strcasecmp(keybind->action, "NextWindow")) {
- server->cycle_view = view_next(server, server->cycle_view);
+ server->cycle_view =
+ desktop_next_view(server, server->cycle_view);
} else if (!strcasecmp(keybind->action, "Execute")) {
spawn_async_no_shell(keybind->command);
} else if (!strcasecmp(keybind->action, "debug-views")) {
struct wlr_seat *seat = server->seat;
struct wlr_surface *surface = NULL;
int view_area;
- struct view *view = view_at(server, server->cursor->x,
+ struct view *view = desktop_view_at(server, server->cursor->x,
server->cursor->y, &surface, &sx, &sy,
&view_area);
if (!view) {
double sx, sy;
struct wlr_surface *surface;
int view_area;
- struct view *view = view_at(server, server->cursor->x,
+ struct view *view = desktop_view_at(server, server->cursor->x,
server->cursor->y, &surface, &sx, &sy,
&view_area);
if (event->state == WLR_BUTTON_RELEASED) {
server->cursor_mode = LAB_CURSOR_PASSTHROUGH;
} else {
/* Focus that client if the button was _pressed_ */
- view_focus(view);
+ desktop_focus_view(view);
switch (view_area) {
case LAB_DECO_BUTTON_CLOSE:
view->impl->close(view);
--- /dev/null
+#include "labwc.h"
+#include "common/bug-on.h"
+
+static void move_to_front(struct view *view)
+{
+ wl_list_remove(&view->link);
+ wl_list_insert(&view->server->views, &view->link);
+}
+
+static struct wlr_xwayland_surface *top_parent_of(struct view *view)
+{
+ struct wlr_xwayland_surface *s = view->xwayland_surface;
+ while (s->parent)
+ s = s->parent;
+ return s;
+}
+
+static void move_xwayland_sub_views_to_front(struct view *parent)
+{
+ if (!parent || parent->type != LAB_XWAYLAND_VIEW)
+ return;
+ struct view *view, *next;
+ wl_list_for_each_reverse_safe(view, next, &parent->server->views, link)
+ {
+ /* need to stop here, otherwise loops keeps going forever */
+ if (view == parent)
+ break;
+ if (view->type != LAB_XWAYLAND_VIEW)
+ continue;
+ if (!view->mapped && !view->minimized)
+ continue;
+ if (top_parent_of(view) != parent->xwayland_surface)
+ continue;
+ move_to_front(view);
+ /* TODO: we should probably focus on these too here */
+ }
+}
+
+/* Activate/deactivate toplevel surface */
+static void set_activated(struct wlr_surface *surface, bool activated)
+{
+ if (!surface)
+ return;
+ if (wlr_surface_is_xdg_surface(surface)) {
+ struct wlr_xdg_surface *previous;
+ previous = wlr_xdg_surface_from_wlr_surface(surface);
+ wlr_xdg_toplevel_set_activated(previous, activated);
+ } else {
+ struct wlr_xwayland_surface *previous;
+ previous = wlr_xwayland_surface_from_wlr_surface(surface);
+ wlr_xwayland_surface_activate(previous, activated);
+ }
+}
+
+void desktop_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 wlr_seat *seat = server->seat;
+ struct wlr_surface *prev_surface;
+ prev_surface = seat->keyboard_state.focused_surface;
+ if (prev_surface == view->surface) {
+ /* Don't re-focus an already focused surface. */
+ 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)
+ set_activated(seat->keyboard_state.focused_surface, false);
+
+ move_to_front(view);
+ set_activated(view->surface, true);
+ struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat);
+ wlr_seat_keyboard_notify_enter(seat, view->surface, keyboard->keycodes,
+ keyboard->num_keycodes,
+ &keyboard->modifiers);
+
+ move_xwayland_sub_views_to_front(view);
+}
+
+/*
+ * Some xwayland apps produce unmapped surfaces on startup and also leave
+ * some unmapped surfaces kicking around on 'close' (for example * leafpad's
+ * "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
+ * those that are already mapped and those that have been minimized.
+ */
+static bool isfocusable(struct view *view)
+{
+ /* filter out those xwayland surfaces that have never been mapped */
+ if (!view->surface)
+ return false;
+ return (view->mapped || view->minimized);
+}
+
+static int has_focusable_view(struct wl_list *wl_list)
+{
+ struct view *view;
+ wl_list_for_each (view, wl_list, link) {
+ if (isfocusable(view))
+ return true;
+ }
+ return false;
+}
+
+static struct view *first_view(struct server *server)
+{
+ struct view *view;
+ view = wl_container_of(server->views.next, view, link);
+ return view;
+}
+
+struct view *desktop_next_view(struct server *server, struct view *current)
+{
+ if (!has_focusable_view(&server->views))
+ return NULL;
+
+ struct view *view = current ? current : first_view(server);
+
+ /* Replacement for wl_list_for_each_from() */
+ do {
+ view = wl_container_of(view->link.next, view, link);
+ } while (&view->link == &server->views || !isfocusable(view));
+ return view;
+}
+
+static bool _view_at(struct view *view, double lx, double ly,
+ struct wlr_surface **surface, double *sx, double *sy)
+{
+ /*
+ * XDG toplevels may have nested surfaces, such as popup windows for
+ * context menus or tooltips. This function tests if any of those are
+ * underneath the coordinates lx and ly (in output Layout Coordinates).
+ * If so, it sets the surface pointer to that wlr_surface and the sx and
+ * sy coordinates to the coordinates relative to that surface's top-left
+ * corner.
+ */
+ double view_sx = lx - view->x;
+ double view_sy = ly - view->y;
+ double _sx, _sy;
+ struct wlr_surface *_surface = NULL;
+
+ switch (view->type) {
+ case LAB_XDG_SHELL_VIEW:
+ _surface = wlr_xdg_surface_surface_at(
+ view->xdg_surface, view_sx, view_sy, &_sx, &_sy);
+ break;
+ case LAB_XWAYLAND_VIEW:
+ if (!view->xwayland_surface->surface)
+ return false;
+ _surface =
+ wlr_surface_surface_at(view->xwayland_surface->surface,
+ view_sx, view_sy, &_sx, &_sy);
+ break;
+ }
+
+ if (_surface) {
+ *sx = _sx;
+ *sy = _sy;
+ *surface = _surface;
+ return true;
+ }
+ return false;
+}
+
+struct view *desktop_view_at(struct server *server, double lx, double ly,
+ struct wlr_surface **surface, double *sx,
+ double *sy, int *view_area)
+{
+ /*
+ * This iterates over all of our surfaces and attempts to find one under
+ * the cursor. It relies on server->views being ordered from
+ * top-to-bottom.
+ */
+ struct view *view;
+ wl_list_for_each (view, &server->views, link) {
+ if (!view->mapped)
+ continue;
+ if (_view_at(view, lx, ly, surface, sx, sy))
+ return view;
+ if (!view->show_server_side_deco)
+ continue;
+ *view_area = deco_at(view, lx, ly);
+ if (*view_area != LAB_DECO_NONE)
+ return view;
+ }
+ return NULL;
+}
if ((syms[0] == XKB_KEY_Alt_L) &&
event->state == WLR_KEY_RELEASED) {
/* end cycle */
- view_focus(server->cycle_view);
+ desktop_focus_view(server->cycle_view);
server->cycle_view = NULL;
} else if (event->state == WLR_KEY_PRESSED) {
/* cycle to next */
- server->cycle_view = view_next(server,
- server->cycle_view);
+ server->cycle_view =
+ desktop_next_view(server, server->cycle_view);
return;
}
}
'cursor.c',
'dbg.c',
'deco.c',
+ 'desktop.c',
'interactive.c',
'keyboard.c',
'main.c',
view->impl->map(view);
}
-static void move_to_front(struct view *view)
-{
- wl_list_remove(&view->link);
- wl_list_insert(&view->server->views, &view->link);
-}
-
-/* Activate/deactivate toplevel surface */
-static void set_activated(struct wlr_surface *surface, bool activated)
-{
- if (!surface)
- return;
- if (wlr_surface_is_xdg_surface(surface)) {
- struct wlr_xdg_surface *previous;
- previous = wlr_xdg_surface_from_wlr_surface(surface);
- wlr_xdg_toplevel_set_activated(previous, activated);
- } else {
- struct wlr_xwayland_surface *previous;
- previous = wlr_xwayland_surface_from_wlr_surface(surface);
- wlr_xwayland_surface_activate(previous, activated);
- }
-}
-
bool view_hasfocus(struct view *view)
{
if (!view || !view->surface)
struct wlr_seat *seat = view->server->seat;
return (view->surface == seat->keyboard_state.focused_surface);
}
-
-static struct wlr_xwayland_surface *top_parent_of(struct view *view)
-{
- struct wlr_xwayland_surface *s = view->xwayland_surface;
- while (s->parent)
- s = s->parent;
- return s;
-}
-
-static void move_xwayland_sub_views_to_front(struct view *parent)
-{
- if (!parent || parent->type != LAB_XWAYLAND_VIEW)
- return;
- struct view *view, *next;
- wl_list_for_each_reverse_safe(view, next, &parent->server->views, link)
- {
- /* need to stop here, otherwise loops keeps going forever */
- if (view == parent)
- break;
- if (view->type != LAB_XWAYLAND_VIEW)
- continue;
- if (!view->mapped && !view->minimized)
- continue;
- if (top_parent_of(view) != parent->xwayland_surface)
- continue;
- move_to_front(view);
- /* TODO: we should probably focus on these too here */
- }
-}
-
-void view_focus(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 wlr_seat *seat = server->seat;
- struct wlr_surface *prev_surface;
- prev_surface = seat->keyboard_state.focused_surface;
- if (prev_surface == view->surface) {
- /* Don't re-focus an already focused surface. */
- 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)
- set_activated(seat->keyboard_state.focused_surface, false);
-
- move_to_front(view);
- set_activated(view->surface, true);
- struct wlr_keyboard *keyboard = wlr_seat_get_keyboard(seat);
- wlr_seat_keyboard_notify_enter(seat, view->surface, keyboard->keycodes,
- keyboard->num_keycodes,
- &keyboard->modifiers);
-
- move_xwayland_sub_views_to_front(view);
-}
-
-static struct view *first_view(struct server *server)
-{
- struct view *view;
- view = wl_container_of(server->views.next, view, link);
- return view;
-}
-
-/*
- * Some xwayland apps produce unmapped surfaces on startup and also leave
- * some unmapped surfaces kicking around on 'close' (for example * leafpad's
- * "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
- * those that are already mapped and those that have been minimized.
- */
-static bool isfocusable(struct view *view)
-{
- /* filter out those xwayland surfaces that have never been mapped */
- if (!view->surface)
- return false;
- return (view->mapped || view->minimized);
-}
-
-static int has_focusable_view(struct wl_list *wl_list)
-{
- struct view *view;
- wl_list_for_each (view, wl_list, link) {
- if (isfocusable(view))
- return true;
- }
- return false;
-}
-
-/**
- * view_next - return next view
- * @current: view used as reference point for defining 'next'
- * Note: If @current=NULL, the list's second view is returned
- */
-struct view *view_next(struct server *server, struct view *current)
-{
- if (!has_focusable_view(&server->views))
- return NULL;
-
- struct view *view = current ? current : first_view(server);
-
- /* Replacement for wl_list_for_each_from() */
- do {
- view = wl_container_of(view->link.next, view, link);
- } while (&view->link == &server->views || !isfocusable(view));
- return view;
-}
-
-static bool _view_at(struct view *view, double lx, double ly,
- struct wlr_surface **surface, double *sx, double *sy)
-{
- /*
- * XDG toplevels may have nested surfaces, such as popup windows for
- * context menus or tooltips. This function tests if any of those are
- * underneath the coordinates lx and ly (in output Layout Coordinates).
- * If so, it sets the surface pointer to that wlr_surface and the sx and
- * sy coordinates to the coordinates relative to that surface's top-left
- * corner.
- */
- double view_sx = lx - view->x;
- double view_sy = ly - view->y;
- double _sx, _sy;
- struct wlr_surface *_surface = NULL;
-
- switch (view->type) {
- case LAB_XDG_SHELL_VIEW:
- _surface = wlr_xdg_surface_surface_at(
- view->xdg_surface, view_sx, view_sy, &_sx, &_sy);
- break;
- case LAB_XWAYLAND_VIEW:
- if (!view->xwayland_surface->surface)
- return false;
- _surface =
- wlr_surface_surface_at(view->xwayland_surface->surface,
- view_sx, view_sy, &_sx, &_sy);
- break;
- }
-
- if (_surface) {
- *sx = _sx;
- *sy = _sy;
- *surface = _surface;
- return true;
- }
- return false;
-}
-
-struct view *view_at(struct server *server, double lx, double ly,
- struct wlr_surface **surface, double *sx, double *sy,
- int *view_area)
-{
- /*
- * This iterates over all of our surfaces and attempts to find one under
- * the cursor. It relies on server->views being ordered from
- * top-to-bottom.
- */
- struct view *view;
- wl_list_for_each (view, &server->views, link) {
- if (!view->mapped)
- continue;
- if (_view_at(view, lx, ly, surface, sx, sy))
- return view;
- if (!view->show_server_side_deco)
- continue;
- *view_area = deco_at(view, lx, ly);
- if (*view_area != LAB_DECO_NONE)
- return view;
- }
- return NULL;
-}
wl_signal_add(&view->xdg_surface->surface->events.commit,
&view->commit);
view->commit.notify = handle_commit;
- view_focus(view);
+ desktop_focus_view(view);
}
static void xdg_toplevel_view_unmap(struct view *view)
{
view->mapped = false;
wl_list_remove(&view->commit.link);
- view_focus(view_next(view->server, view));
+ desktop_focus_view(desktop_next_view(view->server, view));
}
static const struct view_impl xdg_toplevel_view_impl = {
&view->commit);
view->commit.notify = handle_commit;
- view_focus(view);
+ desktop_focus_view(view);
}
static void unmap(struct view *view)
{
view->mapped = false;
wl_list_remove(&view->commit.link);
- view_focus(view_next(view->server, view));
+ desktop_focus_view(desktop_next_view(view->server, view));
}
static const struct view_impl xwl_view_impl = {
projects / proto / labwc.git / commitdiff