--- rxvt-unicode/src/screen.C 2004/08/04 03:33:53 1.82 +++ rxvt-unicode/src/screen.C 2004/08/25 03:52:09 1.129 @@ -25,9 +25,7 @@ */ #include "../config.h" /* NECESSARY */ -#define INTERN_SCREEN #include "rxvt.h" /* NECESSARY */ -#include "screen.intpro" /* PROTOS for internal routines */ #include /* get the typedef for CARD32 */ @@ -50,7 +48,7 @@ * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * * ------------------------------------------------------------------------- */ #define ZERO_SCROLLBACK() \ - if (Options & Opt_scrollTtyOutput) \ + if (options & Opt_scrollTtyOutput) \ TermWin.view_start = 0 #define CLEAR_SELECTION() \ selection.beg.row = selection.beg.col \ @@ -115,12 +113,13 @@ /* ------------------------------------------------------------------------- * * SCREEN `COMMON' ROUTINES * * ------------------------------------------------------------------------- */ + /* Fill part/all of a line with blanks. */ void rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) { efs &= ~RS_baseattrMask; - efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); + efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); while (width--) { @@ -157,7 +156,9 @@ int k; rend_t setrstyle; - D_SCREEN ((stderr, "rxvt_scr_reset ()")); +#if ENABLE_OVERLAY + scr_overlay_off (); +#endif TermWin.view_start = 0; num_scr = 0; @@ -174,10 +175,18 @@ if (ncol == prev_ncol && nrow == prev_nrow) return; + // we need at least two lines for wrapping to work correctly + if (nrow + TermWin.saveLines < 2) + { + TermWin.saveLines++; + prev_nrow--; + TermWin.nscrolled++; + } + want_refresh = 1; - total_rows = nrow + TermWin.saveLines; prev_total_rows = prev_nrow + TermWin.saveLines; + total_rows = nrow + TermWin.saveLines; screen.tscroll = 0; screen.bscroll = nrow - 1; @@ -188,7 +197,7 @@ ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); } - if (prev_nrow == 0) + if (!screen.text) { /* * first time called so just malloc everything: don't rely on realloc @@ -216,7 +225,7 @@ scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); } - MEMSET (charsets, 'B', sizeof (charsets)); + memset (charsets, 'B', sizeof (charsets)); TermWin.nscrolled = 0; /* no saved lines */ rstyle = DEFAULT_RSTYLE; screen.flags = Screen_DefaultFlags; @@ -410,7 +419,7 @@ void rxvt_term::scr_reset_realloc () { - uint16_t total_rows, nrow; + unsigned int total_rows, nrow; nrow = TermWin.nrow; total_rows = nrow + TermWin.saveLines; @@ -437,7 +446,7 @@ void rxvt_term::scr_release () { - uint16_t total_rows; + unsigned int total_rows; int i; total_rows = TermWin.nrow + TermWin.saveLines; @@ -473,8 +482,6 @@ void rxvt_term::scr_poweron () { - D_SCREEN ((stderr, "rxvt_scr_poweron ()")); - scr_release (); prev_nrow = prev_ncol = 0; scr_reset (); @@ -496,8 +503,6 @@ { screen_t *s; - D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); - #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) if (current_screen == SECONDARY) s = &swap; @@ -508,21 +513,21 @@ switch (mode) { case SAVE: - s->s_cur.row = s->cur.row; - s->s_cur.col = s->cur.col; + s->s_cur.row = screen.cur.row; + s->s_cur.col = screen.cur.col; s->s_rstyle = rstyle; - s->s_charset = s->charset; - s->s_charset_char = charsets[s->charset]; + s->s_charset = screen.charset; + s->s_charset_char = charsets[screen.charset]; break; case RESTORE: want_refresh = 1; - s->cur.row = s->s_cur.row; - s->cur.col = s->s_cur.col; - s->flags &= ~Screen_WrapNext; + screen.cur.row = s->s_cur.row; + screen.cur.col = s->s_cur.col; + screen.flags &= ~Screen_WrapNext; rstyle = s->s_rstyle; - s->charset = s->s_charset; - charsets[s->charset] = s->s_charset_char; + screen.charset = s->s_charset; + charsets[screen.charset] = s->s_charset_char; set_font_style (); break; } @@ -555,8 +560,6 @@ want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); - TermWin.view_start = 0; if (current_screen == scrn) @@ -566,7 +569,7 @@ SWAP_IT (current_screen, scrn, int); #if NSCREENS - if (Options & Opt_secondaryScreen) + if (options & Opt_secondaryScreen) { num_scr = 0; offset = TermWin.saveLines; @@ -594,12 +597,29 @@ } else #endif - if (Options & Opt_secondaryScroll) + if (options & Opt_secondaryScroll) //if (current_screen == PRIMARY) scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); return scrn; } +// clear WrapNext indicator, solidifying position on next line +void +rxvt_term::scr_do_wrap () +{ + if (!(screen.flags & Screen_WrapNext)) + return; + + screen.flags &= ~Screen_WrapNext; + + screen.cur.col = 0; + + if (screen.cur.row == screen.bscroll) + scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); + else if (screen.cur.row < TermWin.nrow - 1) + screen.cur.row++; +} + /* ------------------------------------------------------------------------- */ /* * Change the colour for following text @@ -607,7 +627,9 @@ void rxvt_term::scr_color (unsigned int color, int fgbg) { - color &= RS_fgMask; + if (color > maxTermCOLOR) + color = fgbg; + if (fgbg == Color_fg) rstyle = SET_FGCOLOR (rstyle, color); else @@ -646,19 +668,18 @@ return 0; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); if (row1 == 0 && count > 0 - && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) + && (current_screen == PRIMARY || options & Opt_secondaryScroll)) { nscrolled = (long)TermWin.nscrolled + (long)count; if (nscrolled > (long)TermWin.saveLines) TermWin.nscrolled = TermWin.saveLines; else - TermWin.nscrolled = (uint16_t)nscrolled; + TermWin.nscrolled = (unsigned int)nscrolled; - if ((Options & Opt_scrollWithBuffer) + if ((options & Opt_scrollWithBuffer) && TermWin.view_start != 0 && TermWin.view_start != TermWin.saveLines) scr_page (UP, count); @@ -707,19 +728,14 @@ /* A: scroll up */ /* A1: Copy lines that will get clobbered by the rotation */ - for (i = 0, j = row1; i < count; i++, j++) - { - buf_text[i] = screen.text[j]; - buf_rend[i] = screen.rend[j]; - } + memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); + memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); /* A2: Rotate lines */ - for (j = row1, i = j + count; i <= row2; i++, j++) - { - screen.tlen[j] = screen.tlen[i]; - screen.text[j] = screen.text[i]; - screen.rend[j] = screen.rend[i]; - } + i = row2 - row1 - count + 1; + memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); + memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); + memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); j = row2 - count + 1, i = count; } @@ -747,15 +763,12 @@ } /* C: Resurrect lines */ - for (; i--; j++) - { - screen.tlen[j] = 0; - screen.text[j] = buf_text[i]; - screen.rend[j] = buf_rend[i]; - - if (!spec) /* line length may not equal TermWin.ncol */ - scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); - } + memset (screen.tlen + j, 0, i * sizeof (int16_t)); + memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); + memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); + if (!spec) /* line length may not equal TermWin.ncol */ + for (; i--; j++) + scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle); return count; } @@ -767,7 +780,7 @@ void rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) { - unsigned char checksel, clearsel; + unsigned char checksel; unicode_t c; int i, row, last_col; text_t *stp; @@ -777,13 +790,12 @@ return; want_refresh = 1; + ZERO_SCROLLBACK (); last_col = TermWin.ncol; - D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); - ZERO_SCROLLBACK (); if (nlines > 0) { - nlines += (screen.cur.row - screen.bscroll); + nlines += screen.cur.row - screen.bscroll; if ((nlines > 0) && (screen.tscroll == 0) && (screen.bscroll == (TermWin.nrow - 1))) @@ -793,6 +805,7 @@ screen.cur.row -= nlines; } } + #ifdef DEBUG_STRICT assert (screen.cur.col < last_col); assert ((screen.cur.row < TermWin.nrow) @@ -805,7 +818,6 @@ row = screen.cur.row + TermWin.saveLines; checksel = selection.op && current_screen == selection.screen ? 1 : 0; - clearsel = 0; stp = screen.text[row]; srp = screen.rend[row]; @@ -818,7 +830,7 @@ switch (c) { case C0_HT: - scr_tab (1); + scr_tab (1, true); continue; case C0_LF: @@ -850,21 +862,22 @@ && ROWCOL_IS_BEFORE (screen.cur, selection.end)) { checksel = 0; - clearsel = 1; + /* + * If we wrote anywhere in the selected area, kill the selection + * XXX: should we kill the mark too? Possibly, but maybe that + * should be a similar check. + */ + CLEAR_SELECTION (); } if (screen.flags & Screen_WrapNext) { screen.tlen[row] = -1; - 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; + + scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; stp = screen.text[row]; /* _must_ refresh */ srp = screen.rend[row]; /* _must_ refresh */ - screen.cur.col = 0; - screen.flags &= ~Screen_WrapNext; } if (screen.flags & Screen_Insert) @@ -873,37 +886,69 @@ // 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. - int width = c < 256 ? 1 : wcwidth (c); + int width = c < 0x100 ? 1 : wcwidth (c); if (charsets[screen.charset] == '0') // DEC SPECIAL { // vt100 special graphics and line drawing - static uint16_t vt100_0[32] = { // 5f .. 7e - 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, - 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, - 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, - 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, + // 5f-7e standard vt100 + // 40-5e rxvt extension for extra curses acs chars + static uint16_t vt100_0[63] = { // 5f .. 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 + 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 >= 0x5f && c <= 0x7e) + if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) { - c = vt100_0[c - 0x5f]; + c = vt100_0[c - 0x40]; width = 1; } } if (width != 0) { -#if !UNICODE_3 && ENABLE_COMBINING + // 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) +# if ENABLE_COMBINING c = rxvt_composite.compose (c); // map to lower 16 bits +# else + c = 0xfffd; +# endif #endif - bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); - rend_t rend = SET_FONT (rstyle, - c > 0x7f || bold || c < 0x20 - ? TermWin.fontset->find_font (c, bold) - : TermWin.ascii_map [c - 0x20]); + + // nuke the character at this position, if required + if (stp[screen.cur.col] == NOCHAR + || (screen.cur.col < TermWin.ncol - 1 + && stp[screen.cur.col + 1] == NOCHAR)) + { + int col = screen.cur.col; + + // find begin + while (col > 0 && stp[col] == NOCHAR) + col--; + + rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); + + // found begin, nuke + do { + stp[col] = ' '; + srp[col] = rend; + col++; + } while (col < TermWin.ncol && stp[col] == NOCHAR); + } + + rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); do { @@ -958,7 +1003,12 @@ // handle double-width-chars by making them look extremely ugly if (*tp == NOCHAR) - *tp = ' '; // hack //D //TODO //--tp, --rp; + { + // hack //D //TODO //--tp, --rp; + *tp = ' '; + *rp &= ~RS_baseattrMask; + *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); + } // first try to find a precomposed character unicode_t n = rxvt_compose (*tp, c); @@ -966,7 +1016,7 @@ n = rxvt_composite.compose (*tp, c); *tp = n; - *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); + *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); #endif } } @@ -974,14 +1024,6 @@ if (screen.tlen[row] != -1) /* XXX: think about this */ MAX_IT (screen.tlen[row], screen.cur.col); - /* - * If we wrote anywhere in the selected area, kill the selection - * XXX: should we kill the mark too? Possibly, but maybe that - * should be a similar check. - */ - if (clearsel) - CLEAR_SELECTION (); - #ifdef DEBUG_STRICT assert (screen.cur.row >= 0); #else /* drive with your eyes closed */ @@ -1008,10 +1050,9 @@ screen.cur.row--; return; #endif - } } - else if ((screen.flags & Screen_WrapNext) == 0) + else if (!(screen.flags & Screen_WrapNext)) scr_gotorc (0, -1, RELATIVE); screen.flags &= ~Screen_WrapNext; @@ -1024,11 +1065,10 @@ * XTERM_SEQ: CTRL-I */ void -rxvt_term::scr_tab (int count) +rxvt_term::scr_tab (int count, bool ht) { int i, x; - D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); want_refresh = 1; i = x = screen.cur.col; @@ -1036,6 +1076,12 @@ return; else if (count > 0) { + int row = TermWin.saveLines + screen.cur.row; + text_t *tp = screen.text[row]; + rend_t *rp = screen.rend[row]; + rend_t base_rend = rp[i]; + ht &= tp[i] == ' '; + for (; ++i < TermWin.ncol; ) if (tabs[i]) { @@ -1043,9 +1089,33 @@ if (!--count) break; } + else + ht &= tp[i] == ' ' + && RS_SAME (rp[i], base_rend); if (count) x = TermWin.ncol - 1; + + // store horizontal tab commands as characters inside the text + // buffer so they can be selected and pasted. + if (ht) + { + base_rend = SET_FONT (base_rend, 0); + + if (screen.tlen[row] != -1) /* XXX: think about this */ + MAX_IT (screen.tlen[row], x); + + i = screen.cur.col; + + tp[i] = '\t'; + rp[i] = base_rend; + + while (++i < x) + { + tp[i] = NOCHAR; + rp[i] = base_rend; + } + } } else /* if (count < 0) */ { @@ -1072,7 +1142,7 @@ * Move cursor left in row. If we're at the left boundary, shift everything * in that row right. Clear left column. */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::scr_backindex () { @@ -1082,6 +1152,7 @@ { if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) return; /* um, yeah? */ + scr_insdel_chars (1, INSERT); } } @@ -1093,7 +1164,7 @@ * Move cursor right in row. If we're at the right boundary, shift everything * in that row left. Clear right column. */ -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::scr_forwardindex () { @@ -1104,10 +1175,12 @@ else { row = screen.cur.row + TermWin.saveLines; + if (screen.tlen[row] == 0) return; /* um, yeah? */ else if (screen.tlen[row] == -1) screen.tlen[row] = TermWin.ncol; + scr_gotorc (0, 0, R_RELATIVE); scr_insdel_chars (1, DELETE); scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); @@ -1125,13 +1198,12 @@ want_refresh = 1; ZERO_SCROLLBACK (); - D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); - screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; MAX_IT (screen.cur.col, 0); MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); screen.flags &= ~Screen_WrapNext; + if (relative & R_RELATIVE) { if (row > 0) @@ -1161,17 +1233,14 @@ else screen.cur.row = row; } + MAX_IT (screen.cur.row, 0); MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); - - while (screen.cur.col > 0 - && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) - screen.cur.col--; } /* ------------------------------------------------------------------------- */ /* - * direction should be UP or DN + * direction should be UP or DN */ void rxvt_term::scr_index (enum page_dirn direction) @@ -1179,17 +1248,18 @@ int dirn; want_refresh = 1; - dirn = ((direction == UP) ? 1 : -1); - D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); - ZERO_SCROLLBACK (); + dirn = ((direction == UP) ? 1 : -1); + screen.flags &= ~Screen_WrapNext; + if ((screen.cur.row == screen.bscroll && direction == UP) || (screen.cur.row == screen.tscroll && direction == DN)) scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); else screen.cur.row += dirn; + MAX_IT (screen.cur.row, 0); MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); selection_check (0); @@ -1208,13 +1278,10 @@ unsigned int row, col, num; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); selection_check (1); - screen.flags &= ~Screen_WrapNext; - row = TermWin.saveLines + screen.cur.row; switch (mode) { @@ -1267,8 +1334,8 @@ XGCValues gcvalue; want_refresh = 1; - D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); ZERO_SCROLLBACK (); + row_offset = (int32_t)TermWin.saveLines; switch (mode) @@ -1294,8 +1361,6 @@ return; } - refresh_type |= REFRESH_BOUNDS; - if (selection.op && current_screen == selection.screen && ((selection.beg.row >= row && selection.beg.row <= row + num) || (selection.end.row >= row @@ -1317,10 +1382,10 @@ else { ren = (rstyle & (RS_fgMask | RS_bgMask)); - gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; + gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); ERASE_ROWS (row, num); - gcvalue.foreground = PixColors[Color_fg]; + gcvalue.foreground = pix_colors[Color_fg]; XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); } @@ -1346,11 +1411,12 @@ rend_t *r1, fs; want_refresh = 1; - num_scr_allow = 0; ZERO_SCROLLBACK (); + + num_scr_allow = 0; selection_check (3); - fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); + fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) { screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ @@ -1384,7 +1450,8 @@ else if (insdel == INSERT) count = end; } - screen.flags &= ~Screen_WrapNext; + + scr_do_wrap (); scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); } @@ -1408,15 +1475,16 @@ if (count <= 0) return; + scr_do_wrap (); + selection_check (1); MIN_IT (count, (TermWin.ncol - screen.cur.col)); row = screen.cur.row + TermWin.saveLines; - screen.flags &= ~Screen_WrapNext; stp = screen.text[row]; srp = screen.rend[row]; - slp = & (screen.tlen[row]); + slp = &screen.tlen[row]; switch (insdel) { @@ -1547,7 +1615,7 @@ if (mode) screen.flags |= Screen_Autowrap; else - screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); + screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); } /* ------------------------------------------------------------------------- */ @@ -1567,6 +1635,7 @@ screen.flags |= Screen_Relative; else screen.flags &= ~Screen_Relative; + scr_gotorc (0, 0, 0); } @@ -1596,7 +1665,7 @@ rxvt_term::scr_set_tab (int mode) { if (mode < 0) - MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); + memset (tabs, 0, TermWin.ncol * sizeof (char)); else if (screen.cur.col < TermWin.ncol) tabs[screen.cur.col] = (mode ? 1 : 0); } @@ -1610,23 +1679,23 @@ void rxvt_term::scr_rvideo_mode (int mode) { - XGCValues gcvalue; + XGCValues gcvalue; if (rvideo != mode) { rvideo = mode; - SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); -#if defined(XPM_BACKGROUND) + SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); +#if XPM_BACKGROUND if (bgPixmap.pixmap == None) #endif -#if defined(TRANSPARENT) - if (! (Options & Opt_transparent) || am_transparent == 0) +#if TRANSPARENT + if (! (options & Opt_transparent) || am_transparent == 0) #endif XSetWindowBackground (display->display, TermWin.vt, - PixColors[Color_bg]); + pix_colors[Color_bg]); - gcvalue.foreground = PixColors[Color_fg]; - gcvalue.background = PixColors[Color_bg]; + gcvalue.foreground = pix_colors[Color_fg]; + gcvalue.background = pix_colors[Color_bg]; XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, &gcvalue); scr_clear (); @@ -1781,13 +1850,11 @@ MIN_IT (rc[i].row, TermWin.nrow - 1); } - D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); - for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); if (refresh) - scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); + scr_refresh (SLOW_REFRESH); } /* ------------------------------------------------------------------------- */ @@ -1809,17 +1876,18 @@ rxvt_term::scr_move_to (int y, int len) { long p = 0; - uint16_t oldviewstart; + unsigned int oldviewstart; oldviewstart = TermWin.view_start; + if (y < len) { p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; p -= (long) (TermWin.nrow - 1); p = max (p, 0); } - TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); - D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); + + TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); return scr_changeview (oldviewstart); } @@ -1832,10 +1900,9 @@ int rxvt_term::scr_page (enum page_dirn direction, int nlines) { - int n; - uint16_t oldviewstart; + int n; + unsigned int oldviewstart; - D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); #ifdef DEBUG_STRICT assert ((nlines >= 0) && (nlines <= TermWin.nrow)); #endif @@ -1854,7 +1921,7 @@ } int -rxvt_term::scr_changeview (uint16_t oldviewstart) +rxvt_term::scr_changeview (unsigned int oldviewstart) { if (TermWin.view_start != oldviewstart) { @@ -1872,11 +1939,11 @@ #ifndef NO_BELL # ifndef NO_MAPALERT # ifdef MAPALERT_OPTION - if (Options & Opt_mapAlert) + if (options & Opt_mapAlert) # endif XMapWindow (display->display, TermWin.parent[0]); # endif - if (Options & Opt_visualBell) + if (options & Opt_visualBell) { scr_rvideo_mode (!rvideo); /* refresh also done */ scr_rvideo_mode (!rvideo); /* refresh also done */ @@ -1892,14 +1959,15 @@ rxvt_term::scr_printscreen (int fullhist) { #ifdef PRINTPIPE - int i, r1, nrows, row_offset; - text_t *t; - FILE *fd; + int i, r1, nrows, row_offset; + FILE *fd; if ((fd = popen_printer ()) == NULL) return; + nrows = TermWin.nrow; row_offset = TermWin.saveLines; + if (!fullhist) row_offset -= TermWin.view_start; else @@ -1908,14 +1976,34 @@ row_offset -= TermWin.nscrolled; } + wctomb (0, 0); + for (r1 = 0; r1 < nrows; r1++) { - t = screen.text[r1 + row_offset]; - for (i = TermWin.ncol - 1; i >= 0; i--) - if (!isspace (t[i])) - break; - fprintf (fd, "%.*s\n", (i + 1), t); + text_t *tp = screen.text[r1 + row_offset]; + int len = screen.tlen[r1 + row_offset]; + + for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) + { + char mb[MB_LEN_MAX]; + text_t t = *tp++; + if (t == NOCHAR) + continue; + + len = wctomb (mb, t); + + if (len <= 0) + { + mb[0] = ' '; + len = 1; + } + + fwrite (mb, 1, len, fd); + } + + fputc ('\n', fd); } + pclose_printer (fd); #endif } @@ -1939,10 +2027,7 @@ void rxvt_term::scr_refresh (unsigned char refresh_type) { - unsigned char clearfirst, /* first character writes before cell */ - clearlast, /* last character writes beyond cell */ - must_clear, /* use draw_string not draw_image_string */ - rvid, /* reverse video this position */ + unsigned char must_clear, /* use draw_string not draw_image_string */ showcursor; /* show the cursor */ int16_t col, row, /* column/row we're processing */ ocrow; /* old cursor row */ @@ -1951,8 +2036,7 @@ #ifndef NO_CURSORCOLOR rend_t cc1; /* store colours at cursor position (s) */ #endif - rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ - text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ + rend_t *crp; // cursor rendition pointer if (refresh_type == NO_REFRESH || !TermWin.mapped) return; @@ -1960,23 +2044,16 @@ /* * A: set up vars */ - clearfirst = clearlast = must_clear = 0; - + must_clear = 0; refresh_count = 0; row_offset = TermWin.saveLines - TermWin.view_start; - if ((refresh_type & REFRESH_BOUNDS)) - { - clearfirst = clearlast = 1; - refresh_type &= ~REFRESH_BOUNDS; - } - -#ifdef XPM_BACKGROUND +#if XPM_BACKGROUND must_clear |= (bgPixmap.pixmap != None); #endif -#ifdef TRANSPARENT - must_clear |= ((Options & Opt_transparent) && am_transparent); +#if TRANSPARENT + must_clear |= ((options & Opt_transparent) && am_transparent); #endif ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ @@ -2001,13 +2078,18 @@ if (showcursor) { - srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); + int col = screen.cur.col; + + while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) + col--; + + crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; if (showcursor && TermWin.focus) { - *srp ^= RS_RVid; + *crp ^= RS_RVid; #ifndef NO_CURSORCOLOR - cc1 = *srp & (RS_fgMask | RS_bgMask); + cc1 = *crp & (RS_fgMask | RS_bgMask); if (ISSET_PIXCOLOR (Color_cursor)) ccol1 = Color_cursor; else @@ -2024,8 +2106,8 @@ #else ccol2 = Color_bg; #endif - *srp = SET_FGCOLOR (*srp, ccol1); - *srp = SET_BGCOLOR (*srp, ccol2); + *crp = SET_FGCOLOR (*crp, ccol1); + *crp = SET_BGCOLOR (*crp, ccol2); #endif } } @@ -2062,6 +2144,13 @@ } } +#if ENABLE_OVERLAY + 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 @@ -2074,8 +2163,6 @@ { int16_t nits; int j; - rend_t *drp2; - text_t *dtp2; int len, wlen; j = TermWin.nrow; @@ -2085,12 +2172,12 @@ { if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) { - stp = screen.text[row + row_offset]; - srp = screen.rend[row + row_offset]; - dtp = drawn_text[row]; - dtp2 = drawn_text[row + i]; - drp = drawn_rend[row]; - drp2 = drawn_rend[row + i]; + text_t *stp = screen.text[row + row_offset]; + rend_t *srp = screen.rend[row + row_offset]; + text_t *dtp = drawn_text[row]; + text_t *dtp2 = drawn_text[row + i]; + rend_t *drp = drawn_rend[row]; + rend_t *drp2 = drawn_rend[row + i]; for (nits = 0, col = TermWin.ncol; col--; ) if (stp[col] != dtp2[col] || srp[col] != drp2[col]) @@ -2120,7 +2207,6 @@ if (wlen < len) SWAP_IT (wlen, len, int); - D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); XCopyArea (display->display, TermWin.vt, TermWin.vt, TermWin.gc, 0, Row2Pixel (len + i), (unsigned int)TermWin_TotalWidth (), @@ -2137,10 +2223,10 @@ */ for (row = 0; row < TermWin.nrow; row++) { - stp = screen.text[row + row_offset]; - srp = screen.rend[row + row_offset]; - dtp = drawn_text[row]; - drp = drawn_rend[row]; + text_t *stp = screen.text[row + row_offset]; + rend_t *srp = screen.rend[row + row_offset]; + text_t *dtp = drawn_text[row]; + rend_t *drp = drawn_rend[row]; /* * E2: OK, now the real pass @@ -2151,7 +2237,7 @@ { /* compare new text with old - if exactly the same then continue */ if (stp[col] == dtp[col] /* Must match characters to skip. */ - && (srp[col] == drp[col] /* Either rendition the same or */ + && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ || (stp[col] == ' ' /* space w/ no background change */ && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) continue; @@ -2171,8 +2257,6 @@ int xpixel = Col2Pixel (col); - // this loop looks very messy, it can probably be optimized - // and cleaned a bit by you? for (i = 0; ++col < TermWin.ncol; ) { if (stp[col] == NOCHAR) @@ -2180,91 +2264,115 @@ dtp[col] = stp[col]; drp[col] = rend; count++; - - if (i) // only possible skip if char unchanged - i++; + i++; continue; } - if (rend != srp[col]) + if (!RS_SAME (rend, srp[col])) break; count++; if (stp[col] != dtp[col] - || srp[col] != drp[col]) + || !RS_SAME (srp[col], drp[col])) { - if (must_clear && (i++ > (count / 2))) + if (must_clear && (i++ > count / 2)) break; dtp[col] = stp[col]; drp[col] = rend; i = 0; } - else if (must_clear || (stp[col] != ' ' && ++i >= 32)) + else if (must_clear || (stp[col] != ' ' && ++i >= 16)) break; } col--; /* went one too far. move back */ count -= i; /* dump any matching trailing chars */ + // sometimes we optimize away the trailing NOCHAR's, add them back + 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 fid = GET_FONT (rend); int fore = GET_FGCOLOR (rend); // desired foreground int back = GET_BGCOLOR (rend); // desired background - rend = GET_ATTR (rend); - - rvid = !!(rend & RS_RVid); + // only do special processing if ana attributes are set, which is rare + if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) + { + bool invert = rend & RS_RVid; #ifndef NO_BOLD_UNDERLINE_REVERSE - if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) - { - if (ISSET_PIXCOLOR (Color_BD)) - fore = Color_BD; - else - rvid = !rvid; - } + if (rend & RS_Bold + && fore == Color_fg) + { + if (ISSET_PIXCOLOR (Color_BD)) + fore = Color_BD; +# if !ENABLE_STYLES + else + invert = !invert; +# endif + } + + if (rend & RS_Italic + && fore == Color_fg) + { + if (ISSET_PIXCOLOR (Color_IT)) + fore = Color_IT; +# if !ENABLE_STYLES + else + invert = !invert; +# endif + } - if (rend & RS_Uline) - if (ISSET_PIXCOLOR (Color_UL)) - fore = Color_UL; + if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) + fore = Color_UL; #endif - if (rvid) - { - SWAP_IT (fore, back, int); + if (invert) + { + SWAP_IT (fore, back, int); #ifndef NO_BOLD_UNDERLINE_REVERSE - if (ISSET_PIXCOLOR (Color_RV) -# ifndef NO_CURSORCOLOR - && !ISSET_PIXCOLOR (Color_cursor) -# endif - ) - back = Color_RV; + if (ISSET_PIXCOLOR (Color_RV)) + back = Color_RV; #endif - } + } #ifdef TEXT_BLINK - if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) - { - if (!text_blink_ev.active) + if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) { - text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); - hidden_text = 0; + if (!text_blink_ev.active) + { + text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); + hidden_text = 0; + } + else if (hidden_text) + fore = back; } - else if (hidden_text) - fore = back; - } #endif + } /* * Actually do the drawing of the string here */ - rxvt_font *font = (*TermWin.fontset)[fid]; + rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; if (back == fore) font->clear_rect (*TermWin.drawable, xpixel, ypixel, @@ -2296,6 +2404,10 @@ } /* for (col....) */ } /* for (row....) */ +#if ENABLE_OVERLAY + scr_swap_overlay (); +#endif + /* * G: cleanup cursor and display outline cursor if necessary */ @@ -2303,18 +2415,16 @@ { if (TermWin.focus) { - srp = & (screen.rend[screen.cur.row + TermWin.saveLines] - [screen.cur.col]); - *srp ^= RS_RVid; + *crp ^= RS_RVid; #ifndef NO_CURSORCOLOR - *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; + *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; #endif } else if (oldcursor.row >= 0) { #ifndef NO_CURSORCOLOR if (ISSET_PIXCOLOR (Color_cursor)) - XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); + XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); #endif int cursorwidth = 1; while (oldcursor.col + cursorwidth < TermWin.ncol @@ -2334,30 +2444,6 @@ */ scr_reverse_selection (); - /* - * I: other general cleanup - */ -#if 0 - if (clearfirst && TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea (display->display, TermWin.vt, 0, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); - - if (clearlast && TermWin.int_bwidth) - /* - * clear the whole screen height, note that width == 0 is treated - * specially by XClearArea - */ - XClearArea (display->display, TermWin.vt, - TermWin.width + TermWin.int_bwidth, 0, - (unsigned int)TermWin.int_bwidth, - (unsigned int)TermWin_TotalHeight (), False); -#endif - if (refresh_type & SMOOTH_REFRESH) XFlush (display->display); @@ -2373,7 +2459,7 @@ return; for (int i = TermWin.ncol; i; i--, rp++, tp++) - *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); + *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); } void @@ -2389,6 +2475,36 @@ } } +void +rxvt_term::scr_recolour () +{ + if (1 +#if TRANSPARENT + && !am_transparent +#endif +#if XPM_BACKGROUND + && !bgPixmap.pixmap +#endif + ) + { + XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); + XClearWindow (display->display, TermWin.parent[0]); + XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); +#if HAVE_SCROLLBARS + if (scrollBar.win) + { + XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); + scrollBar.setIdle (); + scrollbar_show (0); + } +#endif + } + + scr_clear (); + scr_touch (true); + want_refresh = 1; +} + /* ------------------------------------------------------------------------- */ void rxvt_term::scr_clear (bool really) @@ -2399,12 +2515,12 @@ num_scr_allow = 0; want_refresh = 1; -#ifdef TRANSPARENT - if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) +#if TRANSPARENT + if ((options & Opt_transparent) && (am_pixmap_trans == 0)) { int i; - if (! (Options & Opt_transparent_all)) + if (!(options & Opt_transparent_all)) i = 0; else i = (int) (sizeof (TermWin.parent) / sizeof (Window)); @@ -2491,7 +2607,7 @@ void rxvt_term::selection_check (int check_more) { - row_col_t pos; + row_col_t pos; if (!selection.op) return; @@ -2528,16 +2644,11 @@ unsigned int i, j, n; unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); -#if 0 - /* a paste should act like the user is typing, so check scrollTtyKeypress */ - ZERO_SCROLLBACK (r); -#endif - /* convert normal newline chars into common keyboard Return key sequence */ for (i = 0; i < len; i += PROP_SIZE) { n = min (len - i, PROP_SIZE); - MEMCPY (ds, data + i, n); + memcpy (ds, data + i, n); for (j = 0; j < n; j++) if (ds[j] == C0_LF) @@ -2561,8 +2672,6 @@ unsigned long bytes_after; XTextProperty ct; - D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); - if (prop == None) /* check for failed XConvertSelection */ { if ((selection_type & Sel_CompoundText)) @@ -2598,21 +2707,22 @@ break; if (ct.encoding == 0) + break; + + if (ct.encoding == xa[XA_INCR]) { - D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); + // INCR selection, start handshake + XDeleteProperty (display->display, win, prop); + selection_wait = Sel_incr; + incr_ev.start (NOW + 10); break; } if (ct.value == NULL) - { - D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); - continue; - } + continue; if (ct.nitems == 0) { - D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); - if (selection_wait == Sel_normal && nread == 0 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion { @@ -2620,7 +2730,6 @@ * pass through again trying CUT_BUFFER0 if we've come from * XConvertSelection () but nothing was presented */ - D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); selection_paste (display->root, XA_CUT_BUFFER0, False); } @@ -2635,7 +2744,7 @@ if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) { for (int i = 0; i < cr; i++) - paste ((unsigned char *)cl[i], STRLEN (cl[i])); + paste ((unsigned char *)cl[i], strlen (cl[i])); XFreeStringList (cl); } @@ -2654,7 +2763,6 @@ if (selection_wait == Sel_normal) selection_wait = Sel_none; - D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); return (int)nread; } @@ -2672,52 +2780,16 @@ void rxvt_term::selection_property (Window win, Atom prop) { - int reget_time = 0; - - if (prop == None) + if (prop == None || selection_wait != Sel_incr) return; - D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); - if (selection_wait == Sel_normal) - { - int a, afmt; - Atom atype; - unsigned long bytes_after, nitems; - unsigned char *s = NULL; - - a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, - xa[XA_INCR], &atype, &afmt, &nitems, - &bytes_after, &s); - if (s) - XFree (s); - if (a != Success) - return; - -#ifndef __CYGWIN32__ - if (atype == xa[XA_INCR]) - { /* start an INCR transfer */ - D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); - XDeleteProperty (display->display, win, prop); - XFlush (display->display); - reget_time = 1; - selection_wait = Sel_incr; - } -#endif - - } - else if (selection_wait == Sel_incr) + if (selection_paste (win, prop, 1) > 0) + incr_ev.start (NOW + 10); + else { - reget_time = 1; - - if (selection_paste (win, prop, True) == -1) - { - D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); - selection_wait = Sel_none; - incr_ev.stop (); - } + selection_wait = Sel_none; + incr_ev.stop (); } - if (reget_time) /* received more data so reget time */ - incr_ev.start (NOW + 10); } /* ------------------------------------------------------------------------- */ @@ -2733,14 +2805,11 @@ void rxvt_term::selection_request (Time tm, int x, int y) { - D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) return; /* outside window */ if (selection.text) { /* internal selection */ - D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); char *str = rxvt_wcstombs (selection.text, selection.len); paste ((unsigned char *)str, strlen (str)); free (str); @@ -2769,7 +2838,6 @@ } selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ - D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); selection_paste (display->root, XA_CUT_BUFFER0, False); } @@ -2792,7 +2860,6 @@ if (XGetSelectionOwner (display->display, sel) != None) { - D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], TermWin.vt, selection_request_time); return 1; @@ -2809,8 +2876,6 @@ void rxvt_term::selection_clear () { - D_SELECT ((stderr, "rxvt_selection_clear ()")); - want_refresh = 1; free (selection.text); selection.text = NULL; @@ -2833,7 +2898,6 @@ wchar_t *new_selection_text; text_t *t; - D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); switch (selection.op) { case SELECTION_CONT: @@ -2865,7 +2929,7 @@ for (; row <= end_row; row++, col = 0) { - t = &(screen.text[row][col]); + t = &screen.text[row][col]; end_col = screen.tlen[row]; @@ -2939,7 +3003,6 @@ #endif selection_time = tm; - D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); } /* ------------------------------------------------------------------------- */ @@ -2950,8 +3013,6 @@ void rxvt_term::selection_click (int clicks, int x, int y) { - D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); - clicks = ((clicks - 1) % 3) + 1; selection.clicks = clicks; /* save clicks so extend will work */ @@ -3003,7 +3064,7 @@ /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ #define DELIMIT_TEXT(x) \ - (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) + (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) #define DELIMIT_REND(x) 1 void @@ -3031,10 +3092,10 @@ col = mark->col; MAX_IT (col, 0); /* find the edge of a word */ - stp = & (screen.text[row][col]); + stp = &screen.text[row][col]; w1 = DELIMIT_TEXT (*stp); - srp = (&screen.rend[row][col]); + srp = &screen.rend[row][col]; w2 = DELIMIT_REND (*srp); for (;;) @@ -3078,8 +3139,6 @@ } Old_Word_Selection_You_Die: - D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); - if (dirn == DN) col++; /* put us on one past the end */ @@ -3123,7 +3182,6 @@ selection.beg.col = selection.end.col = 0; selection.clicks = 4; want_refresh = 1; - D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); return; } @@ -3149,9 +3207,6 @@ LEFT, RIGHT } closeto = RIGHT; - D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); - D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); - want_refresh = 1; switch (selection.op) { @@ -3182,7 +3237,6 @@ { selection.beg.col = selection.end.col = selection.mark.col; selection.beg.row = selection.end.row = selection.mark.row; - D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); } pos.col = col; @@ -3285,8 +3339,8 @@ } else if (selection.clicks == 3) { -#ifndef NO_FRILLS - if ((Options & Opt_tripleclickwords)) +#if ENABLE_FRILLS + if ((options & Opt_tripleclickwords)) { int end_row; @@ -3321,8 +3375,7 @@ if (closeto == LEFT) { selection.mark.row = selection.end.row; - selection.mark.col = selection.end.col - - (selection.clicks == 2); + selection.mark.col = selection.end.col - (selection.clicks == 2); } else { @@ -3330,10 +3383,9 @@ selection.mark.col = selection.beg.col; } } - D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); } -#ifndef NO_FRILLS +#if ENABLE_FRILLS void rxvt_term::selection_remove_trailing_spaces () { @@ -3432,10 +3484,12 @@ target - target_list); ev.property = rq.property; } +#if TODO // TODO else if (rq.target == xa[XA_MULTIPLE]) { /* TODO: Handle MULTIPLE */ } +#endif else if (rq.target == xa[XA_TIMESTAMP] && selection.text) { XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, @@ -3526,13 +3580,136 @@ /* ------------------------------------------------------------------------- */ #ifdef USE_XIM void -rxvt_term::im_set_position (XPoint *pos) +rxvt_term::im_set_position (XPoint &pos) { XWindowAttributes xwa; XGetWindowAttributes (display->display, TermWin.vt, &xwa); - pos->x = Col2Pixel (screen.cur.col) + xwa.x; - pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; + + pos.x = xwa.x + Col2Pixel (screen.cur.col); + pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; +} +#endif + +#if ENABLE_OVERLAY +void +rxvt_term::scr_overlay_new (int x, int y, int w, int h) +{ + if (TermWin.nrow < 3 || TermWin.ncol < 3) + return; + + want_refresh = 1; + + scr_overlay_off (); + + if (x < 0) x = TermWin.ncol - w; + if (y < 0) y = TermWin.nrow - h; + + // make space for border + w += 2; MIN_IT (w, TermWin.ncol); + h += 2; MIN_IT (h, TermWin.nrow); + + x -= 1; MAX_IT (x, 0); + y -= 1; MAX_IT (y, 0); + + MIN_IT (x, TermWin.ncol - w); + MIN_IT (y, TermWin.nrow - h); + + ov_x = x; ov_y = y; + ov_w = w; ov_h = h; + + ov_text = new text_t *[h]; + ov_rend = new rend_t *[h]; + + for (y = 0; y < h; y++) + { + text_t *tp = ov_text[y] = new text_t[w]; + rend_t *rp = ov_rend[y] = new rend_t[w]; + + text_t t0, t1, t2; + rend_t r = OVERLAY_RSTYLE; + + if (y == 0) + t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; + else if (y < h - 1) + t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; + else + t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; + + *tp++ = t0; + *rp++ = r; + + for (x = w - 2; x > 0; --x) + { + *tp++ = t1; + *rp++ = r; + } + + *tp = t2; + *rp = r; + } +} + +void +rxvt_term::scr_overlay_off () +{ + if (!ov_text) + return; + + want_refresh = 1; + + for (int y = 0; y < ov_h; y++) + { + delete [] ov_text[y]; + delete [] ov_rend[y]; + } + + delete [] ov_text; ov_text = 0; + delete [] ov_rend; ov_rend = 0; +} + +void +rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) +{ + if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) + return; + + x++, y++; + + ov_text[y][x] = text; + ov_rend[y][x] = rend; +} + +void +rxvt_term::scr_overlay_set (int x, int y, const char *s) +{ + while (*s) + scr_overlay_set (x++, y, *s++); +} + +void +rxvt_term::scr_swap_overlay () +{ + if (!ov_text) + return; + + int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; + + // swap screen mem with overlay + for (int y = ov_h; y--; ) + { + text_t *t1 = ov_text[y]; + rend_t *r1 = ov_rend[y]; + + text_t *t2 = screen.text[y + row_offset] + ov_x; + rend_t *r2 = screen.rend[y + row_offset] + ov_x; + + for (int x = ov_w; x--; ) + { + text_t t = *t1; *t1++ = *t2; *t2++ = t; + rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); + } + } } #endif