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.427 by sf-exg, Sat Dec 29 15:59:51 2012 UTC

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

Diff Legend

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