From e67f3543332349e63b5099a241fdd85ce28ea54b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 30 Apr 2018 21:24:13 +1000 Subject: 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 --- sway/commands/border.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 sway/commands/border.c (limited to 'sway/commands/border.c') 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 @@ +#include "log.h" +#include "sway/commands.h" +#include "sway/config.h" +#include "sway/tree/container.h" +#include "sway/tree/view.h" + +struct cmd_results *cmd_border(int argc, char **argv) { + struct cmd_results *error = NULL; + if ((error = checkarg(argc, "border", 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, "border", + "Only views can have borders"); + } + struct sway_view *view = container->sway_view; + + if (strcmp(argv[0], "none") == 0) { + view->border = B_NONE; + } else if (strcmp(argv[0], "normal") == 0) { + view->border = B_NORMAL; + } else if (strcmp(argv[0], "pixel") == 0) { + view->border = B_PIXEL; + if (argc == 2) { + view->border_thickness = atoi(argv[1]); + } + } else if (strcmp(argv[0], "toggle") == 0) { + view->border = (view->border + 1) % 3; + } else { + return cmd_results_new(CMD_INVALID, "border", + "Expected 'border ' " + "or 'border pixel '"); + } + + view_autoconfigure(view); + + return cmd_results_new(CMD_SUCCESS, NULL, NULL); +} -- cgit v1.2.3 From 51df1d4ff864f9ba6658d568e24554169363df7b Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 1 May 2018 22:42:08 +1000 Subject: Update cursor when border is changed --- sway/commands/border.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'sway/commands/border.c') diff --git a/sway/commands/border.c b/sway/commands/border.c index 873abb68..1eb06a21 100644 --- a/sway/commands/border.c +++ b/sway/commands/border.c @@ -1,6 +1,8 @@ #include "log.h" #include "sway/commands.h" #include "sway/config.h" +#include "sway/input/cursor.h" +#include "sway/input/input-manager.h" #include "sway/tree/container.h" #include "sway/tree/view.h" @@ -37,5 +39,10 @@ struct cmd_results *cmd_border(int argc, char **argv) { view_autoconfigure(view); + struct sway_seat *seat = input_manager_current_seat(input_manager); + if (seat->cursor) { + cursor_send_pointer_motion(seat->cursor, 0); + } + return cmd_results_new(CMD_SUCCESS, NULL, NULL); } -- cgit v1.2.3