mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

chase wlroots: use WLR_PRIVATE (MR 4842)

Browse source 
Ref: 6006023a377868187f73d2e0922bbe952072684f
("Use WLR_PRIVATE for private fields")
This commit is contained in:
Consolatis 2024-11-27 04:48:45 +01:00 • committed by Johan Malm
parent 2b1923c867
commit 0c2cf61895
5 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/common/scene-helpers.c
View file

@ -58,8 +58,8 @@ scene_output_damage(struct wlr_scene_output *scene_output,
if (pixman_region32_not_empty(&clipped)) { if (pixman_region32_not_empty(&clipped)) {
wlr_damage_ring_add(&scene_output->damage_ring, &clipped); wlr_damage_ring_add(&scene_output->damage_ring, &clipped);
pixman_region32_union(&scene_output->pending_commit_damage, pixman_region32_union(&scene_output->WLR_PRIVATE.pending_commit_damage,
&scene_output->pending_commit_damage, &clipped); &scene_output->WLR_PRIVATE.pending_commit_damage, &clipped);
} }
pixman_region32_fini(&clipped); pixman_region32_fini(&clipped);
@ -85,8 +85,10 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
* rendering on every output commit and overloads CPU. * rendering on every output commit and overloads CPU.
* We also need to verify the necessity of wants_magnification. * We also need to verify the necessity of wants_magnification.
*/ */
if (!wlr_output->needs_frame && !pixman_region32_not_empty( if (!wlr_output->needs_frame
&scene_output->pending_commit_damage) && !wants_magnification) { && !pixman_region32_not_empty(
&scene_output->WLR_PRIVATE.pending_commit_damage)
&& !wants_magnification) {
return true; return true;
} }

2
src/magnifier.c
View file

@ -237,7 +237,7 @@ static void
enable_magnifier(struct server *server, bool enable) enable_magnifier(struct server *server, bool enable)
{ {
magnify_on = enable; magnify_on = enable;
server->scene->direct_scanout = enable ? false server->scene->WLR_PRIVATE.direct_scanout = enable ? false
: server->direct_scanout_enabled; : server->direct_scanout_enabled;
} }

2
src/server.c
View file

@ -549,7 +549,7 @@ server_init(struct server *server)
wlr_log(WLR_ERROR, "unable to create scene"); wlr_log(WLR_ERROR, "unable to create scene");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
server->direct_scanout_enabled = server->scene->direct_scanout; server->direct_scanout_enabled = server->scene->WLR_PRIVATE.direct_scanout;
/* /*
* The order in which the scene-trees below are created determines the * The order in which the scene-trees below are created determines the

4
src/view.c
View file

@ -552,7 +552,7 @@ view_update_outputs(struct view *view)
wl_list_for_each(output, &view->server->outputs, link) { wl_list_for_each(output, &view->server->outputs, link) {
if (output_is_usable(output) && wlr_output_layout_intersects( if (output_is_usable(output) && wlr_output_layout_intersects(
layout, output->wlr_output, &view->current)) { layout, output->wlr_output, &view->current)) {
new_outputs |= (1ull << output->scene_output->index); new_outputs |= (1ull << output->scene_output->WLR_PRIVATE.index);
} }
} }
@ -569,7 +569,7 @@ view_on_output(struct view *view, struct output *output)
assert(view); assert(view);
assert(output); assert(output);
return output->scene_output return output->scene_output
&& (view->outputs & (1ull << output->scene_output->index)); && (view->outputs & (1ull << output->scene_output->WLR_PRIVATE.index));
} }
void void

2
subprojects/wlroots.wrap
View file

@ -1,6 +1,6 @@
[wrap-git] [wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git url = https://gitlab.freedesktop.org/wlroots/wlroots.git
revision = 009515161bd97d8f920d72d31ef462f2608688e8 revision = 6006023a377868187f73d2e0922bbe952072684f
[provide] [provide]
dependency_names = wlroots-0.19 dependency_names = wlroots-0.19