aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-04-17 08:11:50 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-04-17 08:11:50 +1000
commitbfd5834f4c1046c234ceaae212e65e045cd51460 (patch)
treefc789c66bd9c20bfc30307c3f675d9c4079b5c4c /sway/commands
parent52420cc24d61db8d22cf0d391f1f84b37bf087d5 (diff)
Feedback for fullscreen.
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/fullscreen.c14
1 files changed, 4 insertions, 10 deletions
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 <enable|disable|toggle>'");
+ "Expected 'fullscreen' or fullscreen <enable|disable|toggle>'");
}
view_set_fullscreen(view, wants_fullscreen);