diff options
author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-23 20:36:53 +0100 |
---|---|---|
committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2014-03-24 10:23:56 +0100 |
commit | 1788f077d4ce9fb3481321d7d5c45a5b2ceb5704 (patch) | |
tree | f7e267e4a71febfe572bcf3ade89ca2ab4a6dd69 /src/bar.c | |
parent | 2c41fe2d905f7ba743be164b74761acdef82d08c (diff) | |
download | ratpoison-1788f077d4ce9fb3481321d7d5c45a5b2ceb5704.zip |
Factorize code in update_{window,group}_names.
Diffstat (limited to 'src/bar.c')
-rw-r--r-- | src/bar.c | 32 |
1 files changed, 10 insertions, 22 deletions
@@ -215,24 +215,17 @@ update_window_names (rp_screen *s, char *fmt) struct sbuf *bar_buffer; int mark_start = 0; int mark_end = 0; + char *delimiter; if (s->bar_is_raised != BAR_IS_WINDOW_LIST) return; - bar_buffer = sbuf_new (0); + delimiter = (defaults.window_list_style == STYLE_ROW) ? " " : "\n"; - if(defaults.window_list_style == STYLE_ROW) - { - get_window_list (fmt, NULL, bar_buffer, &mark_start, &mark_end); - marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); - } - else - { - get_window_list (fmt, "\n", bar_buffer, &mark_start, &mark_end); - marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); - } + bar_buffer = sbuf_new (0); + get_window_list (fmt, delimiter, bar_buffer, &mark_start, &mark_end); + marked_message (sbuf_get (bar_buffer), mark_start, mark_end); -/* marked_message (sbuf_get (bar_buffer), mark_start, mark_end); */ sbuf_free (bar_buffer); } @@ -244,21 +237,16 @@ update_group_names (rp_screen *s) struct sbuf *bar_buffer; int mark_start = 0; int mark_end = 0; + char *delimiter; if (s->bar_is_raised != BAR_IS_GROUP_LIST) return; + delimiter = (defaults.window_list_style == STYLE_ROW) ? " " : "\n"; + bar_buffer = sbuf_new (0); - if (defaults.window_list_style == STYLE_ROW) - { - get_group_list (NULL, bar_buffer, &mark_start, &mark_end); - marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); - } - else - { - get_group_list ("\n", bar_buffer, &mark_start, &mark_end); - marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); - } + get_group_list (delimiter, bar_buffer, &mark_start, &mark_end); + marked_message_internal (sbuf_get (bar_buffer), mark_start, mark_end); sbuf_free (bar_buffer); } |