From 52420cc24d61db8d22cf0d391f1f84b37bf087d5 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 16 Apr 2018 20:36:40 +1000 Subject: Implement fullscreen. --- sway/commands/fullscreen.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 sway/commands/fullscreen.c (limited to 'sway/commands/fullscreen.c') diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c new file mode 100644 index 00000000..3e256282 --- /dev/null +++ b/sway/commands/fullscreen.c @@ -0,0 +1,40 @@ +#include +#include "log.h" +#include "sway/commands.h" +#include "sway/config.h" +#include "sway/tree/container.h" +#include "sway/tree/view.h" +#include "sway/tree/layout.h" + +// fullscreen toggle|enable|disable +struct cmd_results *cmd_fullscreen(int argc, char **argv) { + struct cmd_results *error = NULL; + if (config->reading) return cmd_results_new(CMD_FAILURE, "fullscreen", "Can't be used in config file."); + if (!config->active) return cmd_results_new(CMD_FAILURE, "fullscreen", "Can only be used when sway is running."); + if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 1))) { + return error; + } + struct sway_container *container = + config->handler_context.current_container; + if (container->type != C_VIEW) { + return cmd_results_new(CMD_INVALID, "fullscreen", + "Only views can fullscreen"); + } + struct sway_view *view = container->sway_view; + bool wants_fullscreen; + + if (strcmp(argv[0], "enable") == 0) { + wants_fullscreen = true; + } else if (strcmp(argv[0], "disable") == 0) { + wants_fullscreen = false; + } else if (strcmp(argv[0], "toggle") == 0) { + wants_fullscreen = !view->is_fullscreen; + } else { + return cmd_results_new(CMD_INVALID, "fullscreen", + "Expected 'fullscreen '"); + } + + view_set_fullscreen(view, wants_fullscreen); + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} -- cgit v1.2.3 From bfd5834f4c1046c234ceaae212e65e045cd51460 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 17 Apr 2018 08:11:50 +1000 Subject: Feedback for fullscreen. --- sway/commands/fullscreen.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'sway/commands/fullscreen.c') diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c index 3e256282..5a044aa8 100644 --- a/sway/commands/fullscreen.c +++ b/sway/commands/fullscreen.c @@ -8,12 +8,6 @@ // fullscreen toggle|enable|disable struct cmd_results *cmd_fullscreen(int argc, char **argv) { - struct cmd_results *error = NULL; - if (config->reading) return cmd_results_new(CMD_FAILURE, "fullscreen", "Can't be used in config file."); - if (!config->active) return cmd_results_new(CMD_FAILURE, "fullscreen", "Can only be used when sway is running."); - if ((error = checkarg(argc, "fullscreen", EXPECTED_AT_LEAST, 1))) { - return error; - } struct sway_container *container = config->handler_context.current_container; if (container->type != C_VIEW) { @@ -23,15 +17,15 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) { struct sway_view *view = container->sway_view; bool wants_fullscreen; - if (strcmp(argv[0], "enable") == 0) { + if (argc == 0 || strcmp(argv[0], "toggle") == 0) { + wants_fullscreen = !view->is_fullscreen; + } else if (strcmp(argv[0], "enable") == 0) { wants_fullscreen = true; } else if (strcmp(argv[0], "disable") == 0) { wants_fullscreen = false; - } else if (strcmp(argv[0], "toggle") == 0) { - wants_fullscreen = !view->is_fullscreen; } else { return cmd_results_new(CMD_INVALID, "fullscreen", - "Expected 'fullscreen '"); + "Expected 'fullscreen' or fullscreen '"); } view_set_fullscreen(view, wants_fullscreen); -- cgit v1.2.3 From 72beae209b03815e39d0aaa11348fa17c8a7bca9 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Wed, 18 Apr 2018 00:10:32 +1000 Subject: Fullscreen fixes. --- sway/commands/fullscreen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'sway/commands/fullscreen.c') diff --git a/sway/commands/fullscreen.c b/sway/commands/fullscreen.c index 5a044aa8..8692e92d 100644 --- a/sway/commands/fullscreen.c +++ b/sway/commands/fullscreen.c @@ -6,8 +6,11 @@ #include "sway/tree/view.h" #include "sway/tree/layout.h" -// fullscreen toggle|enable|disable struct cmd_results *cmd_fullscreen(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "fullscreen", EXPECTED_LESS_THAN, 2))) { + return error; + } struct sway_container *container = config->handler_context.current_container; if (container->type != C_VIEW) { @@ -25,7 +28,7 @@ struct cmd_results *cmd_fullscreen(int argc, char **argv) { wants_fullscreen = false; } else { return cmd_results_new(CMD_INVALID, "fullscreen", - "Expected 'fullscreen' or fullscreen '"); + "Expected 'fullscreen' or 'fullscreen '"); } view_set_fullscreen(view, wants_fullscreen); -- cgit v1.2.3