mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-11 13:29:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into wlr-gamma-control

Browse source
This commit is contained in:
emersion 2018-08-02 23:49:25 +01:00 • committed by GitHub
commit 3a54e2291c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 5196 additions and 1035 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sway/server.c
View file

@ -26,7 +26,10 @@
#include "sway/input/input-manager.h"
#include "sway/server.h"
#include "sway/tree/layout.h"
#include "config.h"
#ifdef HAVE_XWAYLAND
#include "sway/xwayland.h"
#endif
bool server_privileged_prepare(struct sway_server *server) {
wlr_log(WLR_DEBUG, "Preparing Wayland server initialization");
@ -83,6 +86,7 @@ bool server_init(struct sway_server *server) {
server->xdg_shell_surface.notify = handle_xdg_shell_surface;
// TODO make xwayland optional
#ifdef HAVE_XWAYLAND
server->xwayland.wlr_xwayland =
wlr_xwayland_create(server->wl_display, server->compositor, true);
wl_signal_add(&server->xwayland.wlr_xwayland->events.new_surface,
@ -103,6 +107,7 @@ bool server_init(struct sway_server *server) {
image->width * 4, image->width, image->height, image->hotspot_x,
image->hotspot_y);
}
#endif
// TODO: Integration with sway borders
struct wlr_server_decoration_manager *deco_manager =