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

Diff Legend

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