mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: add move_to_front to struct view_impl

Browse source 
...to increase xwayland and xdg-shell encapsulation and to avoid passing a
function pointer as an argument in `xwayland_move_sub_views_to_front()`
which is inconsistent with labwc design patterns.

Rename view-impl.c to view-impl-common.c

Move function declarations that are common to view-implementations from
view.h into view-impl-common.h
This commit is contained in:
Johan Malm 2023-02-05 19:29:24 +00:00 • committed by Johan Malm
parent 440372c2da
commit b8ec5a3e2e
10 changed files with 74 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/xwayland.c
View file

@ -8,6 +8,7 @@
#include "node.h"
#include "ssd.h"
#include "view.h"
#include "view-impl-common.h"
#include "workspaces.h"
#include "xwayland.h"
@ -57,40 +58,6 @@ top_parent_of(struct view *view)
return s;
}
void
xwayland_move_sub_views_to_front(struct view *parent,
void (*move_to_front)(struct view *view))
{
assert(parent);
assert(move_to_front);
if (parent->type != LAB_XWAYLAND_VIEW) {
return;
}
struct wlr_xwayland_surface *parent_xwayland_surface =
xwayland_surface_from_view(parent);
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 */
}
}
static struct xwayland_view *
xwayland_view_from_view(struct view *view)
{
@ -545,6 +512,44 @@ maximize(struct view *view, bool maximized)
maximized);
}
static void
move_sub_views_to_front(struct view *parent)
{
assert(parent);
if (parent->type != LAB_XWAYLAND_VIEW) {
return;
}
struct wlr_xwayland_surface *parent_xwayland_surface =
xwayland_surface_from_view(parent);
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;
}
view_impl_move_to_front(view);
}
}
static void
move_to_front(struct view *view)
{
view_impl_move_to_front(view);
move_sub_views_to_front(view);
}
static void
set_activated(struct view *view, bool activated)
{
@ -584,7 +589,8 @@ static const struct view_impl xwl_view_impl = {
.set_activated = set_activated,
.set_fullscreen = set_fullscreen,
.unmap = unmap,
.maximize = maximize
.maximize = maximize,
.move_to_front = move_to_front,
};
static void