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.272 by root, Fri Aug 10 23:52:12 2007 UTC vs.
Revision 1.321 by root, Tue Nov 4 23:21:00 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
… …
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
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY 163 scr_soft_reset ();
163 scr_overlay_off ();
164#endif
165 164
166 rvideo_mode = false;
167 view_start = 0; 165 view_start = 0;
168 num_scr = 0; 166 num_scr = 0;
169 167
170 if (ncol == 0) 168 if (ncol == 0)
171 ncol = 80; 169 ncol = 80;
… …
173 if (nrow == 0) 171 if (nrow == 0)
174 nrow = 24; 172 nrow = 24;
175 173
176 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
177 return; 175 return;
178
179 if (current_screen != PRIMARY)
180 scr_swap_screen ();
181 176
182 // we need at least two lines for wrapping to work correctly 177 // we need at least two lines for wrapping to work correctly
183 while (nrow + saveLines < 2) 178 while (nrow + saveLines < 2)
184 { 179 {
185 //TODO//FIXME 180 //TODO//FIXME
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 272 }
278 273
279 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 276
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
285 280
286 if (top_row) 281 if (top_row)
… …
330 int qcol = 0; 325 int qcol = 0;
331 326
332 // see below for cursor adjustment rationale 327 // see below for cursor adjustment rationale
333 if (p == ocur.row) 328 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 329 screen.cur.row = q - (total_rows - nrow);
335 330
336 // fill a single destination line 331 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 332 while (lofs < llen && qcol < ncol)
338 { 333 {
339 int prow = lofs / prev_ncol; 334 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 335 int pcol = lofs % prev_ncol;
… …
366 } 361 }
367 while (p != pend && q > 0); 362 while (p != pend && q > 0);
368 363
369 term_start = total_rows - nrow; 364 term_start = total_rows - nrow;
370 top_row = q - term_start; 365 top_row = q - term_start;
371 366
372 // make sure all terminal lines exist 367 // make sure all terminal lines exist
373 while (top_row > 0) 368 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 370 }
376 else 371 else
377 { 372 {
378 // if no scrollback exists (yet), wing, instead of wrap 373 // if no scrollback exists (yet), wing, instead of wrap
379 374
380 for (int row = min (nrow, prev_nrow); row--; ) 375 for (int row = min (nrow, prev_nrow); row--; )
381 { 376 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 378 line_t &qline = row_buf [row];
384 379
… …
398 delete old_ta; 393 delete old_ta;
399 delete old_ra; 394 delete old_ra;
400 395
401 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
403
404 free (tabs);
405 } 398 }
406 399
407 CLEAR_ALL_SELECTION (); 400 CLEAR_ALL_SELECTION ();
408 401
409 prev_nrow = nrow; 402 prev_nrow = nrow;
410 prev_ncol = ncol; 403 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 404
420 tt_winch (); 405 tt_winch ();
421 406
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 407 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 408}
… …
435 delete ralloc; ralloc = 0; 420 delete ralloc; ralloc = 0;
436 421
437 free (row_buf); 422 free (row_buf);
438 free (swap_buf); 423 free (swap_buf);
439 free (drawn_buf); 424 free (drawn_buf);
425 row_buf = 0; // signal that we freed all the arrays above
426
440 free (tabs); 427 free (tabs);
441 428 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 429 }
444} 430}
445 431
446/* ------------------------------------------------------------------------- */ 432/* ------------------------------------------------------------------------- */
447/* 433/*
448 * Hard reset 434 * Hard/Soft reset
449 */ 435 */
450void 436void
451rxvt_term::scr_poweron () 437rxvt_term::scr_poweron ()
452{ 438{
453 scr_release (); 439 scr_release ();
454 prev_nrow = prev_ncol = 0; 440 prev_nrow = prev_ncol = 0;
455 scr_reset (); 441 scr_reset ();
456 442
457 scr_clear (true); 443 scr_clear (true);
458 scr_refresh (); 444 scr_refresh ();
445}
446
447void
448rxvt_term::scr_soft_reset ()
449{
450 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY
452 scr_overlay_off ();
453#endif
454
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY)
458 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
459} 469}
460 470
461/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
598/* 608/*
599 * Change the rendition style for following text 609 * Change the rendition style for following text
600 */ 610 */
601void 611void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 613{
604 if (set) 614 if (set)
605 rstyle |= style; 615 rstyle |= style;
606 else if (style == ~RS_None) 616 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
608 else 618 else
609 rstyle &= ~style; 619 rstyle &= ~style;
610 } 620}
611 621
612/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
613/* 623/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
666 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
667 677
668 ::swap (l1, l2); 678 ::swap (l1, l2);
669 l2.touch (); 679 l2.touch ();
670 } 680 }
671 681
672 // move and/or clear selection, if any 682 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
674 { 684 {
675 selection.beg.row -= count; 685 selection.beg.row -= count;
676 selection.end.row -= count; 686 selection.end.row -= count;
… …
712 { 722 {
713 /* move selected region too */ 723 /* move selected region too */
714 selection.beg.row -= count; 724 selection.beg.row -= count;
715 selection.end.row -= count; 725 selection.end.row -= count;
716 selection.mark.row -= count; 726 selection.mark.row -= count;
717 727
718 selection_check (0); 728 selection_check (0);
719 } 729 }
720 } 730 }
721 731
722 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
789 799
790 while (str < strend) 800 while (str < strend)
791 { 801 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 803
794 if (c < 0x20) 804 if (expect_false (c < 0x20))
795 if (c == C0_LF) 805 if (c == C0_LF)
796 { 806 {
797 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
798 808
799 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
818 { 828 {
819 scr_tab (1, true); 829 scr_tab (1, true);
820 continue; 830 continue;
821 } 831 }
822 832
833 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
826 { 838 {
827 checksel = 0; 839 checksel = 0;
828 /* 840 /*
829 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 843 * should be a similar check.
832 */ 844 */
833 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
834 } 846 }
835 847
836 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
837 { 849 {
838 scr_do_wrap (); 850 scr_do_wrap ();
839 851
840 line->l = ncol; 852 line->l = ncol;
841 line->is_longer (1); 853 line->is_longer (1);
842 854
843 row = screen.cur.row; 855 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
845 } 857 }
846 858
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 861 c = 0xfffd;
850 862
851 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
854 // locale. 866 // locale.
855 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
856 868
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 870 {
859 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 872 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
877 } 889 }
878 } 890 }
879 891
880 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
882 894
883 if (width != 0) 895 if (width != 0)
884 { 896 {
885#if !UNICODE_3 897#if !UNICODE_3
… …
891 c = 0xfffd; 903 c = 0xfffd;
892# endif 904# endif
893#endif 905#endif
894 906
895 // nuke the character at this position, if required 907 // nuke the character at this position, if required
908 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 909 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 910 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 919 {
900 int col = screen.cur.col; 920 // ... artificially enlargen the previous one
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
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' '; 921 c = NOCHAR;
923 // and try the same character next loop iteration 922 // and try the same character next loop iteration
924 --str; 923 --str;
925 } 924 }
926 925
927 line->touch (); 926 line->touch ();
… …
929 do 928 do
930 { 929 {
931 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
933 932
934 if (screen.cur.col < ncol - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 934 screen.cur.col++;
936 else 935 else
937 { 936 {
938 line->l = ncol; 937 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
… …
941 break; 940 break;
942 } 941 }
943 942
944 c = NOCHAR; 943 c = NOCHAR;
945 } 944 }
946 while (--width > 0); 945 while (expect_false (--width > 0));
947 946
948 // pad with spaces when overwriting wide character with smaller one 947 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 948 if (expect_false (!width))
950 { 949 {
951 line->touch (); 950 line->touch ();
952 951
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 953 {
955 line->t[c] = ' '; 954 line->t[c] = ' ';
956 line->r[c] = rend; 955 line->r[c] = rend;
957 } 956 }
958 } 957 }
959 } 958 }
959#if ENABLE_COMBINING
960 else // width == 0 960 else // width == 0
961 { 961 {
962#if ENABLE_COMBINING 962 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 { 963 {
964 // handle combining characters
965 // we just tag the accent on the previous on-screen character.
966 // this is arguably not correct, but also arguably not wrong.
967 // we don't handle double-width characters nicely yet.
968 line_t *linep;
969 text_t *tp;
970 rend_t *rp;
971
972 if (screen.cur.col > 0)
973 {
973 linep = line; 974 linep = line;
974 tp = line->t + screen.cur.col - 1; 975 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 976 rp = line->r + screen.cur.col - 1;
977 }
978 else if (screen.cur.row > 0
979 && ROW(screen.cur.row - 1).is_longer ())
980 {
981 linep = &ROW(screen.cur.row - 1);
982 tp = line->t + ncol - 1;
983 rp = line->r + ncol - 1;
984 }
985 else
986 continue;
987
988 linep->touch ();
989
990 while (*tp == NOCHAR && tp > linep->t)
991 tp--, rp--;
992
993 // first try to find a precomposed character
994 unicode_t n = rxvt_compose (*tp, c);
995 if (n == NOCHAR)
996 n = rxvt_composite.compose (*tp, c);
997
998 *tp = n;
999 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 1000 }
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 } 1001 }
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 1002#endif
1000 }
1001 } 1003 }
1002 1004
1003 max_it (line->l, screen.cur.col); 1005 max_it (line->l, screen.cur.col);
1004 1006
1005#ifdef DEBUG_STRICT 1007#ifdef DEBUG_STRICT
… …
1013 * XTERM_SEQ: CTRL-H 1015 * XTERM_SEQ: CTRL-H
1014 */ 1016 */
1015void 1017void
1016rxvt_term::scr_backspace () NOTHROW 1018rxvt_term::scr_backspace () NOTHROW
1017{ 1019{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
1021 { 1021 {
1022 if (screen.cur.row > 0) 1022 if (screen.cur.row > 0)
1023 { 1023 {
1024#ifdef TERMCAP_HAS_BW 1024#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1025 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1026 --screen.cur.row;
1027 return; 1027
1028 want_refresh = 1;
1028#endif 1029#endif
1029 } 1030 }
1030 } 1031 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1032 else
1032 scr_gotorc (0, -1, RELATIVE); 1033 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1034}
1036 1035
1037/* ------------------------------------------------------------------------- */ 1036/* ------------------------------------------------------------------------- */
1038/* 1037/*
1039 * Process Horizontal Tab 1038 * Process Horizontal Tab
… …
1062 x = i; 1061 x = i;
1063 1062
1064 if (!--count) 1063 if (!--count)
1065 break; 1064 break;
1066 } 1065 }
1067 else 1066 else
1068 ht &= l.t[i] == ' ' 1067 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1068 && RS_SAME (l.r[i], base_rend);
1070 1069
1071 if (count) 1070 if (count)
1072 x = ncol - 1; 1071 x = ncol - 1;
… …
1188 } 1187 }
1189 } 1188 }
1190 else 1189 else
1191 { 1190 {
1192 if (screen.flags & Screen_Relative) 1191 if (screen.flags & Screen_Relative)
1192 {
1193 { /* relative origin mode */ 1193 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1194 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1195 min_it (screen.cur.row, screen.bscroll);
1196 } 1196 }
1197 else 1197 else
1198 screen.cur.row = row; 1198 screen.cur.row = row;
… …
1231/* 1231/*
1232 * Erase part or whole of a line 1232 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1236 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1237 */
1237void 1238void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1239rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1240{
1240 unsigned int col, num; 1241 unsigned int col, num;
… …
1249 line.touch (); 1250 line.touch ();
1250 line.is_longer (0); 1251 line.is_longer (0);
1251 1252
1252 switch (mode) 1253 switch (mode)
1253 { 1254 {
1255 case 3:
1256 if (screen.flags & Screen_WrapNext)
1257 return;
1258
1259 /* fall through */
1260
1254 case 0: /* erase to end of line */ 1261 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1262 col = screen.cur.col;
1256 num = ncol - col; 1263 num = ncol - col;
1257 min_it (line.l, col); 1264 min_it (line.l, col);
1265
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1266 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1267 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1268 CLEAR_SELECTION ();
1261 break; 1269 break;
1270
1262 case 1: /* erase to beginning of line */ 1271 case 1: /* erase to beginning of line */
1263 col = 0; 1272 col = 0;
1264 num = screen.cur.col + 1; 1273 num = screen.cur.col + 1;
1274
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1275 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1276 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1277 CLEAR_SELECTION ();
1268 break; 1278 break;
1279
1269 case 2: /* erase whole line */ 1280 case 2: /* erase whole line */
1270 col = 0; 1281 col = 0;
1271 num = ncol; 1282 num = ncol;
1272 line.l = 0; 1283 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1284 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1342 if (row >= nrow) /* Out Of Bounds */
1332 return; 1343 return;
1333 1344
1334 min_it (num, nrow - row); 1345 min_it (num, nrow - row);
1335 1346
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1336 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1351 {
1340 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1342 } 1358 }
1343 else 1359 else
1344 { 1360 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1371 }
1352 1372
1353 for (; num--; row++) 1373 for (; num--; row++)
… …
1435 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1436 */ 1456 */
1437void 1457void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1459{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1460 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1445 1462
1446 if (count <= 0) 1463 if (count <= 0)
1447 return; 1464 return;
… …
1449 scr_do_wrap (); 1466 scr_do_wrap ();
1450 1467
1451 selection_check (1); 1468 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1453 1470
1454 row = screen.cur.row; 1471 int row = screen.cur.row;
1455 1472
1456 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1457 1474
1458 line->touch (); 1475 line->touch ();
1459 line->is_longer (0); 1476 line->is_longer (0);
1460 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1461 switch (insdel) 1482 switch (insdel)
1462 { 1483 {
1463 case INSERT: 1484 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1491 {
1466 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1468 } 1494 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1495
1472 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1498 {
1475 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1478 else 1502 else
1503 {
1479 { /* shift selection */ 1504 /* shift selection */
1480 selection.beg.col += count; 1505 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1507 selection.end.col += count;
1483 } 1508 }
1484 } 1509 }
… …
1489 case ERASE: 1514 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1516 selection_check (1);
1492 screen.cur.col -= count; 1517 screen.cur.col -= count;
1493 1518
1494 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1524 break;
1497 1525
1498 case DELETE: 1526 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1500 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1534 {
1503 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1505 } 1537 }
1506 1538
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count,
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1509 1541
1510 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1544 {
1513 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1623 */ 1655 */
1624void 1656void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1657rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1658{
1627 if (mode < 0) 1659 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1660 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1661 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1662 tabs [screen.cur.col] = !!mode;
1631} 1663}
1632 1664
1633/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
… …
1650 rvideo_state = on; 1682 rvideo_state = on;
1651 1683
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1685#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1687#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1689
1661 XGCValues gcvalue; 1690 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1836 {
1808 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1810 } 1839 }
1811 1840// 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++) 1841 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); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1843
1815 num_scr_allow = 0; 1844 num_scr_allow = 0;
1816 1845
… …
1871 return true; 1900 return true;
1872} 1901}
1873 1902
1874#ifndef NO_BELL 1903#ifndef NO_BELL
1875void 1904void
1876rxvt_term::bell_cb (time_watcher &w) 1905rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1906{
1878 rvideo_bell = false; 1907 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1880} 1910}
1881#endif 1911#endif
1882 1912
1883/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1884void 1914void
… …
1890# ifdef MAPALERT_OPTION 1920# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1921 if (option (Opt_mapAlert))
1892# endif 1922# endif
1893 XMapWindow (dpy, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1894# endif 1924# endif
1925
1895# if ENABLE_FRILLS 1926# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1927 if (option (Opt_urgentOnBell))
1897 { 1928 set_urgency (1);
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif 1929# endif
1908 1930
1909 if (option (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1910 { 1932 {
1911 rvideo_bell = true; 1933 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1934 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1935 flush ();
1914 1936
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1938 }
1917 else 1939 else
1918 XBell (dpy, 0); 1940 XBell (dpy, 0);
1919#endif 1941#endif
1920} 1942}
… …
1924void 1946void
1925rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1926{ 1948{
1927#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1928 int nrows, row_start; 1950 int nrows, row_start;
1929 FILE *fd; 1951 FILE *fd = popen_printer ();
1930 1952
1931 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1932 return; 1954 return;
1933 1955
1934 if (fullhist) 1956 if (fullhist)
1935 { 1957 {
1936 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
2001 return; 2023 return;
2002 2024
2003 /* 2025 /*
2004 * A: set up vars 2026 * A: set up vars
2005 */ 2027 */
2028 refresh_count = 0;
2029
2006 have_bg = 0; 2030 have_bg = 0;
2007 refresh_count = 0;
2008
2009#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2010 have_bg |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2011#endif
2012#if ENABLE_TRANSPARENCY
2013 have_bg |= option (Opt_transparent) && am_transparent;
2014#endif 2033#endif
2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2016 2035
2017 /* 2036 /*
2018 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
… …
2209 continue; 2228 continue;
2210 2229
2211 // redraw one or more characters 2230 // redraw one or more characters
2212 2231
2213 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2214 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2215 --col; 2234 --col;
2216 2235
2217 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2218 text_t *text = stp + col; 2237 text_t *text = stp + col;
2219 int count = 1; 2238 int count = 1;
… …
2256 2275
2257 col--; /* went one too far. move back */ 2276 col--; /* went one too far. move back */
2258 count -= i; /* dump any matching trailing chars */ 2277 count -= i; /* dump any matching trailing chars */
2259 2278
2260 // sometimes we optimize away the trailing NOCHAR's, add them back 2279 // sometimes we optimize away the trailing NOCHAR's, add them back
2261 while (i && text[count] == NOCHAR) 2280 while (expect_false (i && text[count] == NOCHAR))
2262 count++, i--; 2281 count++, i--;
2263 2282
2264 /* 2283 /*
2265 * Determine the attributes for the string 2284 * Determine the attributes for the string
2266 */ 2285 */
2267 int fore = fgcolor_of (rend); // desired foreground 2286 int fore = fgcolor_of (rend); // desired foreground
2268 int back = bgcolor_of (rend); // desired background 2287 int back = bgcolor_of (rend); // desired background
2269 2288
2270 // only do special processing if any attributes are set, which is unlikely 2289 // only do special processing if any attributes are set, which is unlikely
2271 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2290 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2272 { 2291 {
2273 bool invert = rend & RS_RVid; 2292 bool invert = rend & RS_RVid;
2274 2293
2275#ifndef NO_BOLD_UNDERLINE_REVERSE 2294#ifndef NO_BOLD_UNDERLINE_REVERSE
2276 if (rend & RS_Bold
2277 && fore == Color_fg) 2295 if (rend & RS_Bold && fore == Color_fg)
2278 { 2296 {
2279 if (ISSET_PIXCOLOR (Color_BD)) 2297 if (ISSET_PIXCOLOR (Color_BD))
2280 fore = Color_BD; 2298 fore = Color_BD;
2281# if !ENABLE_STYLES 2299# if !ENABLE_STYLES
2282 else 2300 else
2283 invert = !invert; 2301 invert = !invert;
2284# endif 2302# endif
2285 } 2303 }
2286 2304
2287 if (rend & RS_Italic 2305 if (rend & RS_Italic && fore == Color_fg)
2288 && fore == Color_fg)
2289 { 2306 {
2290 if (ISSET_PIXCOLOR (Color_IT)) 2307 if (ISSET_PIXCOLOR (Color_IT))
2291 fore = Color_IT; 2308 fore = Color_IT;
2292# if !ENABLE_STYLES 2309# if !ENABLE_STYLES
2293 else 2310 else
… …
2327 } 2344 }
2328 2345
2329#ifdef TEXT_BLINK 2346#ifdef TEXT_BLINK
2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2347 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2331 { 2348 {
2332 if (!text_blink_ev.active) 2349 if (!text_blink_ev.is_active ())
2333 { 2350 {
2334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2351 text_blink_ev.again ();
2335 hidden_text = 0; 2352 hidden_text = 0;
2336 } 2353 }
2337 else if (hidden_text) 2354 else if (hidden_text)
2338 fore = back; 2355 fore = back;
2339 } 2356 }
… …
2361 /* 2378 /*
2362 * Actually do the drawing of the string here 2379 * Actually do the drawing of the string here
2363 */ 2380 */
2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2381 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2365 2382
2366 if (have_bg && back == Color_bg) 2383 if (expect_true (have_bg && back == Color_bg))
2367 { 2384 {
2368 // this is very ugly, maybe push it into ->draw? 2385 // this is very ugly, maybe push it into ->draw?
2369 2386
2370 for (i = 0; i < count; i++) /* don't draw empty strings */ 2387 for (i = 0; i < count; i++) /* don't draw empty strings */
2371 if (text[i] != ' ') 2388 if (text[i] != ' ')
… …
2378 did_clear: ; 2395 did_clear: ;
2379 } 2396 }
2380 else 2397 else
2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2382 2399
2383 if (rend & RS_Uline && font->descent > 1 && fore != back) 2400 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2384 { 2401 {
2385#if ENABLE_FRILLS 2402#if ENABLE_FRILLS
2386 if (ISSET_PIXCOLOR (Color_underline)) 2403 if (ISSET_PIXCOLOR (Color_underline))
2387 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2404 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2388 else 2405 else
2389#endif 2406#endif
2390 XSetForeground (dpy, gc, pix_colors[fore]); 2407 XSetForeground (dpy, gc, pix_colors[fore]);
2391 2408
2392 XDrawLine (dpy, drawBuffer, gc, 2409 XDrawLine (dpy, vt, gc,
2393 xpixel, ypixel + font->ascent + 1, 2410 xpixel, ypixel + font->ascent + 1,
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2412 }
2396 } /* for (col....) */ 2413 } /* for (col....) */
2397 } /* for (row....) */ 2414 } /* for (row....) */
… …
2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2452 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else 2453 else
2437#endif 2454#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]); 2455 XSetForeground (dpy, gc, pix_colors[ccol1]);
2439 2456
2440 XDrawRectangle (dpy, drawBuffer, gc, 2457 XDrawRectangle (dpy, vt, gc,
2441 Col2Pixel (col), 2458 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2459 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2460 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2462 }
… …
2480} 2497}
2481 2498
2482void 2499void
2483rxvt_term::scr_recolour () NOTHROW 2500rxvt_term::scr_recolour () NOTHROW
2484{ 2501{
2485 if (1
2486#if ENABLE_TRANSPARENCY
2487 && !am_transparent
2488#endif
2489#ifdef HAVE_BG_PIXMAP 2502#ifdef HAVE_BG_PIXMAP
2490 && !bgPixmap.pixmap 2503 bgPixmap.apply ();
2491#endif 2504#else
2492 ) 2505
2493 {
2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2495 XClearWindow (dpy, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2496 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2497#if HAVE_SCROLLBARS 2509
2498 if (scrollBar.win) 2510 if (scrollBar.win)
2499 { 2511 {
2500 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2501 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2502 scrollbar_show (0); 2514 scrollBar.show (0);
2503 }
2504#endif
2505 } 2515 }
2506 2516
2517#endif
2518
2519 /* bgPixmap.apply () does not do the following : */
2507 scr_clear (); 2520 scr_clear ();
2508 scr_touch (true); 2521 scr_touch (true);
2509 want_refresh = 1; 2522 want_refresh = 1;
2510} 2523}
2511 2524
… …
2603{ 2616{
2604 int row, wrote; 2617 int row, wrote;
2605 unsigned int width, towrite; 2618 unsigned int width, towrite;
2606 char r1[] = "\n"; 2619 char r1[] = "\n";
2607 2620
2608 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2609 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2610 { 2623 {
2611 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2612 : ncol; 2625 : ncol;
2613 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2664 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2665 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2666 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2667 data[i] = C0_CR; 2680 data[i] = C0_CR;
2668 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2669 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2670} 2689}
2671 2690
2672/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2673/* 2692/*
2674 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
… …
2749 if (!delete_prop) 2768 if (!delete_prop)
2750 XDeleteProperty (dpy, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2751 2770
2752 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2753 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2754 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2755 2774
2756 goto bailout; 2775 goto bailout;
2757 } 2776 }
2758 2777
2759 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2768 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2769 incr_buf = 0; 2788 incr_buf = 0;
2770 incr_buf_size = 0; 2789 incr_buf_size = 0;
2771 incr_ev.stop (); 2790 incr_ev.stop ();
2772 } 2791 }
2773 else 2792 else
2774 { 2793 {
2775 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2776 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2777 { 2796 {
2778 /* 2797 /*
… …
2785 goto bailout; 2804 goto bailout;
2786 } 2805 }
2787 } 2806 }
2788 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2789 { 2808 {
2790 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2791 2810
2792 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2793 { 2812 {
2794 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2795 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2835 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2836 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2837} 2856}
2838 2857
2839void 2858void
2840rxvt_term::incr_cb (time_watcher &w) NOTHROW 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2841{ 2860{
2842 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2843 2862
2844 incr_buf_size = 0; 2863 incr_buf_size = 0;
2845 free (incr_buf); 2864 free (incr_buf);
… …
2856 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2857} 2876}
2858 2877
2859/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2860/* 2879/*
2861 * Request the current selection: 2880 * Request the current selection:
2862 * Order: > internal selection if available 2881 * Order: > internal selection if available
2863 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2864 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2865 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2866 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
… …
2868 */ 2887 */
2869void 2888void
2870rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2871{ 2890{
2872 if (selection.text && selnum == Sel_Primary) 2891 if (selection.text && selnum == Sel_Primary)
2892 {
2873 { /* internal selection */ 2893 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2876 free (str); 2896 free (str);
2877 return; 2897 return;
2878 } 2898 }
… …
3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3145 3165
3146 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3148 --selection.mark.col; 3168 --selection.mark.col;
3149 3169
3150 if (selection.op) 3170 if (selection.op)
3171 {
3151 { /* clear the old selection */ 3172 /* clear the old selection */
3152 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3153 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3154 } 3175 }
3155 3176
3156 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3345 * a point/word/line which is either the start or end of the selection 3366 * a point/word/line which is either the start or end of the selection
3346 * and it was decided by whichever point/word/line was `fixed' at the 3367 * and it was decided by whichever point/word/line was `fixed' at the
3347 * time of the most recent button3 press 3368 * time of the most recent button3 press
3348 */ 3369 */
3349 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3350 { /* button3 press */ 3372 /* button3 press */
3351 /* 3373 /*
3352 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3353 */ 3375 */
3354 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3355 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3373 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3374 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3375 } 3397 }
3376 } 3398 }
3377 else 3399 else
3400 {
3378 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3379 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3380 { 3403 {
3381 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3382 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3383 && clickchange 3406 && clickchange
… …
3464 selection.end.row++; 3487 selection.end.row++;
3465 } 3488 }
3466 } 3489 }
3467 3490
3468 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3469 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3470 if (closeto == LEFT) 3494 if (closeto == LEFT)
3471 { 3495 {
3472 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3473 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3474 } 3498 }
… …
3673 XFree (ct.value); 3697 XFree (ct.value);
3674 } 3698 }
3675 3699
3676 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3677} 3701}
3678
3679/* ------------------------------------------------------------------------- *
3680 * MOUSE ROUTINES *
3681 * ------------------------------------------------------------------------- */
3682
3683/*
3684 * return col/row values corresponding to x/y pixel values
3685 */
3686void
3687rxvt_term::pixel_position (int *x, int *y) NOTHROW
3688{
3689 *x = Pixel2Col (*x);
3690 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3691 *y = Pixel2Row (*y);
3692 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3693}
3694 3702
3695/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3704#ifdef USE_XIM
3697void 3705void
3698rxvt_term::im_set_position (XPoint &pos) NOTHROW 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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