aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fixed indentation bug

Browse Source
This commit is contained in:
James Booth 2014-11-16 16:27:11 +00:00
parent cd855d3740
commit 90dd1de91a
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui/window.c
View File

@ -641,31 +641,37 @@ _win_print(ProfWin *window, const char show_char, GDateTime *time,
} }
static void static void
_win_print_wrapped(WINDOW *win, const char * const message) _win_indent(WINDOW *win, int size)
{ {
int i = 0; int i = 0;
for (i = 0; i < size; i++) {
waddch(win, ' ');
}
}
static void
_win_print_wrapped(WINDOW *win, const char * const message)
{
int linei = 0; int linei = 0;
int wordi = 0; int wordi = 0;
char *word = malloc(strlen(message) + 1); char *word = malloc(strlen(message) + 1);
char *time_pref = prefs_get_string(PREF_TIME); char *time_pref = prefs_get_string(PREF_TIME);
int wrap_space = 0; int indent = 0;
if (g_strcmp0(time_pref, "minutes") == 0) { if (g_strcmp0(time_pref, "minutes") == 0) {
wrap_space = 8; indent = 8;
} else if (g_strcmp0(time_pref, "seconds") == 0) { } else if (g_strcmp0(time_pref, "seconds") == 0) {
wrap_space = 11; indent = 11;
} }
free(time_pref); free(time_pref);
while (message[linei] != '\0') { while (message[linei] != '\0') {
if (message[linei] == ' ') { if (message[linei] == ' ') {
wprintw(win, " "); waddch(win, ' ');
linei++; linei++;
} else if (message[linei] == '\n') { } else if (message[linei] == '\n') {
waddch(win, '\n'); waddch(win, '\n');
for (i = 0; i < wrap_space; i++) { _win_indent(win, indent);
waddch(win, ' ');
}
linei++; linei++;
} else { } else {
wordi = 0; wordi = 0;
@ -678,28 +684,22 @@ _win_print_wrapped(WINDOW *win, const char * const message)
int maxx = getmaxx(win); int maxx = getmaxx(win);
// word larger than line // word larger than line
if (strlen(word) > (maxx - wrap_space)) { if (strlen(word) > (maxx - indent)) {
int i; int i;
for (i = 0; i < wordi; i++) { for (i = 0; i < wordi; i++) {
curx = getcurx(win); curx = getcurx(win);
if (curx < wrap_space) { if (curx < indent) {
for (i = 0; i < wrap_space; i++) { _win_indent(win, indent);
waddch(win, ' ');
}
} }
waddch(win, word[i]); waddch(win, word[i]);
} }
} else { } else {
if (curx + strlen(word) > maxx) { if (curx + strlen(word) > maxx) {
waddch(win, '\n'); waddch(win, '\n');
for (i = 0; i < wrap_space; i++) { _win_indent(win, indent);
waddch(win, ' ');
}
} }
if (curx < wrap_space) { if (curx < indent) {
for (i = 0; i < wrap_space; i++) { _win_indent(win, indent);
waddch(win, ' ');
}
} }
wprintw(win, "%s", word); wprintw(win, "%s", word);
} }