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.297 by root, Wed Jan 9 01:14:29 2008 UTC vs.
Revision 1.398 by sf-exg, Wed Nov 2 15:11:51 2011 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-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 85
87/* 86/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 88 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 90 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 94
112/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
115 98
… …
148 131
149 l.l = 0; 132 l.l = 0;
150 l.f = 0; 133 l.f = 0;
151} 134}
152 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
153/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
156 160
157void 161void
… …
159{ 163{
160#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
161 scr_overlay_off (); 165 scr_overlay_off ();
162#endif 166#endif
163 167
164 rvideo_mode = false;
165 view_start = 0; 168 view_start = 0;
166 num_scr = 0; 169 num_scr = 0;
167 170
168 if (ncol == 0) 171 if (ncol == 0)
169 ncol = 80; 172 ncol = 80;
… …
171 if (nrow == 0) 174 if (nrow == 0)
172 nrow = 24; 175 nrow = 24;
173 176
174 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 178 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 179
180 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
182 { 182 {
183 //TODO//FIXME 183 //TODO//FIXME
… …
203 term_start = 0; 203 term_start = 0;
204 204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207 207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 211
212 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
213 { 213 {
… …
236 selection.text = NULL; 236 selection.text = NULL;
237 selection.len = 0; 237 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
240 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 277 }
276 278
277 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
279 281
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
288 291
289 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 294
292 do 295 do
293 { 296 {
294 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 299 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 301
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 303 {
… …
396 delete old_ta; 397 delete old_ta;
397 delete old_ra; 398 delete old_ra;
398 399
399 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
401 403
402 free (tabs); 404 free (tabs);
403 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
408 prev_ncol = ncol; 413 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol);
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 414
418 tt_winch (); 415 tt_winch ();
419 416
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 418}
… …
433 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
434 431
435 free (row_buf); 432 free (row_buf);
436 free (swap_buf); 433 free (swap_buf);
437 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
438 free (tabs); 437 free (tabs);
439 438 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 439 }
442} 440}
443 441
444/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
445/* 443/*
446 * Hard reset 444 * Hard/Soft reset
447 */ 445 */
448void 446void
449rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
450{ 448{
451 scr_release (); 449 scr_release ();
452 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
453 scr_reset (); 453 scr_reset ();
454 454
455 scr_clear (true); 455 scr_clear (true);
456 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
457} 473}
458 474
459/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
499 } 515 }
500 516
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
507#endif
508} 522}
509 523
510void 524void
511rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
512{ 526{
… …
537 want_refresh = 1; 551 want_refresh = 1;
538 view_start = 0; 552 view_start = 0;
539 553
540 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
541 555
542 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
543 557
544#if NSCREENS 558#if NSCREENS
545 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
546 { 560 {
547 num_scr = 0; 561 num_scr = 0;
… …
624 638
625 if (count > 0 639 if (count > 0
626 && row1 == 0 640 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
629 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 646
634 // sever bottommost line 647 // sever bottommost line
635 { 648 {
636 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
637 l.is_longer (0); 650 l.is_longer (0);
638 l.touch (); 651 l.touch ();
639 } 652 }
640 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
641 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 670 for (int i = count; i--; )
643 { 671 {
644 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
645 673
646 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 677 {
650 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 679 l.l = 0;
… …
653 } 681 }
654 else 682 else
655 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
656 } 684 }
657 685
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
669
670 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen)
672 {
673 selection.beg.row -= count;
674 selection.end.row -= count;
675 selection.mark.row -= count;
676
677 if (selection.beg.row < top_row
678 || selection.end.row < top_row
679 || selection.mark.row < top_row)
680 {
681 CLEAR_ALL_SELECTION ();
682 selection.op = SELECTION_CLEAR;
683 }
684 }
685
686 // finally move the view window, if desired 686 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 688 && view_start != 0
689 && view_start != -saveLines) 689 && view_start != -saveLines)
690 scr_page (UP, count); 690 scr_page (UP, count);
… …
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
694 } 694 }
695 else 695 else
696 { 696 {
697 if (selection.op && current_screen == selection.screen)
698 {
699 if ((selection.beg.row < row1 && selection.end.row > row1)
700 || (selection.beg.row < row2 && selection.end.row > row2)
701 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
702 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
703 || (selection.end.row - count < row1 && selection.end.row >= row1)
704 || (selection.end.row - count > row2 && selection.end.row <= row2))
705 {
706 CLEAR_ALL_SELECTION ();
707 selection.op = SELECTION_CLEAR;
708 }
709 else if (selection.end.row >= row1 && selection.end.row <= row2)
710 {
711 /* move selected region too */
712 selection.beg.row -= count;
713 selection.end.row -= count;
714 selection.mark.row -= count;
715
716 selection_check (0);
717 }
718 }
719
720 // use a simple and robust scrolling algorithm, this 697 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 698 // part of scr_scroll_text is not time-critical.
722 699
700 // sever line above scroll region
701 if (row1)
702 {
703 line_t &l = ROW(row1 - 1);
704 l.is_longer (0);
705 l.touch ();
706 }
707
723 int rows = row2 - row1 + 1; 708 int rows = row2 - row1 + 1;
724 709
725 min_it (count, rows); 710 min_it (count, rows);
726 711
727 line_t *temp_buf = row_buf + total_rows; 712 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 713
729 for (int row = 0; row < rows; row++) 714 for (int row = 0; row < rows; row++)
730 { 715 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 716 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 717
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 719 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 720 }
736 721
737 for (int row = 0; row < rows; row++) 722 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 723 ROW(row1 + row) = temp_buf [row];
724
725 // sever bottommost line
726 {
727 line_t &l = ROW(row2);
728 l.is_longer (0);
729 l.touch ();
730 }
731 }
732
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
739 } 752 }
740 753
741 return count; 754 return count;
742} 755}
743 756
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 785 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 786 screen.cur.row -= minlines;
774 } 787 }
775 } 788 }
776 789
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 790 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 791 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 792 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 793 int row = screen.cur.row;
783 794
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 795 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 796
786 line_t *line = &ROW(row); 797 line_t *line = &ROW(row);
787 798
788 while (str < strend) 799 while (str < strend)
789 { 800 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 802
792 if (c < 0x20) 803 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 804 if (c == C0_LF)
794 { 805 {
795 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
796 807
797 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
816 { 827 {
817 scr_tab (1, true); 828 scr_tab (1, true);
818 continue; 829 continue;
819 } 830 }
820 831
832 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
824 { 837 {
825 checksel = 0; 838 checksel = 0;
826 /* 839 /*
827 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 842 * should be a similar check.
830 */ 843 */
831 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
832 } 845 }
833 846
834 if (screen.flags & Screen_WrapNext) 847 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 848 {
836 scr_do_wrap (); 849 scr_do_wrap ();
837 850
838 line->l = ncol; 851 line->l = ncol;
839 line->is_longer (1); 852 line->is_longer (1);
… …
841 row = screen.cur.row; 854 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
843 } 856 }
844 857
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 860 c = 0xfffd;
848 861
849 // 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
850 // further replacements, as wcwidth might return -1 for the line 863 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
852 // locale. 865 // locale.
853 int width = WCWIDTH (c); 866 int width = WCWIDTH (c);
854 867
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 869 {
857 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 871 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
875 } 888 }
876 } 889 }
877 890
878 if (screen.flags & Screen_Insert) 891 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
880 893
881 if (width != 0) 894 if (width != 0)
882 { 895 {
883#if !UNICODE_3 896#if !UNICODE_3
… …
888# else 901# else
889 c = 0xfffd; 902 c = 0xfffd;
890# endif 903# endif
891#endif 904#endif
892 905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
910 {
911 if (screen.flags & Screen_Autowrap)
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 else
919 screen.cur.col = ncol - width;
920 }
921
893 // nuke the character at this position, if required 922 // nuke the character at this position, if required
923 // due to wonderful coincidences everywhere else in this loop
924 // we never have to check for overwriting a wide char itself,
925 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 926 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 927 scr_kill_char (*line, screen.cur.col);
896 && line->t[screen.cur.col + 1] == NOCHAR))
897 {
898 int col = screen.cur.col;
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
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 (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' ';
921 // and try the same character next loop iteration
922 --str;
923 }
924 928
925 line->touch (); 929 line->touch ();
926 930
927 do 931 do
928 { 932 {
929 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 934 line->r[screen.cur.col] = rend;
931 935
932 if (screen.cur.col < ncol - 1) 936 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 937 screen.cur.col++;
934 else 938 else
935 { 939 {
936 line->l = ncol; 940 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
939 break; 943
944 goto end_of_line;
940 } 945 }
941 946
942 c = NOCHAR; 947 c = NOCHAR;
943 } 948 }
944 while (--width > 0); 949 while (ecb_unlikely (--width > 0));
945 950
946 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 952 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 953 {
949 line->touch (); 954 line->t[c] = ' ';
955 line->r[c] = rend;
956 }
950 957
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 958end_of_line:
959 ;
960 }
961#if ENABLE_COMBINING
962 else // width == 0
963 {
964 if (c != 0xfeff) // ignore BOM
965 {
966 // handle combining characters
967 // we just tag the accent on the previous on-screen character.
968 // this is arguably not correct, but also arguably not wrong.
969 // we don't handle double-width characters nicely yet.
970 line_t *linep;
971 text_t *tp;
972 rend_t *rp;
973
974 if (screen.cur.col > 0)
952 { 975 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 976 linep = line;
977 tp = line->t + screen.cur.col - 1;
978 rp = line->r + screen.cur.col - 1;
955 } 979 }
980 else if (screen.cur.row > 0
981 && ROW(screen.cur.row - 1).is_longer ())
982 {
983 linep = &ROW(screen.cur.row - 1);
984 tp = line->t + ncol - 1;
985 rp = line->r + ncol - 1;
986 }
987 else
988 continue;
989
990 linep->touch ();
991
992 while (*tp == NOCHAR && tp > linep->t)
993 tp--, rp--;
994
995 // first try to find a precomposed character
996 unicode_t n = rxvt_compose (*tp, c);
997 if (n == NOCHAR)
998 n = rxvt_composite.compose (*tp, c);
999
1000 *tp = n;
1001 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1002 }
957 } 1003 }
958 else // width == 0
959 {
960#if ENABLE_COMBINING
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 {
971 linep = line;
972 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1;
974 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 1004#endif
998 }
999 } 1005 }
1000 1006
1001 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
1002 1008
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1009 assert (screen.cur.row >= 0);
1005#endif
1006} 1010}
1007 1011
1008/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
1009/* 1013/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1014 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1023 1027
1024 want_refresh = 1; 1028 want_refresh = 1;
1025#endif 1029#endif
1026 } 1030 }
1027 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1028 else 1034 else
1029 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1030} 1036}
1031 1037
1032/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1227/* 1233/*
1228 * Erase part or whole of a line 1234 * Erase part or whole of a line
1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1235 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1236 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1237 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1238 * extension: clear to right unless wrapped: ESC [ 3 K
1232 */ 1239 */
1233void 1240void
1234rxvt_term::scr_erase_line (int mode) NOTHROW 1241rxvt_term::scr_erase_line (int mode) NOTHROW
1235{ 1242{
1236 unsigned int col, num; 1243 unsigned int col, num;
… …
1245 line.touch (); 1252 line.touch ();
1246 line.is_longer (0); 1253 line.is_longer (0);
1247 1254
1248 switch (mode) 1255 switch (mode)
1249 { 1256 {
1257 case 3:
1258 if (screen.flags & Screen_WrapNext)
1259 return;
1260
1261 /* fall through */
1262
1250 case 0: /* erase to end of line */ 1263 case 0: /* erase to end of line */
1251 col = screen.cur.col; 1264 col = screen.cur.col;
1252 num = ncol - col; 1265 num = ncol - col;
1253 min_it (line.l, col); 1266 min_it (line.l, col);
1267
1254 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1255 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1256 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1257 break; 1271 break;
1272
1258 case 1: /* erase to beginning of line */ 1273 case 1: /* erase to beginning of line */
1259 col = 0; 1274 col = 0;
1260 num = screen.cur.col + 1; 1275 num = screen.cur.col + 1;
1276
1261 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1277 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1262 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1278 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1263 CLEAR_SELECTION (); 1279 CLEAR_SELECTION ();
1264 break; 1280 break;
1281
1265 case 2: /* erase whole line */ 1282 case 2: /* erase whole line */
1266 col = 0; 1283 col = 0;
1267 num = ncol; 1284 num = ncol;
1268 line.l = 0; 1285 line.l = 0;
1269 if (selection.beg.row <= screen.cur.row 1286 if (selection.beg.row <= screen.cur.row
… …
1327 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1328 return; 1345 return;
1329 1346
1330 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1331 1348
1332 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1333 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1334 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1335 { 1352 {
1336 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1337 CLEAR_ROWS (row, num); 1354
1355 if (mapped)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1338 } 1359 }
1339 else 1360 else
1340 { 1361 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped)
1365 {
1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1343 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1344 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1345 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1346 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1347 } 1375 }
1348 1376
1349 for (; num--; row++) 1377 for (; num--; row++)
1350 { 1378 {
1351 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (row - view_start < nrow)
1352 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1353 } 1383 }
1354} 1384}
1355 1385
1356#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1357void 1387void
… …
1431 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1432 */ 1462 */
1433void 1463void
1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1435{ 1465{
1436 int col, row;
1437 rend_t tr;
1438
1439 want_refresh = 1; 1466 want_refresh = 1;
1440 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1441 1468
1442 if (count <= 0) 1469 if (count <= 0)
1443 return; 1470 return;
… …
1445 scr_do_wrap (); 1472 scr_do_wrap ();
1446 1473
1447 selection_check (1); 1474 selection_check (1);
1448 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1449 1476
1450 row = screen.cur.row; 1477 int row = screen.cur.row;
1451 1478
1452 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1453 1480
1454 line->touch (); 1481 line->touch ();
1455 line->is_longer (0); 1482 line->is_longer (0);
1456 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1457 switch (insdel) 1488 switch (insdel)
1458 { 1489 {
1459 case INSERT: 1490 case INSERT:
1460 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--)
1461 { 1497 {
1462 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1463 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1464 } 1500 }
1465
1466 line->l = min (line->l + count, ncol);
1467 1501
1468 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1470 { 1504 {
1471 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
… …
1486 case ERASE: 1520 case ERASE:
1487 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1488 selection_check (1); 1522 selection_check (1);
1489 screen.cur.col -= count; 1523 screen.cur.col -= count;
1490 1524
1491 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
1492 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1493 break; 1530 break;
1494 1531
1495 case DELETE: 1532 case DELETE:
1496 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1497 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
1498 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1499 { 1540 {
1500 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1501 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1502 } 1543 }
1503 1544
1504 line->l = max (line->l - count, 0);
1505 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1506 1546
1507 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1508 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1509 { 1549 {
1510 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1646 { 1686 {
1647 rvideo_state = on; 1687 rvideo_state = on;
1648 1688
1649 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1650#ifdef HAVE_BG_PIXMAP 1690#ifdef HAVE_BG_PIXMAP
1651 if (bgPixmap.pixmap == None) 1691 if (bg_pixmap == None)
1652#endif 1692#endif
1653 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1654 1694
1655 XGCValues gcvalue; 1695 XGCValues gcvalue;
1656 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
… …
1800 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1801 { 1841 {
1802 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1803 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1804 } 1844 }
1805// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1845
1806 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++)
1807 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);
1808 1848
1809 num_scr_allow = 0; 1849 num_scr_allow = 0;
1810 1850
… …
1883 1923
1884# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1887# endif 1927# endif
1888 XMapWindow (dpy, parent[0]); 1928 XMapWindow (dpy, parent);
1889# endif 1929# endif
1890 1930
1891# if ENABLE_FRILLS 1931# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1932 if (option (Opt_urgentOnBell))
1893 { 1933 set_urgency (1);
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif 1934# endif
1901 1935
1902 if (option (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1903 { 1937 {
1904 rvideo_bell = true; 1938 rvideo_bell = true;
… …
1907 1941
1908 bell_ev.start (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1943 }
1910 else 1944 else
1911 XBell (dpy, 0); 1945 XBell (dpy, 0);
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1947#endif
1913} 1948}
1914 1949
1915/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */
1917void 1951void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1953{
1920#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1921 int nrows, row_start; 1955 int nrows, row_start;
1922 FILE *fd; 1956 FILE *fd = popen_printer ();
1923 1957
1924 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1925 return; 1959 return;
1926 1960
1927 if (fullhist) 1961 if (fullhist)
1928 { 1962 {
1929 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1969 row_start = view_start;
1936 } 1970 }
1937 1971
1938 wctomb (0, 0); 1972 wctomb (0, 0);
1939 1973
1940 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1975 {
1942 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1944 1978
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2009 */
1976void 2010void
1977rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1978{ 2012{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2015 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2026 return;
1995 2027
1996 /* 2028 /*
1997 * A: set up vars 2029 * A: set up vars
1998 */ 2030 */
1999 have_bg = 0;
2000 refresh_count = 0; 2031 refresh_count = 0;
2001 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2004#endif 2037#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2039
2007 /* 2040 /*
2008 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2009 */ 2042 */
2010 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2051
2012 /* 2052 /*
2013 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2014 */ 2054 */
2015 { 2055 {
2016 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2017 2057
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2059 if (hidden_cursor)
2021 showcursor = 0; 2060 showcursor = 0;
2022#endif 2061#endif
2023 2062
… …
2051 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2052#else 2091#else
2053 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2054#endif 2093#endif
2055 2094
2056 if (showcursor && focus) 2095 if (focus)
2057 { 2096 {
2058 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2060 else 2099 else
2061 { 2100 {
… …
2096 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2097 } 2136 }
2098 } 2137 }
2099 } 2138 }
2100 2139
2101 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2102#if ENABLE_OVERLAY
2103 scr_swap_overlay ();
2104#endif
2105
2106#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2141 /*
2108 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2110 */ 2144 */
… …
2199 continue; 2233 continue;
2200 2234
2201 // redraw one or more characters 2235 // redraw one or more characters
2202 2236
2203 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2238 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2239 --col;
2206 2240
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2242 text_t *text = stp + col;
2209 int count = 1; 2243 int count = 1;
2210 2244
2211 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2212 drp[col] = rend; 2246 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2217 { 2251 {
2218 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2219 { 2253 {
2220 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2221 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2222 count++; 2257 count++;
2223 i++; 2258 i++;
2224 2259
2225 continue; 2260 continue;
2226 } 2261 }
… …
2246 2281
2247 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2249 2284
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2286 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2287 count++, i--;
2253 2288
2254 /* 2289 /*
2255 * Determine the attributes for the string 2290 * Determine the attributes for the string
2256 */ 2291 */
2257 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2259 2294
2260 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2297 {
2263 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2264 2299
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2285 2320
2286 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2287 fore = Color_UL; 2322 fore = Color_UL;
2288#endif 2323#endif
2289 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2290 if (invert) 2345 if (invert)
2291 { 2346 {
2292#ifdef OPTION_HC
2293 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2294 || !ISSET_PIXCOLOR (Color_HC))
2295#endif
2296 /* invert the column if no highlightColor is set or it is the
2297 * current cursor column */
2298 ::swap (fore, back); 2347 ::swap (fore, back);
2299#ifdef OPTION_HC
2300 else if (ISSET_PIXCOLOR (Color_HC))
2301 back = Color_HC;
2302#endif
2303 2348
2304#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2305# ifndef OPTION_HC
2306 if (ISSET_PIXCOLOR (Color_RV))
2307 back = Color_RV;
2308# endif
2309 if (fore == back) 2350 if (fore == back)
2310 { 2351 {
2311 fore = Color_bg; 2352 fore = Color_bg;
2312 back = Color_fg; 2353 back = Color_fg;
2313 } 2354 }
… …
2349 /* 2390 /*
2350 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2351 */ 2392 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2394
2354 if (have_bg && back == Color_bg) 2395 if (ecb_likely (have_bg && back == Color_bg))
2355 { 2396 {
2356 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2357 2398
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2366 did_clear: ; 2407 did_clear: ;
2367 } 2408 }
2368 else 2409 else
2369 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2370 2411
2371 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2372 { 2413 {
2373#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2374 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2375 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2376 else 2417 else
2377#endif 2418#endif
2378 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2379 2420
2380 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2381 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2382 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2383 } 2424 }
2384 } /* for (col....) */ 2425 } /* for (col....) */
2385 } /* for (row....) */ 2426 } /* for (row....) */
2386
2387#if ENABLE_OVERLAY
2388 scr_swap_overlay ();
2389#endif
2390 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2391 2427
2392 /* 2428 /*
2393 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2394 */ 2430 */
2395 if (showcursor) 2431 if (showcursor)
… …
2423 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2424 else 2460 else
2425#endif 2461#endif
2426 XSetForeground (dpy, gc, pix_colors[ccol1]); 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2427 2463
2428 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2429 Col2Pixel (col), 2465 Col2Pixel (col),
2430 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2431 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2432 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2433 } 2469 }
2434 } 2470 }
2435 2471
2436 /* 2472 /*
2437 * H: cleanup selection 2473 * H: cleanup selection
2438 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2439 scr_reverse_selection (); 2480 scr_reverse_selection ();
2440 2481
2482 screen.flags = old_screen_flags;
2441 num_scr = 0; 2483 num_scr = 0;
2442 num_scr_allow = 1; 2484 num_scr_allow = 1;
2443} 2485}
2444 2486
2445void 2487void
… …
2466 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2467 } 2509 }
2468} 2510}
2469 2511
2470void 2512void
2471rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2472{ 2514{
2515 bool transparent = false;
2516
2473#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2474 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2475#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2476 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2477 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2478 XClearWindow (dpy, parent[0]);
2479 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2480 2541
2481# if HAVE_SCROLLBARS 2542 XClearWindow (dpy, parent);
2543
2482 if (scrollBar.win) 2544 if (scrollBar.win)
2483 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2550 scrollBar.state = SB_STATE_IDLE;
2486 scrollbar_show (0); 2551 scrollBar.show (0);
2487 } 2552 }
2488# endif
2489 2553
2554 if (refresh)
2555 {
2490 scr_clear (); 2556 scr_clear ();
2491 scr_touch (true); 2557 scr_touch (true);
2558 }
2492 want_refresh = 1; 2559 want_refresh = 1;
2493
2494#endif
2495} 2560}
2496 2561
2497/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2498void 2563void
2499rxvt_term::scr_clear (bool really) NOTHROW 2564rxvt_term::scr_clear (bool really) NOTHROW
… …
2566 { 2631 {
2567#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2568 if (selection.rect) 2633 if (selection.rect)
2569 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2570 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2571 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2572 else 2637 else
2573#endif 2638#endif
2574 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2575 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2576 RS_RVid); 2641 RS_Sel | RS_RVid);
2577 } 2642 }
2578} 2643}
2579 2644
2580/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2581/* 2646/*
… …
2586void 2651void
2587rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2588{ 2653{
2589 int row, wrote; 2654 int row, wrote;
2590 unsigned int width, towrite; 2655 unsigned int width, towrite;
2591 char r1[] = "\n"; 2656 const char r1[] = "\n";
2592 2657
2593 for (row = saveLines - nsaved; 2658 for (row = saveLines + top_row;
2594 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2595 { 2660 {
2596 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2597 : ncol; 2662 : ncol;
2598 for (towrite = width; towrite; towrite -= wrote) 2663 for (towrite = width; towrite; towrite -= wrote)
… …
2613 * CHARACTER SELECTION * 2678 * CHARACTER SELECTION *
2614 * ------------------------------------------------------------------------- */ 2679 * ------------------------------------------------------------------------- */
2615void 2680void
2616rxvt_term::selection_check (int check_more) NOTHROW 2681rxvt_term::selection_check (int check_more) NOTHROW
2617{ 2682{
2618 row_col_t pos;
2619
2620 if (!selection.op) 2683 if (!selection.op)
2621 return; 2684 return;
2622 2685
2686 row_col_t pos;
2623 pos.row = pos.col = 0; 2687 pos.row = pos.col = 0;
2688
2624 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2625 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2626 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2627 || (check_more == 1 2692 || (check_more == 1
2628 && current_screen == selection.screen 2693 && current_screen == selection.screen
… …
2634 || (check_more == 3 2699 || (check_more == 3
2635 && ROWCOL_IS_AFTER (selection.end, pos)) 2700 && ROWCOL_IS_AFTER (selection.end, pos))
2636 || (check_more == 4 /* screen width change */ 2701 || (check_more == 4 /* screen width change */
2637 && (selection.beg.row != selection.end.row 2702 && (selection.beg.row != selection.end.row
2638 || selection.end.col > ncol))) 2703 || selection.end.col > ncol)))
2639 CLEAR_SELECTION (); 2704 CLEAR_ALL_SELECTION ();
2640} 2705}
2641 2706
2642/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2643/* 2708/*
2644 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2645 */ 2710 */
2646void 2711void
2647rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2648{ 2713{
2649 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2650 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2651 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2652 data[i] = C0_CR; 2717 data[i] = C0_CR;
2653 2718
2719 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~");
2721
2654 tt_write (data, len); 2722 tt_write (data, len);
2655}
2656 2723
2657/* ------------------------------------------------------------------------- */ 2724 if (priv_modes & PrivMode_BracketPaste)
2658/* 2725 tt_printf ("\e[201~");
2659 * Respond to a notification that a primary selection has been sent
2660 * EXT: SelectionNotify
2661 */
2662void
2663rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2664{
2665 if (prop == None) /* check for failed XConvertSelection */
2666 {
2667 if ((selection_type & Sel_CompoundText))
2668 {
2669 int selnum = selection_type & Sel_whereMask;
2670
2671 selection_type = 0;
2672 if (selnum != Sel_direct)
2673 selection_request_other (XA_STRING, selnum);
2674 }
2675
2676 if ((selection_type & Sel_UTF8String))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = Sel_CompoundText;
2681 if (selnum != Sel_direct)
2682 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2683 else
2684 selection_type = 0;
2685 }
2686
2687 return;
2688 }
2689
2690 unsigned long bytes_after;
2691 XTextProperty ct;
2692
2693 if (XGetWindowProperty (dpy, win, prop,
2694 0, PROP_SIZE / 4,
2695 delete_prop, AnyPropertyType,
2696 &ct.encoding, &ct.format,
2697 &ct.nitems, &bytes_after,
2698 &ct.value) != Success)
2699 {
2700 ct.value = 0;
2701 goto bailout;
2702 }
2703
2704 if (ct.encoding == None)
2705 goto bailout;
2706
2707 if (bytes_after)
2708 {
2709 // fetch and append remaining data
2710 XTextProperty ct2;
2711
2712 if (XGetWindowProperty (dpy, win, prop,
2713 ct.nitems / 4, (bytes_after + 3) / 4,
2714 delete_prop, AnyPropertyType,
2715 &ct2.encoding, &ct2.format,
2716 &ct2.nitems, &bytes_after,
2717 &ct2.value) != Success)
2718 goto bailout;
2719
2720 // realloc should be compatible to XFree, here, and elsewhere, too
2721 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2722 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2723 ct.nitems += ct2.nitems;
2724
2725 XFree (ct2.value);
2726 }
2727
2728 if (ct.value == 0)
2729 goto bailout;
2730
2731 if (ct.encoding == xa[XA_INCR])
2732 {
2733 // INCR selection, start handshake
2734 if (!delete_prop)
2735 XDeleteProperty (dpy, win, prop);
2736
2737 selection_wait = Sel_incr;
2738 incr_buf_fill = 0;
2739 incr_ev.start (10);
2740
2741 goto bailout;
2742 }
2743
2744 if (ct.nitems == 0)
2745 {
2746 if (selection_wait == Sel_incr)
2747 {
2748 XFree (ct.value);
2749
2750 // finally complete, now paste the whole thing
2751 selection_wait = Sel_normal;
2752 ct.value = (unsigned char *)incr_buf;
2753 ct.nitems = incr_buf_fill;
2754 incr_buf = 0;
2755 incr_buf_size = 0;
2756 incr_ev.stop ();
2757 }
2758 else
2759 {
2760 if (selection_wait == Sel_normal
2761 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2762 {
2763 /*
2764 * pass through again trying CUT_BUFFER0 if we've come from
2765 * XConvertSelection () but nothing was presented
2766 */
2767 selection_paste (display->root, XA_CUT_BUFFER0, False);
2768 }
2769
2770 goto bailout;
2771 }
2772 }
2773 else if (selection_wait == Sel_incr)
2774 {
2775 incr_ev.start (10);
2776
2777 while (incr_buf_fill + ct.nitems > incr_buf_size)
2778 {
2779 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2780 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2781 }
2782
2783 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2784 incr_buf_fill += ct.nitems;
2785
2786 goto bailout;
2787 }
2788
2789 char **cl;
2790 int cr;
2791
2792#if !ENABLE_MINIMAL
2793 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2794 // so recode it manually
2795 if (ct.encoding == xa[XA_UTF8_STRING])
2796 {
2797 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2798 char *s = rxvt_wcstombs (w);
2799 free (w);
2800 // TODO: strlen == only the first element will be converted. well...
2801 paste (s, strlen (s));
2802 free (s);
2803 }
2804 else
2805#endif
2806 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2807 && cl)
2808 {
2809 for (int i = 0; i < cr; i++)
2810 paste (cl[i], strlen (cl[i]));
2811
2812 XFreeStringList (cl);
2813 }
2814 else
2815 paste ((char *)ct.value, ct.nitems); // paste raw
2816
2817bailout:
2818 XFree (ct.value);
2819
2820 if (selection_wait == Sel_normal)
2821 selection_wait = Sel_none;
2822} 2726}
2823 2727
2824void 2728void
2825rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW 2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2826{ 2730{
2827 selection_wait = Sel_none; 2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2828
2829 incr_buf_size = 0;
2830 free (incr_buf);
2831
2832 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2833}
2834
2835void
2836rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2837{
2838 if (prop == None || selection_wait != Sel_incr)
2839 return; 2732 return;
2840 2733
2841 selection_paste (win, prop, true); 2734 tt_paste (data, len);
2842} 2735}
2843 2736
2844/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2845/* 2738/*
2846 * Request the current selection: 2739 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2847 * Order: > internal selection if available 2740 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2848 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2741 * as fallback
2849 * > CUT_BUFFER0
2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2851 * will auto fallback to CUT_BUFFER0
2852 * EXT: button 2 release 2742 * EXT: button 2 release
2853 */ 2743 */
2854void 2744void
2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2745rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2856{ 2746{
2857 if (selection.text && selnum == Sel_Primary) 2747 if (!selection_req)
2858 {
2859 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str));
2862 free (str);
2863 return;
2864 } 2748 {
2865 else 2749 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2750 selection_req->run ();
2866 { 2751 }
2867 selection_request_time = tm;
2868 selection_wait = Sel_normal;
2869
2870#if X_HAVE_UTF8_STRING
2871 selection_type = Sel_UTF8String;
2872 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2873 return;
2874#else
2875 selection_type = Sel_CompoundText;
2876 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2877 return;
2878#endif
2879 }
2880
2881 selection_wait = Sel_none; /* don't loop in selection_paste () */
2882 selection_paste (display->root, XA_CUT_BUFFER0, false);
2883}
2884
2885int
2886rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2887{
2888 Atom sel;
2889
2890 selection_type |= selnum;
2891
2892 if (selnum == Sel_Primary)
2893 sel = XA_PRIMARY;
2894 else if (selnum == Sel_Secondary)
2895 sel = XA_SECONDARY;
2896 else
2897 sel = xa[XA_CLIPBOARD];
2898
2899 if (XGetSelectionOwner (dpy, sel) != None)
2900 {
2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2902 vt, selection_request_time);
2903 return 1;
2904 }
2905
2906 return 0;
2907} 2752}
2908 2753
2909/* ------------------------------------------------------------------------- */ 2754/* ------------------------------------------------------------------------- */
2910/* 2755/*
2911 * Clear all selected text 2756 * Clear all selected text
2912 * EXT: SelectionClear 2757 * EXT: SelectionClear
2913 */ 2758 */
2914void 2759void
2915rxvt_term::selection_clear () NOTHROW 2760rxvt_term::selection_clear (bool clipboard) NOTHROW
2916{ 2761{
2762 if (!clipboard)
2763 {
2917 want_refresh = 1; 2764 want_refresh = 1;
2918 free (selection.text); 2765 free (selection.text);
2919 selection.text = NULL; 2766 selection.text = NULL;
2920 selection.len = 0; 2767 selection.len = 0;
2921 CLEAR_SELECTION (); 2768 CLEAR_SELECTION ();
2922 2769
2923 if (display->selection_owner == this) 2770 if (display->selection_owner == this)
2924 display->selection_owner = 0; 2771 display->selection_owner = 0;
2772 }
2773 else
2774 {
2775 free (selection.clip_text);
2776 selection.clip_text = NULL;
2777 selection.clip_len = 0;
2778
2779 if (display->clipboard_owner == this)
2780 display->clipboard_owner = 0;
2781 }
2925} 2782}
2926 2783
2927/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2928/* 2785/*
2929 * Copy a selection into the cut buffer 2786 * Copy a selection into the cut buffer
2930 * EXT: button 1 or 3 release 2787 * EXT: button 1 or 3 release
2931 */ 2788 */
2932void 2789void
2933rxvt_term::selection_make (Time tm) 2790rxvt_term::selection_make (Time tm)
2934{ 2791{
2935 int i; 2792 int size;
2936 wchar_t *new_selection_text; 2793 wchar_t *new_selection_text;
2937 text_t *t; 2794 text_t *t;
2938 2795
2939 switch (selection.op) 2796 switch (selection.op)
2940 { 2797 {
… …
2956 return; /* nothing selected, go away */ 2813 return; /* nothing selected, go away */
2957 2814
2958 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2815 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2959 return; 2816 return;
2960 2817
2961 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2818 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2962 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2819 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2963 2820
2964 int ofs = 0; 2821 int ofs = 0;
2965 int extra = 0; 2822 int extra = 0;
2966 2823
2967 int col = selection.beg.col; 2824 int col = selection.beg.col;
… …
2973 { 2830 {
2974#if !ENABLE_MINIMAL 2831#if !ENABLE_MINIMAL
2975 if (selection.rect) 2832 if (selection.rect)
2976 { 2833 {
2977 col = selection.beg.col; 2834 col = selection.beg.col;
2978 end_col = ncol + 1; 2835 end_col = selection.end.col;
2979 } 2836 }
2980 else 2837 else
2981#endif 2838#endif
2982 end_col = ROW(row).l; 2839 end_col = ROW(row).l;
2983 2840
2984 col = max (col, 0); 2841 col = max (col, 0);
2985 2842
2986 if (row == selection.end.row 2843 if (row == selection.end.row)
2987#if !ENABLE_MINIMAL
2988 || selection.rect
2989#endif
2990 )
2991 min_it (end_col, selection.end.col); 2844 min_it (end_col, selection.end.col);
2992 2845
2993 t = ROW(row).t + col; 2846 t = ROW(row).t + col;
2994 2847
2995 for (; col < end_col; col++) 2848 for (; col < end_col; col++)
… …
3003 2856
3004 extra -= (len - 1); 2857 extra -= (len - 1);
3005 2858
3006 if (extra < 0) 2859 if (extra < 0)
3007 { 2860 {
3008 extra += i; 2861 extra += size;
3009 i += i; 2862 size += size;
3010 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2863 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3011 } 2864 }
3012 2865
3013 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2866 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3014 } 2867 }
3015#endif 2868#endif
… …
3027 2880
3028 new_selection_text[ofs++] = C0_LF; 2881 new_selection_text[ofs++] = C0_LF;
3029 } 2882 }
3030 else 2883 else
3031#endif 2884#endif
3032 if (!ROW(row).is_longer () && row != selection.end.row) 2885 if (!ROW(row).is_longer ()
2886 && (row != selection.end.row || end_col != selection.end.col)
2887 && (row != selection.beg.row || selection.beg.col < ncol))
3033 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3034 } 2889 }
3035
3036 if (end_col != selection.end.col)
3037 new_selection_text[ofs++] = C0_LF;
3038 2890
3039 new_selection_text[ofs] = 0; 2891 new_selection_text[ofs] = 0;
3040 2892
3041 if (ofs == 0) 2893 if (ofs == 0)
3042 { 2894 {
… …
3055 2907
3056 selection_grab (tm); 2908 selection_grab (tm);
3057} 2909}
3058 2910
3059bool 2911bool
3060rxvt_term::selection_grab (Time tm) NOTHROW 2912rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3061{ 2913{
2914 Atom sel;
2915
2916 if (!clipboard)
2917 {
3062 selection_time = tm; 2918 selection_time = tm;
2919 sel = XA_PRIMARY;
2920 }
2921 else
2922 {
2923 clipboard_time = tm;
2924 sel = xa[XA_CLIPBOARD];
2925 }
3063 2926
3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2927 XSetSelectionOwner (dpy, sel, vt, tm);
3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2928 if (XGetSelectionOwner (dpy, sel) == vt)
3066 { 2929 {
3067 display->set_selection_owner (this); 2930 display->set_selection_owner (this, clipboard);
3068 return true; 2931 return true;
3069 } 2932 }
3070 else 2933 else
3071 { 2934 {
3072 selection_clear (); 2935 selection_clear (clipboard);
3073 return false; 2936 return false;
3074 } 2937 }
3075 2938
3076#if 0 2939#if 0
3077 XTextProperty ct; 2940 XTextProperty ct;
… …
3537 * EXT: SelectionRequest 3400 * EXT: SelectionRequest
3538 */ 3401 */
3539void 3402void
3540rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3541{ 3404{
3405 Atom property = rq.property == None ? rq.target : rq.property;
3542 XSelectionEvent ev; 3406 XSelectionEvent ev;
3543 3407
3544 ev.type = SelectionNotify; 3408 ev.type = SelectionNotify;
3545 ev.property = None; 3409 ev.property = None;
3546 ev.display = rq.display; 3410 ev.display = rq.display;
… …
3561 *target++ = xa[XA_COMPOUND_TEXT]; 3425 *target++ = xa[XA_COMPOUND_TEXT];
3562#if X_HAVE_UTF8_STRING 3426#if X_HAVE_UTF8_STRING
3563 *target++ = xa[XA_UTF8_STRING]; 3427 *target++ = xa[XA_UTF8_STRING];
3564#endif 3428#endif
3565 3429
3566 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3430 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3567 32, PropModeReplace, 3431 32, PropModeReplace,
3568 (unsigned char *)target_list, target - target_list); 3432 (unsigned char *)target_list, target - target_list);
3569 ev.property = rq.property; 3433 ev.property = property;
3570 } 3434 }
3571#if TODO // TODO 3435#if TODO // TODO
3572 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3573 { 3437 {
3574 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3575 } 3439 }
3576#endif 3440#endif
3577 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3578 { 3442 {
3579 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3580 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3581 ev.property = rq.property; 3445 ev.property = property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3451 ev.property = property;
3582 } 3452 }
3583 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3584 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3585 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
3586 || rq.target == xa[XA_UTF8_STRING] 3456 || rq.target == xa[XA_UTF8_STRING]
… …
3618 { 3488 {
3619 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3620 style = enc_compound_text; 3490 style = enc_compound_text;
3621 } 3491 }
3622 3492
3623 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3624 { 3494 {
3625 cl = selection.text; 3495 cl = selection.text;
3626 selectlen = selection.len; 3496 selectlen = selection.len;
3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3627 } 3502 }
3628 else 3503 else
3629 { 3504 {
3630 cl = L""; 3505 cl = L"";
3631 selectlen = 0; 3506 selectlen = 0;
… …
3652 ct.value = (unsigned char *)cl; 3527 ct.value = (unsigned char *)cl;
3653 ct.nitems = selectlen; 3528 ct.nitems = selectlen;
3654 ct.encoding = target; 3529 ct.encoding = target;
3655 } 3530 }
3656 3531
3657 XChangeProperty (dpy, rq.requestor, rq.property, 3532 XChangeProperty (dpy, rq.requestor, property,
3658 ct.encoding, 8, PropModeReplace, 3533 ct.encoding, 8, PropModeReplace,
3659 ct.value, (int)ct.nitems); 3534 ct.value, (int)ct.nitems);
3660 ev.property = rq.property; 3535 ev.property = property;
3661 3536
3662 if (freect) 3537 if (freect)
3663 XFree (ct.value); 3538 XFree (ct.value);
3664 } 3539 }
3665 3540
… …
3699 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3700 3575
3701 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3703 3578
3704 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3706 3581
3707 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3709 3584
3710 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3711 { 3586 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3589
3715 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3717 3592
3718 if (y == 0) 3593 if (y == 0)
… …
3737} 3612}
3738 3613
3739void 3614void
3740rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () NOTHROW
3741{ 3616{
3742 if (!ov_text) 3617 if (!ov.text)
3743 return; 3618 return;
3744 3619
3745 want_refresh = 1; 3620 want_refresh = 1;
3746 3621
3747 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3748 { 3623 {
3749 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3751 } 3626 }
3752 3627
3753 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3755} 3630}
3756 3631
3757void 3632void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3634{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3636 return;
3762 3637
3763 x++, y++; 3638 x++, y++;
3764 3639
3765 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3767} 3642}
3768 3643
3769void 3644void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3646{
… …
3790} 3665}
3791 3666
3792void 3667void
3793rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3669{
3795 if (!ov_text) 3670 if (!ov.text)
3796 return; 3671 return;
3797 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3798 // swap screen mem with overlay 3678 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3800 { 3680 {
3801 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3803 3683
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3686
3807 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3808 { 3688 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3691 }
3812 } 3692 }

Diff Legend

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