Merge 0f9d47023c into ab455bbada

include/sway/commands.h

@@ -253,6 +253,7 @@ sway_cmd input_cmd_click_method;
 sway_cmd input_cmd_clickfinger_button_map;
 sway_cmd input_cmd_drag;
 sway_cmd input_cmd_drag_lock;
+sway_cmd input_cmd_transform;
 sway_cmd input_cmd_dwt;
 sway_cmd input_cmd_dwtp;
 sway_cmd input_cmd_events;

include/sway/config.h

@@ -139,6 +139,18 @@ struct input_config_tool {
 	enum sway_tablet_tool_mode mode;
 };
 
+enum sway_input_transform {
+	INPUT_TRANSFORM_DEFAULT,
+	INPUT_TRANSFORM_NORMAL,
+	INPUT_TRANSFORM_90,
+	INPUT_TRANSFORM_180,
+	INPUT_TRANSFORM_270,
+	INPUT_TRANSFORM_FLIPPED,
+	INPUT_TRANSFORM_FLIPPED_90,
+	INPUT_TRANSFORM_FLIPPED_180,
+	INPUT_TRANSFORM_FLIPPED_270,
+};
+
 /**
  * options for input devices
  */
@@ -187,6 +199,8 @@ struct input_config {
 	char *mapped_to_output;
 	struct wlr_box *mapped_to_region;
 
+	enum sway_input_transform transform;
+
 	list_t *tools;
 
 	bool capturable;

sway/commands/input.c

@@ -34,6 +34,7 @@ static const struct cmd_handler input_handlers[] = {
 	{ "tap", input_cmd_tap },
 	{ "tap_button_map", input_cmd_tap_button_map },
 	{ "tool_mode", input_cmd_tool_mode },
+	{ "transform", input_cmd_transform },
 	{ "xkb_file", input_cmd_xkb_file },
 	{ "xkb_layout", input_cmd_xkb_layout },
 	{ "xkb_model", input_cmd_xkb_model },

sway/commands/input/transform.c

@@ -0,0 +1,77 @@
+#include "log.h"
+#include "sway/config.h"
+#include "sway/commands.h"
+#include "sway/input/input-manager.h"
+#include "util.h"
+#include <strings.h>
+
+static enum sway_input_transform invert_rotation_direction(
+		enum sway_input_transform t) {
+	switch (t) {
+	case INPUT_TRANSFORM_90:
+		return INPUT_TRANSFORM_270;
+	case INPUT_TRANSFORM_270:
+		return INPUT_TRANSFORM_90;
+	case INPUT_TRANSFORM_FLIPPED_90:
+		return INPUT_TRANSFORM_FLIPPED_270;
+	case INPUT_TRANSFORM_FLIPPED_270:
+		return INPUT_TRANSFORM_FLIPPED_90;
+	default:
+		return t;
+	}
+}
+
+struct cmd_results *input_cmd_transform(int argc, char**argv) {
+    struct cmd_results *error = NULL;
+    if ((error = checkarg(argc, "transform", EXPECTED_AT_LEAST, 1))) {
+        return error;
+    }
+    
+    enum sway_input_transform transform;
+    if (strcmp(*argv, "normal") == 0 ||
+			strcmp(*argv, "0") == 0) {
+		transform = INPUT_TRANSFORM_NORMAL;
+	} else if (strcmp(*argv, "90") == 0) {
+		transform = INPUT_TRANSFORM_90;
+	} else if (strcmp(*argv, "180") == 0) {
+		transform = INPUT_TRANSFORM_180;
+	} else if (strcmp(*argv, "270") == 0) {
+		transform = INPUT_TRANSFORM_270;
+	} else if (strcmp(*argv, "flipped") == 0) {
+		transform = INPUT_TRANSFORM_FLIPPED;
+	} else if (strcmp(*argv, "flipped-90") == 0) {
+		transform = INPUT_TRANSFORM_FLIPPED_90;
+	} else if (strcmp(*argv, "flipped-180") == 0) {
+		transform = INPUT_TRANSFORM_FLIPPED_180;
+	} else if (strcmp(*argv, "flipped-270") == 0) {
+		transform = INPUT_TRANSFORM_FLIPPED_270;
+	} else {
+		return cmd_results_new(CMD_INVALID, "Invalid output transform.");
+	}
+
+    struct input_config *ic = config->handler_context.input_config;
+    if (!ic) {
+        return cmd_results_new(CMD_FAILURE, "No input device defined.");
+    }
+
+    if (argc > 1) {
+        if (strcmp(argv[1], "clockwise") && strcmp(argv[1], "anticlockwise")) {
+            return cmd_results_new(CMD_INVALID, "Invalid transform direction");
+        }
+        if (config->reloading) {
+            return cmd_results_new(CMD_INVALID,
+                "Relative transforms cannot be used in the configuration file");
+        }
+        if (strcmp(ic->identifier, "*") == 0) {
+            return cmd_results_new(CMD_INVALID, 
+                "Cannot apply relative transforms to all inputs");
+        }
+        if (strcmp(argv[1], "anticlockwise") == 0) {
+            transform = invert_rotation_direction(transform);
+        }
+    }
+
+    ic->transform = transform;
+
+    return cmd_results_new(CMD_SUCCESS, NULL);
+}

sway/config/input.c

@@ -110,6 +110,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
 	if (src->tap != INT_MIN) {
 		dst->tap = src->tap;
 	}
+	if (src->transform) {
+		dst->transform = src->transform;
+	}
 	if (src->tap_button_map != INT_MIN) {
 		dst->tap_button_map = src->tap_button_map;
 	}

sway/input/cursor.c

@@ -534,6 +534,53 @@ static void apply_mapping_from_region(struct wlr_input_device *device,
 	*y = apply_mapping_from_coord(y1, y2, *y);
 }
 
+static void apply_transform_to_coords(enum sway_input_transform transform,
+		double *x, double *y, double *dx, double *dy) {
+	double tx = *x, ty = *y, tdx = *dx, tdy = *dy;
+	switch (transform) {
+	case INPUT_TRANSFORM_90:
+		*dx = -tdy;
+		*dy = tdx;
+		*x = 1. - ty;
+		*y = tx;
+		return;
+	case INPUT_TRANSFORM_180:
+		*dx = -tdx;
+		*dy = -tdy;
+		*x = 1. - tx;
+		*y = 1. - ty;
+		return;
+	case INPUT_TRANSFORM_270:
+		*dx = tdy;
+		*dy = -tdx;
+		*x = ty;
+		*y = 1. - tx;
+		return;
+	case INPUT_TRANSFORM_FLIPPED:
+		*dx = -tdx;
+		*x = 1. - tx;
+		return;
+	case INPUT_TRANSFORM_FLIPPED_90:
+		*dx = -tdy;
+		*dy = tdx;
+		*x = 1. - ty;
+		*y = tx;
+		return;
+	case INPUT_TRANSFORM_FLIPPED_180:
+		*dy = -tdy;
+		*y = 1. - ty;
+		return;
+	case INPUT_TRANSFORM_FLIPPED_270:
+		*dx = -tdy;
+		*dy = tdx;
+		*x = 1. - ty;
+		*y = tx;
+		return;
+	default:
+		return;
+	}
+}
+
 static void handle_tablet_tool_position(struct sway_cursor *cursor,
 		struct sway_tablet_tool *tool,
 		bool change_x, bool change_y,
@@ -544,9 +591,13 @@ static void handle_tablet_tool_position(struct sway_cursor *cursor,
 		return;
 	}
 
+
 	struct sway_tablet *tablet = tool->tablet;
 	struct sway_input_device *input_device = tablet->seat_device->input_device;
 	struct input_config *ic = input_device_get_config(input_device);
+
+	apply_transform_to_coords(ic->transform, &x, &y, &dx, &dy);
+
 	if (ic != NULL && ic->mapped_from_region != NULL) {
 		apply_mapping_from_region(input_device->wlr_device,
 			ic->mapped_from_region, &x, &y);

sway/meson.build

@@ -159,6 +159,7 @@ sway_sources = files(
 	'commands/input/clickfinger_button_map.c',
 	'commands/input/drag.c',
 	'commands/input/drag_lock.c',
+	'commands/input/transform.c',
 	'commands/input/dwt.c',
 	'commands/input/dwtp.c',
 	'commands/input/events.c',