diff options
| -rw-r--r-- | include/bar/config.h | 2 | ||||
| -rw-r--r-- | include/config.h | 2 | ||||
| -rw-r--r-- | sway/commands.c | 16 | ||||
| -rw-r--r-- | sway/config.c | 2 | ||||
| -rw-r--r-- | sway/ipc-server.c | 2 | ||||
| -rw-r--r-- | sway/sway-bar.5.txt | 2 | ||||
| -rw-r--r-- | swaybar/config.c | 2 | ||||
| -rw-r--r-- | swaybar/ipc.c | 4 | ||||
| -rw-r--r-- | swaybar/render.c | 4 |
9 files changed, 18 insertions, 18 deletions
diff --git a/include/bar/config.h b/include/bar/config.h index 27e0ec29..c0e3d2a7 100644 --- a/include/bar/config.h +++ b/include/bar/config.h @@ -20,7 +20,7 @@ struct box_colors { */ struct config { char *status_command; - bool plaintext_markup; + bool pango_markup; uint32_t position; char *font; char *sep_symbol; diff --git a/include/config.h b/include/config.h index c6f63134..37b97665 100644 --- a/include/config.h +++ b/include/config.h @@ -116,7 +116,7 @@ struct bar_config { enum desktop_shell_panel_position position; list_t *bindings; char *status_command; - bool plaintext_markup; + bool pango_markup; char *swaybar_command; char *font; int height; // -1 not defined diff --git a/sway/commands.c b/sway/commands.c index 3c312ae8..08d3f09d 100644 --- a/sway/commands.c +++ b/sway/commands.c @@ -103,7 +103,7 @@ static sway_cmd bar_cmd_id; static sway_cmd bar_cmd_position; static sway_cmd bar_cmd_separator_symbol; static sway_cmd bar_cmd_status_command; -static sway_cmd bar_cmd_plaintext_markup; +static sway_cmd bar_cmd_pango_markup; static sway_cmd bar_cmd_strip_workspace_numbers; static sway_cmd bar_cmd_swaybar_command; static sway_cmd bar_cmd_tray_output; @@ -2758,24 +2758,24 @@ static struct cmd_results *bar_cmd_status_command(int argc, char **argv) { return cmd_results_new(CMD_SUCCESS, NULL, NULL); } -static struct cmd_results *bar_cmd_plaintext_markup(int argc, char **argv) { +static struct cmd_results *bar_cmd_pango_markup(int argc, char **argv) { struct cmd_results *error = NULL; - if ((error = checkarg(argc, "plaintext_markup", EXPECTED_EQUAL_TO, 1))) { + if ((error = checkarg(argc, "pango_markup", EXPECTED_EQUAL_TO, 1))) { return error; } if (!config->current_bar) { - return cmd_results_new(CMD_FAILURE, "plaintext_markup", "No bar defined."); + return cmd_results_new(CMD_FAILURE, "pango_markup", "No bar defined."); } if (strcasecmp("pango", argv[0]) == 0) { - config->current_bar->plaintext_markup = true; + config->current_bar->pango_markup = true; sway_log(L_DEBUG, "Enabling pango markup for bar: %s", config->current_bar->id); } else if (strcasecmp("none", argv[0]) == 0) { - config->current_bar->plaintext_markup = false; + config->current_bar->pango_markup = false; sway_log(L_DEBUG, "Disabling pango markup for bar: %s", config->current_bar->id); } else { - error = cmd_results_new(CMD_INVALID, "plaintext_markup", "Invalid value %s", argv[0]); + error = cmd_results_new(CMD_INVALID, "pango_markup", "Invalid value %s", argv[0]); return error; } return cmd_results_new(CMD_SUCCESS, NULL, NULL); @@ -2885,7 +2885,7 @@ static struct cmd_handler bar_handlers[] = { { "mode", bar_cmd_mode }, { "modifier", bar_cmd_modifier }, { "output", bar_cmd_output }, - { "plaintext_markup", bar_cmd_plaintext_markup }, + { "pango_markup", bar_cmd_pango_markup }, { "position", bar_cmd_position }, { "separator_symbol", bar_cmd_separator_symbol }, { "status_command", bar_cmd_status_command }, diff --git a/sway/config.c b/sway/config.c index 3c14032b..ebcee95b 100644 --- a/sway/config.c +++ b/sway/config.c @@ -1022,7 +1022,7 @@ struct bar_config *default_bar_config(void) { bar->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; bar->bindings = create_list(); bar->status_command = strdup("while :; do date +'%Y-%m-%d %l:%M:%S %p' && sleep 1; done"); - bar->plaintext_markup = true; + bar->pango_markup = true; bar->swaybar_command = NULL; bar->font = NULL; bar->height = -1; diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 0ab6af49..4d9264e8 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c @@ -600,7 +600,7 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { json_object_object_add(json, "strip_workspace_numbers", json_object_new_boolean(bar->strip_workspace_numbers)); json_object_object_add(json, "binding_mode_indicator", json_object_new_boolean(bar->binding_mode_indicator)); json_object_object_add(json, "verbose", json_object_new_boolean(bar->verbose)); - json_object_object_add(json, "plaintext_markup", json_object_new_boolean(bar->plaintext_markup)); + json_object_object_add(json, "pango_markup", json_object_new_boolean(bar->pango_markup)); json_object *colors = json_object_new_object(); 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 558a9564..25b59946 100644 --- a/sway/sway-bar.5.txt +++ b/sway/sway-bar.5.txt @@ -21,7 +21,7 @@ Commands **status_command** <status command>:: Executes the bar _status command_ with _sh -c_. -**plaintext_markup** <pango|none>:: +**pango_markup** <pango|none>:: Enables or disables pango markup for plaintext statuslines. **id** <bar_id>:: diff --git a/swaybar/config.c b/swaybar/config.c index 7ef9a07e..7bd22c91 100644 --- a/swaybar/config.c +++ b/swaybar/config.c @@ -46,7 +46,7 @@ char *parse_font(const char *font) { struct config *init_config() { struct config *config = calloc(1, sizeof(struct config)); config->status_command = NULL; - config->plaintext_markup = true; + config->pango_markup = true; config->position = DESKTOP_SHELL_PANEL_POSITION_BOTTOM; config->font = strdup("monospace 10"); config->mode = NULL; diff --git a/swaybar/ipc.c b/swaybar/ipc.c index 0446f38a..dacee4c2 100644 --- a/swaybar/ipc.c +++ b/swaybar/ipc.c @@ -27,7 +27,7 @@ static void ipc_parse_config(struct config *config, const char *payload) { json_object_object_get_ex(bar_config, "separator_symbol", &sep_symbol); json_object_object_get_ex(bar_config, "colors", &colors); json_object_object_get_ex(bar_config, "outputs", &outputs); - json_object_object_get_ex(bar_config, "plaintext_markup", &markup); + json_object_object_get_ex(bar_config, "pango_markup", &markup); if (status_command) { free(config->status_command); @@ -65,7 +65,7 @@ static void ipc_parse_config(struct config *config, const char *payload) { } if (markup) { - config->plaintext_markup = json_object_get_boolean(markup); + config->pango_markup = json_object_get_boolean(markup); } // free previous outputs list diff --git a/swaybar/render.c b/swaybar/render.c index b9ef2242..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 int width, height; if (line->protocol == TEXT) { - get_text_size(window->cairo, window->font, &width, &height, config->plaintext_markup, "%s", line->text_line); + get_text_size(window->cairo, window->font, &width, &height, config->pango_markup, "%s", line->text_line); cairo_move_to(cairo, window->width - margin - width, margin); - pango_printf(window->cairo, window->font, config->plaintext_markup, "%s", line->text_line); + pango_printf(window->cairo, window->font, config->pango_markup, "%s", line->text_line); } else if (line->protocol == I3BAR && line->block_line) { double pos = window->width - 0.5; bool edge = true; |