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

Configure linux_dmabuf, primary_selection

Browse source
This commit is contained in:
Drew DeVault 2018-03-31 09:21:15 -04:00
parent 6a1a94b87c
commit ae0552606b
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sway/server.c
View file

@ -8,7 +8,9 @@
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_gamma_control.h> #include <wlr/types/wlr_gamma_control.h>
#include <wlr/types/wlr_linux_dmabuf.h>
#include <wlr/types/wlr_layer_shell.h> #include <wlr/types/wlr_layer_shell.h>
#include <wlr/types/wlr_primary_selection.h>
#include <wlr/types/wlr_screenshooter.h> #include <wlr/types/wlr_screenshooter.h>
#include <wlr/types/wlr_wl_shell.h> #include <wlr/types/wlr_wl_shell.h>
#include <wlr/types/wlr_xcursor_manager.h> #include <wlr/types/wlr_xcursor_manager.h>
@ -54,6 +56,7 @@ bool server_init(struct sway_server *server) {
wlr_screenshooter_create(server->wl_display); wlr_screenshooter_create(server->wl_display);
wlr_gamma_control_manager_create(server->wl_display); wlr_gamma_control_manager_create(server->wl_display);
wlr_primary_selection_device_manager_create(server->wl_display);
server->new_output.notify = handle_new_output; server->new_output.notify = handle_new_output;
wl_signal_add(&server->backend->events.new_output, &server->new_output); wl_signal_add(&server->backend->events.new_output, &server->new_output);
@ -68,6 +71,11 @@ bool server_init(struct sway_server *server) {
&server->xdg_shell_v6_surface); &server->xdg_shell_v6_surface);
server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface; server->xdg_shell_v6_surface.notify = handle_xdg_shell_v6_surface;
server->wl_shell = wlr_wl_shell_create(server->wl_display);
wl_signal_add(&server->wl_shell->events.new_surface,
&server->wl_shell_surface);
server->wl_shell_surface.notify = handle_wl_shell_surface;
// TODO make xwayland optional // TODO make xwayland optional
server->xwayland = server->xwayland =
wlr_xwayland_create(server->wl_display, server->compositor); wlr_xwayland_create(server->wl_display, server->compositor);
@ -91,10 +99,8 @@ bool server_init(struct sway_server *server) {
image->hotspot_y); image->hotspot_y);
} }
server->wl_shell = wlr_wl_shell_create(server->wl_display); struct wlr_egl *egl = wlr_backend_get_egl(server->backend);
wl_signal_add(&server->wl_shell->events.new_surface, wlr_linux_dmabuf_create(server->wl_display, egl);
&server->wl_shell_surface);
server->wl_shell_surface.notify = handle_wl_shell_surface;
server->socket = wl_display_add_socket_auto(server->wl_display); server->socket = wl_display_add_socket_auto(server->wl_display);
if (!server->socket) { if (!server->socket) {