aboutsummaryrefslogtreecommitdiff
path: root/sway/commands
diff options
context:
space:
mode:
authorRyan Dwyer <ryandwyer1@gmail.com>2018-05-02 23:07:52 +1000
committerRyan Dwyer <ryandwyer1@gmail.com>2018-05-03 15:12:00 +1000
commitb667298a0a1efead7949715a31ec86fe3b8b1cda (patch)
treebc658e3019d741f1f245350003b156d05cc354a2 /sway/commands
parentf3d0885524f4f1dc568baf21fcc8e387a316703f (diff)
Render titles
Diffstat (limited to 'sway/commands')
-rw-r--r--sway/commands/client.c27
-rw-r--r--sway/commands/font.c18
2 files changed, 39 insertions, 6 deletions
diff --git a/sway/commands/client.c b/sway/commands/client.c
index c3dc2ee2..0abd0167 100644
--- a/sway/commands/client.c
+++ b/sway/commands/client.c
@@ -3,7 +3,10 @@
#include "sway/config.h"
#include "sway/tree/container.h"
-static bool parse_color(char *hexstring, float dest[static 4]) {
+/**
+ * Parse the hex string into an integer.
+ */
+static bool parse_color_int(char *hexstring, uint32_t *dest) {
if (hexstring[0] != '#') {
return false;
}
@@ -25,6 +28,18 @@ static bool parse_color(char *hexstring, float dest[static 4]) {
decimal = (decimal << 8) | 0xff;
}
+ *dest = decimal;
+ return true;
+}
+
+/**
+ * Parse the hex string into a float value.
+ */
+static bool parse_color_float(char *hexstring, float dest[static 4]) {
+ uint32_t decimal;
+ if (!parse_color_int(hexstring, &decimal)) {
+ return false;
+ }
dest[0] = ((decimal >> 24) & 0xff) / 255.0;
dest[1] = ((decimal >> 16) & 0xff) / 255.0;
dest[2] = ((decimal >> 8) & 0xff) / 255.0;
@@ -39,27 +54,27 @@ static struct cmd_results *handle_command(int argc, char **argv,
return error;
}
- if (!parse_color(argv[0], class->border)) {
+ if (!parse_color_float(argv[0], class->border)) {
return cmd_results_new(CMD_INVALID, cmd_name,
"Unable to parse border color");
}
- if (!parse_color(argv[1], class->background)) {
+ if (!parse_color_float(argv[1], class->background)) {
return cmd_results_new(CMD_INVALID, cmd_name,
"Unable to parse background color");
}
- if (!parse_color(argv[2], class->text)) {
+ if (!parse_color_int(argv[2], &class->text)) {
return cmd_results_new(CMD_INVALID, cmd_name,
"Unable to parse text color");
}
- if (!parse_color(argv[3], class->indicator)) {
+ if (!parse_color_float(argv[3], class->indicator)) {
return cmd_results_new(CMD_INVALID, cmd_name,
"Unable to parse indicator color");
}
- if (!parse_color(argv[4], class->child_border)) {
+ if (!parse_color_float(argv[4], class->child_border)) {
return cmd_results_new(CMD_INVALID, cmd_name,
"Unable to parse child border color");
}
diff --git a/sway/commands/font.c b/sway/commands/font.c
new file mode 100644
index 00000000..96127055
--- /dev/null
+++ b/sway/commands/font.c
@@ -0,0 +1,18 @@
+#define _POSIX_C_SOURCE 200809L
+#include <string.h>
+#include "sway/commands.h"
+#include "sway/config.h"
+#include "log.h"
+#include "stringop.h"
+
+struct cmd_results *cmd_font(int argc, char **argv) {
+ struct cmd_results *error = NULL;
+ if ((error = checkarg(argc, "font", EXPECTED_AT_LEAST, 1))) {
+ return error;
+ }
+ char *font = join_args(argv, argc);
+ free(config->font);
+ config->font = strdup(font);
+ config->font_height = get_font_text_height(font);
+ return cmd_results_new(CMD_SUCCESS, NULL, NULL);
+}