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.280 by ayin, Mon Oct 15 14:56:06 2007 UTC vs.
Revision 1.390 by sf-exg, Fri Jul 8 20:54:31 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-2006 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 {
… …
328 int qcol = 0; 329 int qcol = 0;
329 330
330 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
331 if (p == ocur.row) 332 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
333 334
334 // fill a single destination line 335 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
336 { 337 {
337 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
364 } 365 }
365 while (p != pend && q > 0); 366 while (p != pend && q > 0);
366 367
367 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
368 top_row = q - term_start; 369 top_row = q - term_start;
369 370
370 // make sure all terminal lines exist 371 // make sure all terminal lines exist
371 while (top_row > 0) 372 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 374 }
374 else 375 else
375 { 376 {
376 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
377 378
378 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
379 { 380 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
382 383
… …
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;
… …
596/* 610/*
597 * Change the rendition style for following text 611 * Change the rendition style for following text
598 */ 612 */
599void 613void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 615{
602 if (set) 616 if (set)
603 rstyle |= style; 617 rstyle |= style;
604 else if (style == ~RS_None) 618 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
606 else 620 else
607 rstyle &= ~style; 621 rstyle &= ~style;
608 } 622}
609 623
610/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
611/* 625/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
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 - 1);
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 686 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
672 { 688 {
673 selection.beg.row -= count; 689 selection.beg.row -= count;
674 selection.end.row -= count; 690 selection.end.row -= count;
… …
710 { 726 {
711 /* move selected region too */ 727 /* move selected region too */
712 selection.beg.row -= count; 728 selection.beg.row -= count;
713 selection.end.row -= count; 729 selection.end.row -= count;
714 selection.mark.row -= count; 730 selection.mark.row -= count;
715 731
716 selection_check (0); 732 selection_check (0);
717 } 733 }
718 } 734 }
719 735
720 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
722 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
723 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
724 748
725 min_it (count, rows); 749 min_it (count, rows);
726 750
727 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 752
729 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
730 { 754 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 756
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 759 }
736 760
737 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2 - 1);
767 l.is_longer (0);
768 l.touch ();
769 }
770
739 } 771 }
740 772
741 return count; 773 return count;
742} 774}
743 775
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 804 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 805 screen.cur.row -= minlines;
774 } 806 }
775 } 807 }
776 808
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 809 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 810 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 811 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 812 int row = screen.cur.row;
783 813
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 814 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 815
786 line_t *line = &ROW(row); 816 line_t *line = &ROW(row);
787 817
788 while (str < strend) 818 while (str < strend)
789 { 819 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 821
792 if (c < 0x20) 822 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 823 if (c == C0_LF)
794 { 824 {
795 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
796 826
797 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
816 { 846 {
817 scr_tab (1, true); 847 scr_tab (1, true);
818 continue; 848 continue;
819 } 849 }
820 850
851 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
855 ))
824 { 856 {
825 checksel = 0; 857 checksel = 0;
826 /* 858 /*
827 * If we wrote anywhere in the selected area, kill the selection 859 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 860 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 861 * should be a similar check.
830 */ 862 */
831 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
832 } 864 }
833 865
834 if (screen.flags & Screen_WrapNext) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 867 {
836 scr_do_wrap (); 868 scr_do_wrap ();
837 869
838 line->l = ncol; 870 line->l = ncol;
839 line->is_longer (1); 871 line->is_longer (1);
840 872
841 row = screen.cur.row; 873 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
843 } 875 }
844 876
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 879 c = 0xfffd;
848 880
849 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
852 // locale. 884 // locale.
853 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
854 886
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 888 {
857 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 890 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
875 } 907 }
876 } 908 }
877 909
878 if (screen.flags & Screen_Insert) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
880 912
881 if (width != 0) 913 if (width != 0)
882 { 914 {
883#if !UNICODE_3 915#if !UNICODE_3
… …
888# else 920# else
889 c = 0xfffd; 921 c = 0xfffd;
890# endif 922# endif
891#endif 923#endif
892 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
893 // nuke the character at this position, if required 941 // nuke the character at this position, if required
942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 946 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 947
925 line->touch (); 948 line->touch ();
926 949
927 do 950 do
928 { 951 {
929 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
931 954
932 if (screen.cur.col < ncol - 1) 955 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 956 screen.cur.col++;
934 else 957 else
935 { 958 {
936 line->l = ncol; 959 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
939 break; 962
963 goto end_of_line;
940 } 964 }
941 965
942 c = NOCHAR; 966 c = NOCHAR;
943 } 967 }
944 while (--width > 0); 968 while (ecb_unlikely (--width > 0));
945 969
946 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 972 {
949 line->touch (); 973 line->t[c] = ' ';
974 line->r[c] = rend;
975 }
950 976
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 977end_of_line:
978 ;
979 }
980#if ENABLE_COMBINING
981 else // width == 0
982 {
983 if (c != 0xfeff) // ignore BOM
984 {
985 // handle combining characters
986 // we just tag the accent on the previous on-screen character.
987 // this is arguably not correct, but also arguably not wrong.
988 // we don't handle double-width characters nicely yet.
989 line_t *linep;
990 text_t *tp;
991 rend_t *rp;
992
993 if (screen.cur.col > 0)
952 { 994 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 995 linep = line;
996 tp = line->t + screen.cur.col - 1;
997 rp = line->r + screen.cur.col - 1;
955 } 998 }
999 else if (screen.cur.row > 0
1000 && ROW(screen.cur.row - 1).is_longer ())
1001 {
1002 linep = &ROW(screen.cur.row - 1);
1003 tp = line->t + ncol - 1;
1004 rp = line->r + ncol - 1;
1005 }
1006 else
1007 continue;
1008
1009 linep->touch ();
1010
1011 while (*tp == NOCHAR && tp > linep->t)
1012 tp--, rp--;
1013
1014 // first try to find a precomposed character
1015 unicode_t n = rxvt_compose (*tp, c);
1016 if (n == NOCHAR)
1017 n = rxvt_composite.compose (*tp, c);
1018
1019 *tp = n;
1020 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1021 }
957 } 1022 }
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 1023#endif
998 }
999 } 1024 }
1000 1025
1001 max_it (line->l, screen.cur.col); 1026 max_it (line->l, screen.cur.col);
1002 1027
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1028 assert (screen.cur.row >= 0);
1005#endif
1006} 1029}
1007 1030
1008/* ------------------------------------------------------------------------- */ 1031/* ------------------------------------------------------------------------- */
1009/* 1032/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1033 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1034 * XTERM_SEQ: CTRL-H
1012 */ 1035 */
1013void 1036void
1014rxvt_term::scr_backspace () NOTHROW 1037rxvt_term::scr_backspace () NOTHROW
1015{ 1038{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1039 if (screen.cur.col == 0)
1019 { 1040 {
1020 if (screen.cur.row > 0) 1041 if (screen.cur.row > 0)
1021 { 1042 {
1022#ifdef TERMCAP_HAS_BW 1043#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1044 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1045 --screen.cur.row;
1025 return; 1046
1047 want_refresh = 1;
1026#endif 1048#endif
1027 } 1049 }
1028 } 1050 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1053 else
1030 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1055}
1034 1056
1035/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
1036/* 1058/*
1037 * Process Horizontal Tab 1059 * Process Horizontal Tab
… …
1060 x = i; 1082 x = i;
1061 1083
1062 if (!--count) 1084 if (!--count)
1063 break; 1085 break;
1064 } 1086 }
1065 else 1087 else
1066 ht &= l.t[i] == ' ' 1088 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1089 && RS_SAME (l.r[i], base_rend);
1068 1090
1069 if (count) 1091 if (count)
1070 x = ncol - 1; 1092 x = ncol - 1;
… …
1186 } 1208 }
1187 } 1209 }
1188 else 1210 else
1189 { 1211 {
1190 if (screen.flags & Screen_Relative) 1212 if (screen.flags & Screen_Relative)
1213 {
1191 { /* relative origin mode */ 1214 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1215 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1216 min_it (screen.cur.row, screen.bscroll);
1194 } 1217 }
1195 else 1218 else
1196 screen.cur.row = row; 1219 screen.cur.row = row;
… …
1229/* 1252/*
1230 * Erase part or whole of a line 1253 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1254 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1255 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1256 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1257 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1258 */
1235void 1259void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1260rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1261{
1238 unsigned int col, num; 1262 unsigned int col, num;
… …
1247 line.touch (); 1271 line.touch ();
1248 line.is_longer (0); 1272 line.is_longer (0);
1249 1273
1250 switch (mode) 1274 switch (mode)
1251 { 1275 {
1276 case 3:
1277 if (screen.flags & Screen_WrapNext)
1278 return;
1279
1280 /* fall through */
1281
1252 case 0: /* erase to end of line */ 1282 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1283 col = screen.cur.col;
1254 num = ncol - col; 1284 num = ncol - col;
1255 min_it (line.l, col); 1285 min_it (line.l, col);
1286
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1287 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1288 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1289 CLEAR_SELECTION ();
1259 break; 1290 break;
1291
1260 case 1: /* erase to beginning of line */ 1292 case 1: /* erase to beginning of line */
1261 col = 0; 1293 col = 0;
1262 num = screen.cur.col + 1; 1294 num = screen.cur.col + 1;
1295
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1296 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1297 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1298 CLEAR_SELECTION ();
1266 break; 1299 break;
1300
1267 case 2: /* erase whole line */ 1301 case 2: /* erase whole line */
1268 col = 0; 1302 col = 0;
1269 num = ncol; 1303 num = ncol;
1270 line.l = 0; 1304 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1305 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1363 if (row >= nrow) /* Out Of Bounds */
1330 return; 1364 return;
1331 1365
1332 min_it (num, nrow - row); 1366 min_it (num, nrow - row);
1333 1367
1334 if (rstyle & (RS_RVid | RS_Uline)) 1368 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1369 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1370 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1371 {
1338 ren = DEFAULT_RSTYLE; 1372 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1373
1374 if (mapped)
1375 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width,
1377 (unsigned int)Height2Pixel (num), False);
1340 } 1378 }
1341 else 1379 else
1342 { 1380 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1381 ren = rstyle & (RS_fgMask | RS_bgMask);
1382
1383 if (mapped)
1384 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1386 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1387 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start),
1389 (unsigned int)width,
1390 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1391 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 }
1349 } 1394 }
1350 1395
1351 for (; num--; row++) 1396 for (; num--; row++)
1352 { 1397 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1398 scr_blank_screen_mem (ROW(row), rstyle);
1399
1400 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1401 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1402 }
1356} 1403}
1357 1404
1358#if !ENABLE_MINIMAL 1405#if !ENABLE_MINIMAL
1359void 1406void
… …
1433 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1434 */ 1481 */
1435void 1482void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1484{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1485 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1443 1487
1444 if (count <= 0) 1488 if (count <= 0)
1445 return; 1489 return;
… …
1447 scr_do_wrap (); 1491 scr_do_wrap ();
1448 1492
1449 selection_check (1); 1493 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1451 1495
1452 row = screen.cur.row; 1496 int row = screen.cur.row;
1453 1497
1454 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1455 1499
1456 line->touch (); 1500 line->touch ();
1457 line->is_longer (0); 1501 line->is_longer (0);
1458 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1459 switch (insdel) 1507 switch (insdel)
1460 { 1508 {
1461 case INSERT: 1509 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1510 line->l = min (line->l + count, ncol);
1511
1512 if (line->t[screen.cur.col] == NOCHAR)
1513 scr_kill_char (*line, screen.cur.col);
1514
1515 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1516 {
1464 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1466 } 1519 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1520
1470 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1523 {
1473 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1525 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1526 CLEAR_SELECTION ();
1476 else 1527 else
1528 {
1477 { /* shift selection */ 1529 /* shift selection */
1478 selection.beg.col += count; 1530 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1531 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1532 selection.end.col += count;
1481 } 1533 }
1482 } 1534 }
… …
1487 case ERASE: 1539 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1541 selection_check (1);
1490 screen.cur.col -= count; 1542 screen.cur.col -= count;
1491 1543
1492 line->l = max (line->l - count, 0); 1544 // nuke wide char after the end
1545 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1546 scr_kill_char (*line, screen.cur.col + count);
1547
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1549 break;
1495 1550
1496 case DELETE: 1551 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1498 1553
1554 // nuke wide char spanning the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1559 {
1501 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1503 } 1562 }
1504 1563
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1565
1508 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1568 {
1511 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1647 { 1705 {
1648 rvideo_state = on; 1706 rvideo_state = on;
1649 1707
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1709#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1653#endif 1711#endif
1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1713
1656 XGCValues gcvalue; 1714 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1859 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1860 {
1803 min_it (rc[i].col, ncol - 1); 1861 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1862 min_it (rc[i].row, nrow - 1);
1805 } 1863 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1864
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1865 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1866 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1867
1810 num_scr_allow = 0; 1868 num_scr_allow = 0;
1811 1869
… …
1866 return true; 1924 return true;
1867} 1925}
1868 1926
1869#ifndef NO_BELL 1927#ifndef NO_BELL
1870void 1928void
1871rxvt_term::bell_cb (time_watcher &w) 1929rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1930{
1873 rvideo_bell = false; 1931 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1932 scr_rvideo_mode (rvideo_mode);
1933 refresh_check ();
1875} 1934}
1876#endif 1935#endif
1877 1936
1878/* ------------------------------------------------------------------------- */ 1937/* ------------------------------------------------------------------------- */
1879void 1938void
… …
1883 1942
1884# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1887# endif 1946# endif
1888 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1889# endif 1948# endif
1890 1949
1891# if ENABLE_FRILLS 1950# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell)) 1951 if (option (Opt_urgentOnBell))
1893 { 1952 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 1953# endif
1901 1954
1902 if (option (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1903 { 1956 {
1904 rvideo_bell = true; 1957 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode); 1958 scr_rvideo_mode (rvideo_mode);
1906 display->flush (); 1959 flush ();
1907 1960
1908 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1909 } 1962 }
1910 else 1963 else
1911 XBell (dpy, 0); 1964 XBell (dpy, 0);
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1912#endif 1966#endif
1913} 1967}
1914 1968
1915/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1916/* ARGSUSED */
1917void 1970void
1918rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1919{ 1972{
1920#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1921 int nrows, row_start; 1974 int nrows, row_start;
1922 FILE *fd; 1975 FILE *fd = popen_printer ();
1923 1976
1924 if ((fd = popen_printer ()) == NULL) 1977 if (!fd)
1925 return; 1978 return;
1926 1979
1927 if (fullhist) 1980 if (fullhist)
1928 { 1981 {
1929 nrows = nrow - top_row; 1982 nrows = nrow - top_row;
… …
1935 row_start = view_start; 1988 row_start = view_start;
1936 } 1989 }
1937 1990
1938 wctomb (0, 0); 1991 wctomb (0, 0);
1939 1992
1940 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1941 { 1994 {
1942 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1943 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1944 1997
1945 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1974 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1975 */ 2028 */
1976void 2029void
1977rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1978{ 2031{
1979 unsigned char have_bg,
1980 showcursor; /* show the cursor */
1981 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1982 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1983 int i; /* tmp */ 2034 int i; /* tmp */
1984#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1985 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
… …
1994 return; 2045 return;
1995 2046
1996 /* 2047 /*
1997 * A: set up vars 2048 * A: set up vars
1998 */ 2049 */
1999 have_bg = 0;
2000 refresh_count = 0; 2050 refresh_count = 0;
2001 2051
2052 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0;
2002#ifdef HAVE_BG_PIXMAP 2054#ifdef HAVE_BG_PIXMAP
2003 have_bg |= bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
2004#endif 2056#endif
2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2006 2058
2007 /* 2059 /*
2008 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2009 */ 2061 */
2010 scr_reverse_selection (); 2062 scr_reverse_selection ();
2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 char showcursor = screen.flags & Screen_VisibleCursor;
2011 2070
2012 /* 2071 /*
2013 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2014 */ 2073 */
2015 { 2074 {
2016 unsigned char setoldcursor; 2075 unsigned char setoldcursor;
2017 2076
2018 showcursor = (screen.flags & Screen_VisibleCursor);
2019#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2020 if (hidden_cursor) 2078 if (hidden_cursor)
2021 showcursor = 0; 2079 showcursor = 0;
2022#endif 2080#endif
2023 2081
… …
2051 ccol2 = bgcolor_of (rstyle); 2109 ccol2 = bgcolor_of (rstyle);
2052#else 2110#else
2053 ccol2 = Color_bg; 2111 ccol2 = Color_bg;
2054#endif 2112#endif
2055 2113
2056 if (showcursor && focus) 2114 if (focus)
2057 { 2115 {
2058 if (option (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2059 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2060 else 2118 else
2061 { 2119 {
… …
2096 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2097 } 2155 }
2098 } 2156 }
2099 } 2157 }
2100 2158
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 2159#ifndef NO_SLOW_LINK_SUPPORT
2107 /* 2160 /*
2108 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2109 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2110 */ 2163 */
… …
2199 continue; 2252 continue;
2200 2253
2201 // redraw one or more characters 2254 // redraw one or more characters
2202 2255
2203 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2204 while (stp[col] == NOCHAR && col > 0) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2205 --col; 2258 --col;
2206 2259
2207 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2208 text_t *text = stp + col; 2261 text_t *text = stp + col;
2209 int count = 1; 2262 int count = 1;
2210 2263
2211 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2212 drp[col] = rend; 2265 drp[col] = rend;
… …
2216 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2217 { 2270 {
2218 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2219 { 2272 {
2220 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2221 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2222 count++; 2276 count++;
2223 i++; 2277 i++;
2224 2278
2225 continue; 2279 continue;
2226 } 2280 }
… …
2246 2300
2247 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2248 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2249 2303
2250 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2251 while (i && text[count] == NOCHAR) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2252 count++, i--; 2306 count++, i--;
2253 2307
2254 /* 2308 /*
2255 * Determine the attributes for the string 2309 * Determine the attributes for the string
2256 */ 2310 */
2257 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2258 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2259 2313
2260 // only do special processing if any attributes are set, which is unlikely 2314 // 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)) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2262 { 2316 {
2263 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2264 2318
2265#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2266 if (rend & RS_Bold
2267 && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
2268 { 2321 {
2269 if (ISSET_PIXCOLOR (Color_BD)) 2322 if (ISSET_PIXCOLOR (Color_BD))
2270 fore = Color_BD; 2323 fore = Color_BD;
2271# if !ENABLE_STYLES 2324# if !ENABLE_STYLES
2272 else 2325 else
2273 invert = !invert; 2326 invert = !invert;
2274# endif 2327# endif
2275 } 2328 }
2276 2329
2277 if (rend & RS_Italic 2330 if (rend & RS_Italic && fore == Color_fg)
2278 && fore == Color_fg)
2279 { 2331 {
2280 if (ISSET_PIXCOLOR (Color_IT)) 2332 if (ISSET_PIXCOLOR (Color_IT))
2281 fore = Color_IT; 2333 fore = Color_IT;
2282# if !ENABLE_STYLES 2334# if !ENABLE_STYLES
2283 else 2335 else
… …
2287 2339
2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2289 fore = Color_UL; 2341 fore = Color_UL;
2290#endif 2342#endif
2291 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2292 if (invert) 2364 if (invert)
2293 { 2365 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2300 ::swap (fore, back); 2366 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2305 2367
2306#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2308 if (ISSET_PIXCOLOR (Color_RV))
2309 back = Color_RV;
2310# endif
2311 if (fore == back) 2369 if (fore == back)
2312 { 2370 {
2313 fore = Color_bg; 2371 fore = Color_bg;
2314 back = Color_fg; 2372 back = Color_fg;
2315 } 2373 }
… …
2317 } 2375 }
2318 2376
2319#ifdef TEXT_BLINK 2377#ifdef TEXT_BLINK
2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2378 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2321 { 2379 {
2322 if (!text_blink_ev.active) 2380 if (!text_blink_ev.is_active ())
2323 { 2381 {
2324 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2382 text_blink_ev.again ();
2325 hidden_text = 0; 2383 hidden_text = 0;
2326 } 2384 }
2327 else if (hidden_text) 2385 else if (hidden_text)
2328 fore = back; 2386 fore = back;
2329 } 2387 }
… …
2351 /* 2409 /*
2352 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2353 */ 2411 */
2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2355 2413
2356 if (have_bg && back == Color_bg) 2414 if (ecb_likely (have_bg && back == Color_bg))
2357 { 2415 {
2358 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2359 2417
2360 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2361 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2368 did_clear: ; 2426 did_clear: ;
2369 } 2427 }
2370 else 2428 else
2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2372 2430
2373 if (rend & RS_Uline && font->descent > 1 && fore != back) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2374 { 2432 {
2375#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2376 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2377 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2378 else 2436 else
2379#endif 2437#endif
2380 XSetForeground (dpy, gc, pix_colors[fore]); 2438 XSetForeground (dpy, gc, pix_colors[fore]);
2381 2439
2382 XDrawLine (dpy, drawBuffer, gc, 2440 XDrawLine (dpy, vt, gc,
2383 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2385 } 2443 }
2386 } /* for (col....) */ 2444 } /* for (col....) */
2387 } /* for (row....) */ 2445 } /* for (row....) */
2388
2389#if ENABLE_OVERLAY
2390 scr_swap_overlay ();
2391#endif
2392 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2393 2446
2394 /* 2447 /*
2395 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2396 */ 2449 */
2397 if (showcursor) 2450 if (showcursor)
… …
2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2478 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else 2479 else
2427#endif 2480#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]); 2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2429 2482
2430 XDrawRectangle (dpy, drawBuffer, gc, 2483 XDrawRectangle (dpy, vt, gc,
2431 Col2Pixel (col), 2484 Col2Pixel (col),
2432 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2433 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2435 } 2488 }
2436 } 2489 }
2437 2490
2438 /* 2491 /*
2439 * H: cleanup selection 2492 * H: cleanup selection
2440 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2441 scr_reverse_selection (); 2499 scr_reverse_selection ();
2442 2500
2501 screen.flags = old_screen_flags;
2443 num_scr = 0; 2502 num_scr = 0;
2444 num_scr_allow = 1; 2503 num_scr_allow = 1;
2445} 2504}
2446 2505
2447void 2506void
… …
2468 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2469 } 2528 }
2470} 2529}
2471 2530
2472void 2531void
2473rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2474{ 2533{
2534 bool transparent = false;
2535
2475#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2476 bgPixmap.apply (); 2537 if (bg_pixmap != None)
2477#else 2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2553 }
2554 else
2555#endif
2556 {
2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2479 XClearWindow (dpy, parent[0]);
2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2481# if HAVE_SCROLLBARS 2559 }
2560
2561 XClearWindow (dpy, parent);
2562
2482 if (scrollBar.win) 2563 if (scrollBar.win)
2483 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2485 scrollBar.setIdle (); 2569 scrollBar.state = STATE_IDLE;
2486 scrollbar_show (0); 2570 scrollBar.show (0);
2487 } 2571 }
2488# endif 2572
2573 if (refresh)
2574 {
2489 scr_clear (); 2575 scr_clear ();
2490 scr_touch (true); 2576 scr_touch (true);
2577 }
2491 want_refresh = 1; 2578 want_refresh = 1;
2492#endif
2493
2494} 2579}
2495 2580
2496/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2497void 2582void
2498rxvt_term::scr_clear (bool really) NOTHROW 2583rxvt_term::scr_clear (bool really) NOTHROW
… …
2565 { 2650 {
2566#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2567 if (selection.rect) 2652 if (selection.rect)
2568 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2569 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2570 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2571 else 2656 else
2572#endif 2657#endif
2573 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2575 RS_RVid); 2660 RS_Sel | RS_RVid);
2576 } 2661 }
2577} 2662}
2578 2663
2579/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2580/* 2665/*
… …
2585void 2670void
2586rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2587{ 2672{
2588 int row, wrote; 2673 int row, wrote;
2589 unsigned int width, towrite; 2674 unsigned int width, towrite;
2590 char r1[] = "\n"; 2675 const char r1[] = "\n";
2591 2676
2592 for (row = saveLines - nsaved; 2677 for (row = saveLines + top_row;
2593 row < saveLines + nrow - 1; row++) 2678 row < saveLines + nrow - 1; row++)
2594 { 2679 {
2595 width = row_buf[row].l >= 0 ? row_buf[row].l 2680 width = row_buf[row].l >= 0 ? row_buf[row].l
2596 : ncol; 2681 : ncol;
2597 for (towrite = width; towrite; towrite -= wrote) 2682 for (towrite = width; towrite; towrite -= wrote)
… …
2641/* ------------------------------------------------------------------------- */ 2726/* ------------------------------------------------------------------------- */
2642/* 2727/*
2643 * Paste a selection direct to the command fd 2728 * Paste a selection direct to the command fd
2644 */ 2729 */
2645void 2730void
2646rxvt_term::paste (char *data, unsigned int len) NOTHROW 2731rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2647{ 2732{
2648 /* convert normal newline chars into common keyboard Return key sequence */ 2733 /* convert normal newline chars into common keyboard Return key sequence */
2649 for (unsigned int i = 0; i < len; i++) 2734 for (unsigned int i = 0; i < len; i++)
2650 if (data[i] == C0_LF) 2735 if (data[i] == C0_LF)
2651 data[i] = C0_CR; 2736 data[i] = C0_CR;
2652 2737
2738 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~");
2740
2653 tt_write (data, len); 2741 tt_write (data, len);
2654}
2655 2742
2656/* ------------------------------------------------------------------------- */ 2743 if (priv_modes & PrivMode_BracketPaste)
2657/* 2744 tt_printf ("\e[201~");
2658 * Respond to a notification that a primary selection has been sent
2659 * EXT: SelectionNotify
2660 */
2661void
2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2663{
2664 if (prop == None) /* check for failed XConvertSelection */
2665 {
2666 if ((selection_type & Sel_CompoundText))
2667 {
2668 int selnum = selection_type & Sel_whereMask;
2669
2670 selection_type = 0;
2671 if (selnum != Sel_direct)
2672 selection_request_other (XA_STRING, selnum);
2673 }
2674
2675 if ((selection_type & Sel_UTF8String))
2676 {
2677 int selnum = selection_type & Sel_whereMask;
2678
2679 selection_type = Sel_CompoundText;
2680 if (selnum != Sel_direct)
2681 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2682 else
2683 selection_type = 0;
2684 }
2685
2686 return;
2687 }
2688
2689 unsigned long bytes_after;
2690 XTextProperty ct;
2691
2692 if (XGetWindowProperty (dpy, win, prop,
2693 0, PROP_SIZE / 4,
2694 delete_prop, AnyPropertyType,
2695 &ct.encoding, &ct.format,
2696 &ct.nitems, &bytes_after,
2697 &ct.value) != Success)
2698 {
2699 ct.value = 0;
2700 goto bailout;
2701 }
2702
2703 if (ct.encoding == None)
2704 goto bailout;
2705
2706 if (bytes_after)
2707 {
2708 // fetch and append remaining data
2709 XTextProperty ct2;
2710
2711 if (XGetWindowProperty (dpy, win, prop,
2712 ct.nitems / 4, (bytes_after + 3) / 4,
2713 delete_prop, AnyPropertyType,
2714 &ct2.encoding, &ct2.format,
2715 &ct2.nitems, &bytes_after,
2716 &ct2.value) != Success)
2717 goto bailout;
2718
2719 // realloc should be compatible to XFree, here, and elsewhere, too
2720 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2721 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2722 ct.nitems += ct2.nitems;
2723
2724 XFree (ct2.value);
2725 }
2726
2727 if (ct.value == 0)
2728 goto bailout;
2729
2730 if (ct.encoding == xa[XA_INCR])
2731 {
2732 // INCR selection, start handshake
2733 if (!delete_prop)
2734 XDeleteProperty (dpy, win, prop);
2735
2736 selection_wait = Sel_incr;
2737 incr_buf_fill = 0;
2738 incr_ev.start (NOW + 10);
2739
2740 goto bailout;
2741 }
2742
2743 if (ct.nitems == 0)
2744 {
2745 if (selection_wait == Sel_incr)
2746 {
2747 XFree (ct.value);
2748
2749 // finally complete, now paste the whole thing
2750 selection_wait = Sel_normal;
2751 ct.value = (unsigned char *)incr_buf;
2752 ct.nitems = incr_buf_fill;
2753 incr_buf = 0;
2754 incr_buf_size = 0;
2755 incr_ev.stop ();
2756 }
2757 else
2758 {
2759 if (selection_wait == Sel_normal
2760 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2761 {
2762 /*
2763 * pass through again trying CUT_BUFFER0 if we've come from
2764 * XConvertSelection () but nothing was presented
2765 */
2766 selection_paste (display->root, XA_CUT_BUFFER0, False);
2767 }
2768
2769 goto bailout;
2770 }
2771 }
2772 else if (selection_wait == Sel_incr)
2773 {
2774 incr_ev.start (NOW + 10);
2775
2776 while (incr_buf_fill + ct.nitems > incr_buf_size)
2777 {
2778 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2779 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2780 }
2781
2782 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2783 incr_buf_fill += ct.nitems;
2784
2785 goto bailout;
2786 }
2787
2788 char **cl;
2789 int cr;
2790
2791#if !ENABLE_MINIMAL
2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2793 // so recode it manually
2794 if (ct.encoding == xa[XA_UTF8_STRING])
2795 {
2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2797 char *s = rxvt_wcstombs (w);
2798 free (w);
2799 // TODO: strlen == only the first element will be converted. well...
2800 paste (s, strlen (s));
2801 free (s);
2802 }
2803 else
2804#endif
2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2806 && cl)
2807 {
2808 for (int i = 0; i < cr; i++)
2809 paste (cl[i], strlen (cl[i]));
2810
2811 XFreeStringList (cl);
2812 }
2813 else
2814 paste ((char *)ct.value, ct.nitems); // paste raw
2815
2816bailout:
2817 XFree (ct.value);
2818
2819 if (selection_wait == Sel_normal)
2820 selection_wait = Sel_none;
2821} 2745}
2822 2746
2823void 2747void
2824rxvt_term::incr_cb (time_watcher &w) NOTHROW 2748rxvt_term::paste (char *data, unsigned int len) NOTHROW
2825{ 2749{
2826 selection_wait = Sel_none; 2750 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2827
2828 incr_buf_size = 0;
2829 free (incr_buf);
2830
2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2832}
2833
2834void
2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2836{
2837 if (prop == None || selection_wait != Sel_incr)
2838 return; 2751 return;
2839 2752
2840 selection_paste (win, prop, true); 2753 tt_paste (data, len);
2841} 2754}
2842 2755
2843/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2844/* 2757/*
2845 * Request the current selection: 2758 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2846 * Order: > internal selection if available 2759 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2847 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2760 * as fallback
2848 * > CUT_BUFFER0
2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2850 * will auto fallback to CUT_BUFFER0
2851 * EXT: button 2 release 2761 * EXT: button 2 release
2852 */ 2762 */
2853void 2763void
2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2764rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2855{ 2765{
2856 if (selection.text && selnum == Sel_Primary) 2766 if (!selection_req)
2857 { /* internal selection */
2858 char *str = rxvt_wcstombs (selection.text, selection.len);
2859 paste (str, strlen (str));
2860 free (str);
2861 return;
2862 } 2767 {
2863 else 2768 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2769 selection_req->run ();
2864 { 2770 }
2865 selection_request_time = tm;
2866 selection_wait = Sel_normal;
2867
2868#if X_HAVE_UTF8_STRING
2869 selection_type = Sel_UTF8String;
2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2871 return;
2872#else
2873 selection_type = Sel_CompoundText;
2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2875 return;
2876#endif
2877 }
2878
2879 selection_wait = Sel_none; /* don't loop in selection_paste () */
2880 selection_paste (display->root, XA_CUT_BUFFER0, false);
2881}
2882
2883int
2884rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2885{
2886 Atom sel;
2887
2888 selection_type |= selnum;
2889
2890 if (selnum == Sel_Primary)
2891 sel = XA_PRIMARY;
2892 else if (selnum == Sel_Secondary)
2893 sel = XA_SECONDARY;
2894 else
2895 sel = xa[XA_CLIPBOARD];
2896
2897 if (XGetSelectionOwner (dpy, sel) != None)
2898 {
2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2900 vt, selection_request_time);
2901 return 1;
2902 }
2903
2904 return 0;
2905} 2771}
2906 2772
2907/* ------------------------------------------------------------------------- */ 2773/* ------------------------------------------------------------------------- */
2908/* 2774/*
2909 * Clear all selected text 2775 * Clear all selected text
2910 * EXT: SelectionClear 2776 * EXT: SelectionClear
2911 */ 2777 */
2912void 2778void
2913rxvt_term::selection_clear () NOTHROW 2779rxvt_term::selection_clear (bool clipboard) NOTHROW
2914{ 2780{
2781 if (!clipboard)
2782 {
2915 want_refresh = 1; 2783 want_refresh = 1;
2916 free (selection.text); 2784 free (selection.text);
2917 selection.text = NULL; 2785 selection.text = NULL;
2918 selection.len = 0; 2786 selection.len = 0;
2919 CLEAR_SELECTION (); 2787 CLEAR_SELECTION ();
2920 2788
2921 if (display->selection_owner == this) 2789 if (display->selection_owner == this)
2922 display->selection_owner = 0; 2790 display->selection_owner = 0;
2791 }
2792 else
2793 {
2794 free (selection.clip_text);
2795 selection.clip_text = NULL;
2796 selection.clip_len = 0;
2797
2798 if (display->clipboard_owner == this)
2799 display->clipboard_owner = 0;
2800 }
2923} 2801}
2924 2802
2925/* ------------------------------------------------------------------------- */ 2803/* ------------------------------------------------------------------------- */
2926/* 2804/*
2927 * Copy a selection into the cut buffer 2805 * Copy a selection into the cut buffer
2928 * EXT: button 1 or 3 release 2806 * EXT: button 1 or 3 release
2929 */ 2807 */
2930void 2808void
2931rxvt_term::selection_make (Time tm) 2809rxvt_term::selection_make (Time tm)
2932{ 2810{
2933 int i; 2811 int size;
2934 wchar_t *new_selection_text; 2812 wchar_t *new_selection_text;
2935 text_t *t; 2813 text_t *t;
2936 2814
2937 switch (selection.op) 2815 switch (selection.op)
2938 { 2816 {
… …
2954 return; /* nothing selected, go away */ 2832 return; /* nothing selected, go away */
2955 2833
2956 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2834 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2957 return; 2835 return;
2958 2836
2959 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2837 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2960 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2838 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2961 2839
2962 int ofs = 0; 2840 int ofs = 0;
2963 int extra = 0; 2841 int extra = 0;
2964 2842
2965 int col = selection.beg.col; 2843 int col = selection.beg.col;
… …
2971 { 2849 {
2972#if !ENABLE_MINIMAL 2850#if !ENABLE_MINIMAL
2973 if (selection.rect) 2851 if (selection.rect)
2974 { 2852 {
2975 col = selection.beg.col; 2853 col = selection.beg.col;
2976 end_col = ncol + 1; 2854 end_col = selection.end.col;
2977 } 2855 }
2978 else 2856 else
2979#endif 2857#endif
2980 end_col = ROW(row).l; 2858 end_col = ROW(row).l;
2981 2859
2982 col = max (col, 0); 2860 col = max (col, 0);
2983 2861
2984 if (row == selection.end.row 2862 if (row == selection.end.row)
2985#if !ENABLE_MINIMAL
2986 || selection.rect
2987#endif
2988 )
2989 min_it (end_col, selection.end.col); 2863 min_it (end_col, selection.end.col);
2990 2864
2991 t = ROW(row).t + col; 2865 t = ROW(row).t + col;
2992 2866
2993 for (; col < end_col; col++) 2867 for (; col < end_col; col++)
… …
3001 2875
3002 extra -= (len - 1); 2876 extra -= (len - 1);
3003 2877
3004 if (extra < 0) 2878 if (extra < 0)
3005 { 2879 {
3006 extra += i; 2880 extra += size;
3007 i += i; 2881 size += size;
3008 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2882 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3009 } 2883 }
3010 2884
3011 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2885 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3012 } 2886 }
3013#endif 2887#endif
… …
3025 2899
3026 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3027 } 2901 }
3028 else 2902 else
3029#endif 2903#endif
3030 if (!ROW(row).is_longer () && row != selection.end.row) 2904 if (!ROW(row).is_longer ()
2905 && (row != selection.end.row || end_col != selection.end.col)
2906 && (row != selection.beg.row || selection.beg.col < ncol))
3031 new_selection_text[ofs++] = C0_LF; 2907 new_selection_text[ofs++] = C0_LF;
3032 } 2908 }
3033
3034 if (end_col != selection.end.col)
3035 new_selection_text[ofs++] = C0_LF;
3036 2909
3037 new_selection_text[ofs] = 0; 2910 new_selection_text[ofs] = 0;
3038 2911
3039 if (ofs == 0) 2912 if (ofs == 0)
3040 { 2913 {
… …
3053 2926
3054 selection_grab (tm); 2927 selection_grab (tm);
3055} 2928}
3056 2929
3057bool 2930bool
3058rxvt_term::selection_grab (Time tm) NOTHROW 2931rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3059{ 2932{
2933 Atom sel;
2934
2935 if (!clipboard)
2936 {
3060 selection_time = tm; 2937 selection_time = tm;
2938 sel = XA_PRIMARY;
2939 }
2940 else
2941 {
2942 clipboard_time = tm;
2943 sel = xa[XA_CLIPBOARD];
2944 }
3061 2945
3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2946 XSetSelectionOwner (dpy, sel, vt, tm);
3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2947 if (XGetSelectionOwner (dpy, sel) == vt)
3064 { 2948 {
3065 display->set_selection_owner (this); 2949 display->set_selection_owner (this, clipboard);
3066 return true; 2950 return true;
3067 } 2951 }
3068 else 2952 else
3069 { 2953 {
3070 selection_clear (); 2954 selection_clear (clipboard);
3071 return false; 2955 return false;
3072 } 2956 }
3073 2957
3074#if 0 2958#if 0
3075 XTextProperty ct; 2959 XTextProperty ct;
… …
3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3012 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3129 3013
3130 while (selection.mark.col > 0 3014 while (selection.mark.col > 0
3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3015 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3132 --selection.mark.col; 3016 --selection.mark.col;
3133 3017
3134 if (selection.op) 3018 if (selection.op)
3019 {
3135 { /* clear the old selection */ 3020 /* clear the old selection */
3136 selection.beg.row = selection.end.row = selection.mark.row; 3021 selection.beg.row = selection.end.row = selection.mark.row;
3137 selection.beg.col = selection.end.col = selection.mark.col; 3022 selection.beg.col = selection.end.col = selection.mark.col;
3138 } 3023 }
3139 3024
3140 selection.op = SELECTION_INIT; 3025 selection.op = SELECTION_INIT;
… …
3329 * a point/word/line which is either the start or end of the selection 3214 * a point/word/line which is either the start or end of the selection
3330 * and it was decided by whichever point/word/line was `fixed' at the 3215 * and it was decided by whichever point/word/line was `fixed' at the
3331 * time of the most recent button3 press 3216 * time of the most recent button3 press
3332 */ 3217 */
3333 if (button3 && buttonpress) 3218 if (button3 && buttonpress)
3219 {
3334 { /* button3 press */ 3220 /* button3 press */
3335 /* 3221 /*
3336 * first determine which edge of the selection we are closest to 3222 * first determine which edge of the selection we are closest to
3337 */ 3223 */
3338 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3224 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3339 || (!ROWCOL_IS_AFTER (pos, selection.end) 3225 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3357 selection.mark.row = selection.beg.row; 3243 selection.mark.row = selection.beg.row;
3358 selection.mark.col = selection.beg.col; 3244 selection.mark.col = selection.beg.col;
3359 } 3245 }
3360 } 3246 }
3361 else 3247 else
3248 {
3362 { /* button1 drag or button3 drag */ 3249 /* button1 drag or button3 drag */
3363 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3250 if (ROWCOL_IS_AFTER (selection.mark, pos))
3364 { 3251 {
3365 if (selection.mark.row == selection.end.row 3252 if (selection.mark.row == selection.end.row
3366 && selection.mark.col == selection.end.col 3253 && selection.mark.col == selection.end.col
3367 && clickchange 3254 && clickchange
… …
3448 selection.end.row++; 3335 selection.end.row++;
3449 } 3336 }
3450 } 3337 }
3451 3338
3452 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3453 { /* mark may need to be changed */ 3341 /* mark may need to be changed */
3454 if (closeto == LEFT) 3342 if (closeto == LEFT)
3455 { 3343 {
3456 selection.mark.row = selection.end.row; 3344 selection.mark.row = selection.end.row;
3457 selection.mark.col = selection.end.col - (selection.clicks == 2); 3345 selection.mark.col = selection.end.col - (selection.clicks == 2);
3458 } 3346 }
… …
3531 * EXT: SelectionRequest 3419 * EXT: SelectionRequest
3532 */ 3420 */
3533void 3421void
3534rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3535{ 3423{
3424 Atom property = rq.property == None ? rq.target : rq.property;
3536 XSelectionEvent ev; 3425 XSelectionEvent ev;
3537 3426
3538 ev.type = SelectionNotify; 3427 ev.type = SelectionNotify;
3539 ev.property = None; 3428 ev.property = None;
3540 ev.display = rq.display; 3429 ev.display = rq.display;
… …
3555 *target++ = xa[XA_COMPOUND_TEXT]; 3444 *target++ = xa[XA_COMPOUND_TEXT];
3556#if X_HAVE_UTF8_STRING 3445#if X_HAVE_UTF8_STRING
3557 *target++ = xa[XA_UTF8_STRING]; 3446 *target++ = xa[XA_UTF8_STRING];
3558#endif 3447#endif
3559 3448
3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3449 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3561 32, PropModeReplace, 3450 32, PropModeReplace,
3562 (unsigned char *)target_list, target - target_list); 3451 (unsigned char *)target_list, target - target_list);
3563 ev.property = rq.property; 3452 ev.property = property;
3564 } 3453 }
3565#if TODO // TODO 3454#if TODO // TODO
3566 else if (rq.target == xa[XA_MULTIPLE]) 3455 else if (rq.target == xa[XA_MULTIPLE])
3567 { 3456 {
3568 /* TODO: Handle MULTIPLE */ 3457 /* TODO: Handle MULTIPLE */
3569 } 3458 }
3570#endif 3459#endif
3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3572 { 3461 {
3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3462 XChangeProperty (dpy, rq.requestor, property, rq.target,
3574 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3463 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3575 ev.property = rq.property; 3464 ev.property = property;
3465 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 {
3468 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = property;
3576 } 3471 }
3577 else if (rq.target == XA_STRING 3472 else if (rq.target == XA_STRING
3578 || rq.target == xa[XA_TEXT] 3473 || rq.target == xa[XA_TEXT]
3579 || rq.target == xa[XA_COMPOUND_TEXT] 3474 || rq.target == xa[XA_COMPOUND_TEXT]
3580 || rq.target == xa[XA_UTF8_STRING] 3475 || rq.target == xa[XA_UTF8_STRING]
… …
3612 { 3507 {
3613 target = xa[XA_COMPOUND_TEXT]; 3508 target = xa[XA_COMPOUND_TEXT];
3614 style = enc_compound_text; 3509 style = enc_compound_text;
3615 } 3510 }
3616 3511
3617 if (selection.text) 3512 if (rq.selection == XA_PRIMARY && selection.text)
3618 { 3513 {
3619 cl = selection.text; 3514 cl = selection.text;
3620 selectlen = selection.len; 3515 selectlen = selection.len;
3516 }
3517 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3518 {
3519 cl = selection.clip_text;
3520 selectlen = selection.clip_len;
3621 } 3521 }
3622 else 3522 else
3623 { 3523 {
3624 cl = L""; 3524 cl = L"";
3625 selectlen = 0; 3525 selectlen = 0;
… …
3646 ct.value = (unsigned char *)cl; 3546 ct.value = (unsigned char *)cl;
3647 ct.nitems = selectlen; 3547 ct.nitems = selectlen;
3648 ct.encoding = target; 3548 ct.encoding = target;
3649 } 3549 }
3650 3550
3651 XChangeProperty (dpy, rq.requestor, rq.property, 3551 XChangeProperty (dpy, rq.requestor, property,
3652 ct.encoding, 8, PropModeReplace, 3552 ct.encoding, 8, PropModeReplace,
3653 ct.value, (int)ct.nitems); 3553 ct.value, (int)ct.nitems);
3654 ev.property = rq.property; 3554 ev.property = property;
3655 3555
3656 if (freect) 3556 if (freect)
3657 XFree (ct.value); 3557 XFree (ct.value);
3658 } 3558 }
3659 3559
3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3661} 3561}
3662
3663/* ------------------------------------------------------------------------- *
3664 * MOUSE ROUTINES *
3665 * ------------------------------------------------------------------------- */
3666 3562
3667/* ------------------------------------------------------------------------- */ 3563/* ------------------------------------------------------------------------- */
3668#ifdef USE_XIM 3564#ifdef USE_XIM
3669void 3565void
3670rxvt_term::im_set_position (XPoint &pos) NOTHROW 3566rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3697 h += 2; min_it (h, nrow); 3593 h += 2; min_it (h, nrow);
3698 3594
3699 x -= 1; clamp_it (x, 0, ncol - w); 3595 x -= 1; clamp_it (x, 0, ncol - w);
3700 y -= 1; clamp_it (y, 0, nrow - h); 3596 y -= 1; clamp_it (y, 0, nrow - h);
3701 3597
3702 ov_x = x; ov_y = y; 3598 ov.x = x; ov.y = y;
3703 ov_w = w; ov_h = h; 3599 ov.w = w; ov.h = h;
3704 3600
3705 ov_text = new text_t *[h]; 3601 ov.text = new text_t *[h];
3706 ov_rend = new rend_t *[h]; 3602 ov.rend = new rend_t *[h];
3707 3603
3708 for (y = 0; y < h; y++) 3604 for (y = 0; y < h; y++)
3709 { 3605 {
3710 text_t *tp = ov_text[y] = new text_t[w]; 3606 text_t *tp = ov.text[y] = new text_t[w];
3711 rend_t *rp = ov_rend[y] = new rend_t[w]; 3607 rend_t *rp = ov.rend[y] = new rend_t[w];
3712 3608
3713 text_t t0, t1, t2; 3609 text_t t0, t1, t2;
3714 rend_t r = OVERLAY_RSTYLE; 3610 rend_t r = OVERLAY_RSTYLE;
3715 3611
3716 if (y == 0) 3612 if (y == 0)
… …
3735} 3631}
3736 3632
3737void 3633void
3738rxvt_term::scr_overlay_off () NOTHROW 3634rxvt_term::scr_overlay_off () NOTHROW
3739{ 3635{
3740 if (!ov_text) 3636 if (!ov.text)
3741 return; 3637 return;
3742 3638
3743 want_refresh = 1; 3639 want_refresh = 1;
3744 3640
3745 for (int y = 0; y < ov_h; y++) 3641 for (int y = 0; y < ov.h; y++)
3746 { 3642 {
3747 delete [] ov_text[y]; 3643 delete [] ov.text[y];
3748 delete [] ov_rend[y]; 3644 delete [] ov.rend[y];
3749 } 3645 }
3750 3646
3751 delete [] ov_text; ov_text = 0; 3647 delete [] ov.text; ov.text = 0;
3752 delete [] ov_rend; ov_rend = 0; 3648 delete [] ov.rend; ov.rend = 0;
3753} 3649}
3754 3650
3755void 3651void
3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3757{ 3653{
3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3654 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3759 return; 3655 return;
3760 3656
3761 x++, y++; 3657 x++, y++;
3762 3658
3763 ov_text[y][x] = text; 3659 ov.text[y][x] = text;
3764 ov_rend[y][x] = rend; 3660 ov.rend[y][x] = rend;
3765} 3661}
3766 3662
3767void 3663void
3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3664rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3769{ 3665{
… …
3788} 3684}
3789 3685
3790void 3686void
3791rxvt_term::scr_swap_overlay () NOTHROW 3687rxvt_term::scr_swap_overlay () NOTHROW
3792{ 3688{
3793 if (!ov_text) 3689 if (!ov.text)
3794 return; 3690 return;
3795 3691
3692 // hide cursor if it is within the overlay area
3693 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3694 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3695 screen.flags &= ~Screen_VisibleCursor;
3696
3796 // swap screen mem with overlay 3697 // swap screen mem with overlay
3797 for (int y = ov_h; y--; ) 3698 for (int y = ov.h; y--; )
3798 { 3699 {
3799 text_t *t1 = ov_text[y]; 3700 text_t *t1 = ov.text[y];
3800 rend_t *r1 = ov_rend[y]; 3701 rend_t *r1 = ov.rend[y];
3801 3702
3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3703 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3803 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3704 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3804 3705
3805 for (int x = ov_w; x--; ) 3706 for (int x = ov.w; x--; )
3806 { 3707 {
3807 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3708 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3808 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3709 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3809 } 3710 }
3810 } 3711 }

Diff Legend

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