1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
diff --git a/include/labwc.h b/include/labwc.h
index 87a42198..df293d7c 100644
--- a/include/labwc.h
+++ b/include/labwc.h
@@ -197,7 +197,7 @@ struct server {
struct {
struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1 *manager;
struct {
- struct wl_listener new_request;
+ struct wl_listener capture_request;
} on;
} toplevel_capture;
diff --git a/meson.build b/meson.build
index 8684732f..553ea0f5 100644
--- a/meson.build
+++ b/meson.build
@@ -51,9 +51,9 @@ endif
add_project_arguments('-DLABWC_VERSION=@0@'.format(version), language: 'c')
wlroots = dependency(
- 'wlroots-0.20',
+ 'wlroots-0.21',
default_options: ['default_library=static', 'examples=false'],
- version: ['>=0.20.1', '<0.21.0'],
+ version: ['>=0.21.0', '<0.22.0'],
)
wlroots_has_xwayland = wlroots.get_variable('have_xwayland') == 'true'
diff --git a/src/decorations/xdg-deco.c b/src/decorations/xdg-deco.c
index e195e02f..406e604a 100644
--- a/src/decorations/xdg-deco.c
+++ b/src/decorations/xdg-deco.c
@@ -118,7 +118,7 @@ void
xdg_server_decoration_init(void)
{
struct wlr_xdg_decoration_manager_v1 *xdg_deco_mgr = NULL;
- xdg_deco_mgr = wlr_xdg_decoration_manager_v1_create(server.wl_display);
+ xdg_deco_mgr = wlr_xdg_decoration_manager_v1_create(server.wl_display, 2);
if (!xdg_deco_mgr) {
wlr_log(WLR_ERROR, "unable to create the XDG deco manager");
exit(EXIT_FAILURE);
diff --git a/src/server.c b/src/server.c
index d0c8c04c..cab06334 100644
--- a/src/server.c
+++ b/src/server.c
@@ -424,7 +424,7 @@ handle_toplevel_capture_source_destroy(struct wl_listener *listener, void *data)
static void
handle_toplevel_capture_request(struct wl_listener *listener, void *data)
{
- struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request *request = data;
+ struct wlr_ext_foreign_toplevel_image_capture_source_manager_v1_request_event *request = data;
struct view *view = request->toplevel_handle->data;
assert(view);
wlr_log(WLR_INFO, "Capturing toplevel %s", view->app_id);
@@ -627,6 +627,9 @@ server_init(void)
.features = {
.parametric = true,
.set_mastering_display_primaries = true,
+ .extended_target_volume = true,
+ .windows_scrgb = true,
+ .windows_bt2100 = true
},
.render_intents = render_intents,
.render_intents_len = ARRAY_SIZE(render_intents),
@@ -728,12 +731,12 @@ server_init(void)
wlr_ext_foreign_toplevel_image_capture_source_manager_v1_create(
server.wl_display, 1);
if (server.toplevel_capture.manager) {
- server.toplevel_capture.on.new_request.notify = handle_toplevel_capture_request;
- wl_signal_add(&server.toplevel_capture.manager->events.new_request,
- &server.toplevel_capture.on.new_request);
+ server.toplevel_capture.on.capture_request.notify = handle_toplevel_capture_request;
+ wl_signal_add(&server.toplevel_capture.manager->events.capture_request,
+ &server.toplevel_capture.on.capture_request);
} else {
/* Allow safe removal on shutdown */
- wl_list_init(&server.toplevel_capture.on.new_request.link);
+ wl_list_init(&server.toplevel_capture.on.capture_request.link);
}
wlr_data_control_manager_v1_create(server.wl_display);
@@ -870,7 +873,7 @@ server_finish(void)
server.drm_lease_request.notify = NULL;
}
- wl_list_remove(&server.toplevel_capture.on.new_request.link);
+ wl_list_remove(&server.toplevel_capture.on.capture_request.link);
wlr_backend_destroy(server.backend);
wlr_allocator_destroy(server.allocator);
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index eb797ad5..cdae8b40 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,7 +1,7 @@
[wrap-git]
url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 0.20
+revision = master
[provide]
-dependency_names = wlroots-0.20
-wlroots-0.20=wlroots
+dependency_names = wlroots-0.21
+wlroots-0.21=wlroots
|