kitchen/kiwmi
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only render mapped surfaces

Browse source 
This targets only surfaces under kiwmi_view, thus only XDG shell. Other
surfaces to be fixed later.

The new code here is copied over from wlroots, with only small
modifications.
This commit is contained in:
tiosgz 2021-08-27 13:13:37 +00:00
parent 2b4d6d205b
commit 520dd5ce02
4 changed files with 99 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/desktop/view.h
View file

@ -71,9 +71,9 @@ struct kiwmi_view {
struct kiwmi_view_impl {
void (*close)(struct kiwmi_view *view);
void (*for_each_surface)(
void (*for_each_mapped_surface)(
struct kiwmi_view *view,
wlr_surface_iterator_func_t iterator,
wlr_surface_iterator_func_t callback,
void *user_data);
pid_t (*get_pid)(struct kiwmi_view *view);
void (
@ -133,9 +133,9 @@ struct kiwmi_request_resize_event {
};
void view_close(struct kiwmi_view *view);
void view_for_each_surface(
void view_for_each_mapped_surface(
struct kiwmi_view *view,
wlr_surface_iterator_func_t iterator,
wlr_surface_iterator_func_t callback,
void *user_data);
pid_t view_get_pid(struct kiwmi_view *view);
void view_get_size(struct kiwmi_view *view, uint32_t *width, uint32_t *height);

5
kiwmi/desktop/output.c
View file

@ -172,7 +172,8 @@ output_frame_notify(struct wl_listener *listener, void *data)
struct kiwmi_view *view;
wl_list_for_each (view, &desktop->views, link) {
view_for_each_surface(view, send_frame_done_to_surface, &now);
view_for_each_mapped_surface(
view, send_frame_done_to_surface, &now);
}
if (!wlr_output_attach_render(wlr_output, NULL)) {
@ -229,7 +230,7 @@ output_frame_notify(struct wl_listener *listener, void *data)
rdata.data = view;
wl_signal_emit(&view->events.pre_render, &rdata);
view_for_each_surface(view, render_surface, &rdata);
view_for_each_mapped_surface(view, render_surface, &rdata);
wl_signal_emit(&view->events.post_render, &rdata);
}

8
kiwmi/desktop/view.c
View file

@ -24,13 +24,13 @@ view_close(struct kiwmi_view *view)
}
void
view_for_each_surface(
view_for_each_mapped_surface(
struct kiwmi_view *view,
wlr_surface_iterator_func_t iterator,
wlr_surface_iterator_func_t callback,
void *user_data)
{
if (view->impl->for_each_surface) {
view->impl->for_each_surface(view, iterator, user_data);
if (view->impl->for_each_mapped_surface) {
view->impl->for_each_mapped_surface(view, callback, user_data);
}
}

85
kiwmi/desktop/xdg_shell.c
View file

@ -281,12 +281,87 @@ xdg_shell_view_close(struct kiwmi_view *view)
}
static void
xdg_shell_view_for_each_surface(
struct kiwmi_view *view,
wlr_surface_iterator_func_t iterator,
surface_for_each_mapped_surface(
struct wlr_surface *surface,
int x,
int y,
wlr_surface_iterator_func_t callback,
void *user_data)
{
wlr_xdg_surface_for_each_surface(view->xdg_surface, iterator, user_data);
struct wlr_subsurface *subsurface;
wl_list_for_each (subsurface, &surface->subsurfaces_below, parent_link) {
if (!subsurface->mapped) {
continue;
}
surface_for_each_mapped_surface(
subsurface->surface,
x + subsurface->current.x,
y + subsurface->current.y,
callback,
user_data);
}
callback(surface, x, y, user_data);
wl_list_for_each (subsurface, &surface->subsurfaces_above, parent_link) {
if (!subsurface->mapped) {
continue;
}
surface_for_each_mapped_surface(
subsurface->surface,
x + subsurface->current.x,
y + subsurface->current.y,
callback,
user_data);
}
}
static void
xdg_surface_for_each_mapped_popup_surface(
struct wlr_xdg_surface *surface,
int x,
int y,
wlr_surface_iterator_func_t callback,
void *user_data)
{
struct wlr_xdg_popup *popup;
wl_list_for_each (popup, &surface->popups, link) {
struct wlr_xdg_surface *popup_surface = popup->base;
if (!popup_surface->configured || !popup_surface->mapped) {
continue;
}
double popup_sx, popup_sy;
wlr_xdg_popup_get_position(popup, &popup_sx, &popup_sy);
surface_for_each_mapped_surface(
popup_surface->surface,
x + popup_sx,
y + popup_sy,
callback,
user_data);
xdg_surface_for_each_mapped_popup_surface(
popup_surface, x + popup_sx, y + popup_sy, callback, user_data);
}
}
static void
xdg_shell_view_for_each_mapped_surface(
struct kiwmi_view *view,
wlr_surface_iterator_func_t callback,
void *user_data)
{
if (!view->mapped) {
return;
}
// Have to copy over the wlroots implementation with only small changes
surface_for_each_mapped_surface(
view->xdg_surface->surface, 0, 0, callback, user_data);
xdg_surface_for_each_mapped_popup_surface(
view->xdg_surface, 0, 0, callback, user_data);
}
static pid_t
@ -361,7 +436,7 @@ xdg_shell_view_surface_at(
static const struct kiwmi_view_impl xdg_shell_view_impl = {
.close = xdg_shell_view_close,
.for_each_surface = xdg_shell_view_for_each_surface,
.for_each_mapped_surface = xdg_shell_view_for_each_mapped_surface,
.get_pid = xdg_shell_view_get_pid,
.get_size = xdg_shell_view_get_size,
.get_string_prop = xdg_shell_view_get_string_prop,