diff options
-rw-r--r-- | include/bar/config.h | 1 | ||||
-rw-r--r-- | include/config.h | 1 | ||||
-rw-r--r-- | sway/commands.c | 25 | ||||
-rw-r--r-- | sway/config.c | 1 | ||||
-rw-r--r-- | sway/ipc-server.c | 1 | ||||
-rw-r--r-- | sway/sway-bar.5.txt | 3 | ||||
-rw-r--r-- | swaybar/config.c | 1 | ||||
-rw-r--r-- | swaybar/ipc.c | 6 | ||||
-rw-r--r-- | swaybar/render.c | 4 |
9 files changed, 41 insertions, 2 deletions
diff --git a/include/bar/config.h b/include/bar/config.h index fc938c38..c0e3d2a7 100644 --- a/include/bar/config.h +++ b/include/bar/config.h | |||
@@ -20,6 +20,7 @@ struct box_colors { | |||
20 | */ | 20 | */ |
21 | struct config { | 21 | struct config { |
22 | char *status_command; | 22 | char *status_command; |
23 | bool pango_markup; | ||
23 | uint32_t position; | 24 | uint32_t position; |
24 | char *font; | 25 | char *font; |
25 | char *sep_symbol; | 26 | char *sep_symbol; |
diff --git a/include/config.h b/include/config.h index d7e96e74..37b97665 100644 --- a/include/config.h +++ b/include/config.h | |||
@@ -116,6 +116,7 @@ struct bar_config { | |||
116 | enum desktop_shell_panel_position position; | 116 | enum desktop_shell_panel_position position; |
117 | list_t *bindings; | 117 | list_t *bindings; |
118 | char *status_command; | 118 | char *status_command; |
119 | bool pango_markup; | ||
119 | char *swaybar_command; | 120 | char *swaybar_command; |
120 | char *font; | 121 | char *font; |
121 | int height; // -1 not defined | 122 | int height; // -1 not defined |
diff --git a/sway/commands.c b/sway/commands.c index b7c1a344..11284577 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -103,6 +103,7 @@ static sway_cmd bar_cmd_id; | |||
103 | static sway_cmd bar_cmd_position; | 103 | static sway_cmd bar_cmd_position; |
104 | static sway_cmd bar_cmd_separator_symbol; | 104 | static sway_cmd bar_cmd_separator_symbol; |
105 | static sway_cmd bar_cmd_status_command; | 105 | static sway_cmd bar_cmd_status_command; |
106 | static sway_cmd bar_cmd_pango_markup; | ||
106 | static sway_cmd bar_cmd_strip_workspace_numbers; | 107 | static sway_cmd bar_cmd_strip_workspace_numbers; |
107 | static sway_cmd bar_cmd_swaybar_command; | 108 | static sway_cmd bar_cmd_swaybar_command; |
108 | static sway_cmd bar_cmd_tray_output; | 109 | static sway_cmd bar_cmd_tray_output; |
@@ -2757,6 +2758,29 @@ static struct cmd_results *bar_cmd_status_command(int argc, char **argv) { | |||
2757 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 2758 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |
2758 | } | 2759 | } |
2759 | 2760 | ||
2761 | static struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { | ||
2762 | struct cmd_results *error = NULL; | ||
2763 | if ((error = checkarg(argc, "pango_markup", EXPECTED_EQUAL_TO, 1))) { | ||
2764 | return error; | ||
2765 | } | ||
2766 | |||
2767 | if (!config->current_bar) { | ||
2768 | return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); | ||
2769 | } | ||
2770 | |||
2771 | if (strcasecmp("enabled", argv[0]) == 0) { | ||
2772 | config->current_bar->pango_markup = true; | ||
2773 | sway_log(L_DEBUG, "Enabling pango markup for bar: %s", config->current_bar->id); | ||
2774 | } else if (strcasecmp("disabled", argv[0]) == 0) { | ||
2775 | config->current_bar->pango_markup = false; | ||
2776 | sway_log(L_DEBUG, "Disabling pango markup for bar: %s", config->current_bar->id); | ||
2777 | } else { | ||
2778 | error = cmd_results_new(CMD_INVALID, "pango_markup", "Invalid value %s", argv[0]); | ||
2779 | return error; | ||
2780 | } | ||
2781 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
2782 | } | ||
2783 | |||
2760 | static struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { | 2784 | static struct cmd_results *bar_cmd_strip_workspace_numbers(int argc, char **argv) { |
2761 | struct cmd_results *error = NULL; | 2785 | struct cmd_results *error = NULL; |
2762 | if ((error = checkarg(argc, "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) { | 2786 | if ((error = checkarg(argc, "strip_workspace_numbers", EXPECTED_EQUAL_TO, 1))) { |
@@ -2861,6 +2885,7 @@ static struct cmd_handler bar_handlers[] = { | |||
2861 | { "mode", bar_cmd_mode }, | 2885 | { "mode", bar_cmd_mode }, |
2862 | { "modifier", bar_cmd_modifier }, | 2886 | { "modifier", bar_cmd_modifier }, |
2863 | { "output", bar_cmd_output }, | 2887 | { "output", bar_cmd_output }, |
2888 | { "pango_markup", bar_cmd_pango_markup }, | ||
2864 | { "position", bar_cmd_position }, | 2889 | { "position", bar_cmd_position }, |
2865 | { "separator_symbol", bar_cmd_separator_symbol }, | 2890 | { "separator_symbol", bar_cmd_separator_symbol }, |
2866 | { "status_command", bar_cmd_status_command }, | 2891 | { "status_command", bar_cmd_status_command }, |
diff --git a/sway/config.c b/sway/config.c index a917d348..ebcee95b 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -1022,6 +1022,7 @@ struct bar_config *default_bar_config(void) { | |||
1022 | bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; | 1022 | bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; |
1023 | bar->bindings = create_list(); | 1023 | bar->bindings = create_list(); |
1024 | bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); | 1024 | bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); |
1025 | bar->pango_markup = true; | ||
1025 | bar->swaybar_command = NULL; | 1026 | bar->swaybar_command = NULL; |
1026 | bar->font = NULL; | 1027 | bar->font = NULL; |
1027 | bar->height = -1; | 1028 | bar->height = -1; |
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index f6116921..4d9264e8 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
@@ -600,6 +600,7 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { | |||
600 | json_object_object_add(json, "strip_workspace_numbers", json_object_new_boolean(bar->strip_workspace_numbers)); | 600 | json_object_object_add(json, "strip_workspace_numbers", json_object_new_boolean(bar->strip_workspace_numbers)); |
601 | json_object_object_add(json, "binding_mode_indicator", json_object_new_boolean(bar->binding_mode_indicator)); | 601 | json_object_object_add(json, "binding_mode_indicator", json_object_new_boolean(bar->binding_mode_indicator)); |
602 | json_object_object_add(json, "verbose", json_object_new_boolean(bar->verbose)); | 602 | json_object_object_add(json, "verbose", json_object_new_boolean(bar->verbose)); |
603 | json_object_object_add(json, "pango_markup", json_object_new_boolean(bar->pango_markup)); | ||
603 | 604 | ||
604 | json_object *colors = json_object_new_object(); | 605 | json_object *colors = json_object_new_object(); |
605 | json_object_object_add(colors, "background", json_object_new_string(bar->colors.background)); | 606 | json_object_object_add(colors, "background", json_object_new_string(bar->colors.background)); |
diff --git a/sway/sway-bar.5.txt b/sway/sway-bar.5.txt index c23519a4..30c7d9bf 100644 --- a/sway/sway-bar.5.txt +++ b/sway/sway-bar.5.txt | |||
@@ -21,6 +21,9 @@ Commands | |||
21 | **status_command** <status command>:: | 21 | **status_command** <status command>:: |
22 | Executes the bar _status command_ with _sh -c_. | 22 | Executes the bar _status command_ with _sh -c_. |
23 | 23 | ||
24 | **pango_markup** <enabled|disabled>:: | ||
25 | Enables or disables pango markup for plaintext statuslines. | ||
26 | |||
24 | **id** <bar_id>:: | 27 | **id** <bar_id>:: |
25 | Sets the ID of the bar. | 28 | Sets the ID of the bar. |
26 | 29 | ||
diff --git a/swaybar/config.c b/swaybar/config.c index 6b9ff86b..7bd22c91 100644 --- a/swaybar/config.c +++ b/swaybar/config.c | |||
@@ -46,6 +46,7 @@ char *parse_font(const char *font) { | |||
46 | struct config *init_config() { | 46 | struct config *init_config() { |
47 | struct config *config = calloc(1, sizeof(struct config)); | 47 | struct config *config = calloc(1, sizeof(struct config)); |
48 | config->status_command = NULL; | 48 | config->status_command = NULL; |
49 | config->pango_markup = true; | ||
49 | config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; | 50 | config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; |
50 | config->font = strdup("monospace 10"); | 51 | config->font = strdup("monospace 10"); |
51 | config->mode = NULL; | 52 | config->mode = NULL; |
diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 312c79b9..dacee4c2 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c | |||
@@ -12,6 +12,7 @@ static void ipc_parse_config(struct config *config, const char *payload) { | |||
12 | json_object *tray_output, *mode, *hidden_bar, *position, *status_command; | 12 | json_object *tray_output, *mode, *hidden_bar, *position, *status_command; |
13 | json_object *font, *bar_height, *workspace_buttons, *strip_workspace_numbers; | 13 | json_object *font, *bar_height, *workspace_buttons, *strip_workspace_numbers; |
14 | json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs; | 14 | json_object *binding_mode_indicator, *verbose, *colors, *sep_symbol, *outputs; |
15 | json_object *markup; | ||
15 | json_object_object_get_ex(bar_config, "tray_output", &tray_output); | 16 | json_object_object_get_ex(bar_config, "tray_output", &tray_output); |
16 | json_object_object_get_ex(bar_config, "mode", &mode); | 17 | json_object_object_get_ex(bar_config, "mode", &mode); |
17 | json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar); | 18 | json_object_object_get_ex(bar_config, "hidden_bar", &hidden_bar); |
@@ -26,6 +27,7 @@ static void ipc_parse_config(struct config *config, const char *payload) { | |||
26 | json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol); | 27 | json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol); |
27 | json_object_object_get_ex(bar_config, "colors", &colors); | 28 | json_object_object_get_ex(bar_config, "colors", &colors); |
28 | json_object_object_get_ex(bar_config, "outputs", &outputs); | 29 | json_object_object_get_ex(bar_config, "outputs", &outputs); |
30 | json_object_object_get_ex(bar_config, "pango_markup", &markup); | ||
29 | 31 | ||
30 | if (status_command) { | 32 | if (status_command) { |
31 | free(config->status_command); | 33 | free(config->status_command); |
@@ -62,6 +64,10 @@ static void ipc_parse_config(struct config *config, const char *payload) { | |||
62 | config->height = json_object_get_int(bar_height); | 64 | config->height = json_object_get_int(bar_height); |
63 | } | 65 | } |
64 | 66 | ||
67 | if (markup) { | ||
68 | config->pango_markup = json_object_get_boolean(markup); | ||
69 | } | ||
70 | |||
65 | // free previous outputs list | 71 | // free previous outputs list |
66 | int i; | 72 | int i; |
67 | for (i = 0; i < config->outputs->length; ++i) { | 73 | for (i = 0; i < config->outputs->length; ++i) { |
diff --git a/swaybar/render.c b/swaybar/render.c index 5901b557..273bd4f0 100644 --- a/swaybar/render.c +++ b/swaybar/render.c | |||
@@ -278,9 +278,9 @@ void render(struct output *output, struct config *config, struct status_line *li | |||
278 | int width, height; | 278 | int width, height; |
279 | 279 | ||
280 | if (line->protocol == TEXT) { | 280 | if (line->protocol == TEXT) { |
281 | get_text_size(window->cairo, window->font, &width, &height, true, "%s", line->text_line); | 281 | get_text_size(window->cairo, window->font, &width, &height, config->pango_markup, "%s", line->text_line); |
282 | cairo_move_to(cairo, window->width - margin - width, margin); | 282 | cairo_move_to(cairo, window->width - margin - width, margin); |
283 | pango_printf(window->cairo, window->font, true, "%s", line->text_line); | 283 | pango_printf(window->cairo, window->font, config->pango_markup, "%s", line->text_line); |
284 | } else if (line->protocol == I3BAR && line->block_line) { | 284 | } else if (line->protocol == I3BAR && line->block_line) { |
285 | double pos = window->width - 0.5; | 285 | double pos = window->width - 0.5; |
286 | bool edge = true; | 286 | bool edge = true; |