diff options
| author | Timo Sirainen <cras@irssi.org> | 2001-03-03 18:22:09 +0000 |
|---|---|---|
| committer | cras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564> | 2001-03-03 18:22:09 +0000 |
| commit | fcd8810b6ca21551ca3ca9c99a5b18e38c4baca4 (patch) | |
| tree | 6811e74d1cf64c17937317837cfd4a2ac958d6eb /src/fe-text/gui-windows.c | |
| parent | 88094fa9f28476241c1fb39ca937defe37b60e4f (diff) | |
| download | irssi-fcd8810b6ca21551ca3ca9c99a5b18e38c4baca4.zip | |
Removed all beep handling from text printing. If you want to beep just
send "beep" signal.
/LAST -clear crashed if window contained only lastlog lines. Some other
minor cleanups.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1312 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-text/gui-windows.c')
| -rw-r--r-- | src/fe-text/gui-windows.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/fe-text/gui-windows.c b/src/fe-text/gui-windows.c index f791cc9a..d206f62e 100644 --- a/src/fe-text/gui-windows.c +++ b/src/fe-text/gui-windows.c @@ -270,7 +270,8 @@ static LINE_CACHE_REC *gui_window_line_cache(GUI_WINDOW_REC *gui, LINE_CACHE_REC *rec; LINE_CACHE_SUB_REC *sub; GSList *lines; - unsigned char *ptr, *last_space_ptr; + unsigned char cmd; + char *ptr, *last_space_ptr; int xpos, pos, indent_pos, last_space, last_color, color; g_return_val_if_fail(line->text != NULL, NULL); @@ -282,25 +283,28 @@ static LINE_CACHE_REC *gui_window_line_cache(GUI_WINDOW_REC *gui, last_space = last_color = 0; last_space_ptr = NULL; sub = NULL; rec->count = 1; lines = NULL; - for (ptr = (unsigned char *) line->text;;) { + for (ptr = line->text;;) { if (*ptr == '\0') { /* command */ ptr++; - if (*ptr == LINE_CMD_EOL || *ptr == LINE_CMD_FORMAT) + cmd = *ptr; + ptr++; + + if (cmd == LINE_CMD_EOL || cmd == LINE_CMD_FORMAT) break; - if (*ptr == LINE_CMD_CONTINUE) { - unsigned char *tmp; + if (cmd == LINE_CMD_CONTINUE) { + char *tmp; - memcpy(&tmp, ptr+1, sizeof(char *)); + memcpy(&tmp, ptr, sizeof(char *)); ptr = tmp; continue; } - if ((*ptr & 0x80) == 0) { + if ((cmd & 0x80) == 0) { /* set color */ - color = (color & ATTR_UNDERLINE) | *ptr; - } else switch (*ptr) { + color = (color & ATTR_UNDERLINE) | cmd; + } else switch (cmd) { case LINE_CMD_UNDERLINE: color ^= ATTR_UNDERLINE; break; @@ -320,8 +324,6 @@ static LINE_CACHE_REC *gui_window_line_cache(GUI_WINDOW_REC *gui, if (xpos < COLS-5) indent_pos = xpos; break; } - - ptr++; continue; } @@ -347,7 +349,7 @@ static LINE_CACHE_REC *gui_window_line_cache(GUI_WINDOW_REC *gui, sub->continues = TRUE; } - sub->start = (char *) ptr; + sub->start = ptr; sub->indent = xpos; sub->color = color; |