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.458 by sf-exg, Sat Jul 15 08:16:22 2017 UTC

… …
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
150 l.r[col] = rend; 151 l.r[col] = rend;
151 col++; 152 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
155/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
158 169
159void 170void
160rxvt_term::scr_alloc () 171rxvt_term::scr_alloc () NOTHROW
161{ 172{
162 int tsize = sizeof (text_t) * ncol; 173 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 174 int rsize = sizeof (rend_t) * ncol;
164 175
165 // we assume that rend_t size is a sufficient alignment 176 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only 177 // factor for text_t and line_t values, and we only
167 // need to adjust tsize. 178 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1); 179 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t); 180 tsize -= tsize % sizeof (rend_t);
170 181
171 int all_rows = total_rows + nrow + nrow; 182 int all_rows = total_rows + nrow + nrow;
172 183
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 185 chunk = chunk_alloc (chunk_size, 0);
175 186
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 188
178 for (int row = 0; row < all_rows; ++row) 189 for (int row = 0; row < all_rows; ++row)
179 { 190 {
… …
189 swap_buf = drawn_buf + nrow; 200 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 201 row_buf = swap_buf + nrow;
191} 202}
192 203
193void 204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
194rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
195{ 216{
196#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
197 scr_overlay_off (); 218 scr_overlay_off ();
198#endif 219#endif
… …
225 246
226 screen.tscroll = 0; 247 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
228 249
229 void *prev_chunk = chunk; 250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 252 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 253 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 254 line_t *prev_row_buf = row_buf;
233 255
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 256 scr_alloc ();
237 257
238 if (!prev_row_buf) 258 if (!prev_row_buf)
239 { 259 {
240 /*
241 * first time called so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 260 top_row = 0;
244 term_start = 0; 261 term_start = 0;
245 262
246 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
… …
272 { 289 {
273 /* 290 /*
274 * add or delete rows as appropriate 291 * add or delete rows as appropriate
275 */ 292 */
276 293
294 int common_col = min (prev_ncol, ncol);
295
277 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
278 { 297 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 298 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); 299 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); 300 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); 301
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 302 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 303 }
287 304
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
386 { 403 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 405 line_t &dst = row_buf [row];
389 406
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 407 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 } 408 }
395 409
396 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 412
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 422 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); 423 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); 424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 425 }
412 426
413 free (prev_chunk); 427 chunk_free (prev_chunk, prev_chunk_size);
414 428
415 free (tabs); 429 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
417 431
418 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
… …
426 tt_winch (); 440 tt_winch ();
427 441
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 443}
430 444
431/* ------------------------------------------------------------------------- */ 445void ecb_cold
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
437{ 447{
438 free (chunk); 448 chunk_free (chunk, chunk_size);
449 chunk = 0;
450 row_buf = 0;
451
439 free (tabs); 452 free (tabs);
453 tabs = 0;
440} 454}
441 455
442/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
443/* 457/*
444 * Hard/Soft reset 458 * Hard/Soft reset
445 */ 459 */
446void 460void ecb_cold
447rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
448{ 462{
449 scr_release (); 463 scr_release ();
450 464
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 466 rvideo_mode = false;
455 scr_soft_reset (); 467 scr_soft_reset ();
456 scr_reset (); 468 scr_reset ();
457 469
458 scr_clear (true); 470 scr_clear (true);
459 scr_refresh (); 471 scr_refresh ();
460} 472}
461 473
462void 474void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW 475rxvt_term::scr_soft_reset () NOTHROW
464{ 476{
465 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
467 scr_overlay_off (); 479 scr_overlay_off ();
… …
603 * Change the colour for following text 615 * Change the colour for following text
604 */ 616 */
605void 617void
606rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
607{ 619{
608 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
609 color = fgbg; 621 color = fgbg;
610 622
611 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
612 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
613 else 625 else
… …
633/* 645/*
634 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
635 * count positive ==> scroll up 647 * count positive ==> scroll up
636 * count negative ==> scroll down 648 * count negative ==> scroll down
637 */ 649 */
638int 650int ecb_hot
639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
640{ 652{
641 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
642 return 0; 654 return 0;
643 655
… …
704 716
705 // finally move the view window, if desired 717 // finally move the view window, if desired
706 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
707 && view_start != 0 719 && view_start != 0
708 && view_start != -saveLines) 720 && view_start != -saveLines)
709 scr_page (UP, count); 721 scr_page (count);
710 722
711 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
712 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
713 } 725 }
714 else 726 else
… …
777 789
778/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
779/* 791/*
780 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
781 */ 793 */
782void 794void ecb_hot
783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
784{ 796{
785 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
786 return; 798 return;
787 799
… …
1000 } 1012 }
1001 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
1002 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
1003 { 1015 {
1004 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
1005 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
1006 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
1007 } 1019 }
1008 else 1020 else
1009 continue; 1021 continue;
1010 1022
1011 linep->touch (); 1023 linep->touch ();
… …
1137 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1138 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1139 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1140 */ 1152 */
1141#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1142void 1154void ecb_cold
1143rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1144{ 1156{
1145 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1159 else
… …
1154 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1155 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1156 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1157 */ 1169 */
1158#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1159void 1171void ecb_cold
1160rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1161{ 1173{
1162 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1164 else 1176 else
… …
1229 * direction should be UP or DN 1241 * direction should be UP or DN
1230 */ 1242 */
1231void 1243void
1232rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1233{ 1245{
1234 int dirn;
1235
1236 want_refresh = 1; 1246 want_refresh = 1;
1237 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1238 1248
1239 dirn = ((direction == UP) ? 1 : -1);
1240
1241 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1242 1250
1243 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1244 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1245 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1246 else 1254 else
1247 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1248 1256
1249 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1250 selection_check (0); 1258 selection_check (0);
1251} 1259}
1252 1260
… …
1415/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1416/* 1424/*
1417 * Fill the screen with `E's 1425 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1427 */
1420void 1428void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1422{ 1430{
1423 rend_t fs; 1431 rend_t fs;
1424 1432
1425 want_refresh = 1; 1433 want_refresh = 1;
… …
1589/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1590/* 1598/*
1591 * Set the scrolling region 1599 * Set the scrolling region
1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1593 */ 1601 */
1594void 1602void ecb_cold
1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1596{ 1604{
1597 max_it (top, 0); 1605 max_it (top, 0);
1598 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1599 1607
… …
1609/* 1617/*
1610 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1613 */ 1621 */
1614void 1622void ecb_cold
1615rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1616{ 1624{
1617 want_refresh = 1; 1625 want_refresh = 1;
1618 1626
1619 if (mode) 1627 if (mode)
… …
1626/* 1634/*
1627 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1630 */ 1638 */
1631void 1639void ecb_cold
1632rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1633{ 1641{
1634 if (mode) 1642 if (mode)
1635 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1636 else 1644 else
… …
1645 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1646 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1649 */ 1657 */
1650void 1658void ecb_cold
1651rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1652{ 1660{
1653 if (mode) 1661 if (mode)
1654 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1655 else 1663 else
… …
1662/* 1670/*
1663 * Set insert/replace mode 1671 * Set insert/replace mode
1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1666 */ 1674 */
1667void 1675void ecb_cold
1668rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1669{ 1677{
1670 if (mode) 1678 if (mode)
1671 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1672 else 1680 else
… …
1678 * Set/Unset tabs 1686 * Set/Unset tabs
1679 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1682 */ 1690 */
1683void 1691void ecb_cold
1684rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1685{ 1693{
1686 if (mode < 0) 1694 if (mode < 0)
1687 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1688 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1706 1714
1707 if (rvideo_state != on) 1715 if (rvideo_state != on)
1708 { 1716 {
1709 rvideo_state = on; 1717 rvideo_state = on;
1710 1718
1719#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade])
1721 {
1722 ::swap (pix_colors_focused[Color_fg], pix_colors_focused[Color_bg]);
1723 ::swap (pix_colors_unfocused[Color_fg], pix_colors_unfocused[Color_bg]);
1724 }
1725 else
1726#endif
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1727 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1728#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1729 if (bg_img == 0)
1714#endif 1730#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1731 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1732
1717 XGCValues gcvalue; 1733 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1734 gcvalue.foreground = pix_colors[Color_fg];
… …
1727/* ------------------------------------------------------------------------- */ 1743/* ------------------------------------------------------------------------- */
1728/* 1744/*
1729 * Report current cursor position 1745 * Report current cursor position
1730 * XTERM_SEQ: Report position: ESC [ 6 n 1746 * XTERM_SEQ: Report position: ESC [ 6 n
1731 */ 1747 */
1732void 1748void ecb_cold
1733rxvt_term::scr_report_position () NOTHROW 1749rxvt_term::scr_report_position () NOTHROW
1734{ 1750{
1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1751 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1736} 1752}
1737 1753
… …
1740 * ------------------------------------------------------------------------- */ 1756 * ------------------------------------------------------------------------- */
1741 1757
1742/* 1758/*
1743 * Set font style 1759 * Set font style
1744 */ 1760 */
1745void 1761void ecb_cold
1746rxvt_term::set_font_style () NOTHROW 1762rxvt_term::set_font_style () NOTHROW
1747{ 1763{
1748#if 0 1764#if 0
1749 switch (charsets [screen.charset]) 1765 switch (charsets [screen.charset])
1750 { 1766 {
… …
1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1788 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1789 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1774 * XTERM_SEQ: Invoke G2 character set: ESC N 1790 * XTERM_SEQ: Invoke G2 character set: ESC N
1775 * XTERM_SEQ: Invoke G3 character set: ESC O 1791 * XTERM_SEQ: Invoke G3 character set: ESC O
1776 */ 1792 */
1777void 1793void ecb_cold
1778rxvt_term::scr_charset_choose (int set) NOTHROW 1794rxvt_term::scr_charset_choose (int set) NOTHROW
1779{ 1795{
1780 screen.charset = set; 1796 screen.charset = set;
1781 set_font_style (); 1797 set_font_style ();
1782} 1798}
… …
1803 * ------------------------------------------------------------------------- */ 1819 * ------------------------------------------------------------------------- */
1804 1820
1805/* 1821/*
1806 * refresh matching text. 1822 * refresh matching text.
1807 */ 1823 */
1808bool 1824bool ecb_cold
1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1825rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1810{ 1826{
1811 bool found = false; 1827 bool found = false;
1812 1828
1813 for (int i = 0; i < nrow; i++) 1829 for (int i = 0; i < nrow; i++)
… …
1832 PART_BEG = 0, 1848 PART_BEG = 0,
1833 PART_END, 1849 PART_END,
1834 RC_COUNT 1850 RC_COUNT
1835}; 1851};
1836 1852
1837void 1853void ecb_hot
1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1854rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1839{ 1855{
1840 int i; 1856 int i;
1841 row_col_t rc[RC_COUNT]; 1857 row_col_t rc[RC_COUNT];
1842 1858
… …
1890 * the top of the screen 1906 * the top of the screen
1891 */ 1907 */
1892void 1908void
1893rxvt_term::scr_move_to (int y, int len) NOTHROW 1909rxvt_term::scr_move_to (int y, int len) NOTHROW
1894{ 1910{
1895 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1911 // lerp (y, 0, len, top_row, nrow - 1)
1912 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1896} 1913}
1897 1914
1898/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1899/* 1916/*
1900 * Page the screen up/down nlines 1917 * Page the screen up/down nlines
1901 * direction should be UP or DN 1918 * direction should be UP or DN
1902 */ 1919 */
1903bool 1920bool
1904rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1921rxvt_term::scr_page (int nlines) NOTHROW
1905{ 1922{
1906 int new_view_start =
1907 direction == UP ? view_start - nlines
1908 : view_start + nlines;
1909
1910 return scr_changeview (new_view_start); 1923 return scr_changeview (view_start - nlines);
1911} 1924}
1912 1925
1913bool 1926bool
1914rxvt_term::scr_changeview (int new_view_start) NOTHROW 1927rxvt_term::scr_changeview (int new_view_start) NOTHROW
1915{ 1928{
… …
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1981 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1969#endif 1982#endif
1970} 1983}
1971 1984
1972/* ------------------------------------------------------------------------- */ 1985/* ------------------------------------------------------------------------- */
1973void 1986void ecb_cold
1974rxvt_term::scr_printscreen (int fullhist) NOTHROW 1987rxvt_term::scr_printscreen (int fullhist) NOTHROW
1975{ 1988{
1976#ifdef PRINTPIPE 1989#ifdef PRINTPIPE
1977 int nrows, row_start; 1990 int nrows, row_start;
1978 FILE *fd = popen_printer (); 1991 FILE *fd = popen_printer ();
… …
2027/* 2040/*
2028 * Refresh the screen 2041 * Refresh the screen
2029 * drawn_text/drawn_rend contain the screen information before the update. 2042 * drawn_text/drawn_rend contain the screen information before the update.
2030 * screen.text/screen.rend contain what the screen will change to. 2043 * screen.text/screen.rend contain what the screen will change to.
2031 */ 2044 */
2032void 2045void ecb_hot
2033rxvt_term::scr_refresh () NOTHROW 2046rxvt_term::scr_refresh () NOTHROW
2034{ 2047{
2035 int16_t col, row, /* column/row we're processing */ 2048 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2049 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2050 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 */ 2051 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2052 ccol2; /* Cursor colour2 */
2053 rend_t cur_rend;
2054 int cur_col;
2055 int cursorwidth;
2044 2056
2045 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2046 2058
2047 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2060 return;
… …
2052 */ 2064 */
2053 refresh_count = 0; 2065 refresh_count = 0;
2054 2066
2055 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2068 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2070 have_bg = bg_img != 0;
2059#endif 2071#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2073
2062 /* 2074 /*
2063 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2073 2085
2074 /* 2086 /*
2075 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2076 */ 2088 */
2077 { 2089 {
2078 bool setoldcursor;
2079
2080#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2081 if (hidden_cursor) 2091 if (hidden_cursor)
2082 showcursor = 0; 2092 showcursor = 0;
2083#endif 2093#endif
2084 2094
… …
2087 int col = screen.cur.col; 2097 int col = screen.cur.col;
2088 2098
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2100 col--;
2091 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2092 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2093 2109
2094#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2098 else 2113 else
2099#endif 2114#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2112 ccol2 = bgcolor_of (rstyle); 2127 ccol2 = bgcolor_of (rstyle);
2113#else 2128#else
2114 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2115#endif 2130#endif
2116 2131
2117 if (focus) 2132 if (focus && cursor_type == 0)
2118 { 2133 {
2119 if (option (Opt_cursorUnderline)) 2134 rend_t rend = cur_rend;
2120 *crp ^= RS_Uline; 2135
2121 else
2122 {
2123 *crp ^= RS_RVid; 2136 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2137 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2138 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2139
2140 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2141 }
2128 } 2142 }
2129 2143
2130 /* make sure no outline cursor is left around */ 2144 /* make sure no outline cursor is left around */
2131 setoldcursor = 0; 2145 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2132 if (ocrow != -1) 2146 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2147
2148 // save the current cursor coordinates if the cursor is visible
2149 // and either the window is unfocused or the cursor style is
2150 // underline or vertical bar, so as to clear the outline cursor in
2151 // the next refresh if the cursor moves or becomes invisible
2152 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2133 { 2153 {
2134 if (screen.cur.row - view_start != ocrow 2154 oldcursor.row = screen.cur.row - view_start;
2135 || screen.cur.col != oldcursor.col) 2155 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 } 2156 }
2147 else if (!focus) 2157 else
2148 setoldcursor = 1;
2149
2150 if (setoldcursor)
2151 {
2152 if (screen.cur.row - view_start >= nrow)
2153 oldcursor.row = -1; 2158 oldcursor.row = -1;
2154 else
2155 {
2156 oldcursor.row = screen.cur.row - view_start;
2157 oldcursor.col = screen.cur.col;
2158 }
2159 }
2160 } 2159 }
2161 2160
2162#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2162 /*
2164 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
… …
2245 int ypixel = (int)Row2Pixel (row); 2244 int ypixel = (int)Row2Pixel (row);
2246 2245
2247 for (col = 0; col < ncol; col++) 2246 for (col = 0; col < ncol; col++)
2248 { 2247 {
2249 /* compare new text with old - if exactly the same then continue */ 2248 /* compare new text with old - if exactly the same then continue */
2250 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2249 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; 2250 continue;
2255 2251
2256 // redraw one or more characters 2252 // redraw one or more characters
2257 2253
2258 // seek to the beginning of wide characters 2254 // seek to the beginning of wide characters
… …
2430 else 2426 else
2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2427 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432 2428
2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2429 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434 { 2430 {
2431 if (showcursor && focus && row == screen.cur.row
2432 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2433 XSetForeground (dpy, gc, pix_colors[ccol1]);
2434 else
2435#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2436 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2437 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438 else 2438 else
2439#endif 2439#endif
… …
2451 */ 2451 */
2452 if (showcursor) 2452 if (showcursor)
2453 { 2453 {
2454 if (focus) 2454 if (focus)
2455 { 2455 {
2456 if (option (Opt_cursorUnderline)) 2456 if (cursor_type == 0)
2457 *crp ^= RS_Uline; 2457 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2458 else 2458 else if (oldcursor.row >= 0)
2459 { 2459 {
2460 *crp ^= RS_RVid; 2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461#ifndef NO_CURSORCOLOR 2461 if (cursor_type == 1)
2462 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2462 XFillRectangle (dpy, vt, gc,
2463#endif 2463 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row + 1) - 2,
2465 Width2Pixel (1),
2466 2);
2467 else
2468 XFillRectangle (dpy, vt, gc,
2469 Col2Pixel (cur_col),
2470 Row2Pixel (oldcursor.row),
2471 2,
2472 Height2Pixel (1));
2464 } 2473 }
2465 } 2474 }
2466 else if (oldcursor.row >= 0) 2475 else if (oldcursor.row >= 0)
2467 { 2476 {
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]); 2477 XSetForeground (dpy, gc, pix_colors[ccol1]);
2484 2478
2485 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2486 Col2Pixel (col), 2480 Col2Pixel (cur_col),
2487 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2488 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2489 (unsigned int) (Height2Pixel (1) - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2490 } 2484 }
2491 } 2485 }
… …
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_recolor (bool refresh) NOTHROW
2535{ 2529{
2536 bool transparent = false; 2530 bool transparent = false;
2537 2531
2538#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2533 if (bg_img != 0)
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_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2540
2547 transparent = true; 2541 transparent = true;
2548 } 2542 }
2549 else 2543 else
2550# endif 2544# endif
2551 { 2545 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2548 }
2555 } 2549 }
2556 else 2550 else
2557#endif 2551#endif
2558 { 2552 {
… …
2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 } 2555 }
2562 2556
2563 XClearWindow (dpy, parent); 2557 XClearWindow (dpy, parent);
2564 2558
2565 if (scrollBar.win) 2559 if (scrollBar.state && scrollBar.win)
2566 { 2560 {
2567 if (transparent) 2561 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2563 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2566 scrollBar.show (0);
2573 } 2567 }
2574 2568
2575 if (refresh) 2569 if (refresh)
… …
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)
… …
2692 || (check_more == 1 2686 || (check_more == 1
2693 && current_screen == selection.screen 2687 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 CLEAR_ALL_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2691}
2692
2693void
2694rxvt_term::selection_changed () NOTHROW
2695{
2696 line_t &r1 = ROW (selection.beg.row);
2697 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2698 ++selection.beg.col;
2699
2700 line_t &r2 = ROW (selection.end.row);
2701 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2702 ++selection.end.col;
2703
2704 want_refresh = 1;
2697} 2705}
2698 2706
2699/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2700/* 2708/*
2701 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
… …
2942/* ------------------------------------------------------------------------- */ 2950/* ------------------------------------------------------------------------- */
2943/* 2951/*
2944 * Mark or select text based upon number of clicks: 1, 2, or 3 2952 * Mark or select text based upon number of clicks: 1, 2, or 3
2945 * EXT: button 1 press 2953 * EXT: button 1 press
2946 */ 2954 */
2947void 2955void ecb_cold
2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2956rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2949{ 2957{
2950 clicks = ((clicks - 1) % 3) + 1; 2958 clicks = ((clicks - 1) % 3) + 1;
2951 selection.clicks = clicks; /* save clicks so extend will work */ 2959 selection.clicks = clicks; /* save clicks so extend will work */
2952 2960
… …
2971 2979
2972/* ------------------------------------------------------------------------- */ 2980/* ------------------------------------------------------------------------- */
2973/* 2981/*
2974 * Mark a selection at the specified col/row 2982 * Mark a selection at the specified col/row
2975 */ 2983 */
2976void 2984void ecb_cold
2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2985rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2978{ 2986{
2979 want_refresh = 1; 2987 want_refresh = 1;
2980 2988
2981 selection.mark.row = row + view_start; 2989 selection.mark.row = row + view_start;
… …
3004 * Word select: select text for 2 clicks 3012 * Word select: select text for 2 clicks
3005 * We now only find out the boundary in one direction 3013 * We now only find out the boundary in one direction
3006 */ 3014 */
3007 3015
3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3009#define DELIMIT_TEXT(x) \ 3017#define DELIMIT_TEXT(x) \
3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3011#define DELIMIT_REND(x) 1 3019#define DELIMIT_REND(x) 1
3012 3020
3013void 3021void ecb_cold
3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3015{ 3023{
3016 int col, row, dirnadd, tcol, trow, w1, w2; 3024 int col, row, dirnadd, tcol, trow, w1, w2;
3017 row_col_t bound; 3025 row_col_t bound;
3018 text_t *stp; 3026 text_t *stp;
… …
3092 * EXT: button 3 press; button 1 or 3 drag 3100 * EXT: button 3 press; button 1 or 3 drag
3093 * flag == 0 ==> button 1 3101 * flag == 0 ==> button 1
3094 * flag == 1 ==> button 3 press 3102 * flag == 1 ==> button 3 press
3095 * flag == 2 ==> button 3 motion 3103 * flag == 2 ==> button 3 motion
3096 */ 3104 */
3097void 3105void ecb_cold
3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3106rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3099{ 3107{
3100 int col = clamp (Pixel2Col (x), 0, ncol); 3108 int col = clamp (Pixel2Col (x), 0, ncol);
3101 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3109 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3102 3110
… …
3128 3136
3129/* ------------------------------------------------------------------------- */ 3137/* ------------------------------------------------------------------------- */
3130/* 3138/*
3131 * Extend the selection to the specified col/row 3139 * Extend the selection to the specified col/row
3132 */ 3140 */
3133void 3141void ecb_cold
3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3135{ 3143{
3136 row_col_t pos; 3144 row_col_t pos;
3137 enum { 3145 enum {
3138 LEFT, RIGHT 3146 LEFT, RIGHT
3139 } closeto = RIGHT; 3147 } closeto = RIGHT;
3140
3141 want_refresh = 1;
3142 3148
3143 switch (selection.op) 3149 switch (selection.op)
3144 { 3150 {
3145 case SELECTION_INIT: 3151 case SELECTION_INIT:
3146 CLEAR_SELECTION (); 3152 CLEAR_SELECTION ();
… …
3326 3332
3327#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3328 if (selection.rect && selection.beg.col > selection.end.col) 3334 if (selection.rect && selection.beg.col > selection.end.col)
3329 ::swap (selection.beg.col, selection.end.col); 3335 ::swap (selection.beg.col, selection.end.col);
3330#endif 3336#endif
3337
3338 selection_changed ();
3331} 3339}
3332 3340
3333#if !ENABLE_MINIMAL 3341#if !ENABLE_MINIMAL
3334void 3342void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3343rxvt_term::selection_remove_trailing_spaces () NOTHROW
3336{ 3344{
3337 int32_t end_col, end_row; 3345 int32_t end_col, end_row;
3338 text_t *stp; 3346 text_t *stp;
3339 3347
… …
3377/* ------------------------------------------------------------------------- */ 3385/* ------------------------------------------------------------------------- */
3378/* 3386/*
3379 * Double click on button 3 when already selected 3387 * Double click on button 3 when already selected
3380 * EXT: button 3 double click 3388 * EXT: button 3 double click
3381 */ 3389 */
3382void 3390void ecb_cold
3383rxvt_term::selection_rotate (int x, int y) NOTHROW 3391rxvt_term::selection_rotate (int x, int y) NOTHROW
3384{ 3392{
3385 selection.clicks = selection.clicks % 3 + 1; 3393 selection.clicks = selection.clicks % 3 + 1;
3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3387} 3395}
… …
3389/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3390/* 3398/*
3391 * Respond to a request for our current selection 3399 * Respond to a request for our current selection
3392 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3393 */ 3401 */
3394void 3402void ecb_cold
3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3396{ 3404{
3397 Atom property = rq.property == None ? rq.target : rq.property; 3405 Atom property = rq.property == None ? rq.target : rq.property;
3398 XSelectionEvent ev; 3406 XSelectionEvent ev;
3399 3407
… …
3532 3540
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3542}
3535 3543
3536/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3545#if USE_XIM
3538void 3546void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3547rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3548{
3541 XWindowAttributes xwa; 3549 XWindowAttributes xwa;
3542 3550
3543 XGetWindowAttributes (dpy, vt, &xwa); 3551 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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