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.262 by root, Mon Feb 20 22:42:01 2006 UTC vs.
Revision 1.316 by root, Tue Nov 4 15:02:35 2008 UTC

1/*---------------------------------------------------------------------------* 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 (dpy, 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 (dpy, 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 (dpy, 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
… …
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
153} 135}
154 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
… …
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;
… …
666 line_t &l2 = ROW(i); 667 line_t &l2 = ROW(i);
667 668
668 ::swap (l1, l2); 669 ::swap (l1, l2);
669 l2.touch (); 670 l2.touch ();
670 } 671 }
671 672
672 // move and/or clear selection, if any 673 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 674 if (selection.op && current_screen == selection.screen)
674 { 675 {
675 selection.beg.row -= count; 676 selection.beg.row -= count;
676 selection.end.row -= count; 677 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 685 selection.op = SELECTION_CLEAR;
685 } 686 }
686 } 687 }
687 688
688 // finally move the view window, if desired 689 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 690 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 691 && view_start != 0
691 && view_start != -saveLines) 692 && view_start != -saveLines)
692 scr_page (UP, count); 693 scr_page (UP, count);
693 694
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 713 {
713 /* move selected region too */ 714 /* move selected region too */
714 selection.beg.row -= count; 715 selection.beg.row -= count;
715 selection.end.row -= count; 716 selection.end.row -= count;
716 selection.mark.row -= count; 717 selection.mark.row -= count;
717 718
718 selection_check (0); 719 selection_check (0);
719 } 720 }
720 } 721 }
721 722
722 // use a simple and robust scrolling algorithm, this 723 // use a simple and robust scrolling algorithm, this
… …
789 790
790 while (str < strend) 791 while (str < strend)
791 { 792 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 794
794 if (c < 0x20) 795 if (expect_false (c < 0x20))
795 if (c == C0_LF) 796 if (c == C0_LF)
796 { 797 {
797 max_it (line->l, screen.cur.col); 798 max_it (line->l, screen.cur.col);
798 799
799 screen.flags &= ~Screen_WrapNext; 800 screen.flags &= ~Screen_WrapNext;
… …
818 { 819 {
819 scr_tab (1, true); 820 scr_tab (1, true);
820 continue; 821 continue;
821 } 822 }
822 823
824 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 825 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 827 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 ))
826 { 829 {
827 checksel = 0; 830 checksel = 0;
828 /* 831 /*
829 * If we wrote anywhere in the selected area, kill the selection 832 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 833 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 834 * should be a similar check.
832 */ 835 */
833 CLEAR_SELECTION (); 836 CLEAR_SELECTION ();
834 } 837 }
835 838
836 if (screen.flags & Screen_WrapNext) 839 if (expect_false (screen.flags & Screen_WrapNext))
837 { 840 {
838 scr_do_wrap (); 841 scr_do_wrap ();
839 842
840 line->l = ncol; 843 line->l = ncol;
841 line->is_longer (1); 844 line->is_longer (1);
842 845
843 row = screen.cur.row; 846 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 847 line = &ROW(row); /* _must_ refresh */
845 } 848 }
846 849
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 850 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 852 c = 0xfffd;
850 853
851 // 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
852 // further replacements, as wcwidth might return -1 for the line 855 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 856 // drawing characters below as they might be invalid in the current
854 // locale. 857 // locale.
855 int width = WCWIDTH (c); 858 int width = WCWIDTH (c);
856 859
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 861 {
859 // vt100 special graphics and line drawing 862 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 863 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 864 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 865 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 878 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 879 width = 1; // vt100 line drawing characters are always single-width
877 } 880 }
878 } 881 }
879 882
880 if (screen.flags & Screen_Insert) 883 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 884 scr_insdel_chars (width, INSERT);
882 885
883 if (width != 0) 886 if (width != 0)
884 { 887 {
885#if !UNICODE_3 888#if !UNICODE_3
… …
891 c = 0xfffd; 894 c = 0xfffd;
892# endif 895# endif
893#endif 896#endif
894 897
895 // nuke the character at this position, if required 898 // nuke the character at this position, if required
899 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 900 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 901 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 902 && line->t[screen.cur.col + 1] == NOCHAR)
899 { 903 ))
900 int col = screen.cur.col; 904 scr_kill_char (*line, screen.cur.col);
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915 905
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917 907
918 // if the character doesn't fit into the remaining columns... 908 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width) 909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920 { 910 {
921 // ...output spaces 911 // ...output spaces
922 c = ' '; 912 c = ' ';
923 // and try the same character next loop iteration 913 // and try the same character next loop iteration
924 --str; 914 --str;
… …
929 do 919 do
930 { 920 {
931 line->t[screen.cur.col] = c; 921 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 922 line->r[screen.cur.col] = rend;
933 923
934 if (screen.cur.col < ncol - 1) 924 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 925 screen.cur.col++;
936 else 926 else
937 { 927 {
938 line->l = ncol; 928 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 929 if (screen.flags & Screen_Autowrap)
… …
941 break; 931 break;
942 } 932 }
943 933
944 c = NOCHAR; 934 c = NOCHAR;
945 } 935 }
946 while (--width > 0); 936 while (expect_false (--width > 0));
947 937
948 // pad with spaces when overwriting wide character with smaller one 938 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 939 if (expect_false (!width))
950 { 940 {
951 line->touch (); 941 line->touch ();
952 942
953 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++)
954 { 944 {
955 line->t[c] = ' '; 945 line->t[c] = ' ';
956 line->r[c] = rend; 946 line->r[c] = rend;
957 } 947 }
958 } 948 }
959 } 949 }
950#if ENABLE_COMBINING
960 else // width == 0 951 else // width == 0
961 { 952 {
962#if ENABLE_COMBINING 953 if (c != 0xfeff) // ignore BOM
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 { 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 {
973 linep = line; 965 linep = line;
974 tp = line->t + screen.cur.col - 1; 966 tp = line->t + screen.cur.col - 1;
975 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));
976 } 991 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 } 992 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 993#endif
1000 }
1001 } 994 }
1002 995
1003 max_it (line->l, screen.cur.col); 996 max_it (line->l, screen.cur.col);
1004 997
1005#ifdef DEBUG_STRICT 998#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1006 * XTERM_SEQ: CTRL-H
1014 */ 1007 */
1015void 1008void
1016rxvt_term::scr_backspace () NOTHROW 1009rxvt_term::scr_backspace () NOTHROW
1017{ 1010{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1011 if (screen.cur.col == 0)
1021 { 1012 {
1022 if (screen.cur.row > 0) 1013 if (screen.cur.row > 0)
1023 { 1014 {
1024#ifdef TERMCAP_HAS_BW 1015#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1016 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1017 --screen.cur.row;
1027 return; 1018
1019 want_refresh = 1;
1028#endif 1020#endif
1029 } 1021 }
1030 } 1022 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1023 else
1032 scr_gotorc (0, -1, RELATIVE); 1024 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1025}
1036 1026
1037/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1038/* 1028/*
1039 * Process Horizontal Tab 1029 * Process Horizontal Tab
… …
1062 x = i; 1052 x = i;
1063 1053
1064 if (!--count) 1054 if (!--count)
1065 break; 1055 break;
1066 } 1056 }
1067 else 1057 else
1068 ht &= l.t[i] == ' ' 1058 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1059 && RS_SAME (l.r[i], base_rend);
1070 1060
1071 if (count) 1061 if (count)
1072 x = ncol - 1; 1062 x = ncol - 1;
1073 1063
1074 // store horizontal tab commands as characters inside the text 1064 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1065 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1066 if (ht && option (Opt_pastableTabs))
1077 { 1067 {
1078 base_rend = SET_FONT (base_rend, 0); 1068 base_rend = SET_FONT (base_rend, 0);
1079 1069
1080 l.touch (x); 1070 l.touch (x);
1081 1071
… …
1188 } 1178 }
1189 } 1179 }
1190 else 1180 else
1191 { 1181 {
1192 if (screen.flags & Screen_Relative) 1182 if (screen.flags & Screen_Relative)
1183 {
1193 { /* relative origin mode */ 1184 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1185 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1186 min_it (screen.cur.row, screen.bscroll);
1196 } 1187 }
1197 else 1188 else
1198 screen.cur.row = row; 1189 screen.cur.row = row;
… …
1231/* 1222/*
1232 * Erase part or whole of a line 1223 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1224 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1225 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * 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
1236 */ 1228 */
1237void 1229void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1230rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1231{
1240 unsigned int col, num; 1232 unsigned int col, num;
… …
1249 line.touch (); 1241 line.touch ();
1250 line.is_longer (0); 1242 line.is_longer (0);
1251 1243
1252 switch (mode) 1244 switch (mode)
1253 { 1245 {
1246 case 3:
1247 if (screen.flags & Screen_WrapNext)
1248 return;
1249
1250 /* fall through */
1251
1254 case 0: /* erase to end of line */ 1252 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1253 col = screen.cur.col;
1256 num = ncol - col; 1254 num = ncol - col;
1257 min_it (line.l, col); 1255 min_it (line.l, col);
1256
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1257 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1258 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1261 break; 1260 break;
1261
1262 case 1: /* erase to beginning of line */ 1262 case 1: /* erase to beginning of line */
1263 col = 0; 1263 col = 0;
1264 num = screen.cur.col + 1; 1264 num = screen.cur.col + 1;
1265
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1268 break; 1269 break;
1270
1269 case 2: /* erase whole line */ 1271 case 2: /* erase whole line */
1270 col = 0; 1272 col = 0;
1271 num = ncol; 1273 num = ncol;
1272 line.l = 0; 1274 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1275 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1333 if (row >= nrow) /* Out Of Bounds */
1332 return; 1334 return;
1333 1335
1334 min_it (num, nrow - row); 1336 min_it (num, nrow - row);
1335 1337
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1339 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1340 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1341 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1342 {
1340 ren = DEFAULT_RSTYLE; 1343 ren = DEFAULT_RSTYLE;
1341 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);
1342 } 1349 }
1343 else 1350 else
1344 { 1351 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1352 ren = rstyle & (RS_fgMask | RS_bgMask);
1353
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1356 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row),
1358 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1360 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1362 }
1352 1363
1353 for (; num--; row++) 1364 for (; num--; row++)
… …
1435 * Insert/Delete <count> characters from the current position 1446 * Insert/Delete <count> characters from the current position
1436 */ 1447 */
1437void 1448void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1450{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1451 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1452 ZERO_SCROLLBACK ();
1445 1453
1446 if (count <= 0) 1454 if (count <= 0)
1447 return; 1455 return;
… …
1449 scr_do_wrap (); 1457 scr_do_wrap ();
1450 1458
1451 selection_check (1); 1459 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1460 min_it (count, ncol - screen.cur.col);
1453 1461
1454 row = screen.cur.row; 1462 int row = screen.cur.row;
1455 1463
1456 line_t *line = &ROW(row); 1464 line_t *line = &ROW(row);
1457 1465
1458 line->touch (); 1466 line->touch ();
1459 line->is_longer (0); 1467 line->is_longer (0);
1460 1468
1469 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col);
1472
1461 switch (insdel) 1473 switch (insdel)
1462 { 1474 {
1463 case INSERT: 1475 case INSERT:
1464 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--)
1465 { 1482 {
1466 line->t[col] = line->t[col - count]; 1483 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1484 line->r[col] = line->r[col - count];
1468 } 1485 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1486
1472 if (selection.op && current_screen == selection.screen 1487 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1488 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1489 {
1475 if (selection.end.row != screen.cur.row 1490 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1491 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1492 CLEAR_SELECTION ();
1478 else 1493 else
1494 {
1479 { /* shift selection */ 1495 /* shift selection */
1480 selection.beg.col += count; 1496 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1497 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1498 selection.end.col += count;
1483 } 1499 }
1484 } 1500 }
… …
1489 case ERASE: 1505 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1506 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1507 selection_check (1);
1492 screen.cur.col -= count; 1508 screen.cur.col -= count;
1493 1509
1494 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1515 break;
1497 1516
1498 case DELETE: 1517 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1518 line->l = max (line->l - count, 0);
1500 1519
1520 // nuke wide char spanning the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1524 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1525 {
1503 line->t[col] = line->t[col + count]; 1526 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1527 line->r[col] = line->r[col + count];
1505 } 1528 }
1506 1529
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1530 scr_blank_line (*line, ncol - count, count,
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1509 1532
1510 if (selection.op && current_screen == selection.screen 1533 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1535 {
1513 if (selection.end.row != screen.cur.row 1536 if (selection.end.row != screen.cur.row
… …
1623 */ 1646 */
1624void 1647void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1648rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1649{
1627 if (mode < 0) 1650 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1651 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1652 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1653 tabs [screen.cur.col] = !!mode;
1631} 1654}
1632 1655
1633/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1671 if (rvideo_state != on)
1649 { 1672 {
1650 rvideo_state = on; 1673 rvideo_state = on;
1651 1674
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1676#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1677 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1678#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1680
1661 XGCValues gcvalue; 1681 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1682 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1826 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1827 {
1808 min_it (rc[i].col, ncol - 1); 1828 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1829 min_it (rc[i].row, nrow - 1);
1810 } 1830 }
1811 1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1834
1815 num_scr_allow = 0; 1835 num_scr_allow = 0;
1816 1836
… …
1871 return true; 1891 return true;
1872} 1892}
1873 1893
1874#ifndef NO_BELL 1894#ifndef NO_BELL
1875void 1895void
1876rxvt_term::bell_cb (time_watcher &w) 1896rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1897{
1878 rvideo_bell = false; 1898 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1899 scr_rvideo_mode (rvideo_mode);
1900 refresh_check ();
1880} 1901}
1881#endif 1902#endif
1882 1903
1883/* ------------------------------------------------------------------------- */ 1904/* ------------------------------------------------------------------------- */
1884void 1905void
… …
1886{ 1907{
1887#ifndef NO_BELL 1908#ifndef NO_BELL
1888 1909
1889# ifndef NO_MAPALERT 1910# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1911# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1912 if (option (Opt_mapAlert))
1892# endif 1913# endif
1893 XMapWindow (dpy, parent[0]); 1914 XMapWindow (dpy, parent[0]);
1894# endif 1915# endif
1895 1916
1917# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell))
1919 set_urgency (1);
1920# endif
1921
1896 if (OPTION (Opt_visualBell)) 1922 if (option (Opt_visualBell))
1897 { 1923 {
1898 rvideo_bell = true; 1924 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1925 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1926 flush ();
1901 1927
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1928 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1929 }
1904 else 1930 else
1905 XBell (dpy, 0); 1931 XBell (dpy, 0);
1906
1907#endif 1932#endif
1908} 1933}
1909 1934
1910/* ------------------------------------------------------------------------- */ 1935/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1936/* ARGSUSED */
1912void 1937void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1938rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1939{
1915#ifdef PRINTPIPE 1940#ifdef PRINTPIPE
1916 int nrows, row_start; 1941 int nrows, row_start;
1917 FILE *fd; 1942 FILE *fd = popen_printer ();
1918 1943
1919 if ((fd = popen_printer ()) == NULL) 1944 if (!fd)
1920 return; 1945 return;
1921 1946
1922 if (fullhist) 1947 if (fullhist)
1923 { 1948 {
1924 nrows = nrow - top_row; 1949 nrows = nrow - top_row;
… …
1978 int i; /* tmp */ 2003 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2004#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2005 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2006#endif
1982 rend_t *crp; // cursor rendition pointer 2007 rend_t *crp; // cursor rendition pointer
2008 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */
1983 2010
1984 want_refresh = 0; /* screen is current */ 2011 want_refresh = 0; /* screen is current */
1985 2012
1986 if (refresh_type == NO_REFRESH || !mapped) 2013 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2014 return;
1988 2015
1989 /* 2016 /*
1990 * A: set up vars 2017 * A: set up vars
1991 */ 2018 */
2019 refresh_count = 0;
2020
1992 have_bg = 0; 2021 have_bg = 0;
1993 refresh_count = 0; 2022#ifdef HAVE_BG_PIXMAP
1994
1995#if XPM_BACKGROUND
1996 have_bg |= bgPixmap.pixmap != None; 2023 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2024#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2026
2003 /* 2027 /*
2004 * B: reverse any characters which are selected 2028 * B: reverse any characters which are selected
… …
2008 /* 2032 /*
2009 * C: set the cursor character (s) 2033 * C: set the cursor character (s)
2010 */ 2034 */
2011 { 2035 {
2012 unsigned char setoldcursor; 2036 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2037
2016 showcursor = (screen.flags & Screen_VisibleCursor); 2038 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2039#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2040 if (hidden_cursor)
2019 showcursor = 0; 2041 showcursor = 0;
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2048 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2049 col--;
2028 2050
2029 crp = &ROW(screen.cur.row).r[col]; 2051 crp = &ROW(screen.cur.row).r[col];
2030 2052
2053#ifndef NO_CURSORCOLOR
2054 cc1 = *crp & (RS_fgMask | RS_bgMask);
2055 if (ISSET_PIXCOLOR (Color_cursor))
2056 ccol1 = Color_cursor;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol1 = fgcolor_of (rstyle);
2061#else
2062 ccol1 = Color_fg;
2063#endif
2064
2065#ifndef NO_CURSORCOLOR
2066 if (ISSET_PIXCOLOR (Color_cursor2))
2067 ccol2 = Color_cursor2;
2068 else
2069#endif
2070#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2071 ccol2 = bgcolor_of (rstyle);
2072#else
2073 ccol2 = Color_bg;
2074#endif
2075
2031 if (showcursor && focus) 2076 if (showcursor && focus)
2032 { 2077 {
2033 if (OPTION (Opt_cursorUnderline)) 2078 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2079 *crp ^= RS_Uline;
2035 else 2080 else
2036 { 2081 {
2037 *crp ^= RS_RVid; 2082 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2083 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2084 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2085 }
2061 } 2086 }
2062 } 2087 }
2063 2088
2064 /* make sure no outline cursor is left around */ 2089 /* make sure no outline cursor is left around */
… …
2194 continue; 2219 continue;
2195 2220
2196 // redraw one or more characters 2221 // redraw one or more characters
2197 2222
2198 // seek to the beginning of wide characters 2223 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2224 while (expect_false (stp[col] == NOCHAR && col > 0))
2200 --col; 2225 --col;
2201 2226
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2203 text_t *text = stp + col; 2228 text_t *text = stp + col;
2204 int count = 1; 2229 int count = 1;
… …
2241 2266
2242 col--; /* went one too far. move back */ 2267 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2268 count -= i; /* dump any matching trailing chars */
2244 2269
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2270 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2271 while (expect_false (i && text[count] == NOCHAR))
2247 count++, i--; 2272 count++, i--;
2248 2273
2249 /* 2274 /*
2250 * Determine the attributes for the string 2275 * Determine the attributes for the string
2251 */ 2276 */
2252 int fore = fgcolor_of (rend); // desired foreground 2277 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2278 int back = bgcolor_of (rend); // desired background
2254 2279
2255 // only do special processing if any attributes are set, which is unlikely 2280 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2257 { 2282 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2283 bool invert = rend & RS_RVid;
2277 2284
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2285#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2286 if (rend & RS_Bold && fore == Color_fg)
2281 { 2287 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2288 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2289 fore = Color_BD;
2284# if !ENABLE_STYLES 2290# if !ENABLE_STYLES
2285 else 2291 else
2286 invert = !invert; 2292 invert = !invert;
2287# endif 2293# endif
2288 } 2294 }
2289 2295
2290 if (rend & RS_Italic 2296 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2297 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2298 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2299 fore = Color_IT;
2295# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2296 else 2301 else
2297 invert = !invert; 2302 invert = !invert;
2298# endif 2303# endif
2299 } 2304 }
2300 2305
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2307 fore = Color_UL;
2303#endif 2308#endif
2304 2309
2305 if (invert) 2310 if (invert)
2306 { 2311 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2307 ::swap (fore, back); 2318 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2308 2323
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV)) 2326 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV; 2327 back = Color_RV;
2312 2328# endif
2313 if (fore == back) 2329 if (fore == back)
2314 { 2330 {
2315 fore = Color_bg; 2331 fore = Color_bg;
2316 back = Color_fg; 2332 back = Color_fg;
2317 } 2333 }
… …
2319 } 2335 }
2320 2336
2321#ifdef TEXT_BLINK 2337#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2338 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2339 {
2324 if (!text_blink_ev.active) 2340 if (!text_blink_ev.is_active ())
2325 { 2341 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2342 text_blink_ev.again ();
2327 hidden_text = 0; 2343 hidden_text = 0;
2328 } 2344 }
2329 else if (hidden_text) 2345 else if (hidden_text)
2330 fore = back; 2346 fore = back;
2331 } 2347 }
2332#endif 2348#endif
2349
2350#if ENABLE_STYLES
2351 // "careful" (too wide) character handling
2352
2353 // include previous careful character(s) if possible, looks nicer (best effort...)
2354 while (text > stp
2355 && srp[text - stp - 1] & RS_Careful
2356 && RS_SAME (rend, srp[text - stp - 1]))
2357 text--, count++, xpixel -= fwidth;
2358
2359 // force redraw after "careful" characters to avoid pixel droppings
2360 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2361 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2362
2363 // force redraw before "careful" characters to avoid pixel droppings
2364 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2365 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2366#endif
2333 } 2367 }
2334 2368
2335 /* 2369 /*
2336 * Actually do the drawing of the string here 2370 * Actually do the drawing of the string here
2337 */ 2371 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2373
2340 if (back == fore) 2374 if (expect_true (have_bg && back == Color_bg))
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2375 {
2344 // this is very ugly, maybe push it into ->draw? 2376 // this is very ugly, maybe push it into ->draw?
2345 2377
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2378 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2379 if (text[i] != ' ')
2348 { 2380 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2382 goto did_clear;
2351 } 2383 }
2352 2384
2353 CLEAR_CHARS (xpixel, ypixel, count); 2385 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2386 did_clear: ;
2355 } 2387 }
2356 else 2388 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2390
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2392 {
2361#if ENABLE_FRILLS 2393#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2394 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2395 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2396 else
2365#endif 2397#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2398 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2399
2368 XDrawLine (dpy, drawBuffer, gc, 2400 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2401 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2403 }
2372 } /* for (col....) */ 2404 } /* for (col....) */
2373 } /* for (row....) */ 2405 } /* for (row....) */
… …
2382 */ 2414 */
2383 if (showcursor) 2415 if (showcursor)
2384 { 2416 {
2385 if (focus) 2417 if (focus)
2386 { 2418 {
2387 if (OPTION (Opt_cursorUnderline)) 2419 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2420 *crp ^= RS_Uline;
2389 else 2421 else
2390 { 2422 {
2391 *crp ^= RS_RVid; 2423 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2439 cursorwidth++;
2408 2440
2409#ifndef NO_CURSORCOLOR 2441#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2442 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2443 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2444 else
2412#endif 2445#endif
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2447
2414 XDrawRectangle (dpy, drawBuffer, gc, 2448 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2449 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2450 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2451 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2452 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2453 }
… …
2454} 2488}
2455 2489
2456void 2490void
2457rxvt_term::scr_recolour () NOTHROW 2491rxvt_term::scr_recolour () NOTHROW
2458{ 2492{
2459 if (1 2493#ifdef HAVE_BG_PIXMAP
2460#if TRANSPARENT 2494 bgPixmap.apply ();
2461 && !am_transparent 2495#else
2462#endif 2496
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 )
2467 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]); 2498 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2500
2472 if (scrollBar.win) 2501 if (scrollBar.win)
2473 { 2502 {
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2504 scrollBar.state = STATE_IDLE;
2476 scrollbar_show (0); 2505 scrollBar.show (0);
2477 }
2478#endif
2479 } 2506 }
2480 2507
2508#endif
2509
2510 /* bgPixmap.apply () does not do the following : */
2481 scr_clear (); 2511 scr_clear ();
2482 scr_touch (true); 2512 scr_touch (true);
2483 want_refresh = 1; 2513 want_refresh = 1;
2484} 2514}
2485 2515
… …
2577{ 2607{
2578 int row, wrote; 2608 int row, wrote;
2579 unsigned int width, towrite; 2609 unsigned int width, towrite;
2580 char r1[] = "\n"; 2610 char r1[] = "\n";
2581 2611
2582 for (row = saveLines - nsaved; 2612 for (row = saveLines + top_row;
2583 row < saveLines + nrow - 1; row++) 2613 row < saveLines + nrow - 1; row++)
2584 { 2614 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l 2615 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol; 2616 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote) 2617 for (towrite = width; towrite; towrite -= wrote)
… …
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2668 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2669 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2670 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2671 data[i] = C0_CR;
2642 2672
2673 if (priv_modes & PrivMode_BracketPaste)
2674 tt_printf ("\e[200~");
2675
2643 tt_write (data, len); 2676 tt_write (data, len);
2677
2678 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~");
2644} 2680}
2645 2681
2646/* ------------------------------------------------------------------------- */ 2682/* ------------------------------------------------------------------------- */
2647/* 2683/*
2648 * Respond to a notification that a primary selection has been sent 2684 * Respond to a notification that a primary selection has been sent
… …
2723 if (!delete_prop) 2759 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop); 2760 XDeleteProperty (dpy, win, prop);
2725 2761
2726 selection_wait = Sel_incr; 2762 selection_wait = Sel_incr;
2727 incr_buf_fill = 0; 2763 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10); 2764 incr_ev.start (10);
2729 2765
2730 goto bailout; 2766 goto bailout;
2731 } 2767 }
2732 2768
2733 if (ct.nitems == 0) 2769 if (ct.nitems == 0)
… …
2742 ct.nitems = incr_buf_fill; 2778 ct.nitems = incr_buf_fill;
2743 incr_buf = 0; 2779 incr_buf = 0;
2744 incr_buf_size = 0; 2780 incr_buf_size = 0;
2745 incr_ev.stop (); 2781 incr_ev.stop ();
2746 } 2782 }
2747 else 2783 else
2748 { 2784 {
2749 if (selection_wait == Sel_normal 2785 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 { 2787 {
2752 /* 2788 /*
… …
2759 goto bailout; 2795 goto bailout;
2760 } 2796 }
2761 } 2797 }
2762 else if (selection_wait == Sel_incr) 2798 else if (selection_wait == Sel_incr)
2763 { 2799 {
2764 incr_ev.start (NOW + 10); 2800 incr_ev.start (10);
2765 2801
2766 while (incr_buf_fill + ct.nitems > incr_buf_size) 2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 { 2803 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2809 if (selection_wait == Sel_normal) 2845 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none; 2846 selection_wait = Sel_none;
2811} 2847}
2812 2848
2813void 2849void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2815{ 2851{
2816 selection_wait = Sel_none; 2852 selection_wait = Sel_none;
2817 2853
2818 incr_buf_size = 0; 2854 incr_buf_size = 0;
2819 free (incr_buf); 2855 free (incr_buf);
… …
2830 selection_paste (win, prop, true); 2866 selection_paste (win, prop, true);
2831} 2867}
2832 2868
2833/* ------------------------------------------------------------------------- */ 2869/* ------------------------------------------------------------------------- */
2834/* 2870/*
2835 * Request the current selection: 2871 * Request the current selection:
2836 * Order: > internal selection if available 2872 * Order: > internal selection if available
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2838 * > CUT_BUFFER0 2874 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0 2876 * will auto fallback to CUT_BUFFER0
… …
2842 */ 2878 */
2843void 2879void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2881{
2846 if (selection.text && selnum == Sel_Primary) 2882 if (selection.text && selnum == Sel_Primary)
2883 {
2847 { /* internal selection */ 2884 /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len); 2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str)); 2886 paste (str, strlen (str));
2850 free (str); 2887 free (str);
2851 return; 2888 return;
2852 } 2889 }
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3155 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 3156
3120 while (selection.mark.col > 0 3157 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3158 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3159 --selection.mark.col;
3123 3160
3124 if (selection.op) 3161 if (selection.op)
3162 {
3125 { /* clear the old selection */ 3163 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3164 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3165 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3166 }
3129 3167
3130 selection.op = SELECTION_INIT; 3168 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3357 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3358 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3359 * time of the most recent button3 press
3322 */ 3360 */
3323 if (button3 && buttonpress) 3361 if (button3 && buttonpress)
3362 {
3324 { /* button3 press */ 3363 /* button3 press */
3325 /* 3364 /*
3326 * first determine which edge of the selection we are closest to 3365 * first determine which edge of the selection we are closest to
3327 */ 3366 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3367 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3368 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3386 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3387 selection.mark.col = selection.beg.col;
3349 } 3388 }
3350 } 3389 }
3351 else 3390 else
3391 {
3352 { /* button1 drag or button3 drag */ 3392 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3393 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3394 {
3355 if (selection.mark.row == selection.end.row 3395 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3396 && selection.mark.col == selection.end.col
3357 && clickchange 3397 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3440 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3441 }
3402 else if (selection.clicks == 3) 3442 else if (selection.clicks == 3)
3403 { 3443 {
3404#if ENABLE_FRILLS 3444#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3445 if (option (Opt_tripleclickwords))
3406 { 3446 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3448
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3449 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3450 {
… …
3438 selection.end.row++; 3478 selection.end.row++;
3439 } 3479 }
3440 } 3480 }
3441 3481
3442 if (button3 && buttonpress) 3482 if (button3 && buttonpress)
3483 {
3443 { /* mark may need to be changed */ 3484 /* mark may need to be changed */
3444 if (closeto == LEFT) 3485 if (closeto == LEFT)
3445 { 3486 {
3446 selection.mark.row = selection.end.row; 3487 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3488 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3489 }
… …
3647 XFree (ct.value); 3688 XFree (ct.value);
3648 } 3689 }
3649 3690
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3691 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651} 3692}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667}
3668 3693
3669/* ------------------------------------------------------------------------- */ 3694/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3695#ifdef USE_XIM
3671void 3696void
3672rxvt_term::im_set_position (XPoint &pos) NOTHROW 3697rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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