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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.452 by root, Sat Dec 13 09:49:48 2014 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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 <pcg@goof.com> 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
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
40} 38}
41 39
42/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
46 42
47/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
100 96
101/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
102void 98void
103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104{ 100{
105 if (!l.t) 101 if (!l.valid ())
106 { 102 {
107 lalloc (l); 103 l.alloc ();
108 col = 0; 104 col = 0;
109 width = ncol; 105 width = ncol;
110 } 106 }
111 107
112 l.touch (); 108 l.touch ();
… …
143 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 140 col--;
145 141
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
148 146
149 // found start, nuke 147 // found start, nuke
150 do { 148 do {
151 l.t[col] = ' '; 149 l.t[col] = ' ';
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 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
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
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
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
164 view_start = 0; 220 view_start = 0;
165 num_scr = 0; 221 num_scr = 0;
166 222
167 if (ncol == 0) 223 if (ncol == 0)
168 ncol = 80; 224 ncol = 80;
… …
188 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
189 245
190 screen.tscroll = 0; 246 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
192 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
193 if (!row_buf) 257 if (!prev_row_buf)
194 { 258 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 259 top_row = 0;
199 term_start = 0; 260 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 261
215 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
241 { 288 {
242 /* 289 /*
243 * add or delete rows as appropriate 290 * add or delete rows as appropriate
244 */ 291 */
245 292
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 294
263 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
264 { 296 {
265 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 300
269 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 302 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 303
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
281 307
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 316
291 do 317 do
292 { 318 {
293 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 321 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 323
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 325 {
300 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
301 327
302 plines++; 328 plines++;
303 llen += prev_ncol; 329 llen += prev_ncol;
… …
316 342
317 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
319 { 345 {
320 qline = row_buf + qrow; 346 qline = row_buf + qrow;
321 lalloc (*qline); 347 qline->alloc (); // redundant with next line
322 qline->l = ncol; 348 qline->l = ncol;
323 qline->is_longer (1); 349 qline->is_longer (1);
324 350
325 int qcol = 0; 351 int qcol = 0;
326 352
… …
341 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
342 // least. 368 // least.
343 if (prow == ocur.row) 369 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
345 371
346 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
347 373
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 375
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 398 {
373 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
374 400
375 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
376 { 402 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
379 405
380 qline = pline; 406 copy_line (dst, src);
381 lresize (qline);
382 } 407 }
383 408
384 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 411
389 term_start = 0; 412 term_start = 0;
390 } 413 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 414
396 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 417 }
399 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
400 free (tabs); 428 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
402 430
403 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
405 433
406 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
407 435
408 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
411 tt_winch (); 439 tt_winch ();
412 440
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 442}
415 443
416/* ------------------------------------------------------------------------- */ 444void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
422{ 446{
423 if (row_buf) 447 chunk_free (chunk, chunk_size);
424 { 448 chunk = 0;
425 delete talloc; talloc = 0; 449 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 450
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 451 free (tabs);
434 tabs = 0; 452 tabs = 0;
435 }
436} 453}
437 454
438/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
439/* 456/*
440 * Hard/Soft reset 457 * Hard/Soft reset
441 */ 458 */
442void 459void ecb_cold
443rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
444{ 461{
445 scr_release (); 462 scr_release ();
463
446 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 465 rvideo_mode = false;
448 scr_soft_reset (); 466 scr_soft_reset ();
449 scr_reset (); 467 scr_reset ();
450 468
451 scr_clear (true); 469 scr_clear (true);
452 scr_refresh (); 470 scr_refresh ();
453} 471}
454 472
455void 473void ecb_cold
456rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
457{ 475{
458 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
460 scr_overlay_off (); 478 scr_overlay_off ();
461#endif 479#endif
… …
516 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
518} 536}
519 537
520void 538void
521rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
522{ 540{
523 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
524 return; 542 return;
525 543
526 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
545 return; 563 return;
546 564
547 want_refresh = 1; 565 want_refresh = 1;
548 view_start = 0; 566 view_start = 0;
549 567
550 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
551 574
552 current_screen = scrn; 575 current_screen = scrn;
553 576
554#if NSCREENS 577#if NSCREENS
555 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
621/* 644/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 646 * count positive ==> scroll up
624 * count negative ==> scroll down 647 * count negative ==> scroll down
625 */ 648 */
626int 649int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 651{
629 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
630 return 0; 653 return 0;
631 654
… …
634 657
635 if (count > 0 658 if (count > 0
636 && row1 == 0 659 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
639 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 665
644 // sever bottommost line 666 // sever bottommost line
645 { 667 {
646 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
647 l.is_longer (0); 669 l.is_longer (0);
648 l.touch (); 670 l.touch ();
649 } 671 }
650 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
651 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 689 for (int i = count; i--; )
653 { 690 {
654 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
655 692
656 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 696 {
660 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 698 l.l = 0;
… …
663 } 700 }
664 else 701 else
665 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
666 } 703 }
667 704
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 705 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
682 { 708 {
683 selection.beg.row -= count; 709 selection.beg.row -= count;
684 selection.end.row -= count; 710 selection.end.row -= count;
685 selection.mark.row -= count; 711 selection.mark.row -= count;
686 712
687 if (selection.beg.row < top_row 713 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 714 }
695 715
696 // finally move the view window, if desired 716 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 718 && view_start != 0
699 && view_start != -saveLines) 719 && view_start != -saveLines)
700 scr_page (UP, count); 720 scr_page (count);
701 721
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 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));
704 } 724 }
705 else 725 else
… …
728 } 748 }
729 749
730 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
732 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
733 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
734 762
735 min_it (count, rows); 763 min_it (count, rows);
736 764
737 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 766
739 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
740 { 768 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 770
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 773 }
746 774
747 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
749 } 784 }
750 785
751 return count; 786 return count;
752} 787}
753 788
754/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
755/* 790/*
756 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
757 */ 792 */
758void 793void ecb_hot
759rxvt_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
760{ 795{
761 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
762 return; 797 return;
763 798
764 unsigned char checksel; 799 bool checksel;
765 unicode_t c; 800 unicode_t c;
766 int ncol = this->ncol; 801 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
768 803
769 want_refresh = 1; 804 want_refresh = 1;
… …
795 830
796 while (str < strend) 831 while (str < strend)
797 { 832 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 834
800 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 836 if (c == C0_LF)
802 { 837 {
803 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
804 839
805 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
824 { 859 {
825 scr_tab (1, true); 860 scr_tab (1, true);
826 continue; 861 continue;
827 } 862 }
828 863
829 if (expect_false ( 864 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 868 ))
834 { 869 {
… …
839 * should be a similar check. 874 * should be a similar check.
840 */ 875 */
841 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
842 } 877 }
843 878
844 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 880 {
846 scr_do_wrap (); 881 scr_do_wrap ();
847 882
848 line->l = ncol; 883 line->l = ncol;
849 line->is_longer (1); 884 line->is_longer (1);
… …
851 row = screen.cur.row; 886 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
853 } 888 }
854 889
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 892 c = 0xfffd;
858 893
859 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
862 // locale. 897 // locale.
863 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
864 899
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 901 {
867 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 903 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
885 } 920 }
886 } 921 }
887 922
888 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
890 925
891 if (width != 0) 926 if (width != 0)
892 { 927 {
893#if !UNICODE_3 928#if !UNICODE_3
… …
898# else 933# else
899 c = 0xfffd; 934 c = 0xfffd;
900# endif 935# endif
901#endif 936#endif
902 937
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 939
913 // if the character doesn't fit into the remaining columns... 940 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
915 { 942 {
916 if (screen.flags & Screen_Autowrap) 943 if (screen.flags & Screen_Autowrap)
917 { 944 {
918 // ... artificially enlargen the previous one 945 // ... artificially enlargen the previous one
919 c = NOCHAR; 946 c = NOCHAR;
… …
922 } 949 }
923 else 950 else
924 screen.cur.col = ncol - width; 951 screen.cur.col = ncol - width;
925 } 952 }
926 953
954 // nuke the character at this position, if required
955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
959 scr_kill_char (*line, screen.cur.col);
960
927 line->touch (); 961 line->touch ();
928 962
929 do 963 do
930 { 964 {
931 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
933 967
934 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 969 screen.cur.col++;
936 else 970 else
937 { 971 {
938 line->l = ncol; 972 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
941 break; 975
976 goto end_of_line;
942 } 977 }
943 978
944 c = NOCHAR; 979 c = NOCHAR;
945 } 980 }
946 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
947 982
948 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 985 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 986 line->t[c] = ' ';
956 line->r[c] = rend; 987 line->r[c] = rend;
957 }
958 } 988 }
989
990end_of_line:
991 ;
959 } 992 }
960#if ENABLE_COMBINING 993#if ENABLE_COMBINING
961 else // width == 0 994 else // width == 0
962 { 995 {
963 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
1026 1059
1027 want_refresh = 1; 1060 want_refresh = 1;
1028#endif 1061#endif
1029 } 1062 }
1030 } 1063 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext) 1064 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext; 1065 screen.flags &= ~Screen_WrapNext;
1034#endif
1035 else 1066 else
1036 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1037} 1068}
1038 1069
1039/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1117 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1118 * 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
1119 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1120 */ 1151 */
1121#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1122void 1153void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1124{ 1155{
1125 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1158 else
… …
1134 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1135 * 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
1136 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1137 */ 1168 */
1138#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1139void 1170void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1141{ 1172{
1142 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1175 else
… …
1209 * direction should be UP or DN 1240 * direction should be UP or DN
1210 */ 1241 */
1211void 1242void
1212rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1213{ 1244{
1214 int dirn;
1215
1216 want_refresh = 1; 1245 want_refresh = 1;
1217 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1218 1247
1219 dirn = ((direction == UP) ? 1 : -1);
1220
1221 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1222 1249
1223 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1224 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1225 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1226 else 1253 else
1227 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1228 1255
1229 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1230 selection_check (0); 1257 selection_check (0);
1231} 1258}
1232 1259
… …
1295 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1296} 1323}
1297 1324
1298/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1299/* 1326/*
1300 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1331 */
1305void 1332void
… …
1314 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1315 1342
1316 switch (mode) 1343 switch (mode)
1317 { 1344 {
1318 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1346 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1348 num = nrow - row;
1323 break; 1349 break;
1324 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1351 scr_erase_line (1);
1327 row = 0; 1352 row = 0;
1328 num = screen.cur.row; 1353 num = screen.cur.row;
1329 break; 1354 break;
1330 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1356 row = 0;
1333 num = nrow; 1357 num = nrow;
1334 break; 1358 break;
1335 default: 1359 default:
1336 return; 1360 return;
… …
1353 { 1377 {
1354 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1355 1379
1356 if (mapped) 1380 if (mapped)
1357 XClearArea (dpy, vt, 0, 1381 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1383 (unsigned int)Height2Pixel (num), False);
1360 } 1384 }
1361 else 1385 else
1362 { 1386 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1390 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1393 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1394 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1395 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1396 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1399 }
1376 } 1400 }
… …
1398/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1399/* 1423/*
1400 * Fill the screen with `E's 1424 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1426 */
1403void 1427void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1405{ 1429{
1406 rend_t fs; 1430 rend_t fs;
1407 1431
1408 want_refresh = 1; 1432 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1410 1434
1411 num_scr_allow = 0; 1435 num_scr_allow = 0;
1412 selection_check (3); 1436
1437 row_col_t pos;
1438 pos.row = pos.col = 0;
1439 if (ROWCOL_IS_AFTER (selection.end, pos))
1440 CLEAR_SELECTION ();
1413 1441
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1416 { 1444 {
1417 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1569/* 1597/*
1570 * Set the scrolling region 1598 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1600 */
1573void 1601void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1603{
1576 max_it (top, 0); 1604 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1578 1606
… …
1588/* 1616/*
1589 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1620 */
1593void 1621void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1623{
1596 want_refresh = 1; 1624 want_refresh = 1;
1597 1625
1598 if (mode) 1626 if (mode)
… …
1605/* 1633/*
1606 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1637 */
1610void 1638void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1640{
1613 if (mode) 1641 if (mode)
1614 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1615 else 1643 else
… …
1624 * 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
1625 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1656 */
1629void 1657void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1659{
1632 if (mode) 1660 if (mode)
1633 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1634 else 1662 else
… …
1641/* 1669/*
1642 * Set insert/replace mode 1670 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1673 */
1646void 1674void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1676{
1649 if (mode) 1677 if (mode)
1650 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1651 else 1679 else
… …
1657 * Set/Unset tabs 1685 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1689 */
1662void 1690void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1692{
1665 if (mode < 0) 1693 if (mode < 0)
1666 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1686 if (rvideo_state != on) 1714 if (rvideo_state != on)
1687 { 1715 {
1688 rvideo_state = on; 1716 rvideo_state = on;
1689 1717
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1692 if (bgPixmap.pixmap == None) 1720 if (bg_img == 0)
1693#endif 1721#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1723
1696 XGCValues gcvalue; 1724 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1707/* 1735/*
1708 * Report current cursor position 1736 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1738 */
1711void 1739void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1713{ 1741{
1714 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);
1715} 1743}
1716 1744
… …
1719 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1720 1748
1721/* 1749/*
1722 * Set font style 1750 * Set font style
1723 */ 1751 */
1724void 1752void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1726{ 1754{
1727#if 0 1755#if 0
1728 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1729 { 1757 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1783 */
1756void 1784void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1786{
1759 screen.charset = set; 1787 screen.charset = set;
1760 set_font_style (); 1788 set_font_style ();
1761} 1789}
… …
1782 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1783 1811
1784/* 1812/*
1785 * refresh matching text. 1813 * refresh matching text.
1786 */ 1814 */
1787bool 1815bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1817{
1790 bool found = false; 1818 bool found = false;
1791 1819
1792 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1839 PART_BEG = 0,
1812 PART_END, 1840 PART_END,
1813 RC_COUNT 1841 RC_COUNT
1814}; 1842};
1815 1843
1816void 1844void ecb_hot
1817rxvt_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
1818{ 1846{
1819 int i; 1847 int i;
1820 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1821 1849
… …
1858 * Refresh the entire screen 1886 * Refresh the entire screen
1859 */ 1887 */
1860void 1888void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1890{
1863 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1892}
1865 1893
1866/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1867/* 1895/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1896 * Move the display so that the line represented by scrollbar value Y is at
1869 * the top of the screen 1897 * the top of the screen
1870 */ 1898 */
1871void 1899void
1872rxvt_term::scr_move_to (int y, int len) NOTHROW 1900rxvt_term::scr_move_to (int y, int len) NOTHROW
1873{ 1901{
1874 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);
1875} 1904}
1876 1905
1877/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1878/* 1907/*
1879 * Page the screen up/down nlines 1908 * Page the screen up/down nlines
1880 * direction should be UP or DN 1909 * direction should be UP or DN
1881 */ 1910 */
1882bool 1911bool
1883rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1912rxvt_term::scr_page (int nlines) NOTHROW
1884{ 1913{
1885 int new_view_start =
1886 direction == UP ? view_start - nlines
1887 : view_start + nlines;
1888
1889 return scr_changeview (new_view_start); 1914 return scr_changeview (view_start - nlines);
1890} 1915}
1891 1916
1892bool 1917bool
1893rxvt_term::scr_changeview (int new_view_start) NOTHROW 1918rxvt_term::scr_changeview (int new_view_start) NOTHROW
1894{ 1919{
… …
1924 1949
1925# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1926# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1927 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1928# endif 1953# endif
1929 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1930# endif 1955# endif
1931 1956
1932# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1934 set_urgency (1); 1959 set_urgency (1);
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1973#endif
1949} 1974}
1950 1975
1951/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1977void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1979{
1956#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1957 int nrows, row_start; 1981 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
2007/* 2031/*
2008 * Refresh the screen 2032 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2035 */
2012void 2036void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2014{ 2038{
2015 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2041 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */
2020#endif
2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */ 2042 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */ 2043 ccol2; /* Cursor colour2 */
2044 rend_t cur_rend;
2045 int cur_col;
2046 int cursorwidth;
2024 2047
2025 want_refresh = 0; /* screen is current */ 2048 want_refresh = 0; /* screen is current */
2026 2049
2027 if (refresh_type == NO_REFRESH || !mapped) 2050 if (refresh_type == NO_REFRESH || !mapped)
2028 return; 2051 return;
… …
2031 * A: set up vars 2054 * A: set up vars
2032 */ 2055 */
2033 refresh_count = 0; 2056 refresh_count = 0;
2034 2057
2035 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2059 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2038 have_bg = bgPixmap.pixmap != None; 2061 have_bg = bg_img != 0;
2039#endif 2062#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2064
2042 /* 2065 /*
2043 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2072 scr_swap_overlay ();
2050#endif 2073#endif
2051 2074
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2076
2054 /* 2077 /*
2055 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2056 */ 2079 */
2057 { 2080 {
2058 unsigned char setoldcursor;
2059
2060#ifdef CURSOR_BLINK 2081#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2082 if (hidden_cursor)
2062 showcursor = 0; 2083 showcursor = 0;
2063#endif 2084#endif
2064 2085
… …
2067 int col = screen.cur.col; 2088 int col = screen.cur.col;
2068 2089
2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2090 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2070 col--; 2091 col--;
2071 2092
2093 cursorwidth = 1;
2094 while (col + cursorwidth < ncol
2095 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2096 cursorwidth++;
2097
2072 crp = &ROW(screen.cur.row).r[col]; 2098 cur_rend = ROW(screen.cur.row).r[col];
2099 cur_col = col;
2073 2100
2074#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor)) 2102 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor; 2103 ccol1 = Color_cursor;
2078 else 2104 else
2079#endif 2105#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2092 ccol2 = bgcolor_of (rstyle); 2118 ccol2 = bgcolor_of (rstyle);
2093#else 2119#else
2094 ccol2 = Color_bg; 2120 ccol2 = Color_bg;
2095#endif 2121#endif
2096 2122
2097 if (focus) 2123 if (focus && cursor_type != 2)
2098 { 2124 {
2099 if (option (Opt_cursorUnderline)) 2125 rend_t rend = cur_rend;
2126
2127 if (cursor_type == 1)
2100 *crp ^= RS_Uline; 2128 rend ^= RS_Uline;
2101 else 2129 else
2102 { 2130 {
2103 *crp ^= RS_RVid; 2131 rend ^= RS_RVid;
2104 *crp = SET_FGCOLOR (*crp, ccol1); 2132 rend = SET_FGCOLOR (rend, ccol1);
2105 *crp = SET_BGCOLOR (*crp, ccol2); 2133 rend = SET_BGCOLOR (rend, ccol2);
2106 } 2134 }
2135
2136 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2107 } 2137 }
2108 } 2138 }
2109 2139
2110 /* make sure no outline cursor is left around */ 2140 /* make sure no outline cursor is left around */
2111 setoldcursor = 0; 2141 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2112 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)
2113 { 2149 {
2114 if (screen.cur.row - view_start != ocrow 2150 oldcursor.row = screen.cur.row - view_start;
2115 || screen.cur.col != oldcursor.col) 2151 oldcursor.col = screen.cur.col;
2116 {
2117 if (ocrow < nrow
2118 && oldcursor.col < ncol)
2119 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120
2121 if (focus || !showcursor)
2122 oldcursor.row = -1;
2123 else
2124 setoldcursor = 1;
2125 }
2126 } 2152 }
2127 else if (!focus) 2153 else
2128 setoldcursor = 1;
2129
2130 if (setoldcursor)
2131 {
2132 if (screen.cur.row - view_start >= nrow)
2133 oldcursor.row = -1; 2154 oldcursor.row = -1;
2134 else
2135 {
2136 oldcursor.row = screen.cur.row - view_start;
2137 oldcursor.col = screen.cur.col;
2138 }
2139 }
2140 } 2155 }
2141 2156
2142#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2158 /*
2144 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
… …
2150 { 2165 {
2151 int16_t nits; 2166 int16_t nits;
2152 int i = num_scr; 2167 int i = num_scr;
2153 int j; 2168 int j;
2154 int len, wlen; 2169 int len, wlen;
2155 dLocal (int, num_scr);
2156 2170
2157 j = nrow; 2171 j = nrow;
2158 wlen = len = -1; 2172 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2173 row = i > 0 ? 0 : j - 1;
2160 2174
… …
2226 int ypixel = (int)Row2Pixel (row); 2240 int ypixel = (int)Row2Pixel (row);
2227 2241
2228 for (col = 0; col < ncol; col++) 2242 for (col = 0; col < ncol; col++)
2229 { 2243 {
2230 /* compare new text with old - if exactly the same then continue */ 2244 /* compare new text with old - if exactly the same then continue */
2231 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2245 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2232 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2233 || (stp[col] == ' ' /* space w/ no background change */
2234 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2235 continue; 2246 continue;
2236 2247
2237 // redraw one or more characters 2248 // redraw one or more characters
2238 2249
2239 // seek to the beginning of wide characters 2250 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2251 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2252 --col;
2242 2253
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2255 text_t *text = stp + col;
2245 int count = 1; 2256 int count = 1;
… …
2283 2294
2284 col--; /* went one too far. move back */ 2295 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2296 count -= i; /* dump any matching trailing chars */
2286 2297
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2298 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2299 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2300 count++, i--;
2290 2301
2291 /* 2302 /*
2292 * Determine the attributes for the string 2303 * Determine the attributes for the string
2293 */ 2304 */
2294 int fore = fgcolor_of (rend); // desired foreground 2305 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2306 int back = bgcolor_of (rend); // desired background
2296 2307
2297 // only do special processing if any attributes are set, which is unlikely 2308 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2309 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2310 {
2300 bool invert = rend & RS_RVid; 2311 bool invert = rend & RS_RVid;
2301 2312
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2314 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2403 /*
2393 * Actually do the drawing of the string here 2404 * Actually do the drawing of the string here
2394 */ 2405 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2406 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2407
2397 if (expect_true (have_bg && back == Color_bg)) 2408 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2409 {
2399 // this is very ugly, maybe push it into ->draw? 2410 // this is very ugly, maybe push it into ->draw?
2400 2411
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2412 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2413 if (text[i] != ' ')
… …
2409 did_clear: ; 2420 did_clear: ;
2410 } 2421 }
2411 else 2422 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2423 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2424
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2425 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 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
2416#if ENABLE_FRILLS 2431#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2432 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2433 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2434 else
2420#endif 2435#endif
… …
2432 */ 2447 */
2433 if (showcursor) 2448 if (showcursor)
2434 { 2449 {
2435 if (focus) 2450 if (focus)
2436 { 2451 {
2437 if (option (Opt_cursorUnderline)) 2452 if (cursor_type != 2)
2438 *crp ^= RS_Uline; 2453 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2439 else 2454 else if (oldcursor.row >= 0)
2440 { 2455 {
2441 *crp ^= RS_RVid; 2456 XSetForeground (dpy, gc, pix_colors[ccol1]);
2442#ifndef NO_CURSORCOLOR 2457 XFillRectangle (dpy, vt, gc,
2443 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2458 Col2Pixel (cur_col),
2444#endif 2459 Row2Pixel (oldcursor.row),
2460 1,
2461 Height2Pixel (1));
2445 } 2462 }
2446 } 2463 }
2447 else if (oldcursor.row >= 0) 2464 else if (oldcursor.row >= 0)
2448 { 2465 {
2449 int cursorwidth = 1;
2450 int col = oldcursor.col;
2451
2452 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2453 col--;
2454
2455 while (col + cursorwidth < ncol
2456 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2457 cursorwidth++;
2458
2459#ifndef NO_CURSORCOLOR
2460 if (ISSET_PIXCOLOR (Color_cursor))
2461 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2462 else
2463#endif
2464 XSetForeground (dpy, gc, pix_colors[ccol1]); 2466 XSetForeground (dpy, gc, pix_colors[ccol1]);
2465 2467
2466 XDrawRectangle (dpy, vt, gc, 2468 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2469 Col2Pixel (cur_col),
2468 Row2Pixel (oldcursor.row), 2470 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2471 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2472 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2473 }
2472 } 2474 }
2473 2475
2474 /* 2476 /*
2475 * H: cleanup selection 2477 * H: cleanup selection
… …
2484 screen.flags = old_screen_flags; 2486 screen.flags = old_screen_flags;
2485 num_scr = 0; 2487 num_scr = 0;
2486 num_scr_allow = 1; 2488 num_scr_allow = 1;
2487} 2489}
2488 2490
2489void 2491void ecb_cold
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2492rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2493{
2492 if (!l.t) 2494 if (!l.valid ())
2493 return; 2495 return;
2494 2496
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2497 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2498
2497 for (int i = ncol; i--; ) 2499 for (int i = ncol; i--; )
2498 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]));
2499} 2501}
2500 2502
2501void 2503void ecb_cold
2502rxvt_term::scr_remap_chars () NOTHROW 2504rxvt_term::scr_remap_chars () NOTHROW
2503{ 2505{
2504 for (int i = total_rows; i--; ) 2506 for (int i = total_rows; i--; )
2505 scr_remap_chars (row_buf [i]); 2507 scr_remap_chars (row_buf [i]);
2506 2508
… …
2509 scr_remap_chars (drawn_buf [i]); 2511 scr_remap_chars (drawn_buf [i]);
2510 scr_remap_chars (swap_buf [i]); 2512 scr_remap_chars (swap_buf [i]);
2511 } 2513 }
2512} 2514}
2513 2515
2514void 2516void ecb_cold
2515rxvt_term::scr_recolour () NOTHROW 2517rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2518{
2517#ifdef HAVE_BG_PIXMAP 2519 bool transparent = false;
2518 bgPixmap.apply ();
2519#else
2520 2520
2521#ifdef HAVE_IMG
2522 if (bg_img != 0)
2523 {
2524# if ENABLE_TRANSPARENCY
2525 if (bg_flags & BG_IS_TRANSPARENT)
2526 {
2527 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2528 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2529
2530 transparent = true;
2531 }
2532 else
2533# endif
2534 {
2535 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2536 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2537 }
2538 }
2539 else
2540#endif
2541 {
2521 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2542 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2522 XClearWindow (dpy, parent[0]);
2523 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2543 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2544 }
2524 2545
2525 if (scrollBar.win) 2546 XClearWindow (dpy, parent);
2547
2548 if (scrollBar.state && scrollBar.win)
2526 { 2549 {
2550 if (transparent)
2551 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2552 else
2527 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2528 scrollBar.state = STATE_IDLE; 2554 scrollBar.state = SB_STATE_IDLE;
2529 scrollBar.show (0); 2555 scrollBar.show (0);
2530 } 2556 }
2531 2557
2532#endif 2558 if (refresh)
2533 2559 {
2534 /* bgPixmap.apply () does not do the following : */
2535 scr_clear (); 2560 scr_clear ();
2536 scr_touch (true); 2561 scr_touch (true);
2562 }
2537 want_refresh = 1; 2563 want_refresh = 1;
2538} 2564}
2539 2565
2540/* ------------------------------------------------------------------------- */ 2566/* ------------------------------------------------------------------------- */
2541void 2567void
… …
2598 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2624 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2599 srp[col] ^= rstyle; 2625 srp[col] ^= rstyle;
2600} 2626}
2601 2627
2602/* ------------------------------------------------------------------------- */ 2628/* ------------------------------------------------------------------------- */
2603void 2629void ecb_hot
2604rxvt_term::scr_reverse_selection () NOTHROW 2630rxvt_term::scr_reverse_selection () NOTHROW
2605{ 2631{
2606 if (selection.op 2632 if (selection.op
2607 && current_screen == selection.screen 2633 && current_screen == selection.screen
2608 && selection.end.row >= view_start) 2634 && selection.end.row >= view_start)
… …
2627 */ 2653 */
2628#if 0 2654#if 0
2629void 2655void
2630rxvt_term::scr_dump (int fd) NOTHROW 2656rxvt_term::scr_dump (int fd) NOTHROW
2631{ 2657{
2632 int row, wrote; 2658 // if this method is needed, it can be implemented by factoring the
2633 unsigned int width, towrite; 2659 // relevant code in scr_printscreen
2634 char r1[] = "\n";
2635
2636 for (row = saveLines + top_row;
2637 row < saveLines + nrow - 1; row++)
2638 {
2639 width = row_buf[row].l >= 0 ? row_buf[row].l
2640 : ncol;
2641 for (towrite = width; towrite; towrite -= wrote)
2642 {
2643 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2644 towrite);
2645 if (wrote < 0)
2646 return; /* XXX: death, no report */
2647 }
2648 if (row_buf[row].l >= 0)
2649 if (write (fd, r1, 1) <= 0)
2650 return; /* XXX: death, no report */
2651 }
2652} 2660}
2653#endif 2661#endif
2654 2662
2655/* ------------------------------------------------------------------------- * 2663/* ------------------------------------------------------------------------- *
2656 * CHARACTER SELECTION * 2664 * CHARACTER SELECTION *
2657 * ------------------------------------------------------------------------- */ 2665 * ------------------------------------------------------------------------- */
2658void 2666void
2659rxvt_term::selection_check (int check_more) NOTHROW 2667rxvt_term::selection_check (int check_more) NOTHROW
2660{ 2668{
2661 row_col_t pos;
2662
2663 if (!selection.op) 2669 if (!selection.op)
2664 return; 2670 return;
2665 2671
2666 pos.row = pos.col = 0;
2667 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2672 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2668 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2673 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2669 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2674 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2670 || (check_more == 1 2675 || (check_more == 1
2671 && current_screen == selection.screen 2676 && current_screen == selection.screen
2672 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2677 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2673 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2678 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2674 || (check_more == 2
2675 && ROWCOL_IS_BEFORE (selection.beg, pos)
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 3
2678 && ROWCOL_IS_AFTER (selection.end, pos))
2679 || (check_more == 4 /* screen width change */
2680 && (selection.beg.row != selection.end.row
2681 || selection.end.col > ncol)))
2682 CLEAR_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;
2683} 2694}
2684 2695
2685/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2686/* 2697/*
2687 * Paste a selection direct to the command fd 2698 * Paste a selection direct to the command fd
… …
2693 for (unsigned int i = 0; i < len; i++) 2704 for (unsigned int i = 0; i < len; i++)
2694 if (data[i] == C0_LF) 2705 if (data[i] == C0_LF)
2695 data[i] = C0_CR; 2706 data[i] = C0_CR;
2696 2707
2697 if (priv_modes & PrivMode_BracketPaste) 2708 if (priv_modes & PrivMode_BracketPaste)
2698 tt_printf ("\e[200~"); 2709 tt_printf ("\x1b[200~");
2699 2710
2700 tt_write (data, len); 2711 tt_write (data, len);
2701 2712
2702 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2703 tt_printf ("\e[201~"); 2714 tt_printf ("\x1b[201~");
2704} 2715}
2705 2716
2706void 2717void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW 2718rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{ 2719{
… …
2712 tt_paste (data, len); 2723 tt_paste (data, len);
2713} 2724}
2714 2725
2715/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2716/* 2727/*
2717 * Respond to a notification that a primary selection has been sent 2728 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2718 * EXT: SelectionNotify 2729 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2719 */ 2730 * as fallback
2720void
2721rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2722{
2723 if (prop == None) /* check for failed XConvertSelection */
2724 {
2725 if ((selection_type & Sel_CompoundText))
2726 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = 0;
2730 if (selnum != Sel_direct)
2731 selection_request_other (XA_STRING, selnum);
2732 }
2733
2734 if ((selection_type & Sel_UTF8String))
2735 {
2736 int selnum = selection_type & Sel_whereMask;
2737
2738 selection_type = Sel_CompoundText;
2739 if (selnum != Sel_direct)
2740 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2741 else
2742 selection_type = 0;
2743 }
2744
2745 return;
2746 }
2747
2748 unsigned long bytes_after;
2749 XTextProperty ct;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 0, PROP_SIZE / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct.encoding, &ct.format,
2755 &ct.nitems, &bytes_after,
2756 &ct.value) != Success)
2757 {
2758 ct.value = 0;
2759 goto bailout;
2760 }
2761
2762 if (ct.encoding == None)
2763 goto bailout;
2764
2765 if (bytes_after)
2766 {
2767 // fetch and append remaining data
2768 XTextProperty ct2;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 ct.nitems / 4, (bytes_after + 3) / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct2.encoding, &ct2.format,
2774 &ct2.nitems, &bytes_after,
2775 &ct2.value) != Success)
2776 goto bailout;
2777
2778 // realloc should be compatible to XFree, here, and elsewhere, too
2779 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2780 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2781 ct.nitems += ct2.nitems;
2782
2783 XFree (ct2.value);
2784 }
2785
2786 if (ct.value == 0)
2787 goto bailout;
2788
2789 if (ct.encoding == xa[XA_INCR])
2790 {
2791 // INCR selection, start handshake
2792 if (!delete_prop)
2793 XDeleteProperty (dpy, win, prop);
2794
2795 selection_wait = Sel_incr;
2796 incr_buf_fill = 0;
2797 incr_ev.start (10);
2798
2799 goto bailout;
2800 }
2801
2802 if (ct.nitems == 0)
2803 {
2804 if (selection_wait == Sel_incr)
2805 {
2806 XFree (ct.value);
2807
2808 // finally complete, now paste the whole thing
2809 selection_wait = Sel_normal;
2810 ct.value = (unsigned char *)incr_buf;
2811 ct.nitems = incr_buf_fill;
2812 incr_buf = 0;
2813 incr_buf_size = 0;
2814 incr_ev.stop ();
2815 }
2816 else
2817 {
2818 if (selection_wait == Sel_normal
2819 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2820 {
2821 /*
2822 * pass through again trying CUT_BUFFER0 if we've come from
2823 * XConvertSelection () but nothing was presented
2824 */
2825 selection_paste (display->root, XA_CUT_BUFFER0, False);
2826 }
2827
2828 goto bailout;
2829 }
2830 }
2831 else if (selection_wait == Sel_incr)
2832 {
2833 incr_ev.start (10);
2834
2835 while (incr_buf_fill + ct.nitems > incr_buf_size)
2836 {
2837 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2838 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2839 }
2840
2841 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2842 incr_buf_fill += ct.nitems;
2843
2844 goto bailout;
2845 }
2846
2847 char **cl;
2848 int cr;
2849
2850#if !ENABLE_MINIMAL
2851 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2852 // so recode it manually
2853 if (ct.encoding == xa[XA_UTF8_STRING])
2854 {
2855 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2856 char *s = rxvt_wcstombs (w);
2857 free (w);
2858 // TODO: strlen == only the first element will be converted. well...
2859 paste (s, strlen (s));
2860 free (s);
2861 }
2862 else
2863#endif
2864 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2865 && cl)
2866 {
2867 for (int i = 0; i < cr; i++)
2868 paste (cl[i], strlen (cl[i]));
2869
2870 XFreeStringList (cl);
2871 }
2872 else
2873 paste ((char *)ct.value, ct.nitems); // paste raw
2874
2875bailout:
2876 XFree (ct.value);
2877
2878 if (selection_wait == Sel_normal)
2879 selection_wait = Sel_none;
2880}
2881
2882void
2883rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2884{
2885 selection_wait = Sel_none;
2886
2887 incr_buf_size = 0;
2888 free (incr_buf);
2889
2890 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2891}
2892
2893void
2894rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2895{
2896 if (prop == None || selection_wait != Sel_incr)
2897 return;
2898
2899 selection_paste (win, prop, true);
2900}
2901
2902/* ------------------------------------------------------------------------- */
2903/*
2904 * Request the current selection:
2905 * Order: > internal selection if available
2906 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2907 * > CUT_BUFFER0
2908 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2909 * will auto fallback to CUT_BUFFER0
2910 * EXT: button 2 release 2731 * EXT: button 2 release
2911 */ 2732 */
2912void 2733void
2913rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2734rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2914{ 2735{
2915 if (selection.text && selnum == Sel_Primary) 2736 if (!selection_req)
2916 {
2917 /* internal selection */
2918 char *str = rxvt_wcstombs (selection.text, selection.len);
2919 paste (str, strlen (str));
2920 free (str);
2921 return;
2922 } 2737 {
2923 else 2738 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2739 selection_req->run ();
2924 { 2740 }
2925 selection_request_time = tm;
2926 selection_wait = Sel_normal;
2927
2928#if X_HAVE_UTF8_STRING
2929 selection_type = Sel_UTF8String;
2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2931 return;
2932#else
2933 selection_type = Sel_CompoundText;
2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2935 return;
2936#endif
2937 }
2938
2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
2941}
2942
2943int
2944rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2945{
2946 Atom sel;
2947
2948 selection_type |= selnum;
2949
2950 if (selnum == Sel_Primary)
2951 sel = XA_PRIMARY;
2952 else if (selnum == Sel_Secondary)
2953 sel = XA_SECONDARY;
2954 else
2955 sel = xa[XA_CLIPBOARD];
2956
2957 if (XGetSelectionOwner (dpy, sel) != None)
2958 {
2959 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2960 vt, selection_request_time);
2961 return 1;
2962 }
2963
2964 return 0;
2965} 2741}
2966 2742
2967/* ------------------------------------------------------------------------- */ 2743/* ------------------------------------------------------------------------- */
2968/* 2744/*
2969 * Clear all selected text 2745 * Clear all selected text
… …
3000 * EXT: button 1 or 3 release 2776 * EXT: button 1 or 3 release
3001 */ 2777 */
3002void 2778void
3003rxvt_term::selection_make (Time tm) 2779rxvt_term::selection_make (Time tm)
3004{ 2780{
3005 int i; 2781 int size;
3006 wchar_t *new_selection_text; 2782 wchar_t *new_selection_text;
3007 text_t *t; 2783 text_t *t;
3008 2784
3009 switch (selection.op) 2785 switch (selection.op)
3010 { 2786 {
… …
3026 return; /* nothing selected, go away */ 2802 return; /* nothing selected, go away */
3027 2803
3028 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2804 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3029 return; 2805 return;
3030 2806
3031 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2807 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2808 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3033 2809
3034 int ofs = 0; 2810 int ofs = 0;
3035 int extra = 0; 2811 int extra = 0;
3036 2812
3037 int col = selection.beg.col; 2813 int col = selection.beg.col;
… …
3043 { 2819 {
3044#if !ENABLE_MINIMAL 2820#if !ENABLE_MINIMAL
3045 if (selection.rect) 2821 if (selection.rect)
3046 { 2822 {
3047 col = selection.beg.col; 2823 col = selection.beg.col;
3048 end_col = ncol + 1; 2824 end_col = selection.end.col;
3049 } 2825 }
3050 else 2826 else
3051#endif 2827#endif
3052 end_col = ROW(row).l; 2828 end_col = ROW(row).l;
3053 2829
3054 col = max (col, 0); 2830 col = max (col, 0);
3055 2831
3056 if (row == selection.end.row 2832 if (row == selection.end.row)
3057#if !ENABLE_MINIMAL
3058 || selection.rect
3059#endif
3060 )
3061 min_it (end_col, selection.end.col); 2833 min_it (end_col, selection.end.col);
3062 2834
3063 t = ROW(row).t + col; 2835 t = ROW(row).t + col;
3064 2836
3065 for (; col < end_col; col++) 2837 for (; col < end_col; col++)
… …
3073 2845
3074 extra -= (len - 1); 2846 extra -= (len - 1);
3075 2847
3076 if (extra < 0) 2848 if (extra < 0)
3077 { 2849 {
3078 extra += i; 2850 extra += size;
3079 i += i; 2851 size += size;
3080 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2852 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3081 } 2853 }
3082 2854
3083 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2855 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084 } 2856 }
3085#endif 2857#endif
… …
3097 2869
3098 new_selection_text[ofs++] = C0_LF; 2870 new_selection_text[ofs++] = C0_LF;
3099 } 2871 }
3100 else 2872 else
3101#endif 2873#endif
3102 if (!ROW(row).is_longer () && row != selection.end.row) 2874 if (!ROW(row).is_longer ()
2875 && (row != selection.end.row || end_col != selection.end.col)
2876 && (row != selection.beg.row || selection.beg.col < ncol))
3103 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3104 } 2878 }
3105
3106 if (end_col != selection.end.col)
3107 new_selection_text[ofs++] = C0_LF;
3108 2879
3109 new_selection_text[ofs] = 0; 2880 new_selection_text[ofs] = 0;
3110 2881
3111 if (ofs == 0) 2882 if (ofs == 0)
3112 { 2883 {
… …
3168/* ------------------------------------------------------------------------- */ 2939/* ------------------------------------------------------------------------- */
3169/* 2940/*
3170 * 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
3171 * EXT: button 1 press 2942 * EXT: button 1 press
3172 */ 2943 */
3173void 2944void ecb_cold
3174rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3175{ 2946{
3176 clicks = ((clicks - 1) % 3) + 1; 2947 clicks = ((clicks - 1) % 3) + 1;
3177 selection.clicks = clicks; /* save clicks so extend will work */ 2948 selection.clicks = clicks; /* save clicks so extend will work */
3178 2949
… …
3197 2968
3198/* ------------------------------------------------------------------------- */ 2969/* ------------------------------------------------------------------------- */
3199/* 2970/*
3200 * Mark a selection at the specified col/row 2971 * Mark a selection at the specified col/row
3201 */ 2972 */
3202void 2973void ecb_cold
3203rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3204{ 2975{
3205 want_refresh = 1; 2976 want_refresh = 1;
3206 2977
3207 selection.mark.row = row + view_start; 2978 selection.mark.row = row + view_start;
… …
3230 * Word select: select text for 2 clicks 3001 * Word select: select text for 2 clicks
3231 * We now only find out the boundary in one direction 3002 * We now only find out the boundary in one direction
3232 */ 3003 */
3233 3004
3234/* 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 */
3235#define DELIMIT_TEXT(x) \ 3006#define DELIMIT_TEXT(x) \
3236 (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)))
3237#define DELIMIT_REND(x) 1 3008#define DELIMIT_REND(x) 1
3238 3009
3239void 3010void ecb_cold
3240rxvt_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
3241{ 3012{
3242 int col, row, dirnadd, tcol, trow, w1, w2; 3013 int col, row, dirnadd, tcol, trow, w1, w2;
3243 row_col_t bound; 3014 row_col_t bound;
3244 text_t *stp; 3015 text_t *stp;
… …
3318 * EXT: button 3 press; button 1 or 3 drag 3089 * EXT: button 3 press; button 1 or 3 drag
3319 * flag == 0 ==> button 1 3090 * flag == 0 ==> button 1
3320 * flag == 1 ==> button 3 press 3091 * flag == 1 ==> button 3 press
3321 * flag == 2 ==> button 3 motion 3092 * flag == 2 ==> button 3 motion
3322 */ 3093 */
3323void 3094void ecb_cold
3324rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3325{ 3096{
3326 int col = clamp (Pixel2Col (x), 0, ncol); 3097 int col = clamp (Pixel2Col (x), 0, ncol);
3327 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3098 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3328 3099
… …
3354 3125
3355/* ------------------------------------------------------------------------- */ 3126/* ------------------------------------------------------------------------- */
3356/* 3127/*
3357 * Extend the selection to the specified col/row 3128 * Extend the selection to the specified col/row
3358 */ 3129 */
3359void 3130void ecb_cold
3360rxvt_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
3361{ 3132{
3362 row_col_t pos; 3133 row_col_t pos;
3363 enum { 3134 enum {
3364 LEFT, RIGHT 3135 LEFT, RIGHT
3365 } closeto = RIGHT; 3136 } closeto = RIGHT;
3366
3367 want_refresh = 1;
3368 3137
3369 switch (selection.op) 3138 switch (selection.op)
3370 { 3139 {
3371 case SELECTION_INIT: 3140 case SELECTION_INIT:
3372 CLEAR_SELECTION (); 3141 CLEAR_SELECTION ();
… …
3552 3321
3553#if !ENABLE_MINIMAL 3322#if !ENABLE_MINIMAL
3554 if (selection.rect && selection.beg.col > selection.end.col) 3323 if (selection.rect && selection.beg.col > selection.end.col)
3555 ::swap (selection.beg.col, selection.end.col); 3324 ::swap (selection.beg.col, selection.end.col);
3556#endif 3325#endif
3326
3327 selection_changed ();
3557} 3328}
3558 3329
3559#if !ENABLE_MINIMAL 3330#if !ENABLE_MINIMAL
3560void 3331void ecb_cold
3561rxvt_term::selection_remove_trailing_spaces () NOTHROW 3332rxvt_term::selection_remove_trailing_spaces () NOTHROW
3562{ 3333{
3563 int32_t end_col, end_row; 3334 int32_t end_col, end_row;
3564 text_t *stp; 3335 text_t *stp;
3565 3336
… …
3603/* ------------------------------------------------------------------------- */ 3374/* ------------------------------------------------------------------------- */
3604/* 3375/*
3605 * Double click on button 3 when already selected 3376 * Double click on button 3 when already selected
3606 * EXT: button 3 double click 3377 * EXT: button 3 double click
3607 */ 3378 */
3608void 3379void ecb_cold
3609rxvt_term::selection_rotate (int x, int y) NOTHROW 3380rxvt_term::selection_rotate (int x, int y) NOTHROW
3610{ 3381{
3611 selection.clicks = selection.clicks % 3 + 1; 3382 selection.clicks = selection.clicks % 3 + 1;
3612 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3613} 3384}
… …
3615/* ------------------------------------------------------------------------- */ 3386/* ------------------------------------------------------------------------- */
3616/* 3387/*
3617 * Respond to a request for our current selection 3388 * Respond to a request for our current selection
3618 * EXT: SelectionRequest 3389 * EXT: SelectionRequest
3619 */ 3390 */
3620void 3391void ecb_cold
3621rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3622{ 3393{
3394 Atom property = rq.property == None ? rq.target : rq.property;
3623 XSelectionEvent ev; 3395 XSelectionEvent ev;
3624 3396
3625 ev.type = SelectionNotify; 3397 ev.type = SelectionNotify;
3626 ev.property = None; 3398 ev.property = None;
3627 ev.display = rq.display; 3399 ev.display = rq.display;
… …
3642 *target++ = xa[XA_COMPOUND_TEXT]; 3414 *target++ = xa[XA_COMPOUND_TEXT];
3643#if X_HAVE_UTF8_STRING 3415#if X_HAVE_UTF8_STRING
3644 *target++ = xa[XA_UTF8_STRING]; 3416 *target++ = xa[XA_UTF8_STRING];
3645#endif 3417#endif
3646 3418
3647 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3419 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3648 32, PropModeReplace, 3420 32, PropModeReplace,
3649 (unsigned char *)target_list, target - target_list); 3421 (unsigned char *)target_list, target - target_list);
3650 ev.property = rq.property; 3422 ev.property = property;
3651 } 3423 }
3652#if TODO // TODO 3424#if TODO // TODO
3653 else if (rq.target == xa[XA_MULTIPLE]) 3425 else if (rq.target == xa[XA_MULTIPLE])
3654 { 3426 {
3655 /* TODO: Handle MULTIPLE */ 3427 /* TODO: Handle MULTIPLE */
3656 } 3428 }
3657#endif 3429#endif
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3430 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3659 { 3431 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3432 XChangeProperty (dpy, rq.requestor, property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3433 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property; 3434 ev.property = property;
3663 } 3435 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 { 3437 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3439 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3668 ev.property = rq.property; 3440 ev.property = property;
3669 } 3441 }
3670 else if (rq.target == XA_STRING 3442 else if (rq.target == XA_STRING
3671 || rq.target == xa[XA_TEXT] 3443 || rq.target == xa[XA_TEXT]
3672 || rq.target == xa[XA_COMPOUND_TEXT] 3444 || rq.target == xa[XA_COMPOUND_TEXT]
3673 || rq.target == xa[XA_UTF8_STRING] 3445 || rq.target == xa[XA_UTF8_STRING]
… …
3744 ct.value = (unsigned char *)cl; 3516 ct.value = (unsigned char *)cl;
3745 ct.nitems = selectlen; 3517 ct.nitems = selectlen;
3746 ct.encoding = target; 3518 ct.encoding = target;
3747 } 3519 }
3748 3520
3749 XChangeProperty (dpy, rq.requestor, rq.property, 3521 XChangeProperty (dpy, rq.requestor, property,
3750 ct.encoding, 8, PropModeReplace, 3522 ct.encoding, 8, PropModeReplace,
3751 ct.value, (int)ct.nitems); 3523 ct.value, (int)ct.nitems);
3752 ev.property = rq.property; 3524 ev.property = property;
3753 3525
3754 if (freect) 3526 if (freect)
3755 XFree (ct.value); 3527 XFree (ct.value);
3756 } 3528 }
3757 3529
3758 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3759} 3531}
3760 3532
3761/* ------------------------------------------------------------------------- */ 3533/* ------------------------------------------------------------------------- */
3762#ifdef USE_XIM 3534#if USE_XIM
3763void 3535void ecb_cold
3764rxvt_term::im_set_position (XPoint &pos) NOTHROW 3536rxvt_term::im_set_position (XPoint &pos) NOTHROW
3765{ 3537{
3766 XWindowAttributes xwa; 3538 XWindowAttributes xwa;
3767 3539
3768 XGetWindowAttributes (dpy, vt, &xwa); 3540 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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