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.433 by sf-exg, Thu Jan 31 08:07:14 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));
… …
274 * add or delete rows as appropriate 293 * add or delete rows as appropriate
275 */ 294 */
276 295
277 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
278 { 297 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
281
282 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);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
286 } 300 }
287 301
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
386 { 400 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 402 line_t &dst = row_buf [row];
389 403
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 404 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 } 405 }
395 406
396 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 409
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 419 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); 420 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); 421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 422 }
412 423
413 free (prev_chunk); 424 chunk_free (prev_chunk, prev_chunk_size);
414 425
415 free (tabs); 426 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 427 tabs = (char *)rxvt_malloc (ncol);
417 428
418 for (int col = ncol; col--; ) 429 for (int col = ncol; col--; )
… …
426 tt_winch (); 437 tt_winch ();
427 438
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 440}
430 441
431/* ------------------------------------------------------------------------- */ 442void ecb_cold
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW 443rxvt_term::scr_release () NOTHROW
437{ 444{
438 free (chunk); 445 chunk_free (chunk, chunk_size);
446 chunk = 0;
447 row_buf = 0;
448
439 free (tabs); 449 free (tabs);
450 tabs = 0;
440} 451}
441 452
442/* ------------------------------------------------------------------------- */ 453/* ------------------------------------------------------------------------- */
443/* 454/*
444 * Hard/Soft reset 455 * Hard/Soft reset
445 */ 456 */
446void 457void ecb_cold
447rxvt_term::scr_poweron () 458rxvt_term::scr_poweron ()
448{ 459{
449 scr_release (); 460 scr_release ();
450 461
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 462 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 463 rvideo_mode = false;
455 scr_soft_reset (); 464 scr_soft_reset ();
456 scr_reset (); 465 scr_reset ();
457 466
458 scr_clear (true); 467 scr_clear (true);
459 scr_refresh (); 468 scr_refresh ();
460} 469}
461 470
462void 471void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW 472rxvt_term::scr_soft_reset () NOTHROW
464{ 473{
465 /* only affects modes, nothing drastic such as clearing the screen */ 474 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY 475#if ENABLE_OVERLAY
467 scr_overlay_off (); 476 scr_overlay_off ();
… …
633/* 642/*
634 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
635 * count positive ==> scroll up 644 * count positive ==> scroll up
636 * count negative ==> scroll down 645 * count negative ==> scroll down
637 */ 646 */
638int 647int ecb_hot
639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
640{ 649{
641 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
642 return 0; 651 return 0;
643 652
… …
777 786
778/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
779/* 788/*
780 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
781 */ 790 */
782void 791void ecb_hot
783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
784{ 793{
785 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
786 return; 795 return;
787 796
… …
1137 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1138 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1139 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1140 */ 1149 */
1141#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1142void 1151void ecb_cold
1143rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1144{ 1153{
1145 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1156 else
… …
1154 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1155 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1156 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1157 */ 1166 */
1158#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1159void 1168void ecb_cold
1160rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1161{ 1170{
1162 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1164 else 1173 else
… …
1415/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1416/* 1425/*
1417 * Fill the screen with `E's 1426 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1428 */
1420void 1429void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1422{ 1431{
1423 rend_t fs; 1432 rend_t fs;
1424 1433
1425 want_refresh = 1; 1434 want_refresh = 1;
… …
1589/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1590/* 1599/*
1591 * Set the scrolling region 1600 * Set the scrolling region
1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1593 */ 1602 */
1594void 1603void ecb_cold
1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1596{ 1605{
1597 max_it (top, 0); 1606 max_it (top, 0);
1598 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1599 1608
… …
1609/* 1618/*
1610 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1613 */ 1622 */
1614void 1623void ecb_cold
1615rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1616{ 1625{
1617 want_refresh = 1; 1626 want_refresh = 1;
1618 1627
1619 if (mode) 1628 if (mode)
… …
1626/* 1635/*
1627 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1630 */ 1639 */
1631void 1640void ecb_cold
1632rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1633{ 1642{
1634 if (mode) 1643 if (mode)
1635 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1636 else 1645 else
… …
1645 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1646 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1649 */ 1658 */
1650void 1659void ecb_cold
1651rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1652{ 1661{
1653 if (mode) 1662 if (mode)
1654 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1655 else 1664 else
… …
1662/* 1671/*
1663 * Set insert/replace mode 1672 * Set insert/replace mode
1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1666 */ 1675 */
1667void 1676void ecb_cold
1668rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1669{ 1678{
1670 if (mode) 1679 if (mode)
1671 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1672 else 1681 else
… …
1678 * Set/Unset tabs 1687 * Set/Unset tabs
1679 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1682 */ 1691 */
1683void 1692void ecb_cold
1684rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1685{ 1694{
1686 if (mode < 0) 1695 if (mode < 0)
1687 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1688 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1707 if (rvideo_state != on) 1716 if (rvideo_state != on)
1708 { 1717 {
1709 rvideo_state = on; 1718 rvideo_state = on;
1710 1719
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1722 if (bg_img == 0)
1714#endif 1723#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1725
1717 XGCValues gcvalue; 1726 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1727/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1728/* 1737/*
1729 * Report current cursor position 1738 * Report current cursor position
1730 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1731 */ 1740 */
1732void 1741void ecb_cold
1733rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1734{ 1743{
1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1736} 1745}
1737 1746
… …
1740 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1741 1750
1742/* 1751/*
1743 * Set font style 1752 * Set font style
1744 */ 1753 */
1745void 1754void ecb_cold
1746rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1747{ 1756{
1748#if 0 1757#if 0
1749 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1750 { 1759 {
… …
1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1774 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1775 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1776 */ 1785 */
1777void 1786void ecb_cold
1778rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1779{ 1788{
1780 screen.charset = set; 1789 screen.charset = set;
1781 set_font_style (); 1790 set_font_style ();
1782} 1791}
… …
1803 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1804 1813
1805/* 1814/*
1806 * refresh matching text. 1815 * refresh matching text.
1807 */ 1816 */
1808bool 1817bool ecb_cold
1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1810{ 1819{
1811 bool found = false; 1820 bool found = false;
1812 1821
1813 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1832 PART_BEG = 0, 1841 PART_BEG = 0,
1833 PART_END, 1842 PART_END,
1834 RC_COUNT 1843 RC_COUNT
1835}; 1844};
1836 1845
1837void 1846void ecb_hot
1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1839{ 1848{
1840 int i; 1849 int i;
1841 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1842 1851
… …
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1969#endif 1978#endif
1970} 1979}
1971 1980
1972/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1973void 1982void ecb_cold
1974rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1975{ 1984{
1976#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1977 int nrows, row_start; 1986 int nrows, row_start;
1978 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
2027/* 2036/*
2028 * Refresh the screen 2037 * Refresh the screen
2029 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
2030 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
2031 */ 2040 */
2032void 2041void ecb_hot
2033rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2034{ 2043{
2035 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2046 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 */ 2047 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2044 2051
2045 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2046 2053
2047 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2055 return;
… …
2052 */ 2059 */
2053 refresh_count = 0; 2060 refresh_count = 0;
2054 2061
2055 unsigned int old_screen_flags = screen.flags; 2062 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2063 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2065 have_bg = bg_img != 0;
2059#endif 2066#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2068
2062 /* 2069 /*
2063 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2087 int col = screen.cur.col; 2094 int col = screen.cur.col;
2088 2095
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2097 col--;
2091 2098
2092 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2093 2101
2094#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2098 else 2105 else
2099#endif 2106#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2114 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2115#endif 2122#endif
2116 2123
2117 if (focus) 2124 if (focus)
2118 { 2125 {
2126 rend_t rend = cur_rend;
2127
2119 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2120 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2121 else 2130 else
2122 { 2131 {
2123 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2138 }
2128 } 2139 }
2129 2140
2130 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2450 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2451 */ 2462 */
2452 if (showcursor) 2463 if (showcursor)
2453 { 2464 {
2454 if (focus) 2465 if (focus)
2455 { 2466 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) 2467 else if (oldcursor.row >= 0)
2467 { 2468 {
2468 int cursorwidth = 1; 2469 int cursorwidth = 1;
2469 int col = oldcursor.col; 2470 int col = oldcursor.col;
2470 2471
… …
2503 screen.flags = old_screen_flags; 2504 screen.flags = old_screen_flags;
2504 num_scr = 0; 2505 num_scr = 0;
2505 num_scr_allow = 1; 2506 num_scr_allow = 1;
2506} 2507}
2507 2508
2508void 2509void ecb_cold
2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2510{ 2511{
2511 if (!l.valid ()) 2512 if (!l.valid ())
2512 return; 2513 return;
2513 2514
… …
2515 2516
2516 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2518} 2519}
2519 2520
2520void 2521void ecb_cold
2521rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2522{ 2523{
2523 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2524 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2525 2526
… …
2528 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2529 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2530 } 2531 }
2531} 2532}
2532 2533
2533void 2534void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2536{
2536 bool transparent = false; 2537 bool transparent = false;
2537 2538
2538#ifdef HAVE_BG_PIXMAP 2539#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2540 if (bg_img != 0)
2540 { 2541 {
2541# ifdef ENABLE_TRANSPARENCY 2542# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2543 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2544 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2547
2547 transparent = true; 2548 transparent = true;
2548 } 2549 }
2549 else 2550 else
2550# endif 2551# endif
2551 { 2552 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2555 }
2555 } 2556 }
2556 else 2557 else
2557#endif 2558#endif
2558 { 2559 {
… …
2565 if (scrollBar.win) 2566 if (scrollBar.win)
2566 { 2567 {
2567 if (transparent) 2568 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2570 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2573 scrollBar.show (0);
2573 } 2574 }
2574 2575
2575 if (refresh) 2576 if (refresh)
… …
2641 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2642 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2643} 2644}
2644 2645
2645/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2646void 2647void ecb_hot
2647rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2648{ 2649{
2649 if (selection.op 2650 if (selection.op
2650 && current_screen == selection.screen 2651 && current_screen == selection.screen
2651 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
… …
2942/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
2943/* 2944/*
2944 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
2945 * EXT: button 1 press 2946 * EXT: button 1 press
2946 */ 2947 */
2947void 2948void ecb_cold
2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2949{ 2950{
2950 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
2951 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
2952 2953
… …
2971 2972
2972/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
2973/* 2974/*
2974 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
2975 */ 2976 */
2976void 2977void ecb_cold
2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2978{ 2979{
2979 want_refresh = 1; 2980 want_refresh = 1;
2980 2981
2981 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3012 3013
3013void 3014void ecb_cold
3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3015{ 3016{
3016 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3017 row_col_t bound; 3018 row_col_t bound;
3018 text_t *stp; 3019 text_t *stp;
… …
3092 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3093 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3094 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3095 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3096 */ 3097 */
3097void 3098void ecb_cold
3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3099{ 3100{
3100 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3101 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3102 3103
… …
3128 3129
3129/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3130/* 3131/*
3131 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3132 */ 3133 */
3133void 3134void ecb_cold
3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3135{ 3136{
3136 row_col_t pos; 3137 row_col_t pos;
3137 enum { 3138 enum {
3138 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3329 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3330#endif 3331#endif
3331} 3332}
3332 3333
3333#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3334void 3335void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3336{ 3337{
3337 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3338 text_t *stp; 3339 text_t *stp;
3339 3340
… …
3377/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3378/* 3379/*
3379 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3380 * EXT: button 3 double click 3381 * EXT: button 3 double click
3381 */ 3382 */
3382void 3383void ecb_cold
3383rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3384{ 3385{
3385 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3387} 3388}
… …
3389/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3390/* 3391/*
3391 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3392 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3393 */ 3394 */
3394void 3395void ecb_cold
3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3396{ 3397{
3397 Atom property = rq.property == None ? rq.target : rq.property; 3398 Atom property = rq.property == None ? rq.target : rq.property;
3398 XSelectionEvent ev; 3399 XSelectionEvent ev;
3399 3400
… …
3532 3533
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3535}
3535 3536
3536/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3538#if USE_XIM
3538void 3539void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3541{
3541 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3542 3543
3543 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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