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

Diff Legend

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