From 27b6971b3690e32ecd56cd0ee503e700e4c783f3 Mon Sep 17 00:00:00 2001 From: Jente Hidskes Date: Fri, 14 Jan 2022 21:22:11 +0100 Subject: [PATCH] cage: remove support for rotating outputs This is now handled through wlr_output_management --- cage.1.scd | 4 ---- cage.c | 9 +-------- output.c | 2 -- server.h | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) diff --git a/cage.1.scd b/cage.1.scd index 4ca1bea..37d4690 100644 --- a/cage.1.scd +++ b/cage.1.scd @@ -27,10 +27,6 @@ activities outside the scope of the running application are prevented. *last* Cage uses only the last connected monitor. *extend* Cage extends the display across all connected monitors. -*-r* - Rotate the output 90 degrees clockwise. This can be specified up to three - times, each resulting in an additional 90 degrees clockwise rotation. - *-s* Allow VT switching diff --git a/cage.c b/cage.c index c5eda4d..a98467f 100644 --- a/cage.c +++ b/cage.c @@ -201,7 +201,6 @@ usage(FILE *file, const char *cage) " -h\t Display this help message\n" " -m extend Extend the display across all connected outputs (default)\n" " -m last Use only the last connected output\n" - " -r\t Rotate the output 90 degrees clockwise, specify up to three times\n" " -s\t Allow VT switching\n" " -v\t Show the version number and exit\n" "\n" @@ -213,7 +212,7 @@ static bool parse_args(struct cg_server *server, int argc, char *argv[]) { int c; - while ((c = getopt(argc, argv, "dhm:rsv")) != -1) { + while ((c = getopt(argc, argv, "dhm:sv")) != -1) { switch (c) { case 'd': server->xdg_decoration = true; @@ -228,12 +227,6 @@ parse_args(struct cg_server *server, int argc, char *argv[]) server->output_mode = CAGE_MULTI_OUTPUT_MODE_EXTEND; } break; - case 'r': - server->output_transform++; - if (server->output_transform > WL_OUTPUT_TRANSFORM_270) { - server->output_transform = WL_OUTPUT_TRANSFORM_NORMAL; - } - break; case 's': server->allow_vt_switch = true; break; diff --git a/output.c b/output.c index 6eca0db..cdf1b54 100644 --- a/output.c +++ b/output.c @@ -217,8 +217,6 @@ handle_new_output(struct wl_listener *listener, void *data) } } - wlr_output_set_transform(wlr_output, output->server->output_transform); - if (server->output_mode == CAGE_MULTI_OUTPUT_MODE_LAST) { struct cg_output *next = wl_container_of(output->link.next, next, link); if (next) { diff --git a/server.h b/server.h index 082a435..0e808c1 100644 --- a/server.h +++ b/server.h @@ -49,7 +49,6 @@ struct cg_server { bool xdg_decoration; bool allow_vt_switch; - enum wl_output_transform output_transform; }; #endif