From b394a50db6ec6af7fc9a814932656d1cf2c79466 Mon Sep 17 00:00:00 2001
From: Charlotte Meyer <dev@buffet.sh>
Date: Sun, 17 Mar 2019 21:03:59 +0100
Subject: [PATCH] Moved cursor into input

---
 include/kiwmi/desktop/desktop.h | 3 ---
 include/kiwmi/input/input.h     | 3 +++
 kiwmi/desktop/desktop.c         | 7 -------
 kiwmi/desktop/output.c          | 2 +-
 kiwmi/input.c                   | 4 +---
 kiwmi/input/input.c             | 9 +++++++++
 kiwmi/output.c                  | 1 +
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/include/kiwmi/desktop/desktop.h b/include/kiwmi/desktop/desktop.h
index 0b2d424..c81fdd2 100644
--- a/include/kiwmi/desktop/desktop.h
+++ b/include/kiwmi/desktop/desktop.h
@@ -13,13 +13,10 @@
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_output_layout.h>
 
-#include "kiwmi/input/cursor.h"
-
 struct kiwmi_desktop {
     struct wlr_compositor *compositor;
     struct wlr_data_device_manager *data_device_manager;
     struct wlr_output_layout *output_layout;
-    struct kiwmi_cursor *cursor;
     struct wl_list outputs; // struct kiwmi_output::link
 
     struct wl_listener new_output;
diff --git a/include/kiwmi/input/input.h b/include/kiwmi/input/input.h
index bf1582d..76bc5e8 100644
--- a/include/kiwmi/input/input.h
+++ b/include/kiwmi/input/input.h
@@ -10,9 +10,12 @@
 
 #include <wayland-server.h>
 
+#include "kiwmi/input/cursor.h"
+
 struct kiwmi_input {
     struct wl_list keyboards; // struct kiwmi_keyboard::link
     struct wl_listener new_input;
+    struct kiwmi_cursor *cursor;
 };
 
 bool input_init(struct kiwmi_input *input);
diff --git a/kiwmi/desktop/desktop.c b/kiwmi/desktop/desktop.c
index a1f87e6..16c28a9 100644
--- a/kiwmi/desktop/desktop.c
+++ b/kiwmi/desktop/desktop.c
@@ -14,7 +14,6 @@
 #include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_data_device.h>
 #include <wlr/types/wlr_output_layout.h>
-#include <wlr/util/log.h>
 
 #include "kiwmi/server.h"
 #include "kiwmi/desktop/output.h"
@@ -29,12 +28,6 @@ desktop_init(struct kiwmi_desktop *desktop, struct wlr_renderer *renderer)
         wlr_data_device_manager_create(server->wl_display);
     desktop->output_layout = wlr_output_layout_create();
 
-    desktop->cursor = cursor_create(desktop->output_layout);
-    if (!desktop->cursor) {
-        wlr_log(WLR_ERROR, "Failed to create cursor");
-        return false;
-    }
-
     wl_list_init(&desktop->outputs);
 
     desktop->new_output.notify = new_output_notify;
diff --git a/kiwmi/desktop/output.c b/kiwmi/desktop/output.c
index e422da7..77c4211 100644
--- a/kiwmi/desktop/output.c
+++ b/kiwmi/desktop/output.c
@@ -38,7 +38,7 @@ new_output_notify(struct wl_listener *listener, void *data)
         return;
     }
 
-    struct kiwmi_cursor *cursor = desktop->cursor;
+    struct kiwmi_cursor *cursor = server->input.cursor;
 
     wlr_xcursor_manager_load(cursor->xcursor_manager, wlr_output->scale);
 
diff --git a/kiwmi/input.c b/kiwmi/input.c
index cf0a3e9..23b72f3 100644
--- a/kiwmi/input.c
+++ b/kiwmi/input.c
@@ -18,9 +18,7 @@
 static void
 new_pointer(struct kiwmi_input *input, struct wlr_input_device *device)
 {
-    struct kiwmi_server *server = wl_container_of(input, server, input);
-
-    wlr_cursor_attach_input_device(server->desktop.cursor->cursor, device);
+    wlr_cursor_attach_input_device(input->cursor->cursor, device);
 }
 
 static void
diff --git a/kiwmi/input/input.c b/kiwmi/input/input.c
index ed940a7..bbd00d2 100644
--- a/kiwmi/input/input.c
+++ b/kiwmi/input/input.c
@@ -8,6 +8,7 @@
 #include "kiwmi/input/input.h"
 
 #include <wayland-server.h>
+#include <wlr/util/log.h>
 
 #include "kiwmi/input.h"
 #include "kiwmi/server.h"
@@ -17,8 +18,16 @@ input_init(struct kiwmi_input *input)
 {
     struct kiwmi_server *server = wl_container_of(input, server, input);
 
+    input->cursor = cursor_create(server->desktop.output_layout);
+    if (!input->cursor) {
+        wlr_log(WLR_ERROR, "Failed to create cursor");
+        return false;
+    }
+
     wl_list_init(&input->keyboards);
 
     input->new_input.notify = new_input_notify;
     wl_signal_add(&server->backend->events.new_input, &input->new_input);
+
+    return true;
 }
diff --git a/kiwmi/output.c b/kiwmi/output.c
index 76e2d63..4557363 100644
--- a/kiwmi/output.c
+++ b/kiwmi/output.c
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include <wayland-server.h>
+#include <wlr/backend.h>
 #include <wlr/render/wlr_renderer.h>
 #include <wlr/types/wlr_output.h>