mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-28 06:46:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow arbitrary transforms/rotations.

Browse source
This commit is contained in:
Connor E 2019-03-01 10:12:27 +00:00
parent 88b283c557
commit 353d7230c5
1 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

67
sway/commands/output/transform.c
View file

@ -4,6 +4,13 @@
#include "log.h" #include "log.h"
#include "sway/output.h" #include "sway/output.h"
static enum wl_output_transform rotation_to_transform(int deg, bool flipped) {
// Calculate the modulus.
int mod = (((deg / 90) % 4) + 4) % 4;
// The last 4 variants of wl_output_transform are FLIPPED.
return flipped ? mod + 4 : mod;
}
struct cmd_results *output_cmd_transform(int argc, char **argv) { struct cmd_results *output_cmd_transform(int argc, char **argv) {
if (!config->handler_context.output_config) { if (!config->handler_context.output_config) {
return cmd_results_new(CMD_FAILURE, "Missing output config"); return cmd_results_new(CMD_FAILURE, "Missing output config");
@ -11,27 +18,51 @@ struct cmd_results *output_cmd_transform(int argc, char **argv) {
if (!argc) { if (!argc) {
return cmd_results_new(CMD_INVALID, "Missing transform argument."); return cmd_results_new(CMD_INVALID, "Missing transform argument.");
} }
enum wl_output_transform transform; enum wl_output_transform transform;
if (strcmp(*argv, "normal") == 0 ||
strcmp(*argv, "0") == 0) { // This allows for:
transform = WL_OUTPUT_TRANSFORM_NORMAL; // <deg>
} else if (strcmp(*argv, "90") == 0) { // normal
transform = WL_OUTPUT_TRANSFORM_90; // normal-<deg>
} else if (strcmp(*argv, "180") == 0) { // flipped
transform = WL_OUTPUT_TRANSFORM_180; // flipped-<deg>
} else if (strcmp(*argv, "270") == 0) {
transform = WL_OUTPUT_TRANSFORM_270; if (strncmp(*argv, "normal", 6) == 0) {
} else if (strcmp(*argv, "flipped") == 0) { int len = strlen(*argv);
transform = WL_OUTPUT_TRANSFORM_FLIPPED; if (len >= 8) {
} else if (strcmp(*argv, "flipped-90") == 0) { char *end = NULL;
transform = WL_OUTPUT_TRANSFORM_FLIPPED_90; int deg = strtol(&(*argv)[7], &end, 10);
} else if (strcmp(*argv, "flipped-180") == 0) { if (end == *argv) {
transform = WL_OUTPUT_TRANSFORM_FLIPPED_180; return cmd_results_new(CMD_INVALID, "Invalid output rotation.");
} else if (strcmp(*argv, "flipped-270") == 0) { }
transform = WL_OUTPUT_TRANSFORM_FLIPPED_270; transform = rotation_to_transform(deg, false);
} else {
transform = WL_OUTPUT_TRANSFORM_NORMAL;
}
} else if (strncmp(*argv, "flipped", 7) == 0) {
int len = strlen(*argv);
if (len >= 9) {
char *end = NULL;
int deg = strtol(&(*argv)[8], &end, 10);
if (end == *argv) {
return cmd_results_new(CMD_INVALID, "Invalid output rotation.");
}
transform = rotation_to_transform(deg, true);
} else {
transform = WL_OUTPUT_TRANSFORM_FLIPPED;
}
} else { } else {
return cmd_results_new(CMD_INVALID, "Invalid output transform."); char *end = NULL;
int deg = strtol(*argv, &end, 10);
if (end == *argv) {
// A rotation wasn't passed and none of the other transforms
// matched, so it's an invalid *transform*.
return cmd_results_new(CMD_INVALID, "Invalid output transform.");
}
transform = rotation_to_transform(deg, false);
} }
struct output_config *output = config->handler_context.output_config; struct output_config *output = config->handler_context.output_config;
config->handler_context.leftovers.argc = argc - 1; config->handler_context.leftovers.argc = argc - 1;
config->handler_context.leftovers.argv = argv + 1; config->handler_context.leftovers.argv = argv + 1;