--- rxvt-unicode/src/screen.C 2005/06/22 14:33:23 1.164 +++ rxvt-unicode/src/screen.C 2005/11/28 19:35:04 1.170 @@ -443,7 +443,6 @@ rxvt_term::scr_release () { unsigned int total_rows; - int i; total_rows = TermWin.nrow + TermWin.saveLines; @@ -775,14 +774,15 @@ void rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) { + if (len <= 0) /* sanity */ + return; + unsigned char checksel; unicode_t c; - int i, row, last_col; + int row, last_col; text_t *stp; rend_t *srp; - - if (len <= 0) /* sanity */ - return; + const unicode_t *strend = str + len; want_refresh = 1; ZERO_SCROLLBACK (); @@ -817,39 +817,40 @@ stp = screen.text[row]; srp = screen.rend[row]; - while (len--) + while (str < strend) { c = *str++; if (c < 0x20) - switch (c) + if (c == C0_LF) + { + if (screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT (screen.tlen[row], screen.cur.col); + + screen.flags &= ~Screen_WrapNext; + + if (screen.cur.row == screen.bscroll) + scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); + else if (screen.cur.row < (TermWin.nrow - 1)) + row = (++screen.cur.row) + TermWin.saveLines; + + stp = screen.text[row]; /* _must_ refresh */ + srp = screen.rend[row]; /* _must_ refresh */ + continue; + } + else if (c == C0_CR) + { + if (screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT (screen.tlen[row], screen.cur.col); + + screen.flags &= ~Screen_WrapNext; + screen.cur.col = 0; + continue; + } + else if (c == C0_HT) { - case C0_HT: - scr_tab (1, true); - continue; - - case C0_LF: - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); - - screen.flags &= ~Screen_WrapNext; - - if (screen.cur.row == screen.bscroll) - scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); - else if (screen.cur.row < (TermWin.nrow - 1)) - row = (++screen.cur.row) + TermWin.saveLines; - - stp = screen.text[row]; /* _must_ refresh */ - srp = screen.rend[row]; /* _must_ refresh */ - continue; - - case C0_CR: - if (screen.tlen[row] != -1) /* XXX: think about this */ - MAX_IT (screen.tlen[row], screen.cur.col); - - screen.flags &= ~Screen_WrapNext; - screen.cur.col = 0; - continue; + scr_tab (1, true); + continue; } if (checksel /* see if we're writing within selection */ @@ -869,15 +870,21 @@ { screen.tlen[row] = -1; - scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; - + scr_do_wrap (); + + row = screen.cur.row + TermWin.saveLines; stp = screen.text[row]; /* _must_ refresh */ srp = screen.rend[row]; /* _must_ refresh */ } + // some utf-8 decoders "decode" surrogate characters: let's fix this. + if (IN_RANGE (c, 0xd800, 0xdfff)) + c = 0xfffd; + // rely on wcwidth to tell us the character width, at least for non-latin1 - // do wcwidth before further replacements, as wcwidth says that line-drawing - // characters have width -1 (DOH!) on GNU/Linux sometimes. + // do wcwidth before further replacements, as wcwidth might return -1 + // for the line drawing characters below as they might be invalid in the current + // locale. int width = c < 0x100 ? 1 : wcwidth (c); if (charsets[screen.charset] == '0') // DEC SPECIAL @@ -885,21 +892,21 @@ // vt100 special graphics and line drawing // 5f-7e standard vt100 // 40-5e rxvt extension for extra curses acs chars - static uint16_t vt100_0[63] = { // 40 .. 7e - 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 - 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f + static uint16_t vt100_0[62] = { // 41 .. 7e + 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman! + 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f + 0, 0, 0, 0, 0, 0, 0, 0, // 50-57 + 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e }; - if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) + if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41]) { - c = vt100_0[c - 0x40]; - width = 1; + c = vt100_0[c - 0x41]; + width = 1; // vt100 line drawing characters are always single-width } } @@ -908,10 +915,6 @@ if (width != 0) { - // some utf-8 decoders decode surrogate characters. - if (0xd800 <= c && c <= 0xdfff) - c = 0xfffd; - #if !UNICODE_3 // trim characters we can't store directly :( if (c >= 0x10000) @@ -945,6 +948,15 @@ rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); + // if the character doesn't fit into the remaining columns... + if (screen.cur.col > last_col - width && last_col >= width) + { + // ...output spaces + c = ' '; + // and try the same character next loop iteration + --str; + } + do { stp[screen.cur.col] = c; @@ -972,14 +984,13 @@ srp[c] = rend; } } - else if (width == 0) + else // width == 0 { #if ENABLE_COMBINING // handle combining characters // we just tag the accent on the previous on-screen character. // this is arguably not correct, but also arguably not wrong. // we don't handle double-width characters nicely yet. - text_t *tp; rend_t *rp; @@ -1938,19 +1949,23 @@ rxvt_term::scr_bell () { #ifndef NO_BELL + # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION if (options & Opt_mapAlert) # endif XMapWindow (display->display, TermWin.parent[0]); # endif + if (options & Opt_visualBell) { scr_rvideo_mode (!rvideo); /* refresh also done */ + rxvt_usleep (VISUAL_BELL_DURATION); scr_rvideo_mode (!rvideo); /* refresh also done */ } else XBell (display->display, 0); + #endif } @@ -2147,9 +2162,6 @@ scr_swap_overlay (); #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ - #ifndef NO_SLOW_LINK_SUPPORT /* * D: CopyArea pass - very useful for slower links @@ -2294,27 +2306,27 @@ while (i && text[count] == NOCHAR) count++, i--; -#if ENABLE_STYLES - // force redraw after "careful" characters to avoid pixel droppings - if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) - drp[col + 1] = ~srp[col + 1]; - - // include previous careful character(s) if possible, looks nicer (best effort...) - while (text > stp - && srp[text - stp - 1] & RS_Careful - && RS_SAME (rend, srp[text - stp - 1])) - text--, count++, xpixel -= TermWin.fwidth; -#endif - /* * Determine the attributes for the string */ int fore = GET_FGCOLOR (rend); // desired foreground int back = GET_BGCOLOR (rend); // desired background - // only do special processing if ana attributes are set, which is rare - if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) + // only do special processing if any attributes are set, which is rare + if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) { +#if ENABLE_STYLES + // force redraw after "careful" characters to avoid pixel droppings + if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) + drp[col + 1] = ~srp[col + 1]; + + // include previous careful character(s) if possible, looks nicer (best effort...) + while (text > stp + && srp[text - stp - 1] & RS_Careful + && RS_SAME (rend, srp[text - stp - 1])) + text--, count++, xpixel -= TermWin.fwidth; +#endif + bool invert = rend & RS_RVid; #ifndef NO_BOLD_UNDERLINE_REVERSE @@ -2351,6 +2363,12 @@ #ifndef NO_BOLD_UNDERLINE_REVERSE if (ISSET_PIXCOLOR (Color_RV)) back = Color_RV; + + if (fore == back) + { + fore = Color_bg; + back = Color_fg; + } #endif } @@ -2533,22 +2551,6 @@ num_scr_allow = 0; want_refresh = 1; -#if TRANSPARENT - if ((options & Opt_transparent) && (am_pixmap_trans == 0)) - { - int i; - - if (!(options & Opt_transparent_all)) - i = 0; - else - i = (int) (sizeof (TermWin.parent) / sizeof (Window)); - - while (i--) - if (TermWin.parent[i] != None) - XClearWindow (display->display, TermWin.parent[i]); - } -#endif - if (really) XClearWindow (display->display, TermWin.vt); }