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.453 by root, Sat Dec 13 12:24:33 2014 UTC

… …
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 169void
160rxvt_term::scr_alloc () 170rxvt_term::scr_alloc () NOTHROW
161{ 171{
162 int tsize = sizeof (text_t) * ncol; 172 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 173 int rsize = sizeof (rend_t) * ncol;
164 174
165 // we assume that rend_t size is a sufficient alignment 175 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only 176 // factor for text_t and line_t values, and we only
167 // need to adjust tsize. 177 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1); 178 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t); 179 tsize -= tsize % sizeof (rend_t);
170 180
171 int all_rows = total_rows + nrow + nrow; 181 int all_rows = total_rows + nrow + nrow;
172 182
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 184 chunk = chunk_alloc (chunk_size, 0);
175 185
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 187
178 for (int row = 0; row < all_rows; ++row) 188 for (int row = 0; row < all_rows; ++row)
179 { 189 {
… …
189 swap_buf = drawn_buf + nrow; 199 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 200 row_buf = swap_buf + nrow;
191} 201}
192 202
193void 203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
194rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
195{ 215{
196#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
197 scr_overlay_off (); 217 scr_overlay_off ();
198#endif 218#endif
… …
225 245
226 screen.tscroll = 0; 246 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
228 248
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
233 254
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 255 scr_alloc ();
237 256
238 if (!prev_row_buf) 257 if (!prev_row_buf)
239 { 258 {
240 /*
241 * first time called so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 259 top_row = 0;
244 term_start = 0; 260 term_start = 0;
245 261
246 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
272 { 288 {
273 /* 289 /*
274 * add or delete rows as appropriate 290 * add or delete rows as appropriate
275 */ 291 */
276 292
293 int common_col = min (prev_ncol, ncol);
294
277 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
278 { 296 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 300
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 301 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 302 }
287 303
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
386 { 402 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
389 405
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 407 }
395 408
396 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 411
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 421 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); 422 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); 423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 424 }
412 425
413 free (prev_chunk); 426 chunk_free (prev_chunk, prev_chunk_size);
414 427
415 free (tabs); 428 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
417 430
418 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
… …
426 tt_winch (); 439 tt_winch ();
427 440
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 442}
430 443
431/* ------------------------------------------------------------------------- */ 444void ecb_cold
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
437{ 446{
438 free (chunk); 447 chunk_free (chunk, chunk_size);
448 chunk = 0;
449 row_buf = 0;
450
439 free (tabs); 451 free (tabs);
452 tabs = 0;
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
450 463
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 465 rvideo_mode = false;
455 scr_soft_reset (); 466 scr_soft_reset ();
456 scr_reset (); 467 scr_reset ();
457 468
458 scr_clear (true); 469 scr_clear (true);
459 scr_refresh (); 470 scr_refresh ();
460} 471}
461 472
462void 473void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW 474rxvt_term::scr_soft_reset () NOTHROW
464{ 475{
465 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
467 scr_overlay_off (); 478 scr_overlay_off ();
… …
633/* 644/*
634 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
635 * count positive ==> scroll up 646 * count positive ==> scroll up
636 * count negative ==> scroll down 647 * count negative ==> scroll down
637 */ 648 */
638int 649int ecb_hot
639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
640{ 651{
641 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
642 return 0; 653 return 0;
643 654
… …
704 715
705 // finally move the view window, if desired 716 // finally move the view window, if desired
706 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
707 && view_start != 0 718 && view_start != 0
708 && view_start != -saveLines) 719 && view_start != -saveLines)
709 scr_page (UP, count); 720 scr_page (count);
710 721
711 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
712 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
713 } 724 }
714 else 725 else
… …
777 788
778/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
779/* 790/*
780 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
781 */ 792 */
782void 793void ecb_hot
783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
784{ 795{
785 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
786 return; 797 return;
787 798
… …
1137 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1138 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1139 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1140 */ 1151 */
1141#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1142void 1153void ecb_cold
1143rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1144{ 1155{
1145 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1158 else
… …
1154 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1155 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1156 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1157 */ 1168 */
1158#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1159void 1170void ecb_cold
1160rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1161{ 1172{
1162 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1164 else 1175 else
… …
1229 * direction should be UP or DN 1240 * direction should be UP or DN
1230 */ 1241 */
1231void 1242void
1232rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1233{ 1244{
1234 int dirn;
1235
1236 want_refresh = 1; 1245 want_refresh = 1;
1237 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1238 1247
1239 dirn = ((direction == UP) ? 1 : -1);
1240
1241 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1242 1249
1243 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1244 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1245 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1246 else 1253 else
1247 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1248 1255
1249 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1250 selection_check (0); 1257 selection_check (0);
1251} 1258}
1252 1259
… …
1415/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1416/* 1423/*
1417 * Fill the screen with `E's 1424 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1426 */
1420void 1427void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1422{ 1429{
1423 rend_t fs; 1430 rend_t fs;
1424 1431
1425 want_refresh = 1; 1432 want_refresh = 1;
… …
1589/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1590/* 1597/*
1591 * Set the scrolling region 1598 * Set the scrolling region
1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1593 */ 1600 */
1594void 1601void ecb_cold
1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1596{ 1603{
1597 max_it (top, 0); 1604 max_it (top, 0);
1598 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1599 1606
… …
1609/* 1616/*
1610 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1613 */ 1620 */
1614void 1621void ecb_cold
1615rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1616{ 1623{
1617 want_refresh = 1; 1624 want_refresh = 1;
1618 1625
1619 if (mode) 1626 if (mode)
… …
1626/* 1633/*
1627 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1630 */ 1637 */
1631void 1638void ecb_cold
1632rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1633{ 1640{
1634 if (mode) 1641 if (mode)
1635 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1636 else 1643 else
… …
1645 * Relative mode: line numbers are relative to top margin of scrolling region 1652 * Relative mode: line numbers are relative to top margin of scrolling region
1646 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1649 */ 1656 */
1650void 1657void ecb_cold
1651rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1652{ 1659{
1653 if (mode) 1660 if (mode)
1654 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1655 else 1662 else
… …
1662/* 1669/*
1663 * Set insert/replace mode 1670 * Set insert/replace mode
1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1666 */ 1673 */
1667void 1674void ecb_cold
1668rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1669{ 1676{
1670 if (mode) 1677 if (mode)
1671 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1672 else 1679 else
… …
1678 * Set/Unset tabs 1685 * Set/Unset tabs
1679 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1682 */ 1689 */
1683void 1690void ecb_cold
1684rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1685{ 1692{
1686 if (mode < 0) 1693 if (mode < 0)
1687 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1688 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1707 if (rvideo_state != on) 1714 if (rvideo_state != on)
1708 { 1715 {
1709 rvideo_state = on; 1716 rvideo_state = on;
1710 1717
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1720 if (bg_img == 0)
1714#endif 1721#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1723
1717 XGCValues gcvalue; 1724 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1727/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1728/* 1735/*
1729 * Report current cursor position 1736 * Report current cursor position
1730 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1731 */ 1738 */
1732void 1739void ecb_cold
1733rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1734{ 1741{
1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1736} 1743}
1737 1744
… …
1740 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1741 1748
1742/* 1749/*
1743 * Set font style 1750 * Set font style
1744 */ 1751 */
1745void 1752void ecb_cold
1746rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1747{ 1754{
1748#if 0 1755#if 0
1749 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1750 { 1757 {
… …
1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1774 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1775 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1776 */ 1783 */
1777void 1784void ecb_cold
1778rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1779{ 1786{
1780 screen.charset = set; 1787 screen.charset = set;
1781 set_font_style (); 1788 set_font_style ();
1782} 1789}
… …
1803 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1804 1811
1805/* 1812/*
1806 * refresh matching text. 1813 * refresh matching text.
1807 */ 1814 */
1808bool 1815bool ecb_cold
1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1810{ 1817{
1811 bool found = false; 1818 bool found = false;
1812 1819
1813 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1832 PART_BEG = 0, 1839 PART_BEG = 0,
1833 PART_END, 1840 PART_END,
1834 RC_COUNT 1841 RC_COUNT
1835}; 1842};
1836 1843
1837void 1844void ecb_hot
1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1839{ 1846{
1840 int i; 1847 int i;
1841 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1842 1849
… …
1890 * the top of the screen 1897 * the top of the screen
1891 */ 1898 */
1892void 1899void
1893rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1894{ 1901{
1895 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1902 // lerp (y, 0, len, top_row, nrow - 1)
1903 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1896} 1904}
1897 1905
1898/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1899/* 1907/*
1900 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1901 * direction should be UP or DN 1909 * direction should be UP or DN
1902 */ 1910 */
1903bool 1911bool
1904rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1905{ 1913{
1906 int new_view_start =
1907 direction == UP ? view_start - nlines
1908 : view_start + nlines;
1909
1910 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1911} 1915}
1912 1916
1913bool 1917bool
1914rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1915{ 1919{
… …
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1969#endif 1973#endif
1970} 1974}
1971 1975
1972/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1973void 1977void ecb_cold
1974rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1975{ 1979{
1976#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1977 int nrows, row_start; 1981 int nrows, row_start;
1978 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
2027/* 2031/*
2028 * Refresh the screen 2032 * Refresh the screen
2029 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2030 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2031 */ 2035 */
2032void 2036void ecb_hot
2033rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2034{ 2038{
2035 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2041 int i; /* tmp */
2038#ifndef NO_CURSORCOLOR
2039 rend_t cc1; /* store colours at cursor position (s) */
2040#endif
2041 rend_t *crp; // cursor rendition pointer
2042 rend_t ccol1, /* Cursor colour */ 2042 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2044 rend_t cur_rend;
2045 int cur_col;
2046 int cursorwidth;
2044 2047
2045 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2046 2049
2047 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2051 return;
… …
2052 */ 2055 */
2053 refresh_count = 0; 2056 refresh_count = 0;
2054 2057
2055 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2059 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2061 have_bg = bg_img != 0;
2059#endif 2062#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2064
2062 /* 2065 /*
2063 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2073 2076
2074 /* 2077 /*
2075 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2076 */ 2079 */
2077 { 2080 {
2078 bool setoldcursor;
2079
2080#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2081 if (hidden_cursor) 2082 if (hidden_cursor)
2082 showcursor = 0; 2083 showcursor = 0;
2083#endif 2084#endif
2084 2085
… …
2087 int col = screen.cur.col; 2088 int col = screen.cur.col;
2088 2089
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2091 col--;
2091 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
2092 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
2093 2100
2094#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2102 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2103 ccol1 = Color_cursor;
2098 else 2104 else
2099#endif 2105#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2112 ccol2 = bgcolor_of (rstyle); 2118 ccol2 = bgcolor_of (rstyle);
2113#else 2119#else
2114 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2115#endif 2121#endif
2116 2122
2117 if (focus) 2123 if (focus && cursor_type != 2)
2118 { 2124 {
2119 if (option (Opt_cursorUnderline)) 2125 rend_t rend = cur_rend;
2126
2127 if (cursor_type == 1)
2120 *crp ^= RS_Uline; 2128 rend ^= RS_Uline;
2121 else 2129 else
2122 { 2130 {
2123 *crp ^= RS_RVid; 2131 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2132 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2133 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2134 }
2135
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2137 }
2128 } 2138 }
2129 2139
2130 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2141 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2132 if (ocrow != -1) 2142 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2143
2144 // save the current cursor coordinates if the cursor is visible
2145 // and either the window is unfocused or the cursor style is
2146 // vertical bar, so as to clear the outline cursor in the next
2147 // refresh if the cursor moves or becomes invisible
2148 if (showcursor && (!focus || cursor_type == 2) && screen.cur.row - view_start < nrow)
2133 { 2149 {
2134 if (screen.cur.row - view_start != ocrow 2150 oldcursor.row = screen.cur.row - view_start;
2135 || screen.cur.col != oldcursor.col) 2151 oldcursor.col = screen.cur.col;
2136 {
2137 if (ocrow < nrow
2138 && oldcursor.col < ncol)
2139 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140
2141 if (focus || !showcursor)
2142 oldcursor.row = -1;
2143 else
2144 setoldcursor = 1;
2145 }
2146 } 2152 }
2147 else if (!focus) 2153 else
2148 setoldcursor = 1;
2149
2150 if (setoldcursor)
2151 {
2152 if (screen.cur.row - view_start >= nrow)
2153 oldcursor.row = -1; 2154 oldcursor.row = -1;
2154 else
2155 {
2156 oldcursor.row = screen.cur.row - view_start;
2157 oldcursor.col = screen.cur.col;
2158 }
2159 }
2160 } 2155 }
2161 2156
2162#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2158 /*
2164 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
… …
2245 int ypixel = (int)Row2Pixel (row); 2240 int ypixel = (int)Row2Pixel (row);
2246 2241
2247 for (col = 0; col < ncol; col++) 2242 for (col = 0; col < ncol; col++)
2248 { 2243 {
2249 /* compare new text with old - if exactly the same then continue */ 2244 /* compare new text with old - if exactly the same then continue */
2250 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2245 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2251 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2252 || (stp[col] == ' ' /* space w/ no background change */
2253 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2254 continue; 2246 continue;
2255 2247
2256 // redraw one or more characters 2248 // redraw one or more characters
2257 2249
2258 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
… …
2430 else 2422 else
2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432 2424
2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434 { 2426 {
2427 if (showcursor && focus && row == screen.cur.row
2428 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2429 XSetForeground (dpy, gc, pix_colors[ccol1]);
2430 else
2435#if ENABLE_FRILLS 2431#if ENABLE_FRILLS
2436 if (ISSET_PIXCOLOR (Color_underline)) 2432 if (ISSET_PIXCOLOR (Color_underline))
2437 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2433 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438 else 2434 else
2439#endif 2435#endif
… …
2451 */ 2447 */
2452 if (showcursor) 2448 if (showcursor)
2453 { 2449 {
2454 if (focus) 2450 if (focus)
2455 { 2451 {
2456 if (option (Opt_cursorUnderline)) 2452 if (cursor_type != 2)
2457 *crp ^= RS_Uline; 2453 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458 else 2454 else if (oldcursor.row >= 0)
2459 { 2455 {
2460 *crp ^= RS_RVid; 2456 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461#ifndef NO_CURSORCOLOR 2457 XFillRectangle (dpy, vt, gc,
2462 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2458 Col2Pixel (cur_col),
2463#endif 2459 Row2Pixel (oldcursor.row),
2460 1,
2461 Height2Pixel (1));
2464 } 2462 }
2465 } 2463 }
2466 else if (oldcursor.row >= 0) 2464 else if (oldcursor.row >= 0)
2467 { 2465 {
2468 int cursorwidth = 1;
2469 int col = oldcursor.col;
2470
2471 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2472 col--;
2473
2474 while (col + cursorwidth < ncol
2475 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2476 cursorwidth++;
2477
2478#ifndef NO_CURSORCOLOR
2479 if (ISSET_PIXCOLOR (Color_cursor))
2480 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2481 else
2482#endif
2483 XSetForeground (dpy, gc, pix_colors[ccol1]); 2466 XSetForeground (dpy, gc, pix_colors[ccol1]);
2484 2467
2485 XDrawRectangle (dpy, vt, gc, 2468 XDrawRectangle (dpy, vt, gc,
2486 Col2Pixel (col), 2469 Col2Pixel (cur_col),
2487 Row2Pixel (oldcursor.row), 2470 Row2Pixel (oldcursor.row),
2488 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2471 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2489 (unsigned int) (Height2Pixel (1) - 1)); 2472 (unsigned int) (Height2Pixel (1) - 1));
2490 } 2473 }
2491 } 2474 }
… …
2503 screen.flags = old_screen_flags; 2486 screen.flags = old_screen_flags;
2504 num_scr = 0; 2487 num_scr = 0;
2505 num_scr_allow = 1; 2488 num_scr_allow = 1;
2506} 2489}
2507 2490
2508void 2491void ecb_cold
2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2492rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2510{ 2493{
2511 if (!l.valid ()) 2494 if (!l.valid ())
2512 return; 2495 return;
2513 2496
… …
2515 2498
2516 for (int i = ncol; i--; ) 2499 for (int i = ncol; i--; )
2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2500 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2518} 2501}
2519 2502
2520void 2503void ecb_cold
2521rxvt_term::scr_remap_chars () NOTHROW 2504rxvt_term::scr_remap_chars () NOTHROW
2522{ 2505{
2523 for (int i = total_rows; i--; ) 2506 for (int i = total_rows; i--; )
2524 scr_remap_chars (row_buf [i]); 2507 scr_remap_chars (row_buf [i]);
2525 2508
… …
2528 scr_remap_chars (drawn_buf [i]); 2511 scr_remap_chars (drawn_buf [i]);
2529 scr_remap_chars (swap_buf [i]); 2512 scr_remap_chars (swap_buf [i]);
2530 } 2513 }
2531} 2514}
2532 2515
2533void 2516void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2517rxvt_term::scr_recolor (bool refresh) NOTHROW
2535{ 2518{
2536 bool transparent = false; 2519 bool transparent = false;
2537 2520
2538#ifdef HAVE_BG_PIXMAP 2521#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2522 if (bg_img != 0)
2540 { 2523 {
2541# ifdef ENABLE_TRANSPARENCY 2524# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2525 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2526 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2527 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2528 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2529
2547 transparent = true; 2530 transparent = true;
2548 } 2531 }
2549 else 2532 else
2550# endif 2533# endif
2551 { 2534 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2535 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2536 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2537 }
2555 } 2538 }
2556 else 2539 else
2557#endif 2540#endif
2558 { 2541 {
… …
2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2543 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 } 2544 }
2562 2545
2563 XClearWindow (dpy, parent); 2546 XClearWindow (dpy, parent);
2564 2547
2565 if (scrollBar.win) 2548 if (scrollBar.state && scrollBar.win)
2566 { 2549 {
2567 if (transparent) 2550 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2551 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2552 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2554 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2555 scrollBar.show (0);
2573 } 2556 }
2574 2557
2575 if (refresh) 2558 if (refresh)
… …
2641 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2624 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2642 srp[col] ^= rstyle; 2625 srp[col] ^= rstyle;
2643} 2626}
2644 2627
2645/* ------------------------------------------------------------------------- */ 2628/* ------------------------------------------------------------------------- */
2646void 2629void ecb_hot
2647rxvt_term::scr_reverse_selection () NOTHROW 2630rxvt_term::scr_reverse_selection () NOTHROW
2648{ 2631{
2649 if (selection.op 2632 if (selection.op
2650 && current_screen == selection.screen 2633 && current_screen == selection.screen
2651 && selection.end.row >= view_start) 2634 && selection.end.row >= view_start)
… …
2692 || (check_more == 1 2675 || (check_more == 1
2693 && current_screen == selection.screen 2676 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2677 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2678 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 CLEAR_ALL_SELECTION (); 2679 CLEAR_ALL_SELECTION ();
2680}
2681
2682void
2683rxvt_term::selection_changed () NOTHROW
2684{
2685 line_t &r1 = ROW (selection.beg.row);
2686 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2687 ++selection.beg.col;
2688
2689 line_t &r2 = ROW (selection.end.row);
2690 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2691 ++selection.end.col;
2692
2693 want_refresh = 1;
2697} 2694}
2698 2695
2699/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2700/* 2697/*
2701 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
… …
2942/* ------------------------------------------------------------------------- */ 2939/* ------------------------------------------------------------------------- */
2943/* 2940/*
2944 * Mark or select text based upon number of clicks: 1, 2, or 3 2941 * Mark or select text based upon number of clicks: 1, 2, or 3
2945 * EXT: button 1 press 2942 * EXT: button 1 press
2946 */ 2943 */
2947void 2944void ecb_cold
2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2949{ 2946{
2950 clicks = ((clicks - 1) % 3) + 1; 2947 clicks = ((clicks - 1) % 3) + 1;
2951 selection.clicks = clicks; /* save clicks so extend will work */ 2948 selection.clicks = clicks; /* save clicks so extend will work */
2952 2949
… …
2971 2968
2972/* ------------------------------------------------------------------------- */ 2969/* ------------------------------------------------------------------------- */
2973/* 2970/*
2974 * Mark a selection at the specified col/row 2971 * Mark a selection at the specified col/row
2975 */ 2972 */
2976void 2973void ecb_cold
2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2978{ 2975{
2979 want_refresh = 1; 2976 want_refresh = 1;
2980 2977
2981 selection.mark.row = row + view_start; 2978 selection.mark.row = row + view_start;
… …
3004 * Word select: select text for 2 clicks 3001 * Word select: select text for 2 clicks
3005 * We now only find out the boundary in one direction 3002 * We now only find out the boundary in one direction
3006 */ 3003 */
3007 3004
3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3005/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009#define DELIMIT_TEXT(x) \ 3006#define DELIMIT_TEXT(x) \
3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3007 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011#define DELIMIT_REND(x) 1 3008#define DELIMIT_REND(x) 1
3012 3009
3013void 3010void ecb_cold
3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3011rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3015{ 3012{
3016 int col, row, dirnadd, tcol, trow, w1, w2; 3013 int col, row, dirnadd, tcol, trow, w1, w2;
3017 row_col_t bound; 3014 row_col_t bound;
3018 text_t *stp; 3015 text_t *stp;
… …
3092 * EXT: button 3 press; button 1 or 3 drag 3089 * EXT: button 3 press; button 1 or 3 drag
3093 * flag == 0 ==> button 1 3090 * flag == 0 ==> button 1
3094 * flag == 1 ==> button 3 press 3091 * flag == 1 ==> button 3 press
3095 * flag == 2 ==> button 3 motion 3092 * flag == 2 ==> button 3 motion
3096 */ 3093 */
3097void 3094void ecb_cold
3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3099{ 3096{
3100 int col = clamp (Pixel2Col (x), 0, ncol); 3097 int col = clamp (Pixel2Col (x), 0, ncol);
3101 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3098 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3102 3099
… …
3128 3125
3129/* ------------------------------------------------------------------------- */ 3126/* ------------------------------------------------------------------------- */
3130/* 3127/*
3131 * Extend the selection to the specified col/row 3128 * Extend the selection to the specified col/row
3132 */ 3129 */
3133void 3130void ecb_cold
3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3131rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3135{ 3132{
3136 row_col_t pos; 3133 row_col_t pos;
3137 enum { 3134 enum {
3138 LEFT, RIGHT 3135 LEFT, RIGHT
3139 } closeto = RIGHT; 3136 } closeto = RIGHT;
3140
3141 want_refresh = 1;
3142 3137
3143 switch (selection.op) 3138 switch (selection.op)
3144 { 3139 {
3145 case SELECTION_INIT: 3140 case SELECTION_INIT:
3146 CLEAR_SELECTION (); 3141 CLEAR_SELECTION ();
… …
3326 3321
3327#if !ENABLE_MINIMAL 3322#if !ENABLE_MINIMAL
3328 if (selection.rect && selection.beg.col > selection.end.col) 3323 if (selection.rect && selection.beg.col > selection.end.col)
3329 ::swap (selection.beg.col, selection.end.col); 3324 ::swap (selection.beg.col, selection.end.col);
3330#endif 3325#endif
3326
3327 selection_changed ();
3331} 3328}
3332 3329
3333#if !ENABLE_MINIMAL 3330#if !ENABLE_MINIMAL
3334void 3331void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3332rxvt_term::selection_remove_trailing_spaces () NOTHROW
3336{ 3333{
3337 int32_t end_col, end_row; 3334 int32_t end_col, end_row;
3338 text_t *stp; 3335 text_t *stp;
3339 3336
… …
3377/* ------------------------------------------------------------------------- */ 3374/* ------------------------------------------------------------------------- */
3378/* 3375/*
3379 * Double click on button 3 when already selected 3376 * Double click on button 3 when already selected
3380 * EXT: button 3 double click 3377 * EXT: button 3 double click
3381 */ 3378 */
3382void 3379void ecb_cold
3383rxvt_term::selection_rotate (int x, int y) NOTHROW 3380rxvt_term::selection_rotate (int x, int y) NOTHROW
3384{ 3381{
3385 selection.clicks = selection.clicks % 3 + 1; 3382 selection.clicks = selection.clicks % 3 + 1;
3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3387} 3384}
… …
3389/* ------------------------------------------------------------------------- */ 3386/* ------------------------------------------------------------------------- */
3390/* 3387/*
3391 * Respond to a request for our current selection 3388 * Respond to a request for our current selection
3392 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3393 */ 3390 */
3394void 3391void ecb_cold
3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3396{ 3393{
3397 Atom property = rq.property == None ? rq.target : rq.property; 3394 Atom property = rq.property == None ? rq.target : rq.property;
3398 XSelectionEvent ev; 3395 XSelectionEvent ev;
3399 3396
… …
3532 3529
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3531}
3535 3532
3536/* ------------------------------------------------------------------------- */ 3533/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3534#if USE_XIM
3538void 3535void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3536rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3537{
3541 XWindowAttributes xwa; 3538 XWindowAttributes xwa;
3542 3539
3543 XGetWindowAttributes (dpy, vt, &xwa); 3540 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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