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.415 by root, Mon May 28 14:25:16 2012 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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