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.427 by sf-exg, Sat Dec 29 15:59:51 2012 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;
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
162rxvt_term::scr_alloc () 160rxvt_term::scr_alloc () NOTHROW
163{ 161{
164 int tsize = sizeof (text_t) * ncol; 162 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol; 163 int rsize = sizeof (rend_t) * ncol;
166 164
167 // we assume that rend_t size is a sufficient alignment 165 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only 166 // factor for text_t and line_t values, and we only
169 // need to adjust tsize. 167 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1); 168 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t); 169 tsize -= tsize % sizeof (rend_t);
172 170
173 int all_rows = total_rows + nrow + nrow; 171 int all_rows = total_rows + nrow + nrow;
174 172
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size); 174 chunk = chunk_alloc (chunk_size, 0);
177 175
178 char *base = (char *)chunk + sizeof (line_t) * all_rows; 176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179 177
180 for (int row = 0; row < all_rows; ++row) 178 for (int row = 0; row < all_rows; ++row)
181 { 179 {
… …
190 drawn_buf = (line_t *)chunk; 188 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow; 189 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow; 190 row_buf = swap_buf + nrow;
193} 191}
194 192
195void 193void ecb_cold
196rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
197{ 195{
198#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
199 scr_overlay_off (); 197 scr_overlay_off ();
200#endif 198#endif
… …
227 225
228 screen.tscroll = 0; 226 screen.tscroll = 0;
229 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
230 228
231 void *prev_chunk = chunk; 229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
232 line_t *prev_drawn_buf = drawn_buf; 231 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf; 232 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf; 233 line_t *prev_row_buf = row_buf;
235 234
236 int common_col = min (prev_ncol, ncol); 235 int common_col = min (prev_ncol, ncol);
… …
238 scr_alloc (); 237 scr_alloc ();
239 238
240 if (!prev_row_buf) 239 if (!prev_row_buf)
241 { 240 {
242 /* 241 /*
243 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
244 */ 243 */
245 top_row = 0; 244 top_row = 0;
246 term_start = 0; 245 term_start = 0;
247 246
248 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
… …
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 409 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); 410 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); 411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 } 412 }
414 413
415 free (prev_chunk); 414 chunk_free (prev_chunk, prev_chunk_size);
416 415
417 free (tabs); 416 free (tabs);
418 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
419 418
420 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
… …
428 tt_winch (); 427 tt_winch ();
429 428
430 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
431} 430}
432 431
433/* ------------------------------------------------------------------------- */ 432void ecb_cold
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
439{ 434{
440 free (chunk); 435 chunk_free (chunk, chunk_size);
436 chunk = 0;
437 row_buf = 0;
438
441 free (tabs); 439 free (tabs);
440 tabs = 0;
442} 441}
443 442
444/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
445/* 444/*
446 * Hard/Soft reset 445 * Hard/Soft reset
447 */ 446 */
448void 447void ecb_cold
449rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
450{ 449{
451 scr_release (); 450 scr_release ();
452 451
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false; 453 rvideo_mode = false;
457 scr_soft_reset (); 454 scr_soft_reset ();
458 scr_reset (); 455 scr_reset ();
459 456
460 scr_clear (true); 457 scr_clear (true);
461 scr_refresh (); 458 scr_refresh ();
462} 459}
463 460
464void 461void ecb_cold
465rxvt_term::scr_soft_reset () NOTHROW 462rxvt_term::scr_soft_reset () NOTHROW
466{ 463{
467 /* only affects modes, nothing drastic such as clearing the screen */ 464 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY 465#if ENABLE_OVERLAY
469 scr_overlay_off (); 466 scr_overlay_off ();
… …
635/* 632/*
636 * Scroll text between <row1> and <row2> inclusive, by <count> lines 633 * Scroll text between <row1> and <row2> inclusive, by <count> lines
637 * count positive ==> scroll up 634 * count positive ==> scroll up
638 * count negative ==> scroll down 635 * count negative ==> scroll down
639 */ 636 */
640int 637int ecb_hot
641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 638rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
642{ 639{
643 if (count == 0 || (row1 > row2)) 640 if (count == 0 || (row1 > row2))
644 return 0; 641 return 0;
645 642
… …
779 776
780/* ------------------------------------------------------------------------- */ 777/* ------------------------------------------------------------------------- */
781/* 778/*
782 * Add text given in <str> of length <len> to screen struct 779 * Add text given in <str> of length <len> to screen struct
783 */ 780 */
784void 781void ecb_hot
785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 782rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
786{ 783{
787 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
788 return; 785 return;
789 786
… …
1139 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1140 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1141 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1142 */ 1139 */
1143#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1144void 1141void ecb_cold
1145rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1146{ 1143{
1147 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1149 else 1146 else
… …
1156 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1157 * Move cursor right in row. If we're at the right boundary, shift everything 1154 * Move cursor right in row. If we're at the right boundary, shift everything
1158 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1159 */ 1156 */
1160#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1161void 1158void ecb_cold
1162rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1163{ 1160{
1164 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1166 else 1163 else
… …
1417/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1418/* 1415/*
1419 * Fill the screen with `E's 1416 * Fill the screen with `E's
1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1421 */ 1418 */
1422void 1419void ecb_cold
1423rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1424{ 1421{
1425 rend_t fs; 1422 rend_t fs;
1426 1423
1427 want_refresh = 1; 1424 want_refresh = 1;
… …
1591/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1592/* 1589/*
1593 * Set the scrolling region 1590 * Set the scrolling region
1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1595 */ 1592 */
1596void 1593void ecb_cold
1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1598{ 1595{
1599 max_it (top, 0); 1596 max_it (top, 0);
1600 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1601 1598
… …
1611/* 1608/*
1612 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1615 */ 1612 */
1616void 1613void ecb_cold
1617rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1618{ 1615{
1619 want_refresh = 1; 1616 want_refresh = 1;
1620 1617
1621 if (mode) 1618 if (mode)
… …
1628/* 1625/*
1629 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1632 */ 1629 */
1633void 1630void ecb_cold
1634rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1635{ 1632{
1636 if (mode) 1633 if (mode)
1637 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1638 else 1635 else
… …
1647 * Relative mode: line numbers are relative to top margin of scrolling region 1644 * Relative mode: line numbers are relative to top margin of scrolling region
1648 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1651 */ 1648 */
1652void 1649void ecb_cold
1653rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1654{ 1651{
1655 if (mode) 1652 if (mode)
1656 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1657 else 1654 else
… …
1664/* 1661/*
1665 * Set insert/replace mode 1662 * Set insert/replace mode
1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1668 */ 1665 */
1669void 1666void ecb_cold
1670rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1671{ 1668{
1672 if (mode) 1669 if (mode)
1673 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1674 else 1671 else
… …
1680 * Set/Unset tabs 1677 * Set/Unset tabs
1681 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1684 */ 1681 */
1685void 1682void ecb_cold
1686rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1687{ 1684{
1688 if (mode < 0) 1685 if (mode < 0)
1689 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1690 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1709 if (rvideo_state != on) 1706 if (rvideo_state != on)
1710 { 1707 {
1711 rvideo_state = on; 1708 rvideo_state = on;
1712 1709
1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1714#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_IMG
1715 if (bg_pixmap == None) 1712 if (bg_img == 0)
1716#endif 1713#endif
1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1718 1715
1719 XGCValues gcvalue; 1716 XGCValues gcvalue;
1720 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1729/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1730/* 1727/*
1731 * Report current cursor position 1728 * Report current cursor position
1732 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1733 */ 1730 */
1734void 1731void ecb_cold
1735rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1736{ 1733{
1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1734 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1738} 1735}
1739 1736
… …
1742 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1743 1740
1744/* 1741/*
1745 * Set font style 1742 * Set font style
1746 */ 1743 */
1747void 1744void ecb_cold
1748rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1749{ 1746{
1750#if 0 1747#if 0
1751 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1752 { 1749 {
… …
1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1776 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1777 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1778 */ 1775 */
1779void 1776void ecb_cold
1780rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1781{ 1778{
1782 screen.charset = set; 1779 screen.charset = set;
1783 set_font_style (); 1780 set_font_style ();
1784} 1781}
… …
1805 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1806 1803
1807/* 1804/*
1808 * refresh matching text. 1805 * refresh matching text.
1809 */ 1806 */
1810bool 1807bool ecb_cold
1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1812{ 1809{
1813 bool found = false; 1810 bool found = false;
1814 1811
1815 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1834 PART_BEG = 0, 1831 PART_BEG = 0,
1835 PART_END, 1832 PART_END,
1836 RC_COUNT 1833 RC_COUNT
1837}; 1834};
1838 1835
1839void 1836void ecb_hot
1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1837rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1841{ 1838{
1842 int i; 1839 int i;
1843 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1844 1841
… …
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1971#endif 1968#endif
1972} 1969}
1973 1970
1974/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1975void 1972void ecb_cold
1976rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1977{ 1974{
1978#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1979 int nrows, row_start; 1976 int nrows, row_start;
1980 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
2029/* 2026/*
2030 * Refresh the screen 2027 * Refresh the screen
2031 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2032 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2033 */ 2030 */
2034void 2031void ecb_hot
2035rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2036{ 2033{
2037 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2038 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2039 int i; /* tmp */ 2036 int i; /* tmp */
… …
2054 */ 2051 */
2055 refresh_count = 0; 2052 refresh_count = 0;
2056 2053
2057 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2058 bool have_bg = 0; 2055 bool have_bg = 0;
2059#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_IMG
2060 have_bg = bg_pixmap != None; 2057 have_bg = bg_img != 0;
2061#endif 2058#endif
2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2063 2060
2064 /* 2061 /*
2065 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2505 screen.flags = old_screen_flags; 2502 screen.flags = old_screen_flags;
2506 num_scr = 0; 2503 num_scr = 0;
2507 num_scr_allow = 1; 2504 num_scr_allow = 1;
2508} 2505}
2509 2506
2510void 2507void ecb_cold
2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2512{ 2509{
2513 if (!l.valid ()) 2510 if (!l.valid ())
2514 return; 2511 return;
2515 2512
… …
2517 2514
2518 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2516 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2520} 2517}
2521 2518
2522void 2519void ecb_cold
2523rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2524{ 2521{
2525 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2526 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2527 2524
… …
2530 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2531 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2532 } 2529 }
2533} 2530}
2534 2531
2535void 2532void ecb_cold
2536rxvt_term::scr_recolour (bool refresh) NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2537{ 2534{
2538 bool transparent = false; 2535 bool transparent = false;
2539 2536
2540#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_IMG
2541 if (bg_pixmap != None) 2538 if (bg_img != 0)
2542 { 2539 {
2543# ifdef ENABLE_TRANSPARENCY 2540# if ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT) 2541 if (bg_flags & BG_IS_TRANSPARENT)
2545 { 2542 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548 2545
2549 transparent = true; 2546 transparent = true;
2550 } 2547 }
2551 else 2548 else
2552# endif 2549# endif
2553 { 2550 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2556 } 2553 }
2557 } 2554 }
2558 else 2555 else
2559#endif 2556#endif
2560 { 2557 {
… …
2567 if (scrollBar.win) 2564 if (scrollBar.win)
2568 { 2565 {
2569 if (transparent) 2566 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else 2568 else
2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2573 scrollBar.state = SB_STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2574 scrollBar.show (0); 2571 scrollBar.show (0);
2575 } 2572 }
2576 2573
2577 if (refresh) 2574 if (refresh)
… …
2643 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2644 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2645} 2642}
2646 2643
2647/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2648void 2645void ecb_hot
2649rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2650{ 2647{
2651 if (selection.op 2648 if (selection.op
2652 && current_screen == selection.screen 2649 && current_screen == selection.screen
2653 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
… …
2944/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
2945/* 2942/*
2946 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
2947 * EXT: button 1 press 2944 * EXT: button 1 press
2948 */ 2945 */
2949void 2946void ecb_cold
2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2951{ 2948{
2952 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
2953 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
2954 2951
… …
2973 2970
2974/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
2975/* 2972/*
2976 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
2977 */ 2974 */
2978void 2975void ecb_cold
2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2980{ 2977{
2981 want_refresh = 1; 2978 want_refresh = 1;
2982 2979
2983 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3014 3011
3015void 3012void ecb_cold
3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3017{ 3014{
3018 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3019 row_col_t bound; 3016 row_col_t bound;
3020 text_t *stp; 3017 text_t *stp;
… …
3094 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3095 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3096 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3097 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3098 */ 3095 */
3099void 3096void ecb_cold
3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3101{ 3098{
3102 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3103 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 3101
… …
3130 3127
3131/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3132/* 3129/*
3133 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3134 */ 3131 */
3135void 3132void ecb_cold
3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3137{ 3134{
3138 row_col_t pos; 3135 row_col_t pos;
3139 enum { 3136 enum {
3140 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3331 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3332#endif 3329#endif
3333} 3330}
3334 3331
3335#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3336void 3333void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3338{ 3335{
3339 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3340 text_t *stp; 3337 text_t *stp;
3341 3338
… …
3379/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3380/* 3377/*
3381 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3382 * EXT: button 3 double click 3379 * EXT: button 3 double click
3383 */ 3380 */
3384void 3381void ecb_cold
3385rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3386{ 3383{
3387 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3389} 3386}
… …
3391/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3392/* 3389/*
3393 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3394 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3395 */ 3392 */
3396void 3393void ecb_cold
3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3398{ 3395{
3399 Atom property = rq.property == None ? rq.target : rq.property; 3396 Atom property = rq.property == None ? rq.target : rq.property;
3400 XSelectionEvent ev; 3397 XSelectionEvent ev;
3401 3398
… …
3534 3531
3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3536} 3533}
3537 3534
3538/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3539#ifdef USE_XIM 3536#if USE_XIM
3540void 3537void ecb_cold
3541rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3542{ 3539{
3543 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3544 3541
3545 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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