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.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.315 by root, Tue Nov 4 14:38:29 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 begin, 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 * ------------------------------------------------------------------------- */
… …
161{ 162{
162#if ENABLE_OVERLAY 163#if ENABLE_OVERLAY
163 scr_overlay_off (); 164 scr_overlay_off ();
164#endif 165#endif
165 166
167 rvideo_mode = false;
166 view_start = 0; 168 view_start = 0;
167 num_scr = 0; 169 num_scr = 0;
168 170
169 if (ncol == 0) 171 if (ncol == 0)
170 ncol = 80; 172 ncol = 80;
… …
237 selection.text = NULL; 239 selection.text = NULL;
238 selection.len = 0; 240 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 241 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 242 selection.screen = PRIMARY;
241 selection.clicks = 0; 243 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 244 }
244 else 245 else
245 { 246 {
246 /* 247 /*
247 * add or delete rows as appropriate 248 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 278 }
278 279
279 line_t *old_buf = row_buf; 280 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 282
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 284 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 285 int q = total_rows; // rewrapped row
285 286
286 if (top_row) 287 if (top_row)
… …
330 int qcol = 0; 331 int qcol = 0;
331 332
332 // see below for cursor adjustment rationale 333 // see below for cursor adjustment rationale
333 if (p == ocur.row) 334 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 335 screen.cur.row = q - (total_rows - nrow);
335 336
336 // fill a single destination line 337 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 338 while (lofs < llen && qcol < ncol)
338 { 339 {
339 int prow = lofs / prev_ncol; 340 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 341 int pcol = lofs % prev_ncol;
… …
366 } 367 }
367 while (p != pend && q > 0); 368 while (p != pend && q > 0);
368 369
369 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
370 top_row = q - term_start; 371 top_row = q - term_start;
371 372
372 // make sure all terminal lines exist 373 // make sure all terminal lines exist
373 while (top_row > 0) 374 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 376 }
376 else 377 else
377 { 378 {
378 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
379 380
380 for (int row = min (nrow, prev_nrow); row--; ) 381 for (int row = min (nrow, prev_nrow); row--; )
381 { 382 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 384 line_t &qline = row_buf [row];
384 385
… …
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 prev_ncol = ncol;
411 412
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 413 tabs = (char *)rxvt_malloc (ncol);
413 414
414 for (int col = ncol; col--; ) 415 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
416 417
417 if (current_screen != PRIMARY) 418 if (current_screen != PRIMARY)
418 scr_swap_screen (); 419 scr_swap_screen ();
419 420
… …
510} 511}
511 512
512void 513void
513rxvt_term::scr_swap_screen () 514rxvt_term::scr_swap_screen ()
514{ 515{
515 if (!OPTION (Opt_secondaryScreen)) 516 if (!option (Opt_secondaryScreen))
516 return; 517 return;
517 518
518 for (int i = prev_nrow; i--; ) 519 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 520 ::swap (ROW(i), swap_buf [i]);
520 521
… …
542 selection_check (2); /* check for boundary cross */ 543 selection_check (2); /* check for boundary cross */
543 544
544 int i = current_screen; current_screen = scrn; scrn = i; 545 int i = current_screen; current_screen = scrn; scrn = i;
545 546
546#if NSCREENS 547#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 548 if (option (Opt_secondaryScreen))
548 { 549 {
549 num_scr = 0; 550 num_scr = 0;
550 551
551 scr_swap_screen (); 552 scr_swap_screen ();
552 553
… …
555 screen.flags |= Screen_VisibleCursor; 556 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 557 swap.flags |= Screen_VisibleCursor;
557 } 558 }
558 else 559 else
559#endif 560#endif
560 if (OPTION (Opt_secondaryScroll)) 561 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 562 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 563}
563 564
564// clear WrapNext indicator, solidifying position on next line 565// clear WrapNext indicator, solidifying position on next line
565void 566void
… …
598/* 599/*
599 * Change the rendition style for following text 600 * Change the rendition style for following text
600 */ 601 */
601void 602void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 603rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 604{
604 if (set) 605 if (set)
605 rstyle |= style; 606 rstyle |= style;
606 else if (style == ~RS_None) 607 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 608 rstyle = DEFAULT_RSTYLE;
608 else 609 else
609 rstyle &= ~style; 610 rstyle &= ~style;
610 } 611}
611 612
612/* ------------------------------------------------------------------------- */ 613/* ------------------------------------------------------------------------- */
613/* 614/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 615 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 616 * count positive ==> scroll up
… …
624 want_refresh = 1; 625 want_refresh = 1;
625 num_scr += count; 626 num_scr += count;
626 627
627 if (count > 0 628 if (count > 0
628 && row1 == 0 629 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 630 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 631 {
631 top_row = max (top_row - count, -saveLines); 632 top_row = max (top_row - count, -saveLines);
632 633
633 // scroll everything up 'count' lines 634 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 635 term_start = (term_start + count) % total_rows;
… …
641 } 642 }
642 643
643 // erase newly scrolled-in lines 644 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 645 for (int i = count; i--; )
645 { 646 {
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); 647 line_t &l = ROW(nrow - 1 - i);
649 648
649 // optimize if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 {
650 scr_blank_line (l, 0, l.l, rstyle); 653 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 654 l.l = 0;
653 l.f = 0; 655 l.f = 0;
656 }
657 else
658 scr_blank_screen_mem (l, rstyle);
654 } 659 }
655 660
656 // now copy lines below the scroll region bottom to the 661 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 662 // bottom of the screen again, so they look as if they
658 // hadn't moved. 663 // hadn't moved.
… …
662 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
663 668
664 ::swap (l1, l2); 669 ::swap (l1, l2);
665 l2.touch (); 670 l2.touch ();
666 } 671 }
667 672
668 // move and/or clear selection, if any 673 // move and/or clear selection, if any
669 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
670 { 675 {
671 selection.beg.row -= count; 676 selection.beg.row -= count;
672 selection.end.row -= count; 677 selection.end.row -= count;
… …
680 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
681 } 686 }
682 } 687 }
683 688
684 // finally move the view window, if desired 689 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 691 && view_start != 0
687 && view_start != -saveLines) 692 && view_start != -saveLines)
688 scr_page (UP, count); 693 scr_page (UP, count);
689 694
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
708 { 713 {
709 /* move selected region too */ 714 /* move selected region too */
710 selection.beg.row -= count; 715 selection.beg.row -= count;
711 selection.end.row -= count; 716 selection.end.row -= count;
712 selection.mark.row -= count; 717 selection.mark.row -= count;
713 718
714 selection_check (0); 719 selection_check (0);
715 } 720 }
716 } 721 }
717 722
718 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
785 790
786 while (str < strend) 791 while (str < strend)
787 { 792 {
788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
789 794
790 if (c < 0x20) 795 if (expect_false (c < 0x20))
791 if (c == C0_LF) 796 if (c == C0_LF)
792 { 797 {
793 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
794 799
795 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
814 { 819 {
815 scr_tab (1, true); 820 scr_tab (1, true);
816 continue; 821 continue;
817 } 822 }
818 823
824 if (expect_false (
819 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
820 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
821 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
822 { 829 {
823 checksel = 0; 830 checksel = 0;
824 /* 831 /*
825 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
826 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
827 * should be a similar check. 834 * should be a similar check.
828 */ 835 */
829 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
830 } 837 }
831 838
832 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
833 { 840 {
834 scr_do_wrap (); 841 scr_do_wrap ();
835 842
836 line->l = ncol; 843 line->l = ncol;
837 line->is_longer (1); 844 line->is_longer (1);
838 845
839 row = screen.cur.row; 846 row = screen.cur.row;
840 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
841 } 848 }
842 849
843 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
844 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
845 c = 0xfffd; 852 c = 0xfffd;
846 853
847 // rely on wcwidth to tell us the character width, at least for non-latin1 854 // rely on wcwidth to tell us the character width, do wcwidth before
848 // do wcwidth before further replacements, as wcwidth might return -1 855 // further replacements, as wcwidth might return -1 for the line
849 // for the line drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
850 // locale. 857 // locale.
851 int width = c < 0x100 ? 1 : wcwidth (c); 858 int width = WCWIDTH (c);
852 859
853 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
854 { 861 {
855 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
856 // 5f-7e standard vt100 863 // 5f-7e standard vt100
857 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
858 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
871 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
872 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
873 } 880 }
874 } 881 }
875 882
876 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
877 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
878 885
879 if (width != 0) 886 if (width != 0)
880 { 887 {
881#if !UNICODE_3 888#if !UNICODE_3
… …
887 c = 0xfffd; 894 c = 0xfffd;
888# endif 895# endif
889#endif 896#endif
890 897
891 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
892 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
893 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
894 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
895 { 903 ))
896 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
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 905
912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
913 907
914 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
915 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
916 { 910 {
917 // ...output spaces 911 // ...output spaces
918 c = ' '; 912 c = ' ';
919 // and try the same character next loop iteration 913 // and try the same character next loop iteration
920 --str; 914 --str;
… …
925 do 919 do
926 { 920 {
927 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
928 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
929 923
930 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
931 screen.cur.col++; 925 screen.cur.col++;
932 else 926 else
933 { 927 {
934 line->l = ncol; 928 line->l = ncol;
935 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
937 break; 931 break;
938 } 932 }
939 933
940 c = NOCHAR; 934 c = NOCHAR;
941 } 935 }
942 while (--width > 0); 936 while (expect_false (--width > 0));
943 937
944 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
945 if (!width) 939 if (expect_false (!width))
946 { 940 {
947 line->touch (); 941 line->touch ();
948 942
949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
950 { 944 {
951 line->t[c] = ' '; 945 line->t[c] = ' ';
952 line->r[c] = rend; 946 line->r[c] = rend;
953 } 947 }
954 } 948 }
955 } 949 }
950#if ENABLE_COMBINING
956 else // width == 0 951 else // width == 0
957 { 952 {
958#if ENABLE_COMBINING 953 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 { 954 {
955 // handle combining characters
956 // we just tag the accent on the previous on-screen character.
957 // this is arguably not correct, but also arguably not wrong.
958 // we don't handle double-width characters nicely yet.
959 line_t *linep;
960 text_t *tp;
961 rend_t *rp;
962
963 if (screen.cur.col > 0)
964 {
969 linep = line; 965 linep = line;
970 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
971 rp = line->r + screen.cur.col - 1; 967 rp = line->r + screen.cur.col - 1;
968 }
969 else if (screen.cur.row > 0
970 && ROW(screen.cur.row - 1).is_longer ())
971 {
972 linep = &ROW(screen.cur.row - 1);
973 tp = line->t + ncol - 1;
974 rp = line->r + ncol - 1;
975 }
976 else
977 continue;
978
979 linep->touch ();
980
981 while (*tp == NOCHAR && tp > linep->t)
982 tp--, rp--;
983
984 // first try to find a precomposed character
985 unicode_t n = rxvt_compose (*tp, c);
986 if (n == NOCHAR)
987 n = rxvt_composite.compose (*tp, c);
988
989 *tp = n;
990 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
972 } 991 }
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 } 992 }
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 993#endif
996 }
997 } 994 }
998 995
999 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1000 997
1001#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1009 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1010 */ 1007 */
1011void 1008void
1012rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1013{ 1010{
1014 want_refresh = 1;
1015
1016 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1017 { 1012 {
1018 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1019 { 1014 {
1020#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1021 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1022 screen.cur.row--; 1017 --screen.cur.row;
1023 return; 1018
1019 want_refresh = 1;
1024#endif 1020#endif
1025 } 1021 }
1026 } 1022 }
1027 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1028 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1029
1030 screen.flags &= ~Screen_WrapNext;
1031} 1025}
1032 1026
1033/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1034/* 1028/*
1035 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1058 x = i; 1052 x = i;
1059 1053
1060 if (!--count) 1054 if (!--count)
1061 break; 1055 break;
1062 } 1056 }
1063 else 1057 else
1064 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1065 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1066 1060
1067 if (count) 1061 if (count)
1068 x = ncol - 1; 1062 x = ncol - 1;
1069 1063
1070 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1071 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1072 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1073 { 1067 {
1074 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1075 1069
1076 l.touch (x); 1070 l.touch (x);
1077 1071
… …
1110 * Process DEC Back Index 1104 * Process DEC Back Index
1111 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1112 * Move cursor left in row. If we're at the left boundary, shift everything 1106 * Move cursor left in row. If we're at the left boundary, shift everything
1113 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1114 */ 1108 */
1115#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1116void 1110void
1117rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1118{ 1112{
1119 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1127 * Process DEC Forward Index 1121 * Process DEC Forward Index
1128 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1129 * Move cursor right in row. If we're at the right boundary, shift everything 1123 * Move cursor right in row. If we're at the right boundary, shift everything
1130 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1131 */ 1125 */
1132#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1133void 1127void
1134rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1135{ 1129{
1136 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1184 } 1178 }
1185 } 1179 }
1186 else 1180 else
1187 { 1181 {
1188 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1189 { /* relative origin mode */ 1184 /* relative origin mode */
1190 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1191 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1192 } 1187 }
1193 else 1188 else
1194 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1227/* 1222/*
1228 * Erase part or whole of a line 1223 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1226 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1227 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1228 */
1233void 1229void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1231{
1236 unsigned int col, num; 1232 unsigned int col, num;
… …
1245 line.touch (); 1241 line.touch ();
1246 line.is_longer (0); 1242 line.is_longer (0);
1247 1243
1248 switch (mode) 1244 switch (mode)
1249 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1250 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1253 col = screen.cur.col;
1252 num = ncol - col; 1254 num = ncol - col;
1253 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1257 break; 1260 break;
1261
1258 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1259 col = 0; 1263 col = 0;
1260 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1264 break; 1269 break;
1270
1265 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1266 col = 0; 1272 col = 0;
1267 num = ncol; 1273 num = ncol;
1268 line.l = 0; 1274 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1328 return; 1334 return;
1329 1335
1330 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1331 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1332 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1342 {
1336 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1344
1345 if (mapped)
1346 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False);
1338 } 1349 }
1339 else 1350 else
1340 { 1351 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1347 } 1362 }
1348 1363
1349 for (; num--; row++) 1364 for (; num--; row++)
1350 { 1365 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1353 } 1368 }
1354} 1369}
1355 1370
1356#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1357void 1372void
1358rxvt_term::scr_erase_savelines () NOTHROW 1373rxvt_term::scr_erase_savelines () NOTHROW
1359{ 1374{
1360 want_refresh = 1; 1375 want_refresh = 1;
1361 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1431 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1432 */ 1447 */
1433void 1448void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1450{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1451 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1441 1453
1442 if (count <= 0) 1454 if (count <= 0)
1443 return; 1455 return;
… …
1445 scr_do_wrap (); 1457 scr_do_wrap ();
1446 1458
1447 selection_check (1); 1459 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1449 1461
1450 row = screen.cur.row; 1462 int row = screen.cur.row;
1451 1463
1452 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1453 1465
1454 line->touch (); 1466 line->touch ();
1455 line->is_longer (0); 1467 line->is_longer (0);
1456 1468
1469 // nuke wide char at beginning
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1457 switch (insdel) 1473 switch (insdel)
1458 { 1474 {
1459 case INSERT: 1475 case INSERT:
1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1476 line->l = min (line->l + count, ncol);
1477
1478 if (line->t[screen.cur.col] == NOCHAR)
1479 scr_kill_char (*line, screen.cur.col);
1480
1481 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1461 { 1482 {
1462 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1464 } 1485 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1486
1468 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1489 {
1471 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1472 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1473 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1474 else 1493 else
1494 {
1475 { /* shift selection */ 1495 /* shift selection */
1476 selection.beg.col += count; 1496 selection.beg.col += count;
1477 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1478 selection.end.col += count; 1498 selection.end.col += count;
1479 } 1499 }
1480 } 1500 }
… …
1485 case ERASE: 1505 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1507 selection_check (1);
1488 screen.cur.col -= count; 1508 screen.cur.col -= count;
1489 1509
1490 line->l = max (line->l - count, 0); 1510 // nuke wide char after the end
1511 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1512 scr_kill_char (*line, screen.cur.col + count);
1513
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1515 break;
1493 1516
1494 case DELETE: 1517 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0);
1520
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1496 1522
1497 for (col = screen.cur.col; (col + count) < ncol; col++) 1523 for (int col = screen.cur.col; (col + count) < ncol; col++)
1498 { 1524 {
1499 line->t[col] = line->t[col + count]; 1525 line->t[col] = line->t[col + count];
1500 line->r[col] = line->r[col + count]; 1526 line->r[col] = line->r[col + count];
1501 } 1527 }
1502 1528
1503 line->l = max (line->l - count, 0); 1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1504 scr_blank_line (*line, ncol - count, count, tr); 1533 scr_blank_line (*line, ncol - count, count, tr);
1505 1534
1506 if (selection.op && current_screen == selection.screen 1535 if (selection.op && current_screen == selection.screen
1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1508 { 1537 {
1509 if (selection.end.row != screen.cur.row 1538 if (selection.end.row != screen.cur.row
1510 || (screen.cur.col >= selection.beg.col - count) 1539 || (screen.cur.col >= selection.beg.col - count)
1511 || selection.end.col >= ncol) 1540 || selection.end.col >= ncol)
1512 CLEAR_SELECTION (); 1541 CLEAR_SELECTION ();
1513 else 1542 else
1514 { 1543 {
1515 /* shift selection */ 1544 /* shift selection */
1516 selection.beg.col -= count; 1545 selection.beg.col -= count;
1517 selection.mark.col -= count; /* XXX: yes? */ 1546 selection.mark.col -= count; /* XXX: yes? */
1518 selection.end.col -= count; 1547 selection.end.col -= count;
1519 } 1548 }
1549 }
1520 } 1550 }
1521 1551
1522 break; 1552 break;
1523 } 1553 }
1524} 1554}
… …
1619 */ 1649 */
1620void 1650void
1621rxvt_term::scr_set_tab (int mode) NOTHROW 1651rxvt_term::scr_set_tab (int mode) NOTHROW
1622{ 1652{
1623 if (mode < 0) 1653 if (mode < 0)
1624 memset (tabs, 0, ncol * sizeof (char)); 1654 memset (tabs, 0, ncol);
1625 else if (screen.cur.col < ncol) 1655 else if (screen.cur.col < ncol)
1626 tabs [screen.cur.col] = !!mode; 1656 tabs [screen.cur.col] = !!mode;
1627} 1657}
1628 1658
1629/* ------------------------------------------------------------------------- */ 1659/* ------------------------------------------------------------------------- */
… …
1644 if (rvideo_state != on) 1674 if (rvideo_state != on)
1645 { 1675 {
1646 rvideo_state = on; 1676 rvideo_state = on;
1647 1677
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#if XPM_BACKGROUND 1679#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1680 if (bgPixmap.pixmap == None)
1651#endif 1681#endif
1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif
1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1683
1657 XGCValues gcvalue; 1684 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1685 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1686 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1687 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1688
1662 scr_clear (); 1689 scr_clear ();
1663 scr_touch (true); 1690 scr_touch (true);
1664 } 1691 }
1665} 1692}
… …
1750{ 1777{
1751 bool found = false; 1778 bool found = false;
1752 1779
1753 for (int i = 0; i < nrow; i++) 1780 for (int i = 0; i < nrow; i++)
1754 { 1781 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1782 rend_t *drp = drawn_buf[i].r;
1757 1783
1758 for (; col < ncol; col++, drp++) 1784 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1785 if ((*drp & mask) == value)
1760 { 1786 {
1761 found = true; 1787 found = true;
1762 *drp = ~value; 1788 *drp = ~value;
1763 } 1789 }
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1829 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1830 {
1805 min_it (rc[i].col, ncol - 1); 1831 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1832 min_it (rc[i].row, nrow - 1);
1807 } 1833 }
1808 1834// 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++) 1835 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); 1836 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1837
1812 num_scr_allow = 0; 1838 num_scr_allow = 0;
1813 1839
… …
1868 return true; 1894 return true;
1869} 1895}
1870 1896
1871#ifndef NO_BELL 1897#ifndef NO_BELL
1872void 1898void
1873rxvt_term::bell_cb (time_watcher &w) 1899rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1900{
1875 rvideo_bell = false; 1901 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1902 scr_rvideo_mode (rvideo_mode);
1903 refresh_check ();
1877} 1904}
1878#endif 1905#endif
1879 1906
1880/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1881void 1908void
… …
1883{ 1910{
1884#ifndef NO_BELL 1911#ifndef NO_BELL
1885 1912
1886# ifndef NO_MAPALERT 1913# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1914# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1915 if (option (Opt_mapAlert))
1889# endif 1916# endif
1890 XMapWindow (display->display, parent[0]); 1917 XMapWindow (dpy, parent[0]);
1891# endif 1918# endif
1892 1919
1920# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell))
1922 set_urgency (1);
1923# endif
1924
1893 if (OPTION (Opt_visualBell)) 1925 if (option (Opt_visualBell))
1894 { 1926 {
1895 rvideo_bell = true; 1927 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode); 1928 scr_rvideo_mode (rvideo_mode);
1897 display->flush (); 1929 flush ();
1898 1930
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1931 bell_ev.start (VISUAL_BELL_DURATION);
1900 } 1932 }
1901 else 1933 else
1902 XBell (display->display, 0); 1934 XBell (dpy, 0);
1903
1904#endif 1935#endif
1905} 1936}
1906 1937
1907/* ------------------------------------------------------------------------- */ 1938/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1939/* ARGSUSED */
1909void 1940void
1910rxvt_term::scr_printscreen (int fullhist) NOTHROW 1941rxvt_term::scr_printscreen (int fullhist) NOTHROW
1911{ 1942{
1912#ifdef PRINTPIPE 1943#ifdef PRINTPIPE
1913 int nrows, row_start; 1944 int nrows, row_start;
1914 FILE *fd; 1945 FILE *fd = popen_printer ();
1915 1946
1916 if ((fd = popen_printer ()) == NULL) 1947 if (!fd)
1917 return; 1948 return;
1918 1949
1919 if (fullhist) 1950 if (fullhist)
1920 { 1951 {
1921 nrows = nrow - top_row; 1952 nrows = nrow - top_row;
… …
1966 * screen.text/screen.rend contain what the screen will change to. 1997 * screen.text/screen.rend contain what the screen will change to.
1967 */ 1998 */
1968void 1999void
1969rxvt_term::scr_refresh () NOTHROW 2000rxvt_term::scr_refresh () NOTHROW
1970{ 2001{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */ 2002 unsigned char have_bg,
1972 showcursor; /* show the cursor */ 2003 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 2004 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 2005 ocrow; /* old cursor row */
1975 int i; /* tmp */ 2006 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 2008 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 2009#endif
1979 rend_t *crp; // cursor rendition pointer 2010 rend_t *crp; // cursor rendition pointer
2011 rend_t ccol1, /* Cursor colour */
2012 ccol2; /* Cursor colour2 */
1980 2013
1981 want_refresh = 0; /* screen is current */ 2014 want_refresh = 0; /* screen is current */
1982 2015
1983 if (refresh_type == NO_REFRESH || !mapped) 2016 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2017 return;
1985 2018
1986 /* 2019 /*
1987 * A: set up vars 2020 * A: set up vars
1988 */ 2021 */
1989 must_clear = 0;
1990 refresh_count = 0; 2022 refresh_count = 0;
1991 2023
1992#if XPM_BACKGROUND 2024 have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2026 have_bg = bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2027#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2029
2000 /* 2030 /*
2001 * B: reverse any characters which are selected 2031 * B: reverse any characters which are selected
… …
2005 /* 2035 /*
2006 * C: set the cursor character (s) 2036 * C: set the cursor character (s)
2007 */ 2037 */
2008 { 2038 {
2009 unsigned char setoldcursor; 2039 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2040
2013 showcursor = (screen.flags & Screen_VisibleCursor); 2041 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2042#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2043 if (hidden_cursor)
2016 showcursor = 0; 2044 showcursor = 0;
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2051 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2052 col--;
2025 2053
2026 crp = &ROW(screen.cur.row).r[col]; 2054 crp = &ROW(screen.cur.row).r[col];
2027 2055
2056#ifndef NO_CURSORCOLOR
2057 cc1 = *crp & (RS_fgMask | RS_bgMask);
2058 if (ISSET_PIXCOLOR (Color_cursor))
2059 ccol1 = Color_cursor;
2060 else
2061#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2063 ccol1 = fgcolor_of (rstyle);
2064#else
2065 ccol1 = Color_fg;
2066#endif
2067
2068#ifndef NO_CURSORCOLOR
2069 if (ISSET_PIXCOLOR (Color_cursor2))
2070 ccol2 = Color_cursor2;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol2 = bgcolor_of (rstyle);
2075#else
2076 ccol2 = Color_bg;
2077#endif
2078
2028 if (showcursor && focus) 2079 if (showcursor && focus)
2029 { 2080 {
2030 if (OPTION (Opt_cursorUnderline)) 2081 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2082 *crp ^= RS_Uline;
2032 else 2083 else
2033 { 2084 {
2034 *crp ^= RS_RVid; 2085 *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); 2086 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2087 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2088 }
2058 } 2089 }
2059 } 2090 }
2060 2091
2061 /* make sure no outline cursor is left around */ 2092 /* make sure no outline cursor is left around */
… …
2100 * D: CopyArea pass - very useful for slower links 2131 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2132 * This has been deliberately kept simple.
2102 */ 2133 */
2103 if (!display->is_local 2134 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2135 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2136 && abs (num_scr) < nrow && !have_bg)
2106 { 2137 {
2107 int16_t nits; 2138 int16_t nits;
2139 int i = num_scr;
2108 int j; 2140 int j;
2109 int len, wlen; 2141 int len, wlen;
2110 dLocal (int, num_scr); 2142 dLocal (int, num_scr);
2111 2143
2112 j = nrow; 2144 j = nrow;
2113 wlen = len = -1; 2145 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2146 row = i > 0 ? 0 : j - 1;
2147
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2148 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2149 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2150 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2151 {
2119 line_t s = ROW(view_start + row); 2152 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2173 wlen = row;
2141 continue; 2174 continue;
2142 } 2175 }
2143 } 2176 }
2144 2177
2145 if (len != -1) 2178 if (len >= 0)
2146 { 2179 {
2147 /* also comes here at end if needed because of >= above */ 2180 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2181 if (wlen < len)
2149 ::swap (wlen, len); 2182 ::swap (wlen, len);
2150 2183
2184 XGCValues gcv;
2185
2186 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (display->display, vt, vt, 2187 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2188 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2189 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2190 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2191 0, Row2Pixel (len));
2192 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2193
2156 len = -1; 2194 len = -1;
2157 } 2195 }
2158 } 2196 }
2159 } 2197 }
2160#endif 2198#endif
… …
2184 continue; 2222 continue;
2185 2223
2186 // redraw one or more characters 2224 // redraw one or more characters
2187 2225
2188 // seek to the beginning of wide characters 2226 // seek to the beginning of wide characters
2189 while (stp[col] == NOCHAR && col > 0) 2227 while (expect_false (stp[col] == NOCHAR && col > 0))
2190 --col; 2228 --col;
2191 2229
2192 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2193 text_t *text = stp + col; 2231 text_t *text = stp + col;
2194 int count = 1; 2232 int count = 1;
… …
2216 count++; 2254 count++;
2217 2255
2218 if (stp[col] != dtp[col] 2256 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2257 || !RS_SAME (srp[col], drp[col]))
2220 { 2258 {
2221 if (must_clear && (i++ > count / 2)) 2259 if (have_bg && (i++ > count / 2))
2222 break; 2260 break;
2223 2261
2224 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2225 drp[col] = rend; 2263 drp[col] = rend;
2226 i = 0; 2264 i = 0;
2227 } 2265 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2266 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2267 break;
2230 } 2268 }
2231 2269
2232 col--; /* went one too far. move back */ 2270 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2271 count -= i; /* dump any matching trailing chars */
2234 2272
2235 // sometimes we optimize away the trailing NOCHAR's, add them back 2273 // sometimes we optimize away the trailing NOCHAR's, add them back
2236 while (i && text[count] == NOCHAR) 2274 while (expect_false (i && text[count] == NOCHAR))
2237 count++, i--; 2275 count++, i--;
2238 2276
2239 /* 2277 /*
2240 * Determine the attributes for the string 2278 * Determine the attributes for the string
2241 */ 2279 */
2242 int fore = fgcolor_of (rend); // desired foreground 2280 int fore = fgcolor_of (rend); // desired foreground
2243 int back = bgcolor_of (rend); // desired background 2281 int back = bgcolor_of (rend); // desired background
2244 2282
2245 // only do special processing if any attributes are set, which is unlikely 2283 // 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)) 2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2247 { 2285 {
2248#if ENABLE_STYLES
2249 // force redraw after "careful" characters to avoid pixel droppings
2250 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2251 drp[col + 1] = ~srp[col + 1];
2252
2253 // include previous careful character(s) if possible, looks nicer (best effort...)
2254 while (text > stp
2255 && srp[text - stp - 1] & RS_Careful
2256 && RS_SAME (rend, srp[text - stp - 1]))
2257 text--, count++, xpixel -= fwidth;
2258#endif
2259
2260 bool invert = rend & RS_RVid; 2286 bool invert = rend & RS_RVid;
2261 2287
2262#ifndef NO_BOLD_UNDERLINE_REVERSE 2288#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (rend & RS_Bold
2264 && fore == Color_fg) 2289 if (rend & RS_Bold && fore == Color_fg)
2265 { 2290 {
2266 if (ISSET_PIXCOLOR (Color_BD)) 2291 if (ISSET_PIXCOLOR (Color_BD))
2267 fore = Color_BD; 2292 fore = Color_BD;
2268# if !ENABLE_STYLES 2293# if !ENABLE_STYLES
2269 else 2294 else
2270 invert = !invert; 2295 invert = !invert;
2271# endif 2296# endif
2272 } 2297 }
2273 2298
2274 if (rend & RS_Italic 2299 if (rend & RS_Italic && fore == Color_fg)
2275 && fore == Color_fg)
2276 { 2300 {
2277 if (ISSET_PIXCOLOR (Color_IT)) 2301 if (ISSET_PIXCOLOR (Color_IT))
2278 fore = Color_IT; 2302 fore = Color_IT;
2279# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2280 else 2304 else
2281 invert = !invert; 2305 invert = !invert;
2282# endif 2306# endif
2283 } 2307 }
2284 2308
2285 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2286 fore = Color_UL; 2310 fore = Color_UL;
2287#endif 2311#endif
2288 2312
2289 if (invert) 2313 if (invert)
2290 { 2314 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2291 ::swap (fore, back); 2321 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2292 2326
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2327#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2294 if (ISSET_PIXCOLOR (Color_RV)) 2329 if (ISSET_PIXCOLOR (Color_RV))
2295 back = Color_RV; 2330 back = Color_RV;
2296 2331# endif
2297 if (fore == back) 2332 if (fore == back)
2298 { 2333 {
2299 fore = Color_bg; 2334 fore = Color_bg;
2300 back = Color_fg; 2335 back = Color_fg;
2301 } 2336 }
… …
2303 } 2338 }
2304 2339
2305#ifdef TEXT_BLINK 2340#ifdef TEXT_BLINK
2306 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2341 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2307 { 2342 {
2308 if (!text_blink_ev.active) 2343 if (!text_blink_ev.is_active ())
2309 { 2344 {
2310 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2345 text_blink_ev.again ();
2311 hidden_text = 0; 2346 hidden_text = 0;
2312 } 2347 }
2313 else if (hidden_text) 2348 else if (hidden_text)
2314 fore = back; 2349 fore = back;
2315 } 2350 }
2316#endif 2351#endif
2352
2353#if ENABLE_STYLES
2354 // "careful" (too wide) character handling
2355
2356 // include previous careful character(s) if possible, looks nicer (best effort...)
2357 while (text > stp
2358 && srp[text - stp - 1] & RS_Careful
2359 && RS_SAME (rend, srp[text - stp - 1]))
2360 text--, count++, xpixel -= fwidth;
2361
2362 // force redraw after "careful" characters to avoid pixel droppings
2363 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2364 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2365
2366 // force redraw before "careful" characters to avoid pixel droppings
2367 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2368 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2369#endif
2317 } 2370 }
2318 2371
2319 /* 2372 /*
2320 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2321 */ 2374 */
2322 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2323 2376
2324 if (back == fore) 2377 if (expect_true (have_bg && back == Color_bg))
2325 font->clear_rect (*drawable, xpixel, ypixel,
2326 fwidth * count, fheight,
2327 back);
2328 else if (back == Color_bg)
2329 { 2378 {
2330 if (must_clear) 2379 // this is very ugly, maybe push it into ->draw?
2331 {
2332 CLEAR_CHARS (xpixel, ypixel, count);
2333 2380
2334 for (i = 0; i < count; i++) /* don't draw empty strings */ 2381 for (i = 0; i < count; i++) /* don't draw empty strings */
2335 if (text[i] != ' ') 2382 if (text[i] != ' ')
2336 { 2383 {
2337 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2384 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2338 break; 2385 goto did_clear;
2339 }
2340 } 2386 }
2341 else 2387
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2388 CLEAR_CHARS (xpixel, ypixel, count);
2389 did_clear: ;
2343 } 2390 }
2344 else 2391 else
2345 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2346 2393
2347 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2348 { 2395 {
2349#if ENABLE_FRILLS 2396#if ENABLE_FRILLS
2350 if (ISSET_PIXCOLOR (Color_underline)) 2397 if (ISSET_PIXCOLOR (Color_underline))
2351 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2398 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2352 else 2399 else
2353#endif 2400#endif
2354 XSetForeground (display->display, gc, pix_colors[fore]); 2401 XSetForeground (dpy, gc, pix_colors[fore]);
2355 2402
2356 XDrawLine (display->display, drawBuffer, gc, 2403 XDrawLine (dpy, vt, gc,
2357 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2358 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2359 } 2406 }
2360 } /* for (col....) */ 2407 } /* for (col....) */
2361 } /* for (row....) */ 2408 } /* for (row....) */
… …
2370 */ 2417 */
2371 if (showcursor) 2418 if (showcursor)
2372 { 2419 {
2373 if (focus) 2420 if (focus)
2374 { 2421 {
2375 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2376 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2377 else 2424 else
2378 { 2425 {
2379 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2380#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2394 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2395 cursorwidth++; 2442 cursorwidth++;
2396 2443
2397#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2398 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2399 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2400#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2401 2450
2402 XDrawRectangle (display->display, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2403 Col2Pixel (col), 2452 Col2Pixel (col),
2404 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2405 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2406 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2407 } 2456 }
… …
2442} 2491}
2443 2492
2444void 2493void
2445rxvt_term::scr_recolour () NOTHROW 2494rxvt_term::scr_recolour () NOTHROW
2446{ 2495{
2447 if (1 2496#ifdef HAVE_BG_PIXMAP
2448#if TRANSPARENT 2497 bgPixmap.apply ();
2449 && !am_transparent 2498#else
2450#endif 2499
2451#if XPM_BACKGROUND
2452 && !bgPixmap.pixmap
2453#endif
2454 )
2455 {
2456 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2457 XClearWindow (display->display, parent[0]); 2501 XClearWindow (dpy, parent[0]);
2458 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2459#if HAVE_SCROLLBARS 2503
2460 if (scrollBar.win) 2504 if (scrollBar.win)
2461 { 2505 {
2462 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2463 scrollBar.setIdle (); 2507 scrollBar.state = STATE_IDLE;
2464 scrollbar_show (0); 2508 scrollBar.show (0);
2465 }
2466#endif
2467 } 2509 }
2468 2510
2511#endif
2512
2513 /* bgPixmap.apply () does not do the following : */
2469 scr_clear (); 2514 scr_clear ();
2470 scr_touch (true); 2515 scr_touch (true);
2471 want_refresh = 1; 2516 want_refresh = 1;
2472} 2517}
2473 2518
… …
2480 2525
2481 num_scr_allow = 0; 2526 num_scr_allow = 0;
2482 want_refresh = 1; 2527 want_refresh = 1;
2483 2528
2484 if (really) 2529 if (really)
2485 XClearWindow (display->display, vt); 2530 XClearWindow (dpy, vt);
2486} 2531}
2487 2532
2488void 2533void
2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2534rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2490{ 2535{
… …
2539{ 2584{
2540 if (selection.op 2585 if (selection.op
2541 && current_screen == selection.screen 2586 && current_screen == selection.screen
2542 && selection.end.row >= view_start) 2587 && selection.end.row >= view_start)
2543 { 2588 {
2544#if ENABLE_FRILLS 2589#if !ENABLE_MINIMAL
2545 if (selection.rect) 2590 if (selection.rect)
2546 scr_xor_rect (selection.beg.row, selection.beg.col, 2591 scr_xor_rect (selection.beg.row, selection.beg.col,
2547 selection.end.row, selection.end.col, 2592 selection.end.row, selection.end.col,
2548 RS_RVid, RS_RVid | RS_Uline); 2593 RS_RVid, RS_RVid | RS_Uline);
2549 else 2594 else
… …
2565{ 2610{
2566 int row, wrote; 2611 int row, wrote;
2567 unsigned int width, towrite; 2612 unsigned int width, towrite;
2568 char r1[] = "\n"; 2613 char r1[] = "\n";
2569 2614
2570 for (row = saveLines - nsaved; 2615 for (row = saveLines + top_row;
2571 row < saveLines + nrow - 1; row++) 2616 row < saveLines + nrow - 1; row++)
2572 { 2617 {
2573 width = row_buf[row].l >= 0 ? row_buf[row].l 2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2574 : ncol; 2619 : ncol;
2575 for (towrite = width; towrite; towrite -= wrote) 2620 for (towrite = width; towrite; towrite -= wrote)
… …
2626 /* convert normal newline chars into common keyboard Return key sequence */ 2671 /* convert normal newline chars into common keyboard Return key sequence */
2627 for (unsigned int i = 0; i < len; i++) 2672 for (unsigned int i = 0; i < len; i++)
2628 if (data[i] == C0_LF) 2673 if (data[i] == C0_LF)
2629 data[i] = C0_CR; 2674 data[i] = C0_CR;
2630 2675
2676 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~");
2678
2631 tt_write (data, len); 2679 tt_write (data, len);
2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~");
2632} 2683}
2633 2684
2634/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2635/* 2686/*
2636 * Respond to a notification that a primary selection has been sent 2687 * Respond to a notification that a primary selection has been sent
… …
2665 } 2716 }
2666 2717
2667 unsigned long bytes_after; 2718 unsigned long bytes_after;
2668 XTextProperty ct; 2719 XTextProperty ct;
2669 2720
2670 if (XGetWindowProperty (display->display, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2671 0, PROP_SIZE / 4, 2722 0, PROP_SIZE / 4,
2672 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2673 &ct.encoding, &ct.format, 2724 &ct.encoding, &ct.format,
2674 &ct.nitems, &bytes_after, 2725 &ct.nitems, &bytes_after,
2675 &ct.value) != Success) 2726 &ct.value) != Success)
… …
2684 if (bytes_after) 2735 if (bytes_after)
2685 { 2736 {
2686 // fetch and append remaining data 2737 // fetch and append remaining data
2687 XTextProperty ct2; 2738 XTextProperty ct2;
2688 2739
2689 if (XGetWindowProperty (display->display, win, prop, 2740 if (XGetWindowProperty (dpy, win, prop,
2690 ct.nitems / 4, (bytes_after + 3) / 4, 2741 ct.nitems / 4, (bytes_after + 3) / 4,
2691 delete_prop, AnyPropertyType, 2742 delete_prop, AnyPropertyType,
2692 &ct2.encoding, &ct2.format, 2743 &ct2.encoding, &ct2.format,
2693 &ct2.nitems, &bytes_after, 2744 &ct2.nitems, &bytes_after,
2694 &ct2.value) != Success) 2745 &ct2.value) != Success)
… …
2707 2758
2708 if (ct.encoding == xa[XA_INCR]) 2759 if (ct.encoding == xa[XA_INCR])
2709 { 2760 {
2710 // INCR selection, start handshake 2761 // INCR selection, start handshake
2711 if (!delete_prop) 2762 if (!delete_prop)
2712 XDeleteProperty (display->display, win, prop); 2763 XDeleteProperty (dpy, win, prop);
2713 2764
2714 selection_wait = Sel_incr; 2765 selection_wait = Sel_incr;
2715 incr_buf_fill = 0; 2766 incr_buf_fill = 0;
2716 incr_ev.start (NOW + 10); 2767 incr_ev.start (10);
2717 2768
2718 goto bailout; 2769 goto bailout;
2719 } 2770 }
2720 2771
2721 if (ct.nitems == 0) 2772 if (ct.nitems == 0)
… …
2730 ct.nitems = incr_buf_fill; 2781 ct.nitems = incr_buf_fill;
2731 incr_buf = 0; 2782 incr_buf = 0;
2732 incr_buf_size = 0; 2783 incr_buf_size = 0;
2733 incr_ev.stop (); 2784 incr_ev.stop ();
2734 } 2785 }
2735 else 2786 else
2736 { 2787 {
2737 if (selection_wait == Sel_normal 2788 if (selection_wait == Sel_normal
2738 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2739 { 2790 {
2740 /* 2791 /*
… …
2747 goto bailout; 2798 goto bailout;
2748 } 2799 }
2749 } 2800 }
2750 else if (selection_wait == Sel_incr) 2801 else if (selection_wait == Sel_incr)
2751 { 2802 {
2752 incr_ev.start (NOW + 10); 2803 incr_ev.start (10);
2753 2804
2754 while (incr_buf_fill + ct.nitems > incr_buf_size) 2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2755 { 2806 {
2756 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2757 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2764 } 2815 }
2765 2816
2766 char **cl; 2817 char **cl;
2767 int cr; 2818 int cr;
2768 2819
2769#if ENABLE_FRILLS 2820#if !ENABLE_MINIMAL
2770 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2771 // so recode it manually 2822 // so recode it manually
2772 if (ct.encoding == xa[XA_UTF8_STRING]) 2823 if (ct.encoding == xa[XA_UTF8_STRING])
2773 { 2824 {
2774 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2778 paste (s, strlen (s)); 2829 paste (s, strlen (s));
2779 free (s); 2830 free (s);
2780 } 2831 }
2781 else 2832 else
2782#endif 2833#endif
2783 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2784 && cl) 2835 && cl)
2785 { 2836 {
2786 for (int i = 0; i < cr; i++) 2837 for (int i = 0; i < cr; i++)
2787 paste (cl[i], strlen (cl[i])); 2838 paste (cl[i], strlen (cl[i]));
2788 2839
… …
2797 if (selection_wait == Sel_normal) 2848 if (selection_wait == Sel_normal)
2798 selection_wait = Sel_none; 2849 selection_wait = Sel_none;
2799} 2850}
2800 2851
2801void 2852void
2802rxvt_term::incr_cb (time_watcher &w) NOTHROW 2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2803{ 2854{
2804 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2805 2856
2806 incr_buf_size = 0; 2857 incr_buf_size = 0;
2807 free (incr_buf); 2858 free (incr_buf);
… …
2818 selection_paste (win, prop, true); 2869 selection_paste (win, prop, true);
2819} 2870}
2820 2871
2821/* ------------------------------------------------------------------------- */ 2872/* ------------------------------------------------------------------------- */
2822/* 2873/*
2823 * Request the current selection: 2874 * Request the current selection:
2824 * Order: > internal selection if available 2875 * Order: > internal selection if available
2825 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2826 * > CUT_BUFFER0 2877 * > CUT_BUFFER0
2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2828 * will auto fallback to CUT_BUFFER0 2879 * will auto fallback to CUT_BUFFER0
… …
2830 */ 2881 */
2831void 2882void
2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2833{ 2884{
2834 if (selection.text && selnum == Sel_Primary) 2885 if (selection.text && selnum == Sel_Primary)
2886 {
2835 { /* internal selection */ 2887 /* internal selection */
2836 char *str = rxvt_wcstombs (selection.text, selection.len); 2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2837 paste (str, strlen (str)); 2889 paste (str, strlen (str));
2838 free (str); 2890 free (str);
2839 return; 2891 return;
2840 } 2892 }
… …
2870 else if (selnum == Sel_Secondary) 2922 else if (selnum == Sel_Secondary)
2871 sel = XA_SECONDARY; 2923 sel = XA_SECONDARY;
2872 else 2924 else
2873 sel = xa[XA_CLIPBOARD]; 2925 sel = xa[XA_CLIPBOARD];
2874 2926
2875 if (XGetSelectionOwner (display->display, sel) != None) 2927 if (XGetSelectionOwner (dpy, sel) != None)
2876 { 2928 {
2877 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2878 vt, selection_request_time); 2930 vt, selection_request_time);
2879 return 1; 2931 return 1;
2880 } 2932 }
2881 2933
2882 return 0; 2934 return 0;
… …
2945 2997
2946 int end_col; 2998 int end_col;
2947 2999
2948 for (; row <= selection.end.row; row++, col = 0) 3000 for (; row <= selection.end.row; row++, col = 0)
2949 { 3001 {
2950#if ENABLE_FRILLS 3002#if !ENABLE_MINIMAL
2951 if (selection.rect) 3003 if (selection.rect)
2952 { 3004 {
2953 col = selection.beg.col; 3005 col = selection.beg.col;
2954 end_col = ncol + 1; 3006 end_col = ncol + 1;
2955 } 3007 }
… …
2958 end_col = ROW(row).l; 3010 end_col = ROW(row).l;
2959 3011
2960 col = max (col, 0); 3012 col = max (col, 0);
2961 3013
2962 if (row == selection.end.row 3014 if (row == selection.end.row
2963#if ENABLE_FRILLS 3015#if !ENABLE_MINIMAL
2964 || selection.rect 3016 || selection.rect
2965#endif 3017#endif
2966 ) 3018 )
2967 min_it (end_col, selection.end.col); 3019 min_it (end_col, selection.end.col);
2968 3020
… …
2991#endif 3043#endif
2992 else 3044 else
2993 new_selection_text[ofs++] = *t++; 3045 new_selection_text[ofs++] = *t++;
2994 } 3046 }
2995 3047
2996#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
2997 if (selection.rect) 3049 if (selection.rect)
2998 { 3050 {
2999 while (ofs 3051 while (ofs
3000 && new_selection_text[ofs - 1] != C0_LF 3052 && new_selection_text[ofs - 1] != C0_LF
3001 && unicode::is_space (new_selection_text[ofs - 1])) 3053 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3035bool 3087bool
3036rxvt_term::selection_grab (Time tm) NOTHROW 3088rxvt_term::selection_grab (Time tm) NOTHROW
3037{ 3089{
3038 selection_time = tm; 3090 selection_time = tm;
3039 3091
3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3042 { 3094 {
3043 display->set_selection_owner (this); 3095 display->set_selection_owner (this);
3044 return true; 3096 return true;
3045 } 3097 }
3046 else 3098 else
… …
3050 } 3102 }
3051 3103
3052#if 0 3104#if 0
3053 XTextProperty ct; 3105 XTextProperty ct;
3054 3106
3055 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3107 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3056 { 3108 {
3057 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3109 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3058 XFree (ct.value); 3110 XFree (ct.value);
3059 } 3111 }
3060#endif 3112#endif
… …
3106 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3158 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3107 3159
3108 while (selection.mark.col > 0 3160 while (selection.mark.col > 0
3109 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3161 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3110 --selection.mark.col; 3162 --selection.mark.col;
3111 3163
3112 if (selection.op) 3164 if (selection.op)
3165 {
3113 { /* clear the old selection */ 3166 /* clear the old selection */
3114 selection.beg.row = selection.end.row = selection.mark.row; 3167 selection.beg.row = selection.end.row = selection.mark.row;
3115 selection.beg.col = selection.end.col = selection.mark.col; 3168 selection.beg.col = selection.end.col = selection.mark.col;
3116 } 3169 }
3117 3170
3118 selection.op = SELECTION_INIT; 3171 selection.op = SELECTION_INIT;
… …
3307 * a point/word/line which is either the start or end of the selection 3360 * a point/word/line which is either the start or end of the selection
3308 * and it was decided by whichever point/word/line was `fixed' at the 3361 * and it was decided by whichever point/word/line was `fixed' at the
3309 * time of the most recent button3 press 3362 * time of the most recent button3 press
3310 */ 3363 */
3311 if (button3 && buttonpress) 3364 if (button3 && buttonpress)
3365 {
3312 { /* button3 press */ 3366 /* button3 press */
3313 /* 3367 /*
3314 * first determine which edge of the selection we are closest to 3368 * first determine which edge of the selection we are closest to
3315 */ 3369 */
3316 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3370 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3317 || (!ROWCOL_IS_AFTER (pos, selection.end) 3371 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3335 selection.mark.row = selection.beg.row; 3389 selection.mark.row = selection.beg.row;
3336 selection.mark.col = selection.beg.col; 3390 selection.mark.col = selection.beg.col;
3337 } 3391 }
3338 } 3392 }
3339 else 3393 else
3394 {
3340 { /* button1 drag or button3 drag */ 3395 /* button1 drag or button3 drag */
3341 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3396 if (ROWCOL_IS_AFTER (selection.mark, pos))
3342 { 3397 {
3343 if (selection.mark.row == selection.end.row 3398 if (selection.mark.row == selection.end.row
3344 && selection.mark.col == selection.end.col 3399 && selection.mark.col == selection.end.col
3345 && clickchange 3400 && clickchange
… …
3362 3417
3363 if (selection.clicks == 1) 3418 if (selection.clicks == 1)
3364 { 3419 {
3365 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3420 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3366 && !ROW(selection.beg.row).is_longer () 3421 && !ROW(selection.beg.row).is_longer ()
3367#if ENABLE_FRILLS 3422#if !ENABLE_MINIMAL
3368 && !selection.rect 3423 && !selection.rect
3369#endif 3424#endif
3370 ) 3425 )
3371 selection.beg.col = ncol; 3426 selection.beg.col = ncol;
3372 3427
3373 if ( 3428 if (
3374 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3429 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3375 && !ROW(selection.end.row).is_longer () 3430 && !ROW(selection.end.row).is_longer ()
3376#if ENABLE_FRILLS 3431#if !ENABLE_MINIMAL
3377 && !selection.rect 3432 && !selection.rect
3378#endif 3433#endif
3379 ) 3434 )
3380 selection.end.col = ncol; 3435 selection.end.col = ncol;
3381 } 3436 }
… …
3388 selection_delimit_word (DN, &selection.end, &selection.end); 3443 selection_delimit_word (DN, &selection.end, &selection.end);
3389 } 3444 }
3390 else if (selection.clicks == 3) 3445 else if (selection.clicks == 3)
3391 { 3446 {
3392#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3393 if (OPTION (Opt_tripleclickwords)) 3448 if (option (Opt_tripleclickwords))
3394 { 3449 {
3395 selection_delimit_word (UP, &selection.beg, &selection.beg); 3450 selection_delimit_word (UP, &selection.beg, &selection.beg);
3396 3451
3397 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3452 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3398 { 3453 {
3399 if (!ROW(end_row).is_longer ()) 3454 if (!ROW(end_row).is_longer ())
3400 { 3455 {
3401 selection.end.row = end_row; 3456 selection.end.row = end_row;
3402 selection.end.col = ROW(end_row).l; 3457 selection.end.col = ROW(end_row).l;
3458# if !ENABLE_MINIMAL
3403 selection_remove_trailing_spaces (); 3459 selection_remove_trailing_spaces ();
3460# endif
3404 break; 3461 break;
3405 } 3462 }
3406 } 3463 }
3407 } 3464 }
3408 else 3465 else
… …
3424 selection.end.row++; 3481 selection.end.row++;
3425 } 3482 }
3426 } 3483 }
3427 3484
3428 if (button3 && buttonpress) 3485 if (button3 && buttonpress)
3486 {
3429 { /* mark may need to be changed */ 3487 /* mark may need to be changed */
3430 if (closeto == LEFT) 3488 if (closeto == LEFT)
3431 { 3489 {
3432 selection.mark.row = selection.end.row; 3490 selection.mark.row = selection.end.row;
3433 selection.mark.col = selection.end.col - (selection.clicks == 2); 3491 selection.mark.col = selection.end.col - (selection.clicks == 2);
3434 } 3492 }
… …
3437 selection.mark.row = selection.beg.row; 3495 selection.mark.row = selection.beg.row;
3438 selection.mark.col = selection.beg.col; 3496 selection.mark.col = selection.beg.col;
3439 } 3497 }
3440 } 3498 }
3441 3499
3442#if ENABLE_FRILLS 3500#if !ENABLE_MINIMAL
3443 if (selection.rect && selection.beg.col > selection.end.col) 3501 if (selection.rect && selection.beg.col > selection.end.col)
3444 ::swap (selection.beg.col, selection.end.col); 3502 ::swap (selection.beg.col, selection.end.col);
3445#endif 3503#endif
3446} 3504}
3447 3505
3448#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3449void 3507void
3450rxvt_term::selection_remove_trailing_spaces () NOTHROW 3508rxvt_term::selection_remove_trailing_spaces () NOTHROW
3451{ 3509{
3452 int32_t end_col, end_row; 3510 int32_t end_col, end_row;
3453 text_t *stp; 3511 text_t *stp;
… …
3508 */ 3566 */
3509void 3567void
3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3568rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3511{ 3569{
3512 XSelectionEvent ev; 3570 XSelectionEvent ev;
3513 dDisp;
3514 3571
3515 ev.type = SelectionNotify; 3572 ev.type = SelectionNotify;
3516 ev.property = None; 3573 ev.property = None;
3517 ev.display = rq.display; 3574 ev.display = rq.display;
3518 ev.requestor = rq.requestor; 3575 ev.requestor = rq.requestor;
… …
3532 *target++ = xa[XA_COMPOUND_TEXT]; 3589 *target++ = xa[XA_COMPOUND_TEXT];
3533#if X_HAVE_UTF8_STRING 3590#if X_HAVE_UTF8_STRING
3534 *target++ = xa[XA_UTF8_STRING]; 3591 *target++ = xa[XA_UTF8_STRING];
3535#endif 3592#endif
3536 3593
3537 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3538 32, PropModeReplace, 3595 32, PropModeReplace,
3539 (unsigned char *)target_list, target - target_list); 3596 (unsigned char *)target_list, target - target_list);
3540 ev.property = rq.property; 3597 ev.property = rq.property;
3541 } 3598 }
3542#if TODO // TODO 3599#if TODO // TODO
… …
3545 /* TODO: Handle MULTIPLE */ 3602 /* TODO: Handle MULTIPLE */
3546 } 3603 }
3547#endif 3604#endif
3548 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3549 { 3606 {
3550 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3551 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3608 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3552 ev.property = rq.property; 3609 ev.property = rq.property;
3553 } 3610 }
3554 else if (rq.target == XA_STRING 3611 else if (rq.target == XA_STRING
3555 || rq.target == xa[XA_TEXT] 3612 || rq.target == xa[XA_TEXT]
… …
3579 style = enc_string; 3636 style = enc_string;
3580 else if (target == xa[XA_TEXT]) 3637 else if (target == xa[XA_TEXT])
3581 style = enc_text; 3638 style = enc_text;
3582 else if (target == xa[XA_COMPOUND_TEXT]) 3639 else if (target == xa[XA_COMPOUND_TEXT])
3583 style = enc_compound_text; 3640 style = enc_compound_text;
3584#if ENABLE_FRILLS 3641#if !ENABLE_MINIMAL
3585 else if (target == xa[XA_UTF8_STRING]) 3642 else if (target == xa[XA_UTF8_STRING])
3586 style = enc_utf8; 3643 style = enc_utf8;
3587#endif 3644#endif
3588 else 3645 else
3589 { 3646 {
… …
3600 { 3657 {
3601 cl = L""; 3658 cl = L"";
3602 selectlen = 0; 3659 selectlen = 0;
3603 } 3660 }
3604 3661
3605#if ENABLE_FRILLS 3662#if !ENABLE_MINIMAL
3606 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3663 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3607 // so recode it manually 3664 // so recode it manually
3608 if (style == enc_utf8) 3665 if (style == enc_utf8)
3609 { 3666 {
3610 freect = 1; 3667 freect = 1;
… …
3613 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3670 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3614 ct.nitems = strlen ((char *)ct.value); 3671 ct.nitems = strlen ((char *)ct.value);
3615 } 3672 }
3616 else 3673 else
3617#endif 3674#endif
3618 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3675 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3619 freect = 1; 3676 freect = 1;
3620 else 3677 else
3621 { 3678 {
3622 /* if we failed to convert then send it raw */ 3679 /* if we failed to convert then send it raw */
3623 ct.value = (unsigned char *)cl; 3680 ct.value = (unsigned char *)cl;
3624 ct.nitems = selectlen; 3681 ct.nitems = selectlen;
3625 ct.encoding = target; 3682 ct.encoding = target;
3626 } 3683 }
3627 3684
3628 XChangeProperty (disp, rq.requestor, rq.property, 3685 XChangeProperty (dpy, rq.requestor, rq.property,
3629 ct.encoding, 8, PropModeReplace, 3686 ct.encoding, 8, PropModeReplace,
3630 ct.value, (int)ct.nitems); 3687 ct.value, (int)ct.nitems);
3631 ev.property = rq.property; 3688 ev.property = rq.property;
3632 3689
3633 if (freect) 3690 if (freect)
3634 XFree (ct.value); 3691 XFree (ct.value);
3635 } 3692 }
3636 3693
3637 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3694 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3638}
3639
3640/* ------------------------------------------------------------------------- *
3641 * MOUSE ROUTINES *
3642 * ------------------------------------------------------------------------- */
3643
3644/*
3645 * return col/row values corresponding to x/y pixel values
3646 */
3647void
3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3649{
3650 *x = Pixel2Col (*x);
3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3652 *y = Pixel2Row (*y);
3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3654} 3695}
3655 3696
3656/* ------------------------------------------------------------------------- */ 3697/* ------------------------------------------------------------------------- */
3657#ifdef USE_XIM 3698#ifdef USE_XIM
3658void 3699void
3659rxvt_term::im_set_position (XPoint &pos) NOTHROW 3700rxvt_term::im_set_position (XPoint &pos) NOTHROW
3660{ 3701{
3661 XWindowAttributes xwa; 3702 XWindowAttributes xwa;
3662 3703
3663 XGetWindowAttributes (display->display, vt, &xwa); 3704 XGetWindowAttributes (dpy, vt, &xwa);
3664 3705
3665 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3706 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3666 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3707 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3667} 3708}
3668#endif 3709#endif
… …
3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3805rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3765{ 3806{
3766 while (*s) 3807 while (*s)
3767 { 3808 {
3768 text_t t = *s++; 3809 text_t t = *s++;
3769 int width = wcwidth (t); 3810 int width = WCWIDTH (t);
3770 3811
3771 while (width--) 3812 while (width--)
3772 { 3813 {
3773 scr_overlay_set (x++, y, t); 3814 scr_overlay_set (x++, y, t);
3774 t = NOCHAR; 3815 t = NOCHAR;

Diff Legend

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