10 files changed, 149 insertions, 32 deletions

diff --git a/include/sway/commands.h b/include/sway/commands.h
index bc5d5412..dbebaa49 100644
--- a/include/sway/commands.h
+++ b/include/sway/commands.h
@@ -204,8 +204,9 @@ sway_cmd input_cmd_xkb_options;
 sway_cmd input_cmd_xkb_rules;
 sway_cmd input_cmd_xkb_variant;
 
-sway_cmd seat_cmd_fallback;
 sway_cmd seat_cmd_attach;
+sway_cmd seat_cmd_fallback;
+sway_cmd seat_cmd_cursor;
 
 sway_cmd cmd_ipc_cmd;
 sway_cmd cmd_ipc_events;
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index daf7d4ee..fcd94437 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -30,5 +30,7 @@ struct sway_cursor {
 void sway_cursor_destroy(struct sway_cursor *cursor);
 struct sway_cursor *sway_cursor_create(struct sway_seat *seat);
 void cursor_send_pointer_motion(struct sway_cursor *cursor, uint32_t time);
+void dispatch_cursor_button(struct sway_cursor *cursor, uint32_t time_msec,
+        uint32_t button, enum wlr_button_state state);
 
 #endif
diff --git a/sway/commands.c b/sway/commands.c
index 55929659..54d84450 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -203,6 +203,7 @@ static struct cmd_handler input_handlers[] = {
 // must be in order for the bsearch
 static struct cmd_handler seat_handlers[] = {
         { "attach", seat_cmd_attach },
+        { "cursor", seat_cmd_cursor },
         { "fallback", seat_cmd_fallback },
 };
 
diff --git a/sway/commands/seat.c b/sway/commands/seat.c
index 819b769c..5916015f 100644
--- a/sway/commands/seat.c
+++ b/sway/commands/seat.c
@@ -40,6 +40,8 @@ struct cmd_results *cmd_seat(int argc, char **argv) {
         struct cmd_results *res;
         if (strcasecmp("attach", argv[1]) == 0) {
                 res = seat_cmd_attach(argc_new, argv_new);
+        } else if (strcasecmp("cursor", argv[1]) == 0) {
+                res = seat_cmd_cursor(argc_new, argv_new);
         } else if (strcasecmp("fallback", argv[1]) == 0) {
                 res = seat_cmd_fallback(argc_new, argv_new);
         } else {
diff --git a/sway/commands/seat/cursor.c b/sway/commands/seat/cursor.c
new file mode 100644
index 00000000..5dad97f1
--- /dev/null
+++ b/sway/commands/seat/cursor.c
@@ -0,0 +1,89 @@
+#define _XOPEN_SOURCE 700
+#ifdef __linux__
+#include <linux/input-event-codes.h>
+#elif __FreeBSD__
+#include <dev/evdev/input-event-codes.h>
+#endif
+
+#include <strings.h>
+#include <wlr/types/wlr_cursor.h>
+#include "sway/commands.h"
+#include "sway/input/cursor.h"
+
+static struct cmd_results *press_or_release(struct sway_cursor *cursor,
+                char *action, char *button_str, uint32_t time);
+
+static const char *expected_syntax = "Expected 'cursor <move> <x> <y>' or "
+                                        "'cursor <set> <x> <y>' or "
+                                        "'curor <press|release> <left|right|1|2|3...>'";
+
+struct cmd_results *seat_cmd_cursor(int argc, char **argv) {
+        struct cmd_results *error = NULL;
+        if ((error = checkarg(argc, "cursor", EXPECTED_AT_LEAST, 2))) {
+                return error;
+        }
+        struct sway_seat *seat = config->handler_context.seat;
+        if (!seat) {
+                return cmd_results_new(CMD_FAILURE, "cursor", "No seat defined");
+        }
+
+        struct sway_cursor *cursor = seat->cursor;
+
+        struct timespec now;
+        clock_gettime(CLOCK_MONOTONIC, &now);
+        uint32_t time = now.tv_nsec / 1000;
+
+        if (strcasecmp(argv[0], "move") == 0) {
+                if (argc < 3) {
+                        return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
+                }
+                int delta_x = strtol(argv[1], NULL, 10);
+                int delta_y = strtol(argv[2], NULL, 10);
+                wlr_cursor_move(cursor->cursor, NULL, delta_x, delta_y);
+                cursor_send_pointer_motion(cursor, time);
+        } else if (strcasecmp(argv[0], "set") == 0) {
+                if (argc < 3) {
+                        return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
+                }
+                // map absolute coords (0..1,0..1) to root container coords
+                float x = strtof(argv[1], NULL) / root_container.width;
+                float y = strtof(argv[2], NULL) / root_container.height;
+                wlr_cursor_warp_absolute(cursor->cursor, NULL, x, y);
+                cursor_send_pointer_motion(cursor, time);
+        } else {
+                if (argc < 2) {
+                        return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
+                }
+                if ((error = press_or_release(cursor, argv[0], argv[1], time))) {
+                        return error;
+                }
+        }
+
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
+
+static struct cmd_results *press_or_release(struct sway_cursor *cursor,
+                char *action, char *button_str, uint32_t time) {
+        enum wlr_button_state state;
+        uint32_t button;
+        if (strcasecmp(action, "press") == 0) {
+                state = WLR_BUTTON_PRESSED;
+        } else if (strcasecmp(action, "release") == 0) {
+                state = WLR_BUTTON_RELEASED;
+        } else {
+                return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
+        }
+
+        if (strcasecmp(button_str, "left") == 0) {
+                button = BTN_LEFT;
+        } else if (strcasecmp(button_str, "right") == 0) {
+                button = BTN_RIGHT;
+        } else {
+                button = strtol(button_str, NULL, 10);
+                if (button == 0) {
+                        return cmd_results_new(CMD_INVALID, "cursor", expected_syntax);
+                }
+        }
+        dispatch_cursor_button(cursor, time, button, state);
+        return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}
diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 0df01504..15a61cbf 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -166,7 +166,7 @@ static void handle_cursor_motion_absolute(
         cursor_send_pointer_motion(cursor, event->time_msec);
 }
 
-static void dispatch_cursor_button(struct sway_cursor *cursor,
+void dispatch_cursor_button(struct sway_cursor *cursor,
                 uint32_t time_msec, uint32_t button, enum wlr_button_state state) {
         struct wlr_surface *surface = NULL;
         double sx, sy;
diff --git a/sway/meson.build b/sway/meson.build
index d0730296..9e55e335 100644
--- a/sway/meson.build
+++ b/sway/meson.build
@@ -47,6 +47,7 @@ sway_sources = files(
         'commands/resize.c',
         'commands/seat.c',
         'commands/seat/attach.c',
+        'commands/seat/cursor.c',
         'commands/seat/fallback.c',
         'commands/set.c',
         'commands/split.c',
diff --git a/sway/sway.5.txt b/sway/sway.5.txt
index 59c3295a..03975349 100644
--- a/sway/sway.5.txt
+++ b/sway/sway.5.txt
@@ -328,6 +328,13 @@ The default colors are:
         the named seat, and _}_ on its own line will close the block.
         See **sway-input**(5) for details.
 
+**seat** <seat_name> cursor <move|set> <x> <y>::
+        Move cursor relatively to current position or set to absolute screen position.
+        A value of 0 causes the axis to be ignored in both commands.
+
+**seat** <seat_name> cursor <press|release> <left|right|1|2|3...>::
+        Simulate press of mouse button specified by left, right, or numerical code.
+
 **kill**::
         Kills (force-closes) the currently-focused container and all of its children.
 
diff --git a/swaybar/bar.c b/swaybar/bar.c
index f1a701b9..d51c4ec7 100644
--- a/swaybar/bar.c
+++ b/swaybar/bar.c
@@ -264,6 +264,19 @@ struct wl_output_listener output_listener = {
         .scale = output_scale,
 };
 
+static bool bar_uses_output(struct swaybar *bar, size_t output_index) {
+        if (bar->config->all_outputs) {
+                return true;
+        }
+        struct config_output *coutput;
+        wl_list_for_each(coutput, &bar->config->outputs, link) {
+                if (coutput->index == output_index) {
+                        return true;
+                }
+        }
+        return false;
+}
+
 static void handle_global(void *data, struct wl_registry *registry,
                 uint32_t name, const char *interface, uint32_t version) {
         struct swaybar *bar = data;
@@ -278,19 +291,22 @@ static void handle_global(void *data, struct wl_registry *registry,
                 bar->shm = wl_registry_bind(registry, name,
                                 &wl_shm_interface, 1);
         } else if (strcmp(interface, wl_output_interface.name) == 0) {
-                static size_t index = 0;
-                struct swaybar_output *output =
-                        calloc(1, sizeof(struct swaybar_output));
-                output->bar = bar;
-                output->output = wl_registry_bind(registry, name,
-                                &wl_output_interface, 3);
-                wl_output_add_listener(output->output, &output_listener, output);
-                output->scale = 1;
-                output->index = index++;
-                output->wl_name = name;
-                wl_list_init(&output->workspaces);
-                wl_list_init(&output->hotspots);
-                wl_list_insert(&bar->outputs, &output->link);
+                static size_t output_index = 0;
+                if (bar_uses_output(bar, output_index)) {
+                        struct swaybar_output *output =
+                                calloc(1, sizeof(struct swaybar_output));
+                        output->bar = bar;
+                        output->output = wl_registry_bind(registry, name,
+                                        &wl_output_interface, 3);
+                        wl_output_add_listener(output->output, &output_listener, output);
+                        output->scale = 1;
+                        output->index = output_index;
+                        output->wl_name = name;
+                        wl_list_init(&output->workspaces);
+                        wl_list_init(&output->hotspots);
+                        wl_list_insert(&bar->outputs, &output->link);
+                }
+                ++output_index;
         } else if (strcmp(interface, zwlr_layer_shell_v1_interface.name) == 0) {
                 bar->layer_shell = wl_registry_bind(
                                 registry, name, &zwlr_layer_shell_v1_interface, 1);
@@ -362,26 +378,24 @@ void bar_setup(struct swaybar *bar,
         pointer->cursor_surface = wl_compositor_create_surface(bar->compositor);
         assert(pointer->cursor_surface);
 
-        // TODO: we might not necessarily be meant to do all of the outputs
         wl_list_for_each(output, &bar->outputs, link) {
                 struct config_output *coutput;
                 wl_list_for_each(coutput, &bar->config->outputs, link) {
-                        if (coutput->index != output->index) {
-                                continue;
+                        if (coutput->index == output->index) {
+                                output->name = strdup(coutput->name);
+                                break;
                         }
-                        output->name = strdup(coutput->name);
-                        output->surface = wl_compositor_create_surface(bar->compositor);
-                        assert(output->surface);
-                        output->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
-                                        bar->layer_shell, output->surface, output->output,
-                                        ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel");
-                        assert(output->layer_surface);
-                        zwlr_layer_surface_v1_add_listener(output->layer_surface,
-                                        &layer_surface_listener, output);
-                        zwlr_layer_surface_v1_set_anchor(output->layer_surface,
-                                        bar->config->position);
-                        break;
                 }
+                output->surface = wl_compositor_create_surface(bar->compositor);
+                assert(output->surface);
+                output->layer_surface = zwlr_layer_shell_v1_get_layer_surface(
+                                bar->layer_shell, output->surface, output->output,
+                                ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM, "panel");
+                assert(output->layer_surface);
+                zwlr_layer_surface_v1_add_listener(output->layer_surface,
+                                &layer_surface_listener, output);
+                zwlr_layer_surface_v1_set_anchor(output->layer_surface,
+                                bar->config->position);
         }
         ipc_get_workspaces(bar);
         render_all_frames(bar);
diff --git a/swaybar/ipc.c b/swaybar/ipc.c
index e6231bd2..ed5d9a31 100644
--- a/swaybar/ipc.c
+++ b/swaybar/ipc.c
@@ -331,7 +331,7 @@ bool handle_ipc_readable(struct swaybar *bar) {
         switch (resp->type) {
         case IPC_EVENT_WORKSPACE:
                 ipc_get_workspaces(bar);
-                return true;
+                break;
         case IPC_EVENT_MODE: {
                 json_object *result = json_tokener_parse(resp->payload);
                 if (!result) {
@@ -367,5 +367,5 @@ bool handle_ipc_readable(struct swaybar *bar) {
                 return false;
         }
         free_ipc_response(resp);
-        return false;
+        return true;
 }