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

do wordwrap on "\n" even with !word_wrap

Browse Source
This commit is contained in:
Sascha Kruse 2012-08-22 22:34:31 +02:00
parent b5a7dbee5a
commit 925f3e8731
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dunst.c
View File

@ -373,14 +373,14 @@ void update_lists()
/* TODO get draw_txt_buf as argument */ /* TODO get draw_txt_buf as argument */
int do_word_wrap(char *source, int max_width) int do_word_wrap(char *source, int max_width)
{ {
if (!word_wrap || max_width < 1)
return 1;
strtrim_end(source); strtrim_end(source);
if (!source || source == '\0' || strcmp(source, "") == 0)
if (!source || strlen(source) == 0)
return 0; return 0;
char *eol = source; char *eol = source;
while (True) { while (True) {
if (*eol == '\0') if (*eol == '\0')
return 1; return 1;
@ -394,24 +394,26 @@ int do_word_wrap(char *source, int max_width)
return 1 + do_word_wrap(eol + 2, max_width); return 1 + do_word_wrap(eol + 2, max_width);
} }
if (textnw(dc, source, (eol - source) + 1) >= max_width) { if (word_wrap && max_width > 0) {
/* go back to previous space */ if (textnw(dc, source, (eol - source) + 1) >= max_width) {
char *space = eol; /* go back to previous space */
while (space > source && !isspace(*space)) char *space = eol;
space--; while (space > source && !isspace(*space))
space--;
if (space <= source) { if (space <= source) {
/* whe have a word longer than width, so we /* whe have a word longer than width, so we
* split mid-word. That one letter is * split mid-word. That one letter is
* collateral damage */ * collateral damage */
space = eol; space = eol;
}
*space = '\0';
if (*(space + 1) == '\0')
return 1;
return 1 + do_word_wrap(space + 1, max_width);
} }
*space = '\0';
if (*(space + 1) == '\0')
return 1;
return 1 + do_word_wrap(space + 1, max_width);
} }
eol++; eol++;
} }
} }