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.251 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.327 by root, Wed Nov 5 14:43:54 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 236 }
244 else 237 else
245 { 238 {
246 /* 239 /*
247 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 270 }
278 271
279 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 274
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
285 278
286 if (top_row) 279 if (top_row)
287 { 280 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
290 284
291 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 287
294 do 288 do
… …
330 int qcol = 0; 324 int qcol = 0;
331 325
332 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
333 if (p == ocur.row) 327 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
335 329
336 // fill a single destination line 330 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
338 { 332 {
339 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
366 } 360 }
367 while (p != pend && q > 0); 361 while (p != pend && q > 0);
368 362
369 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
370 top_row = q - term_start; 364 top_row = q - term_start;
371 365
372 // make sure all terminal lines exist 366 // make sure all terminal lines exist
373 while (top_row > 0) 367 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 369 }
376 else 370 else
377 { 371 {
378 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
379 373
380 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
381 { 375 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
384 378
… …
398 delete old_ta; 392 delete old_ta;
399 delete old_ra; 393 delete old_ra;
400 394
401 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
403 398
404 free (tabs); 399 free (tabs);
405 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
406 404
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 409
420 tt_winch (); 410 tt_winch ();
421 411
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 413}
… …
435 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
436 426
437 free (row_buf); 427 free (row_buf);
438 free (swap_buf); 428 free (swap_buf);
439 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
440 free (tabs); 432 free (tabs);
441 433 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 434 }
444} 435}
445 436
446/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
447/* 438/*
448 * Hard reset 439 * Hard/Soft reset
449 */ 440 */
450void 441void
451rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
452{ 443{
453 scr_release (); 444 scr_release ();
454 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
455 scr_reset (); 448 scr_reset ();
456 449
457 scr_clear (true); 450 scr_clear (true);
458 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
459} 468}
460 469
461/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
510} 519}
511 520
512void 521void
513rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen ()
514{ 523{
515 if (!OPTION (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
516 return; 525 return;
517 526
518 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 528 ::swap (ROW(i), swap_buf [i]);
520 529
… …
542 selection_check (2); /* check for boundary cross */ 551 selection_check (2); /* check for boundary cross */
543 552
544 int i = current_screen; current_screen = scrn; scrn = i; 553 int i = current_screen; current_screen = scrn; scrn = i;
545 554
546#if NSCREENS 555#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 556 if (option (Opt_secondaryScreen))
548 { 557 {
549 num_scr = 0; 558 num_scr = 0;
550 559
551 scr_swap_screen (); 560 scr_swap_screen ();
552 561
… …
555 screen.flags |= Screen_VisibleCursor; 564 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 565 swap.flags |= Screen_VisibleCursor;
557 } 566 }
558 else 567 else
559#endif 568#endif
560 if (OPTION (Opt_secondaryScroll)) 569 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 570 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 571}
563 572
564// clear WrapNext indicator, solidifying position on next line 573// clear WrapNext indicator, solidifying position on next line
565void 574void
… …
598/* 607/*
599 * Change the rendition style for following text 608 * Change the rendition style for following text
600 */ 609 */
601void 610void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 611rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 612{
604 if (set) 613 if (set)
605 rstyle |= style; 614 rstyle |= style;
606 else if (style == ~RS_None) 615 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 616 rstyle = DEFAULT_RSTYLE;
608 else 617 else
609 rstyle &= ~style; 618 rstyle &= ~style;
610 } 619}
611 620
612/* ------------------------------------------------------------------------- */ 621/* ------------------------------------------------------------------------- */
613/* 622/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 623 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 624 * count positive ==> scroll up
… …
624 want_refresh = 1; 633 want_refresh = 1;
625 num_scr += count; 634 num_scr += count;
626 635
627 if (count > 0 636 if (count > 0
628 && row1 == 0 637 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 638 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 639 {
631 top_row = max (top_row - count, -saveLines); 640 top_row = max (top_row - count, -saveLines);
632 641
633 // scroll everything up 'count' lines 642 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 643 term_start = (term_start + count) % total_rows;
… …
641 } 650 }
642 651
643 // erase newly scrolled-in lines 652 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 653 for (int i = count; i--; )
645 { 654 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 655 line_t &l = ROW(nrow - 1 - i);
649 656
657 // optimize if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 {
650 scr_blank_line (l, 0, l.l, rstyle); 661 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 662 l.l = 0;
653 l.f = 0; 663 l.f = 0;
664 }
665 else
666 scr_blank_screen_mem (l, rstyle);
654 } 667 }
655 668
656 // now copy lines below the scroll region bottom to the 669 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 670 // bottom of the screen again, so they look as if they
658 // hadn't moved. 671 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 675 line_t &l2 = ROW(i);
663 676
664 ::swap (l1, l2); 677 ::swap (l1, l2);
665 l2.touch (); 678 l2.touch ();
666 } 679 }
667 680
668 // move and/or clear selection, if any 681 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 682 if (selection.op && current_screen == selection.screen)
670 { 683 {
671 selection.beg.row -= count; 684 selection.beg.row -= count;
672 selection.end.row -= count; 685 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 693 selection.op = SELECTION_CLEAR;
681 } 694 }
682 } 695 }
683 696
684 // finally move the view window, if desired 697 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 699 && view_start != 0
687 && view_start != -saveLines) 700 && view_start != -saveLines)
688 scr_page (UP, count); 701 scr_page (UP, count);
689 702
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 721 {
709 /* move selected region too */ 722 /* move selected region too */
710 selection.beg.row -= count; 723 selection.beg.row -= count;
711 selection.end.row -= count; 724 selection.end.row -= count;
712 selection.mark.row -= count; 725 selection.mark.row -= count;
713 726
714 selection_check (0); 727 selection_check (0);
715 } 728 }
716 } 729 }
717 730
718 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
… …
785 798
786 while (str < strend) 799 while (str < strend)
787 { 800 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 802
790 if (c < 0x20) 803 if (expect_false (c < 0x20))
791 if (c == C0_LF) 804 if (c == C0_LF)
792 { 805 {
793 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
794 807
795 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
814 { 827 {
815 scr_tab (1, true); 828 scr_tab (1, true);
816 continue; 829 continue;
817 } 830 }
818 831
832 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
822 { 837 {
823 checksel = 0; 838 checksel = 0;
824 /* 839 /*
825 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 842 * should be a similar check.
828 */ 843 */
829 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
830 } 845 }
831 846
832 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
833 { 848 {
834 scr_do_wrap (); 849 scr_do_wrap ();
835 850
836 line->l = ncol; 851 line->l = ncol;
837 line->is_longer (1); 852 line->is_longer (1);
838 853
839 row = screen.cur.row; 854 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
841 } 856 }
842 857
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 860 c = 0xfffd;
846 861
847 // rely on wcwidth to tell us the character width, do wcwidth before 862 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
849 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
850 // locale. 865 // locale.
851 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
852 867
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 869 {
855 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 871 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
873 } 888 }
874 } 889 }
875 890
876 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
878 893
879 if (width != 0) 894 if (width != 0)
880 { 895 {
881#if !UNICODE_3 896#if !UNICODE_3
… …
887 c = 0xfffd; 902 c = 0xfffd;
888# endif 903# endif
889#endif 904#endif
890 905
891 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
894 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
895 { 918 {
896 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
897
898 // find begin
899 while (col > 0 && line->t[col] == NOCHAR)
900 col--;
901
902 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
903
904 // found begin, nuke
905 do {
906 line->t[col] = ' ';
907 line->r[col] = rend;
908 col++;
909 } while (col < ncol && line->t[col] == NOCHAR);
910 }
911
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913
914 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width)
916 {
917 // ...output spaces
918 c = ' '; 920 c = NOCHAR;
919 // and try the same character next loop iteration 921 // and try the same character next loop iteration
920 --str; 922 --str;
921 } 923 }
922 924
923 line->touch (); 925 line->touch ();
… …
925 do 927 do
926 { 928 {
927 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
929 931
930 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 933 screen.cur.col++;
932 else 934 else
933 { 935 {
934 line->l = ncol; 936 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
937 break; 939 break;
938 } 940 }
939 941
940 c = NOCHAR; 942 c = NOCHAR;
941 } 943 }
942 while (--width > 0); 944 while (expect_false (--width > 0));
943 945
944 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 947 if (expect_false (!width))
946 { 948 {
947 line->touch (); 949 line->touch ();
948 950
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
950 { 952 {
951 line->t[c] = ' '; 953 line->t[c] = ' ';
952 line->r[c] = rend; 954 line->r[c] = rend;
953 } 955 }
954 } 956 }
955 } 957 }
958#if ENABLE_COMBINING
956 else // width == 0 959 else // width == 0
957 { 960 {
958#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
969 linep = line; 973 linep = line;
970 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
972 } 999 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 } 1000 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
995#endif 1001#endif
996 }
997 } 1002 }
998 1003
999 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1000 1005
1001#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
1009 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1010 */ 1015 */
1011void 1016void
1012rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1013{ 1018{
1014 want_refresh = 1;
1015
1016 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1017 { 1020 {
1018 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1019 { 1022 {
1020#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1025 --screen.cur.row;
1023 return; 1026
1027 want_refresh = 1;
1024#endif 1028#endif
1025 } 1029 }
1026 } 1030 }
1027 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1028 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1029
1030 screen.flags &= ~Screen_WrapNext;
1031} 1033}
1032 1034
1033/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1034/* 1036/*
1035 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
1058 x = i; 1060 x = i;
1059 1061
1060 if (!--count) 1062 if (!--count)
1061 break; 1063 break;
1062 } 1064 }
1063 else 1065 else
1064 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1065 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1066 1068
1067 if (count) 1069 if (count)
1068 x = ncol - 1; 1070 x = ncol - 1;
1069 1071
1070 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1071 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1072 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1073 { 1075 {
1074 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1075 1077
1076 l.touch (x); 1078 l.touch (x);
1077 1079
… …
1110 * Process DEC Back Index 1112 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1112 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1113 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1114 */ 1116 */
1115#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1116void 1118void
1117rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1118{ 1120{
1119 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1129 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1129 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1130 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1131 */ 1133 */
1132#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1133void 1135void
1134rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1135{ 1137{
1136 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1184 } 1186 }
1185 } 1187 }
1186 else 1188 else
1187 { 1189 {
1188 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1189 { /* relative origin mode */ 1192 /* relative origin mode */
1190 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1191 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1192 } 1195 }
1193 else 1196 else
1194 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1227/* 1230/*
1228 * Erase part or whole of a line 1231 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1236 */
1233void 1237void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1239{
1236 unsigned int col, num; 1240 unsigned int col, num;
… …
1245 line.touch (); 1249 line.touch ();
1246 line.is_longer (0); 1250 line.is_longer (0);
1247 1251
1248 switch (mode) 1252 switch (mode)
1249 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1250 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1261 col = screen.cur.col;
1252 num = ncol - col; 1262 num = ncol - col;
1253 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1257 break; 1268 break;
1269
1258 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1259 col = 0; 1271 col = 0;
1260 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1264 break; 1277 break;
1278
1265 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1266 col = 0; 1280 col = 0;
1267 num = ncol; 1281 num = ncol;
1268 line.l = 0; 1282 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1328 return; 1342 return;
1329 1343
1330 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1331 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1332 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1352 {
1336 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1354
1355 if (mapped && !view_start)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1338 } 1359 }
1339 else 1360 else
1340 { 1361 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped && !view_start)
1365 {
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1347 } 1375 }
1348 1376
1349 for (; num--; row++) 1377 for (; num--; row++)
1350 { 1378 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1383 }
1354} 1384}
1355 1385
1356#if ENABLE_FRILLS 1386#if !ENABLE_MINIMAL
1357void 1387void
1358rxvt_term::scr_erase_savelines () NOTHROW 1388rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1389{
1360 want_refresh = 1; 1390 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1391 ZERO_SCROLLBACK ();
… …
1431 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1432 */ 1462 */
1433void 1463void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1465{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1466 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1441 1468
1442 if (count <= 0) 1469 if (count <= 0)
1443 return; 1470 return;
… …
1445 scr_do_wrap (); 1472 scr_do_wrap ();
1446 1473
1447 selection_check (1); 1474 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1449 1476
1450 row = screen.cur.row; 1477 int row = screen.cur.row;
1451 1478
1452 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1453 1480
1454 line->touch (); 1481 line->touch ();
1455 line->is_longer (0); 1482 line->is_longer (0);
1456 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1457 switch (insdel) 1488 switch (insdel)
1458 { 1489 {
1459 case INSERT: 1490 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1497 {
1462 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1464 } 1500 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1501
1468 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1504 {
1471 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
1472 || (selection.end.col + count >= ncol)) 1506 || (selection.end.col + count >= ncol))
1473 CLEAR_SELECTION (); 1507 CLEAR_SELECTION ();
1474 else 1508 else
1509 {
1475 { /* shift selection */ 1510 /* shift selection */
1476 selection.beg.col += count; 1511 selection.beg.col += count;
1477 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1478 selection.end.col += count; 1513 selection.end.col += count;
1479 } 1514 }
1480 } 1515 }
… …
1485 case ERASE: 1520 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1522 selection_check (1);
1488 screen.cur.col -= count; 1523 screen.cur.col -= count;
1489 1524
1490 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1530 break;
1493 1531
1494 case DELETE: 1532 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1496 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1540 {
1499 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1501 } 1543 }
1502 1544
1503 line->l = max (line->l - count, 0);
1504 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1505 1546
1506 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1549 {
1509 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1619 */ 1660 */
1620void 1661void
1621rxvt_term::scr_set_tab (int mode) NOTHROW 1662rxvt_term::scr_set_tab (int mode) NOTHROW
1622{ 1663{
1623 if (mode < 0) 1664 if (mode < 0)
1624 memset (tabs, 0, ncol * sizeof (char)); 1665 memset (tabs, 0, ncol);
1625 else if (screen.cur.col < ncol) 1666 else if (screen.cur.col < ncol)
1626 tabs [screen.cur.col] = !!mode; 1667 tabs [screen.cur.col] = !!mode;
1627} 1668}
1628 1669
1629/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
… …
1644 if (rvideo_state != on) 1685 if (rvideo_state != on)
1645 { 1686 {
1646 rvideo_state = on; 1687 rvideo_state = on;
1647 1688
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#if XPM_BACKGROUND 1690#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1651#endif 1692#endif
1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1694
1657 XGCValues gcvalue; 1695 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1697 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1698 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1699
1662 scr_clear (); 1700 scr_clear ();
1663 scr_touch (true); 1701 scr_touch (true);
1664 } 1702 }
1665} 1703}
… …
1750{ 1788{
1751 bool found = false; 1789 bool found = false;
1752 1790
1753 for (int i = 0; i < nrow; i++) 1791 for (int i = 0; i < nrow; i++)
1754 { 1792 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1793 rend_t *drp = drawn_buf[i].r;
1757 1794
1758 for (; col < ncol; col++, drp++) 1795 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1796 if ((*drp & mask) == value)
1760 { 1797 {
1761 found = true; 1798 found = true;
1762 *drp = ~value; 1799 *drp = ~value;
1763 } 1800 }
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1841 {
1805 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1807 } 1844 }
1808 1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1848
1812 num_scr_allow = 0; 1849 num_scr_allow = 0;
1813 1850
… …
1868 return true; 1905 return true;
1869} 1906}
1870 1907
1871#ifndef NO_BELL 1908#ifndef NO_BELL
1872void 1909void
1873rxvt_term::bell_cb (time_watcher &w) 1910rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1911{
1875 rvideo_bell = false; 1912 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1913 scr_rvideo_mode (rvideo_mode);
1914 refresh_check ();
1877} 1915}
1878#endif 1916#endif
1879 1917
1880/* ------------------------------------------------------------------------- */ 1918/* ------------------------------------------------------------------------- */
1881void 1919void
… …
1883{ 1921{
1884#ifndef NO_BELL 1922#ifndef NO_BELL
1885 1923
1886# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1889# endif 1927# endif
1890 XMapWindow (display->display, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1891# endif 1929# endif
1892 1930
1931# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell))
1933 set_urgency (1);
1934# endif
1935
1893 if (OPTION (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1894 { 1937 {
1895 rvideo_bell = true; 1938 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode); 1939 scr_rvideo_mode (rvideo_mode);
1897 display->flush (); 1940 flush ();
1898 1941
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1900 } 1943 }
1901 else 1944 else
1902 XBell (display->display, 0); 1945 XBell (dpy, 0);
1903
1904#endif 1946#endif
1905} 1947}
1906 1948
1907/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1950/* ARGSUSED */
1909void 1951void
1910rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1911{ 1953{
1912#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1913 int nrows, row_start; 1955 int nrows, row_start;
1914 FILE *fd; 1956 FILE *fd = popen_printer ();
1915 1957
1916 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1917 return; 1959 return;
1918 1960
1919 if (fullhist) 1961 if (fullhist)
1920 { 1962 {
1921 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1966 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1967 */ 2009 */
1968void 2010void
1969rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1970{ 2012{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1972 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1975 int i; /* tmp */ 2015 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 2018#endif
1979 rend_t *crp; // cursor rendition pointer 2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */
1980 2022
1981 want_refresh = 0; /* screen is current */ 2023 want_refresh = 0; /* screen is current */
1982 2024
1983 if (refresh_type == NO_REFRESH || !mapped) 2025 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2026 return;
1985 2027
1986 /* 2028 /*
1987 * A: set up vars 2029 * A: set up vars
1988 */ 2030 */
1989 must_clear = 0;
1990 refresh_count = 0; 2031 refresh_count = 0;
1991 2032
1992#if XPM_BACKGROUND 2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2037#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2039
2000 /* 2040 /*
2001 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2002 */ 2042 */
2003 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2004 2051
2005 /* 2052 /*
2006 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2007 */ 2054 */
2008 { 2055 {
2009 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2057
2013 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2059 if (hidden_cursor)
2016 showcursor = 0; 2060 showcursor = 0;
2017#endif 2061#endif
2018 2062
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2068 col--;
2025 2069
2026 crp = &ROW(screen.cur.row).r[col]; 2070 crp = &ROW(screen.cur.row).r[col];
2027 2071
2072#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor;
2076 else
2077#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2079 ccol1 = fgcolor_of (rstyle);
2080#else
2081 ccol1 = Color_fg;
2082#endif
2083
2084#ifndef NO_CURSORCOLOR
2085 if (ISSET_PIXCOLOR (Color_cursor2))
2086 ccol2 = Color_cursor2;
2087 else
2088#endif
2089#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2090 ccol2 = bgcolor_of (rstyle);
2091#else
2092 ccol2 = Color_bg;
2093#endif
2094
2028 if (showcursor && focus) 2095 if (showcursor && focus)
2029 { 2096 {
2030 if (OPTION (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2032 else 2099 else
2033 { 2100 {
2034 *crp ^= RS_RVid; 2101 *crp ^= RS_RVid;
2035
2036#ifndef NO_CURSORCOLOR
2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2038 if (ISSET_PIXCOLOR (Color_cursor))
2039 ccol1 = Color_cursor;
2040 else
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2050 ccol2 = bgcolor_of (rstyle);
2051#else
2052 ccol2 = Color_bg;
2053#endif
2054 *crp = SET_FGCOLOR (*crp, ccol1); 2102 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2103 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2104 }
2058 } 2105 }
2059 } 2106 }
2060 2107
2061 /* make sure no outline cursor is left around */ 2108 /* make sure no outline cursor is left around */
… …
2088 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2089 } 2136 }
2090 } 2137 }
2091 } 2138 }
2092 2139
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2094#if ENABLE_OVERLAY
2095 scr_swap_overlay ();
2096#endif
2097
2098#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2099 /* 2141 /*
2100 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2102 */ 2144 */
2103 if (!display->is_local 2145 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2146 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2147 && abs (num_scr) < nrow && !have_bg)
2106 { 2148 {
2107 int16_t nits; 2149 int16_t nits;
2150 int i = num_scr;
2108 int j; 2151 int j;
2109 int len, wlen; 2152 int len, wlen;
2110 dLocal (int, num_scr); 2153 dLocal (int, num_scr);
2111 2154
2112 j = nrow; 2155 j = nrow;
2113 wlen = len = -1; 2156 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2157 row = i > 0 ? 0 : j - 1;
2158
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2159 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2160 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2161 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2162 {
2119 line_t s = ROW(view_start + row); 2163 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2184 wlen = row;
2141 continue; 2185 continue;
2142 } 2186 }
2143 } 2187 }
2144 2188
2145 if (len != -1) 2189 if (len >= 0)
2146 { 2190 {
2147 /* also comes here at end if needed because of >= above */ 2191 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2192 if (wlen < len)
2149 ::swap (wlen, len); 2193 ::swap (wlen, len);
2150 2194
2195 XGCValues gcv;
2196
2197 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2198 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2199 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2200 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2201 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2202 0, Row2Pixel (len));
2203 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204
2156 len = -1; 2205 len = -1;
2157 } 2206 }
2158 } 2207 }
2159 } 2208 }
2160#endif 2209#endif
… …
2184 continue; 2233 continue;
2185 2234
2186 // redraw one or more characters 2235 // redraw one or more characters
2187 2236
2188 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2189 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2190 --col; 2239 --col;
2191 2240
2192 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2193 text_t *text = stp + col; 2242 text_t *text = stp + col;
2194 int count = 1; 2243 int count = 1;
… …
2216 count++; 2265 count++;
2217 2266
2218 if (stp[col] != dtp[col] 2267 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2268 || !RS_SAME (srp[col], drp[col]))
2220 { 2269 {
2221 if (must_clear && (i++ > count / 2)) 2270 if (have_bg && (i++ > count / 2))
2222 break; 2271 break;
2223 2272
2224 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2225 drp[col] = rend; 2274 drp[col] = rend;
2226 i = 0; 2275 i = 0;
2227 } 2276 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2277 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2278 break;
2230 } 2279 }
2231 2280
2232 col--; /* went one too far. move back */ 2281 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2282 count -= i; /* dump any matching trailing chars */
2234 2283
2235 // sometimes we optimize away the trailing NOCHAR's, add them back 2284 // sometimes we optimize away the trailing NOCHAR's, add them back
2236 while (i && text[count] == NOCHAR) 2285 while (expect_false (i && text[count] == NOCHAR))
2237 count++, i--; 2286 count++, i--;
2238 2287
2239 /* 2288 /*
2240 * Determine the attributes for the string 2289 * Determine the attributes for the string
2241 */ 2290 */
2242 int fore = fgcolor_of (rend); // desired foreground 2291 int fore = fgcolor_of (rend); // desired foreground
2243 int back = bgcolor_of (rend); // desired background 2292 int back = bgcolor_of (rend); // desired background
2244 2293
2245 // only do special processing if any attributes are set, which is unlikely 2294 // only do special processing if any attributes are set, which is unlikely
2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2247 { 2296 {
2248#if ENABLE_STYLES
2249 // "careful" (too wide) character handling
2250
2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2252 while (text > stp
2253 && srp[text - stp - 1] & RS_Careful
2254 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2264#endif
2265
2266 bool invert = rend & RS_RVid; 2297 bool invert = rend & RS_RVid;
2267 2298
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold
2270 && fore == Color_fg) 2300 if (rend & RS_Bold && fore == Color_fg)
2271 { 2301 {
2272 if (ISSET_PIXCOLOR (Color_BD)) 2302 if (ISSET_PIXCOLOR (Color_BD))
2273 fore = Color_BD; 2303 fore = Color_BD;
2274# if !ENABLE_STYLES 2304# if !ENABLE_STYLES
2275 else 2305 else
2276 invert = !invert; 2306 invert = !invert;
2277# endif 2307# endif
2278 } 2308 }
2279 2309
2280 if (rend & RS_Italic 2310 if (rend & RS_Italic && fore == Color_fg)
2281 && fore == Color_fg)
2282 { 2311 {
2283 if (ISSET_PIXCOLOR (Color_IT)) 2312 if (ISSET_PIXCOLOR (Color_IT))
2284 fore = Color_IT; 2313 fore = Color_IT;
2285# if !ENABLE_STYLES 2314# if !ENABLE_STYLES
2286 else 2315 else
2287 invert = !invert; 2316 invert = !invert;
2288# endif 2317# endif
2289 } 2318 }
2290 2319
2291 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2321 fore = Color_UL;
2293#endif 2322#endif
2294 2323
2295 if (invert) 2324 if (invert)
2296 { 2325 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2297 ::swap (fore, back); 2332 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2298 2337
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2338#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2300 if (ISSET_PIXCOLOR (Color_RV)) 2340 if (ISSET_PIXCOLOR (Color_RV))
2301 back = Color_RV; 2341 back = Color_RV;
2302 2342# endif
2303 if (fore == back) 2343 if (fore == back)
2304 { 2344 {
2305 fore = Color_bg; 2345 fore = Color_bg;
2306 back = Color_fg; 2346 back = Color_fg;
2307 } 2347 }
… …
2309 } 2349 }
2310 2350
2311#ifdef TEXT_BLINK 2351#ifdef TEXT_BLINK
2312 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2352 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2313 { 2353 {
2314 if (!text_blink_ev.active) 2354 if (!text_blink_ev.is_active ())
2315 { 2355 {
2316 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2356 text_blink_ev.again ();
2317 hidden_text = 0; 2357 hidden_text = 0;
2318 } 2358 }
2319 else if (hidden_text) 2359 else if (hidden_text)
2320 fore = back; 2360 fore = back;
2321 } 2361 }
2322#endif 2362#endif
2363
2364#if ENABLE_STYLES
2365 // "careful" (too wide) character handling
2366
2367 // include previous careful character(s) if possible, looks nicer (best effort...)
2368 while (text > stp
2369 && srp[text - stp - 1] & RS_Careful
2370 && RS_SAME (rend, srp[text - stp - 1]))
2371 text--, count++, xpixel -= fwidth;
2372
2373 // force redraw after "careful" characters to avoid pixel droppings
2374 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2375 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2376
2377 // force redraw before "careful" characters to avoid pixel droppings
2378 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2379 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2380#endif
2323 } 2381 }
2324 2382
2325 /* 2383 /*
2326 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2327 */ 2385 */
2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2329 2387
2330 if (back == fore) 2388 if (expect_true (have_bg && back == Color_bg))
2331 font->clear_rect (*drawable, xpixel, ypixel,
2332 fwidth * count, fheight,
2333 back);
2334 else if (back == Color_bg)
2335 { 2389 {
2336 if (must_clear) 2390 // this is very ugly, maybe push it into ->draw?
2337 {
2338 CLEAR_CHARS (xpixel, ypixel, count);
2339 2391
2340 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2341 if (text[i] != ' ') 2393 if (text[i] != ' ')
2342 { 2394 {
2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2395 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2344 break; 2396 goto did_clear;
2345 }
2346 } 2397 }
2347 else 2398
2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2399 CLEAR_CHARS (xpixel, ypixel, count);
2400 did_clear: ;
2349 } 2401 }
2350 else 2402 else
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2352 2404
2353 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2354 { 2406 {
2355#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2358 else 2410 else
2359#endif 2411#endif
2360 XSetForeground (display->display, gc, pix_colors[fore]); 2412 XSetForeground (dpy, gc, pix_colors[fore]);
2361 2413
2362 XDrawLine (display->display, drawBuffer, gc, 2414 XDrawLine (dpy, vt, gc,
2363 xpixel, ypixel + font->ascent + 1, 2415 xpixel, ypixel + font->ascent + 1,
2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2365 } 2417 }
2366 } /* for (col....) */ 2418 } /* for (col....) */
2367 } /* for (row....) */ 2419 } /* for (row....) */
2368 2420
2369#if ENABLE_OVERLAY
2370 scr_swap_overlay ();
2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2373
2374 /* 2421 /*
2375 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2376 */ 2423 */
2377 if (showcursor) 2424 if (showcursor)
2378 { 2425 {
2379 if (focus) 2426 if (focus)
2380 { 2427 {
2381 if (OPTION (Opt_cursorUnderline)) 2428 if (option (Opt_cursorUnderline))
2382 *crp ^= RS_Uline; 2429 *crp ^= RS_Uline;
2383 else 2430 else
2384 { 2431 {
2385 *crp ^= RS_RVid; 2432 *crp ^= RS_RVid;
2386#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
… …
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2447 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++; 2448 cursorwidth++;
2402 2449
2403#ifndef NO_CURSORCOLOR 2450#ifndef NO_CURSORCOLOR
2404 if (ISSET_PIXCOLOR (Color_cursor)) 2451 if (ISSET_PIXCOLOR (Color_cursor))
2405 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2452 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2453 else
2406#endif 2454#endif
2455 XSetForeground (dpy, gc, pix_colors[ccol1]);
2407 2456
2408 XDrawRectangle (display->display, drawBuffer, gc, 2457 XDrawRectangle (dpy, vt, gc,
2409 Col2Pixel (col), 2458 Col2Pixel (col),
2410 Row2Pixel (oldcursor.row), 2459 Row2Pixel (oldcursor.row),
2411 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2460 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2413 } 2462 }
2414 } 2463 }
2415 2464
2416 /* 2465 /*
2417 * H: cleanup selection 2466 * H: cleanup selection
2418 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2419 scr_reverse_selection (); 2473 scr_reverse_selection ();
2420 2474
2475 screen.flags = old_screen_flags;
2421 num_scr = 0; 2476 num_scr = 0;
2422 num_scr_allow = 1; 2477 num_scr_allow = 1;
2423} 2478}
2424 2479
2425void 2480void
… …
2448} 2503}
2449 2504
2450void 2505void
2451rxvt_term::scr_recolour () NOTHROW 2506rxvt_term::scr_recolour () NOTHROW
2452{ 2507{
2453 if (1 2508#ifdef HAVE_BG_PIXMAP
2454#if TRANSPARENT 2509 bgPixmap.apply ();
2455 && !am_transparent 2510#else
2456#endif 2511
2457#if XPM_BACKGROUND
2458 && !bgPixmap.pixmap
2459#endif
2460 )
2461 {
2462 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2463 XClearWindow (display->display, parent[0]); 2513 XClearWindow (dpy, parent[0]);
2464 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2465#if HAVE_SCROLLBARS 2515
2466 if (scrollBar.win) 2516 if (scrollBar.win)
2467 { 2517 {
2468 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2469 scrollBar.setIdle (); 2519 scrollBar.state = STATE_IDLE;
2470 scrollbar_show (0); 2520 scrollBar.show (0);
2471 }
2472#endif
2473 } 2521 }
2474 2522
2523#endif
2524
2525 /* bgPixmap.apply () does not do the following : */
2475 scr_clear (); 2526 scr_clear ();
2476 scr_touch (true); 2527 scr_touch (true);
2477 want_refresh = 1; 2528 want_refresh = 1;
2478} 2529}
2479 2530
… …
2486 2537
2487 num_scr_allow = 0; 2538 num_scr_allow = 0;
2488 want_refresh = 1; 2539 want_refresh = 1;
2489 2540
2490 if (really) 2541 if (really)
2491 XClearWindow (display->display, vt); 2542 XClearWindow (dpy, vt);
2492} 2543}
2493 2544
2494void 2545void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2546rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{ 2547{
… …
2545{ 2596{
2546 if (selection.op 2597 if (selection.op
2547 && current_screen == selection.screen 2598 && current_screen == selection.screen
2548 && selection.end.row >= view_start) 2599 && selection.end.row >= view_start)
2549 { 2600 {
2550#if ENABLE_FRILLS 2601#if !ENABLE_MINIMAL
2551 if (selection.rect) 2602 if (selection.rect)
2552 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2553 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2554 RS_RVid, RS_RVid | RS_Uline); 2605 RS_RVid, RS_RVid | RS_Uline);
2555 else 2606 else
… …
2571{ 2622{
2572 int row, wrote; 2623 int row, wrote;
2573 unsigned int width, towrite; 2624 unsigned int width, towrite;
2574 char r1[] = "\n"; 2625 char r1[] = "\n";
2575 2626
2576 for (row = saveLines - nsaved; 2627 for (row = saveLines + top_row;
2577 row < saveLines + nrow - 1; row++) 2628 row < saveLines + nrow - 1; row++)
2578 { 2629 {
2579 width = row_buf[row].l >= 0 ? row_buf[row].l 2630 width = row_buf[row].l >= 0 ? row_buf[row].l
2580 : ncol; 2631 : ncol;
2581 for (towrite = width; towrite; towrite -= wrote) 2632 for (towrite = width; towrite; towrite -= wrote)
… …
2632 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2633 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2634 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2635 data[i] = C0_CR; 2686 data[i] = C0_CR;
2636 2687
2688 if (priv_modes & PrivMode_BracketPaste)
2689 tt_printf ("\e[200~");
2690
2637 tt_write (data, len); 2691 tt_write (data, len);
2692
2693 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~");
2638} 2695}
2639 2696
2640/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2641/* 2698/*
2642 * Respond to a notification that a primary selection has been sent 2699 * Respond to a notification that a primary selection has been sent
… …
2671 } 2728 }
2672 2729
2673 unsigned long bytes_after; 2730 unsigned long bytes_after;
2674 XTextProperty ct; 2731 XTextProperty ct;
2675 2732
2676 if (XGetWindowProperty (display->display, win, prop, 2733 if (XGetWindowProperty (dpy, win, prop,
2677 0, PROP_SIZE / 4, 2734 0, PROP_SIZE / 4,
2678 delete_prop, AnyPropertyType, 2735 delete_prop, AnyPropertyType,
2679 &ct.encoding, &ct.format, 2736 &ct.encoding, &ct.format,
2680 &ct.nitems, &bytes_after, 2737 &ct.nitems, &bytes_after,
2681 &ct.value) != Success) 2738 &ct.value) != Success)
… …
2690 if (bytes_after) 2747 if (bytes_after)
2691 { 2748 {
2692 // fetch and append remaining data 2749 // fetch and append remaining data
2693 XTextProperty ct2; 2750 XTextProperty ct2;
2694 2751
2695 if (XGetWindowProperty (display->display, win, prop, 2752 if (XGetWindowProperty (dpy, win, prop,
2696 ct.nitems / 4, (bytes_after + 3) / 4, 2753 ct.nitems / 4, (bytes_after + 3) / 4,
2697 delete_prop, AnyPropertyType, 2754 delete_prop, AnyPropertyType,
2698 &ct2.encoding, &ct2.format, 2755 &ct2.encoding, &ct2.format,
2699 &ct2.nitems, &bytes_after, 2756 &ct2.nitems, &bytes_after,
2700 &ct2.value) != Success) 2757 &ct2.value) != Success)
… …
2713 2770
2714 if (ct.encoding == xa[XA_INCR]) 2771 if (ct.encoding == xa[XA_INCR])
2715 { 2772 {
2716 // INCR selection, start handshake 2773 // INCR selection, start handshake
2717 if (!delete_prop) 2774 if (!delete_prop)
2718 XDeleteProperty (display->display, win, prop); 2775 XDeleteProperty (dpy, win, prop);
2719 2776
2720 selection_wait = Sel_incr; 2777 selection_wait = Sel_incr;
2721 incr_buf_fill = 0; 2778 incr_buf_fill = 0;
2722 incr_ev.start (NOW + 10); 2779 incr_ev.start (10);
2723 2780
2724 goto bailout; 2781 goto bailout;
2725 } 2782 }
2726 2783
2727 if (ct.nitems == 0) 2784 if (ct.nitems == 0)
… …
2736 ct.nitems = incr_buf_fill; 2793 ct.nitems = incr_buf_fill;
2737 incr_buf = 0; 2794 incr_buf = 0;
2738 incr_buf_size = 0; 2795 incr_buf_size = 0;
2739 incr_ev.stop (); 2796 incr_ev.stop ();
2740 } 2797 }
2741 else 2798 else
2742 { 2799 {
2743 if (selection_wait == Sel_normal 2800 if (selection_wait == Sel_normal
2744 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2745 { 2802 {
2746 /* 2803 /*
… …
2753 goto bailout; 2810 goto bailout;
2754 } 2811 }
2755 } 2812 }
2756 else if (selection_wait == Sel_incr) 2813 else if (selection_wait == Sel_incr)
2757 { 2814 {
2758 incr_ev.start (NOW + 10); 2815 incr_ev.start (10);
2759 2816
2760 while (incr_buf_fill + ct.nitems > incr_buf_size) 2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2761 { 2818 {
2762 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2763 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2770 } 2827 }
2771 2828
2772 char **cl; 2829 char **cl;
2773 int cr; 2830 int cr;
2774 2831
2775#if ENABLE_FRILLS 2832#if !ENABLE_MINIMAL
2776 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2777 // so recode it manually 2834 // so recode it manually
2778 if (ct.encoding == xa[XA_UTF8_STRING]) 2835 if (ct.encoding == xa[XA_UTF8_STRING])
2779 { 2836 {
2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2784 paste (s, strlen (s)); 2841 paste (s, strlen (s));
2785 free (s); 2842 free (s);
2786 } 2843 }
2787 else 2844 else
2788#endif 2845#endif
2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2790 && cl) 2847 && cl)
2791 { 2848 {
2792 for (int i = 0; i < cr; i++) 2849 for (int i = 0; i < cr; i++)
2793 paste (cl[i], strlen (cl[i])); 2850 paste (cl[i], strlen (cl[i]));
2794 2851
… …
2803 if (selection_wait == Sel_normal) 2860 if (selection_wait == Sel_normal)
2804 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2805} 2862}
2806 2863
2807void 2864void
2808rxvt_term::incr_cb (time_watcher &w) NOTHROW 2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2809{ 2866{
2810 selection_wait = Sel_none; 2867 selection_wait = Sel_none;
2811 2868
2812 incr_buf_size = 0; 2869 incr_buf_size = 0;
2813 free (incr_buf); 2870 free (incr_buf);
… …
2824 selection_paste (win, prop, true); 2881 selection_paste (win, prop, true);
2825} 2882}
2826 2883
2827/* ------------------------------------------------------------------------- */ 2884/* ------------------------------------------------------------------------- */
2828/* 2885/*
2829 * Request the current selection: 2886 * Request the current selection:
2830 * Order: > internal selection if available 2887 * Order: > internal selection if available
2831 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2888 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2832 * > CUT_BUFFER0 2889 * > CUT_BUFFER0
2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2890 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2834 * will auto fallback to CUT_BUFFER0 2891 * will auto fallback to CUT_BUFFER0
… …
2836 */ 2893 */
2837void 2894void
2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2895rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2839{ 2896{
2840 if (selection.text && selnum == Sel_Primary) 2897 if (selection.text && selnum == Sel_Primary)
2898 {
2841 { /* internal selection */ 2899 /* internal selection */
2842 char *str = rxvt_wcstombs (selection.text, selection.len); 2900 char *str = rxvt_wcstombs (selection.text, selection.len);
2843 paste (str, strlen (str)); 2901 paste (str, strlen (str));
2844 free (str); 2902 free (str);
2845 return; 2903 return;
2846 } 2904 }
… …
2876 else if (selnum == Sel_Secondary) 2934 else if (selnum == Sel_Secondary)
2877 sel = XA_SECONDARY; 2935 sel = XA_SECONDARY;
2878 else 2936 else
2879 sel = xa[XA_CLIPBOARD]; 2937 sel = xa[XA_CLIPBOARD];
2880 2938
2881 if (XGetSelectionOwner (display->display, sel) != None) 2939 if (XGetSelectionOwner (dpy, sel) != None)
2882 { 2940 {
2883 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2884 vt, selection_request_time); 2942 vt, selection_request_time);
2885 return 1; 2943 return 1;
2886 } 2944 }
2887 2945
2888 return 0; 2946 return 0;
… …
2951 3009
2952 int end_col; 3010 int end_col;
2953 3011
2954 for (; row <= selection.end.row; row++, col = 0) 3012 for (; row <= selection.end.row; row++, col = 0)
2955 { 3013 {
2956#if ENABLE_FRILLS 3014#if !ENABLE_MINIMAL
2957 if (selection.rect) 3015 if (selection.rect)
2958 { 3016 {
2959 col = selection.beg.col; 3017 col = selection.beg.col;
2960 end_col = ncol + 1; 3018 end_col = ncol + 1;
2961 } 3019 }
… …
2964 end_col = ROW(row).l; 3022 end_col = ROW(row).l;
2965 3023
2966 col = max (col, 0); 3024 col = max (col, 0);
2967 3025
2968 if (row == selection.end.row 3026 if (row == selection.end.row
2969#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
2970 || selection.rect 3028 || selection.rect
2971#endif 3029#endif
2972 ) 3030 )
2973 min_it (end_col, selection.end.col); 3031 min_it (end_col, selection.end.col);
2974 3032
… …
2997#endif 3055#endif
2998 else 3056 else
2999 new_selection_text[ofs++] = *t++; 3057 new_selection_text[ofs++] = *t++;
3000 } 3058 }
3001 3059
3002#if ENABLE_FRILLS 3060#if !ENABLE_MINIMAL
3003 if (selection.rect) 3061 if (selection.rect)
3004 { 3062 {
3005 while (ofs 3063 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF 3064 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1])) 3065 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3041bool 3099bool
3042rxvt_term::selection_grab (Time tm) NOTHROW 3100rxvt_term::selection_grab (Time tm) NOTHROW
3043{ 3101{
3044 selection_time = tm; 3102 selection_time = tm;
3045 3103
3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3048 { 3106 {
3049 display->set_selection_owner (this); 3107 display->set_selection_owner (this);
3050 return true; 3108 return true;
3051 } 3109 }
3052 else 3110 else
… …
3056 } 3114 }
3057 3115
3058#if 0 3116#if 0
3059 XTextProperty ct; 3117 XTextProperty ct;
3060 3118
3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3119 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3062 { 3120 {
3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3121 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3064 XFree (ct.value); 3122 XFree (ct.value);
3065 } 3123 }
3066#endif 3124#endif
… …
3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3170 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3113 3171
3114 while (selection.mark.col > 0 3172 while (selection.mark.col > 0
3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3173 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3116 --selection.mark.col; 3174 --selection.mark.col;
3117 3175
3118 if (selection.op) 3176 if (selection.op)
3177 {
3119 { /* clear the old selection */ 3178 /* clear the old selection */
3120 selection.beg.row = selection.end.row = selection.mark.row; 3179 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = selection.end.col = selection.mark.col; 3180 selection.beg.col = selection.end.col = selection.mark.col;
3122 } 3181 }
3123 3182
3124 selection.op = SELECTION_INIT; 3183 selection.op = SELECTION_INIT;
… …
3313 * a point/word/line which is either the start or end of the selection 3372 * a point/word/line which is either the start or end of the selection
3314 * and it was decided by whichever point/word/line was `fixed' at the 3373 * and it was decided by whichever point/word/line was `fixed' at the
3315 * time of the most recent button3 press 3374 * time of the most recent button3 press
3316 */ 3375 */
3317 if (button3 && buttonpress) 3376 if (button3 && buttonpress)
3377 {
3318 { /* button3 press */ 3378 /* button3 press */
3319 /* 3379 /*
3320 * first determine which edge of the selection we are closest to 3380 * first determine which edge of the selection we are closest to
3321 */ 3381 */
3322 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3382 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3323 || (!ROWCOL_IS_AFTER (pos, selection.end) 3383 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3341 selection.mark.row = selection.beg.row; 3401 selection.mark.row = selection.beg.row;
3342 selection.mark.col = selection.beg.col; 3402 selection.mark.col = selection.beg.col;
3343 } 3403 }
3344 } 3404 }
3345 else 3405 else
3406 {
3346 { /* button1 drag or button3 drag */ 3407 /* button1 drag or button3 drag */
3347 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3408 if (ROWCOL_IS_AFTER (selection.mark, pos))
3348 { 3409 {
3349 if (selection.mark.row == selection.end.row 3410 if (selection.mark.row == selection.end.row
3350 && selection.mark.col == selection.end.col 3411 && selection.mark.col == selection.end.col
3351 && clickchange 3412 && clickchange
… …
3368 3429
3369 if (selection.clicks == 1) 3430 if (selection.clicks == 1)
3370 { 3431 {
3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3432 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.beg.row).is_longer () 3433 && !ROW(selection.beg.row).is_longer ()
3373#if ENABLE_FRILLS 3434#if !ENABLE_MINIMAL
3374 && !selection.rect 3435 && !selection.rect
3375#endif 3436#endif
3376 ) 3437 )
3377 selection.beg.col = ncol; 3438 selection.beg.col = ncol;
3378 3439
3379 if ( 3440 if (
3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3441 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3381 && !ROW(selection.end.row).is_longer () 3442 && !ROW(selection.end.row).is_longer ()
3382#if ENABLE_FRILLS 3443#if !ENABLE_MINIMAL
3383 && !selection.rect 3444 && !selection.rect
3384#endif 3445#endif
3385 ) 3446 )
3386 selection.end.col = ncol; 3447 selection.end.col = ncol;
3387 } 3448 }
… …
3394 selection_delimit_word (DN, &selection.end, &selection.end); 3455 selection_delimit_word (DN, &selection.end, &selection.end);
3395 } 3456 }
3396 else if (selection.clicks == 3) 3457 else if (selection.clicks == 3)
3397 { 3458 {
3398#if ENABLE_FRILLS 3459#if ENABLE_FRILLS
3399 if (OPTION (Opt_tripleclickwords)) 3460 if (option (Opt_tripleclickwords))
3400 { 3461 {
3401 selection_delimit_word (UP, &selection.beg, &selection.beg); 3462 selection_delimit_word (UP, &selection.beg, &selection.beg);
3402 3463
3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3464 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3404 { 3465 {
3405 if (!ROW(end_row).is_longer ()) 3466 if (!ROW(end_row).is_longer ())
3406 { 3467 {
3407 selection.end.row = end_row; 3468 selection.end.row = end_row;
3408 selection.end.col = ROW(end_row).l; 3469 selection.end.col = ROW(end_row).l;
3470# if !ENABLE_MINIMAL
3409 selection_remove_trailing_spaces (); 3471 selection_remove_trailing_spaces ();
3472# endif
3410 break; 3473 break;
3411 } 3474 }
3412 } 3475 }
3413 } 3476 }
3414 else 3477 else
… …
3430 selection.end.row++; 3493 selection.end.row++;
3431 } 3494 }
3432 } 3495 }
3433 3496
3434 if (button3 && buttonpress) 3497 if (button3 && buttonpress)
3498 {
3435 { /* mark may need to be changed */ 3499 /* mark may need to be changed */
3436 if (closeto == LEFT) 3500 if (closeto == LEFT)
3437 { 3501 {
3438 selection.mark.row = selection.end.row; 3502 selection.mark.row = selection.end.row;
3439 selection.mark.col = selection.end.col - (selection.clicks == 2); 3503 selection.mark.col = selection.end.col - (selection.clicks == 2);
3440 } 3504 }
… …
3443 selection.mark.row = selection.beg.row; 3507 selection.mark.row = selection.beg.row;
3444 selection.mark.col = selection.beg.col; 3508 selection.mark.col = selection.beg.col;
3445 } 3509 }
3446 } 3510 }
3447 3511
3448#if ENABLE_FRILLS 3512#if !ENABLE_MINIMAL
3449 if (selection.rect && selection.beg.col > selection.end.col) 3513 if (selection.rect && selection.beg.col > selection.end.col)
3450 ::swap (selection.beg.col, selection.end.col); 3514 ::swap (selection.beg.col, selection.end.col);
3451#endif 3515#endif
3452} 3516}
3453 3517
3454#if ENABLE_FRILLS 3518#if !ENABLE_MINIMAL
3455void 3519void
3456rxvt_term::selection_remove_trailing_spaces () NOTHROW 3520rxvt_term::selection_remove_trailing_spaces () NOTHROW
3457{ 3521{
3458 int32_t end_col, end_row; 3522 int32_t end_col, end_row;
3459 text_t *stp; 3523 text_t *stp;
… …
3537 *target++ = xa[XA_COMPOUND_TEXT]; 3601 *target++ = xa[XA_COMPOUND_TEXT];
3538#if X_HAVE_UTF8_STRING 3602#if X_HAVE_UTF8_STRING
3539 *target++ = xa[XA_UTF8_STRING]; 3603 *target++ = xa[XA_UTF8_STRING];
3540#endif 3604#endif
3541 3605
3542 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3606 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3543 32, PropModeReplace, 3607 32, PropModeReplace,
3544 (unsigned char *)target_list, target - target_list); 3608 (unsigned char *)target_list, target - target_list);
3545 ev.property = rq.property; 3609 ev.property = rq.property;
3546 } 3610 }
3547#if TODO // TODO 3611#if TODO // TODO
… …
3550 /* TODO: Handle MULTIPLE */ 3614 /* TODO: Handle MULTIPLE */
3551 } 3615 }
3552#endif 3616#endif
3553 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3554 { 3618 {
3555 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3556 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3620 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3557 ev.property = rq.property; 3621 ev.property = rq.property;
3558 } 3622 }
3559 else if (rq.target == XA_STRING 3623 else if (rq.target == XA_STRING
3560 || rq.target == xa[XA_TEXT] 3624 || rq.target == xa[XA_TEXT]
… …
3584 style = enc_string; 3648 style = enc_string;
3585 else if (target == xa[XA_TEXT]) 3649 else if (target == xa[XA_TEXT])
3586 style = enc_text; 3650 style = enc_text;
3587 else if (target == xa[XA_COMPOUND_TEXT]) 3651 else if (target == xa[XA_COMPOUND_TEXT])
3588 style = enc_compound_text; 3652 style = enc_compound_text;
3589#if ENABLE_FRILLS 3653#if !ENABLE_MINIMAL
3590 else if (target == xa[XA_UTF8_STRING]) 3654 else if (target == xa[XA_UTF8_STRING])
3591 style = enc_utf8; 3655 style = enc_utf8;
3592#endif 3656#endif
3593 else 3657 else
3594 { 3658 {
… …
3605 { 3669 {
3606 cl = L""; 3670 cl = L"";
3607 selectlen = 0; 3671 selectlen = 0;
3608 } 3672 }
3609 3673
3610#if ENABLE_FRILLS 3674#if !ENABLE_MINIMAL
3611 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3675 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3612 // so recode it manually 3676 // so recode it manually
3613 if (style == enc_utf8) 3677 if (style == enc_utf8)
3614 { 3678 {
3615 freect = 1; 3679 freect = 1;
… …
3618 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3682 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3619 ct.nitems = strlen ((char *)ct.value); 3683 ct.nitems = strlen ((char *)ct.value);
3620 } 3684 }
3621 else 3685 else
3622#endif 3686#endif
3623 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3687 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3624 freect = 1; 3688 freect = 1;
3625 else 3689 else
3626 { 3690 {
3627 /* if we failed to convert then send it raw */ 3691 /* if we failed to convert then send it raw */
3628 ct.value = (unsigned char *)cl; 3692 ct.value = (unsigned char *)cl;
3629 ct.nitems = selectlen; 3693 ct.nitems = selectlen;
3630 ct.encoding = target; 3694 ct.encoding = target;
3631 } 3695 }
3632 3696
3633 XChangeProperty (xdisp, rq.requestor, rq.property, 3697 XChangeProperty (dpy, rq.requestor, rq.property,
3634 ct.encoding, 8, PropModeReplace, 3698 ct.encoding, 8, PropModeReplace,
3635 ct.value, (int)ct.nitems); 3699 ct.value, (int)ct.nitems);
3636 ev.property = rq.property; 3700 ev.property = rq.property;
3637 3701
3638 if (freect) 3702 if (freect)
3639 XFree (ct.value); 3703 XFree (ct.value);
3640 } 3704 }
3641 3705
3642 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3706 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3643}
3644
3645/* ------------------------------------------------------------------------- *
3646 * MOUSE ROUTINES *
3647 * ------------------------------------------------------------------------- */
3648
3649/*
3650 * return col/row values corresponding to x/y pixel values
3651 */
3652void
3653rxvt_term::pixel_position (int *x, int *y) NOTHROW
3654{
3655 *x = Pixel2Col (*x);
3656 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3657 *y = Pixel2Row (*y);
3658 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3659} 3707}
3660 3708
3661/* ------------------------------------------------------------------------- */ 3709/* ------------------------------------------------------------------------- */
3662#ifdef USE_XIM 3710#ifdef USE_XIM
3663void 3711void
3664rxvt_term::im_set_position (XPoint &pos) NOTHROW 3712rxvt_term::im_set_position (XPoint &pos) NOTHROW
3665{ 3713{
3666 XWindowAttributes xwa; 3714 XWindowAttributes xwa;
3667 3715
3668 XGetWindowAttributes (display->display, vt, &xwa); 3716 XGetWindowAttributes (dpy, vt, &xwa);
3669 3717
3670 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3718 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3719 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3672} 3720}
3673#endif 3721#endif
… …
3691 h += 2; min_it (h, nrow); 3739 h += 2; min_it (h, nrow);
3692 3740
3693 x -= 1; clamp_it (x, 0, ncol - w); 3741 x -= 1; clamp_it (x, 0, ncol - w);
3694 y -= 1; clamp_it (y, 0, nrow - h); 3742 y -= 1; clamp_it (y, 0, nrow - h);
3695 3743
3696 ov_x = x; ov_y = y; 3744 ov.x = x; ov.y = y;
3697 ov_w = w; ov_h = h; 3745 ov.w = w; ov.h = h;
3698 3746
3699 ov_text = new text_t *[h]; 3747 ov.text = new text_t *[h];
3700 ov_rend = new rend_t *[h]; 3748 ov.rend = new rend_t *[h];
3701 3749
3702 for (y = 0; y < h; y++) 3750 for (y = 0; y < h; y++)
3703 { 3751 {
3704 text_t *tp = ov_text[y] = new text_t[w]; 3752 text_t *tp = ov.text[y] = new text_t[w];
3705 rend_t *rp = ov_rend[y] = new rend_t[w]; 3753 rend_t *rp = ov.rend[y] = new rend_t[w];
3706 3754
3707 text_t t0, t1, t2; 3755 text_t t0, t1, t2;
3708 rend_t r = OVERLAY_RSTYLE; 3756 rend_t r = OVERLAY_RSTYLE;
3709 3757
3710 if (y == 0) 3758 if (y == 0)
… …
3729} 3777}
3730 3778
3731void 3779void
3732rxvt_term::scr_overlay_off () NOTHROW 3780rxvt_term::scr_overlay_off () NOTHROW
3733{ 3781{
3734 if (!ov_text) 3782 if (!ov.text)
3735 return; 3783 return;
3736 3784
3737 want_refresh = 1; 3785 want_refresh = 1;
3738 3786
3739 for (int y = 0; y < ov_h; y++) 3787 for (int y = 0; y < ov.h; y++)
3740 { 3788 {
3741 delete [] ov_text[y]; 3789 delete [] ov.text[y];
3742 delete [] ov_rend[y]; 3790 delete [] ov.rend[y];
3743 } 3791 }
3744 3792
3745 delete [] ov_text; ov_text = 0; 3793 delete [] ov.text; ov.text = 0;
3746 delete [] ov_rend; ov_rend = 0; 3794 delete [] ov.rend; ov.rend = 0;
3747} 3795}
3748 3796
3749void 3797void
3750rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3798rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3751{ 3799{
3752 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3800 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3753 return; 3801 return;
3754 3802
3755 x++, y++; 3803 x++, y++;
3756 3804
3757 ov_text[y][x] = text; 3805 ov.text[y][x] = text;
3758 ov_rend[y][x] = rend; 3806 ov.rend[y][x] = rend;
3759} 3807}
3760 3808
3761void 3809void
3762rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3810rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3763{ 3811{
… …
3782} 3830}
3783 3831
3784void 3832void
3785rxvt_term::scr_swap_overlay () NOTHROW 3833rxvt_term::scr_swap_overlay () NOTHROW
3786{ 3834{
3787 if (!ov_text) 3835 if (!ov.text)
3788 return; 3836 return;
3789 3837
3838 // hide cursor if it is within the overlay area
3839 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3840 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3841 screen.flags &= ~Screen_VisibleCursor;
3842
3790 // swap screen mem with overlay 3843 // swap screen mem with overlay
3791 for (int y = ov_h; y--; ) 3844 for (int y = ov.h; y--; )
3792 { 3845 {
3793 text_t *t1 = ov_text[y]; 3846 text_t *t1 = ov.text[y];
3794 rend_t *r1 = ov_rend[y]; 3847 rend_t *r1 = ov.rend[y];
3795 3848
3796 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3849 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3797 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3850 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3798 3851
3799 for (int x = ov_w; x--; ) 3852 for (int x = ov.w; x--; )
3800 { 3853 {
3801 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3854 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3802 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3855 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3803 } 3856 }
3804 } 3857 }

Diff Legend

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