mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-03-17 05:34:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use new wlr_backend_autocreate signature

Browse source 
The session is now stored explicitly, with wlr_backend_get_session being
dropped.
This commit is contained in:
Kenny Levinsen 2023-09-30 13:36:49 +02:00 • committed by Simon Ser
parent 34eb3ec2c8
commit 624355485a
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cage.c
View file

@ -293,7 +293,7 @@ main(int argc, char *argv[])
struct wl_event_source *sigterm_source = struct wl_event_source *sigterm_source =
wl_event_loop_add_signal(event_loop, SIGTERM, handle_signal, &server.wl_display); wl_event_loop_add_signal(event_loop, SIGTERM, handle_signal, &server.wl_display);
server.backend = wlr_backend_autocreate(server.wl_display); server.backend = wlr_backend_autocreate(server.wl_display, &server.session);
if (!server.backend) { if (!server.backend) {
wlr_log(WLR_ERROR, "Unable to create the wlroots backend"); wlr_log(WLR_ERROR, "Unable to create the wlroots backend");
ret = 1; ret = 1;

6
seat.c
View file

@ -17,6 +17,7 @@
#include <wayland-server-core.h> #include <wayland-server-core.h>
#include <wlr/backend.h> #include <wlr/backend.h>
#include <wlr/backend/multi.h> #include <wlr/backend/multi.h>
#include <wlr/backend/session.h>
#include <wlr/types/wlr_cursor.h> #include <wlr/types/wlr_cursor.h>
#include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_data_device.h>
#include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_idle.h>
@ -263,10 +264,9 @@ handle_keybinding(struct cg_server *server, xkb_keysym_t sym)
#endif #endif
if (server->allow_vt_switch && sym >= XKB_KEY_XF86Switch_VT_1 && sym <= XKB_KEY_XF86Switch_VT_12) { if (server->allow_vt_switch && sym >= XKB_KEY_XF86Switch_VT_1 && sym <= XKB_KEY_XF86Switch_VT_12) {
if (wlr_backend_is_multi(server->backend)) { if (wlr_backend_is_multi(server->backend)) {
struct wlr_session *session = wlr_backend_get_session(server->backend); if (server->session) {
if (session) {
unsigned vt = sym - XKB_KEY_XF86Switch_VT_1 + 1; unsigned vt = sym - XKB_KEY_XF86Switch_VT_1 + 1;
wlr_session_change_vt(session, vt); wlr_session_change_vt(server->session, vt);
} }
} }
} else { } else {

1
server.h
View file

@ -24,6 +24,7 @@ struct cg_server {
struct wlr_backend *backend; struct wlr_backend *backend;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_allocator *allocator; struct wlr_allocator *allocator;
struct wlr_session *session;
struct cg_seat *seat; struct cg_seat *seat;
struct wlr_idle *idle; struct wlr_idle *idle;