summaryrefslogtreecommitdiff
path: root/sway/server.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/server.c')
-rw-r--r--sway/server.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sway/server.c b/sway/server.c
index d6a4d00a..3fab3431 100644
--- a/sway/server.c
+++ b/sway/server.c
@@ -25,7 +25,6 @@
#include <wlr/types/wlr_relative_pointer_v1.h>
#include <wlr/types/wlr_screencopy_v1.h>
#include <wlr/types/wlr_server_decoration.h>
-#include <wlr/types/wlr_subcompositor.h>
#include <wlr/types/wlr_tablet_v2.h>
#include <wlr/types/wlr_viewporter.h>
#include <wlr/types/wlr_xcursor_manager.h>
@@ -110,8 +109,6 @@ bool server_init(struct sway_server *server) {
wl_signal_add(&server->compositor->events.new_surface,
&server->compositor_new_surface);
- wlr_subcompositor_create(server->wl_display);
-
server->data_device_manager =
wlr_data_device_manager_create(server->wl_display);
@@ -221,8 +218,8 @@ bool server_init(struct sway_server *server) {
// Avoid using "wayland-0" as display socket
char name_candidate[16];
- for (unsigned int i = 1; i <= 32; ++i) {
- snprintf(name_candidate, sizeof(name_candidate), "wayland-%u", i);
+ for (int i = 1; i <= 32; ++i) {
+ sprintf(name_candidate, "wayland-%d", i);
if (wl_display_add_socket(server->wl_display, name_candidate) >= 0) {
server->socket = strdup(name_candidate);
break;