ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.416 by root, Mon May 28 14:26:11 2012 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 169void
160rxvt_term::scr_alloc () 170rxvt_term::scr_alloc () NOTHROW
161{ 171{
162 int tsize = sizeof (text_t) * ncol; 172 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 173 int rsize = sizeof (rend_t) * ncol;
164 174
165 // we assume that rend_t size is a sufficient alignment 175 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only 176 // factor for text_t and line_t values, and we only
167 // need to adjust tsize. 177 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1); 178 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t); 179 tsize -= tsize % sizeof (rend_t);
170 180
171 int all_rows = total_rows + nrow + nrow; 181 int all_rows = total_rows + nrow + nrow;
172 182
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 184 chunk = chunk_alloc (chunk_size, 0);
175 185
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 187
178 for (int row = 0; row < all_rows; ++row) 188 for (int row = 0; row < all_rows; ++row)
179 { 189 {
… …
189 swap_buf = drawn_buf + nrow; 199 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 200 row_buf = swap_buf + nrow;
191} 201}
192 202
193void 203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
194rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
195{ 215{
196#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
197 scr_overlay_off (); 217 scr_overlay_off ();
198#endif 218#endif
… …
225 245
226 screen.tscroll = 0; 246 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
228 248
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
233 254
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 255 scr_alloc ();
237 256
238 if (!prev_row_buf) 257 if (!prev_row_buf)
239 { 258 {
240 /* 259 /*
241 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
242 */ 261 */
243 top_row = 0; 262 top_row = 0;
244 term_start = 0; 263 term_start = 0;
245 264
246 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
… …
272 { 291 {
273 /* 292 /*
274 * add or delete rows as appropriate 293 * add or delete rows as appropriate
275 */ 294 */
276 295
296 int common_col = min (prev_ncol, ncol);
297
277 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
278 { 299 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 303
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 304 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 305 }
287 306
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
386 { 405 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 407 line_t &dst = row_buf [row];
389 408
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 409 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 410 }
395 411
396 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 414
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 427 }
412 428
413 free (prev_chunk); 429 chunk_free (prev_chunk, prev_chunk_size);
414 430
415 free (tabs); 431 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
417 433
418 for (int col = ncol; col--; ) 434 for (int col = ncol; col--; )
… …
426 tt_winch (); 442 tt_winch ();
427 443
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 445}
430 446
431/* ------------------------------------------------------------------------- */ 447void ecb_cold
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () NOTHROW
437{ 449{
438 free (chunk); 450 chunk_free (chunk, chunk_size);
451 chunk = 0;
452 row_buf = 0;
453
439 free (tabs); 454 free (tabs);
455 tabs = 0;
440} 456}
441 457
442/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
443/* 459/*
444 * Hard/Soft reset 460 * Hard/Soft reset
445 */ 461 */
446void 462void ecb_cold
447rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
448{ 464{
449 scr_release (); 465 scr_release ();
450 466
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 468 rvideo_mode = false;
455 scr_soft_reset (); 469 scr_soft_reset ();
456 scr_reset (); 470 scr_reset ();
457 471
458 scr_clear (true); 472 scr_clear (true);
459 scr_refresh (); 473 scr_refresh ();
460} 474}
461 475
462void 476void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW 477rxvt_term::scr_soft_reset () NOTHROW
464{ 478{
465 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
467 scr_overlay_off (); 481 scr_overlay_off ();
… …
633/* 647/*
634 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
635 * count positive ==> scroll up 649 * count positive ==> scroll up
636 * count negative ==> scroll down 650 * count negative ==> scroll down
637 */ 651 */
638int 652int ecb_hot
639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
640{ 654{
641 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
642 return 0; 656 return 0;
643 657
… …
777 791
778/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
779/* 793/*
780 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
781 */ 795 */
782void 796void ecb_hot
783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
784{ 798{
785 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
786 return; 800 return;
787 801
… …
1137 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1138 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1139 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1140 */ 1154 */
1141#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1142void 1156void ecb_cold
1143rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1144{ 1158{
1145 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1161 else
… …
1154 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1155 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1156 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1157 */ 1171 */
1158#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1159void 1173void ecb_cold
1160rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1161{ 1175{
1162 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1164 else 1178 else
… …
1415/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1416/* 1430/*
1417 * Fill the screen with `E's 1431 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1433 */
1420void 1434void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1422{ 1436{
1423 rend_t fs; 1437 rend_t fs;
1424 1438
1425 want_refresh = 1; 1439 want_refresh = 1;
… …
1589/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1590/* 1604/*
1591 * Set the scrolling region 1605 * Set the scrolling region
1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1593 */ 1607 */
1594void 1608void ecb_cold
1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1596{ 1610{
1597 max_it (top, 0); 1611 max_it (top, 0);
1598 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1599 1613
… …
1609/* 1623/*
1610 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1613 */ 1627 */
1614void 1628void ecb_cold
1615rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1616{ 1630{
1617 want_refresh = 1; 1631 want_refresh = 1;
1618 1632
1619 if (mode) 1633 if (mode)
… …
1626/* 1640/*
1627 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1630 */ 1644 */
1631void 1645void ecb_cold
1632rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1633{ 1647{
1634 if (mode) 1648 if (mode)
1635 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1636 else 1650 else
… …
1645 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1646 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1649 */ 1663 */
1650void 1664void ecb_cold
1651rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1652{ 1666{
1653 if (mode) 1667 if (mode)
1654 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1655 else 1669 else
… …
1662/* 1676/*
1663 * Set insert/replace mode 1677 * Set insert/replace mode
1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1666 */ 1680 */
1667void 1681void ecb_cold
1668rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1669{ 1683{
1670 if (mode) 1684 if (mode)
1671 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1672 else 1686 else
… …
1678 * Set/Unset tabs 1692 * Set/Unset tabs
1679 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1682 */ 1696 */
1683void 1697void ecb_cold
1684rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1685{ 1699{
1686 if (mode < 0) 1700 if (mode < 0)
1687 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1688 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1707 if (rvideo_state != on) 1721 if (rvideo_state != on)
1708 { 1722 {
1709 rvideo_state = on; 1723 rvideo_state = on;
1710 1724
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1727 if (bg_img == 0)
1714#endif 1728#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1730
1717 XGCValues gcvalue; 1731 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1727/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1728/* 1742/*
1729 * Report current cursor position 1743 * Report current cursor position
1730 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1731 */ 1745 */
1732void 1746void ecb_cold
1733rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1734{ 1748{
1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1736} 1750}
1737 1751
… …
1740 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1741 1755
1742/* 1756/*
1743 * Set font style 1757 * Set font style
1744 */ 1758 */
1745void 1759void ecb_cold
1746rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1747{ 1761{
1748#if 0 1762#if 0
1749 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1750 { 1764 {
… …
1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1774 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1775 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1776 */ 1790 */
1777void 1791void ecb_cold
1778rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1779{ 1793{
1780 screen.charset = set; 1794 screen.charset = set;
1781 set_font_style (); 1795 set_font_style ();
1782} 1796}
… …
1803 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1804 1818
1805/* 1819/*
1806 * refresh matching text. 1820 * refresh matching text.
1807 */ 1821 */
1808bool 1822bool ecb_cold
1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1810{ 1824{
1811 bool found = false; 1825 bool found = false;
1812 1826
1813 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1832 PART_BEG = 0, 1846 PART_BEG = 0,
1833 PART_END, 1847 PART_END,
1834 RC_COUNT 1848 RC_COUNT
1835}; 1849};
1836 1850
1837void 1851void ecb_hot
1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1839{ 1853{
1840 int i; 1854 int i;
1841 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1842 1856
… …
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1969#endif 1983#endif
1970} 1984}
1971 1985
1972/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1973void 1987void ecb_cold
1974rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1975{ 1989{
1976#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1977 int nrows, row_start; 1991 int nrows, row_start;
1978 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
… …
2027/* 2041/*
2028 * Refresh the screen 2042 * Refresh the screen
2029 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2030 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2031 */ 2045 */
2032void 2046void ecb_hot
2033rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2034{ 2048{
2035 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2051 int i; /* tmp */
2038#ifndef NO_CURSORCOLOR
2039 rend_t cc1; /* store colours at cursor position (s) */
2040#endif
2041 rend_t *crp; // cursor rendition pointer
2042 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2044 2056
2045 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2046 2058
2047 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2060 return;
… …
2052 */ 2064 */
2053 refresh_count = 0; 2065 refresh_count = 0;
2054 2066
2055 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2068 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2059#endif 2071#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2073
2062 /* 2074 /*
2063 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2087 int col = screen.cur.col; 2099 int col = screen.cur.col;
2088 2100
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2102 col--;
2091 2103
2092 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2093 2106
2094#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2098 else 2110 else
2099#endif 2111#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2114 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2115#endif 2127#endif
2116 2128
2117 if (focus) 2129 if (focus)
2118 { 2130 {
2131 rend_t rend = cur_rend;
2132
2119 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2120 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2121 else 2135 else
2122 { 2136 {
2123 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2143 }
2128 } 2144 }
2129 2145
2130 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2450 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2451 */ 2467 */
2452 if (showcursor) 2468 if (showcursor)
2453 { 2469 {
2454 if (focus) 2470 if (focus)
2455 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 if (option (Opt_cursorUnderline))
2457 *crp ^= RS_Uline;
2458 else
2459 {
2460 *crp ^= RS_RVid;
2461#ifndef NO_CURSORCOLOR
2462 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2463#endif
2464 }
2465 }
2466 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2467 { 2473 {
2468 int cursorwidth = 1; 2474 int cursorwidth = 1;
2469 int col = oldcursor.col; 2475 int col = oldcursor.col;
2470 2476
… …
2503 screen.flags = old_screen_flags; 2509 screen.flags = old_screen_flags;
2504 num_scr = 0; 2510 num_scr = 0;
2505 num_scr_allow = 1; 2511 num_scr_allow = 1;
2506} 2512}
2507 2513
2508void 2514void ecb_cold
2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2510{ 2516{
2511 if (!l.valid ()) 2517 if (!l.valid ())
2512 return; 2518 return;
2513 2519
… …
2515 2521
2516 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2518} 2524}
2519 2525
2520void 2526void ecb_cold
2521rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2522{ 2528{
2523 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2524 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2525 2531
… …
2528 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2529 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2530 } 2536 }
2531} 2537}
2532 2538
2533void 2539void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2541{
2536 bool transparent = false; 2542 bool transparent = false;
2537 2543
2538#ifdef HAVE_BG_PIXMAP 2544#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2545 if (bg_img != 0)
2540 { 2546 {
2541# ifdef ENABLE_TRANSPARENCY 2547# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2548 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2549 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2552
2547 transparent = true; 2553 transparent = true;
2548 } 2554 }
2549 else 2555 else
2550# endif 2556# endif
2551 { 2557 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2560 }
2555 } 2561 }
2556 else 2562 else
2557#endif 2563#endif
2558 { 2564 {
… …
2565 if (scrollBar.win) 2571 if (scrollBar.win)
2566 { 2572 {
2567 if (transparent) 2573 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2575 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2578 scrollBar.show (0);
2573 } 2579 }
2574 2580
2575 if (refresh) 2581 if (refresh)
… …
2641 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2642 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2643} 2649}
2644 2650
2645/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2646void 2652void ecb_hot
2647rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2648{ 2654{
2649 if (selection.op 2655 if (selection.op
2650 && current_screen == selection.screen 2656 && current_screen == selection.screen
2651 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
… …
2692 || (check_more == 1 2698 || (check_more == 1
2693 && current_screen == selection.screen 2699 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 CLEAR_ALL_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2697} 2717}
2698 2718
2699/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2700/* 2720/*
2701 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
… …
2942/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
2943/* 2963/*
2944 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
2945 * EXT: button 1 press 2965 * EXT: button 1 press
2946 */ 2966 */
2947void 2967void ecb_cold
2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2949{ 2969{
2950 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
2951 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
2952 2972
… …
2971 2991
2972/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2973/* 2993/*
2974 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
2975 */ 2995 */
2976void 2996void ecb_cold
2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2978{ 2998{
2979 want_refresh = 1; 2999 want_refresh = 1;
2980 3000
2981 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3004 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3005 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3006 */ 3026 */
3007 3027
3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3012 3032
3013void 3033void ecb_cold
3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3015{ 3035{
3016 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3017 row_col_t bound; 3037 row_col_t bound;
3018 text_t *stp; 3038 text_t *stp;
… …
3092 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3093 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3094 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3095 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3096 */ 3116 */
3097void 3117void ecb_cold
3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3099{ 3119{
3100 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3101 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3102 3122
… …
3128 3148
3129/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3130/* 3150/*
3131 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3132 */ 3152 */
3133void 3153void ecb_cold
3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3135{ 3155{
3136 row_col_t pos; 3156 row_col_t pos;
3137 enum { 3157 enum {
3138 LEFT, RIGHT 3158 LEFT, RIGHT
3139 } closeto = RIGHT; 3159 } closeto = RIGHT;
3140
3141 want_refresh = 1;
3142 3160
3143 switch (selection.op) 3161 switch (selection.op)
3144 { 3162 {
3145 case SELECTION_INIT: 3163 case SELECTION_INIT:
3146 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3326 3344
3327#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3328 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3329 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3330#endif 3348#endif
3349
3350 selection_changed ();
3331} 3351}
3332 3352
3333#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3334void 3354void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3336{ 3356{
3337 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3338 text_t *stp; 3358 text_t *stp;
3339 3359
… …
3377/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3378/* 3398/*
3379 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3380 * EXT: button 3 double click 3400 * EXT: button 3 double click
3381 */ 3401 */
3382void 3402void ecb_cold
3383rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3384{ 3404{
3385 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3387} 3407}
… …
3389/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3390/* 3410/*
3391 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3392 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3393 */ 3413 */
3394void 3414void ecb_cold
3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3396{ 3416{
3397 Atom property = rq.property == None ? rq.target : rq.property; 3417 Atom property = rq.property == None ? rq.target : rq.property;
3398 XSelectionEvent ev; 3418 XSelectionEvent ev;
3399 3419
… …
3532 3552
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3554}
3535 3555
3536/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3557#if USE_XIM
3538void 3558void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3560{
3541 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3542 3562
3543 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines