aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-04-30 21:24:13 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-04-30 21:24:13 +1000
commite67f3543332349e63b5099a241fdd85ce28ea54b (patch)
tree54bede11d48f561693d1288e0980660c644b4dc3 /sway/commands
parentMerge pull request #1873 from RyanDwyer/remove-arrange-windows (diff)
downloadsway-e67f3543332349e63b5099a241fdd85ce28ea54b.tar.gz
sway-e67f3543332349e63b5099a241fdd85ce28ea54b.tar.zst
sway-e67f3543332349e63b5099a241fdd85ce28ea54b.zip
Implement borders
Implements rendering of borders. Title text is still to do. Implements the following configuration directives: * client.focused * client.focused_inactive * client.unfocused * client.urgent * border * default_border
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/border.c41
-rw-r--r--sway/commands/client.c79
-rw-r--r--sway/commands/default_border.c27
3 files changed, 147 insertions, 0 deletions
diff --git a/sway/commands/border.c b/sway/commands/border.c
new file mode 100644
index 00000000..873abb68
--- /dev/null
+++ b/sway/commands/border.c
@@ -0,0 +1,41 @@
1#include "log.h"
2#include "sway/commands.h"
3#include "sway/config.h"
4#include "sway/tree/container.h"
5#include "sway/tree/view.h"
6
7struct cmd_results *cmd_border(int argc, char **argv) {
8 struct cmd_results *error = NULL;
9 if ((error = checkarg(argc, "border", EXPECTED_AT_LEAST, 1))) {
10 return error;
11 }
12
13 struct sway_container *container =
14 config->handler_context.current_container;
15 if (container->type != C_VIEW) {
16 return cmd_results_new(CMD_INVALID, "border",
17 "Only views can have borders");
18 }
19 struct sway_view *view = container->sway_view;
20
21 if (strcmp(argv[0], "none") == 0) {
22 view->border = B_NONE;
23 } else if (strcmp(argv[0], "normal") == 0) {
24 view->border = B_NORMAL;
25 } else if (strcmp(argv[0], "pixel") == 0) {
26 view->border = B_PIXEL;
27 if (argc == 2) {
28 view->border_thickness = atoi(argv[1]);
29 }
30 } else if (strcmp(argv[0], "toggle") == 0) {
31 view->border = (view->border + 1) % 3;
32 } else {
33 return cmd_results_new(CMD_INVALID, "border",
34 "Expected 'border <none|normal|pixel|toggle>' "
35 "or 'border pixel <px>'");
36 }
37
38 view_autoconfigure(view);
39
40 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
41}
diff --git a/sway/commands/client.c b/sway/commands/client.c
new file mode 100644
index 00000000..ce519381
--- /dev/null
+++ b/sway/commands/client.c
@@ -0,0 +1,79 @@
1#include "log.h"
2#include "sway/commands.h"
3#include "sway/config.h"
4#include "sway/tree/container.h"
5
6static bool parse_color(char *hexstring, float (*dest)[4]) {
7 if (hexstring[0] != '#') {
8 return false;
9 }
10
11 if (strlen(hexstring) != 7) {
12 return false;
13 }
14
15 ++hexstring;
16 char *end;
17 uint32_t decimal = strtol(hexstring, &end, 16);
18
19 if (*end != '\0') {
20 return false;
21 }
22
23 (*dest)[0] = ((decimal >> 16) & 0xff) / 255.0;
24 (*dest)[1] = ((decimal >> 8) & 0xff) / 255.0;
25 (*dest)[2] = (decimal & 0xff) / 255.0;
26 (*dest)[3] = 1.0;
27 return true;
28}
29
30static struct cmd_results *handle_command(int argc, char **argv,
31 struct border_colors *class, char *cmd_name) {
32 struct cmd_results *error = NULL;
33 if ((error = checkarg(argc, cmd_name, EXPECTED_EQUAL_TO, 5))) {
34 return error;
35 }
36
37 if (!parse_color(argv[0], &class->border)) {
38 return cmd_results_new(CMD_INVALID, cmd_name,
39 "Unable to parse border color");
40 }
41
42 if (!parse_color(argv[1], &class->background)) {
43 return cmd_results_new(CMD_INVALID, cmd_name,
44 "Unable to parse background color");
45 }
46
47 if (!parse_color(argv[2], &class->text)) {
48 return cmd_results_new(CMD_INVALID, cmd_name,
49 "Unable to parse text color");
50 }
51
52 if (!parse_color(argv[3], &class->indicator)) {
53 return cmd_results_new(CMD_INVALID, cmd_name,
54 "Unable to parse indicator color");
55 }
56
57 if (!parse_color(argv[4], &class->child_border)) {
58 return cmd_results_new(CMD_INVALID, cmd_name,
59 "Unable to parse child border color");
60 }
61
62 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
63}
64
65struct cmd_results *cmd_client_focused(int argc, char **argv) {
66 return handle_command(argc, argv, &config->border_colors.focused, "client.focused");
67}
68
69struct cmd_results *cmd_client_focused_inactive(int argc, char **argv) {
70 return handle_command(argc, argv, &config->border_colors.focused_inactive, "client.focused_inactive");
71}
72
73struct cmd_results *cmd_client_unfocused(int argc, char **argv) {
74 return handle_command(argc, argv, &config->border_colors.unfocused, "client.unfocused");
75}
76
77struct cmd_results *cmd_client_urgent(int argc, char **argv) {
78 return handle_command(argc, argv, &config->border_colors.urgent, "client.urgent");
79}
diff --git a/sway/commands/default_border.c b/sway/commands/default_border.c
new file mode 100644
index 00000000..fcd2c075
--- /dev/null
+++ b/sway/commands/default_border.c
@@ -0,0 +1,27 @@
1#include "log.h"
2#include "sway/commands.h"
3#include "sway/config.h"
4#include "sway/tree/container.h"
5
6struct cmd_results *cmd_default_border(int argc, char **argv) {
7 struct cmd_results *error = NULL;
8 if ((error = checkarg(argc, "default_border", EXPECTED_AT_LEAST, 1))) {
9 return error;
10 }
11
12 if (strcmp(argv[0], "none") == 0) {
13 config->border = B_NONE;
14 } else if (strcmp(argv[0], "normal") == 0) {
15 config->border = B_NORMAL;
16 } else if (strcmp(argv[0], "pixel") == 0) {
17 config->border = B_PIXEL;
18 if (argc == 2) {
19 config->border_thickness = atoi(argv[1]);
20 }
21 } else {
22 return cmd_results_new(CMD_INVALID, "default_border",
23 "Expected 'default_border <none|normal|pixel>' or 'default_border pixel <px>'");
24 }
25
26 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
27}