1 files changed, 2 insertions, 32 deletions
diff --git a/src/wayland/internal.h b/src/wayland/internal.h
index cba5096..ccfd2dc 100644
--- a/src/wayland/internal.h
+++ b/src/wayland/internal.h
@@ -100,7 +100,7 @@ struct conn_drag {
     struct wl_data_source *source;
     struct xdg_toplevel_drag_v1 *toplevel;
     struct drag_icon icon;
-    const struct yasl_drag_listener *listener;
+    struct yasl_drag_listener listener;
     void *ud;
     struct seat *seat;
     uint32_t scale_120;
@@ -192,36 +192,7 @@ struct seat {
     bool touch_scrolling;
 };
 
-#define YASL_QUEUE_CAP 256
-#define YASL_QUEUE_MASK (YASL_QUEUE_CAP - 1)
-struct input_queue {
-    struct yasl_input_event events[YASL_QUEUE_CAP];
-    int head;
-    int tail;
-    int count;
-};
-
-static inline void input_queue_push(struct input_queue *q, const struct yasl_input_event *ev)
-{
-    if (unlikely(q->count >= YASL_QUEUE_CAP)) return;
-    q->events[q->tail] = *ev;
-    q->tail = (q->tail + 1) & YASL_QUEUE_MASK;
-    q->count++;
-}
-
-static inline bool input_queue_pop(struct input_queue *q, struct yasl_input_event *ev)
-{
-    if (unlikely(q->count <= 0)) return false;
-    *ev = q->events[q->head];
-    q->head = (q->head + 1) & YASL_QUEUE_MASK;
-    q->count--;
-    return true;
-}
-
-static inline void input_queue_clear(struct input_queue *q)
-{
-    q->head = q->tail = q->count = 0;
-}
+#include "common/input.h"
 
 struct wayland_display {
     struct yasl_display base;
@@ -257,7 +228,6 @@ struct wayland_display {
     struct xdg_toplevel_drag_manager_v1 *toplevel_drag_mgr;
     struct conn_drag drag;
     struct wayland_surface *surfaces;
-    struct wayland_surface *paste_target;
     struct wayland_surface *dead;
 
     /* 4-byte integers */