diff options
Diffstat (limited to 'src/comet.c')
| -rw-r--r-- | src/comet.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/comet.c b/src/comet.c index ed2ea91..617fcb5 100644 --- a/src/comet.c +++ b/src/comet.c @@ -220,10 +220,10 @@ static void menu_action(Button *btn) state_request_redraw(menu_ctx->state, true); } -static void register_buttons(State *state, Color color, Color line_color, Color text_color) +static void register_buttons(State *state, Color color, Color text_color) { // Cpu usage button - Button *cpu_btn = button_simple_create(PANGO_ALIGN_RIGHT, color, line_color); + Button *cpu_btn = button_simple_create(PANGO_ALIGN_RIGHT, color); button_simple_set_text(cpu_btn, g_strdup(" 0%"), text_color); button_simple_set_action(cpu_btn, show_action, state); state_add_button(state, cpu_btn); @@ -232,7 +232,7 @@ static void register_buttons(State *state, Color color, Color line_color, Color g_timeout_add(1000, cpu_update, cpu_btn); // Temperature button - Button *temp_btn = button_simple_create(PANGO_ALIGN_RIGHT, color, line_color); + Button *temp_btn = button_simple_create(PANGO_ALIGN_RIGHT, color); button_simple_set_text(temp_btn, g_strdup("temp"), text_color); button_simple_set_action(temp_btn, show_action, state); state_add_button(state, temp_btn); @@ -241,7 +241,7 @@ static void register_buttons(State *state, Color color, Color line_color, Color g_timeout_add(20 * 1000, temp_update, temp_btn); // Ram usage button - Button *ram_btn = button_simple_create(PANGO_ALIGN_RIGHT, color, line_color); + Button *ram_btn = button_simple_create(PANGO_ALIGN_RIGHT, color); button_simple_set_text(ram_btn, g_strdup("ram"), text_color); button_simple_set_action(ram_btn, show_action, state); state_add_button(state, ram_btn); @@ -250,7 +250,7 @@ static void register_buttons(State *state, Color color, Color line_color, Color g_timeout_add(10 * 1000, ram_update, ram_btn); // Disk usage button - Button *disk_btn = button_simple_create(PANGO_ALIGN_RIGHT, color, line_color); + Button *disk_btn = button_simple_create(PANGO_ALIGN_RIGHT, color); button_simple_set_text(disk_btn, g_strdup("disk"), text_color); button_simple_set_action(disk_btn, show_action, state); state_add_button(state, disk_btn); @@ -280,21 +280,21 @@ int main(int argc, char **argv) log_debug("Calculated dimensions [height=%d, x_pad=%d, y_pad=%d]", height, x_padding, y_padding); Color background_all = { 0.3, 0.3, 0.3, 1 }; - Drawer *draw = draw_create("Hack 13 Bold", height, x_padding, x_padding, y_padding, 0); + Drawer *draw = draw_create("Hack 13 Bold", height, x_padding, x_padding, y_padding); draw_set_background(draw, background_all); State *state = state_create(win, draw); Color color = { 0.4, 0.4, 0.4, 1 }; Color purple = { 0.502, 0.168, 0.886, 1 }; - Color line_color = { 0.8, 0.8, 0.8, 1 }; + //Color line_color = { 0.8, 0.8, 0.8, 1 }; Color text_color = { 0.9, 0.9, 0.9, 1 }; // Dwm tags DwmIpc *dwm = dwm_create(state, "/tmp/dwm.sock"); - dwm_register_tags(dwm, color, purple, text_color, line_color); + dwm_register_tags(dwm, color, purple, text_color); - register_buttons(state, color, line_color, text_color); + register_buttons(state, color, text_color); // Buttons with special handling @@ -304,7 +304,7 @@ int main(int argc, char **argv) } date_ctx = { state, 0 }; // Date & time button - Button *date_btn = button_simple_create(PANGO_ALIGN_CENTER, color, line_color); + Button *date_btn = button_simple_create(PANGO_ALIGN_CENTER, color); button_simple_set_text(date_btn, g_strdup("date"), text_color); button_simple_set_action(date_btn, NULL, &date_ctx); state_add_button(state, date_btn); @@ -317,26 +317,26 @@ int main(int argc, char **argv) date_update(date_btn); // Quit button - Button *q_btn = button_simple_create(PANGO_ALIGN_RIGHT, purple, line_color); + Button *q_btn = button_simple_create(PANGO_ALIGN_RIGHT, purple); button_simple_set_text(q_btn, g_strdup(""), text_color); button_simple_set_action(q_btn, quit_action, mainloop); state_add_button(state, q_btn); // Menu button(s) Color grey = { 0.5, 0.5, 0.5, 1 }; - Button *group = button_group_create(PANGO_ALIGN_LEFT, grey, line_color); + Button *group = button_group_create(PANGO_ALIGN_LEFT, grey); - Button *child1 = button_simple_create(PANGO_ALIGN_CENTER, color, line_color); + Button *child1 = button_simple_create(PANGO_ALIGN_CENTER, color); button_set_padding(child1, 1, 1); button_simple_set_text(child1, g_strdup("C1"), text_color); button_simple_set_action(child1, show_action, NULL); - Button *child2 = button_simple_create(PANGO_ALIGN_CENTER, color, line_color); + Button *child2 = button_simple_create(PANGO_ALIGN_CENTER, color); button_set_padding(child2, 1, 1); button_simple_set_text(child2, g_strdup("C2"), text_color); button_simple_set_action(child2, show_action, NULL); - Button *child3 = button_simple_create(PANGO_ALIGN_CENTER, color, line_color); + Button *child3 = button_simple_create(PANGO_ALIGN_CENTER, color); button_set_padding(child3, 1, 1); button_simple_set_text(child3, g_strdup("C3"), text_color); button_simple_set_action(child3, show_action, NULL); @@ -348,7 +348,7 @@ int main(int argc, char **argv) State *state; } menu_ctx = { (gpointer)group, {"", ""}, NULL, state }; - Button *menu = button_simple_create(PANGO_ALIGN_CENTER, color, line_color); + Button *menu = button_simple_create(PANGO_ALIGN_CENTER, color); button_simple_set_text(menu, g_strdup(menu_ctx.strings[0]), text_color); button_simple_set_action(menu, menu_action, &menu_ctx); |