nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

draw_win don't draw separator after every line

Browse Source
This commit is contained in:
Sascha Kruse 2012-12-11 00:31:32 +01:00
parent e380849c24
commit 034505c356
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dunst.c
View File

@ -106,7 +106,7 @@ void move_all_to_history(void);
void print_version(void); void print_version(void);
void r_line_cache_init(r_line_cache *c); void r_line_cache_init(r_line_cache *c);
void r_line_cache_append(r_line_cache *c, const char *s, ColorSet *col); void r_line_cache_append(r_line_cache *c, const char *s, ColorSet *col, bool continues);
void r_line_cache_reset(r_line_cache *c); void r_line_cache_reset(r_line_cache *c);
/* show warning notification */ /* show warning notification */
@ -396,7 +396,7 @@ void r_line_cache_init(r_line_cache *c)
c->lines = NULL; c->lines = NULL;
} }
void r_line_cache_append(r_line_cache *c, const char *s, ColorSet *col) void r_line_cache_append(r_line_cache *c, const char *s, ColorSet *col, bool continues)
{ {
if (!c || !s) if (!c || !s)
return; return;
@ -410,6 +410,7 @@ void r_line_cache_append(r_line_cache *c, const char *s, ColorSet *col)
c->count++; c->count++;
c->lines[c->count-1].colors = col; c->lines[c->count-1].colors = col;
c->lines[c->count-1].str = strdup(s); c->lines[c->count-1].str = strdup(s);
c->lines[c->count-1].continues = continues;
} }
void r_line_cache_reset(r_line_cache *c) void r_line_cache_reset(r_line_cache *c)
@ -523,7 +524,7 @@ void add_notification_to_line_cache(notification *n, int max_width)
n->line_count = linecnt; n->line_count = linecnt;
char *cur = buf; char *cur = buf;
for (int i = 0; i < linecnt; i++) { for (int i = 0; i < linecnt; i++) {
r_line_cache_append(&line_cache, cur, n->colors); r_line_cache_append(&line_cache, cur, n->colors, i+1 != linecnt);
while (*cur != '\0') while (*cur != '\0')
cur++; cur++;
@ -674,7 +675,7 @@ void fill_line_cache(int width)
asprintf(&tmp, "(%d more)", queue_cnt); asprintf(&tmp, "(%d more)", queue_cnt);
ColorSet *last_colors = ColorSet *last_colors =
line_cache.lines[line_cache.count-1].colors; line_cache.lines[line_cache.count-1].colors;
r_line_cache_append(&line_cache, strdup(tmp), last_colors); r_line_cache_append(&line_cache, strdup(tmp), last_colors, false);
free(tmp); free(tmp);
} else { } else {
char *old = line_cache.lines[0].str; char *old = line_cache.lines[0].str;
@ -735,7 +736,7 @@ void draw_win(void)
dc->y += line_height - ((line_height - font_h) / 2); dc->y += line_height - ((line_height - font_h) / 2);
/* draw separator */ /* draw separator */
if (separator_height > 0 && i < line_cache.count - 1) { if (separator_height > 0 && i < line_cache.count - 1 && !line.continues) {
dc->x = 0; dc->x = 0;
double color; double color;
if (sep_color == AUTO) if (sep_color == AUTO)

1
dunst.h
View File

@ -86,6 +86,7 @@ typedef struct _keyboard_shortcut {
typedef struct _r_line { typedef struct _r_line {
ColorSet *colors; ColorSet *colors;
char *str; char *str;
bool continues;
} r_line; } r_line;
typedef struct r_line_cache { typedef struct r_line_cache {