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.421 by sf-exg, Sun Jun 10 13:07:56 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;
… …
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
… …
238 scr_alloc (); 236 scr_alloc ();
239 237
240 if (!prev_row_buf) 238 if (!prev_row_buf)
241 { 239 {
242 /* 240 /*
243 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
244 */ 242 */
245 top_row = 0; 243 top_row = 0;
246 term_start = 0; 244 term_start = 0;
247 245
248 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
… …
428 tt_winch (); 426 tt_winch ();
429 427
430 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
431} 429}
432 430
433/* ------------------------------------------------------------------------- */ 431void ecb_cold
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
439{ 433{
440 free (chunk); 434 free (chunk); chunk = 0; row_buf = 0;
441 free (tabs); 435 free (tabs); tabs = 0;
442} 436}
443 437
444/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
445/* 439/*
446 * Hard/Soft reset 440 * Hard/Soft reset
447 */ 441 */
448void 442void ecb_cold
449rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
450{ 444{
451 scr_release (); 445 scr_release ();
452 446
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false; 448 rvideo_mode = false;
457 scr_soft_reset (); 449 scr_soft_reset ();
458 scr_reset (); 450 scr_reset ();
459 451
460 scr_clear (true); 452 scr_clear (true);
461 scr_refresh (); 453 scr_refresh ();
462} 454}
463 455
464void 456void ecb_cold
465rxvt_term::scr_soft_reset () NOTHROW 457rxvt_term::scr_soft_reset () NOTHROW
466{ 458{
467 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
469 scr_overlay_off (); 461 scr_overlay_off ();
… …
635/* 627/*
636 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
637 * count positive ==> scroll up 629 * count positive ==> scroll up
638 * count negative ==> scroll down 630 * count negative ==> scroll down
639 */ 631 */
640int 632int ecb_hot
641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
642{ 634{
643 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
644 return 0; 636 return 0;
645 637
… …
779 771
780/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
781/* 773/*
782 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
783 */ 775 */
784void 776void ecb_hot
785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
786{ 778{
787 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
788 return; 780 return;
789 781
… …
1139 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1140 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1141 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1142 */ 1134 */
1143#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1144void 1136void ecb_cold
1145rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1146{ 1138{
1147 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1149 else 1141 else
… …
1156 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1157 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1158 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1159 */ 1151 */
1160#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1161void 1153void ecb_cold
1162rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1163{ 1155{
1164 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1166 else 1158 else
… …
1417/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1418/* 1410/*
1419 * Fill the screen with `E's 1411 * Fill the screen with `E's
1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1421 */ 1413 */
1422void 1414void ecb_cold
1423rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1424{ 1416{
1425 rend_t fs; 1417 rend_t fs;
1426 1418
1427 want_refresh = 1; 1419 want_refresh = 1;
… …
1591/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1592/* 1584/*
1593 * Set the scrolling region 1585 * Set the scrolling region
1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1595 */ 1587 */
1596void 1588void ecb_cold
1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1598{ 1590{
1599 max_it (top, 0); 1591 max_it (top, 0);
1600 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1601 1593
… …
1611/* 1603/*
1612 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1615 */ 1607 */
1616void 1608void ecb_cold
1617rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1618{ 1610{
1619 want_refresh = 1; 1611 want_refresh = 1;
1620 1612
1621 if (mode) 1613 if (mode)
… …
1628/* 1620/*
1629 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1632 */ 1624 */
1633void 1625void ecb_cold
1634rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1635{ 1627{
1636 if (mode) 1628 if (mode)
1637 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1638 else 1630 else
… …
1647 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1648 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1651 */ 1643 */
1652void 1644void ecb_cold
1653rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1654{ 1646{
1655 if (mode) 1647 if (mode)
1656 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1657 else 1649 else
… …
1664/* 1656/*
1665 * Set insert/replace mode 1657 * Set insert/replace mode
1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1668 */ 1660 */
1669void 1661void ecb_cold
1670rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1671{ 1663{
1672 if (mode) 1664 if (mode)
1673 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1674 else 1666 else
… …
1680 * Set/Unset tabs 1672 * Set/Unset tabs
1681 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1684 */ 1676 */
1685void 1677void ecb_cold
1686rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1687{ 1679{
1688 if (mode < 0) 1680 if (mode < 0)
1689 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1690 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1710 { 1702 {
1711 rvideo_state = on; 1703 rvideo_state = on;
1712 1704
1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1714#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1715 if (bg_pixmap == None) 1707 if (bg_img == 0)
1716#endif 1708#endif
1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1718 1710
1719 XGCValues gcvalue; 1711 XGCValues gcvalue;
1720 gcvalue.foreground = pix_colors[Color_fg]; 1712 gcvalue.foreground = pix_colors[Color_fg];
… …
1729/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1730/* 1722/*
1731 * Report current cursor position 1723 * Report current cursor position
1732 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1733 */ 1725 */
1734void 1726void ecb_cold
1735rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1736{ 1728{
1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1738} 1730}
1739 1731
… …
1742 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1743 1735
1744/* 1736/*
1745 * Set font style 1737 * Set font style
1746 */ 1738 */
1747void 1739void ecb_cold
1748rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1749{ 1741{
1750#if 0 1742#if 0
1751 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1752 { 1744 {
… …
1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1776 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1777 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1778 */ 1770 */
1779void 1771void ecb_cold
1780rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1781{ 1773{
1782 screen.charset = set; 1774 screen.charset = set;
1783 set_font_style (); 1775 set_font_style ();
1784} 1776}
… …
1805 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1806 1798
1807/* 1799/*
1808 * refresh matching text. 1800 * refresh matching text.
1809 */ 1801 */
1810bool 1802bool ecb_cold
1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1812{ 1804{
1813 bool found = false; 1805 bool found = false;
1814 1806
1815 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1834 PART_BEG = 0, 1826 PART_BEG = 0,
1835 PART_END, 1827 PART_END,
1836 RC_COUNT 1828 RC_COUNT
1837}; 1829};
1838 1830
1839void 1831void ecb_hot
1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1841{ 1833{
1842 int i; 1834 int i;
1843 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1844 1836
… …
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1971#endif 1963#endif
1972} 1964}
1973 1965
1974/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1975void 1967void ecb_cold
1976rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1977{ 1969{
1978#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1979 int nrows, row_start; 1971 int nrows, row_start;
1980 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
2029/* 2021/*
2030 * Refresh the screen 2022 * Refresh the screen
2031 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2032 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2033 */ 2025 */
2034void 2026void ecb_hot
2035rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2036{ 2028{
2037 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2038 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2039 int i; /* tmp */ 2031 int i; /* tmp */
… …
2055 refresh_count = 0; 2047 refresh_count = 0;
2056 2048
2057 unsigned int old_screen_flags = screen.flags; 2049 unsigned int old_screen_flags = screen.flags;
2058 bool have_bg = 0; 2050 bool have_bg = 0;
2059#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2060 have_bg = bg_pixmap != None; 2052 have_bg = bg_img != 0;
2061#endif 2053#endif
2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2063 2055
2064 /* 2056 /*
2065 * B: reverse any characters which are selected 2057 * B: reverse any characters which are selected
… …
2505 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2506 num_scr = 0; 2498 num_scr = 0;
2507 num_scr_allow = 1; 2499 num_scr_allow = 1;
2508} 2500}
2509 2501
2510void 2502void ecb_cold
2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2512{ 2504{
2513 if (!l.valid ()) 2505 if (!l.valid ())
2514 return; 2506 return;
2515 2507
… …
2517 2509
2518 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2520} 2512}
2521 2513
2522void 2514void ecb_cold
2523rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2524{ 2516{
2525 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2526 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2527 2519
… …
2530 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2531 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2532 } 2524 }
2533} 2525}
2534 2526
2535void 2527void ecb_cold
2536rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2537{ 2529{
2538 bool transparent = false; 2530 bool transparent = false;
2539 2531
2540#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2541 if (bg_pixmap != None) 2533 if (bg_img != 0)
2542 { 2534 {
2543# ifdef ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2545 { 2537 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548 2540
2549 transparent = true; 2541 transparent = true;
2550 } 2542 }
2551 else 2543 else
2552# endif 2544# endif
2553 { 2545 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2556 } 2548 }
2557 } 2549 }
2558 else 2550 else
2559#endif 2551#endif
2560 { 2552 {
… …
2643 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2644 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2645} 2637}
2646 2638
2647/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2648void 2640void ecb_hot
2649rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2650{ 2642{
2651 if (selection.op 2643 if (selection.op
2652 && current_screen == selection.screen 2644 && current_screen == selection.screen
2653 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2944/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2945/* 2937/*
2946 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2947 * EXT: button 1 press 2939 * EXT: button 1 press
2948 */ 2940 */
2949void 2941void ecb_cold
2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2951{ 2943{
2952 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2953 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2954 2946
… …
2973 2965
2974/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2975/* 2967/*
2976 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2977 */ 2969 */
2978void 2970void ecb_cold
2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2980{ 2972{
2981 want_refresh = 1; 2973 want_refresh = 1;
2982 2974
2983 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3014 3006
3015void 3007void ecb_cold
3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3017{ 3009{
3018 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3019 row_col_t bound; 3011 row_col_t bound;
3020 text_t *stp; 3012 text_t *stp;
… …
3094 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3095 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3096 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3097 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3098 */ 3090 */
3099void 3091void ecb_cold
3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3101{ 3093{
3102 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3103 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 3096
… …
3130 3122
3131/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3132/* 3124/*
3133 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3134 */ 3126 */
3135void 3127void ecb_cold
3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3137{ 3129{
3138 row_col_t pos; 3130 row_col_t pos;
3139 enum { 3131 enum {
3140 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3331 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3332#endif 3324#endif
3333} 3325}
3334 3326
3335#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3336void 3328void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3338{ 3330{
3339 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3340 text_t *stp; 3332 text_t *stp;
3341 3333
… …
3379/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3380/* 3372/*
3381 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3382 * EXT: button 3 double click 3374 * EXT: button 3 double click
3383 */ 3375 */
3384void 3376void ecb_cold
3385rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3386{ 3378{
3387 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3389} 3381}
… …
3391/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3392/* 3384/*
3393 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3394 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3395 */ 3387 */
3396void 3388void ecb_cold
3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3398{ 3390{
3399 Atom property = rq.property == None ? rq.target : rq.property; 3391 Atom property = rq.property == None ? rq.target : rq.property;
3400 XSelectionEvent ev; 3392 XSelectionEvent ev;
3401 3393
… …
3534 3526
3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3536} 3528}
3537 3529
3538/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3539#ifdef USE_XIM 3531#if USE_XIM
3540void 3532void ecb_cold
3541rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3542{ 3534{
3543 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3544 3536
3545 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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