绘制当前显示窗口的名称
This commit is contained in:
22
src/main.c
22
src/main.c
@@ -84,6 +84,7 @@ static uint32_t dpi = dpi_fallback;
|
||||
static uint32_t bar_y_pad = bar_y_padding;
|
||||
static uint32_t tag_x_pad = tag_x_padding;
|
||||
static uint32_t layout_symbol_x_pad = layout_symbol_x_padding;
|
||||
static uint32_t client_name_x_pad = client_name_x_padding;
|
||||
static uint32_t bar_height = 0;
|
||||
static uint32_t border_px = border_width;
|
||||
|
||||
@@ -142,7 +143,9 @@ static void print_color_set(color_set_t *set) {
|
||||
print_color("== tag color:", &set->tag_color);
|
||||
print_color("== active tag color:", &set->active_tag_color);
|
||||
print_color("== layout bg:", &set->layout_color);
|
||||
print_color("== client name bg:", &set->client_name_bg);
|
||||
print_color("== client name color:", &set->client_name_color);
|
||||
print_color("== active client name bg:", &set->active_client_name_bg);
|
||||
print_color("== active client name color:", &set->active_client_name_color);
|
||||
print_color("== status color:", &set->status_color);
|
||||
print_color("== border color:", &set->border_color);
|
||||
@@ -385,7 +388,9 @@ void init_color_set(void) {
|
||||
char *tag = NULL;
|
||||
char *active_tag = NULL;
|
||||
char *layout = NULL;
|
||||
char *client_name_background = NULL;
|
||||
char *client_name = NULL;
|
||||
char *active_client_name_background = NULL;
|
||||
char *active_client_name = NULL;
|
||||
char *status = NULL;
|
||||
char *border = NULL;
|
||||
@@ -398,10 +403,14 @@ void init_color_set(void) {
|
||||
get_xresource_string("zswm.color.tag", &tag, tag_color);
|
||||
get_xresource_string("zswm.color.active_tag", &active_tag, active_tag_color);
|
||||
get_xresource_string("zswm.color.layout", &layout, layout_color);
|
||||
get_xresource_string("zswm.color.client_name", &client_name,
|
||||
get_xresource_string("zswm.color.client_name_bg", &client_name_background,
|
||||
client_name_bg);
|
||||
get_xresource_string("zswm.color.client_name_color", &client_name,
|
||||
client_name_color);
|
||||
get_xresource_string("zswm.color.active_client_name", &active_client_name,
|
||||
active_client_name_color);
|
||||
get_xresource_string("zswm.color.active_client_name_bg",
|
||||
&active_client_name_background, active_client_name_bg);
|
||||
get_xresource_string("zswm.color.active_client_name_color",
|
||||
&active_client_name, active_client_name_color);
|
||||
get_xresource_string("zswm.color.status", &status, status_color);
|
||||
get_xresource_string("zswm.color.border", &border, border_color);
|
||||
get_xresource_string("zswm.color.active_border", &active_border,
|
||||
@@ -413,7 +422,9 @@ void init_color_set(void) {
|
||||
parse_color(tag, &color_set->tag_color);
|
||||
parse_color(active_tag, &color_set->active_tag_color);
|
||||
parse_color(layout, &color_set->layout_color);
|
||||
parse_color(client_name_background, &color_set->client_name_bg);
|
||||
parse_color(client_name, &color_set->client_name_color);
|
||||
parse_color(active_client_name_background, &color_set->active_client_name_bg);
|
||||
parse_color(active_client_name, &color_set->active_client_name_color);
|
||||
parse_color(status, &color_set->status_color);
|
||||
parse_color(border, &color_set->border_color);
|
||||
@@ -425,7 +436,9 @@ void init_color_set(void) {
|
||||
free(tag);
|
||||
free(active_tag);
|
||||
free(layout);
|
||||
free(client_name_background);
|
||||
free(client_name);
|
||||
free(active_client_name_background);
|
||||
free(active_client_name);
|
||||
free(status);
|
||||
free(border);
|
||||
@@ -478,6 +491,7 @@ void get_xresource_config(void) {
|
||||
get_xresource_uint32("zswm.bar_y_padding", &bar_y_pad);
|
||||
get_xresource_uint32("zswm.tag_x_padding", &tag_x_pad);
|
||||
get_xresource_uint32("zswm.layout_symbol_x_padding", &layout_symbol_x_pad);
|
||||
get_xresource_uint32("zswm.client_name_x_padding", &client_name_x_pad);
|
||||
get_xresource_uint32("zswm.border_width", &border_px);
|
||||
|
||||
logger("dpi: %u, font family: %s, font size: %u\n", dpi, font_family,
|
||||
@@ -491,7 +505,7 @@ void draw_all_monitor_bars(void) {
|
||||
|
||||
void draw_monitor_bar(monitor_t *m) {
|
||||
draw_bar(m, m == current_monitor, color_set, bar_height, tag_x_pad,
|
||||
layout_symbol_x_pad);
|
||||
layout_symbol_x_pad, client_name_x_pad);
|
||||
flush_xcb_connection();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user