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.253 by root, Fri Jan 27 18:36:43 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 (xdisp, 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 (xdisp, 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 (xdisp, 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;
… …
640 l.touch (); 641 l.touch ();
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--; )
646 {
647 line_t &l = ROW(nrow - 1 - i);
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 {
653 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0;
655 l.f = 0;
656 }
657 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 658 scr_blank_screen_mem (l, rstyle);
659 }
646 660
647 // now copy lines below the scroll region bottom to the 661 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 662 // bottom of the screen again, so they look as if they
649 // hadn't moved. 663 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 664 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
654 668
655 ::swap (l1, l2); 669 ::swap (l1, l2);
656 l2.touch (); 670 l2.touch ();
657 } 671 }
658 672
659 // move and/or clear selection, if any 673 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
661 { 675 {
662 selection.beg.row -= count; 676 selection.beg.row -= count;
663 selection.end.row -= count; 677 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
672 } 686 }
673 } 687 }
674 688
675 // finally move the view window, if desired 689 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 691 && view_start != 0
678 && view_start != -saveLines) 692 && view_start != -saveLines)
679 scr_page (UP, count); 693 scr_page (UP, count);
680 694
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 713 {
700 /* move selected region too */ 714 /* move selected region too */
701 selection.beg.row -= count; 715 selection.beg.row -= count;
702 selection.end.row -= count; 716 selection.end.row -= count;
703 selection.mark.row -= count; 717 selection.mark.row -= count;
704 718
705 selection_check (0); 719 selection_check (0);
706 } 720 }
707 } 721 }
708 722
709 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
776 790
777 while (str < strend) 791 while (str < strend)
778 { 792 {
779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
780 794
781 if (c < 0x20) 795 if (expect_false (c < 0x20))
782 if (c == C0_LF) 796 if (c == C0_LF)
783 { 797 {
784 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
785 799
786 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
805 { 819 {
806 scr_tab (1, true); 820 scr_tab (1, true);
807 continue; 821 continue;
808 } 822 }
809 823
824 if (expect_false (
810 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
811 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
812 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
813 { 829 {
814 checksel = 0; 830 checksel = 0;
815 /* 831 /*
816 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
817 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
818 * should be a similar check. 834 * should be a similar check.
819 */ 835 */
820 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
821 } 837 }
822 838
823 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
824 { 840 {
825 scr_do_wrap (); 841 scr_do_wrap ();
826 842
827 line->l = ncol; 843 line->l = ncol;
828 line->is_longer (1); 844 line->is_longer (1);
829 845
830 row = screen.cur.row; 846 row = screen.cur.row;
831 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
832 } 848 }
833 849
834 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
835 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
836 c = 0xfffd; 852 c = 0xfffd;
837 853
838 // rely on wcwidth to tell us the character width, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
839 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
840 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
841 // locale. 857 // locale.
842 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
843 859
844 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
845 { 861 {
846 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
847 // 5f-7e standard vt100 863 // 5f-7e standard vt100
848 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
849 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
862 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
863 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
864 } 880 }
865 } 881 }
866 882
867 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
868 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
869 885
870 if (width != 0) 886 if (width != 0)
871 { 887 {
872#if !UNICODE_3 888#if !UNICODE_3
… …
878 c = 0xfffd; 894 c = 0xfffd;
879# endif 895# endif
880#endif 896#endif
881 897
882 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
883 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
884 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
885 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
886 { 903 ))
887 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
888
889 // find begin
890 while (col > 0 && line->t[col] == NOCHAR)
891 col--;
892
893 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
894
895 // found begin, nuke
896 do {
897 line->t[col] = ' ';
898 line->r[col] = rend;
899 col++;
900 } while (col < ncol && line->t[col] == NOCHAR);
901 }
902 905
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 907
905 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
906 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 { 910 {
908 // ...output spaces 911 // ...output spaces
909 c = ' '; 912 c = ' ';
910 // and try the same character next loop iteration 913 // and try the same character next loop iteration
911 --str; 914 --str;
… …
916 do 919 do
917 { 920 {
918 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
919 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
920 923
921 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
922 screen.cur.col++; 925 screen.cur.col++;
923 else 926 else
924 { 927 {
925 line->l = ncol; 928 line->l = ncol;
926 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
928 break; 931 break;
929 } 932 }
930 933
931 c = NOCHAR; 934 c = NOCHAR;
932 } 935 }
933 while (--width > 0); 936 while (expect_false (--width > 0));
934 937
935 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
936 if (!width) 939 if (expect_false (!width))
937 { 940 {
938 line->touch (); 941 line->touch ();
939 942
940 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++)
941 { 944 {
942 line->t[c] = ' '; 945 line->t[c] = ' ';
943 line->r[c] = rend; 946 line->r[c] = rend;
944 } 947 }
945 } 948 }
946 } 949 }
950#if ENABLE_COMBINING
947 else // width == 0 951 else // width == 0
948 { 952 {
949#if ENABLE_COMBINING 953 if (c != 0xfeff) // ignore BOM
950 // handle combining characters
951 // we just tag the accent on the previous on-screen character.
952 // this is arguably not correct, but also arguably not wrong.
953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
955 text_t *tp;
956 rend_t *rp;
957
958 if (screen.cur.col > 0)
959 { 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 {
960 linep = line; 965 linep = line;
961 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
962 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));
963 } 991 }
964 else if (screen.cur.row > 0
965 && ROW(screen.cur.row - 1).is_longer ())
966 {
967 linep = &ROW(screen.cur.row - 1);
968 tp = line->t + ncol - 1;
969 rp = line->r + ncol - 1;
970 } 992 }
971 else
972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
978
979 // first try to find a precomposed character
980 unicode_t n = rxvt_compose (*tp, c);
981 if (n == NOCHAR)
982 n = rxvt_composite.compose (*tp, c);
983
984 *tp = n;
985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
986#endif 993#endif
987 }
988 } 994 }
989 995
990 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
991 997
992#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1000 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1001 */ 1007 */
1002void 1008void
1003rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1004{ 1010{
1005 want_refresh = 1;
1006
1007 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1008 { 1012 {
1009 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1010 { 1014 {
1011#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1012 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1013 screen.cur.row--; 1017 --screen.cur.row;
1014 return; 1018
1019 want_refresh = 1;
1015#endif 1020#endif
1016 } 1021 }
1017 } 1022 }
1018 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1019 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1020
1021 screen.flags &= ~Screen_WrapNext;
1022} 1025}
1023 1026
1024/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1025/* 1028/*
1026 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1049 x = i; 1052 x = i;
1050 1053
1051 if (!--count) 1054 if (!--count)
1052 break; 1055 break;
1053 } 1056 }
1054 else 1057 else
1055 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1056 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1057 1060
1058 if (count) 1061 if (count)
1059 x = ncol - 1; 1062 x = ncol - 1;
1060 1063
1061 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1062 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1063 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1064 { 1067 {
1065 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1066 1069
1067 l.touch (x); 1070 l.touch (x);
1068 1071
… …
1101 * Process DEC Back Index 1104 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1105 * XTERM_SEQ: ESC 6
1103 * 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
1104 * in that row right. Clear left column. 1107 * in that row right. Clear left column.
1105 */ 1108 */
1106#if ENABLE_FRILLS 1109#if !ENABLE_MINIMAL
1107void 1110void
1108rxvt_term::scr_backindex () NOTHROW 1111rxvt_term::scr_backindex () NOTHROW
1109{ 1112{
1110 if (screen.cur.col > 0) 1113 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1121 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1122 * XTERM_SEQ: ESC 9
1120 * 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
1121 * in that row left. Clear right column. 1124 * in that row left. Clear right column.
1122 */ 1125 */
1123#if ENABLE_FRILLS 1126#if !ENABLE_MINIMAL
1124void 1127void
1125rxvt_term::scr_forwardindex () NOTHROW 1128rxvt_term::scr_forwardindex () NOTHROW
1126{ 1129{
1127 if (screen.cur.col < ncol - 1) 1130 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1175 } 1178 }
1176 } 1179 }
1177 else 1180 else
1178 { 1181 {
1179 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1180 { /* relative origin mode */ 1184 /* relative origin mode */
1181 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1182 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1183 } 1187 }
1184 else 1188 else
1185 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1218/* 1222/*
1219 * Erase part or whole of a line 1223 * Erase part or whole of a line
1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1222 * 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
1223 */ 1228 */
1224void 1229void
1225rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1226{ 1231{
1227 unsigned int col, num; 1232 unsigned int col, num;
… …
1236 line.touch (); 1241 line.touch ();
1237 line.is_longer (0); 1242 line.is_longer (0);
1238 1243
1239 switch (mode) 1244 switch (mode)
1240 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1241 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1242 col = screen.cur.col; 1253 col = screen.cur.col;
1243 num = ncol - col; 1254 num = ncol - col;
1244 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1247 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1248 break; 1260 break;
1261
1249 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1250 col = 0; 1263 col = 0;
1251 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1252 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1255 break; 1269 break;
1270
1256 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1257 col = 0; 1272 col = 0;
1258 num = ncol; 1273 num = ncol;
1259 line.l = 0; 1274 line.l = 0;
1260 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1318 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1319 return; 1334 return;
1320 1335
1321 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1322 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1323 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1324 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1325 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1326 { 1342 {
1327 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1328 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);
1329 } 1349 }
1330 else 1350 else
1331 { 1351 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1336 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1338 } 1362 }
1339 1363
1340 for (; num--; row++) 1364 for (; num--; row++)
1341 { 1365 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1366 scr_blank_screen_mem (ROW(row), rstyle);
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1367 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1368 }
1345} 1369}
1346 1370
1347#if ENABLE_FRILLS 1371#if !ENABLE_MINIMAL
1348void 1372void
1349rxvt_term::scr_erase_savelines () NOTHROW 1373rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1374{
1351 want_refresh = 1; 1375 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1422 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1423 */ 1447 */
1424void 1448void
1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1426{ 1450{
1427 int col, row;
1428 rend_t tr;
1429
1430 want_refresh = 1; 1451 want_refresh = 1;
1431 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1432 1453
1433 if (count <= 0) 1454 if (count <= 0)
1434 return; 1455 return;
… …
1436 scr_do_wrap (); 1457 scr_do_wrap ();
1437 1458
1438 selection_check (1); 1459 selection_check (1);
1439 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1440 1461
1441 row = screen.cur.row; 1462 int row = screen.cur.row;
1442 1463
1443 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1444 1465
1445 line->touch (); 1466 line->touch ();
1446 line->is_longer (0); 1467 line->is_longer (0);
1447 1468
1469 // nuke wide char at beginning
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1448 switch (insdel) 1473 switch (insdel)
1449 { 1474 {
1450 case INSERT: 1475 case INSERT:
1451 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--)
1452 { 1482 {
1453 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1454 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1455 } 1485 }
1456
1457 line->l = min (line->l + count, ncol);
1458 1486
1459 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1461 { 1489 {
1462 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1463 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1464 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1465 else 1493 else
1494 {
1466 { /* shift selection */ 1495 /* shift selection */
1467 selection.beg.col += count; 1496 selection.beg.col += count;
1468 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1469 selection.end.col += count; 1498 selection.end.col += count;
1470 } 1499 }
1471 } 1500 }
… …
1476 case ERASE: 1505 case ERASE:
1477 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1478 selection_check (1); 1507 selection_check (1);
1479 screen.cur.col -= count; 1508 screen.cur.col -= count;
1480 1509
1481 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
1482 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1483 break; 1515 break;
1484 1516
1485 case DELETE: 1517 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0);
1520
1486 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);
1487 1522
1488 for (col = screen.cur.col; (col + count) < ncol; col++) 1523 for (int col = screen.cur.col; (col + count) < ncol; col++)
1489 { 1524 {
1490 line->t[col] = line->t[col + count]; 1525 line->t[col] = line->t[col + count];
1491 line->r[col] = line->r[col + count]; 1526 line->r[col] = line->r[col + count];
1492 } 1527 }
1493 1528
1494 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
1495 scr_blank_line (*line, ncol - count, count, tr); 1533 scr_blank_line (*line, ncol - count, count, tr);
1496 1534
1497 if (selection.op && current_screen == selection.screen 1535 if (selection.op && current_screen == selection.screen
1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 { 1537 {
1500 if (selection.end.row != screen.cur.row 1538 if (selection.end.row != screen.cur.row
1501 || (screen.cur.col >= selection.beg.col - count) 1539 || (screen.cur.col >= selection.beg.col - count)
1502 || selection.end.col >= ncol) 1540 || selection.end.col >= ncol)
1503 CLEAR_SELECTION (); 1541 CLEAR_SELECTION ();
1504 else 1542 else
1505 { 1543 {
1506 /* shift selection */ 1544 /* shift selection */
1507 selection.beg.col -= count; 1545 selection.beg.col -= count;
1508 selection.mark.col -= count; /* XXX: yes? */ 1546 selection.mark.col -= count; /* XXX: yes? */
1509 selection.end.col -= count; 1547 selection.end.col -= count;
1510 } 1548 }
1549 }
1511 } 1550 }
1512 1551
1513 break; 1552 break;
1514 } 1553 }
1515} 1554}
… …
1610 */ 1649 */
1611void 1650void
1612rxvt_term::scr_set_tab (int mode) NOTHROW 1651rxvt_term::scr_set_tab (int mode) NOTHROW
1613{ 1652{
1614 if (mode < 0) 1653 if (mode < 0)
1615 memset (tabs, 0, ncol * sizeof (char)); 1654 memset (tabs, 0, ncol);
1616 else if (screen.cur.col < ncol) 1655 else if (screen.cur.col < ncol)
1617 tabs [screen.cur.col] = !!mode; 1656 tabs [screen.cur.col] = !!mode;
1618} 1657}
1619 1658
1620/* ------------------------------------------------------------------------- */ 1659/* ------------------------------------------------------------------------- */
… …
1635 if (rvideo_state != on) 1674 if (rvideo_state != on)
1636 { 1675 {
1637 rvideo_state = on; 1676 rvideo_state = on;
1638 1677
1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640#if XPM_BACKGROUND 1679#ifdef HAVE_BG_PIXMAP
1641 if (bgPixmap.pixmap == None) 1680 if (bgPixmap.pixmap == None)
1642#endif 1681#endif
1643#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1683
1648 XGCValues gcvalue; 1684 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1685 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1686 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1687 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1688
1653 scr_clear (); 1689 scr_clear ();
1654 scr_touch (true); 1690 scr_touch (true);
1655 } 1691 }
1656} 1692}
… …
1741{ 1777{
1742 bool found = false; 1778 bool found = false;
1743 1779
1744 for (int i = 0; i < nrow; i++) 1780 for (int i = 0; i < nrow; i++)
1745 { 1781 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1782 rend_t *drp = drawn_buf[i].r;
1748 1783
1749 for (; col < ncol; col++, drp++) 1784 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1785 if ((*drp & mask) == value)
1751 { 1786 {
1752 found = true; 1787 found = true;
1753 *drp = ~value; 1788 *drp = ~value;
1754 } 1789 }
… …
1794 for (i = PART_BEG; i < RC_COUNT; i++) 1829 for (i = PART_BEG; i < RC_COUNT; i++)
1795 { 1830 {
1796 min_it (rc[i].col, ncol - 1); 1831 min_it (rc[i].col, ncol - 1);
1797 min_it (rc[i].row, nrow - 1); 1832 min_it (rc[i].row, nrow - 1);
1798 } 1833 }
1799 1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1800 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++)
1801 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);
1802 1837
1803 num_scr_allow = 0; 1838 num_scr_allow = 0;
1804 1839
… …
1859 return true; 1894 return true;
1860} 1895}
1861 1896
1862#ifndef NO_BELL 1897#ifndef NO_BELL
1863void 1898void
1864rxvt_term::bell_cb (time_watcher &w) 1899rxvt_term::bell_cb (ev::timer &w, int revents)
1865{ 1900{
1866 rvideo_bell = false; 1901 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode); 1902 scr_rvideo_mode (rvideo_mode);
1903 refresh_check ();
1868} 1904}
1869#endif 1905#endif
1870 1906
1871/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1872void 1908void
… …
1874{ 1910{
1875#ifndef NO_BELL 1911#ifndef NO_BELL
1876 1912
1877# ifndef NO_MAPALERT 1913# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1914# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1915 if (option (Opt_mapAlert))
1880# endif 1916# endif
1881 XMapWindow (xdisp, parent[0]); 1917 XMapWindow (dpy, parent[0]);
1882# endif 1918# endif
1883 1919
1920# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell))
1922 set_urgency (1);
1923# endif
1924
1884 if (OPTION (Opt_visualBell)) 1925 if (option (Opt_visualBell))
1885 { 1926 {
1886 rvideo_bell = true; 1927 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1928 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1929 flush ();
1889 1930
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1931 bell_ev.start (VISUAL_BELL_DURATION);
1891 } 1932 }
1892 else 1933 else
1893 XBell (xdisp, 0); 1934 XBell (dpy, 0);
1894
1895#endif 1935#endif
1896} 1936}
1897 1937
1898/* ------------------------------------------------------------------------- */ 1938/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1939/* ARGSUSED */
1900void 1940void
1901rxvt_term::scr_printscreen (int fullhist) NOTHROW 1941rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1942{
1903#ifdef PRINTPIPE 1943#ifdef PRINTPIPE
1904 int nrows, row_start; 1944 int nrows, row_start;
1905 FILE *fd; 1945 FILE *fd = popen_printer ();
1906 1946
1907 if ((fd = popen_printer ()) == NULL) 1947 if (!fd)
1908 return; 1948 return;
1909 1949
1910 if (fullhist) 1950 if (fullhist)
1911 { 1951 {
1912 nrows = nrow - top_row; 1952 nrows = nrow - top_row;
… …
1957 * screen.text/screen.rend contain what the screen will change to. 1997 * screen.text/screen.rend contain what the screen will change to.
1958 */ 1998 */
1959void 1999void
1960rxvt_term::scr_refresh () NOTHROW 2000rxvt_term::scr_refresh () NOTHROW
1961{ 2001{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */ 2002 unsigned char have_bg,
1963 showcursor; /* show the cursor */ 2003 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 2004 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 2005 ocrow; /* old cursor row */
1966 int i; /* tmp */ 2006 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 2007#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 2008 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 2009#endif
1970 rend_t *crp; // cursor rendition pointer 2010 rend_t *crp; // cursor rendition pointer
2011 rend_t ccol1, /* Cursor colour */
2012 ccol2; /* Cursor colour2 */
1971 2013
1972 want_refresh = 0; /* screen is current */ 2014 want_refresh = 0; /* screen is current */
1973 2015
1974 if (refresh_type == NO_REFRESH || !mapped) 2016 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 2017 return;
1976 2018
1977 /* 2019 /*
1978 * A: set up vars 2020 * A: set up vars
1979 */ 2021 */
1980 must_clear = 0;
1981 refresh_count = 0; 2022 refresh_count = 0;
1982 2023
1983#if XPM_BACKGROUND 2024 have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP
1984 must_clear |= bgPixmap.pixmap != None; 2026 have_bg = bgPixmap.pixmap != None;
1985#endif
1986#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2027#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2029
1991 /* 2030 /*
1992 * B: reverse any characters which are selected 2031 * B: reverse any characters which are selected
… …
1996 /* 2035 /*
1997 * C: set the cursor character (s) 2036 * C: set the cursor character (s)
1998 */ 2037 */
1999 { 2038 {
2000 unsigned char setoldcursor; 2039 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2040
2004 showcursor = (screen.flags & Screen_VisibleCursor); 2041 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2042#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2043 if (hidden_cursor)
2007 showcursor = 0; 2044 showcursor = 0;
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2051 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2052 col--;
2016 2053
2017 crp = &ROW(screen.cur.row).r[col]; 2054 crp = &ROW(screen.cur.row).r[col];
2018 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
2019 if (showcursor && focus) 2079 if (showcursor && focus)
2020 { 2080 {
2021 if (OPTION (Opt_cursorUnderline)) 2081 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2082 *crp ^= RS_Uline;
2023 else 2083 else
2024 { 2084 {
2025 *crp ^= RS_RVid; 2085 *crp ^= RS_RVid;
2026
2027#ifndef NO_CURSORCOLOR
2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2029 if (ISSET_PIXCOLOR (Color_cursor))
2030 ccol1 = Color_cursor;
2031 else
2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033 ccol1 = fgcolor_of (rstyle);
2034#else
2035 ccol1 = Color_fg;
2036#endif
2037 if (ISSET_PIXCOLOR (Color_cursor2))
2038 ccol2 = Color_cursor2;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol2 = bgcolor_of (rstyle);
2042#else
2043 ccol2 = Color_bg;
2044#endif
2045 *crp = SET_FGCOLOR (*crp, ccol1); 2086 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2087 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2088 }
2049 } 2089 }
2050 } 2090 }
2051 2091
2052 /* make sure no outline cursor is left around */ 2092 /* make sure no outline cursor is left around */
… …
2091 * D: CopyArea pass - very useful for slower links 2131 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2132 * This has been deliberately kept simple.
2093 */ 2133 */
2094 if (!display->is_local 2134 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2135 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2136 && abs (num_scr) < nrow && !have_bg)
2097 { 2137 {
2098 int16_t nits; 2138 int16_t nits;
2139 int i = num_scr;
2099 int j; 2140 int j;
2100 int len, wlen; 2141 int len, wlen;
2101 dLocal (int, num_scr); 2142 dLocal (int, num_scr);
2102 2143
2103 j = nrow; 2144 j = nrow;
2104 wlen = len = -1; 2145 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2146 row = i > 0 ? 0 : j - 1;
2147
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2148 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2149 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2150 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2151 {
2110 line_t s = ROW(view_start + row); 2152 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2173 wlen = row;
2132 continue; 2174 continue;
2133 } 2175 }
2134 } 2176 }
2135 2177
2136 if (len != -1) 2178 if (len >= 0)
2137 { 2179 {
2138 /* also comes here at end if needed because of >= above */ 2180 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2181 if (wlen < len)
2140 ::swap (wlen, len); 2182 ::swap (wlen, len);
2141 2183
2184 XGCValues gcv;
2185
2186 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2187 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2188 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2189 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2190 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2191 0, Row2Pixel (len));
2192 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2193
2147 len = -1; 2194 len = -1;
2148 } 2195 }
2149 } 2196 }
2150 } 2197 }
2151#endif 2198#endif
… …
2175 continue; 2222 continue;
2176 2223
2177 // redraw one or more characters 2224 // redraw one or more characters
2178 2225
2179 // seek to the beginning of wide characters 2226 // seek to the beginning of wide characters
2180 while (stp[col] == NOCHAR && col > 0) 2227 while (expect_false (stp[col] == NOCHAR && col > 0))
2181 --col; 2228 --col;
2182 2229
2183 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2184 text_t *text = stp + col; 2231 text_t *text = stp + col;
2185 int count = 1; 2232 int count = 1;
… …
2207 count++; 2254 count++;
2208 2255
2209 if (stp[col] != dtp[col] 2256 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2257 || !RS_SAME (srp[col], drp[col]))
2211 { 2258 {
2212 if (must_clear && (i++ > count / 2)) 2259 if (have_bg && (i++ > count / 2))
2213 break; 2260 break;
2214 2261
2215 dtp[col] = stp[col]; 2262 dtp[col] = stp[col];
2216 drp[col] = rend; 2263 drp[col] = rend;
2217 i = 0; 2264 i = 0;
2218 } 2265 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2266 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2267 break;
2221 } 2268 }
2222 2269
2223 col--; /* went one too far. move back */ 2270 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2271 count -= i; /* dump any matching trailing chars */
2225 2272
2226 // sometimes we optimize away the trailing NOCHAR's, add them back 2273 // sometimes we optimize away the trailing NOCHAR's, add them back
2227 while (i && text[count] == NOCHAR) 2274 while (expect_false (i && text[count] == NOCHAR))
2228 count++, i--; 2275 count++, i--;
2229 2276
2230 /* 2277 /*
2231 * Determine the attributes for the string 2278 * Determine the attributes for the string
2232 */ 2279 */
2233 int fore = fgcolor_of (rend); // desired foreground 2280 int fore = fgcolor_of (rend); // desired foreground
2234 int back = bgcolor_of (rend); // desired background 2281 int back = bgcolor_of (rend); // desired background
2235 2282
2236 // 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
2237 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)))
2238 { 2285 {
2239#if ENABLE_STYLES
2240 // "careful" (too wide) character handling
2241
2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2243 while (text > stp
2244 && srp[text - stp - 1] & RS_Careful
2245 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2255#endif
2256
2257 bool invert = rend & RS_RVid; 2286 bool invert = rend & RS_RVid;
2258 2287
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2288#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold
2261 && fore == Color_fg) 2289 if (rend & RS_Bold && fore == Color_fg)
2262 { 2290 {
2263 if (ISSET_PIXCOLOR (Color_BD)) 2291 if (ISSET_PIXCOLOR (Color_BD))
2264 fore = Color_BD; 2292 fore = Color_BD;
2265# if !ENABLE_STYLES 2293# if !ENABLE_STYLES
2266 else 2294 else
2267 invert = !invert; 2295 invert = !invert;
2268# endif 2296# endif
2269 } 2297 }
2270 2298
2271 if (rend & RS_Italic 2299 if (rend & RS_Italic && fore == Color_fg)
2272 && fore == Color_fg)
2273 { 2300 {
2274 if (ISSET_PIXCOLOR (Color_IT)) 2301 if (ISSET_PIXCOLOR (Color_IT))
2275 fore = Color_IT; 2302 fore = Color_IT;
2276# if !ENABLE_STYLES 2303# if !ENABLE_STYLES
2277 else 2304 else
2278 invert = !invert; 2305 invert = !invert;
2279# endif 2306# endif
2280 } 2307 }
2281 2308
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2310 fore = Color_UL;
2284#endif 2311#endif
2285 2312
2286 if (invert) 2313 if (invert)
2287 { 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 */
2288 ::swap (fore, back); 2321 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2289 2326
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2327#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2291 if (ISSET_PIXCOLOR (Color_RV)) 2329 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV; 2330 back = Color_RV;
2293 2331# endif
2294 if (fore == back) 2332 if (fore == back)
2295 { 2333 {
2296 fore = Color_bg; 2334 fore = Color_bg;
2297 back = Color_fg; 2335 back = Color_fg;
2298 } 2336 }
… …
2300 } 2338 }
2301 2339
2302#ifdef TEXT_BLINK 2340#ifdef TEXT_BLINK
2303 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2341 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2304 { 2342 {
2305 if (!text_blink_ev.active) 2343 if (!text_blink_ev.is_active ())
2306 { 2344 {
2307 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2345 text_blink_ev.again ();
2308 hidden_text = 0; 2346 hidden_text = 0;
2309 } 2347 }
2310 else if (hidden_text) 2348 else if (hidden_text)
2311 fore = back; 2349 fore = back;
2312 } 2350 }
2313#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
2314 } 2370 }
2315 2371
2316 /* 2372 /*
2317 * Actually do the drawing of the string here 2373 * Actually do the drawing of the string here
2318 */ 2374 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2376
2321 if (back == fore) 2377 if (expect_true (have_bg && back == Color_bg))
2322 font->clear_rect (*drawable, xpixel, ypixel,
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg)
2326 { 2378 {
2327 if (must_clear) 2379 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2380
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2381 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2382 if (text[i] != ' ')
2333 { 2383 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2384 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2385 goto did_clear;
2336 }
2337 } 2386 }
2338 else 2387
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2388 CLEAR_CHARS (xpixel, ypixel, count);
2389 did_clear: ;
2340 } 2390 }
2341 else 2391 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2393
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2345 { 2395 {
2346#if ENABLE_FRILLS 2396#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2397 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2398 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2399 else
2350#endif 2400#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2401 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2402
2353 XDrawLine (xdisp, drawBuffer, gc, 2403 XDrawLine (dpy, vt, gc,
2354 xpixel, ypixel + font->ascent + 1, 2404 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2406 }
2357 } /* for (col....) */ 2407 } /* for (col....) */
2358 } /* for (row....) */ 2408 } /* for (row....) */
… …
2367 */ 2417 */
2368 if (showcursor) 2418 if (showcursor)
2369 { 2419 {
2370 if (focus) 2420 if (focus)
2371 { 2421 {
2372 if (OPTION (Opt_cursorUnderline)) 2422 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2423 *crp ^= RS_Uline;
2374 else 2424 else
2375 { 2425 {
2376 *crp ^= RS_RVid; 2426 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2427#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2442 cursorwidth++;
2393 2443
2394#ifndef NO_CURSORCOLOR 2444#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2445 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2397#endif 2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2450
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2451 XDrawRectangle (dpy, vt, gc,
2400 Col2Pixel (col), 2452 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2453 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2454 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2456 }
… …
2439} 2491}
2440 2492
2441void 2493void
2442rxvt_term::scr_recolour () NOTHROW 2494rxvt_term::scr_recolour () NOTHROW
2443{ 2495{
2444 if (1 2496#ifdef HAVE_BG_PIXMAP
2445#if TRANSPARENT 2497 bgPixmap.apply ();
2446 && !am_transparent 2498#else
2447#endif 2499
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 )
2452 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2501 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2503
2457 if (scrollBar.win) 2504 if (scrollBar.win)
2458 { 2505 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2507 scrollBar.state = STATE_IDLE;
2461 scrollbar_show (0); 2508 scrollBar.show (0);
2462 }
2463#endif
2464 } 2509 }
2465 2510
2511#endif
2512
2513 /* bgPixmap.apply () does not do the following : */
2466 scr_clear (); 2514 scr_clear ();
2467 scr_touch (true); 2515 scr_touch (true);
2468 want_refresh = 1; 2516 want_refresh = 1;
2469} 2517}
2470 2518
… …
2477 2525
2478 num_scr_allow = 0; 2526 num_scr_allow = 0;
2479 want_refresh = 1; 2527 want_refresh = 1;
2480 2528
2481 if (really) 2529 if (really)
2482 XClearWindow (xdisp, vt); 2530 XClearWindow (dpy, vt);
2483} 2531}
2484 2532
2485void 2533void
2486rxvt_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
2487{ 2535{
… …
2536{ 2584{
2537 if (selection.op 2585 if (selection.op
2538 && current_screen == selection.screen 2586 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2587 && selection.end.row >= view_start)
2540 { 2588 {
2541#if ENABLE_FRILLS 2589#if !ENABLE_MINIMAL
2542 if (selection.rect) 2590 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2591 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2592 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2593 RS_RVid, RS_RVid | RS_Uline);
2546 else 2594 else
… …
2562{ 2610{
2563 int row, wrote; 2611 int row, wrote;
2564 unsigned int width, towrite; 2612 unsigned int width, towrite;
2565 char r1[] = "\n"; 2613 char r1[] = "\n";
2566 2614
2567 for (row = saveLines - nsaved; 2615 for (row = saveLines + top_row;
2568 row < saveLines + nrow - 1; row++) 2616 row < saveLines + nrow - 1; row++)
2569 { 2617 {
2570 width = row_buf[row].l >= 0 ? row_buf[row].l 2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2571 : ncol; 2619 : ncol;
2572 for (towrite = width; towrite; towrite -= wrote) 2620 for (towrite = width; towrite; towrite -= wrote)
… …
2623 /* convert normal newline chars into common keyboard Return key sequence */ 2671 /* convert normal newline chars into common keyboard Return key sequence */
2624 for (unsigned int i = 0; i < len; i++) 2672 for (unsigned int i = 0; i < len; i++)
2625 if (data[i] == C0_LF) 2673 if (data[i] == C0_LF)
2626 data[i] = C0_CR; 2674 data[i] = C0_CR;
2627 2675
2676 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~");
2678
2628 tt_write (data, len); 2679 tt_write (data, len);
2680
2681 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~");
2629} 2683}
2630 2684
2631/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2632/* 2686/*
2633 * Respond to a notification that a primary selection has been sent 2687 * Respond to a notification that a primary selection has been sent
… …
2662 } 2716 }
2663 2717
2664 unsigned long bytes_after; 2718 unsigned long bytes_after;
2665 XTextProperty ct; 2719 XTextProperty ct;
2666 2720
2667 if (XGetWindowProperty (xdisp, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2722 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2724 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2725 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2726 &ct.value) != Success)
… …
2681 if (bytes_after) 2735 if (bytes_after)
2682 { 2736 {
2683 // fetch and append remaining data 2737 // fetch and append remaining data
2684 XTextProperty ct2; 2738 XTextProperty ct2;
2685 2739
2686 if (XGetWindowProperty (xdisp, win, prop, 2740 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2741 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2742 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2743 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2744 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2745 &ct2.value) != Success)
… …
2704 2758
2705 if (ct.encoding == xa[XA_INCR]) 2759 if (ct.encoding == xa[XA_INCR])
2706 { 2760 {
2707 // INCR selection, start handshake 2761 // INCR selection, start handshake
2708 if (!delete_prop) 2762 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2763 XDeleteProperty (dpy, win, prop);
2710 2764
2711 selection_wait = Sel_incr; 2765 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2766 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2767 incr_ev.start (10);
2714 2768
2715 goto bailout; 2769 goto bailout;
2716 } 2770 }
2717 2771
2718 if (ct.nitems == 0) 2772 if (ct.nitems == 0)
… …
2727 ct.nitems = incr_buf_fill; 2781 ct.nitems = incr_buf_fill;
2728 incr_buf = 0; 2782 incr_buf = 0;
2729 incr_buf_size = 0; 2783 incr_buf_size = 0;
2730 incr_ev.stop (); 2784 incr_ev.stop ();
2731 } 2785 }
2732 else 2786 else
2733 { 2787 {
2734 if (selection_wait == Sel_normal 2788 if (selection_wait == Sel_normal
2735 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736 { 2790 {
2737 /* 2791 /*
… …
2744 goto bailout; 2798 goto bailout;
2745 } 2799 }
2746 } 2800 }
2747 else if (selection_wait == Sel_incr) 2801 else if (selection_wait == Sel_incr)
2748 { 2802 {
2749 incr_ev.start (NOW + 10); 2803 incr_ev.start (10);
2750 2804
2751 while (incr_buf_fill + ct.nitems > incr_buf_size) 2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2752 { 2806 {
2753 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;
2754 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2761 } 2815 }
2762 2816
2763 char **cl; 2817 char **cl;
2764 int cr; 2818 int cr;
2765 2819
2766#if ENABLE_FRILLS 2820#if !ENABLE_MINIMAL
2767 // 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
2768 // so recode it manually 2822 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2823 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2824 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2829 paste (s, strlen (s));
2776 free (s); 2830 free (s);
2777 } 2831 }
2778 else 2832 else
2779#endif 2833#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2835 && cl)
2782 { 2836 {
2783 for (int i = 0; i < cr; i++) 2837 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2838 paste (cl[i], strlen (cl[i]));
2785 2839
… …
2794 if (selection_wait == Sel_normal) 2848 if (selection_wait == Sel_normal)
2795 selection_wait = Sel_none; 2849 selection_wait = Sel_none;
2796} 2850}
2797 2851
2798void 2852void
2799rxvt_term::incr_cb (time_watcher &w) NOTHROW 2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2800{ 2854{
2801 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2802 2856
2803 incr_buf_size = 0; 2857 incr_buf_size = 0;
2804 free (incr_buf); 2858 free (incr_buf);
… …
2815 selection_paste (win, prop, true); 2869 selection_paste (win, prop, true);
2816} 2870}
2817 2871
2818/* ------------------------------------------------------------------------- */ 2872/* ------------------------------------------------------------------------- */
2819/* 2873/*
2820 * Request the current selection: 2874 * Request the current selection:
2821 * Order: > internal selection if available 2875 * Order: > internal selection if available
2822 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823 * > CUT_BUFFER0 2877 * > CUT_BUFFER0
2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825 * will auto fallback to CUT_BUFFER0 2879 * will auto fallback to CUT_BUFFER0
… …
2827 */ 2881 */
2828void 2882void
2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2830{ 2884{
2831 if (selection.text && selnum == Sel_Primary) 2885 if (selection.text && selnum == Sel_Primary)
2886 {
2832 { /* internal selection */ 2887 /* internal selection */
2833 char *str = rxvt_wcstombs (selection.text, selection.len); 2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2834 paste (str, strlen (str)); 2889 paste (str, strlen (str));
2835 free (str); 2890 free (str);
2836 return; 2891 return;
2837 } 2892 }
… …
2867 else if (selnum == Sel_Secondary) 2922 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2923 sel = XA_SECONDARY;
2869 else 2924 else
2870 sel = xa[XA_CLIPBOARD]; 2925 sel = xa[XA_CLIPBOARD];
2871 2926
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2927 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2928 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2930 vt, selection_request_time);
2876 return 1; 2931 return 1;
2877 } 2932 }
2878 2933
2879 return 0; 2934 return 0;
… …
2942 2997
2943 int end_col; 2998 int end_col;
2944 2999
2945 for (; row <= selection.end.row; row++, col = 0) 3000 for (; row <= selection.end.row; row++, col = 0)
2946 { 3001 {
2947#if ENABLE_FRILLS 3002#if !ENABLE_MINIMAL
2948 if (selection.rect) 3003 if (selection.rect)
2949 { 3004 {
2950 col = selection.beg.col; 3005 col = selection.beg.col;
2951 end_col = ncol + 1; 3006 end_col = ncol + 1;
2952 } 3007 }
… …
2955 end_col = ROW(row).l; 3010 end_col = ROW(row).l;
2956 3011
2957 col = max (col, 0); 3012 col = max (col, 0);
2958 3013
2959 if (row == selection.end.row 3014 if (row == selection.end.row
2960#if ENABLE_FRILLS 3015#if !ENABLE_MINIMAL
2961 || selection.rect 3016 || selection.rect
2962#endif 3017#endif
2963 ) 3018 )
2964 min_it (end_col, selection.end.col); 3019 min_it (end_col, selection.end.col);
2965 3020
… …
2988#endif 3043#endif
2989 else 3044 else
2990 new_selection_text[ofs++] = *t++; 3045 new_selection_text[ofs++] = *t++;
2991 } 3046 }
2992 3047
2993#if ENABLE_FRILLS 3048#if !ENABLE_MINIMAL
2994 if (selection.rect) 3049 if (selection.rect)
2995 { 3050 {
2996 while (ofs 3051 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3052 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3053 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032bool 3087bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3088rxvt_term::selection_grab (Time tm) NOTHROW
3034{ 3089{
3035 selection_time = tm; 3090 selection_time = tm;
3036 3091
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3039 { 3094 {
3040 display->set_selection_owner (this); 3095 display->set_selection_owner (this);
3041 return true; 3096 return true;
3042 } 3097 }
3043 else 3098 else
… …
3047 } 3102 }
3048 3103
3049#if 0 3104#if 0
3050 XTextProperty ct; 3105 XTextProperty ct;
3051 3106
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3107 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3108 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3109 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3110 XFree (ct.value);
3056 } 3111 }
3057#endif 3112#endif
… …
3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3158 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104 3159
3105 while (selection.mark.col > 0 3160 while (selection.mark.col > 0
3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3161 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107 --selection.mark.col; 3162 --selection.mark.col;
3108 3163
3109 if (selection.op) 3164 if (selection.op)
3165 {
3110 { /* clear the old selection */ 3166 /* clear the old selection */
3111 selection.beg.row = selection.end.row = selection.mark.row; 3167 selection.beg.row = selection.end.row = selection.mark.row;
3112 selection.beg.col = selection.end.col = selection.mark.col; 3168 selection.beg.col = selection.end.col = selection.mark.col;
3113 } 3169 }
3114 3170
3115 selection.op = SELECTION_INIT; 3171 selection.op = SELECTION_INIT;
… …
3304 * 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
3305 * 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
3306 * time of the most recent button3 press 3362 * time of the most recent button3 press
3307 */ 3363 */
3308 if (button3 && buttonpress) 3364 if (button3 && buttonpress)
3365 {
3309 { /* button3 press */ 3366 /* button3 press */
3310 /* 3367 /*
3311 * first determine which edge of the selection we are closest to 3368 * first determine which edge of the selection we are closest to
3312 */ 3369 */
3313 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3370 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3314 || (!ROWCOL_IS_AFTER (pos, selection.end) 3371 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3332 selection.mark.row = selection.beg.row; 3389 selection.mark.row = selection.beg.row;
3333 selection.mark.col = selection.beg.col; 3390 selection.mark.col = selection.beg.col;
3334 } 3391 }
3335 } 3392 }
3336 else 3393 else
3394 {
3337 { /* button1 drag or button3 drag */ 3395 /* button1 drag or button3 drag */
3338 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3396 if (ROWCOL_IS_AFTER (selection.mark, pos))
3339 { 3397 {
3340 if (selection.mark.row == selection.end.row 3398 if (selection.mark.row == selection.end.row
3341 && selection.mark.col == selection.end.col 3399 && selection.mark.col == selection.end.col
3342 && clickchange 3400 && clickchange
… …
3359 3417
3360 if (selection.clicks == 1) 3418 if (selection.clicks == 1)
3361 { 3419 {
3362 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
3363 && !ROW(selection.beg.row).is_longer () 3421 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3422#if !ENABLE_MINIMAL
3365 && !selection.rect 3423 && !selection.rect
3366#endif 3424#endif
3367 ) 3425 )
3368 selection.beg.col = ncol; 3426 selection.beg.col = ncol;
3369 3427
3370 if ( 3428 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3429 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3430 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3431#if !ENABLE_MINIMAL
3374 && !selection.rect 3432 && !selection.rect
3375#endif 3433#endif
3376 ) 3434 )
3377 selection.end.col = ncol; 3435 selection.end.col = ncol;
3378 } 3436 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3443 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3444 }
3387 else if (selection.clicks == 3) 3445 else if (selection.clicks == 3)
3388 { 3446 {
3389#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3448 if (option (Opt_tripleclickwords))
3391 { 3449 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3450 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3451
3394 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++)
3395 { 3453 {
3396 if (!ROW(end_row).is_longer ()) 3454 if (!ROW(end_row).is_longer ())
3397 { 3455 {
3398 selection.end.row = end_row; 3456 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3457 selection.end.col = ROW(end_row).l;
3458# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3459 selection_remove_trailing_spaces ();
3460# endif
3401 break; 3461 break;
3402 } 3462 }
3403 } 3463 }
3404 } 3464 }
3405 else 3465 else
… …
3421 selection.end.row++; 3481 selection.end.row++;
3422 } 3482 }
3423 } 3483 }
3424 3484
3425 if (button3 && buttonpress) 3485 if (button3 && buttonpress)
3486 {
3426 { /* mark may need to be changed */ 3487 /* mark may need to be changed */
3427 if (closeto == LEFT) 3488 if (closeto == LEFT)
3428 { 3489 {
3429 selection.mark.row = selection.end.row; 3490 selection.mark.row = selection.end.row;
3430 selection.mark.col = selection.end.col - (selection.clicks == 2); 3491 selection.mark.col = selection.end.col - (selection.clicks == 2);
3431 } 3492 }
… …
3434 selection.mark.row = selection.beg.row; 3495 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3496 selection.mark.col = selection.beg.col;
3436 } 3497 }
3437 } 3498 }
3438 3499
3439#if ENABLE_FRILLS 3500#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3501 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3502 ::swap (selection.beg.col, selection.end.col);
3442#endif 3503#endif
3443} 3504}
3444 3505
3445#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3446void 3507void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3508rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3509{
3449 int32_t end_col, end_row; 3510 int32_t end_col, end_row;
3450 text_t *stp; 3511 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3589 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3590#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3591 *target++ = xa[XA_UTF8_STRING];
3531#endif 3592#endif
3532 3593
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3595 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3596 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3597 ev.property = rq.property;
3537 } 3598 }
3538#if TODO // TODO 3599#if TODO // TODO
… …
3541 /* TODO: Handle MULTIPLE */ 3602 /* TODO: Handle MULTIPLE */
3542 } 3603 }
3543#endif 3604#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3545 { 3606 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3608 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3548 ev.property = rq.property; 3609 ev.property = rq.property;
3549 } 3610 }
3550 else if (rq.target == XA_STRING 3611 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3612 || rq.target == xa[XA_TEXT]
… …
3575 style = enc_string; 3636 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3637 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3638 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3639 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3640 style = enc_compound_text;
3580#if ENABLE_FRILLS 3641#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3642 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3643 style = enc_utf8;
3583#endif 3644#endif
3584 else 3645 else
3585 { 3646 {
… …
3596 { 3657 {
3597 cl = L""; 3658 cl = L"";
3598 selectlen = 0; 3659 selectlen = 0;
3599 } 3660 }
3600 3661
3601#if ENABLE_FRILLS 3662#if !ENABLE_MINIMAL
3602 // 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
3603 // so recode it manually 3664 // so recode it manually
3604 if (style == enc_utf8) 3665 if (style == enc_utf8)
3605 { 3666 {
3606 freect = 1; 3667 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3670 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3671 ct.nitems = strlen ((char *)ct.value);
3611 } 3672 }
3612 else 3673 else
3613#endif 3674#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3675 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3676 freect = 1;
3616 else 3677 else
3617 { 3678 {
3618 /* if we failed to convert then send it raw */ 3679 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3680 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3681 ct.nitems = selectlen;
3621 ct.encoding = target; 3682 ct.encoding = target;
3622 } 3683 }
3623 3684
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3685 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3686 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3687 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3688 ev.property = rq.property;
3628 3689
3629 if (freect) 3690 if (freect)
3630 XFree (ct.value); 3691 XFree (ct.value);
3631 } 3692 }
3632 3693
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3694 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634}
3635
3636/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */
3639
3640/*
3641 * return col/row values corresponding to x/y pixel values
3642 */
3643void
3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3645{
3646 *x = Pixel2Col (*x);
3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3648 *y = Pixel2Row (*y);
3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3650} 3695}
3651 3696
3652/* ------------------------------------------------------------------------- */ 3697/* ------------------------------------------------------------------------- */
3653#ifdef USE_XIM 3698#ifdef USE_XIM
3654void 3699void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3700rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3701{
3657 XWindowAttributes xwa; 3702 XWindowAttributes xwa;
3658 3703
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3704 XGetWindowAttributes (dpy, vt, &xwa);
3660 3705
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3706 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3707 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3708}
3664#endif 3709#endif

Diff Legend

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