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.265 by root, Tue Oct 3 11:56:48 2006 UTC vs.
Revision 1.310 by root, Wed Jul 23 17:10:07 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
… …
161{ 143{
162#if ENABLE_OVERLAY 144#if ENABLE_OVERLAY
163 scr_overlay_off (); 145 scr_overlay_off ();
164#endif 146#endif
165 147
148 rvideo_mode = false;
166 view_start = 0; 149 view_start = 0;
167 num_scr = 0; 150 num_scr = 0;
168 151
169 if (ncol == 0) 152 if (ncol == 0)
170 ncol = 80; 153 ncol = 80;
… …
237 selection.text = NULL; 220 selection.text = NULL;
238 selection.len = 0; 221 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 222 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 223 selection.screen = PRIMARY;
241 selection.clicks = 0; 224 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 225 }
244 else 226 else
245 { 227 {
246 /* 228 /*
247 * add or delete rows as appropriate 229 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 259 }
278 260
279 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 263
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
285 267
286 if (top_row) 268 if (top_row)
… …
330 int qcol = 0; 312 int qcol = 0;
331 313
332 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
333 if (p == ocur.row) 315 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
335 317
336 // fill a single destination line 318 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
338 { 320 {
339 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
366 } 348 }
367 while (p != pend && q > 0); 349 while (p != pend && q > 0);
368 350
369 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
370 top_row = q - term_start; 352 top_row = q - term_start;
371 353
372 // make sure all terminal lines exist 354 // make sure all terminal lines exist
373 while (top_row > 0) 355 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 357 }
376 else 358 else
377 { 359 {
378 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
379 361
380 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
381 { 363 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
384 366
… …
407 CLEAR_ALL_SELECTION (); 389 CLEAR_ALL_SELECTION ();
408 390
409 prev_nrow = nrow; 391 prev_nrow = nrow;
410 prev_ncol = ncol; 392 prev_ncol = ncol;
411 393
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
413 395
414 for (int col = ncol; col--; ) 396 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
416 398
417 if (current_screen != PRIMARY) 399 if (current_screen != PRIMARY)
418 scr_swap_screen (); 400 scr_swap_screen ();
419 401
… …
510} 492}
511 493
512void 494void
513rxvt_term::scr_swap_screen () 495rxvt_term::scr_swap_screen ()
514{ 496{
515 if (!OPTION (Opt_secondaryScreen)) 497 if (!option (Opt_secondaryScreen))
516 return; 498 return;
517 499
518 for (int i = prev_nrow; i--; ) 500 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 501 ::swap (ROW(i), swap_buf [i]);
520 502
… …
542 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
543 525
544 int i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
545 527
546#if NSCREENS 528#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 529 if (option (Opt_secondaryScreen))
548 { 530 {
549 num_scr = 0; 531 num_scr = 0;
550 532
551 scr_swap_screen (); 533 scr_swap_screen ();
552 534
… …
555 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
557 } 539 }
558 else 540 else
559#endif 541#endif
560 if (OPTION (Opt_secondaryScroll)) 542 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 543 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 544}
563 545
564// clear WrapNext indicator, solidifying position on next line 546// clear WrapNext indicator, solidifying position on next line
565void 547void
… …
598/* 580/*
599 * Change the rendition style for following text 581 * Change the rendition style for following text
600 */ 582 */
601void 583void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 585{
604 if (set) 586 if (set)
605 rstyle |= style; 587 rstyle |= style;
606 else if (style == ~RS_None) 588 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
608 else 590 else
609 rstyle &= ~style; 591 rstyle &= ~style;
610 } 592}
611 593
612/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
613/* 595/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
624 want_refresh = 1; 606 want_refresh = 1;
625 num_scr += count; 607 num_scr += count;
626 608
627 if (count > 0 609 if (count > 0
628 && row1 == 0 610 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 611 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 612 {
631 top_row = max (top_row - count, -saveLines); 613 top_row = max (top_row - count, -saveLines);
632 614
633 // scroll everything up 'count' lines 615 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 616 term_start = (term_start + count) % total_rows;
… …
666 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
667 649
668 ::swap (l1, l2); 650 ::swap (l1, l2);
669 l2.touch (); 651 l2.touch ();
670 } 652 }
671 653
672 // move and/or clear selection, if any 654 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
674 { 656 {
675 selection.beg.row -= count; 657 selection.beg.row -= count;
676 selection.end.row -= count; 658 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 666 selection.op = SELECTION_CLEAR;
685 } 667 }
686 } 668 }
687 669
688 // finally move the view window, if desired 670 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 671 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 672 && view_start != 0
691 && view_start != -saveLines) 673 && view_start != -saveLines)
692 scr_page (UP, count); 674 scr_page (UP, count);
693 675
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 676 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 694 {
713 /* move selected region too */ 695 /* move selected region too */
714 selection.beg.row -= count; 696 selection.beg.row -= count;
715 selection.end.row -= count; 697 selection.end.row -= count;
716 selection.mark.row -= count; 698 selection.mark.row -= count;
717 699
718 selection_check (0); 700 selection_check (0);
719 } 701 }
720 } 702 }
721 703
722 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
789 771
790 while (str < strend) 772 while (str < strend)
791 { 773 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 775
794 if (c < 0x20) 776 if (expect_false (c < 0x20))
795 if (c == C0_LF) 777 if (c == C0_LF)
796 { 778 {
797 max_it (line->l, screen.cur.col); 779 max_it (line->l, screen.cur.col);
798 780
799 screen.flags &= ~Screen_WrapNext; 781 screen.flags &= ~Screen_WrapNext;
… …
818 { 800 {
819 scr_tab (1, true); 801 scr_tab (1, true);
820 continue; 802 continue;
821 } 803 }
822 804
805 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 806 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 ))
826 { 810 {
827 checksel = 0; 811 checksel = 0;
828 /* 812 /*
829 * If we wrote anywhere in the selected area, kill the selection 813 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 814 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 815 * should be a similar check.
832 */ 816 */
833 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
834 } 818 }
835 819
836 if (screen.flags & Screen_WrapNext) 820 if (expect_false (screen.flags & Screen_WrapNext))
837 { 821 {
838 scr_do_wrap (); 822 scr_do_wrap ();
839 823
840 line->l = ncol; 824 line->l = ncol;
841 line->is_longer (1); 825 line->is_longer (1);
842 826
843 row = screen.cur.row; 827 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
845 } 829 }
846 830
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 831 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 833 c = 0xfffd;
850 834
851 // rely on wcwidth to tell us the character width, do wcwidth before 835 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 836 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 837 // drawing characters below as they might be invalid in the current
854 // locale. 838 // locale.
855 int width = WCWIDTH (c); 839 int width = WCWIDTH (c);
856 840
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 842 {
859 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 844 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 859 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 860 width = 1; // vt100 line drawing characters are always single-width
877 } 861 }
878 } 862 }
879 863
880 if (screen.flags & Screen_Insert) 864 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 865 scr_insdel_chars (width, INSERT);
882 866
883 if (width != 0) 867 if (width != 0)
884 { 868 {
885#if !UNICODE_3 869#if !UNICODE_3
… …
891 c = 0xfffd; 875 c = 0xfffd;
892# endif 876# endif
893#endif 877#endif
894 878
895 // nuke the character at this position, if required 879 // nuke the character at this position, if required
880 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 881 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 882 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
899 { 885 {
900 int col = screen.cur.col; 886 int col = screen.cur.col;
901 887
902 // find begin 888 // find begin
903 while (col > 0 && line->t[col] == NOCHAR) 889 while (col > 0 && line->t[col] == NOCHAR)
… …
914 } 900 }
915 901
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917 903
918 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width) 905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
920 { 906 {
921 // ...output spaces 907 // ...output spaces
922 c = ' '; 908 c = ' ';
923 // and try the same character next loop iteration 909 // and try the same character next loop iteration
924 --str; 910 --str;
… …
929 do 915 do
930 { 916 {
931 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
933 919
934 if (screen.cur.col < ncol - 1) 920 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 921 screen.cur.col++;
936 else 922 else
937 { 923 {
938 line->l = ncol; 924 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
… …
941 break; 927 break;
942 } 928 }
943 929
944 c = NOCHAR; 930 c = NOCHAR;
945 } 931 }
946 while (--width > 0); 932 while (expect_false (--width > 0));
947 933
948 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 935 if (expect_false (!width))
950 { 936 {
951 line->touch (); 937 line->touch ();
952 938
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 940 {
955 line->t[c] = ' '; 941 line->t[c] = ' ';
956 line->r[c] = rend; 942 line->r[c] = rend;
957 } 943 }
958 } 944 }
959 } 945 }
946#if ENABLE_COMBINING
960 else // width == 0 947 else // width == 0
961 { 948 {
962#if ENABLE_COMBINING 949 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 { 950 {
951 // handle combining characters
952 // we just tag the accent on the previous on-screen character.
953 // this is arguably not correct, but also arguably not wrong.
954 // we don't handle double-width characters nicely yet.
955 line_t *linep;
956 text_t *tp;
957 rend_t *rp;
958
959 if (screen.cur.col > 0)
960 {
973 linep = line; 961 linep = line;
974 tp = line->t + screen.cur.col - 1; 962 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 963 rp = line->r + screen.cur.col - 1;
964 }
965 else if (screen.cur.row > 0
966 && ROW(screen.cur.row - 1).is_longer ())
967 {
968 linep = &ROW(screen.cur.row - 1);
969 tp = line->t + ncol - 1;
970 rp = line->r + ncol - 1;
971 }
972 else
973 continue;
974
975 linep->touch ();
976
977 while (*tp == NOCHAR && tp > linep->t)
978 tp--, rp--;
979
980 // first try to find a precomposed character
981 unicode_t n = rxvt_compose (*tp, c);
982 if (n == NOCHAR)
983 n = rxvt_composite.compose (*tp, c);
984
985 *tp = n;
986 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 987 }
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 } 988 }
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 989#endif
1000 }
1001 } 990 }
1002 991
1003 max_it (line->l, screen.cur.col); 992 max_it (line->l, screen.cur.col);
1004 993
1005#ifdef DEBUG_STRICT 994#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1002 * XTERM_SEQ: CTRL-H
1014 */ 1003 */
1015void 1004void
1016rxvt_term::scr_backspace () NOTHROW 1005rxvt_term::scr_backspace () NOTHROW
1017{ 1006{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1007 if (screen.cur.col == 0)
1021 { 1008 {
1022 if (screen.cur.row > 0) 1009 if (screen.cur.row > 0)
1023 { 1010 {
1024#ifdef TERMCAP_HAS_BW 1011#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1012 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1013 --screen.cur.row;
1027 return; 1014
1015 want_refresh = 1;
1028#endif 1016#endif
1029 } 1017 }
1030 } 1018 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1019 else
1032 scr_gotorc (0, -1, RELATIVE); 1020 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1021}
1036 1022
1037/* ------------------------------------------------------------------------- */ 1023/* ------------------------------------------------------------------------- */
1038/* 1024/*
1039 * Process Horizontal Tab 1025 * Process Horizontal Tab
… …
1062 x = i; 1048 x = i;
1063 1049
1064 if (!--count) 1050 if (!--count)
1065 break; 1051 break;
1066 } 1052 }
1067 else 1053 else
1068 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1055 && RS_SAME (l.r[i], base_rend);
1070 1056
1071 if (count) 1057 if (count)
1072 x = ncol - 1; 1058 x = ncol - 1;
1073 1059
1074 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1062 if (ht && option (Opt_pastableTabs))
1077 { 1063 {
1078 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1079 1065
1080 l.touch (x); 1066 l.touch (x);
1081 1067
… …
1188 } 1174 }
1189 } 1175 }
1190 else 1176 else
1191 { 1177 {
1192 if (screen.flags & Screen_Relative) 1178 if (screen.flags & Screen_Relative)
1179 {
1193 { /* relative origin mode */ 1180 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1181 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1182 min_it (screen.cur.row, screen.bscroll);
1196 } 1183 }
1197 else 1184 else
1198 screen.cur.row = row; 1185 screen.cur.row = row;
… …
1231/* 1218/*
1232 * Erase part or whole of a line 1219 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1222 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1223 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1224 */
1237void 1225void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1226rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1227{
1240 unsigned int col, num; 1228 unsigned int col, num;
… …
1249 line.touch (); 1237 line.touch ();
1250 line.is_longer (0); 1238 line.is_longer (0);
1251 1239
1252 switch (mode) 1240 switch (mode)
1253 { 1241 {
1242 case 3:
1243 if (screen.flags & Screen_WrapNext)
1244 return;
1245
1246 /* fall through */
1247
1254 case 0: /* erase to end of line */ 1248 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1249 col = screen.cur.col;
1256 num = ncol - col; 1250 num = ncol - col;
1257 min_it (line.l, col); 1251 min_it (line.l, col);
1252
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1253 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1254 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1255 CLEAR_SELECTION ();
1261 break; 1256 break;
1257
1262 case 1: /* erase to beginning of line */ 1258 case 1: /* erase to beginning of line */
1263 col = 0; 1259 col = 0;
1264 num = screen.cur.col + 1; 1260 num = screen.cur.col + 1;
1261
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1262 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1263 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1264 CLEAR_SELECTION ();
1268 break; 1265 break;
1266
1269 case 2: /* erase whole line */ 1267 case 2: /* erase whole line */
1270 col = 0; 1268 col = 0;
1271 num = ncol; 1269 num = ncol;
1272 line.l = 0; 1270 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1271 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1329 if (row >= nrow) /* Out Of Bounds */
1332 return; 1330 return;
1333 1331
1334 min_it (num, nrow - row); 1332 min_it (num, nrow - row);
1335 1333
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1335 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1336 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1337 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1338 {
1340 ren = DEFAULT_RSTYLE; 1339 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1340
1341 if (mapped)
1342 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False);
1342 } 1345 }
1343 else 1346 else
1344 { 1347 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1348 ren = rstyle & (RS_fgMask | RS_bgMask);
1349
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1351 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1352 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row),
1354 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1356 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1357 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1358 }
1352 1359
1353 for (; num--; row++) 1360 for (; num--; row++)
… …
1474 { 1481 {
1475 if (selection.end.row != screen.cur.row 1482 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1483 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1484 CLEAR_SELECTION ();
1478 else 1485 else
1486 {
1479 { /* shift selection */ 1487 /* shift selection */
1480 selection.beg.col += count; 1488 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1489 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1490 selection.end.col += count;
1483 } 1491 }
1484 } 1492 }
… …
1623 */ 1631 */
1624void 1632void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1633rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1634{
1627 if (mode < 0) 1635 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1636 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1637 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1638 tabs [screen.cur.col] = !!mode;
1631} 1639}
1632 1640
1633/* ------------------------------------------------------------------------- */ 1641/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1656 if (rvideo_state != on)
1649 { 1657 {
1650 rvideo_state = on; 1658 rvideo_state = on;
1651 1659
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1661#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1662 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1663#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1665
1661 XGCValues gcvalue; 1666 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1667 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1811 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1812 {
1808 min_it (rc[i].col, ncol - 1); 1813 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1814 min_it (rc[i].row, nrow - 1);
1810 } 1815 }
1811 1816// 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++) 1817 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); 1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1819
1815 num_scr_allow = 0; 1820 num_scr_allow = 0;
1816 1821
… …
1871 return true; 1876 return true;
1872} 1877}
1873 1878
1874#ifndef NO_BELL 1879#ifndef NO_BELL
1875void 1880void
1876rxvt_term::bell_cb (time_watcher &w) 1881rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1882{
1878 rvideo_bell = false; 1883 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1884 scr_rvideo_mode (rvideo_mode);
1885 refresh_check ();
1880} 1886}
1881#endif 1887#endif
1882 1888
1883/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1884void 1890void
… …
1886{ 1892{
1887#ifndef NO_BELL 1893#ifndef NO_BELL
1888 1894
1889# ifndef NO_MAPALERT 1895# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1896# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1897 if (option (Opt_mapAlert))
1892# endif 1898# endif
1893 XMapWindow (dpy, parent[0]); 1899 XMapWindow (dpy, parent[0]);
1894# endif 1900# endif
1895 1901
1902# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell))
1904 {
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif
1912
1896 if (OPTION (Opt_visualBell)) 1913 if (option (Opt_visualBell))
1897 { 1914 {
1898 rvideo_bell = true; 1915 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1916 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1917 flush ();
1901 1918
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1919 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1920 }
1904 else 1921 else
1905 XBell (dpy, 0); 1922 XBell (dpy, 0);
1906
1907#endif 1923#endif
1908} 1924}
1909 1925
1910/* ------------------------------------------------------------------------- */ 1926/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1927/* ARGSUSED */
1912void 1928void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1929rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1930{
1915#ifdef PRINTPIPE 1931#ifdef PRINTPIPE
1916 int nrows, row_start; 1932 int nrows, row_start;
1917 FILE *fd; 1933 FILE *fd = popen_printer ();
1918 1934
1919 if ((fd = popen_printer ()) == NULL) 1935 if (!fd)
1920 return; 1936 return;
1921 1937
1922 if (fullhist) 1938 if (fullhist)
1923 { 1939 {
1924 nrows = nrow - top_row; 1940 nrows = nrow - top_row;
… …
1989 return; 2005 return;
1990 2006
1991 /* 2007 /*
1992 * A: set up vars 2008 * A: set up vars
1993 */ 2009 */
2010 refresh_count = 0;
2011
1994 have_bg = 0; 2012 have_bg = 0;
1995 refresh_count = 0; 2013#ifdef HAVE_BG_PIXMAP
1996
1997#if XPM_BACKGROUND
1998 have_bg |= bgPixmap.pixmap != None; 2014 have_bg = bgPixmap.pixmap != None;
1999#endif
2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2002#endif 2015#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2017
2005 /* 2018 /*
2006 * B: reverse any characters which are selected 2019 * B: reverse any characters which are selected
… …
2051 ccol2 = Color_bg; 2064 ccol2 = Color_bg;
2052#endif 2065#endif
2053 2066
2054 if (showcursor && focus) 2067 if (showcursor && focus)
2055 { 2068 {
2056 if (OPTION (Opt_cursorUnderline)) 2069 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2070 *crp ^= RS_Uline;
2058 else 2071 else
2059 { 2072 {
2060 *crp ^= RS_RVid; 2073 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2074 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2197 continue; 2210 continue;
2198 2211
2199 // redraw one or more characters 2212 // redraw one or more characters
2200 2213
2201 // seek to the beginning of wide characters 2214 // seek to the beginning of wide characters
2202 while (stp[col] == NOCHAR && col > 0) 2215 while (expect_false (stp[col] == NOCHAR && col > 0))
2203 --col; 2216 --col;
2204 2217
2205 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2206 text_t *text = stp + col; 2219 text_t *text = stp + col;
2207 int count = 1; 2220 int count = 1;
… …
2244 2257
2245 col--; /* went one too far. move back */ 2258 col--; /* went one too far. move back */
2246 count -= i; /* dump any matching trailing chars */ 2259 count -= i; /* dump any matching trailing chars */
2247 2260
2248 // sometimes we optimize away the trailing NOCHAR's, add them back 2261 // sometimes we optimize away the trailing NOCHAR's, add them back
2249 while (i && text[count] == NOCHAR) 2262 while (expect_false (i && text[count] == NOCHAR))
2250 count++, i--; 2263 count++, i--;
2251 2264
2252 /* 2265 /*
2253 * Determine the attributes for the string 2266 * Determine the attributes for the string
2254 */ 2267 */
2255 int fore = fgcolor_of (rend); // desired foreground 2268 int fore = fgcolor_of (rend); // desired foreground
2256 int back = bgcolor_of (rend); // desired background 2269 int back = bgcolor_of (rend); // desired background
2257 2270
2258 // only do special processing if any attributes are set, which is unlikely 2271 // only do special processing if any attributes are set, which is unlikely
2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2272 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2260 { 2273 {
2261 bool invert = rend & RS_RVid; 2274 bool invert = rend & RS_RVid;
2262 2275
2263#ifndef NO_BOLD_UNDERLINE_REVERSE 2276#ifndef NO_BOLD_UNDERLINE_REVERSE
2264 if (rend & RS_Bold
2265 && fore == Color_fg) 2277 if (rend & RS_Bold && fore == Color_fg)
2266 { 2278 {
2267 if (ISSET_PIXCOLOR (Color_BD)) 2279 if (ISSET_PIXCOLOR (Color_BD))
2268 fore = Color_BD; 2280 fore = Color_BD;
2269# if !ENABLE_STYLES 2281# if !ENABLE_STYLES
2270 else 2282 else
2271 invert = !invert; 2283 invert = !invert;
2272# endif 2284# endif
2273 } 2285 }
2274 2286
2275 if (rend & RS_Italic 2287 if (rend & RS_Italic && fore == Color_fg)
2276 && fore == Color_fg)
2277 { 2288 {
2278 if (ISSET_PIXCOLOR (Color_IT)) 2289 if (ISSET_PIXCOLOR (Color_IT))
2279 fore = Color_IT; 2290 fore = Color_IT;
2280# if !ENABLE_STYLES 2291# if !ENABLE_STYLES
2281 else 2292 else
… …
2315 } 2326 }
2316 2327
2317#ifdef TEXT_BLINK 2328#ifdef TEXT_BLINK
2318 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2329 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2319 { 2330 {
2320 if (!text_blink_ev.active) 2331 if (!text_blink_ev.is_active ())
2321 { 2332 {
2322 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2333 text_blink_ev.again ();
2323 hidden_text = 0; 2334 hidden_text = 0;
2324 } 2335 }
2325 else if (hidden_text) 2336 else if (hidden_text)
2326 fore = back; 2337 fore = back;
2327 } 2338 }
… …
2349 /* 2360 /*
2350 * Actually do the drawing of the string here 2361 * Actually do the drawing of the string here
2351 */ 2362 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2363 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2364
2354 if (back == fore) 2365 if (expect_true (have_bg && back == Color_bg))
2355 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2356 else if (back == Color_bg && have_bg)
2357 { 2366 {
2358 // this is very ugly, maybe push it into ->draw? 2367 // this is very ugly, maybe push it into ->draw?
2359 2368
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2369 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2370 if (text[i] != ' ')
2362 { 2371 {
2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2364 goto did_clear; 2373 goto did_clear;
2365 } 2374 }
2366 2375
2367 CLEAR_CHARS (xpixel, ypixel, count); 2376 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ; 2377 did_clear: ;
2369 } 2378 }
2370 else 2379 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2380 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2381
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2382 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2383 {
2375#if ENABLE_FRILLS 2384#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2385 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2386 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2387 else
2379#endif 2388#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2389 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2390
2382 XDrawLine (dpy, drawBuffer, gc, 2391 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2392 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2394 }
2386 } /* for (col....) */ 2395 } /* for (col....) */
2387 } /* for (row....) */ 2396 } /* for (row....) */
… …
2396 */ 2405 */
2397 if (showcursor) 2406 if (showcursor)
2398 { 2407 {
2399 if (focus) 2408 if (focus)
2400 { 2409 {
2401 if (OPTION (Opt_cursorUnderline)) 2410 if (option (Opt_cursorUnderline))
2402 *crp ^= RS_Uline; 2411 *crp ^= RS_Uline;
2403 else 2412 else
2404 { 2413 {
2405 *crp ^= RS_RVid; 2414 *crp ^= RS_RVid;
2406#ifndef NO_CURSORCOLOR 2415#ifndef NO_CURSORCOLOR
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2434 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2435 else
2427#endif 2436#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2437 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2438
2430 XDrawRectangle (dpy, drawBuffer, gc, 2439 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2440 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2441 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2442 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2443 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2444 }
… …
2470} 2479}
2471 2480
2472void 2481void
2473rxvt_term::scr_recolour () NOTHROW 2482rxvt_term::scr_recolour () NOTHROW
2474{ 2483{
2475 if (1 2484#ifdef HAVE_BG_PIXMAP
2476#if TRANSPARENT 2485 bgPixmap.apply ();
2477 && !am_transparent 2486#else
2478#endif 2487
2479#if XPM_BACKGROUND
2480 && !bgPixmap.pixmap
2481#endif
2482 )
2483 {
2484 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2488 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2485 XClearWindow (dpy, parent[0]); 2489 XClearWindow (dpy, parent[0]);
2486 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2487#if HAVE_SCROLLBARS 2491
2488 if (scrollBar.win) 2492 if (scrollBar.win)
2489 { 2493 {
2490 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2491 scrollBar.setIdle (); 2495 scrollBar.state = STATE_IDLE;
2492 scrollbar_show (0); 2496 scrollBar.show (0);
2493 }
2494#endif
2495 } 2497 }
2496 2498
2499#endif
2500
2501 /* bgPixmap.apply () does not do the following : */
2497 scr_clear (); 2502 scr_clear ();
2498 scr_touch (true); 2503 scr_touch (true);
2499 want_refresh = 1; 2504 want_refresh = 1;
2500} 2505}
2501 2506
… …
2593{ 2598{
2594 int row, wrote; 2599 int row, wrote;
2595 unsigned int width, towrite; 2600 unsigned int width, towrite;
2596 char r1[] = "\n"; 2601 char r1[] = "\n";
2597 2602
2598 for (row = saveLines - nsaved; 2603 for (row = saveLines + top_row;
2599 row < saveLines + nrow - 1; row++) 2604 row < saveLines + nrow - 1; row++)
2600 { 2605 {
2601 width = row_buf[row].l >= 0 ? row_buf[row].l 2606 width = row_buf[row].l >= 0 ? row_buf[row].l
2602 : ncol; 2607 : ncol;
2603 for (towrite = width; towrite; towrite -= wrote) 2608 for (towrite = width; towrite; towrite -= wrote)
… …
2654 /* convert normal newline chars into common keyboard Return key sequence */ 2659 /* convert normal newline chars into common keyboard Return key sequence */
2655 for (unsigned int i = 0; i < len; i++) 2660 for (unsigned int i = 0; i < len; i++)
2656 if (data[i] == C0_LF) 2661 if (data[i] == C0_LF)
2657 data[i] = C0_CR; 2662 data[i] = C0_CR;
2658 2663
2664 if (priv_modes & PrivMode_BracketPaste)
2665 tt_printf ("\e[200~");
2666
2659 tt_write (data, len); 2667 tt_write (data, len);
2668
2669 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~");
2660} 2671}
2661 2672
2662/* ------------------------------------------------------------------------- */ 2673/* ------------------------------------------------------------------------- */
2663/* 2674/*
2664 * Respond to a notification that a primary selection has been sent 2675 * Respond to a notification that a primary selection has been sent
… …
2739 if (!delete_prop) 2750 if (!delete_prop)
2740 XDeleteProperty (dpy, win, prop); 2751 XDeleteProperty (dpy, win, prop);
2741 2752
2742 selection_wait = Sel_incr; 2753 selection_wait = Sel_incr;
2743 incr_buf_fill = 0; 2754 incr_buf_fill = 0;
2744 incr_ev.start (NOW + 10); 2755 incr_ev.start (10);
2745 2756
2746 goto bailout; 2757 goto bailout;
2747 } 2758 }
2748 2759
2749 if (ct.nitems == 0) 2760 if (ct.nitems == 0)
… …
2758 ct.nitems = incr_buf_fill; 2769 ct.nitems = incr_buf_fill;
2759 incr_buf = 0; 2770 incr_buf = 0;
2760 incr_buf_size = 0; 2771 incr_buf_size = 0;
2761 incr_ev.stop (); 2772 incr_ev.stop ();
2762 } 2773 }
2763 else 2774 else
2764 { 2775 {
2765 if (selection_wait == Sel_normal 2776 if (selection_wait == Sel_normal
2766 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2767 { 2778 {
2768 /* 2779 /*
… …
2775 goto bailout; 2786 goto bailout;
2776 } 2787 }
2777 } 2788 }
2778 else if (selection_wait == Sel_incr) 2789 else if (selection_wait == Sel_incr)
2779 { 2790 {
2780 incr_ev.start (NOW + 10); 2791 incr_ev.start (10);
2781 2792
2782 while (incr_buf_fill + ct.nitems > incr_buf_size) 2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2783 { 2794 {
2784 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2785 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2825 if (selection_wait == Sel_normal) 2836 if (selection_wait == Sel_normal)
2826 selection_wait = Sel_none; 2837 selection_wait = Sel_none;
2827} 2838}
2828 2839
2829void 2840void
2830rxvt_term::incr_cb (time_watcher &w) NOTHROW 2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2831{ 2842{
2832 selection_wait = Sel_none; 2843 selection_wait = Sel_none;
2833 2844
2834 incr_buf_size = 0; 2845 incr_buf_size = 0;
2835 free (incr_buf); 2846 free (incr_buf);
… …
2846 selection_paste (win, prop, true); 2857 selection_paste (win, prop, true);
2847} 2858}
2848 2859
2849/* ------------------------------------------------------------------------- */ 2860/* ------------------------------------------------------------------------- */
2850/* 2861/*
2851 * Request the current selection: 2862 * Request the current selection:
2852 * Order: > internal selection if available 2863 * Order: > internal selection if available
2853 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2854 * > CUT_BUFFER0 2865 * > CUT_BUFFER0
2855 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2856 * will auto fallback to CUT_BUFFER0 2867 * will auto fallback to CUT_BUFFER0
… …
2858 */ 2869 */
2859void 2870void
2860rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2861{ 2872{
2862 if (selection.text && selnum == Sel_Primary) 2873 if (selection.text && selnum == Sel_Primary)
2874 {
2863 { /* internal selection */ 2875 /* internal selection */
2864 char *str = rxvt_wcstombs (selection.text, selection.len); 2876 char *str = rxvt_wcstombs (selection.text, selection.len);
2865 paste (str, strlen (str)); 2877 paste (str, strlen (str));
2866 free (str); 2878 free (str);
2867 return; 2879 return;
2868 } 2880 }
… …
3134 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3146 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3135 3147
3136 while (selection.mark.col > 0 3148 while (selection.mark.col > 0
3137 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3149 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3138 --selection.mark.col; 3150 --selection.mark.col;
3139 3151
3140 if (selection.op) 3152 if (selection.op)
3153 {
3141 { /* clear the old selection */ 3154 /* clear the old selection */
3142 selection.beg.row = selection.end.row = selection.mark.row; 3155 selection.beg.row = selection.end.row = selection.mark.row;
3143 selection.beg.col = selection.end.col = selection.mark.col; 3156 selection.beg.col = selection.end.col = selection.mark.col;
3144 } 3157 }
3145 3158
3146 selection.op = SELECTION_INIT; 3159 selection.op = SELECTION_INIT;
… …
3335 * a point/word/line which is either the start or end of the selection 3348 * a point/word/line which is either the start or end of the selection
3336 * and it was decided by whichever point/word/line was `fixed' at the 3349 * and it was decided by whichever point/word/line was `fixed' at the
3337 * time of the most recent button3 press 3350 * time of the most recent button3 press
3338 */ 3351 */
3339 if (button3 && buttonpress) 3352 if (button3 && buttonpress)
3353 {
3340 { /* button3 press */ 3354 /* button3 press */
3341 /* 3355 /*
3342 * first determine which edge of the selection we are closest to 3356 * first determine which edge of the selection we are closest to
3343 */ 3357 */
3344 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3358 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3345 || (!ROWCOL_IS_AFTER (pos, selection.end) 3359 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3363 selection.mark.row = selection.beg.row; 3377 selection.mark.row = selection.beg.row;
3364 selection.mark.col = selection.beg.col; 3378 selection.mark.col = selection.beg.col;
3365 } 3379 }
3366 } 3380 }
3367 else 3381 else
3382 {
3368 { /* button1 drag or button3 drag */ 3383 /* button1 drag or button3 drag */
3369 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3384 if (ROWCOL_IS_AFTER (selection.mark, pos))
3370 { 3385 {
3371 if (selection.mark.row == selection.end.row 3386 if (selection.mark.row == selection.end.row
3372 && selection.mark.col == selection.end.col 3387 && selection.mark.col == selection.end.col
3373 && clickchange 3388 && clickchange
… …
3416 selection_delimit_word (DN, &selection.end, &selection.end); 3431 selection_delimit_word (DN, &selection.end, &selection.end);
3417 } 3432 }
3418 else if (selection.clicks == 3) 3433 else if (selection.clicks == 3)
3419 { 3434 {
3420#if ENABLE_FRILLS 3435#if ENABLE_FRILLS
3421 if (OPTION (Opt_tripleclickwords)) 3436 if (option (Opt_tripleclickwords))
3422 { 3437 {
3423 selection_delimit_word (UP, &selection.beg, &selection.beg); 3438 selection_delimit_word (UP, &selection.beg, &selection.beg);
3424 3439
3425 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3440 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3426 { 3441 {
… …
3454 selection.end.row++; 3469 selection.end.row++;
3455 } 3470 }
3456 } 3471 }
3457 3472
3458 if (button3 && buttonpress) 3473 if (button3 && buttonpress)
3474 {
3459 { /* mark may need to be changed */ 3475 /* mark may need to be changed */
3460 if (closeto == LEFT) 3476 if (closeto == LEFT)
3461 { 3477 {
3462 selection.mark.row = selection.end.row; 3478 selection.mark.row = selection.end.row;
3463 selection.mark.col = selection.end.col - (selection.clicks == 2); 3479 selection.mark.col = selection.end.col - (selection.clicks == 2);
3464 } 3480 }
… …
3663 XFree (ct.value); 3679 XFree (ct.value);
3664 } 3680 }
3665 3681
3666 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3682 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3667} 3683}
3668
3669/* ------------------------------------------------------------------------- *
3670 * MOUSE ROUTINES *
3671 * ------------------------------------------------------------------------- */
3672
3673/*
3674 * return col/row values corresponding to x/y pixel values
3675 */
3676void
3677rxvt_term::pixel_position (int *x, int *y) NOTHROW
3678{
3679 *x = Pixel2Col (*x);
3680 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3681 *y = Pixel2Row (*y);
3682 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3683}
3684 3684
3685/* ------------------------------------------------------------------------- */ 3685/* ------------------------------------------------------------------------- */
3686#ifdef USE_XIM 3686#ifdef USE_XIM
3687void 3687void
3688rxvt_term::im_set_position (XPoint &pos) NOTHROW 3688rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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