mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-02-24 01:40:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master' into atomic

Browse source
This commit is contained in:
Ryan Dwyer 2018-06-29 20:04:24 +10:00
commit a2fbb20a61
16 changed files with 193 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
include/sway/server.h
View file

@ -11,8 +11,8 @@
#include <wlr/types/wlr_xdg_shell.h>
#include <wlr/render/wlr_renderer.h>
// TODO WLR: make Xwayland optional
#include <wlr/xwayland.h>
#include "list.h"
#include "sway/xwayland.h"
struct sway_server {
struct wl_display *wl_display;
@ -38,12 +38,9 @@ struct sway_server {
struct wlr_xdg_shell *xdg_shell;
struct wl_listener xdg_shell_surface;
struct wlr_xwayland *xwayland;
struct wlr_xcursor_manager *xcursor_manager;
struct sway_xwayland xwayland;
struct wl_listener xwayland_surface;
struct wlr_wl_shell *wl_shell;
struct wl_listener wl_shell_surface;
struct wl_listener xwayland_ready;
bool debug_txn_timings;