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.252 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 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;
… …
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, do wcwidth before 854 // rely on wcwidth to tell us the character width, do wcwidth before
848 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
849 // 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 = 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 (xdisp, 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 (xdisp, 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 ();
… …
1470 { 1485 {
1471 if (selection.end.row != screen.cur.row 1486 if (selection.end.row != screen.cur.row
1472 || (selection.end.col + count >= ncol)) 1487 || (selection.end.col + count >= ncol))
1473 CLEAR_SELECTION (); 1488 CLEAR_SELECTION ();
1474 else 1489 else
1490 {
1475 { /* shift selection */ 1491 /* shift selection */
1476 selection.beg.col += count; 1492 selection.beg.col += count;
1477 selection.mark.col += count; /* XXX: yes? */ 1493 selection.mark.col += count; /* XXX: yes? */
1478 selection.end.col += count; 1494 selection.end.col += count;
1479 } 1495 }
1480 } 1496 }
… …
1485 case ERASE: 1501 case ERASE:
1486 screen.cur.col += count; /* don't worry if > ncol */ 1502 screen.cur.col += count; /* don't worry if > ncol */
1487 selection_check (1); 1503 selection_check (1);
1488 screen.cur.col -= count; 1504 screen.cur.col -= count;
1489 1505
1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, screen.cur.col, count, rstyle); 1506 scr_blank_line (*line, screen.cur.col, count, rstyle);
1492 break; 1507 break;
1493 1508
1494 case DELETE: 1509 case DELETE:
1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1510 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1619 */ 1634 */
1620void 1635void
1621rxvt_term::scr_set_tab (int mode) NOTHROW 1636rxvt_term::scr_set_tab (int mode) NOTHROW
1622{ 1637{
1623 if (mode < 0) 1638 if (mode < 0)
1624 memset (tabs, 0, ncol * sizeof (char)); 1639 memset (tabs, 0, ncol);
1625 else if (screen.cur.col < ncol) 1640 else if (screen.cur.col < ncol)
1626 tabs [screen.cur.col] = !!mode; 1641 tabs [screen.cur.col] = !!mode;
1627} 1642}
1628 1643
1629/* ------------------------------------------------------------------------- */ 1644/* ------------------------------------------------------------------------- */
… …
1644 if (rvideo_state != on) 1659 if (rvideo_state != on)
1645 { 1660 {
1646 rvideo_state = on; 1661 rvideo_state = on;
1647 1662
1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1663 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1649#if XPM_BACKGROUND 1664#ifdef HAVE_BG_PIXMAP
1650 if (bgPixmap.pixmap == None) 1665 if (bgPixmap.pixmap == None)
1651#endif 1666#endif
1652#if TRANSPARENT
1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1654#endif
1655 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1667 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1656 1668
1657 XGCValues gcvalue; 1669 XGCValues gcvalue;
1658 gcvalue.foreground = pix_colors[Color_fg]; 1670 gcvalue.foreground = pix_colors[Color_fg];
1659 gcvalue.background = pix_colors[Color_bg]; 1671 gcvalue.background = pix_colors[Color_bg];
1660 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1672 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1661 1673
1662 scr_clear (); 1674 scr_clear ();
1663 scr_touch (true); 1675 scr_touch (true);
1664 } 1676 }
1665} 1677}
… …
1750{ 1762{
1751 bool found = false; 1763 bool found = false;
1752 1764
1753 for (int i = 0; i < nrow; i++) 1765 for (int i = 0; i < nrow; i++)
1754 { 1766 {
1755 int col = 0;
1756 rend_t *drp = drawn_buf[i].r; 1767 rend_t *drp = drawn_buf[i].r;
1757 1768
1758 for (; col < ncol; col++, drp++) 1769 for (int col = 0; col < ncol; col++, drp++)
1759 if ((*drp & mask) == value) 1770 if ((*drp & mask) == value)
1760 { 1771 {
1761 found = true; 1772 found = true;
1762 *drp = ~value; 1773 *drp = ~value;
1763 } 1774 }
… …
1803 for (i = PART_BEG; i < RC_COUNT; i++) 1814 for (i = PART_BEG; i < RC_COUNT; i++)
1804 { 1815 {
1805 min_it (rc[i].col, ncol - 1); 1816 min_it (rc[i].col, ncol - 1);
1806 min_it (rc[i].row, nrow - 1); 1817 min_it (rc[i].row, nrow - 1);
1807 } 1818 }
1808 1819// 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++) 1820 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); 1821 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1811 1822
1812 num_scr_allow = 0; 1823 num_scr_allow = 0;
1813 1824
… …
1868 return true; 1879 return true;
1869} 1880}
1870 1881
1871#ifndef NO_BELL 1882#ifndef NO_BELL
1872void 1883void
1873rxvt_term::bell_cb (time_watcher &w) 1884rxvt_term::bell_cb (ev::timer &w, int revents)
1874{ 1885{
1875 rvideo_bell = false; 1886 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode); 1887 scr_rvideo_mode (rvideo_mode);
1888 refresh_check ();
1877} 1889}
1878#endif 1890#endif
1879 1891
1880/* ------------------------------------------------------------------------- */ 1892/* ------------------------------------------------------------------------- */
1881void 1893void
… …
1883{ 1895{
1884#ifndef NO_BELL 1896#ifndef NO_BELL
1885 1897
1886# ifndef NO_MAPALERT 1898# ifndef NO_MAPALERT
1887# ifdef MAPALERT_OPTION 1899# ifdef MAPALERT_OPTION
1888 if (OPTION (Opt_mapAlert)) 1900 if (option (Opt_mapAlert))
1889# endif 1901# endif
1890 XMapWindow (xdisp, parent[0]); 1902 XMapWindow (dpy, parent[0]);
1891# endif 1903# endif
1892 1904
1905# if ENABLE_FRILLS
1906 if (option (Opt_urgentOnBell))
1907 set_urgency (1);
1908# endif
1909
1893 if (OPTION (Opt_visualBell)) 1910 if (option (Opt_visualBell))
1894 { 1911 {
1895 rvideo_bell = true; 1912 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode); 1913 scr_rvideo_mode (rvideo_mode);
1897 display->flush (); 1914 flush ();
1898 1915
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1916 bell_ev.start (VISUAL_BELL_DURATION);
1900 } 1917 }
1901 else 1918 else
1902 XBell (xdisp, 0); 1919 XBell (dpy, 0);
1903
1904#endif 1920#endif
1905} 1921}
1906 1922
1907/* ------------------------------------------------------------------------- */ 1923/* ------------------------------------------------------------------------- */
1908/* ARGSUSED */ 1924/* ARGSUSED */
1909void 1925void
1910rxvt_term::scr_printscreen (int fullhist) NOTHROW 1926rxvt_term::scr_printscreen (int fullhist) NOTHROW
1911{ 1927{
1912#ifdef PRINTPIPE 1928#ifdef PRINTPIPE
1913 int nrows, row_start; 1929 int nrows, row_start;
1914 FILE *fd; 1930 FILE *fd = popen_printer ();
1915 1931
1916 if ((fd = popen_printer ()) == NULL) 1932 if (!fd)
1917 return; 1933 return;
1918 1934
1919 if (fullhist) 1935 if (fullhist)
1920 { 1936 {
1921 nrows = nrow - top_row; 1937 nrows = nrow - top_row;
… …
1966 * screen.text/screen.rend contain what the screen will change to. 1982 * screen.text/screen.rend contain what the screen will change to.
1967 */ 1983 */
1968void 1984void
1969rxvt_term::scr_refresh () NOTHROW 1985rxvt_term::scr_refresh () NOTHROW
1970{ 1986{
1971 unsigned char must_clear, /* use draw_string not draw_image_string */ 1987 unsigned char have_bg,
1972 showcursor; /* show the cursor */ 1988 showcursor; /* show the cursor */
1973 int16_t col, row, /* column/row we're processing */ 1989 int16_t col, row, /* column/row we're processing */
1974 ocrow; /* old cursor row */ 1990 ocrow; /* old cursor row */
1975 int i; /* tmp */ 1991 int i; /* tmp */
1976#ifndef NO_CURSORCOLOR 1992#ifndef NO_CURSORCOLOR
1977 rend_t cc1; /* store colours at cursor position (s) */ 1993 rend_t cc1; /* store colours at cursor position (s) */
1978#endif 1994#endif
1979 rend_t *crp; // cursor rendition pointer 1995 rend_t *crp; // cursor rendition pointer
1996 rend_t ccol1, /* Cursor colour */
1997 ccol2; /* Cursor colour2 */
1980 1998
1981 want_refresh = 0; /* screen is current */ 1999 want_refresh = 0; /* screen is current */
1982 2000
1983 if (refresh_type == NO_REFRESH || !mapped) 2001 if (refresh_type == NO_REFRESH || !mapped)
1984 return; 2002 return;
1985 2003
1986 /* 2004 /*
1987 * A: set up vars 2005 * A: set up vars
1988 */ 2006 */
1989 must_clear = 0;
1990 refresh_count = 0; 2007 refresh_count = 0;
1991 2008
1992#if XPM_BACKGROUND 2009 have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP
1993 must_clear |= bgPixmap.pixmap != None; 2011 have_bg = bgPixmap.pixmap != None;
1994#endif
1995#if TRANSPARENT
1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1997#endif 2012#endif
1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1999 2014
2000 /* 2015 /*
2001 * B: reverse any characters which are selected 2016 * B: reverse any characters which are selected
… …
2005 /* 2020 /*
2006 * C: set the cursor character (s) 2021 * C: set the cursor character (s)
2007 */ 2022 */
2008 { 2023 {
2009 unsigned char setoldcursor; 2024 unsigned char setoldcursor;
2010 rend_t ccol1, /* Cursor colour */
2011 ccol2; /* Cursor colour2 */
2012 2025
2013 showcursor = (screen.flags & Screen_VisibleCursor); 2026 showcursor = (screen.flags & Screen_VisibleCursor);
2014#ifdef CURSOR_BLINK 2027#ifdef CURSOR_BLINK
2015 if (hidden_cursor) 2028 if (hidden_cursor)
2016 showcursor = 0; 2029 showcursor = 0;
… …
2023 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2036 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2024 col--; 2037 col--;
2025 2038
2026 crp = &ROW(screen.cur.row).r[col]; 2039 crp = &ROW(screen.cur.row).r[col];
2027 2040
2041#ifndef NO_CURSORCOLOR
2042 cc1 = *crp & (RS_fgMask | RS_bgMask);
2043 if (ISSET_PIXCOLOR (Color_cursor))
2044 ccol1 = Color_cursor;
2045 else
2046#endif
2047#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2048 ccol1 = fgcolor_of (rstyle);
2049#else
2050 ccol1 = Color_fg;
2051#endif
2052
2053#ifndef NO_CURSORCOLOR
2054 if (ISSET_PIXCOLOR (Color_cursor2))
2055 ccol2 = Color_cursor2;
2056 else
2057#endif
2058#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2059 ccol2 = bgcolor_of (rstyle);
2060#else
2061 ccol2 = Color_bg;
2062#endif
2063
2028 if (showcursor && focus) 2064 if (showcursor && focus)
2029 { 2065 {
2030 if (OPTION (Opt_cursorUnderline)) 2066 if (option (Opt_cursorUnderline))
2031 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2032 else 2068 else
2033 { 2069 {
2034 *crp ^= RS_RVid; 2070 *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); 2071 *crp = SET_FGCOLOR (*crp, ccol1);
2055 *crp = SET_BGCOLOR (*crp, ccol2); 2072 *crp = SET_BGCOLOR (*crp, ccol2);
2056#endif
2057 } 2073 }
2058 } 2074 }
2059 } 2075 }
2060 2076
2061 /* make sure no outline cursor is left around */ 2077 /* make sure no outline cursor is left around */
… …
2100 * D: CopyArea pass - very useful for slower links 2116 * D: CopyArea pass - very useful for slower links
2101 * This has been deliberately kept simple. 2117 * This has been deliberately kept simple.
2102 */ 2118 */
2103 if (!display->is_local 2119 if (!display->is_local
2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2120 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2105 && abs (num_scr) < nrow && !must_clear) 2121 && abs (num_scr) < nrow && !have_bg)
2106 { 2122 {
2107 int16_t nits; 2123 int16_t nits;
2124 int i = num_scr;
2108 int j; 2125 int j;
2109 int len, wlen; 2126 int len, wlen;
2110 dLocal (int, num_scr); 2127 dLocal (int, num_scr);
2111 2128
2112 j = nrow; 2129 j = nrow;
2113 wlen = len = -1; 2130 wlen = len = -1;
2114 row = i > 0 ? 0 : j - 1; 2131 row = i > 0 ? 0 : j - 1;
2132
2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2133 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2116 { 2134 {
2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2135 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2118 { 2136 {
2119 line_t s = ROW(view_start + row); 2137 line_t s = ROW(view_start + row);
… …
2140 wlen = row; 2158 wlen = row;
2141 continue; 2159 continue;
2142 } 2160 }
2143 } 2161 }
2144 2162
2145 if (len != -1) 2163 if (len >= 0)
2146 { 2164 {
2147 /* also comes here at end if needed because of >= above */ 2165 /* also comes here at end if needed because of >= above */
2148 if (wlen < len) 2166 if (wlen < len)
2149 ::swap (wlen, len); 2167 ::swap (wlen, len);
2150 2168
2169 XGCValues gcv;
2170
2171 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2151 XCopyArea (xdisp, vt, vt, 2172 XCopyArea (dpy, vt, vt,
2152 gc, 0, Row2Pixel (len + i), 2173 gc, 0, Row2Pixel (len + i),
2153 (unsigned int)this->width, 2174 (unsigned int)this->width,
2154 (unsigned int)Height2Pixel (wlen - len + 1), 2175 (unsigned int)Height2Pixel (wlen - len + 1),
2155 0, Row2Pixel (len)); 2176 0, Row2Pixel (len));
2177 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2178
2156 len = -1; 2179 len = -1;
2157 } 2180 }
2158 } 2181 }
2159 } 2182 }
2160#endif 2183#endif
… …
2184 continue; 2207 continue;
2185 2208
2186 // redraw one or more characters 2209 // redraw one or more characters
2187 2210
2188 // seek to the beginning of wide characters 2211 // seek to the beginning of wide characters
2189 while (stp[col] == NOCHAR && col > 0) 2212 while (expect_false (stp[col] == NOCHAR && col > 0))
2190 --col; 2213 --col;
2191 2214
2192 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2193 text_t *text = stp + col; 2216 text_t *text = stp + col;
2194 int count = 1; 2217 int count = 1;
… …
2216 count++; 2239 count++;
2217 2240
2218 if (stp[col] != dtp[col] 2241 if (stp[col] != dtp[col]
2219 || !RS_SAME (srp[col], drp[col])) 2242 || !RS_SAME (srp[col], drp[col]))
2220 { 2243 {
2221 if (must_clear && (i++ > count / 2)) 2244 if (have_bg && (i++ > count / 2))
2222 break; 2245 break;
2223 2246
2224 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2225 drp[col] = rend; 2248 drp[col] = rend;
2226 i = 0; 2249 i = 0;
2227 } 2250 }
2228 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2251 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2229 break; 2252 break;
2230 } 2253 }
2231 2254
2232 col--; /* went one too far. move back */ 2255 col--; /* went one too far. move back */
2233 count -= i; /* dump any matching trailing chars */ 2256 count -= i; /* dump any matching trailing chars */
2234 2257
2235 // sometimes we optimize away the trailing NOCHAR's, add them back 2258 // sometimes we optimize away the trailing NOCHAR's, add them back
2236 while (i && text[count] == NOCHAR) 2259 while (expect_false (i && text[count] == NOCHAR))
2237 count++, i--; 2260 count++, i--;
2238 2261
2239 /* 2262 /*
2240 * Determine the attributes for the string 2263 * Determine the attributes for the string
2241 */ 2264 */
2242 int fore = fgcolor_of (rend); // desired foreground 2265 int fore = fgcolor_of (rend); // desired foreground
2243 int back = bgcolor_of (rend); // desired background 2266 int back = bgcolor_of (rend); // desired background
2244 2267
2245 // only do special processing if any attributes are set, which is unlikely 2268 // 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)) 2269 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2247 { 2270 {
2248#if ENABLE_STYLES
2249 // "careful" (too wide) character handling
2250
2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2252 while (text > stp
2253 && srp[text - stp - 1] & RS_Careful
2254 && RS_SAME (rend, srp[text - stp - 1]))
2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2264#endif
2265
2266 bool invert = rend & RS_RVid; 2271 bool invert = rend & RS_RVid;
2267 2272
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2273#ifndef NO_BOLD_UNDERLINE_REVERSE
2269 if (rend & RS_Bold
2270 && fore == Color_fg) 2274 if (rend & RS_Bold && fore == Color_fg)
2271 { 2275 {
2272 if (ISSET_PIXCOLOR (Color_BD)) 2276 if (ISSET_PIXCOLOR (Color_BD))
2273 fore = Color_BD; 2277 fore = Color_BD;
2274# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2275 else 2279 else
2276 invert = !invert; 2280 invert = !invert;
2277# endif 2281# endif
2278 } 2282 }
2279 2283
2280 if (rend & RS_Italic 2284 if (rend & RS_Italic && fore == Color_fg)
2281 && fore == Color_fg)
2282 { 2285 {
2283 if (ISSET_PIXCOLOR (Color_IT)) 2286 if (ISSET_PIXCOLOR (Color_IT))
2284 fore = Color_IT; 2287 fore = Color_IT;
2285# if !ENABLE_STYLES 2288# if !ENABLE_STYLES
2286 else 2289 else
2287 invert = !invert; 2290 invert = !invert;
2288# endif 2291# endif
2289 } 2292 }
2290 2293
2291 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2294 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2295 fore = Color_UL;
2293#endif 2296#endif
2294 2297
2295 if (invert) 2298 if (invert)
2296 { 2299 {
2300#ifdef OPTION_HC
2301 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2302 || !ISSET_PIXCOLOR (Color_HC))
2303#endif
2304 /* invert the column if no highlightColor is set or it is the
2305 * current cursor column */
2297 ::swap (fore, back); 2306 ::swap (fore, back);
2307#ifdef OPTION_HC
2308 else if (ISSET_PIXCOLOR (Color_HC))
2309 back = Color_HC;
2310#endif
2298 2311
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2313# ifndef OPTION_HC
2300 if (ISSET_PIXCOLOR (Color_RV)) 2314 if (ISSET_PIXCOLOR (Color_RV))
2301 back = Color_RV; 2315 back = Color_RV;
2302 2316# endif
2303 if (fore == back) 2317 if (fore == back)
2304 { 2318 {
2305 fore = Color_bg; 2319 fore = Color_bg;
2306 back = Color_fg; 2320 back = Color_fg;
2307 } 2321 }
… …
2309 } 2323 }
2310 2324
2311#ifdef TEXT_BLINK 2325#ifdef TEXT_BLINK
2312 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2326 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2313 { 2327 {
2314 if (!text_blink_ev.active) 2328 if (!text_blink_ev.is_active ())
2315 { 2329 {
2316 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2330 text_blink_ev.again ();
2317 hidden_text = 0; 2331 hidden_text = 0;
2318 } 2332 }
2319 else if (hidden_text) 2333 else if (hidden_text)
2320 fore = back; 2334 fore = back;
2321 } 2335 }
2322#endif 2336#endif
2337
2338#if ENABLE_STYLES
2339 // "careful" (too wide) character handling
2340
2341 // include previous careful character(s) if possible, looks nicer (best effort...)
2342 while (text > stp
2343 && srp[text - stp - 1] & RS_Careful
2344 && RS_SAME (rend, srp[text - stp - 1]))
2345 text--, count++, xpixel -= fwidth;
2346
2347 // force redraw after "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2349 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2350
2351 // force redraw before "careful" characters to avoid pixel droppings
2352 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2353 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2354#endif
2323 } 2355 }
2324 2356
2325 /* 2357 /*
2326 * Actually do the drawing of the string here 2358 * Actually do the drawing of the string here
2327 */ 2359 */
2328 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2360 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2329 2361
2330 if (back == fore) 2362 if (expect_true (have_bg && back == Color_bg))
2331 font->clear_rect (*drawable, xpixel, ypixel,
2332 fwidth * count, fheight,
2333 back);
2334 else if (back == Color_bg)
2335 { 2363 {
2336 if (must_clear) 2364 // this is very ugly, maybe push it into ->draw?
2337 {
2338 CLEAR_CHARS (xpixel, ypixel, count);
2339 2365
2340 for (i = 0; i < count; i++) /* don't draw empty strings */ 2366 for (i = 0; i < count; i++) /* don't draw empty strings */
2341 if (text[i] != ' ') 2367 if (text[i] != ' ')
2342 { 2368 {
2343 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2344 break; 2370 goto did_clear;
2345 }
2346 } 2371 }
2347 else 2372
2348 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2373 CLEAR_CHARS (xpixel, ypixel, count);
2374 did_clear: ;
2349 } 2375 }
2350 else 2376 else
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2377 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2352 2378
2353 if (rend & RS_Uline && font->descent > 1 && fore != back) 2379 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2354 { 2380 {
2355#if ENABLE_FRILLS 2381#if ENABLE_FRILLS
2356 if (ISSET_PIXCOLOR (Color_underline)) 2382 if (ISSET_PIXCOLOR (Color_underline))
2357 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2383 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2358 else 2384 else
2359#endif 2385#endif
2360 XSetForeground (xdisp, gc, pix_colors[fore]); 2386 XSetForeground (dpy, gc, pix_colors[fore]);
2361 2387
2362 XDrawLine (xdisp, drawBuffer, gc, 2388 XDrawLine (dpy, vt, gc,
2363 xpixel, ypixel + font->ascent + 1, 2389 xpixel, ypixel + font->ascent + 1,
2364 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2390 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2365 } 2391 }
2366 } /* for (col....) */ 2392 } /* for (col....) */
2367 } /* for (row....) */ 2393 } /* for (row....) */
… …
2376 */ 2402 */
2377 if (showcursor) 2403 if (showcursor)
2378 { 2404 {
2379 if (focus) 2405 if (focus)
2380 { 2406 {
2381 if (OPTION (Opt_cursorUnderline)) 2407 if (option (Opt_cursorUnderline))
2382 *crp ^= RS_Uline; 2408 *crp ^= RS_Uline;
2383 else 2409 else
2384 { 2410 {
2385 *crp ^= RS_RVid; 2411 *crp ^= RS_RVid;
2386#ifndef NO_CURSORCOLOR 2412#ifndef NO_CURSORCOLOR
… …
2400 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2426 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2401 cursorwidth++; 2427 cursorwidth++;
2402 2428
2403#ifndef NO_CURSORCOLOR 2429#ifndef NO_CURSORCOLOR
2404 if (ISSET_PIXCOLOR (Color_cursor)) 2430 if (ISSET_PIXCOLOR (Color_cursor))
2405 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2431 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2432 else
2406#endif 2433#endif
2434 XSetForeground (dpy, gc, pix_colors[ccol1]);
2407 2435
2408 XDrawRectangle (xdisp, drawBuffer, gc, 2436 XDrawRectangle (dpy, vt, gc,
2409 Col2Pixel (col), 2437 Col2Pixel (col),
2410 Row2Pixel (oldcursor.row), 2438 Row2Pixel (oldcursor.row),
2411 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2439 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2412 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2440 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2413 } 2441 }
… …
2448} 2476}
2449 2477
2450void 2478void
2451rxvt_term::scr_recolour () NOTHROW 2479rxvt_term::scr_recolour () NOTHROW
2452{ 2480{
2453 if (1 2481#ifdef HAVE_BG_PIXMAP
2454#if TRANSPARENT 2482 bgPixmap.apply ();
2455 && !am_transparent 2483#else
2456#endif 2484
2457#if XPM_BACKGROUND
2458 && !bgPixmap.pixmap
2459#endif
2460 )
2461 {
2462 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2485 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2463 XClearWindow (xdisp, parent[0]); 2486 XClearWindow (dpy, parent[0]);
2464 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2487 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2465#if HAVE_SCROLLBARS 2488
2466 if (scrollBar.win) 2489 if (scrollBar.win)
2467 { 2490 {
2468 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2491 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2469 scrollBar.setIdle (); 2492 scrollBar.state = STATE_IDLE;
2470 scrollbar_show (0); 2493 scrollBar.show (0);
2471 }
2472#endif
2473 } 2494 }
2474 2495
2496#endif
2497
2498 /* bgPixmap.apply () does not do the following : */
2475 scr_clear (); 2499 scr_clear ();
2476 scr_touch (true); 2500 scr_touch (true);
2477 want_refresh = 1; 2501 want_refresh = 1;
2478} 2502}
2479 2503
… …
2486 2510
2487 num_scr_allow = 0; 2511 num_scr_allow = 0;
2488 want_refresh = 1; 2512 want_refresh = 1;
2489 2513
2490 if (really) 2514 if (really)
2491 XClearWindow (xdisp, vt); 2515 XClearWindow (dpy, vt);
2492} 2516}
2493 2517
2494void 2518void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2519rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{ 2520{
… …
2545{ 2569{
2546 if (selection.op 2570 if (selection.op
2547 && current_screen == selection.screen 2571 && current_screen == selection.screen
2548 && selection.end.row >= view_start) 2572 && selection.end.row >= view_start)
2549 { 2573 {
2550#if ENABLE_FRILLS 2574#if !ENABLE_MINIMAL
2551 if (selection.rect) 2575 if (selection.rect)
2552 scr_xor_rect (selection.beg.row, selection.beg.col, 2576 scr_xor_rect (selection.beg.row, selection.beg.col,
2553 selection.end.row, selection.end.col, 2577 selection.end.row, selection.end.col,
2554 RS_RVid, RS_RVid | RS_Uline); 2578 RS_RVid, RS_RVid | RS_Uline);
2555 else 2579 else
… …
2571{ 2595{
2572 int row, wrote; 2596 int row, wrote;
2573 unsigned int width, towrite; 2597 unsigned int width, towrite;
2574 char r1[] = "\n"; 2598 char r1[] = "\n";
2575 2599
2576 for (row = saveLines - nsaved; 2600 for (row = saveLines + top_row;
2577 row < saveLines + nrow - 1; row++) 2601 row < saveLines + nrow - 1; row++)
2578 { 2602 {
2579 width = row_buf[row].l >= 0 ? row_buf[row].l 2603 width = row_buf[row].l >= 0 ? row_buf[row].l
2580 : ncol; 2604 : ncol;
2581 for (towrite = width; towrite; towrite -= wrote) 2605 for (towrite = width; towrite; towrite -= wrote)
… …
2632 /* convert normal newline chars into common keyboard Return key sequence */ 2656 /* convert normal newline chars into common keyboard Return key sequence */
2633 for (unsigned int i = 0; i < len; i++) 2657 for (unsigned int i = 0; i < len; i++)
2634 if (data[i] == C0_LF) 2658 if (data[i] == C0_LF)
2635 data[i] = C0_CR; 2659 data[i] = C0_CR;
2636 2660
2661 if (priv_modes & PrivMode_BracketPaste)
2662 tt_printf ("\e[200~");
2663
2637 tt_write (data, len); 2664 tt_write (data, len);
2665
2666 if (priv_modes & PrivMode_BracketPaste)
2667 tt_printf ("\e[201~");
2638} 2668}
2639 2669
2640/* ------------------------------------------------------------------------- */ 2670/* ------------------------------------------------------------------------- */
2641/* 2671/*
2642 * Respond to a notification that a primary selection has been sent 2672 * Respond to a notification that a primary selection has been sent
… …
2671 } 2701 }
2672 2702
2673 unsigned long bytes_after; 2703 unsigned long bytes_after;
2674 XTextProperty ct; 2704 XTextProperty ct;
2675 2705
2676 if (XGetWindowProperty (xdisp, win, prop, 2706 if (XGetWindowProperty (dpy, win, prop,
2677 0, PROP_SIZE / 4, 2707 0, PROP_SIZE / 4,
2678 delete_prop, AnyPropertyType, 2708 delete_prop, AnyPropertyType,
2679 &ct.encoding, &ct.format, 2709 &ct.encoding, &ct.format,
2680 &ct.nitems, &bytes_after, 2710 &ct.nitems, &bytes_after,
2681 &ct.value) != Success) 2711 &ct.value) != Success)
… …
2690 if (bytes_after) 2720 if (bytes_after)
2691 { 2721 {
2692 // fetch and append remaining data 2722 // fetch and append remaining data
2693 XTextProperty ct2; 2723 XTextProperty ct2;
2694 2724
2695 if (XGetWindowProperty (xdisp, win, prop, 2725 if (XGetWindowProperty (dpy, win, prop,
2696 ct.nitems / 4, (bytes_after + 3) / 4, 2726 ct.nitems / 4, (bytes_after + 3) / 4,
2697 delete_prop, AnyPropertyType, 2727 delete_prop, AnyPropertyType,
2698 &ct2.encoding, &ct2.format, 2728 &ct2.encoding, &ct2.format,
2699 &ct2.nitems, &bytes_after, 2729 &ct2.nitems, &bytes_after,
2700 &ct2.value) != Success) 2730 &ct2.value) != Success)
… …
2713 2743
2714 if (ct.encoding == xa[XA_INCR]) 2744 if (ct.encoding == xa[XA_INCR])
2715 { 2745 {
2716 // INCR selection, start handshake 2746 // INCR selection, start handshake
2717 if (!delete_prop) 2747 if (!delete_prop)
2718 XDeleteProperty (xdisp, win, prop); 2748 XDeleteProperty (dpy, win, prop);
2719 2749
2720 selection_wait = Sel_incr; 2750 selection_wait = Sel_incr;
2721 incr_buf_fill = 0; 2751 incr_buf_fill = 0;
2722 incr_ev.start (NOW + 10); 2752 incr_ev.start (10);
2723 2753
2724 goto bailout; 2754 goto bailout;
2725 } 2755 }
2726 2756
2727 if (ct.nitems == 0) 2757 if (ct.nitems == 0)
… …
2736 ct.nitems = incr_buf_fill; 2766 ct.nitems = incr_buf_fill;
2737 incr_buf = 0; 2767 incr_buf = 0;
2738 incr_buf_size = 0; 2768 incr_buf_size = 0;
2739 incr_ev.stop (); 2769 incr_ev.stop ();
2740 } 2770 }
2741 else 2771 else
2742 { 2772 {
2743 if (selection_wait == Sel_normal 2773 if (selection_wait == Sel_normal
2744 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2745 { 2775 {
2746 /* 2776 /*
… …
2753 goto bailout; 2783 goto bailout;
2754 } 2784 }
2755 } 2785 }
2756 else if (selection_wait == Sel_incr) 2786 else if (selection_wait == Sel_incr)
2757 { 2787 {
2758 incr_ev.start (NOW + 10); 2788 incr_ev.start (10);
2759 2789
2760 while (incr_buf_fill + ct.nitems > incr_buf_size) 2790 while (incr_buf_fill + ct.nitems > incr_buf_size)
2761 { 2791 {
2762 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2792 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2763 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2793 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2770 } 2800 }
2771 2801
2772 char **cl; 2802 char **cl;
2773 int cr; 2803 int cr;
2774 2804
2775#if ENABLE_FRILLS 2805#if !ENABLE_MINIMAL
2776 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2806 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2777 // so recode it manually 2807 // so recode it manually
2778 if (ct.encoding == xa[XA_UTF8_STRING]) 2808 if (ct.encoding == xa[XA_UTF8_STRING])
2779 { 2809 {
2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2810 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2784 paste (s, strlen (s)); 2814 paste (s, strlen (s));
2785 free (s); 2815 free (s);
2786 } 2816 }
2787 else 2817 else
2788#endif 2818#endif
2789 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2819 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2790 && cl) 2820 && cl)
2791 { 2821 {
2792 for (int i = 0; i < cr; i++) 2822 for (int i = 0; i < cr; i++)
2793 paste (cl[i], strlen (cl[i])); 2823 paste (cl[i], strlen (cl[i]));
2794 2824
… …
2803 if (selection_wait == Sel_normal) 2833 if (selection_wait == Sel_normal)
2804 selection_wait = Sel_none; 2834 selection_wait = Sel_none;
2805} 2835}
2806 2836
2807void 2837void
2808rxvt_term::incr_cb (time_watcher &w) NOTHROW 2838rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2809{ 2839{
2810 selection_wait = Sel_none; 2840 selection_wait = Sel_none;
2811 2841
2812 incr_buf_size = 0; 2842 incr_buf_size = 0;
2813 free (incr_buf); 2843 free (incr_buf);
… …
2824 selection_paste (win, prop, true); 2854 selection_paste (win, prop, true);
2825} 2855}
2826 2856
2827/* ------------------------------------------------------------------------- */ 2857/* ------------------------------------------------------------------------- */
2828/* 2858/*
2829 * Request the current selection: 2859 * Request the current selection:
2830 * Order: > internal selection if available 2860 * Order: > internal selection if available
2831 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2832 * > CUT_BUFFER0 2862 * > CUT_BUFFER0
2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2834 * will auto fallback to CUT_BUFFER0 2864 * will auto fallback to CUT_BUFFER0
… …
2836 */ 2866 */
2837void 2867void
2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2839{ 2869{
2840 if (selection.text && selnum == Sel_Primary) 2870 if (selection.text && selnum == Sel_Primary)
2871 {
2841 { /* internal selection */ 2872 /* internal selection */
2842 char *str = rxvt_wcstombs (selection.text, selection.len); 2873 char *str = rxvt_wcstombs (selection.text, selection.len);
2843 paste (str, strlen (str)); 2874 paste (str, strlen (str));
2844 free (str); 2875 free (str);
2845 return; 2876 return;
2846 } 2877 }
… …
2876 else if (selnum == Sel_Secondary) 2907 else if (selnum == Sel_Secondary)
2877 sel = XA_SECONDARY; 2908 sel = XA_SECONDARY;
2878 else 2909 else
2879 sel = xa[XA_CLIPBOARD]; 2910 sel = xa[XA_CLIPBOARD];
2880 2911
2881 if (XGetSelectionOwner (xdisp, sel) != None) 2912 if (XGetSelectionOwner (dpy, sel) != None)
2882 { 2913 {
2883 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2914 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2884 vt, selection_request_time); 2915 vt, selection_request_time);
2885 return 1; 2916 return 1;
2886 } 2917 }
2887 2918
2888 return 0; 2919 return 0;
… …
2951 2982
2952 int end_col; 2983 int end_col;
2953 2984
2954 for (; row <= selection.end.row; row++, col = 0) 2985 for (; row <= selection.end.row; row++, col = 0)
2955 { 2986 {
2956#if ENABLE_FRILLS 2987#if !ENABLE_MINIMAL
2957 if (selection.rect) 2988 if (selection.rect)
2958 { 2989 {
2959 col = selection.beg.col; 2990 col = selection.beg.col;
2960 end_col = ncol + 1; 2991 end_col = ncol + 1;
2961 } 2992 }
… …
2964 end_col = ROW(row).l; 2995 end_col = ROW(row).l;
2965 2996
2966 col = max (col, 0); 2997 col = max (col, 0);
2967 2998
2968 if (row == selection.end.row 2999 if (row == selection.end.row
2969#if ENABLE_FRILLS 3000#if !ENABLE_MINIMAL
2970 || selection.rect 3001 || selection.rect
2971#endif 3002#endif
2972 ) 3003 )
2973 min_it (end_col, selection.end.col); 3004 min_it (end_col, selection.end.col);
2974 3005
… …
2997#endif 3028#endif
2998 else 3029 else
2999 new_selection_text[ofs++] = *t++; 3030 new_selection_text[ofs++] = *t++;
3000 } 3031 }
3001 3032
3002#if ENABLE_FRILLS 3033#if !ENABLE_MINIMAL
3003 if (selection.rect) 3034 if (selection.rect)
3004 { 3035 {
3005 while (ofs 3036 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF 3037 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1])) 3038 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3041bool 3072bool
3042rxvt_term::selection_grab (Time tm) NOTHROW 3073rxvt_term::selection_grab (Time tm) NOTHROW
3043{ 3074{
3044 selection_time = tm; 3075 selection_time = tm;
3045 3076
3046 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3077 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3047 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3078 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3048 { 3079 {
3049 display->set_selection_owner (this); 3080 display->set_selection_owner (this);
3050 return true; 3081 return true;
3051 } 3082 }
3052 else 3083 else
… …
3056 } 3087 }
3057 3088
3058#if 0 3089#if 0
3059 XTextProperty ct; 3090 XTextProperty ct;
3060 3091
3061 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3092 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3062 { 3093 {
3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3094 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3064 XFree (ct.value); 3095 XFree (ct.value);
3065 } 3096 }
3066#endif 3097#endif
… …
3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3143 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3113 3144
3114 while (selection.mark.col > 0 3145 while (selection.mark.col > 0
3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3146 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3116 --selection.mark.col; 3147 --selection.mark.col;
3117 3148
3118 if (selection.op) 3149 if (selection.op)
3150 {
3119 { /* clear the old selection */ 3151 /* clear the old selection */
3120 selection.beg.row = selection.end.row = selection.mark.row; 3152 selection.beg.row = selection.end.row = selection.mark.row;
3121 selection.beg.col = selection.end.col = selection.mark.col; 3153 selection.beg.col = selection.end.col = selection.mark.col;
3122 } 3154 }
3123 3155
3124 selection.op = SELECTION_INIT; 3156 selection.op = SELECTION_INIT;
… …
3313 * a point/word/line which is either the start or end of the selection 3345 * a point/word/line which is either the start or end of the selection
3314 * and it was decided by whichever point/word/line was `fixed' at the 3346 * and it was decided by whichever point/word/line was `fixed' at the
3315 * time of the most recent button3 press 3347 * time of the most recent button3 press
3316 */ 3348 */
3317 if (button3 && buttonpress) 3349 if (button3 && buttonpress)
3350 {
3318 { /* button3 press */ 3351 /* button3 press */
3319 /* 3352 /*
3320 * first determine which edge of the selection we are closest to 3353 * first determine which edge of the selection we are closest to
3321 */ 3354 */
3322 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3355 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3323 || (!ROWCOL_IS_AFTER (pos, selection.end) 3356 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3341 selection.mark.row = selection.beg.row; 3374 selection.mark.row = selection.beg.row;
3342 selection.mark.col = selection.beg.col; 3375 selection.mark.col = selection.beg.col;
3343 } 3376 }
3344 } 3377 }
3345 else 3378 else
3379 {
3346 { /* button1 drag or button3 drag */ 3380 /* button1 drag or button3 drag */
3347 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3381 if (ROWCOL_IS_AFTER (selection.mark, pos))
3348 { 3382 {
3349 if (selection.mark.row == selection.end.row 3383 if (selection.mark.row == selection.end.row
3350 && selection.mark.col == selection.end.col 3384 && selection.mark.col == selection.end.col
3351 && clickchange 3385 && clickchange
… …
3368 3402
3369 if (selection.clicks == 1) 3403 if (selection.clicks == 1)
3370 { 3404 {
3371 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3405 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.beg.row).is_longer () 3406 && !ROW(selection.beg.row).is_longer ()
3373#if ENABLE_FRILLS 3407#if !ENABLE_MINIMAL
3374 && !selection.rect 3408 && !selection.rect
3375#endif 3409#endif
3376 ) 3410 )
3377 selection.beg.col = ncol; 3411 selection.beg.col = ncol;
3378 3412
3379 if ( 3413 if (
3380 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3414 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3381 && !ROW(selection.end.row).is_longer () 3415 && !ROW(selection.end.row).is_longer ()
3382#if ENABLE_FRILLS 3416#if !ENABLE_MINIMAL
3383 && !selection.rect 3417 && !selection.rect
3384#endif 3418#endif
3385 ) 3419 )
3386 selection.end.col = ncol; 3420 selection.end.col = ncol;
3387 } 3421 }
… …
3394 selection_delimit_word (DN, &selection.end, &selection.end); 3428 selection_delimit_word (DN, &selection.end, &selection.end);
3395 } 3429 }
3396 else if (selection.clicks == 3) 3430 else if (selection.clicks == 3)
3397 { 3431 {
3398#if ENABLE_FRILLS 3432#if ENABLE_FRILLS
3399 if (OPTION (Opt_tripleclickwords)) 3433 if (option (Opt_tripleclickwords))
3400 { 3434 {
3401 selection_delimit_word (UP, &selection.beg, &selection.beg); 3435 selection_delimit_word (UP, &selection.beg, &selection.beg);
3402 3436
3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3437 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3404 { 3438 {
3405 if (!ROW(end_row).is_longer ()) 3439 if (!ROW(end_row).is_longer ())
3406 { 3440 {
3407 selection.end.row = end_row; 3441 selection.end.row = end_row;
3408 selection.end.col = ROW(end_row).l; 3442 selection.end.col = ROW(end_row).l;
3443# if !ENABLE_MINIMAL
3409 selection_remove_trailing_spaces (); 3444 selection_remove_trailing_spaces ();
3445# endif
3410 break; 3446 break;
3411 } 3447 }
3412 } 3448 }
3413 } 3449 }
3414 else 3450 else
… …
3430 selection.end.row++; 3466 selection.end.row++;
3431 } 3467 }
3432 } 3468 }
3433 3469
3434 if (button3 && buttonpress) 3470 if (button3 && buttonpress)
3471 {
3435 { /* mark may need to be changed */ 3472 /* mark may need to be changed */
3436 if (closeto == LEFT) 3473 if (closeto == LEFT)
3437 { 3474 {
3438 selection.mark.row = selection.end.row; 3475 selection.mark.row = selection.end.row;
3439 selection.mark.col = selection.end.col - (selection.clicks == 2); 3476 selection.mark.col = selection.end.col - (selection.clicks == 2);
3440 } 3477 }
… …
3443 selection.mark.row = selection.beg.row; 3480 selection.mark.row = selection.beg.row;
3444 selection.mark.col = selection.beg.col; 3481 selection.mark.col = selection.beg.col;
3445 } 3482 }
3446 } 3483 }
3447 3484
3448#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3449 if (selection.rect && selection.beg.col > selection.end.col) 3486 if (selection.rect && selection.beg.col > selection.end.col)
3450 ::swap (selection.beg.col, selection.end.col); 3487 ::swap (selection.beg.col, selection.end.col);
3451#endif 3488#endif
3452} 3489}
3453 3490
3454#if ENABLE_FRILLS 3491#if !ENABLE_MINIMAL
3455void 3492void
3456rxvt_term::selection_remove_trailing_spaces () NOTHROW 3493rxvt_term::selection_remove_trailing_spaces () NOTHROW
3457{ 3494{
3458 int32_t end_col, end_row; 3495 int32_t end_col, end_row;
3459 text_t *stp; 3496 text_t *stp;
… …
3537 *target++ = xa[XA_COMPOUND_TEXT]; 3574 *target++ = xa[XA_COMPOUND_TEXT];
3538#if X_HAVE_UTF8_STRING 3575#if X_HAVE_UTF8_STRING
3539 *target++ = xa[XA_UTF8_STRING]; 3576 *target++ = xa[XA_UTF8_STRING];
3540#endif 3577#endif
3541 3578
3542 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3579 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3543 32, PropModeReplace, 3580 32, PropModeReplace,
3544 (unsigned char *)target_list, target - target_list); 3581 (unsigned char *)target_list, target - target_list);
3545 ev.property = rq.property; 3582 ev.property = rq.property;
3546 } 3583 }
3547#if TODO // TODO 3584#if TODO // TODO
… …
3550 /* TODO: Handle MULTIPLE */ 3587 /* TODO: Handle MULTIPLE */
3551 } 3588 }
3552#endif 3589#endif
3553 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3590 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3554 { 3591 {
3555 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3592 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3556 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3593 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3557 ev.property = rq.property; 3594 ev.property = rq.property;
3558 } 3595 }
3559 else if (rq.target == XA_STRING 3596 else if (rq.target == XA_STRING
3560 || rq.target == xa[XA_TEXT] 3597 || rq.target == xa[XA_TEXT]
… …
3584 style = enc_string; 3621 style = enc_string;
3585 else if (target == xa[XA_TEXT]) 3622 else if (target == xa[XA_TEXT])
3586 style = enc_text; 3623 style = enc_text;
3587 else if (target == xa[XA_COMPOUND_TEXT]) 3624 else if (target == xa[XA_COMPOUND_TEXT])
3588 style = enc_compound_text; 3625 style = enc_compound_text;
3589#if ENABLE_FRILLS 3626#if !ENABLE_MINIMAL
3590 else if (target == xa[XA_UTF8_STRING]) 3627 else if (target == xa[XA_UTF8_STRING])
3591 style = enc_utf8; 3628 style = enc_utf8;
3592#endif 3629#endif
3593 else 3630 else
3594 { 3631 {
… …
3605 { 3642 {
3606 cl = L""; 3643 cl = L"";
3607 selectlen = 0; 3644 selectlen = 0;
3608 } 3645 }
3609 3646
3610#if ENABLE_FRILLS 3647#if !ENABLE_MINIMAL
3611 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3648 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3612 // so recode it manually 3649 // so recode it manually
3613 if (style == enc_utf8) 3650 if (style == enc_utf8)
3614 { 3651 {
3615 freect = 1; 3652 freect = 1;
… …
3618 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3655 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3619 ct.nitems = strlen ((char *)ct.value); 3656 ct.nitems = strlen ((char *)ct.value);
3620 } 3657 }
3621 else 3658 else
3622#endif 3659#endif
3623 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3660 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3624 freect = 1; 3661 freect = 1;
3625 else 3662 else
3626 { 3663 {
3627 /* if we failed to convert then send it raw */ 3664 /* if we failed to convert then send it raw */
3628 ct.value = (unsigned char *)cl; 3665 ct.value = (unsigned char *)cl;
3629 ct.nitems = selectlen; 3666 ct.nitems = selectlen;
3630 ct.encoding = target; 3667 ct.encoding = target;
3631 } 3668 }
3632 3669
3633 XChangeProperty (xdisp, rq.requestor, rq.property, 3670 XChangeProperty (dpy, rq.requestor, rq.property,
3634 ct.encoding, 8, PropModeReplace, 3671 ct.encoding, 8, PropModeReplace,
3635 ct.value, (int)ct.nitems); 3672 ct.value, (int)ct.nitems);
3636 ev.property = rq.property; 3673 ev.property = rq.property;
3637 3674
3638 if (freect) 3675 if (freect)
3639 XFree (ct.value); 3676 XFree (ct.value);
3640 } 3677 }
3641 3678
3642 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3679 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3643}
3644
3645/* ------------------------------------------------------------------------- *
3646 * MOUSE ROUTINES *
3647 * ------------------------------------------------------------------------- */
3648
3649/*
3650 * return col/row values corresponding to x/y pixel values
3651 */
3652void
3653rxvt_term::pixel_position (int *x, int *y) NOTHROW
3654{
3655 *x = Pixel2Col (*x);
3656 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3657 *y = Pixel2Row (*y);
3658 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3659} 3680}
3660 3681
3661/* ------------------------------------------------------------------------- */ 3682/* ------------------------------------------------------------------------- */
3662#ifdef USE_XIM 3683#ifdef USE_XIM
3663void 3684void
3664rxvt_term::im_set_position (XPoint &pos) NOTHROW 3685rxvt_term::im_set_position (XPoint &pos) NOTHROW
3665{ 3686{
3666 XWindowAttributes xwa; 3687 XWindowAttributes xwa;
3667 3688
3668 XGetWindowAttributes (xdisp, vt, &xwa); 3689 XGetWindowAttributes (dpy, vt, &xwa);
3669 3690
3670 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3691 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3671 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3692 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3672} 3693}
3673#endif 3694#endif

Diff Legend

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