alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add default_orientation command

Browse source
This commit is contained in:
Drew DeVault 2018-03-30 10:43:55 -04:00
parent 2d46050281
commit 69eb021767
5 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sway/commands.h
View file

@ -95,6 +95,7 @@ sway_cmd cmd_commands;
sway_cmd cmd_debuglog; sway_cmd cmd_debuglog;
sway_cmd cmd_default_border; sway_cmd cmd_default_border;
sway_cmd cmd_default_floating_border; sway_cmd cmd_default_floating_border;
sway_cmd cmd_default_orientation;
sway_cmd cmd_exec; sway_cmd cmd_exec;
sway_cmd cmd_exec_always; sway_cmd cmd_exec_always;
sway_cmd cmd_exit; sway_cmd cmd_exit;
@ -125,7 +126,6 @@ sway_cmd cmd_move;
sway_cmd cmd_new_float; sway_cmd cmd_new_float;
sway_cmd cmd_new_window; sway_cmd cmd_new_window;
sway_cmd cmd_no_focus; sway_cmd cmd_no_focus;
sway_cmd cmd_orientation;
sway_cmd cmd_output; sway_cmd cmd_output;
sway_cmd cmd_permit; sway_cmd cmd_permit;
sway_cmd cmd_reject; sway_cmd cmd_reject;

1
sway/commands.c
View file

@ -149,6 +149,7 @@ static struct cmd_handler bar_colors_handlers[] = {
/* Config-time only commands. Keep alphabetized */ /* Config-time only commands. Keep alphabetized */
static struct cmd_handler config_handlers[] = { static struct cmd_handler config_handlers[] = {
{ "default_orientation", cmd_default_orientation },
{ "set", cmd_set }, { "set", cmd_set },
{ "swaybg_command", cmd_swaybg_command }, { "swaybg_command", cmd_swaybg_command },
}; };

21
sway/commands/default_orientation.c Normal file
View file

@ -0,0 +1,21 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
struct cmd_results *cmd_default_orientation(int argc, char **argv) {
struct cmd_results *error = NULL;
if ((error = checkarg(argc, "default_orientation", EXPECTED_EQUAL_TO, 1))) {
return error;
}
if (strcasecmp(argv[0], "horizontal") == 0) {
config->default_orientation = L_HORIZ;
} else if (strcasecmp(argv[0], "vertical") == 0) {
config->default_orientation = L_VERT;
} else if (strcasecmp(argv[0], "auto") == 0) {
// Do nothing
} else {
return cmd_results_new(CMD_INVALID, "default_orientation",
"Expected 'orientation <horizontal|vertical|auto>'");
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);
}

1
sway/meson.build
View file

@ -8,6 +8,7 @@ sway_sources = files(
'input/keyboard.c', 'input/keyboard.c',
'commands/bar.c', 'commands/bar.c',
'commands/bind.c', 'commands/bind.c',
'commands/default_orientation.c',
'commands/exit.c', 'commands/exit.c',
'commands/exec.c', 'commands/exec.c',
'commands/exec_always.c', 'commands/exec_always.c',

5
sway/tree/layout.c
View file

@ -123,12 +123,11 @@ struct sway_container *container_remove_child(struct sway_container *child) {
enum sway_container_layout container_get_default_layout( enum sway_container_layout container_get_default_layout(
struct sway_container *output) { struct sway_container *output) {
/* TODO WLR
if (config->default_layout != L_NONE) { if (config->default_layout != L_NONE) {
//return config->default_layout; return config->default_layout;
} else if (config->default_orientation != L_NONE) { } else if (config->default_orientation != L_NONE) {
return config->default_orientation; return config->default_orientation;
} else */if (output->width >= output->height) { } else if (output->width >= output->height) {
return L_HORIZ; return L_HORIZ;
} else { } else {
return L_VERT; return L_VERT;