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.270 by root, Tue Jun 26 00:40:19 2007 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 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.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
85 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)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 88 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
… …
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
153} 134}
154 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
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
158 160
159void 161void
… …
172 if (nrow == 0) 174 if (nrow == 0)
173 nrow = 24; 175 nrow = 24;
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 179
181 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
183 { 182 {
184 //TODO//FIXME 183 //TODO//FIXME
… …
204 term_start = 0; 203 term_start = 0;
205 204
206 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
208 207
209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
212 211
213 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
214 { 213 {
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 241 selection.clip_text = NULL;
242 selection.clip_len = 0;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
275 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);
276 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);
277 } 277 }
278 278
279 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 281
282 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
283 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (top_row) 286 if (top_row)
287 { 287 {
288 // 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
289 // 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
290 291
291 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 294
294 do 295 do
295 { 296 {
296 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 299 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 301
303 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 ())
304 { 303 {
… …
330 int qcol = 0; 329 int qcol = 0;
331 330
332 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
333 if (p == ocur.row) 332 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
335 334
336 // fill a single destination line 335 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
338 { 337 {
339 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
366 } 365 }
367 while (p != pend && q > 0); 366 while (p != pend && q > 0);
368 367
369 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
370 top_row = q - term_start; 369 top_row = q - term_start;
371 370
372 // make sure all terminal lines exist 371 // make sure all terminal lines exist
373 while (top_row > 0) 372 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 374 }
376 else 375 else
377 { 376 {
378 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
379 378
380 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
381 { 380 {
382 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)];
383 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
384 383
… …
398 delete old_ta; 397 delete old_ta;
399 delete old_ra; 398 delete old_ra;
400 399
401 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
403 403
404 free (tabs); 404 free (tabs);
405 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
406 409
407 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
408 411
409 prev_nrow = nrow; 412 prev_nrow = nrow;
410 prev_ncol = ncol; 413 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 414
420 tt_winch (); 415 tt_winch ();
421 416
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 418}
… …
435 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
436 431
437 free (row_buf); 432 free (row_buf);
438 free (swap_buf); 433 free (swap_buf);
439 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
440 free (tabs); 437 free (tabs);
441 438 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 439 }
444} 440}
445 441
446/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
447/* 443/*
448 * Hard reset 444 * Hard/Soft reset
449 */ 445 */
450void 446void
451rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
452{ 448{
453 scr_release (); 449 scr_release ();
454 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
455 scr_reset (); 453 scr_reset ();
456 454
457 scr_clear (true); 455 scr_clear (true);
458 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);
459} 473}
460 474
461/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
501 } 515 }
502 516
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
509#endif
510} 522}
511 523
512void 524void
513rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
514{ 526{
… …
539 want_refresh = 1; 551 want_refresh = 1;
540 view_start = 0; 552 view_start = 0;
541 553
542 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
543 555
544 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
545 557
546#if NSCREENS 558#if NSCREENS
547 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
548 { 560 {
549 num_scr = 0; 561 num_scr = 0;
… …
598/* 610/*
599 * Change the rendition style for following text 611 * Change the rendition style for following text
600 */ 612 */
601void 613void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 615{
604 if (set) 616 if (set)
605 rstyle |= style; 617 rstyle |= style;
606 else if (style == ~RS_None) 618 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
608 else 620 else
609 rstyle &= ~style; 621 rstyle &= ~style;
610 } 622}
611 623
612/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
613/* 625/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
626 638
627 if (count > 0 639 if (count > 0
628 && row1 == 0 640 && row1 == 0
629 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
631 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635 646
636 // sever bottommost line 647 // sever bottommost line
637 { 648 {
638 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
639 l.is_longer (0); 650 l.is_longer (0);
640 l.touch (); 651 l.touch ();
641 } 652 }
642 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
643 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 670 for (int i = count; i--; )
645 { 671 {
646 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
647 673
648 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 675 // could be rolled into scr_blank_screen_mem
650 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)))
651 { 677 {
652 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 679 l.l = 0;
… …
655 } 681 }
656 else 682 else
657 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
658 } 684 }
659 685
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
671
672 // move and/or clear selection, if any 686 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
674 { 689 {
675 selection.beg.row -= count; 690 selection.beg.row -= count;
676 selection.end.row -= count; 691 selection.end.row -= count;
677 selection.mark.row -= count; 692 selection.mark.row -= count;
678 693
679 if (selection.beg.row < top_row 694 selection_check (0);
680 || selection.end.row < top_row
681 || selection.mark.row < top_row)
682 {
683 CLEAR_ALL_SELECTION ();
684 selection.op = SELECTION_CLEAR;
685 }
686 } 695 }
687 696
688 // finally move the view window, if desired 697 // finally move the view window, if desired
689 if (option (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 699 && view_start != 0
… …
712 { 721 {
713 /* move selected region too */ 722 /* move selected region too */
714 selection.beg.row -= count; 723 selection.beg.row -= count;
715 selection.end.row -= count; 724 selection.end.row -= count;
716 selection.mark.row -= count; 725 selection.mark.row -= count;
717 726
718 selection_check (0); 727 selection_check (0);
719 } 728 }
720 } 729 }
721 730
722 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
723 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
724 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
725 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
726 743
727 min_it (count, rows); 744 min_it (count, rows);
728 745
729 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
730 747
731 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
732 { 749 {
733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
734 751
… …
736 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
737 } 754 }
738 755
739 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
740 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
741 } 765 }
742 766
743 return count; 767 return count;
744} 768}
745 769
… …
751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
752{ 776{
753 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
754 return; 778 return;
755 779
756 unsigned char checksel; 780 bool checksel;
757 unicode_t c; 781 unicode_t c;
758 int ncol = this->ncol; 782 int ncol = this->ncol;
759 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
760 784
761 want_refresh = 1; 785 want_refresh = 1;
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
776 } 800 }
777 } 801 }
778 802
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 806 int row = screen.cur.row;
785 807
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 809
788 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
789 811
790 while (str < strend) 812 while (str < strend)
791 { 813 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 815
794 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 817 if (c == C0_LF)
796 { 818 {
797 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
798 820
799 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
818 { 840 {
819 scr_tab (1, true); 841 scr_tab (1, true);
820 continue; 842 continue;
821 } 843 }
822 844
845 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
826 { 850 {
827 checksel = 0; 851 checksel = 0;
828 /* 852 /*
829 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 855 * should be a similar check.
832 */ 856 */
833 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
834 } 858 }
835 859
836 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 861 {
838 scr_do_wrap (); 862 scr_do_wrap ();
839 863
840 line->l = ncol; 864 line->l = ncol;
841 line->is_longer (1); 865 line->is_longer (1);
842 866
843 row = screen.cur.row; 867 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
845 } 869 }
846 870
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 873 c = 0xfffd;
850 874
851 // rely on wcwidth to tell us the character width, do wcwidth before 875 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 876 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 877 // drawing characters below as they might be invalid in the current
854 // locale. 878 // locale.
855 int width = WCWIDTH (c); 879 int width = WCWIDTH (c);
856 880
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 882 {
859 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 884 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
877 } 901 }
878 } 902 }
879 903
880 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
882 906
883 if (width != 0) 907 if (width != 0)
884 { 908 {
885#if !UNICODE_3 909#if !UNICODE_3
… …
890# else 914# else
891 c = 0xfffd; 915 c = 0xfffd;
892# endif 916# endif
893#endif 917#endif
894 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
895 // nuke the character at this position, if required 935 // nuke the character at this position, if required
936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 940 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 941
927 line->touch (); 942 line->touch ();
928 943
929 do 944 do
930 { 945 {
931 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
933 948
934 if (screen.cur.col < ncol - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 950 screen.cur.col++;
936 else 951 else
937 { 952 {
938 line->l = ncol; 953 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
941 break; 956
957 goto end_of_line;
942 } 958 }
943 959
944 c = NOCHAR; 960 c = NOCHAR;
945 } 961 }
946 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
947 963
948 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 966 {
951 line->touch (); 967 line->t[c] = ' ';
968 line->r[c] = rend;
969 }
952 970
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 971end_of_line:
972 ;
973 }
974#if ENABLE_COMBINING
975 else // width == 0
976 {
977 if (c != 0xfeff) // ignore BOM
978 {
979 // handle combining characters
980 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet.
983 line_t *linep;
984 text_t *tp;
985 rend_t *rp;
986
987 if (screen.cur.col > 0)
954 { 988 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 989 linep = line;
990 tp = line->t + screen.cur.col - 1;
991 rp = line->r + screen.cur.col - 1;
957 } 992 }
993 else if (screen.cur.row > 0
994 && ROW(screen.cur.row - 1).is_longer ())
995 {
996 linep = &ROW(screen.cur.row - 1);
997 tp = line->t + ncol - 1;
998 rp = line->r + ncol - 1;
999 }
1000 else
1001 continue;
1002
1003 linep->touch ();
1004
1005 while (*tp == NOCHAR && tp > linep->t)
1006 tp--, rp--;
1007
1008 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c);
1012
1013 *tp = n;
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1015 }
959 } 1016 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1017#endif
1000 }
1001 } 1018 }
1002 1019
1003 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
1004 1021
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
1007#endif
1008} 1023}
1009 1024
1010/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
1011/* 1026/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1027 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
1014 */ 1029 */
1015void 1030void
1016rxvt_term::scr_backspace () NOTHROW 1031rxvt_term::scr_backspace () NOTHROW
1017{ 1032{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
1021 { 1034 {
1022 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
1023 { 1036 {
1024#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1039 --screen.cur.row;
1027 return; 1040
1041 want_refresh = 1;
1028#endif 1042#endif
1029 } 1043 }
1030 } 1044 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
1032 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1049}
1036 1050
1037/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
1038/* 1052/*
1039 * Process Horizontal Tab 1053 * Process Horizontal Tab
… …
1062 x = i; 1076 x = i;
1063 1077
1064 if (!--count) 1078 if (!--count)
1065 break; 1079 break;
1066 } 1080 }
1067 else 1081 else
1068 ht &= l.t[i] == ' ' 1082 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1083 && RS_SAME (l.r[i], base_rend);
1070 1084
1071 if (count) 1085 if (count)
1072 x = ncol - 1; 1086 x = ncol - 1;
… …
1188 } 1202 }
1189 } 1203 }
1190 else 1204 else
1191 { 1205 {
1192 if (screen.flags & Screen_Relative) 1206 if (screen.flags & Screen_Relative)
1207 {
1193 { /* relative origin mode */ 1208 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1209 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1210 min_it (screen.cur.row, screen.bscroll);
1196 } 1211 }
1197 else 1212 else
1198 screen.cur.row = row; 1213 screen.cur.row = row;
… …
1231/* 1246/*
1232 * Erase part or whole of a line 1247 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1250 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1251 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1252 */
1237void 1253void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1255{
1240 unsigned int col, num; 1256 unsigned int col, num;
… …
1249 line.touch (); 1265 line.touch ();
1250 line.is_longer (0); 1266 line.is_longer (0);
1251 1267
1252 switch (mode) 1268 switch (mode)
1253 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1254 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1277 col = screen.cur.col;
1256 num = ncol - col; 1278 num = ncol - col;
1257 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1261 break; 1284 break;
1285
1262 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1263 col = 0; 1287 col = 0;
1264 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1268 break; 1293 break;
1294
1269 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1270 col = 0; 1296 col = 0;
1271 num = ncol; 1297 num = ncol;
1272 line.l = 0; 1298 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1300 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1301 1327
1302 switch (mode) 1328 switch (mode)
1303 { 1329 {
1304 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1305 selection_check (1);
1306 scr_erase_line (0); 1331 scr_erase_line (0);
1307 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1308 num = nrow - row; 1333 num = nrow - row;
1309 break; 1334 break;
1310 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1311 selection_check (3);
1312 scr_erase_line (1); 1336 scr_erase_line (1);
1313 row = 0; 1337 row = 0;
1314 num = screen.cur.row; 1338 num = screen.cur.row;
1315 break; 1339 break;
1316 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1317 selection_check (3);
1318 row = 0; 1341 row = 0;
1319 num = nrow; 1342 num = nrow;
1320 break; 1343 break;
1321 default: 1344 default:
1322 return; 1345 return;
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1354 if (row >= nrow) /* Out Of Bounds */
1332 return; 1355 return;
1333 1356
1334 min_it (num, nrow - row); 1357 min_it (num, nrow - row);
1335 1358
1336 if (rstyle & (RS_RVid | RS_Uline)) 1359 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1360 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1361 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1362 {
1340 ren = DEFAULT_RSTYLE; 1363 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1364
1365 if (mapped)
1366 XClearArea (dpy, vt, 0,
1367 Row2Pixel (row - view_start), (unsigned int)width,
1368 (unsigned int)Height2Pixel (num), False);
1342 } 1369 }
1343 else 1370 else
1344 { 1371 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1372 ren = rstyle & (RS_fgMask | RS_bgMask);
1373
1374 if (mapped)
1375 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1376 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1377 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1378 XFillRectangle (dpy, vt, gc,
1379 0, Row2Pixel (row - view_start),
1380 (unsigned int)width,
1381 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1382 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1384 }
1351 } 1385 }
1352 1386
1353 for (; num--; row++) 1387 for (; num--; row++)
1354 { 1388 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1389 scr_blank_screen_mem (ROW(row), rstyle);
1390
1391 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1392 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1393 }
1358} 1394}
1359 1395
1360#if !ENABLE_MINIMAL 1396#if !ENABLE_MINIMAL
1361void 1397void
… …
1435 * Insert/Delete <count> characters from the current position 1471 * Insert/Delete <count> characters from the current position
1436 */ 1472 */
1437void 1473void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1474rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1475{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1476 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1477 ZERO_SCROLLBACK ();
1445 1478
1446 if (count <= 0) 1479 if (count <= 0)
1447 return; 1480 return;
… …
1449 scr_do_wrap (); 1482 scr_do_wrap ();
1450 1483
1451 selection_check (1); 1484 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1485 min_it (count, ncol - screen.cur.col);
1453 1486
1454 row = screen.cur.row; 1487 int row = screen.cur.row;
1455 1488
1456 line_t *line = &ROW(row); 1489 line_t *line = &ROW(row);
1457 1490
1458 line->touch (); 1491 line->touch ();
1459 line->is_longer (0); 1492 line->is_longer (0);
1460 1493
1494 // nuke wide spanning the start
1495 if (line->t[screen.cur.col] == NOCHAR)
1496 scr_kill_char (*line, screen.cur.col);
1497
1461 switch (insdel) 1498 switch (insdel)
1462 { 1499 {
1463 case INSERT: 1500 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1501 line->l = min (line->l + count, ncol);
1502
1503 if (line->t[screen.cur.col] == NOCHAR)
1504 scr_kill_char (*line, screen.cur.col);
1505
1506 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1507 {
1466 line->t[col] = line->t[col - count]; 1508 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1509 line->r[col] = line->r[col - count];
1468 } 1510 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1511
1472 if (selection.op && current_screen == selection.screen 1512 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1513 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1514 {
1475 if (selection.end.row != screen.cur.row 1515 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1516 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1517 CLEAR_SELECTION ();
1478 else 1518 else
1519 {
1479 { /* shift selection */ 1520 /* shift selection */
1480 selection.beg.col += count; 1521 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1522 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1523 selection.end.col += count;
1483 } 1524 }
1484 } 1525 }
… …
1489 case ERASE: 1530 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1531 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1532 selection_check (1);
1492 screen.cur.col -= count; 1533 screen.cur.col -= count;
1493 1534
1494 line->l = max (line->l - count, 0); 1535 // nuke wide char after 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
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1539 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1540 break;
1497 1541
1498 case DELETE: 1542 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1543 line->l = max (line->l - count, 0);
1500 1544
1545 // nuke wide char spanning the end
1546 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1547 scr_kill_char (*line, screen.cur.col + count);
1548
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1549 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1550 {
1503 line->t[col] = line->t[col + count]; 1551 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1552 line->r[col] = line->r[col + count];
1505 } 1553 }
1506 1554
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1555 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1556
1510 if (selection.op && current_screen == selection.screen 1557 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1558 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1559 {
1513 if (selection.end.row != screen.cur.row 1560 if (selection.end.row != screen.cur.row
… …
1623 */ 1670 */
1624void 1671void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1672rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1673{
1627 if (mode < 0) 1674 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1675 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1676 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1677 tabs [screen.cur.col] = !!mode;
1631} 1678}
1632 1679
1633/* ------------------------------------------------------------------------- */ 1680/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1695 if (rvideo_state != on)
1649 { 1696 {
1650 rvideo_state = on; 1697 rvideo_state = on;
1651 1698
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1699 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1700#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1701 if (bg_pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1702#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1703 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1704
1661 XGCValues gcvalue; 1705 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1706 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1915 return true;
1872} 1916}
1873 1917
1874#ifndef NO_BELL 1918#ifndef NO_BELL
1875void 1919void
1876rxvt_term::bell_cb (time_watcher &w) 1920rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1921{
1878 rvideo_bell = false; 1922 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1923 scr_rvideo_mode (rvideo_mode);
1924 refresh_check ();
1880} 1925}
1881#endif 1926#endif
1882 1927
1883/* ------------------------------------------------------------------------- */ 1928/* ------------------------------------------------------------------------- */
1884void 1929void
… …
1888 1933
1889# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1936 if (option (Opt_mapAlert))
1892# endif 1937# endif
1893 XMapWindow (dpy, parent[0]); 1938 XMapWindow (dpy, parent);
1894# endif 1939# endif
1940
1895# if ENABLE_FRILLS 1941# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1942 if (option (Opt_urgentOnBell))
1897 { 1943 set_urgency (1);
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif 1944# endif
1908 1945
1909 if (option (Opt_visualBell)) 1946 if (option (Opt_visualBell))
1910 { 1947 {
1911 rvideo_bell = true; 1948 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1949 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1950 flush ();
1914 1951
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1952 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1953 }
1917 else 1954 else
1918 XBell (dpy, 0); 1955 XBell (dpy, 0);
1919 1956 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1957#endif
1921} 1958}
1922 1959
1923/* ------------------------------------------------------------------------- */ 1960/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */
1925void 1961void
1926rxvt_term::scr_printscreen (int fullhist) NOTHROW 1962rxvt_term::scr_printscreen (int fullhist) NOTHROW
1927{ 1963{
1928#ifdef PRINTPIPE 1964#ifdef PRINTPIPE
1929 int nrows, row_start; 1965 int nrows, row_start;
1930 FILE *fd; 1966 FILE *fd = popen_printer ();
1931 1967
1932 if ((fd = popen_printer ()) == NULL) 1968 if (!fd)
1933 return; 1969 return;
1934 1970
1935 if (fullhist) 1971 if (fullhist)
1936 { 1972 {
1937 nrows = nrow - top_row; 1973 nrows = nrow - top_row;
… …
1943 row_start = view_start; 1979 row_start = view_start;
1944 } 1980 }
1945 1981
1946 wctomb (0, 0); 1982 wctomb (0, 0);
1947 1983
1948 for (int r1 = 0; r1 < nrows; r1++) 1984 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1985 {
1950 text_t *tp = ROW(r1).t; 1986 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1987 int len = ROW(r1).l;
1952 1988
1953 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1989 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2018 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2019 */
1984void 2020void
1985rxvt_term::scr_refresh () NOTHROW 2021rxvt_term::scr_refresh () NOTHROW
1986{ 2022{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2023 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2024 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2025 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2026#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2027 rend_t cc1; /* store colours at cursor position (s) */
… …
2002 return; 2036 return;
2003 2037
2004 /* 2038 /*
2005 * A: set up vars 2039 * A: set up vars
2006 */ 2040 */
2007 have_bg = 0;
2008 refresh_count = 0; 2041 refresh_count = 0;
2009 2042
2010#if XPM_BACKGROUND 2043 unsigned int old_screen_flags = screen.flags;
2044 bool have_bg = 0;
2045#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2046 have_bg = bg_pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2047#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2049
2018 /* 2050 /*
2019 * B: reverse any characters which are selected 2051 * B: reverse any characters which are selected
2020 */ 2052 */
2021 scr_reverse_selection (); 2053 scr_reverse_selection ();
2022 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2056#if ENABLE_OVERLAY
2057 scr_swap_overlay ();
2058#endif
2059
2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2061
2023 /* 2062 /*
2024 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
2025 */ 2064 */
2026 { 2065 {
2027 unsigned char setoldcursor; 2066 bool setoldcursor;
2028 2067
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2069 if (hidden_cursor)
2032 showcursor = 0; 2070 showcursor = 0;
2033#endif 2071#endif
2034 2072
… …
2062 ccol2 = bgcolor_of (rstyle); 2100 ccol2 = bgcolor_of (rstyle);
2063#else 2101#else
2064 ccol2 = Color_bg; 2102 ccol2 = Color_bg;
2065#endif 2103#endif
2066 2104
2067 if (showcursor && focus) 2105 if (focus)
2068 { 2106 {
2069 if (option (Opt_cursorUnderline)) 2107 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2108 *crp ^= RS_Uline;
2071 else 2109 else
2072 { 2110 {
… …
2107 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2108 } 2146 }
2109 } 2147 }
2110 } 2148 }
2111 2149
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2150#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2151 /*
2119 * D: CopyArea pass - very useful for slower links 2152 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2153 * This has been deliberately kept simple.
2121 */ 2154 */
… …
2210 continue; 2243 continue;
2211 2244
2212 // redraw one or more characters 2245 // redraw one or more characters
2213 2246
2214 // seek to the beginning of wide characters 2247 // seek to the beginning of wide characters
2215 while (stp[col] == NOCHAR && col > 0) 2248 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2216 --col; 2249 --col;
2217 2250
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2252 text_t *text = stp + col;
2220 int count = 1; 2253 int count = 1;
2221 2254
2222 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2223 drp[col] = rend; 2256 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2260 for (i = 0; ++col < ncol; )
2228 { 2261 {
2229 if (stp[col] == NOCHAR) 2262 if (stp[col] == NOCHAR)
2230 { 2263 {
2231 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2232 drp[col] = rend; 2265 drp[col] = srp[col];
2266
2233 count++; 2267 count++;
2234 i++; 2268 i++;
2235 2269
2236 continue; 2270 continue;
2237 } 2271 }
… …
2257 2291
2258 col--; /* went one too far. move back */ 2292 col--; /* went one too far. move back */
2259 count -= i; /* dump any matching trailing chars */ 2293 count -= i; /* dump any matching trailing chars */
2260 2294
2261 // sometimes we optimize away the trailing NOCHAR's, add them back 2295 // sometimes we optimize away the trailing NOCHAR's, add them back
2262 while (i && text[count] == NOCHAR) 2296 while (ecb_unlikely (i && text[count] == NOCHAR))
2263 count++, i--; 2297 count++, i--;
2264 2298
2265 /* 2299 /*
2266 * Determine the attributes for the string 2300 * Determine the attributes for the string
2267 */ 2301 */
2268 int fore = fgcolor_of (rend); // desired foreground 2302 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2303 int back = bgcolor_of (rend); // desired background
2270 2304
2271 // only do special processing if any attributes are set, which is unlikely 2305 // only do special processing if any attributes are set, which is unlikely
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2306 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2273 { 2307 {
2274 bool invert = rend & RS_RVid; 2308 bool invert = rend & RS_RVid;
2275 2309
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2311 if (rend & RS_Bold && fore == Color_fg)
2279 { 2312 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2313 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2314 fore = Color_BD;
2282# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2283 else 2316 else
2284 invert = !invert; 2317 invert = !invert;
2285# endif 2318# endif
2286 } 2319 }
2287 2320
2288 if (rend & RS_Italic 2321 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2322 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2323 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2324 fore = Color_IT;
2293# if !ENABLE_STYLES 2325# if !ENABLE_STYLES
2294 else 2326 else
… …
2298 2330
2299 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2331 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2300 fore = Color_UL; 2332 fore = Color_UL;
2301#endif 2333#endif
2302 2334
2335#ifdef OPTION_HC
2336 if (rend & RS_Sel)
2337 {
2338 /* invert the column if no highlightColor is set or it is the
2339 * current cursor column */
2340 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2341 && ISSET_PIXCOLOR (Color_HC))
2342 {
2343 if (ISSET_PIXCOLOR (Color_HTC))
2344 fore = Color_HTC;
2345 // if invert is 0 reverse video is set so we use bg color as fg color
2346 else if (!invert)
2347 fore = back;
2348
2349 back = Color_HC;
2350 invert = 0;
2351 }
2352 }
2353#endif
2354
2303 if (invert) 2355 if (invert)
2304 { 2356 {
2305#ifdef OPTION_HC
2306 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2307 || !ISSET_PIXCOLOR (Color_HC))
2308#endif
2309 /* invert the column if no highlightColor is set or it is the
2310 * current cursor column */
2311 ::swap (fore, back); 2357 ::swap (fore, back);
2312#ifdef OPTION_HC
2313 else if (ISSET_PIXCOLOR (Color_HC))
2314 back = Color_HC;
2315#endif
2316 2358
2317#ifndef NO_BOLD_UNDERLINE_REVERSE 2359#ifndef NO_BOLD_UNDERLINE_REVERSE
2318# ifndef OPTION_HC
2319 if (ISSET_PIXCOLOR (Color_RV))
2320 back = Color_RV;
2321# endif
2322 if (fore == back) 2360 if (fore == back)
2323 { 2361 {
2324 fore = Color_bg; 2362 fore = Color_bg;
2325 back = Color_fg; 2363 back = Color_fg;
2326 } 2364 }
… …
2328 } 2366 }
2329 2367
2330#ifdef TEXT_BLINK 2368#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2369 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2370 {
2333 if (!text_blink_ev.active) 2371 if (!text_blink_ev.is_active ())
2334 { 2372 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2373 text_blink_ev.again ();
2336 hidden_text = 0; 2374 hidden_text = 0;
2337 } 2375 }
2338 else if (hidden_text) 2376 else if (hidden_text)
2339 fore = back; 2377 fore = back;
2340 } 2378 }
… …
2362 /* 2400 /*
2363 * Actually do the drawing of the string here 2401 * Actually do the drawing of the string here
2364 */ 2402 */
2365 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2403 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2366 2404
2367 if (have_bg && back == Color_bg) 2405 if (ecb_likely (have_bg && back == Color_bg))
2368 { 2406 {
2369 // this is very ugly, maybe push it into ->draw? 2407 // this is very ugly, maybe push it into ->draw?
2370 2408
2371 for (i = 0; i < count; i++) /* don't draw empty strings */ 2409 for (i = 0; i < count; i++) /* don't draw empty strings */
2372 if (text[i] != ' ') 2410 if (text[i] != ' ')
… …
2379 did_clear: ; 2417 did_clear: ;
2380 } 2418 }
2381 else 2419 else
2382 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2420 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2383 2421
2384 if (rend & RS_Uline && font->descent > 1 && fore != back) 2422 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2385 { 2423 {
2386#if ENABLE_FRILLS 2424#if ENABLE_FRILLS
2387 if (ISSET_PIXCOLOR (Color_underline)) 2425 if (ISSET_PIXCOLOR (Color_underline))
2388 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2426 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2389 else 2427 else
2390#endif 2428#endif
2391 XSetForeground (dpy, gc, pix_colors[fore]); 2429 XSetForeground (dpy, gc, pix_colors[fore]);
2392 2430
2393 XDrawLine (dpy, drawBuffer, gc, 2431 XDrawLine (dpy, vt, gc,
2394 xpixel, ypixel + font->ascent + 1, 2432 xpixel, ypixel + font->ascent + 1,
2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2433 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2396 } 2434 }
2397 } /* for (col....) */ 2435 } /* for (col....) */
2398 } /* for (row....) */ 2436 } /* for (row....) */
2399
2400#if ENABLE_OVERLAY
2401 scr_swap_overlay ();
2402#endif
2403 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2404 2437
2405 /* 2438 /*
2406 * G: cleanup cursor and display outline cursor if necessary 2439 * G: cleanup cursor and display outline cursor if necessary
2407 */ 2440 */
2408 if (showcursor) 2441 if (showcursor)
… …
2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2469 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else 2470 else
2438#endif 2471#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]); 2472 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 2473
2441 XDrawRectangle (dpy, drawBuffer, gc, 2474 XDrawRectangle (dpy, vt, gc,
2442 Col2Pixel (col), 2475 Col2Pixel (col),
2443 Row2Pixel (oldcursor.row), 2476 Row2Pixel (oldcursor.row),
2444 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2477 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2478 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2446 } 2479 }
2447 } 2480 }
2448 2481
2449 /* 2482 /*
2450 * H: cleanup selection 2483 * H: cleanup selection
2451 */ 2484 */
2485#if ENABLE_OVERLAY
2486 scr_swap_overlay ();
2487#endif
2488 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2489
2452 scr_reverse_selection (); 2490 scr_reverse_selection ();
2453 2491
2492 screen.flags = old_screen_flags;
2454 num_scr = 0; 2493 num_scr = 0;
2455 num_scr_allow = 1; 2494 num_scr_allow = 1;
2456} 2495}
2457 2496
2458void 2497void
… …
2479 scr_remap_chars (swap_buf [i]); 2518 scr_remap_chars (swap_buf [i]);
2480 } 2519 }
2481} 2520}
2482 2521
2483void 2522void
2484rxvt_term::scr_recolour () NOTHROW 2523rxvt_term::scr_recolour (bool refresh) NOTHROW
2485{ 2524{
2486 if (1 2525 bool transparent = false;
2526
2527#ifdef HAVE_BG_PIXMAP
2528 if (bg_pixmap != None)
2529 {
2487#if ENABLE_TRANSPARENCY 2530# ifdef ENABLE_TRANSPARENCY
2488 && !am_transparent 2531 if (bg_flags & BG_IS_TRANSPARENT)
2532 {
2533 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2534 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2535
2536 transparent = true;
2537 }
2538 else
2489#endif 2539# endif
2490#if XPM_BACKGROUND
2491 && !bgPixmap.pixmap
2492#endif
2493 ) 2540 {
2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2542 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2543 }
2494 { 2544 }
2545 else
2546#endif
2547 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2549 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2550 }
2551
2552 XClearWindow (dpy, parent);
2553
2499 if (scrollBar.win) 2554 if (scrollBar.win)
2500 { 2555 {
2556 if (transparent)
2557 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 else
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2560 scrollBar.state = SB_STATE_IDLE;
2503 scrollbar_show (0); 2561 scrollBar.show (0);
2504 } 2562 }
2505#endif 2563
2564 if (refresh)
2506 } 2565 {
2507
2508 scr_clear (); 2566 scr_clear ();
2509 scr_touch (true); 2567 scr_touch (true);
2568 }
2510 want_refresh = 1; 2569 want_refresh = 1;
2511} 2570}
2512 2571
2513/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2514void 2573void
… …
2582 { 2641 {
2583#if !ENABLE_MINIMAL 2642#if !ENABLE_MINIMAL
2584 if (selection.rect) 2643 if (selection.rect)
2585 scr_xor_rect (selection.beg.row, selection.beg.col, 2644 scr_xor_rect (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2645 selection.end.row, selection.end.col,
2587 RS_RVid, RS_RVid | RS_Uline); 2646 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2588 else 2647 else
2589#endif 2648#endif
2590 scr_xor_span (selection.beg.row, selection.beg.col, 2649 scr_xor_span (selection.beg.row, selection.beg.col,
2591 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2592 RS_RVid); 2651 RS_Sel | RS_RVid);
2593 } 2652 }
2594} 2653}
2595 2654
2596/* ------------------------------------------------------------------------- */ 2655/* ------------------------------------------------------------------------- */
2597/* 2656/*
… …
2602void 2661void
2603rxvt_term::scr_dump (int fd) NOTHROW 2662rxvt_term::scr_dump (int fd) NOTHROW
2604{ 2663{
2605 int row, wrote; 2664 int row, wrote;
2606 unsigned int width, towrite; 2665 unsigned int width, towrite;
2607 char r1[] = "\n"; 2666 const char r1[] = "\n";
2608 2667
2609 for (row = saveLines - nsaved; 2668 for (row = saveLines + top_row;
2610 row < saveLines + nrow - 1; row++) 2669 row < saveLines + nrow - 1; row++)
2611 { 2670 {
2612 width = row_buf[row].l >= 0 ? row_buf[row].l 2671 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : ncol; 2672 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2673 for (towrite = width; towrite; towrite -= wrote)
… …
2629 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2630 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2631void 2690void
2632rxvt_term::selection_check (int check_more) NOTHROW 2691rxvt_term::selection_check (int check_more) NOTHROW
2633{ 2692{
2634 row_col_t pos;
2635
2636 if (!selection.op) 2693 if (!selection.op)
2637 return; 2694 return;
2638 2695
2696 row_col_t pos;
2639 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2640 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2641 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2642 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2643 || (check_more == 1 2702 || (check_more == 1
2644 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2646 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2647 || (check_more == 2 2706 || (check_more == 2
2648 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2649 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2650 || (check_more == 3 2709 || (check_more == 3
2651 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2652 || (check_more == 4 /* screen width change */
2653 && (selection.beg.row != selection.end.row
2654 || selection.end.col > ncol)))
2655 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2656} 2712}
2657 2713
2658/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2659/* 2715/*
2660 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
2661 */ 2717 */
2662void 2718void
2663rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2664{ 2720{
2665 /* convert normal newline chars into common keyboard Return key sequence */ 2721 /* convert normal newline chars into common keyboard Return key sequence */
2666 for (unsigned int i = 0; i < len; i++) 2722 for (unsigned int i = 0; i < len; i++)
2667 if (data[i] == C0_LF) 2723 if (data[i] == C0_LF)
2668 data[i] = C0_CR; 2724 data[i] = C0_CR;
2669 2725
2726 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[200~");
2728
2670 tt_write (data, len); 2729 tt_write (data, len);
2671}
2672 2730
2673/* ------------------------------------------------------------------------- */ 2731 if (priv_modes & PrivMode_BracketPaste)
2674/* 2732 tt_printf ("\e[201~");
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2680{
2681 if (prop == None) /* check for failed XConvertSelection */
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (NOW + 10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838} 2733}
2839 2734
2840void 2735void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2736rxvt_term::paste (char *data, unsigned int len) NOTHROW
2842{ 2737{
2843 selection_wait = Sel_none; 2738 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2739 return;
2856 2740
2857 selection_paste (win, prop, true); 2741 tt_paste (data, len);
2858} 2742}
2859 2743
2860/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2861/* 2745/*
2862 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2863 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * as fallback
2865 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0
2868 * EXT: button 2 release 2749 * EXT: button 2 release
2869 */ 2750 */
2870void 2751void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2753{
2873 if (selection.text && selnum == Sel_Primary) 2754 if (!selection_req)
2874 { /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str));
2877 free (str);
2878 return;
2879 } 2755 {
2880 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2881 { 2758 }
2882 selection_request_time = tm;
2883 selection_wait = Sel_normal;
2884
2885#if X_HAVE_UTF8_STRING
2886 selection_type = Sel_UTF8String;
2887 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2888 return;
2889#else
2890 selection_type = Sel_CompoundText;
2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2892 return;
2893#endif
2894 }
2895
2896 selection_wait = Sel_none; /* don't loop in selection_paste () */
2897 selection_paste (display->root, XA_CUT_BUFFER0, false);
2898}
2899
2900int
2901rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2902{
2903 Atom sel;
2904
2905 selection_type |= selnum;
2906
2907 if (selnum == Sel_Primary)
2908 sel = XA_PRIMARY;
2909 else if (selnum == Sel_Secondary)
2910 sel = XA_SECONDARY;
2911 else
2912 sel = xa[XA_CLIPBOARD];
2913
2914 if (XGetSelectionOwner (dpy, sel) != None)
2915 {
2916 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2917 vt, selection_request_time);
2918 return 1;
2919 }
2920
2921 return 0;
2922} 2759}
2923 2760
2924/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2925/* 2762/*
2926 * Clear all selected text 2763 * Clear all selected text
2927 * EXT: SelectionClear 2764 * EXT: SelectionClear
2928 */ 2765 */
2929void 2766void
2930rxvt_term::selection_clear () NOTHROW 2767rxvt_term::selection_clear (bool clipboard) NOTHROW
2931{ 2768{
2769 if (!clipboard)
2770 {
2932 want_refresh = 1; 2771 want_refresh = 1;
2933 free (selection.text); 2772 free (selection.text);
2934 selection.text = NULL; 2773 selection.text = NULL;
2935 selection.len = 0; 2774 selection.len = 0;
2936 CLEAR_SELECTION (); 2775 CLEAR_SELECTION ();
2937 2776
2938 if (display->selection_owner == this) 2777 if (display->selection_owner == this)
2939 display->selection_owner = 0; 2778 display->selection_owner = 0;
2779 }
2780 else
2781 {
2782 free (selection.clip_text);
2783 selection.clip_text = NULL;
2784 selection.clip_len = 0;
2785
2786 if (display->clipboard_owner == this)
2787 display->clipboard_owner = 0;
2788 }
2940} 2789}
2941 2790
2942/* ------------------------------------------------------------------------- */ 2791/* ------------------------------------------------------------------------- */
2943/* 2792/*
2944 * Copy a selection into the cut buffer 2793 * Copy a selection into the cut buffer
2945 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
2946 */ 2795 */
2947void 2796void
2948rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
2949{ 2798{
2950 int i; 2799 int size;
2951 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
2952 text_t *t; 2801 text_t *t;
2953 2802
2954 switch (selection.op) 2803 switch (selection.op)
2955 { 2804 {
… …
2971 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
2972 2821
2973 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2822 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2974 return; 2823 return;
2975 2824
2976 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2977 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2826 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2978 2827
2979 int ofs = 0; 2828 int ofs = 0;
2980 int extra = 0; 2829 int extra = 0;
2981 2830
2982 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
2988 { 2837 {
2989#if !ENABLE_MINIMAL 2838#if !ENABLE_MINIMAL
2990 if (selection.rect) 2839 if (selection.rect)
2991 { 2840 {
2992 col = selection.beg.col; 2841 col = selection.beg.col;
2993 end_col = ncol + 1; 2842 end_col = selection.end.col;
2994 } 2843 }
2995 else 2844 else
2996#endif 2845#endif
2997 end_col = ROW(row).l; 2846 end_col = ROW(row).l;
2998 2847
2999 col = max (col, 0); 2848 col = max (col, 0);
3000 2849
3001 if (row == selection.end.row 2850 if (row == selection.end.row)
3002#if !ENABLE_MINIMAL
3003 || selection.rect
3004#endif
3005 )
3006 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
3007 2852
3008 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
3009 2854
3010 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
… …
3018 2863
3019 extra -= (len - 1); 2864 extra -= (len - 1);
3020 2865
3021 if (extra < 0) 2866 if (extra < 0)
3022 { 2867 {
3023 extra += i; 2868 extra += size;
3024 i += i; 2869 size += size;
3025 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3026 } 2871 }
3027 2872
3028 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3029 } 2874 }
3030#endif 2875#endif
… …
3042 2887
3043 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3044 } 2889 }
3045 else 2890 else
3046#endif 2891#endif
3047 if (!ROW(row).is_longer () && row != selection.end.row) 2892 if (!ROW(row).is_longer ()
2893 && (row != selection.end.row || end_col != selection.end.col)
2894 && (row != selection.beg.row || selection.beg.col < ncol))
3048 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
3049 } 2896 }
3050
3051 if (end_col != selection.end.col)
3052 new_selection_text[ofs++] = C0_LF;
3053 2897
3054 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
3055 2899
3056 if (ofs == 0) 2900 if (ofs == 0)
3057 { 2901 {
… …
3070 2914
3071 selection_grab (tm); 2915 selection_grab (tm);
3072} 2916}
3073 2917
3074bool 2918bool
3075rxvt_term::selection_grab (Time tm) NOTHROW 2919rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3076{ 2920{
2921 Atom sel;
2922
2923 if (!clipboard)
2924 {
3077 selection_time = tm; 2925 selection_time = tm;
2926 sel = XA_PRIMARY;
2927 }
2928 else
2929 {
2930 clipboard_time = tm;
2931 sel = xa[XA_CLIPBOARD];
2932 }
3078 2933
3079 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2934 XSetSelectionOwner (dpy, sel, vt, tm);
3080 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2935 if (XGetSelectionOwner (dpy, sel) == vt)
3081 { 2936 {
3082 display->set_selection_owner (this); 2937 display->set_selection_owner (this, clipboard);
3083 return true; 2938 return true;
3084 } 2939 }
3085 else 2940 else
3086 { 2941 {
3087 selection_clear (); 2942 selection_clear (clipboard);
3088 return false; 2943 return false;
3089 } 2944 }
3090 2945
3091#if 0 2946#if 0
3092 XTextProperty ct; 2947 XTextProperty ct;
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3000 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 3001
3147 while (selection.mark.col > 0 3002 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3003 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 3004 --selection.mark.col;
3150 3005
3151 if (selection.op) 3006 if (selection.op)
3007 {
3152 { /* clear the old selection */ 3008 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3009 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3010 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3011 }
3156 3012
3157 selection.op = SELECTION_INIT; 3013 selection.op = SELECTION_INIT;
… …
3346 * a point/word/line which is either the start or end of the selection 3202 * a point/word/line which is either the start or end of the selection
3347 * and it was decided by whichever point/word/line was `fixed' at the 3203 * and it was decided by whichever point/word/line was `fixed' at the
3348 * time of the most recent button3 press 3204 * time of the most recent button3 press
3349 */ 3205 */
3350 if (button3 && buttonpress) 3206 if (button3 && buttonpress)
3207 {
3351 { /* button3 press */ 3208 /* button3 press */
3352 /* 3209 /*
3353 * first determine which edge of the selection we are closest to 3210 * first determine which edge of the selection we are closest to
3354 */ 3211 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3212 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3213 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3231 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3232 selection.mark.col = selection.beg.col;
3376 } 3233 }
3377 } 3234 }
3378 else 3235 else
3236 {
3379 { /* button1 drag or button3 drag */ 3237 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3238 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3239 {
3382 if (selection.mark.row == selection.end.row 3240 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3241 && selection.mark.col == selection.end.col
3384 && clickchange 3242 && clickchange
… …
3465 selection.end.row++; 3323 selection.end.row++;
3466 } 3324 }
3467 } 3325 }
3468 3326
3469 if (button3 && buttonpress) 3327 if (button3 && buttonpress)
3328 {
3470 { /* mark may need to be changed */ 3329 /* mark may need to be changed */
3471 if (closeto == LEFT) 3330 if (closeto == LEFT)
3472 { 3331 {
3473 selection.mark.row = selection.end.row; 3332 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3333 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3334 }
… …
3548 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3549 */ 3408 */
3550void 3409void
3551rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3552{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3553 XSelectionEvent ev; 3413 XSelectionEvent ev;
3554 3414
3555 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3556 ev.property = None; 3416 ev.property = None;
3557 ev.display = rq.display; 3417 ev.display = rq.display;
… …
3572 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3573#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3574 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3575#endif 3435#endif
3576 3436
3577 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3578 32, PropModeReplace, 3438 32, PropModeReplace,
3579 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3580 ev.property = rq.property; 3440 ev.property = property;
3581 } 3441 }
3582#if TODO // TODO 3442#if TODO // TODO
3583 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3584 { 3444 {
3585 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3586 } 3446 }
3587#endif 3447#endif
3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3589 { 3449 {
3590 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3591 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3592 ev.property = rq.property; 3452 ev.property = property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3458 ev.property = property;
3593 } 3459 }
3594 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3595 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3596 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3597 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3629 { 3495 {
3630 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3631 style = enc_compound_text; 3497 style = enc_compound_text;
3632 } 3498 }
3633 3499
3634 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3635 { 3501 {
3636 cl = selection.text; 3502 cl = selection.text;
3637 selectlen = selection.len; 3503 selectlen = selection.len;
3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3638 } 3509 }
3639 else 3510 else
3640 { 3511 {
3641 cl = L""; 3512 cl = L"";
3642 selectlen = 0; 3513 selectlen = 0;
… …
3663 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3664 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3665 ct.encoding = target; 3536 ct.encoding = target;
3666 } 3537 }
3667 3538
3668 XChangeProperty (dpy, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3669 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3670 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3671 ev.property = rq.property; 3542 ev.property = property;
3672 3543
3673 if (freect) 3544 if (freect)
3674 XFree (ct.value); 3545 XFree (ct.value);
3675 } 3546 }
3676 3547
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3548 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694} 3549}
3695 3550
3696/* ------------------------------------------------------------------------- */ 3551/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3552#ifdef USE_XIM
3698void 3553void
… …
3726 h += 2; min_it (h, nrow); 3581 h += 2; min_it (h, nrow);
3727 3582
3728 x -= 1; clamp_it (x, 0, ncol - w); 3583 x -= 1; clamp_it (x, 0, ncol - w);
3729 y -= 1; clamp_it (y, 0, nrow - h); 3584 y -= 1; clamp_it (y, 0, nrow - h);
3730 3585
3731 ov_x = x; ov_y = y; 3586 ov.x = x; ov.y = y;
3732 ov_w = w; ov_h = h; 3587 ov.w = w; ov.h = h;
3733 3588
3734 ov_text = new text_t *[h]; 3589 ov.text = new text_t *[h];
3735 ov_rend = new rend_t *[h]; 3590 ov.rend = new rend_t *[h];
3736 3591
3737 for (y = 0; y < h; y++) 3592 for (y = 0; y < h; y++)
3738 { 3593 {
3739 text_t *tp = ov_text[y] = new text_t[w]; 3594 text_t *tp = ov.text[y] = new text_t[w];
3740 rend_t *rp = ov_rend[y] = new rend_t[w]; 3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3741 3596
3742 text_t t0, t1, t2; 3597 text_t t0, t1, t2;
3743 rend_t r = OVERLAY_RSTYLE; 3598 rend_t r = OVERLAY_RSTYLE;
3744 3599
3745 if (y == 0) 3600 if (y == 0)
… …
3764} 3619}
3765 3620
3766void 3621void
3767rxvt_term::scr_overlay_off () NOTHROW 3622rxvt_term::scr_overlay_off () NOTHROW
3768{ 3623{
3769 if (!ov_text) 3624 if (!ov.text)
3770 return; 3625 return;
3771 3626
3772 want_refresh = 1; 3627 want_refresh = 1;
3773 3628
3774 for (int y = 0; y < ov_h; y++) 3629 for (int y = 0; y < ov.h; y++)
3775 { 3630 {
3776 delete [] ov_text[y]; 3631 delete [] ov.text[y];
3777 delete [] ov_rend[y]; 3632 delete [] ov.rend[y];
3778 } 3633 }
3779 3634
3780 delete [] ov_text; ov_text = 0; 3635 delete [] ov.text; ov.text = 0;
3781 delete [] ov_rend; ov_rend = 0; 3636 delete [] ov.rend; ov.rend = 0;
3782} 3637}
3783 3638
3784void 3639void
3785rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3640rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3786{ 3641{
3787 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3788 return; 3643 return;
3789 3644
3790 x++, y++; 3645 x++, y++;
3791 3646
3792 ov_text[y][x] = text; 3647 ov.text[y][x] = text;
3793 ov_rend[y][x] = rend; 3648 ov.rend[y][x] = rend;
3794} 3649}
3795 3650
3796void 3651void
3797rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3798{ 3653{
… …
3817} 3672}
3818 3673
3819void 3674void
3820rxvt_term::scr_swap_overlay () NOTHROW 3675rxvt_term::scr_swap_overlay () NOTHROW
3821{ 3676{
3822 if (!ov_text) 3677 if (!ov.text)
3823 return; 3678 return;
3824 3679
3680 // hide cursor if it is within the overlay area
3681 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3682 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3683 screen.flags &= ~Screen_VisibleCursor;
3684
3825 // swap screen mem with overlay 3685 // swap screen mem with overlay
3826 for (int y = ov_h; y--; ) 3686 for (int y = ov.h; y--; )
3827 { 3687 {
3828 text_t *t1 = ov_text[y]; 3688 text_t *t1 = ov.text[y];
3829 rend_t *r1 = ov_rend[y]; 3689 rend_t *r1 = ov.rend[y];
3830 3690
3831 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3691 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3832 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3692 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3833 3693
3834 for (int x = ov_w; x--; ) 3694 for (int x = ov.w; x--; )
3835 { 3695 {
3836 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3837 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3697 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3838 } 3698 }
3839 } 3699 }

Diff Legend

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