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

Diff Legend

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