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.381 by sf-exg, Fri Apr 22 10:01:39 2011 UTC vs.
Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC

… …
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;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_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
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 281
273 for (int row = prev_nrow; row < nrow; row++) 282 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);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 286 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 305 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 307
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 309 {
304 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
305 311
306 plines++; 312 plines++;
307 llen += prev_ncol; 313 llen += prev_ncol;
… …
320 326
321 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
323 { 329 {
324 qline = row_buf + qrow; 330 qline = row_buf + qrow;
325 lalloc (*qline); 331 qline->alloc (); // redundant with next line
326 qline->l = ncol; 332 qline->l = ncol;
327 qline->is_longer (1); 333 qline->is_longer (1);
328 334
329 int qcol = 0; 335 int qcol = 0;
330 336
… …
345 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
346 // least. 352 // least.
347 if (prow == ocur.row) 353 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
349 355
350 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
351 357
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 359
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 382 {
377 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
378 384
379 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
380 { 386 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
383 389
384 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 394 }
387 395
388 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 398
393 term_start = 0; 399 term_start = 0;
394 } 400 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 401
400 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 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);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
406 417
407 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 426 tt_winch ();
416 427
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 429}
419 430
420/* ------------------------------------------------------------------------- */ 431void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
426{ 433{
427 if (row_buf) 434 free (chunk); chunk = 0; row_buf = 0;
428 { 435 free (tabs); tabs = 0;
429 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0;
431
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs);
438 tabs = 0;
439 }
440} 436}
441 437
442/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
443/* 439/*
444 * Hard/Soft reset 440 * Hard/Soft reset
445 */ 441 */
446void 442void ecb_cold
447rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
448{ 444{
449 scr_release (); 445 scr_release ();
446
450 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 448 rvideo_mode = false;
452 scr_soft_reset (); 449 scr_soft_reset ();
453 scr_reset (); 450 scr_reset ();
454 451
455 scr_clear (true); 452 scr_clear (true);
456 scr_refresh (); 453 scr_refresh ();
457} 454}
458 455
459void 456void ecb_cold
460rxvt_term::scr_soft_reset () 457rxvt_term::scr_soft_reset () NOTHROW
461{ 458{
462 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
464 scr_overlay_off (); 461 scr_overlay_off ();
465#endif 462#endif
… …
520 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
522} 519}
523 520
524void 521void
525rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
526{ 523{
527 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
528 return; 525 return;
529 526
530 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
549 return; 546 return;
550 547
551 want_refresh = 1; 548 want_refresh = 1;
552 view_start = 0; 549 view_start = 0;
553 550
554 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
555 557
556 current_screen = scrn; 558 current_screen = scrn;
557 559
558#if NSCREENS 560#if NSCREENS
559 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
… …
625/* 627/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 629 * count positive ==> scroll up
628 * count negative ==> scroll down 630 * count negative ==> scroll down
629 */ 631 */
630int 632int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 634{
633 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
634 return 0; 636 return 0;
635 637
… …
638 640
639 if (count > 0 641 if (count > 0
640 && row1 == 0 642 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 644 {
645 min_it (count, total_rows - (nrow - (row2 + 1)));
646
643 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 648
648 // sever bottommost line 649 // sever bottommost line
649 { 650 {
650 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
651 l.is_longer (0); 652 l.is_longer (0);
652 l.touch (); 653 l.touch ();
653 } 654 }
654 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
655 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 672 for (int i = count; i--; )
657 { 673 {
658 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
659 675
660 // optimize if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 677 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 679 {
664 scr_blank_line (l, 0, l.l, rstyle); 680 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 681 l.l = 0;
… …
667 } 683 }
668 else 684 else
669 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
670 } 686 }
671 687
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 688 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
686 { 691 {
687 selection.beg.row -= count; 692 selection.beg.row -= count;
688 selection.end.row -= count; 693 selection.end.row -= count;
689 selection.mark.row -= count; 694 selection.mark.row -= count;
690 695
691 if (selection.beg.row < top_row 696 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 697 }
699 698
700 // finally move the view window, if desired 699 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 701 && view_start != 0
… …
732 } 731 }
733 732
734 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
736 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
737 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
738 745
739 min_it (count, rows); 746 min_it (count, rows);
740 747
741 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 749
743 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
744 { 751 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 753
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 756 }
750 757
751 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
753 } 767 }
754 768
755 return count; 769 return count;
756} 770}
757 771
758/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
759/* 773/*
760 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
761 */ 775 */
762void 776void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 778{
765 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
766 return; 780 return;
767 781
768 unsigned char checksel; 782 bool checksel;
769 unicode_t c; 783 unicode_t c;
770 int ncol = this->ncol; 784 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
772 786
773 want_refresh = 1; 787 want_refresh = 1;
… …
799 813
800 while (str < strend) 814 while (str < strend)
801 { 815 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 816 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 817
804 if (expect_false (c < 0x20)) 818 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 819 if (c == C0_LF)
806 { 820 {
807 max_it (line->l, screen.cur.col); 821 max_it (line->l, screen.cur.col);
808 822
809 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
… …
828 { 842 {
829 scr_tab (1, true); 843 scr_tab (1, true);
830 continue; 844 continue;
831 } 845 }
832 846
833 if (expect_false ( 847 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 848 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 851 ))
838 { 852 {
… …
843 * should be a similar check. 857 * should be a similar check.
844 */ 858 */
845 CLEAR_SELECTION (); 859 CLEAR_SELECTION ();
846 } 860 }
847 861
848 if (expect_false (screen.flags & Screen_WrapNext)) 862 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 863 {
850 scr_do_wrap (); 864 scr_do_wrap ();
851 865
852 line->l = ncol; 866 line->l = ncol;
853 line->is_longer (1); 867 line->is_longer (1);
… …
855 row = screen.cur.row; 869 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 870 line = &ROW(row); /* _must_ refresh */
857 } 871 }
858 872
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 873 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 874 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 875 c = 0xfffd;
862 876
863 // rely on wcwidth to tell us the character width, do wcwidth before 877 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 878 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 879 // drawing characters below as they might be invalid in the current
866 // locale. 880 // locale.
867 int width = WCWIDTH (c); 881 int width = WCWIDTH (c);
868 882
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 883 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 884 {
871 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 886 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 888 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 901 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 902 width = 1; // vt100 line drawing characters are always single-width
889 } 903 }
890 } 904 }
891 905
892 if (expect_false (screen.flags & Screen_Insert)) 906 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 907 scr_insdel_chars (width, INSERT);
894 908
895 if (width != 0) 909 if (width != 0)
896 { 910 {
897#if !UNICODE_3 911#if !UNICODE_3
… …
905#endif 919#endif
906 920
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 921 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 922
909 // if the character doesn't fit into the remaining columns... 923 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 924 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 { 925 {
912 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
913 { 927 {
914 // ... artificially enlargen the previous one 928 // ... artificially enlargen the previous one
915 c = NOCHAR; 929 c = NOCHAR;
… …
922 936
923 // nuke the character at this position, if required 937 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop 938 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself, 939 // we never have to check for overwriting a wide char itself,
926 // only its tail. 940 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 941 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col); 942 scr_kill_char (*line, screen.cur.col);
929 943
930 line->touch (); 944 line->touch ();
931 945
932 do 946 do
933 { 947 {
934 line->t[screen.cur.col] = c; 948 line->t[screen.cur.col] = c;
935 line->r[screen.cur.col] = rend; 949 line->r[screen.cur.col] = rend;
936 950
937 if (expect_true (screen.cur.col < ncol - 1)) 951 if (ecb_likely (screen.cur.col < ncol - 1))
938 screen.cur.col++; 952 screen.cur.col++;
939 else 953 else
940 { 954 {
941 line->l = ncol; 955 line->l = ncol;
942 if (screen.flags & Screen_Autowrap) 956 if (screen.flags & Screen_Autowrap)
… …
945 goto end_of_line; 959 goto end_of_line;
946 } 960 }
947 961
948 c = NOCHAR; 962 c = NOCHAR;
949 } 963 }
950 while (expect_false (--width > 0)); 964 while (ecb_unlikely (--width > 0));
951 965
952 // pad with spaces when overwriting wide character with smaller one 966 // pad with spaces when overwriting wide character with smaller one
953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 967 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954 { 968 {
955 line->t[c] = ' '; 969 line->t[c] = ' ';
956 line->r[c] = rend; 970 line->r[c] = rend;
957 } 971 }
958 972
… …
1117 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1120 */ 1134 */
1121#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1122void 1136void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1124{ 1138{
1125 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1141 else
… …
1134 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1137 */ 1151 */
1138#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1139void 1153void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1141{ 1155{
1142 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1158 else
… …
1295 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1296} 1310}
1297 1311
1298/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1299/* 1313/*
1300 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1318 */
1305void 1319void
… …
1314 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1315 1329
1316 switch (mode) 1330 switch (mode)
1317 { 1331 {
1318 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1333 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1335 num = nrow - row;
1323 break; 1336 break;
1324 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1338 scr_erase_line (1);
1327 row = 0; 1339 row = 0;
1328 num = screen.cur.row; 1340 num = screen.cur.row;
1329 break; 1341 break;
1330 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1343 row = 0;
1333 num = nrow; 1344 num = nrow;
1334 break; 1345 break;
1335 default: 1346 default:
1336 return; 1347 return;
… …
1353 { 1364 {
1354 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1355 1366
1356 if (mapped) 1367 if (mapped)
1357 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1360 } 1371 }
1361 else 1372 else
1362 { 1373 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1377 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1381 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1382 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1386 }
1376 } 1387 }
… …
1398/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1399/* 1410/*
1400 * Fill the screen with `E's 1411 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1413 */
1403void 1414void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1405{ 1416{
1406 rend_t fs; 1417 rend_t fs;
1407 1418
1408 want_refresh = 1; 1419 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1410 1421
1411 num_scr_allow = 0; 1422 num_scr_allow = 0;
1412 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1413 1428
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1416 { 1431 {
1417 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1569/* 1584/*
1570 * Set the scrolling region 1585 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1587 */
1573void 1588void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1590{
1576 max_it (top, 0); 1591 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1578 1593
… …
1588/* 1603/*
1589 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1607 */
1593void 1608void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1610{
1596 want_refresh = 1; 1611 want_refresh = 1;
1597 1612
1598 if (mode) 1613 if (mode)
… …
1605/* 1620/*
1606 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1624 */
1610void 1625void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1627{
1613 if (mode) 1628 if (mode)
1614 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1615 else 1630 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1643 */
1629void 1644void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1646{
1632 if (mode) 1647 if (mode)
1633 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1634 else 1649 else
… …
1641/* 1656/*
1642 * Set insert/replace mode 1657 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1660 */
1646void 1661void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1663{
1649 if (mode) 1664 if (mode)
1650 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1651 else 1666 else
… …
1657 * Set/Unset tabs 1672 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1676 */
1662void 1677void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1679{
1665 if (mode < 0) 1680 if (mode < 0)
1666 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1706/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1707/* 1722/*
1708 * Report current cursor position 1723 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1725 */
1711void 1726void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1713{ 1728{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1730}
1716 1731
… …
1719 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1720 1735
1721/* 1736/*
1722 * Set font style 1737 * Set font style
1723 */ 1738 */
1724void 1739void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1726{ 1741{
1727#if 0 1742#if 0
1728 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1729 { 1744 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1770 */
1756void 1771void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1773{
1759 screen.charset = set; 1774 screen.charset = set;
1760 set_font_style (); 1775 set_font_style ();
1761} 1776}
… …
1782 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1783 1798
1784/* 1799/*
1785 * refresh matching text. 1800 * refresh matching text.
1786 */ 1801 */
1787bool 1802bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1804{
1790 bool found = false; 1805 bool found = false;
1791 1806
1792 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1826 PART_BEG = 0,
1812 PART_END, 1827 PART_END,
1813 RC_COUNT 1828 RC_COUNT
1814}; 1829};
1815 1830
1816void 1831void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1833{
1819 int i; 1834 int i;
1820 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1821 1836
… …
1858 * Refresh the entire screen 1873 * Refresh the entire screen
1859 */ 1874 */
1860void 1875void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1877{
1863 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1879}
1865 1880
1866/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1867/* 1882/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1963#endif
1949} 1964}
1950 1965
1951/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1967void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1969{
1956#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1957 int nrows, row_start; 1971 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
2007/* 2021/*
2008 * Refresh the screen 2022 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2025 */
2012void 2026void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2014{ 2028{
2015 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2031 int i; /* tmp */
… …
2031 * A: set up vars 2045 * A: set up vars
2032 */ 2046 */
2033 refresh_count = 0; 2047 refresh_count = 0;
2034 2048
2035 unsigned int old_screen_flags = screen.flags; 2049 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2050 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2038 have_bg = bg_pixmap != None; 2052 have_bg = bg_pixmap != None;
2039#endif 2053#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2055
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2062#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2063 scr_swap_overlay ();
2050#endif 2064#endif
2051 2065
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2067
2054 /* 2068 /*
2055 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2056 */ 2070 */
2057 { 2071 {
2058 unsigned char setoldcursor; 2072 bool setoldcursor;
2059 2073
2060#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2075 if (hidden_cursor)
2062 showcursor = 0; 2076 showcursor = 0;
2063#endif 2077#endif
… …
2150 { 2164 {
2151 int16_t nits; 2165 int16_t nits;
2152 int i = num_scr; 2166 int i = num_scr;
2153 int j; 2167 int j;
2154 int len, wlen; 2168 int len, wlen;
2155 dLocal (int, num_scr);
2156 2169
2157 j = nrow; 2170 j = nrow;
2158 wlen = len = -1; 2171 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2160 2173
… …
2235 continue; 2248 continue;
2236 2249
2237 // redraw one or more characters 2250 // redraw one or more characters
2238 2251
2239 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2253 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2254 --col;
2242 2255
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2256 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2257 text_t *text = stp + col;
2245 int count = 1; 2258 int count = 1;
… …
2283 2296
2284 col--; /* went one too far. move back */ 2297 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2298 count -= i; /* dump any matching trailing chars */
2286 2299
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2300 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2301 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2302 count++, i--;
2290 2303
2291 /* 2304 /*
2292 * Determine the attributes for the string 2305 * Determine the attributes for the string
2293 */ 2306 */
2294 int fore = fgcolor_of (rend); // desired foreground 2307 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2308 int back = bgcolor_of (rend); // desired background
2296 2309
2297 // only do special processing if any attributes are set, which is unlikely 2310 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2311 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2312 {
2300 bool invert = rend & RS_RVid; 2313 bool invert = rend & RS_RVid;
2301 2314
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2405 /*
2393 * Actually do the drawing of the string here 2406 * Actually do the drawing of the string here
2394 */ 2407 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2408 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2409
2397 if (expect_true (have_bg && back == Color_bg)) 2410 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2411 {
2399 // this is very ugly, maybe push it into ->draw? 2412 // this is very ugly, maybe push it into ->draw?
2400 2413
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2414 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2415 if (text[i] != ' ')
… …
2409 did_clear: ; 2422 did_clear: ;
2410 } 2423 }
2411 else 2424 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2426
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 2428 {
2416#if ENABLE_FRILLS 2429#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2430 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2431 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2432 else
… …
2465 2478
2466 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2480 Col2Pixel (col),
2468 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2484 }
2472 } 2485 }
2473 2486
2474 /* 2487 /*
2475 * H: cleanup selection 2488 * H: cleanup selection
… …
2484 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2485 num_scr = 0; 2498 num_scr = 0;
2486 num_scr_allow = 1; 2499 num_scr_allow = 1;
2487} 2500}
2488 2501
2489void 2502void ecb_cold
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2504{
2492 if (!l.t) 2505 if (!l.valid ())
2493 return; 2506 return;
2494 2507
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2509
2497 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2498 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]));
2499} 2512}
2500 2513
2501void 2514void ecb_cold
2502rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2503{ 2516{
2504 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2505 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2506 2519
… …
2509 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2510 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2511 } 2524 }
2512} 2525}
2513 2526
2514void 2527void ecb_cold
2515rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2529{
2517 bool transparent = false; 2530 bool transparent = false;
2518 2531
2519#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
… …
2547 { 2560 {
2548 if (transparent) 2561 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else 2563 else
2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2552 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2553 scrollBar.show (0); 2566 scrollBar.show (0);
2554 } 2567 }
2555 2568
2556 if (refresh) 2569 if (refresh)
2557 { 2570 {
… …
2622 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2623 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2624} 2637}
2625 2638
2626/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2627void 2640void ecb_hot
2628rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2629{ 2642{
2630 if (selection.op 2643 if (selection.op
2631 && current_screen == selection.screen 2644 && current_screen == selection.screen
2632 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2651 */ 2664 */
2652#if 0 2665#if 0
2653void 2666void
2654rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2655{ 2668{
2656 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2657 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2658 const char r1[] = "\n";
2659
2660 for (row = saveLines + top_row;
2661 row < saveLines + nrow - 1; row++)
2662 {
2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2664 : ncol;
2665 for (towrite = width; towrite; towrite -= wrote)
2666 {
2667 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2668 towrite);
2669 if (wrote < 0)
2670 return; /* XXX: death, no report */
2671 }
2672 if (row_buf[row].l >= 0)
2673 if (write (fd, r1, 1) <= 0)
2674 return; /* XXX: death, no report */
2675 }
2676} 2671}
2677#endif 2672#endif
2678 2673
2679/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2680 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2681 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2682void 2677void
2683rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2684{ 2679{
2685 row_col_t pos;
2686
2687 if (!selection.op) 2680 if (!selection.op)
2688 return; 2681 return;
2689 2682
2690 pos.row = pos.col = 0;
2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2694 || (check_more == 1 2686 || (check_more == 1
2695 && current_screen == selection.screen 2687 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698 || (check_more == 2
2699 && ROWCOL_IS_BEFORE (selection.beg, pos)
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 3
2702 && ROWCOL_IS_AFTER (selection.end, pos))
2703 || (check_more == 4 /* screen width change */
2704 && (selection.beg.row != selection.end.row
2705 || selection.end.col > ncol)))
2706 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2707} 2691}
2708 2692
2709/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2710/* 2694/*
2711 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
… …
2717 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2718 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2719 data[i] = C0_CR; 2703 data[i] = C0_CR;
2720 2704
2721 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2723 2707
2724 tt_write (data, len); 2708 tt_write (data, len);
2725 2709
2726 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2728} 2712}
2729 2713
2730void 2714void
2731rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2732{ 2716{
… …
2736 tt_paste (data, len); 2720 tt_paste (data, len);
2737} 2721}
2738 2722
2739/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2740/* 2724/*
2741 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2742 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2743 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * as fallback
2744 * > CUT_BUFFER0
2745 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2746 * will auto fallback to CUT_BUFFER0
2747 * EXT: button 2 release 2728 * EXT: button 2 release
2748 */ 2729 */
2749void 2730void
2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2751{ 2732{
… …
2955/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2956/* 2937/*
2957 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2958 * EXT: button 1 press 2939 * EXT: button 1 press
2959 */ 2940 */
2960void 2941void ecb_cold
2961rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2962{ 2943{
2963 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2964 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2965 2946
… …
2984 2965
2985/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2986/* 2967/*
2987 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2988 */ 2969 */
2989void 2970void ecb_cold
2990rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2991{ 2972{
2992 want_refresh = 1; 2973 want_refresh = 1;
2993 2974
2994 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3021/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3022#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3024#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3025 3006
3026void 3007void ecb_cold
3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3028{ 3009{
3029 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3030 row_col_t bound; 3011 row_col_t bound;
3031 text_t *stp; 3012 text_t *stp;
… …
3105 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3106 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3107 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3108 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3109 */ 3090 */
3110void 3091void ecb_cold
3111rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3112{ 3093{
3113 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3114 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3115 3096
… …
3141 3122
3142/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3143/* 3124/*
3144 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3145 */ 3126 */
3146void 3127void ecb_cold
3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3148{ 3129{
3149 row_col_t pos; 3130 row_col_t pos;
3150 enum { 3131 enum {
3151 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3342 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3343#endif 3324#endif
3344} 3325}
3345 3326
3346#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3347void 3328void ecb_cold
3348rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3349{ 3330{
3350 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3351 text_t *stp; 3332 text_t *stp;
3352 3333
… …
3390/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3391/* 3372/*
3392 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3393 * EXT: button 3 double click 3374 * EXT: button 3 double click
3394 */ 3375 */
3395void 3376void ecb_cold
3396rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3397{ 3378{
3398 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3400} 3381}
… …
3402/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3403/* 3384/*
3404 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3405 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3406 */ 3387 */
3407void 3388void ecb_cold
3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3409{ 3390{
3410 Atom property = rq.property == None ? rq.target : rq.property; 3391 Atom property = rq.property == None ? rq.target : rq.property;
3411 XSelectionEvent ev; 3392 XSelectionEvent ev;
3412 3393
… …
3546 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3547} 3528}
3548 3529
3549/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3550#ifdef USE_XIM 3531#ifdef USE_XIM
3551void 3532void ecb_cold
3552rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3553{ 3534{
3554 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3555 3536
3556 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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