mirrors/cage
1
0
Fork 0
mirror of https://github.com/cage-kiosk/cage.git synced 2026-04-01 07:15:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add xdg output manager

Browse source
This commit is contained in:
Andri Yngvason 2019-08-16 17:04:28 +00:00 • committed by Jente Hidskes
parent da6b6c208e
commit c13ada98de
1 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cage.c
View file

@ -31,6 +31,7 @@
#include <wlr/types/wlr_xdg_decoration_v1.h> #include <wlr/types/wlr_xdg_decoration_v1.h>
#include <wlr/types/wlr_xdg_shell.h> #include <wlr/types/wlr_xdg_shell.h>
#include <wlr/types/wlr_screencopy_v1.h> #include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_xdg_output_v1.h>
#include <wlr/util/log.h> #include <wlr/util/log.h>
#if CAGE_HAS_XWAYLAND #if CAGE_HAS_XWAYLAND
#include <wlr/xwayland.h> #include <wlr/xwayland.h>
@ -171,6 +172,7 @@ main(int argc, char *argv[])
struct wlr_server_decoration_manager *server_decoration_manager = NULL; struct wlr_server_decoration_manager *server_decoration_manager = NULL;
struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager = NULL; struct wlr_xdg_decoration_manager_v1 *xdg_decoration_manager = NULL;
struct wlr_screencopy_manager_v1 *screencopy_manager = NULL; struct wlr_screencopy_manager_v1 *screencopy_manager = NULL;
struct wlr_xdg_output_manager_v1 *output_manager = NULL;
struct wlr_xdg_shell *xdg_shell = NULL; struct wlr_xdg_shell *xdg_shell = NULL;
#if CAGE_HAS_XWAYLAND #if CAGE_HAS_XWAYLAND
struct wlr_xwayland *xwayland = NULL; struct wlr_xwayland *xwayland = NULL;
@ -302,6 +304,13 @@ main(int argc, char *argv[])
goto end; goto end;
} }
output_manager = wlr_xdg_output_manager_v1_create(server.wl_display, server.output_layout);
if (!output_manager) {
wlr_log(WLR_ERROR, "Unable to create the output manager");
ret = 1;
goto end;
}
#if CAGE_HAS_XWAYLAND #if CAGE_HAS_XWAYLAND
xwayland = wlr_xwayland_create(server.wl_display, compositor, true); xwayland = wlr_xwayland_create(server.wl_display, compositor, true);
if (!xwayland) { if (!xwayland) {
@ -383,6 +392,7 @@ end:
wl_event_source_remove(sigint_source); wl_event_source_remove(sigint_source);
wl_event_source_remove(sigterm_source); wl_event_source_remove(sigterm_source);
seat_destroy(server.seat); seat_destroy(server.seat);
wlr_xdg_output_manager_v1_destroy(output_manager);
wlr_screencopy_manager_v1_destroy(screencopy_manager); wlr_screencopy_manager_v1_destroy(screencopy_manager);
wlr_server_decoration_manager_destroy(server_decoration_manager); wlr_server_decoration_manager_destroy(server_decoration_manager);
wlr_xdg_decoration_manager_v1_destroy(xdg_decoration_manager); wlr_xdg_decoration_manager_v1_destroy(xdg_decoration_manager);