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.383 by sf-exg, Fri Apr 29 13:08:24 2011 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 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 = chunk_alloc (chunk_size, 0);
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 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 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 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
245 { 273 {
246 /* 274 /*
247 * add or delete rows as appropriate 275 * add or delete rows as appropriate
248 */ 276 */
249 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
268 { 279 {
269 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 282
273 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
274 { 290 }
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 291
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
285 295
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 304
295 do 305 do
296 { 306 {
297 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 309 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 311
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 313 {
304 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
305 315
306 plines++; 316 plines++;
307 llen += prev_ncol; 317 llen += prev_ncol;
… …
320 330
321 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
323 { 333 {
324 qline = row_buf + qrow; 334 qline = row_buf + qrow;
325 lalloc (*qline); 335 qline->alloc (); // redundant with next line
326 qline->l = ncol; 336 qline->l = ncol;
327 qline->is_longer (1); 337 qline->is_longer (1);
328 338
329 int qcol = 0; 339 int qcol = 0;
330 340
… …
345 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
346 // least. 356 // least.
347 if (prow == ocur.row) 357 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
349 359
350 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
351 361
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 363
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 386 {
377 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
378 388
379 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
380 { 390 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
383 393
384 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
386 } 399 }
387 400
388 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 403
393 term_start = 0; 404 term_start = 0;
394 } 405 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 406
400 clamp_it (screen.cur.row, 0, nrow - 1); 407 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 408 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 409 }
403 410
411 for (int row = nrow; row--; )
412 {
413 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
414 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
415 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
416 }
417
418 chunk_free (prev_chunk, prev_chunk_size);
419
404 free (tabs); 420 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 421 tabs = (char *)rxvt_malloc (ncol);
406 422
407 for (int col = ncol; col--; ) 423 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 424 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 431 tt_winch ();
416 432
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 433 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 434}
419 435
420/* ------------------------------------------------------------------------- */ 436void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 437rxvt_term::scr_release () NOTHROW
426{ 438{
427 if (row_buf) 439 chunk_free (chunk, chunk_size);
428 { 440 chunk = 0;
429 delete talloc; talloc = 0; 441 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 442
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); 443 free (tabs);
438 tabs = 0; 444 tabs = 0;
439 }
440} 445}
441 446
442/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
443/* 448/*
444 * Hard/Soft reset 449 * Hard/Soft reset
445 */ 450 */
446void 451void ecb_cold
447rxvt_term::scr_poweron () 452rxvt_term::scr_poweron ()
448{ 453{
449 scr_release (); 454 scr_release ();
455
450 prev_nrow = prev_ncol = 0; 456 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 457 rvideo_mode = false;
452 scr_soft_reset (); 458 scr_soft_reset ();
453 scr_reset (); 459 scr_reset ();
454 460
455 scr_clear (true); 461 scr_clear (true);
456 scr_refresh (); 462 scr_refresh ();
457} 463}
458 464
459void 465void ecb_cold
460rxvt_term::scr_soft_reset () 466rxvt_term::scr_soft_reset () NOTHROW
461{ 467{
462 /* only affects modes, nothing drastic such as clearing the screen */ 468 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 469#if ENABLE_OVERLAY
464 scr_overlay_off (); 470 scr_overlay_off ();
465#endif 471#endif
… …
520 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
522} 528}
523 529
524void 530void
525rxvt_term::scr_swap_screen () 531rxvt_term::scr_swap_screen () NOTHROW
526{ 532{
527 if (!option (Opt_secondaryScreen)) 533 if (!option (Opt_secondaryScreen))
528 return; 534 return;
529 535
530 for (int i = prev_nrow; i--; ) 536 for (int i = prev_nrow; i--; )
… …
549 return; 555 return;
550 556
551 want_refresh = 1; 557 want_refresh = 1;
552 view_start = 0; 558 view_start = 0;
553 559
554 selection_check (2); /* check for boundary cross */ 560 /* check for boundary cross */
561 row_col_t pos;
562 pos.row = pos.col = 0;
563 if (ROWCOL_IS_BEFORE (selection.beg, pos)
564 && ROWCOL_IS_AFTER (selection.end, pos))
565 CLEAR_SELECTION ();
555 566
556 current_screen = scrn; 567 current_screen = scrn;
557 568
558#if NSCREENS 569#if NSCREENS
559 if (option (Opt_secondaryScreen)) 570 if (option (Opt_secondaryScreen))
… …
625/* 636/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 637 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 638 * count positive ==> scroll up
628 * count negative ==> scroll down 639 * count negative ==> scroll down
629 */ 640 */
630int 641int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 643{
633 if (count == 0 || (row1 > row2)) 644 if (count == 0 || (row1 > row2))
634 return 0; 645 return 0;
635 646
… …
638 649
639 if (count > 0 650 if (count > 0
640 && row1 == 0 651 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 652 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 653 {
654 min_it (count, total_rows - (nrow - (row2 + 1)));
655
643 top_row = max (top_row - count, -saveLines); 656 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 657
648 // sever bottommost line 658 // sever bottommost line
649 { 659 {
650 line_t &l = ROW(row2 - count); 660 line_t &l = ROW(row2);
651 l.is_longer (0); 661 l.is_longer (0);
652 l.touch (); 662 l.touch ();
653 } 663 }
654 664
665 // scroll everything up 'count' lines
666 term_start = (term_start + count) % total_rows;
667
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
655 // erase newly scrolled-in lines 680 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 681 for (int i = count; i--; )
657 { 682 {
658 line_t &l = ROW(nrow - 1 - i); 683 line_t &l = ROW(row2 - i);
659 684
660 // optimize if already cleared, can be significant on slow machines 685 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 686 // 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))) 687 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 688 {
664 scr_blank_line (l, 0, l.l, rstyle); 689 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 690 l.l = 0;
… …
667 } 692 }
668 else 693 else
669 scr_blank_screen_mem (l, rstyle); 694 scr_blank_screen_mem (l, rstyle);
670 } 695 }
671 696
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 697 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 698 if (selection.op && current_screen == selection.screen
699 && selection.beg.row <= row2)
686 { 700 {
687 selection.beg.row -= count; 701 selection.beg.row -= count;
688 selection.end.row -= count; 702 selection.end.row -= count;
689 selection.mark.row -= count; 703 selection.mark.row -= count;
690 704
691 if (selection.beg.row < top_row 705 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 } 706 }
699 707
700 // finally move the view window, if desired 708 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 709 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 710 && view_start != 0
… …
732 } 740 }
733 741
734 // use a simple and robust scrolling algorithm, this 742 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 743 // part of scr_scroll_text is not time-critical.
736 744
745 // sever line above scroll region
746 if (row1)
747 {
748 line_t &l = ROW(row1 - 1);
749 l.is_longer (0);
750 l.touch ();
751 }
752
737 int rows = row2 - row1 + 1; 753 int rows = row2 - row1 + 1;
738 754
739 min_it (count, rows); 755 min_it (count, rows);
740 756
741 line_t *temp_buf = row_buf + total_rows; 757 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 758
743 for (int row = 0; row < rows; row++) 759 for (int row = 0; row < rows; row++)
744 { 760 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 761 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 762
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 764 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 765 }
750 766
751 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 768 ROW(row1 + row) = temp_buf [row];
769
770 // sever bottommost line
771 {
772 line_t &l = ROW(row2);
773 l.is_longer (0);
774 l.touch ();
775 }
753 } 776 }
754 777
755 return count; 778 return count;
756} 779}
757 780
758/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
759/* 782/*
760 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
761 */ 784 */
762void 785void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 787{
765 if (len <= 0) /* sanity */ 788 if (len <= 0) /* sanity */
766 return; 789 return;
767 790
768 unsigned char checksel; 791 bool checksel;
769 unicode_t c; 792 unicode_t c;
770 int ncol = this->ncol; 793 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 794 const wchar_t *strend = str + len;
772 795
773 want_refresh = 1; 796 want_refresh = 1;
… …
799 822
800 while (str < strend) 823 while (str < strend)
801 { 824 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 825 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 826
804 if (expect_false (c < 0x20)) 827 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 828 if (c == C0_LF)
806 { 829 {
807 max_it (line->l, screen.cur.col); 830 max_it (line->l, screen.cur.col);
808 831
809 screen.flags &= ~Screen_WrapNext; 832 screen.flags &= ~Screen_WrapNext;
… …
828 { 851 {
829 scr_tab (1, true); 852 scr_tab (1, true);
830 continue; 853 continue;
831 } 854 }
832 855
833 if (expect_false ( 856 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 857 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 860 ))
838 { 861 {
… …
843 * should be a similar check. 866 * should be a similar check.
844 */ 867 */
845 CLEAR_SELECTION (); 868 CLEAR_SELECTION ();
846 } 869 }
847 870
848 if (expect_false (screen.flags & Screen_WrapNext)) 871 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 872 {
850 scr_do_wrap (); 873 scr_do_wrap ();
851 874
852 line->l = ncol; 875 line->l = ncol;
853 line->is_longer (1); 876 line->is_longer (1);
… …
855 row = screen.cur.row; 878 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 879 line = &ROW(row); /* _must_ refresh */
857 } 880 }
858 881
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 882 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 883 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 884 c = 0xfffd;
862 885
863 // rely on wcwidth to tell us the character width, do wcwidth before 886 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 887 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 888 // drawing characters below as they might be invalid in the current
866 // locale. 889 // locale.
867 int width = WCWIDTH (c); 890 int width = WCWIDTH (c);
868 891
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 892 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 893 {
871 // vt100 special graphics and line drawing 894 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 895 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 896 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 897 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 910 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 911 width = 1; // vt100 line drawing characters are always single-width
889 } 912 }
890 } 913 }
891 914
892 if (expect_false (screen.flags & Screen_Insert)) 915 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 916 scr_insdel_chars (width, INSERT);
894 917
895 if (width != 0) 918 if (width != 0)
896 { 919 {
897#if !UNICODE_3 920#if !UNICODE_3
… …
905#endif 928#endif
906 929
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 931
909 // if the character doesn't fit into the remaining columns... 932 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 933 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 { 934 {
912 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
913 { 936 {
914 // ... artificially enlargen the previous one 937 // ... artificially enlargen the previous one
915 c = NOCHAR; 938 c = NOCHAR;
… …
922 945
923 // nuke the character at this position, if required 946 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop 947 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself, 948 // we never have to check for overwriting a wide char itself,
926 // only its tail. 949 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 950 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col); 951 scr_kill_char (*line, screen.cur.col);
929 952
930 line->touch (); 953 line->touch ();
931 954
932 do 955 do
933 { 956 {
934 line->t[screen.cur.col] = c; 957 line->t[screen.cur.col] = c;
935 line->r[screen.cur.col] = rend; 958 line->r[screen.cur.col] = rend;
936 959
937 if (expect_true (screen.cur.col < ncol - 1)) 960 if (ecb_likely (screen.cur.col < ncol - 1))
938 screen.cur.col++; 961 screen.cur.col++;
939 else 962 else
940 { 963 {
941 line->l = ncol; 964 line->l = ncol;
942 if (screen.flags & Screen_Autowrap) 965 if (screen.flags & Screen_Autowrap)
… …
945 goto end_of_line; 968 goto end_of_line;
946 } 969 }
947 970
948 c = NOCHAR; 971 c = NOCHAR;
949 } 972 }
950 while (expect_false (--width > 0)); 973 while (ecb_unlikely (--width > 0));
951 974
952 // pad with spaces when overwriting wide character with smaller one 975 // 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++) 976 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954 { 977 {
955 line->t[c] = ' '; 978 line->t[c] = ' ';
956 line->r[c] = rend; 979 line->r[c] = rend;
957 } 980 }
958 981
… …
1117 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1120 */ 1143 */
1121#if !ENABLE_MINIMAL 1144#if !ENABLE_MINIMAL
1122void 1145void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1146rxvt_term::scr_backindex () NOTHROW
1124{ 1147{
1125 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1150 else
… …
1134 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1158 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1137 */ 1160 */
1138#if !ENABLE_MINIMAL 1161#if !ENABLE_MINIMAL
1139void 1162void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1163rxvt_term::scr_forwardindex () NOTHROW
1141{ 1164{
1142 if (screen.cur.col < ncol - 1) 1165 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1167 else
… …
1295 scr_blank_line (line, col, num, rstyle); 1318 scr_blank_line (line, col, num, rstyle);
1296} 1319}
1297 1320
1298/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1299/* 1322/*
1300 * Erase part of whole of the screen 1323 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1327 */
1305void 1328void
… …
1314 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1315 1338
1316 switch (mode) 1339 switch (mode)
1317 { 1340 {
1318 case 0: /* erase to end of screen */ 1341 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1342 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1343 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1344 num = nrow - row;
1323 break; 1345 break;
1324 case 1: /* erase to beginning of screen */ 1346 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1347 scr_erase_line (1);
1327 row = 0; 1348 row = 0;
1328 num = screen.cur.row; 1349 num = screen.cur.row;
1329 break; 1350 break;
1330 case 2: /* erase whole screen */ 1351 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1352 row = 0;
1333 num = nrow; 1353 num = nrow;
1334 break; 1354 break;
1335 default: 1355 default:
1336 return; 1356 return;
… …
1353 { 1373 {
1354 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1355 1375
1356 if (mapped) 1376 if (mapped)
1357 XClearArea (dpy, vt, 0, 1377 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1378 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1379 (unsigned int)Height2Pixel (num), False);
1360 } 1380 }
1361 else 1381 else
1362 { 1382 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1383 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1386 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1387 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1389 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1390 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1391 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1392 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1395 }
1376 } 1396 }
… …
1398/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1399/* 1419/*
1400 * Fill the screen with `E's 1420 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1422 */
1403void 1423void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1424rxvt_term::scr_E () NOTHROW
1405{ 1425{
1406 rend_t fs; 1426 rend_t fs;
1407 1427
1408 want_refresh = 1; 1428 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1410 1430
1411 num_scr_allow = 0; 1431 num_scr_allow = 0;
1412 selection_check (3); 1432
1433 row_col_t pos;
1434 pos.row = pos.col = 0;
1435 if (ROWCOL_IS_AFTER (selection.end, pos))
1436 CLEAR_SELECTION ();
1413 1437
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1438 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1439 for (int row = nrow; row--; )
1416 { 1440 {
1417 line_t &line = ROW(row); 1441 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1592/* ------------------------------------------------------------------------- */
1569/* 1593/*
1570 * Set the scrolling region 1594 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1596 */
1573void 1597void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1599{
1576 max_it (top, 0); 1600 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1601 min_it (bot, nrow - 1);
1578 1602
… …
1588/* 1612/*
1589 * Make the cursor visible/invisible 1613 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1616 */
1593void 1617void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1618rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1619{
1596 want_refresh = 1; 1620 want_refresh = 1;
1597 1621
1598 if (mode) 1622 if (mode)
… …
1605/* 1629/*
1606 * Set/unset automatic wrapping 1630 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1633 */
1610void 1634void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1635rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1636{
1613 if (mode) 1637 if (mode)
1614 screen.flags |= Screen_Autowrap; 1638 screen.flags |= Screen_Autowrap;
1615 else 1639 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1648 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1649 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1652 */
1629void 1653void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1654rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1655{
1632 if (mode) 1656 if (mode)
1633 screen.flags |= Screen_Relative; 1657 screen.flags |= Screen_Relative;
1634 else 1658 else
… …
1641/* 1665/*
1642 * Set insert/replace mode 1666 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1669 */
1646void 1670void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1671rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1672{
1649 if (mode) 1673 if (mode)
1650 screen.flags |= Screen_Insert; 1674 screen.flags |= Screen_Insert;
1651 else 1675 else
… …
1657 * Set/Unset tabs 1681 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1682 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1685 */
1662void 1686void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1687rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1688{
1665 if (mode < 0) 1689 if (mode < 0)
1666 memset (tabs, 0, ncol); 1690 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1691 else if (screen.cur.col < ncol)
… …
1686 if (rvideo_state != on) 1710 if (rvideo_state != on)
1687 { 1711 {
1688 rvideo_state = on; 1712 rvideo_state = on;
1689 1713
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1692 if (bg_pixmap == None) 1716 if (bg_img == 0)
1693#endif 1717#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1719
1696 XGCValues gcvalue; 1720 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1721 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1730/* ------------------------------------------------------------------------- */
1707/* 1731/*
1708 * Report current cursor position 1732 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1733 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1734 */
1711void 1735void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1736rxvt_term::scr_report_position () NOTHROW
1713{ 1737{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1739}
1716 1740
… …
1719 * ------------------------------------------------------------------------- */ 1743 * ------------------------------------------------------------------------- */
1720 1744
1721/* 1745/*
1722 * Set font style 1746 * Set font style
1723 */ 1747 */
1724void 1748void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1749rxvt_term::set_font_style () NOTHROW
1726{ 1750{
1727#if 0 1751#if 0
1728 switch (charsets [screen.charset]) 1752 switch (charsets [screen.charset])
1729 { 1753 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1775 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1777 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1778 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1779 */
1756void 1780void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1781rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1782{
1759 screen.charset = set; 1783 screen.charset = set;
1760 set_font_style (); 1784 set_font_style ();
1761} 1785}
… …
1782 * ------------------------------------------------------------------------- */ 1806 * ------------------------------------------------------------------------- */
1783 1807
1784/* 1808/*
1785 * refresh matching text. 1809 * refresh matching text.
1786 */ 1810 */
1787bool 1811bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1813{
1790 bool found = false; 1814 bool found = false;
1791 1815
1792 for (int i = 0; i < nrow; i++) 1816 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1835 PART_BEG = 0,
1812 PART_END, 1836 PART_END,
1813 RC_COUNT 1837 RC_COUNT
1814}; 1838};
1815 1839
1816void 1840void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1842{
1819 int i; 1843 int i;
1820 row_col_t rc[RC_COUNT]; 1844 row_col_t rc[RC_COUNT];
1821 1845
… …
1858 * Refresh the entire screen 1882 * Refresh the entire screen
1859 */ 1883 */
1860void 1884void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1885rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1886{
1863 scr_expose (0, 0, width, height, refresh); 1887 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1888}
1865 1889
1866/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1867/* 1891/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1892 * Move the display so that the line represented by scrollbar value Y is at
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1972#endif
1949} 1973}
1950 1974
1951/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1952void 1976void ecb_cold
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1978{
1955#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1956 int nrows, row_start; 1980 int nrows, row_start;
1957 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
2006/* 2030/*
2007 * Refresh the screen 2031 * Refresh the screen
2008 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
2009 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
2010 */ 2034 */
2011void 2035void ecb_hot
2012rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
2013{ 2037{
2014 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2040 int i; /* tmp */
… …
2030 * A: set up vars 2054 * A: set up vars
2031 */ 2055 */
2032 refresh_count = 0; 2056 refresh_count = 0;
2033 2057
2034 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2059 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2037 have_bg = bg_pixmap != None; 2061 have_bg = bg_img != 0;
2038#endif 2062#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2064
2041 /* 2065 /*
2042 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2072 scr_swap_overlay ();
2049#endif 2073#endif
2050 2074
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2076
2053 /* 2077 /*
2054 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2055 */ 2079 */
2056 { 2080 {
2057 unsigned char setoldcursor; 2081 bool setoldcursor;
2058 2082
2059#ifdef CURSOR_BLINK 2083#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2084 if (hidden_cursor)
2061 showcursor = 0; 2085 showcursor = 0;
2062#endif 2086#endif
… …
2149 { 2173 {
2150 int16_t nits; 2174 int16_t nits;
2151 int i = num_scr; 2175 int i = num_scr;
2152 int j; 2176 int j;
2153 int len, wlen; 2177 int len, wlen;
2154 dLocal (int, num_scr);
2155 2178
2156 j = nrow; 2179 j = nrow;
2157 wlen = len = -1; 2180 wlen = len = -1;
2158 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2159 2182
… …
2234 continue; 2257 continue;
2235 2258
2236 // redraw one or more characters 2259 // redraw one or more characters
2237 2260
2238 // seek to the beginning of wide characters 2261 // seek to the beginning of wide characters
2239 while (expect_false (stp[col] == NOCHAR && col > 0)) 2262 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2240 --col; 2263 --col;
2241 2264
2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2265 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2243 text_t *text = stp + col; 2266 text_t *text = stp + col;
2244 int count = 1; 2267 int count = 1;
… …
2282 2305
2283 col--; /* went one too far. move back */ 2306 col--; /* went one too far. move back */
2284 count -= i; /* dump any matching trailing chars */ 2307 count -= i; /* dump any matching trailing chars */
2285 2308
2286 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (expect_false (i && text[count] == NOCHAR)) 2310 while (ecb_unlikely (i && text[count] == NOCHAR))
2288 count++, i--; 2311 count++, i--;
2289 2312
2290 /* 2313 /*
2291 * Determine the attributes for the string 2314 * Determine the attributes for the string
2292 */ 2315 */
2293 int fore = fgcolor_of (rend); // desired foreground 2316 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2317 int back = bgcolor_of (rend); // desired background
2295 2318
2296 // only do special processing if any attributes are set, which is unlikely 2319 // only do special processing if any attributes are set, which is unlikely
2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2320 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2321 {
2299 bool invert = rend & RS_RVid; 2322 bool invert = rend & RS_RVid;
2300 2323
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold && fore == Color_fg)
… …
2391 /* 2414 /*
2392 * Actually do the drawing of the string here 2415 * Actually do the drawing of the string here
2393 */ 2416 */
2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2417 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2395 2418
2396 if (expect_true (have_bg && back == Color_bg)) 2419 if (ecb_likely (have_bg && back == Color_bg))
2397 { 2420 {
2398 // this is very ugly, maybe push it into ->draw? 2421 // this is very ugly, maybe push it into ->draw?
2399 2422
2400 for (i = 0; i < count; i++) /* don't draw empty strings */ 2423 for (i = 0; i < count; i++) /* don't draw empty strings */
2401 if (text[i] != ' ') 2424 if (text[i] != ' ')
… …
2408 did_clear: ; 2431 did_clear: ;
2409 } 2432 }
2410 else 2433 else
2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2412 2435
2413 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2414 { 2437 {
2415#if ENABLE_FRILLS 2438#if ENABLE_FRILLS
2416 if (ISSET_PIXCOLOR (Color_underline)) 2439 if (ISSET_PIXCOLOR (Color_underline))
2417 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2440 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2418 else 2441 else
… …
2464 2487
2465 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2466 Col2Pixel (col), 2489 Col2Pixel (col),
2467 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2468 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2470 } 2493 }
2471 } 2494 }
2472 2495
2473 /* 2496 /*
2474 * H: cleanup selection 2497 * H: cleanup selection
… …
2483 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2484 num_scr = 0; 2507 num_scr = 0;
2485 num_scr_allow = 1; 2508 num_scr_allow = 1;
2486} 2509}
2487 2510
2488void 2511void ecb_cold
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490{ 2513{
2491 if (!l.t) 2514 if (!l.valid ())
2492 return; 2515 return;
2493 2516
2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495 2518
2496 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498} 2521}
2499 2522
2500void 2523void ecb_cold
2501rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2502{ 2525{
2503 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2504 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2505 2528
… …
2508 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2509 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2510 } 2533 }
2511} 2534}
2512 2535
2513void 2536void ecb_cold
2514rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2538{
2516 bool transparent = false; 2539 bool transparent = false;
2517 2540
2518#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2519 if (bg_pixmap != None) 2542 if (bg_img != 0)
2520 { 2543 {
2521# ifdef ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2523 { 2546 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526 2549
2527 transparent = true; 2550 transparent = true;
2528 } 2551 }
2529 else 2552 else
2530# endif 2553# endif
2531 { 2554 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2534 } 2557 }
2535 } 2558 }
2536 else 2559 else
2537#endif 2560#endif
2538 { 2561 {
… …
2545 if (scrollBar.win) 2568 if (scrollBar.win)
2546 { 2569 {
2547 if (transparent) 2570 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2572 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2551 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2552 scrollBar.show (0); 2575 scrollBar.show (0);
2553 } 2576 }
2554 2577
2555 if (refresh) 2578 if (refresh)
2556 { 2579 {
… …
2621 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2622 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2623} 2646}
2624 2647
2625/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2626void 2649void ecb_hot
2627rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2628{ 2651{
2629 if (selection.op 2652 if (selection.op
2630 && current_screen == selection.screen 2653 && current_screen == selection.screen
2631 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2650 */ 2673 */
2651#if 0 2674#if 0
2652void 2675void
2653rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2654{ 2677{
2655 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2656 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2657 const char r1[] = "\n";
2658
2659 for (row = saveLines + top_row;
2660 row < saveLines + nrow - 1; row++)
2661 {
2662 width = row_buf[row].l >= 0 ? row_buf[row].l
2663 : ncol;
2664 for (towrite = width; towrite; towrite -= wrote)
2665 {
2666 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2667 towrite);
2668 if (wrote < 0)
2669 return; /* XXX: death, no report */
2670 }
2671 if (row_buf[row].l >= 0)
2672 if (write (fd, r1, 1) <= 0)
2673 return; /* XXX: death, no report */
2674 }
2675} 2680}
2676#endif 2681#endif
2677 2682
2678/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2679 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2680 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2681void 2686void
2682rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2683{ 2688{
2684 row_col_t pos;
2685
2686 if (!selection.op) 2689 if (!selection.op)
2687 return; 2690 return;
2688 2691
2689 pos.row = pos.col = 0;
2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2693 || (check_more == 1 2695 || (check_more == 1
2694 && current_screen == selection.screen 2696 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 || (check_more == 2
2698 && ROWCOL_IS_BEFORE (selection.beg, pos)
2699 && ROWCOL_IS_AFTER (selection.end, pos))
2700 || (check_more == 3
2701 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 4 /* screen width change */
2703 && (selection.beg.row != selection.end.row
2704 || selection.end.col > ncol)))
2705 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2706} 2700}
2707 2701
2708/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2709/* 2703/*
2710 * Paste a selection direct to the command fd 2704 * Paste a selection direct to the command fd
… …
2716 for (unsigned int i = 0; i < len; i++) 2710 for (unsigned int i = 0; i < len; i++)
2717 if (data[i] == C0_LF) 2711 if (data[i] == C0_LF)
2718 data[i] = C0_CR; 2712 data[i] = C0_CR;
2719 2713
2720 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2721 tt_printf ("\e[200~"); 2715 tt_printf ("\x1b[200~");
2722 2716
2723 tt_write (data, len); 2717 tt_write (data, len);
2724 2718
2725 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2726 tt_printf ("\e[201~"); 2720 tt_printf ("\x1b[201~");
2727} 2721}
2728 2722
2729void 2723void
2730rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::paste (char *data, unsigned int len) NOTHROW
2731{ 2725{
… …
2951/* ------------------------------------------------------------------------- */ 2945/* ------------------------------------------------------------------------- */
2952/* 2946/*
2953 * Mark or select text based upon number of clicks: 1, 2, or 3 2947 * Mark or select text based upon number of clicks: 1, 2, or 3
2954 * EXT: button 1 press 2948 * EXT: button 1 press
2955 */ 2949 */
2956void 2950void ecb_cold
2957rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2958{ 2952{
2959 clicks = ((clicks - 1) % 3) + 1; 2953 clicks = ((clicks - 1) % 3) + 1;
2960 selection.clicks = clicks; /* save clicks so extend will work */ 2954 selection.clicks = clicks; /* save clicks so extend will work */
2961 2955
… …
2980 2974
2981/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
2982/* 2976/*
2983 * Mark a selection at the specified col/row 2977 * Mark a selection at the specified col/row
2984 */ 2978 */
2985void 2979void ecb_cold
2986rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2987{ 2981{
2988 want_refresh = 1; 2982 want_refresh = 1;
2989 2983
2990 selection.mark.row = row + view_start; 2984 selection.mark.row = row + view_start;
… …
3017/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3018#define DELIMIT_TEXT(x) \ 3012#define DELIMIT_TEXT(x) \
3019 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3020#define DELIMIT_REND(x) 1 3014#define DELIMIT_REND(x) 1
3021 3015
3022void 3016void ecb_cold
3023rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3024{ 3018{
3025 int col, row, dirnadd, tcol, trow, w1, w2; 3019 int col, row, dirnadd, tcol, trow, w1, w2;
3026 row_col_t bound; 3020 row_col_t bound;
3027 text_t *stp; 3021 text_t *stp;
… …
3101 * EXT: button 3 press; button 1 or 3 drag 3095 * EXT: button 3 press; button 1 or 3 drag
3102 * flag == 0 ==> button 1 3096 * flag == 0 ==> button 1
3103 * flag == 1 ==> button 3 press 3097 * flag == 1 ==> button 3 press
3104 * flag == 2 ==> button 3 motion 3098 * flag == 2 ==> button 3 motion
3105 */ 3099 */
3106void 3100void ecb_cold
3107rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3108{ 3102{
3109 int col = clamp (Pixel2Col (x), 0, ncol); 3103 int col = clamp (Pixel2Col (x), 0, ncol);
3110 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3104 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3111 3105
… …
3137 3131
3138/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3139/* 3133/*
3140 * Extend the selection to the specified col/row 3134 * Extend the selection to the specified col/row
3141 */ 3135 */
3142void 3136void ecb_cold
3143rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3144{ 3138{
3145 row_col_t pos; 3139 row_col_t pos;
3146 enum { 3140 enum {
3147 LEFT, RIGHT 3141 LEFT, RIGHT
… …
3338 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3339#endif 3333#endif
3340} 3334}
3341 3335
3342#if !ENABLE_MINIMAL 3336#if !ENABLE_MINIMAL
3343void 3337void ecb_cold
3344rxvt_term::selection_remove_trailing_spaces () NOTHROW 3338rxvt_term::selection_remove_trailing_spaces () NOTHROW
3345{ 3339{
3346 int32_t end_col, end_row; 3340 int32_t end_col, end_row;
3347 text_t *stp; 3341 text_t *stp;
3348 3342
… …
3386/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3387/* 3381/*
3388 * Double click on button 3 when already selected 3382 * Double click on button 3 when already selected
3389 * EXT: button 3 double click 3383 * EXT: button 3 double click
3390 */ 3384 */
3391void 3385void ecb_cold
3392rxvt_term::selection_rotate (int x, int y) NOTHROW 3386rxvt_term::selection_rotate (int x, int y) NOTHROW
3393{ 3387{
3394 selection.clicks = selection.clicks % 3 + 1; 3388 selection.clicks = selection.clicks % 3 + 1;
3395 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3396} 3390}
… …
3398/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3399/* 3393/*
3400 * Respond to a request for our current selection 3394 * Respond to a request for our current selection
3401 * EXT: SelectionRequest 3395 * EXT: SelectionRequest
3402 */ 3396 */
3403void 3397void ecb_cold
3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3405{ 3399{
3406 Atom property = rq.property == None ? rq.target : rq.property; 3400 Atom property = rq.property == None ? rq.target : rq.property;
3407 XSelectionEvent ev; 3401 XSelectionEvent ev;
3408 3402
… …
3541 3535
3542 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3536 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3543} 3537}
3544 3538
3545/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3546#ifdef USE_XIM 3540#if USE_XIM
3547void 3541void ecb_cold
3548rxvt_term::im_set_position (XPoint &pos) NOTHROW 3542rxvt_term::im_set_position (XPoint &pos) NOTHROW
3549{ 3543{
3550 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3551 3545
3552 XGetWindowAttributes (dpy, vt, &xwa); 3546 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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