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.261 by root, Sat Feb 18 15:44:26 2006 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC

1/*--------------------------------*-C-*--------------------------------------* 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 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
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
… …
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
… …
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 + nrow, 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{
515 if (!OPTION (Opt_secondaryScreen)) 527 if (!option (Opt_secondaryScreen))
516 return; 528 return;
517 529
518 for (int i = prev_nrow; i--; ) 530 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 531 ::swap (ROW(i), swap_buf [i]);
520 532
… …
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;
550 562
551 scr_swap_screen (); 563 scr_swap_screen ();
552 564
… …
555 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
557 } 569 }
558 else 570 else
559#endif 571#endif
560 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 574}
563 575
564// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
565void 577void
… …
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
… …
624 want_refresh = 1; 636 want_refresh = 1;
625 num_scr += count; 637 num_scr += count;
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 - 1);
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)
674 { 688 {
675 selection.beg.row -= count; 689 selection.beg.row -= count;
676 selection.end.row -= count; 690 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 698 selection.op = SELECTION_CLEAR;
685 } 699 }
686 } 700 }
687 701
688 // finally move the view window, if desired 702 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 703 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 704 && view_start != 0
691 && view_start != -saveLines) 705 && view_start != -saveLines)
692 scr_page (UP, count); 706 scr_page (UP, count);
693 707
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 708 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 726 {
713 /* move selected region too */ 727 /* move selected region too */
714 selection.beg.row -= count; 728 selection.beg.row -= count;
715 selection.end.row -= count; 729 selection.end.row -= count;
716 selection.mark.row -= count; 730 selection.mark.row -= count;
717 731
718 selection_check (0); 732 selection_check (0);
719 } 733 }
720 } 734 }
721 735
722 // use a simple and robust scrolling algorithm, this 736 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 788 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 789 screen.cur.row -= minlines;
776 } 790 }
777 } 791 }
778 792
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 793 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 794 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 795 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 796 int row = screen.cur.row;
785 797
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 798 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 799
788 line_t *line = &ROW(row); 800 line_t *line = &ROW(row);
789 801
790 while (str < strend) 802 while (str < strend)
791 { 803 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 805
794 if (c < 0x20) 806 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 807 if (c == C0_LF)
796 { 808 {
797 max_it (line->l, screen.cur.col); 809 max_it (line->l, screen.cur.col);
798 810
799 screen.flags &= ~Screen_WrapNext; 811 screen.flags &= ~Screen_WrapNext;
… …
818 { 830 {
819 scr_tab (1, true); 831 scr_tab (1, true);
820 continue; 832 continue;
821 } 833 }
822 834
835 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 836 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 838 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 ))
826 { 840 {
827 checksel = 0; 841 checksel = 0;
828 /* 842 /*
829 * If we wrote anywhere in the selected area, kill the selection 843 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 844 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 845 * should be a similar check.
832 */ 846 */
833 CLEAR_SELECTION (); 847 CLEAR_SELECTION ();
834 } 848 }
835 849
836 if (screen.flags & Screen_WrapNext) 850 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 851 {
838 scr_do_wrap (); 852 scr_do_wrap ();
839 853
840 line->l = ncol; 854 line->l = ncol;
841 line->is_longer (1); 855 line->is_longer (1);
842 856
843 row = screen.cur.row; 857 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 858 line = &ROW(row); /* _must_ refresh */
845 } 859 }
846 860
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 861 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 862 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 863 c = 0xfffd;
850 864
851 // rely on wcwidth to tell us the character width, do wcwidth before 865 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 866 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 867 // drawing characters below as they might be invalid in the current
854 // locale. 868 // locale.
855 int width = WCWIDTH (c); 869 int width = WCWIDTH (c);
856 870
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 871 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 872 {
859 // vt100 special graphics and line drawing 873 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 874 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 875 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 876 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 889 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 890 width = 1; // vt100 line drawing characters are always single-width
877 } 891 }
878 } 892 }
879 893
880 if (screen.flags & Screen_Insert) 894 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 895 scr_insdel_chars (width, INSERT);
882 896
883 if (width != 0) 897 if (width != 0)
884 { 898 {
885#if !UNICODE_3 899#if !UNICODE_3
… …
890# else 904# else
891 c = 0xfffd; 905 c = 0xfffd;
892# endif 906# endif
893#endif 907#endif
894 908
909 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
910
911 // if the character doesn't fit into the remaining columns...
912 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
913 {
914 if (screen.flags & Screen_Autowrap)
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 else
922 screen.cur.col = ncol - width;
923 }
924
895 // nuke the character at this position, if required 925 // nuke the character at this position, if required
926 // due to wonderful coincidences everywhere else in this loop
927 // we never have to check for overwriting a wide char itself,
928 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 929 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 930 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 931
927 line->touch (); 932 line->touch ();
928 933
929 do 934 do
930 { 935 {
931 line->t[screen.cur.col] = c; 936 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 937 line->r[screen.cur.col] = rend;
933 938
934 if (screen.cur.col < ncol - 1) 939 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 940 screen.cur.col++;
936 else 941 else
937 { 942 {
938 line->l = ncol; 943 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 945 screen.flags |= Screen_WrapNext;
941 break; 946
947 goto end_of_line;
942 } 948 }
943 949
944 c = NOCHAR; 950 c = NOCHAR;
945 } 951 }
946 while (--width > 0); 952 while (ecb_unlikely (--width > 0));
947 953
948 // pad with spaces when overwriting wide character with smaller one 954 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 955 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 956 {
951 line->touch (); 957 line->t[c] = ' ';
958 line->r[c] = rend;
959 }
952 960
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 961end_of_line:
962 ;
963 }
964#if ENABLE_COMBINING
965 else // width == 0
966 {
967 if (c != 0xfeff) // ignore BOM
968 {
969 // handle combining characters
970 // we just tag the accent on the previous on-screen character.
971 // this is arguably not correct, but also arguably not wrong.
972 // we don't handle double-width characters nicely yet.
973 line_t *linep;
974 text_t *tp;
975 rend_t *rp;
976
977 if (screen.cur.col > 0)
954 { 978 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 979 linep = line;
980 tp = line->t + screen.cur.col - 1;
981 rp = line->r + screen.cur.col - 1;
957 } 982 }
983 else if (screen.cur.row > 0
984 && ROW(screen.cur.row - 1).is_longer ())
985 {
986 linep = &ROW(screen.cur.row - 1);
987 tp = line->t + ncol - 1;
988 rp = line->r + ncol - 1;
989 }
990 else
991 continue;
992
993 linep->touch ();
994
995 while (*tp == NOCHAR && tp > linep->t)
996 tp--, rp--;
997
998 // first try to find a precomposed character
999 unicode_t n = rxvt_compose (*tp, c);
1000 if (n == NOCHAR)
1001 n = rxvt_composite.compose (*tp, c);
1002
1003 *tp = n;
1004 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1005 }
959 } 1006 }
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 1007#endif
1000 }
1001 } 1008 }
1002 1009
1003 max_it (line->l, screen.cur.col); 1010 max_it (line->l, screen.cur.col);
1004 1011
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1012 assert (screen.cur.row >= 0);
1007#endif
1008} 1013}
1009 1014
1010/* ------------------------------------------------------------------------- */ 1015/* ------------------------------------------------------------------------- */
1011/* 1016/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1017 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1018 * XTERM_SEQ: CTRL-H
1014 */ 1019 */
1015void 1020void
1016rxvt_term::scr_backspace () NOTHROW 1021rxvt_term::scr_backspace () NOTHROW
1017{ 1022{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1023 if (screen.cur.col == 0)
1021 { 1024 {
1022 if (screen.cur.row > 0) 1025 if (screen.cur.row > 0)
1023 { 1026 {
1024#ifdef TERMCAP_HAS_BW 1027#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1028 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1029 --screen.cur.row;
1027 return; 1030
1031 want_refresh = 1;
1028#endif 1032#endif
1029 } 1033 }
1030 } 1034 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1035 else if (screen.flags & Screen_WrapNext)
1036 screen.flags &= ~Screen_WrapNext;
1037 else
1032 scr_gotorc (0, -1, RELATIVE); 1038 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1039}
1036 1040
1037/* ------------------------------------------------------------------------- */ 1041/* ------------------------------------------------------------------------- */
1038/* 1042/*
1039 * Process Horizontal Tab 1043 * Process Horizontal Tab
… …
1062 x = i; 1066 x = i;
1063 1067
1064 if (!--count) 1068 if (!--count)
1065 break; 1069 break;
1066 } 1070 }
1067 else 1071 else
1068 ht &= l.t[i] == ' ' 1072 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1073 && RS_SAME (l.r[i], base_rend);
1070 1074
1071 if (count) 1075 if (count)
1072 x = ncol - 1; 1076 x = ncol - 1;
1073 1077
1074 // store horizontal tab commands as characters inside the text 1078 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1079 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1080 if (ht && option (Opt_pastableTabs))
1077 { 1081 {
1078 base_rend = SET_FONT (base_rend, 0); 1082 base_rend = SET_FONT (base_rend, 0);
1079 1083
1080 l.touch (x); 1084 l.touch (x);
1081 1085
… …
1188 } 1192 }
1189 } 1193 }
1190 else 1194 else
1191 { 1195 {
1192 if (screen.flags & Screen_Relative) 1196 if (screen.flags & Screen_Relative)
1197 {
1193 { /* relative origin mode */ 1198 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1199 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1200 min_it (screen.cur.row, screen.bscroll);
1196 } 1201 }
1197 else 1202 else
1198 screen.cur.row = row; 1203 screen.cur.row = row;
… …
1231/* 1236/*
1232 * Erase part or whole of a line 1237 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1238 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1239 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1240 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1241 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1242 */
1237void 1243void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1244rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1245{
1240 unsigned int col, num; 1246 unsigned int col, num;
… …
1249 line.touch (); 1255 line.touch ();
1250 line.is_longer (0); 1256 line.is_longer (0);
1251 1257
1252 switch (mode) 1258 switch (mode)
1253 { 1259 {
1260 case 3:
1261 if (screen.flags & Screen_WrapNext)
1262 return;
1263
1264 /* fall through */
1265
1254 case 0: /* erase to end of line */ 1266 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1267 col = screen.cur.col;
1256 num = ncol - col; 1268 num = ncol - col;
1257 min_it (line.l, col); 1269 min_it (line.l, col);
1270
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1271 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1272 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1273 CLEAR_SELECTION ();
1261 break; 1274 break;
1275
1262 case 1: /* erase to beginning of line */ 1276 case 1: /* erase to beginning of line */
1263 col = 0; 1277 col = 0;
1264 num = screen.cur.col + 1; 1278 num = screen.cur.col + 1;
1279
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1280 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1268 break; 1283 break;
1284
1269 case 2: /* erase whole line */ 1285 case 2: /* erase whole line */
1270 col = 0; 1286 col = 0;
1271 num = ncol; 1287 num = ncol;
1272 line.l = 0; 1288 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1289 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1347 if (row >= nrow) /* Out Of Bounds */
1332 return; 1348 return;
1333 1349
1334 min_it (num, nrow - row); 1350 min_it (num, nrow - row);
1335 1351
1336 if (rstyle & (RS_RVid | RS_Uline)) 1352 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1353 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1354 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1355 {
1340 ren = DEFAULT_RSTYLE; 1356 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1357
1358 if (mapped)
1359 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width,
1361 (unsigned int)Height2Pixel (num), False);
1342 } 1362 }
1343 else 1363 else
1344 { 1364 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1365 ren = rstyle & (RS_fgMask | RS_bgMask);
1366
1367 if (mapped)
1368 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1371 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start),
1373 (unsigned int)width,
1374 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1375 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1376 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 }
1351 } 1378 }
1352 1379
1353 for (; num--; row++) 1380 for (; num--; row++)
1354 { 1381 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1382 scr_blank_screen_mem (ROW(row), rstyle);
1383
1384 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1385 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1386 }
1358} 1387}
1359 1388
1360#if !ENABLE_MINIMAL 1389#if !ENABLE_MINIMAL
1361void 1390void
… …
1435 * Insert/Delete <count> characters from the current position 1464 * Insert/Delete <count> characters from the current position
1436 */ 1465 */
1437void 1466void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1467rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1468{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1469 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1470 ZERO_SCROLLBACK ();
1445 1471
1446 if (count <= 0) 1472 if (count <= 0)
1447 return; 1473 return;
… …
1449 scr_do_wrap (); 1475 scr_do_wrap ();
1450 1476
1451 selection_check (1); 1477 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1478 min_it (count, ncol - screen.cur.col);
1453 1479
1454 row = screen.cur.row; 1480 int row = screen.cur.row;
1455 1481
1456 line_t *line = &ROW(row); 1482 line_t *line = &ROW(row);
1457 1483
1458 line->touch (); 1484 line->touch ();
1459 line->is_longer (0); 1485 line->is_longer (0);
1460 1486
1487 // nuke wide spanning the start
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1461 switch (insdel) 1491 switch (insdel)
1462 { 1492 {
1463 case INSERT: 1493 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1494 line->l = min (line->l + count, ncol);
1495
1496 if (line->t[screen.cur.col] == NOCHAR)
1497 scr_kill_char (*line, screen.cur.col);
1498
1499 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1500 {
1466 line->t[col] = line->t[col - count]; 1501 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1502 line->r[col] = line->r[col - count];
1468 } 1503 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1504
1472 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1507 {
1475 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1509 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1510 CLEAR_SELECTION ();
1478 else 1511 else
1512 {
1479 { /* shift selection */ 1513 /* shift selection */
1480 selection.beg.col += count; 1514 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1515 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1516 selection.end.col += count;
1483 } 1517 }
1484 } 1518 }
… …
1489 case ERASE: 1523 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1524 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1525 selection_check (1);
1492 screen.cur.col -= count; 1526 screen.cur.col -= count;
1493 1527
1494 line->l = max (line->l - count, 0); 1528 // nuke wide char after the end
1529 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col + count);
1531
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1532 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1533 break;
1497 1534
1498 case DELETE: 1535 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1536 line->l = max (line->l - count, 0);
1500 1537
1538 // nuke wide char spanning the end
1539 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1540 scr_kill_char (*line, screen.cur.col + count);
1541
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1542 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1543 {
1503 line->t[col] = line->t[col + count]; 1544 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1545 line->r[col] = line->r[col + count];
1505 } 1546 }
1506 1547
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1548 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1549
1510 if (selection.op && current_screen == selection.screen 1550 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1551 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1552 {
1513 if (selection.end.row != screen.cur.row 1553 if (selection.end.row != screen.cur.row
… …
1623 */ 1663 */
1624void 1664void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1665rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1666{
1627 if (mode < 0) 1667 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1668 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1669 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1670 tabs [screen.cur.col] = !!mode;
1631} 1671}
1632 1672
1633/* ------------------------------------------------------------------------- */ 1673/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1688 if (rvideo_state != on)
1649 { 1689 {
1650 rvideo_state = on; 1690 rvideo_state = on;
1651 1691
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1693#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1694 if (bg_pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1695#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1697
1661 XGCValues gcvalue; 1698 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1908 return true;
1872} 1909}
1873 1910
1874#ifndef NO_BELL 1911#ifndef NO_BELL
1875void 1912void
1876rxvt_term::bell_cb (time_watcher &w) 1913rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1914{
1878 rvideo_bell = false; 1915 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1916 scr_rvideo_mode (rvideo_mode);
1917 refresh_check ();
1880} 1918}
1881#endif 1919#endif
1882 1920
1883/* ------------------------------------------------------------------------- */ 1921/* ------------------------------------------------------------------------- */
1884void 1922void
… …
1886{ 1924{
1887#ifndef NO_BELL 1925#ifndef NO_BELL
1888 1926
1889# ifndef NO_MAPALERT 1927# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1928# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1929 if (option (Opt_mapAlert))
1892# endif 1930# endif
1893 XMapWindow (dpy, parent[0]); 1931 XMapWindow (dpy, parent);
1894# endif 1932# endif
1895 1933
1934# if ENABLE_FRILLS
1935 if (option (Opt_urgentOnBell))
1936 set_urgency (1);
1937# endif
1938
1896 if (OPTION (Opt_visualBell)) 1939 if (option (Opt_visualBell))
1897 { 1940 {
1898 rvideo_bell = true; 1941 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1942 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1943 flush ();
1901 1944
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1945 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1946 }
1904 else 1947 else
1905 XBell (dpy, 0); 1948 XBell (dpy, 0);
1906 1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1950#endif
1908} 1951}
1909 1952
1910/* ------------------------------------------------------------------------- */ 1953/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */
1912void 1954void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1955rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1956{
1915#ifdef PRINTPIPE 1957#ifdef PRINTPIPE
1916 int nrows, row_start; 1958 int nrows, row_start;
1917 FILE *fd; 1959 FILE *fd = popen_printer ();
1918 1960
1919 if ((fd = popen_printer ()) == NULL) 1961 if (!fd)
1920 return; 1962 return;
1921 1963
1922 if (fullhist) 1964 if (fullhist)
1923 { 1965 {
1924 nrows = nrow - top_row; 1966 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1972 row_start = view_start;
1931 } 1973 }
1932 1974
1933 wctomb (0, 0); 1975 wctomb (0, 0);
1934 1976
1935 for (int r1 = 0; r1 < nrows; r1++) 1977 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1978 {
1937 text_t *tp = ROW(r1).t; 1979 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1980 int len = ROW(r1).l;
1939 1981
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1982 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2011 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2012 */
1971void 2013void
1972rxvt_term::scr_refresh () NOTHROW 2014rxvt_term::scr_refresh () NOTHROW
1973{ 2015{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2016 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2017 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2018 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2019#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2020 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2021#endif
1982 rend_t *crp; // cursor rendition pointer 2022 rend_t *crp; // cursor rendition pointer
2023 rend_t ccol1, /* Cursor colour */
2024 ccol2; /* Cursor colour2 */
1983 2025
1984 want_refresh = 0; /* screen is current */ 2026 want_refresh = 0; /* screen is current */
1985 2027
1986 if (refresh_type == NO_REFRESH || !mapped) 2028 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2029 return;
1988 2030
1989 /* 2031 /*
1990 * A: set up vars 2032 * A: set up vars
1991 */ 2033 */
1992 have_bg = 0;
1993 refresh_count = 0; 2034 refresh_count = 0;
1994 2035
1995#if XPM_BACKGROUND 2036 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2039 have_bg = bg_pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2040#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2042
2003 /* 2043 /*
2004 * B: reverse any characters which are selected 2044 * B: reverse any characters which are selected
2005 */ 2045 */
2006 scr_reverse_selection (); 2046 scr_reverse_selection ();
2047
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY
2050 scr_swap_overlay ();
2051#endif
2052
2053 char showcursor = screen.flags & Screen_VisibleCursor;
2007 2054
2008 /* 2055 /*
2009 * C: set the cursor character (s) 2056 * C: set the cursor character (s)
2010 */ 2057 */
2011 { 2058 {
2012 unsigned char setoldcursor; 2059 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2060
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2061#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2062 if (hidden_cursor)
2019 showcursor = 0; 2063 showcursor = 0;
2020#endif 2064#endif
2021 2065
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2070 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2071 col--;
2028 2072
2029 crp = &ROW(screen.cur.row).r[col]; 2073 crp = &ROW(screen.cur.row).r[col];
2030 2074
2031 if (showcursor && focus) 2075#ifndef NO_CURSORCOLOR
2076 cc1 = *crp & (RS_fgMask | RS_bgMask);
2077 if (ISSET_PIXCOLOR (Color_cursor))
2078 ccol1 = Color_cursor;
2079 else
2080#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2082 ccol1 = fgcolor_of (rstyle);
2083#else
2084 ccol1 = Color_fg;
2085#endif
2086
2087#ifndef NO_CURSORCOLOR
2088 if (ISSET_PIXCOLOR (Color_cursor2))
2089 ccol2 = Color_cursor2;
2090 else
2091#endif
2092#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2093 ccol2 = bgcolor_of (rstyle);
2094#else
2095 ccol2 = Color_bg;
2096#endif
2097
2098 if (focus)
2032 { 2099 {
2033 if (OPTION (Opt_cursorUnderline)) 2100 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2101 *crp ^= RS_Uline;
2035 else 2102 else
2036 { 2103 {
2037 *crp ^= RS_RVid; 2104 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2105 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2106 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2107 }
2061 } 2108 }
2062 } 2109 }
2063 2110
2064 /* make sure no outline cursor is left around */ 2111 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2138 oldcursor.col = screen.cur.col;
2092 } 2139 }
2093 } 2140 }
2094 } 2141 }
2095 2142
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2143#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2144 /*
2103 * D: CopyArea pass - very useful for slower links 2145 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2146 * This has been deliberately kept simple.
2105 */ 2147 */
… …
2194 continue; 2236 continue;
2195 2237
2196 // redraw one or more characters 2238 // redraw one or more characters
2197 2239
2198 // seek to the beginning of wide characters 2240 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2241 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2200 --col; 2242 --col;
2201 2243
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2244 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2203 text_t *text = stp + col; 2245 text_t *text = stp + col;
2204 int count = 1; 2246 int count = 1;
2205 2247
2206 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2207 drp[col] = rend; 2249 drp[col] = rend;
… …
2211 for (i = 0; ++col < ncol; ) 2253 for (i = 0; ++col < ncol; )
2212 { 2254 {
2213 if (stp[col] == NOCHAR) 2255 if (stp[col] == NOCHAR)
2214 { 2256 {
2215 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2216 drp[col] = rend; 2258 drp[col] = srp[col];
2259
2217 count++; 2260 count++;
2218 i++; 2261 i++;
2219 2262
2220 continue; 2263 continue;
2221 } 2264 }
… …
2241 2284
2242 col--; /* went one too far. move back */ 2285 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2286 count -= i; /* dump any matching trailing chars */
2244 2287
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2288 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2289 while (ecb_unlikely (i && text[count] == NOCHAR))
2247 count++, i--; 2290 count++, i--;
2248 2291
2249 /* 2292 /*
2250 * Determine the attributes for the string 2293 * Determine the attributes for the string
2251 */ 2294 */
2252 int fore = fgcolor_of (rend); // desired foreground 2295 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2296 int back = bgcolor_of (rend); // desired background
2254 2297
2255 // only do special processing if any attributes are set, which is unlikely 2298 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2299 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2257 { 2300 {
2258#if ENABLE_STYLES
2259 // "careful" (too wide) character handling
2260
2261 // include previous careful character(s) if possible, looks nicer (best effort...)
2262 while (text > stp
2263 && srp[text - stp - 1] & RS_Careful
2264 && RS_SAME (rend, srp[text - stp - 1]))
2265 text--, count++, xpixel -= fwidth;
2266
2267 // force redraw after "careful" characters to avoid pixel droppings
2268 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2269 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2270
2271 // force redraw before "careful" characters to avoid pixel droppings
2272 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2273 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2274#endif
2275
2276 bool invert = rend & RS_RVid; 2301 bool invert = rend & RS_RVid;
2277 2302
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2303#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2304 if (rend & RS_Bold && fore == Color_fg)
2281 { 2305 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2306 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2307 fore = Color_BD;
2284# if !ENABLE_STYLES 2308# if !ENABLE_STYLES
2285 else 2309 else
2286 invert = !invert; 2310 invert = !invert;
2287# endif 2311# endif
2288 } 2312 }
2289 2313
2290 if (rend & RS_Italic 2314 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2315 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2316 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2317 fore = Color_IT;
2295# if !ENABLE_STYLES 2318# if !ENABLE_STYLES
2296 else 2319 else
2297 invert = !invert; 2320 invert = !invert;
2298# endif 2321# endif
2299 } 2322 }
2300 2323
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2324 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2325 fore = Color_UL;
2326#endif
2327
2328#ifdef OPTION_HC
2329 if (rend & RS_Sel)
2330 {
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2334 && ISSET_PIXCOLOR (Color_HC))
2335 {
2336 if (ISSET_PIXCOLOR (Color_HTC))
2337 fore = Color_HTC;
2338 // if invert is 0 reverse video is set so we use bg color as fg color
2339 else if (!invert)
2340 fore = back;
2341
2342 back = Color_HC;
2343 invert = 0;
2344 }
2345 }
2303#endif 2346#endif
2304 2347
2305 if (invert) 2348 if (invert)
2306 { 2349 {
2307 ::swap (fore, back); 2350 ::swap (fore, back);
2308 2351
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2352#ifndef NO_BOLD_UNDERLINE_REVERSE
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312
2313 if (fore == back) 2353 if (fore == back)
2314 { 2354 {
2315 fore = Color_bg; 2355 fore = Color_bg;
2316 back = Color_fg; 2356 back = Color_fg;
2317 } 2357 }
… …
2319 } 2359 }
2320 2360
2321#ifdef TEXT_BLINK 2361#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2363 {
2324 if (!text_blink_ev.active) 2364 if (!text_blink_ev.is_active ())
2325 { 2365 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2366 text_blink_ev.again ();
2327 hidden_text = 0; 2367 hidden_text = 0;
2328 } 2368 }
2329 else if (hidden_text) 2369 else if (hidden_text)
2330 fore = back; 2370 fore = back;
2331 } 2371 }
2332#endif 2372#endif
2373
2374#if ENABLE_STYLES
2375 // "careful" (too wide) character handling
2376
2377 // include previous careful character(s) if possible, looks nicer (best effort...)
2378 while (text > stp
2379 && srp[text - stp - 1] & RS_Careful
2380 && RS_SAME (rend, srp[text - stp - 1]))
2381 text--, count++, xpixel -= fwidth;
2382
2383 // force redraw after "careful" characters to avoid pixel droppings
2384 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2385 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2386
2387 // force redraw before "careful" characters to avoid pixel droppings
2388 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2389 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2390#endif
2333 } 2391 }
2334 2392
2335 /* 2393 /*
2336 * Actually do the drawing of the string here 2394 * Actually do the drawing of the string here
2337 */ 2395 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2396 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2397
2340 if (back == fore) 2398 if (ecb_likely (have_bg && back == Color_bg))
2341 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2342 else if (back == Color_bg && have_bg)
2343 { 2399 {
2344 // this is very ugly, maybe push it into ->draw? 2400 // this is very ugly, maybe push it into ->draw?
2345 2401
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2402 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2403 if (text[i] != ' ')
2348 { 2404 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2406 goto did_clear;
2351 } 2407 }
2352 2408
2353 CLEAR_CHARS (xpixel, ypixel, count); 2409 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2410 did_clear: ;
2355 } 2411 }
2356 else 2412 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2414
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2416 {
2361#if ENABLE_FRILLS 2417#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2418 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2419 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2420 else
2365#endif 2421#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2422 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2423
2368 XDrawLine (dpy, drawBuffer, gc, 2424 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2427 }
2372 } /* for (col....) */ 2428 } /* for (col....) */
2373 } /* for (row....) */ 2429 } /* for (row....) */
2374 2430
2375#if ENABLE_OVERLAY
2376 scr_swap_overlay ();
2377#endif
2378 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2379
2380 /* 2431 /*
2381 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2382 */ 2433 */
2383 if (showcursor) 2434 if (showcursor)
2384 { 2435 {
2385 if (focus) 2436 if (focus)
2386 { 2437 {
2387 if (OPTION (Opt_cursorUnderline)) 2438 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2439 *crp ^= RS_Uline;
2389 else 2440 else
2390 { 2441 {
2391 *crp ^= RS_RVid; 2442 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2458 cursorwidth++;
2408 2459
2409#ifndef NO_CURSORCOLOR 2460#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2461 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2462 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2463 else
2412#endif 2464#endif
2465 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2466
2414 XDrawRectangle (dpy, drawBuffer, gc, 2467 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2468 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2469 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2470 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2472 }
2420 } 2473 }
2421 2474
2422 /* 2475 /*
2423 * H: cleanup selection 2476 * H: cleanup selection
2424 */ 2477 */
2478#if ENABLE_OVERLAY
2479 scr_swap_overlay ();
2480#endif
2481 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2482
2425 scr_reverse_selection (); 2483 scr_reverse_selection ();
2426 2484
2485 screen.flags = old_screen_flags;
2427 num_scr = 0; 2486 num_scr = 0;
2428 num_scr_allow = 1; 2487 num_scr_allow = 1;
2429} 2488}
2430 2489
2431void 2490void
… …
2452 scr_remap_chars (swap_buf [i]); 2511 scr_remap_chars (swap_buf [i]);
2453 } 2512 }
2454} 2513}
2455 2514
2456void 2515void
2457rxvt_term::scr_recolour () NOTHROW 2516rxvt_term::scr_recolour (bool refresh) NOTHROW
2458{ 2517{
2459 if (1 2518 bool transparent = false;
2460#if TRANSPARENT 2519
2461 && !am_transparent 2520#ifdef HAVE_BG_PIXMAP
2521 if (bg_pixmap != None)
2522 {
2523# ifdef ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT)
2525 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528
2529 transparent = true;
2530 }
2531 else
2462#endif 2532# endif
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 ) 2533 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2536 }
2467 { 2537 }
2538 else
2539#endif
2540 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2542 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2543 }
2544
2545 XClearWindow (dpy, parent);
2546
2472 if (scrollBar.win) 2547 if (scrollBar.win)
2473 { 2548 {
2549 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2553 scrollBar.state = STATE_IDLE;
2476 scrollbar_show (0); 2554 scrollBar.show (0);
2477 } 2555 }
2478#endif 2556
2557 if (refresh)
2479 } 2558 {
2480
2481 scr_clear (); 2559 scr_clear ();
2482 scr_touch (true); 2560 scr_touch (true);
2561 }
2483 want_refresh = 1; 2562 want_refresh = 1;
2484} 2563}
2485 2564
2486/* ------------------------------------------------------------------------- */ 2565/* ------------------------------------------------------------------------- */
2487void 2566void
… …
2555 { 2634 {
2556#if !ENABLE_MINIMAL 2635#if !ENABLE_MINIMAL
2557 if (selection.rect) 2636 if (selection.rect)
2558 scr_xor_rect (selection.beg.row, selection.beg.col, 2637 scr_xor_rect (selection.beg.row, selection.beg.col,
2559 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2560 RS_RVid, RS_RVid | RS_Uline); 2639 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2561 else 2640 else
2562#endif 2641#endif
2563 scr_xor_span (selection.beg.row, selection.beg.col, 2642 scr_xor_span (selection.beg.row, selection.beg.col,
2564 selection.end.row, selection.end.col, 2643 selection.end.row, selection.end.col,
2565 RS_RVid); 2644 RS_Sel | RS_RVid);
2566 } 2645 }
2567} 2646}
2568 2647
2569/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2570/* 2649/*
… …
2575void 2654void
2576rxvt_term::scr_dump (int fd) NOTHROW 2655rxvt_term::scr_dump (int fd) NOTHROW
2577{ 2656{
2578 int row, wrote; 2657 int row, wrote;
2579 unsigned int width, towrite; 2658 unsigned int width, towrite;
2580 char r1[] = "\n"; 2659 const char r1[] = "\n";
2581 2660
2582 for (row = saveLines - nsaved; 2661 for (row = saveLines + top_row;
2583 row < saveLines + nrow - 1; row++) 2662 row < saveLines + nrow - 1; row++)
2584 { 2663 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l 2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol; 2665 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote) 2666 for (towrite = width; towrite; towrite -= wrote)
… …
2631/* ------------------------------------------------------------------------- */ 2710/* ------------------------------------------------------------------------- */
2632/* 2711/*
2633 * Paste a selection direct to the command fd 2712 * Paste a selection direct to the command fd
2634 */ 2713 */
2635void 2714void
2636rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2637{ 2716{
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2717 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2718 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2719 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2720 data[i] = C0_CR;
2642 2721
2722 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~");
2724
2643 tt_write (data, len); 2725 tt_write (data, len);
2644}
2645 2726
2646/* ------------------------------------------------------------------------- */ 2727 if (priv_modes & PrivMode_BracketPaste)
2647/* 2728 tt_printf ("\e[201~");
2648 * Respond to a notification that a primary selection has been sent
2649 * EXT: SelectionNotify
2650 */
2651void
2652rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2653{
2654 if (prop == None) /* check for failed XConvertSelection */
2655 {
2656 if ((selection_type & Sel_CompoundText))
2657 {
2658 int selnum = selection_type & Sel_whereMask;
2659
2660 selection_type = 0;
2661 if (selnum != Sel_direct)
2662 selection_request_other (XA_STRING, selnum);
2663 }
2664
2665 if ((selection_type & Sel_UTF8String))
2666 {
2667 int selnum = selection_type & Sel_whereMask;
2668
2669 selection_type = Sel_CompoundText;
2670 if (selnum != Sel_direct)
2671 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2672 else
2673 selection_type = 0;
2674 }
2675
2676 return;
2677 }
2678
2679 unsigned long bytes_after;
2680 XTextProperty ct;
2681
2682 if (XGetWindowProperty (dpy, win, prop,
2683 0, PROP_SIZE / 4,
2684 delete_prop, AnyPropertyType,
2685 &ct.encoding, &ct.format,
2686 &ct.nitems, &bytes_after,
2687 &ct.value) != Success)
2688 {
2689 ct.value = 0;
2690 goto bailout;
2691 }
2692
2693 if (ct.encoding == None)
2694 goto bailout;
2695
2696 if (bytes_after)
2697 {
2698 // fetch and append remaining data
2699 XTextProperty ct2;
2700
2701 if (XGetWindowProperty (dpy, win, prop,
2702 ct.nitems / 4, (bytes_after + 3) / 4,
2703 delete_prop, AnyPropertyType,
2704 &ct2.encoding, &ct2.format,
2705 &ct2.nitems, &bytes_after,
2706 &ct2.value) != Success)
2707 goto bailout;
2708
2709 // realloc should be compatible to XFree, here, and elsewhere, too
2710 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2711 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2712 ct.nitems += ct2.nitems;
2713
2714 XFree (ct2.value);
2715 }
2716
2717 if (ct.value == 0)
2718 goto bailout;
2719
2720 if (ct.encoding == xa[XA_INCR])
2721 {
2722 // INCR selection, start handshake
2723 if (!delete_prop)
2724 XDeleteProperty (dpy, win, prop);
2725
2726 selection_wait = Sel_incr;
2727 incr_buf_fill = 0;
2728 incr_ev.start (NOW + 10);
2729
2730 goto bailout;
2731 }
2732
2733 if (ct.nitems == 0)
2734 {
2735 if (selection_wait == Sel_incr)
2736 {
2737 XFree (ct.value);
2738
2739 // finally complete, now paste the whole thing
2740 selection_wait = Sel_normal;
2741 ct.value = (unsigned char *)incr_buf;
2742 ct.nitems = incr_buf_fill;
2743 incr_buf = 0;
2744 incr_buf_size = 0;
2745 incr_ev.stop ();
2746 }
2747 else
2748 {
2749 if (selection_wait == Sel_normal
2750 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2751 {
2752 /*
2753 * pass through again trying CUT_BUFFER0 if we've come from
2754 * XConvertSelection () but nothing was presented
2755 */
2756 selection_paste (display->root, XA_CUT_BUFFER0, False);
2757 }
2758
2759 goto bailout;
2760 }
2761 }
2762 else if (selection_wait == Sel_incr)
2763 {
2764 incr_ev.start (NOW + 10);
2765
2766 while (incr_buf_fill + ct.nitems > incr_buf_size)
2767 {
2768 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2769 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2770 }
2771
2772 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2773 incr_buf_fill += ct.nitems;
2774
2775 goto bailout;
2776 }
2777
2778 char **cl;
2779 int cr;
2780
2781#if !ENABLE_MINIMAL
2782 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2783 // so recode it manually
2784 if (ct.encoding == xa[XA_UTF8_STRING])
2785 {
2786 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2787 char *s = rxvt_wcstombs (w);
2788 free (w);
2789 // TODO: strlen == only the first element will be converted. well...
2790 paste (s, strlen (s));
2791 free (s);
2792 }
2793 else
2794#endif
2795 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2796 && cl)
2797 {
2798 for (int i = 0; i < cr; i++)
2799 paste (cl[i], strlen (cl[i]));
2800
2801 XFreeStringList (cl);
2802 }
2803 else
2804 paste ((char *)ct.value, ct.nitems); // paste raw
2805
2806bailout:
2807 XFree (ct.value);
2808
2809 if (selection_wait == Sel_normal)
2810 selection_wait = Sel_none;
2811} 2729}
2812 2730
2813void 2731void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2732rxvt_term::paste (char *data, unsigned int len) NOTHROW
2815{ 2733{
2816 selection_wait = Sel_none; 2734 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2817
2818 incr_buf_size = 0;
2819 free (incr_buf);
2820
2821 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2822}
2823
2824void
2825rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2826{
2827 if (prop == None || selection_wait != Sel_incr)
2828 return; 2735 return;
2829 2736
2830 selection_paste (win, prop, true); 2737 tt_paste (data, len);
2831} 2738}
2832 2739
2833/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2834/* 2741/*
2835 * Request the current selection: 2742 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2836 * Order: > internal selection if available 2743 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2744 * as fallback
2838 * > CUT_BUFFER0
2839 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2840 * will auto fallback to CUT_BUFFER0
2841 * EXT: button 2 release 2745 * EXT: button 2 release
2842 */ 2746 */
2843void 2747void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2748rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2749{
2846 if (selection.text && selnum == Sel_Primary) 2750 if (!selection_req)
2847 { /* internal selection */
2848 char *str = rxvt_wcstombs (selection.text, selection.len);
2849 paste (str, strlen (str));
2850 free (str);
2851 return;
2852 } 2751 {
2853 else 2752 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2753 selection_req->run ();
2854 { 2754 }
2855 selection_request_time = tm;
2856 selection_wait = Sel_normal;
2857
2858#if X_HAVE_UTF8_STRING
2859 selection_type = Sel_UTF8String;
2860 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2861 return;
2862#else
2863 selection_type = Sel_CompoundText;
2864 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2865 return;
2866#endif
2867 }
2868
2869 selection_wait = Sel_none; /* don't loop in selection_paste () */
2870 selection_paste (display->root, XA_CUT_BUFFER0, false);
2871}
2872
2873int
2874rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2875{
2876 Atom sel;
2877
2878 selection_type |= selnum;
2879
2880 if (selnum == Sel_Primary)
2881 sel = XA_PRIMARY;
2882 else if (selnum == Sel_Secondary)
2883 sel = XA_SECONDARY;
2884 else
2885 sel = xa[XA_CLIPBOARD];
2886
2887 if (XGetSelectionOwner (dpy, sel) != None)
2888 {
2889 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2890 vt, selection_request_time);
2891 return 1;
2892 }
2893
2894 return 0;
2895} 2755}
2896 2756
2897/* ------------------------------------------------------------------------- */ 2757/* ------------------------------------------------------------------------- */
2898/* 2758/*
2899 * Clear all selected text 2759 * Clear all selected text
2900 * EXT: SelectionClear 2760 * EXT: SelectionClear
2901 */ 2761 */
2902void 2762void
2903rxvt_term::selection_clear () NOTHROW 2763rxvt_term::selection_clear (bool clipboard) NOTHROW
2904{ 2764{
2765 if (!clipboard)
2766 {
2905 want_refresh = 1; 2767 want_refresh = 1;
2906 free (selection.text); 2768 free (selection.text);
2907 selection.text = NULL; 2769 selection.text = NULL;
2908 selection.len = 0; 2770 selection.len = 0;
2909 CLEAR_SELECTION (); 2771 CLEAR_SELECTION ();
2910 2772
2911 if (display->selection_owner == this) 2773 if (display->selection_owner == this)
2912 display->selection_owner = 0; 2774 display->selection_owner = 0;
2775 }
2776 else
2777 {
2778 free (selection.clip_text);
2779 selection.clip_text = NULL;
2780 selection.clip_len = 0;
2781
2782 if (display->clipboard_owner == this)
2783 display->clipboard_owner = 0;
2784 }
2913} 2785}
2914 2786
2915/* ------------------------------------------------------------------------- */ 2787/* ------------------------------------------------------------------------- */
2916/* 2788/*
2917 * Copy a selection into the cut buffer 2789 * Copy a selection into the cut buffer
2918 * EXT: button 1 or 3 release 2790 * EXT: button 1 or 3 release
2919 */ 2791 */
2920void 2792void
2921rxvt_term::selection_make (Time tm) 2793rxvt_term::selection_make (Time tm)
2922{ 2794{
2923 int i; 2795 int size;
2924 wchar_t *new_selection_text; 2796 wchar_t *new_selection_text;
2925 text_t *t; 2797 text_t *t;
2926 2798
2927 switch (selection.op) 2799 switch (selection.op)
2928 { 2800 {
… …
2944 return; /* nothing selected, go away */ 2816 return; /* nothing selected, go away */
2945 2817
2946 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2818 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2947 return; 2819 return;
2948 2820
2949 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2821 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2950 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2822 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2951 2823
2952 int ofs = 0; 2824 int ofs = 0;
2953 int extra = 0; 2825 int extra = 0;
2954 2826
2955 int col = selection.beg.col; 2827 int col = selection.beg.col;
… …
2961 { 2833 {
2962#if !ENABLE_MINIMAL 2834#if !ENABLE_MINIMAL
2963 if (selection.rect) 2835 if (selection.rect)
2964 { 2836 {
2965 col = selection.beg.col; 2837 col = selection.beg.col;
2966 end_col = ncol + 1; 2838 end_col = selection.end.col;
2967 } 2839 }
2968 else 2840 else
2969#endif 2841#endif
2970 end_col = ROW(row).l; 2842 end_col = ROW(row).l;
2971 2843
2972 col = max (col, 0); 2844 col = max (col, 0);
2973 2845
2974 if (row == selection.end.row 2846 if (row == selection.end.row)
2975#if !ENABLE_MINIMAL
2976 || selection.rect
2977#endif
2978 )
2979 min_it (end_col, selection.end.col); 2847 min_it (end_col, selection.end.col);
2980 2848
2981 t = ROW(row).t + col; 2849 t = ROW(row).t + col;
2982 2850
2983 for (; col < end_col; col++) 2851 for (; col < end_col; col++)
… …
2991 2859
2992 extra -= (len - 1); 2860 extra -= (len - 1);
2993 2861
2994 if (extra < 0) 2862 if (extra < 0)
2995 { 2863 {
2996 extra += i; 2864 extra += size;
2997 i += i; 2865 size += size;
2998 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2866 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2999 } 2867 }
3000 2868
3001 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2869 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3002 } 2870 }
3003#endif 2871#endif
… …
3015 2883
3016 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3017 } 2885 }
3018 else 2886 else
3019#endif 2887#endif
3020 if (!ROW(row).is_longer () && row != selection.end.row) 2888 if (!ROW(row).is_longer ()
2889 && (row != selection.end.row || end_col != selection.end.col)
2890 && (row != selection.beg.row || selection.beg.col < ncol))
3021 new_selection_text[ofs++] = C0_LF; 2891 new_selection_text[ofs++] = C0_LF;
3022 } 2892 }
3023
3024 if (end_col != selection.end.col)
3025 new_selection_text[ofs++] = C0_LF;
3026 2893
3027 new_selection_text[ofs] = 0; 2894 new_selection_text[ofs] = 0;
3028 2895
3029 if (ofs == 0) 2896 if (ofs == 0)
3030 { 2897 {
… …
3043 2910
3044 selection_grab (tm); 2911 selection_grab (tm);
3045} 2912}
3046 2913
3047bool 2914bool
3048rxvt_term::selection_grab (Time tm) NOTHROW 2915rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3049{ 2916{
2917 Atom sel;
2918
2919 if (!clipboard)
2920 {
3050 selection_time = tm; 2921 selection_time = tm;
2922 sel = XA_PRIMARY;
2923 }
2924 else
2925 {
2926 clipboard_time = tm;
2927 sel = xa[XA_CLIPBOARD];
2928 }
3051 2929
3052 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2930 XSetSelectionOwner (dpy, sel, vt, tm);
3053 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2931 if (XGetSelectionOwner (dpy, sel) == vt)
3054 { 2932 {
3055 display->set_selection_owner (this); 2933 display->set_selection_owner (this, clipboard);
3056 return true; 2934 return true;
3057 } 2935 }
3058 else 2936 else
3059 { 2937 {
3060 selection_clear (); 2938 selection_clear (clipboard);
3061 return false; 2939 return false;
3062 } 2940 }
3063 2941
3064#if 0 2942#if 0
3065 XTextProperty ct; 2943 XTextProperty ct;
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2996 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 2997
3120 while (selection.mark.col > 0 2998 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2999 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 3000 --selection.mark.col;
3123 3001
3124 if (selection.op) 3002 if (selection.op)
3003 {
3125 { /* clear the old selection */ 3004 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 3005 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 3006 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 3007 }
3129 3008
3130 selection.op = SELECTION_INIT; 3009 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3198 * a point/word/line which is either the start or end of the selection
3320 * and it was decided by whichever point/word/line was `fixed' at the 3199 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3200 * time of the most recent button3 press
3322 */ 3201 */
3323 if (button3 && buttonpress) 3202 if (button3 && buttonpress)
3203 {
3324 { /* button3 press */ 3204 /* button3 press */
3325 /* 3205 /*
3326 * first determine which edge of the selection we are closest to 3206 * first determine which edge of the selection we are closest to
3327 */ 3207 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3208 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3209 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3227 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3228 selection.mark.col = selection.beg.col;
3349 } 3229 }
3350 } 3230 }
3351 else 3231 else
3232 {
3352 { /* button1 drag or button3 drag */ 3233 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3234 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3235 {
3355 if (selection.mark.row == selection.end.row 3236 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3237 && selection.mark.col == selection.end.col
3357 && clickchange 3238 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3281 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3282 }
3402 else if (selection.clicks == 3) 3283 else if (selection.clicks == 3)
3403 { 3284 {
3404#if ENABLE_FRILLS 3285#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3286 if (option (Opt_tripleclickwords))
3406 { 3287 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3288 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3289
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3290 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3291 {
… …
3438 selection.end.row++; 3319 selection.end.row++;
3439 } 3320 }
3440 } 3321 }
3441 3322
3442 if (button3 && buttonpress) 3323 if (button3 && buttonpress)
3324 {
3443 { /* mark may need to be changed */ 3325 /* mark may need to be changed */
3444 if (closeto == LEFT) 3326 if (closeto == LEFT)
3445 { 3327 {
3446 selection.mark.row = selection.end.row; 3328 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3329 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3330 }
… …
3521 * EXT: SelectionRequest 3403 * EXT: SelectionRequest
3522 */ 3404 */
3523void 3405void
3524rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3525{ 3407{
3408 Atom property = rq.property == None ? rq.target : rq.property;
3526 XSelectionEvent ev; 3409 XSelectionEvent ev;
3527 3410
3528 ev.type = SelectionNotify; 3411 ev.type = SelectionNotify;
3529 ev.property = None; 3412 ev.property = None;
3530 ev.display = rq.display; 3413 ev.display = rq.display;
… …
3545 *target++ = xa[XA_COMPOUND_TEXT]; 3428 *target++ = xa[XA_COMPOUND_TEXT];
3546#if X_HAVE_UTF8_STRING 3429#if X_HAVE_UTF8_STRING
3547 *target++ = xa[XA_UTF8_STRING]; 3430 *target++ = xa[XA_UTF8_STRING];
3548#endif 3431#endif
3549 3432
3550 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3433 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3551 32, PropModeReplace, 3434 32, PropModeReplace,
3552 (unsigned char *)target_list, target - target_list); 3435 (unsigned char *)target_list, target - target_list);
3553 ev.property = rq.property; 3436 ev.property = property;
3554 } 3437 }
3555#if TODO // TODO 3438#if TODO // TODO
3556 else if (rq.target == xa[XA_MULTIPLE]) 3439 else if (rq.target == xa[XA_MULTIPLE])
3557 { 3440 {
3558 /* TODO: Handle MULTIPLE */ 3441 /* TODO: Handle MULTIPLE */
3559 } 3442 }
3560#endif 3443#endif
3561 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3444 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3562 { 3445 {
3563 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3446 XChangeProperty (dpy, rq.requestor, property, rq.target,
3564 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3447 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3565 ev.property = rq.property; 3448 ev.property = property;
3449 }
3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3451 {
3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3453 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3454 ev.property = property;
3566 } 3455 }
3567 else if (rq.target == XA_STRING 3456 else if (rq.target == XA_STRING
3568 || rq.target == xa[XA_TEXT] 3457 || rq.target == xa[XA_TEXT]
3569 || rq.target == xa[XA_COMPOUND_TEXT] 3458 || rq.target == xa[XA_COMPOUND_TEXT]
3570 || rq.target == xa[XA_UTF8_STRING] 3459 || rq.target == xa[XA_UTF8_STRING]
… …
3602 { 3491 {
3603 target = xa[XA_COMPOUND_TEXT]; 3492 target = xa[XA_COMPOUND_TEXT];
3604 style = enc_compound_text; 3493 style = enc_compound_text;
3605 } 3494 }
3606 3495
3607 if (selection.text) 3496 if (rq.selection == XA_PRIMARY && selection.text)
3608 { 3497 {
3609 cl = selection.text; 3498 cl = selection.text;
3610 selectlen = selection.len; 3499 selectlen = selection.len;
3500 }
3501 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3502 {
3503 cl = selection.clip_text;
3504 selectlen = selection.clip_len;
3611 } 3505 }
3612 else 3506 else
3613 { 3507 {
3614 cl = L""; 3508 cl = L"";
3615 selectlen = 0; 3509 selectlen = 0;
… …
3636 ct.value = (unsigned char *)cl; 3530 ct.value = (unsigned char *)cl;
3637 ct.nitems = selectlen; 3531 ct.nitems = selectlen;
3638 ct.encoding = target; 3532 ct.encoding = target;
3639 } 3533 }
3640 3534
3641 XChangeProperty (dpy, rq.requestor, rq.property, 3535 XChangeProperty (dpy, rq.requestor, property,
3642 ct.encoding, 8, PropModeReplace, 3536 ct.encoding, 8, PropModeReplace,
3643 ct.value, (int)ct.nitems); 3537 ct.value, (int)ct.nitems);
3644 ev.property = rq.property; 3538 ev.property = property;
3645 3539
3646 if (freect) 3540 if (freect)
3647 XFree (ct.value); 3541 XFree (ct.value);
3648 } 3542 }
3649 3543
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3651}
3652
3653/* ------------------------------------------------------------------------- *
3654 * MOUSE ROUTINES *
3655 * ------------------------------------------------------------------------- */
3656
3657/*
3658 * return col/row values corresponding to x/y pixel values
3659 */
3660void
3661rxvt_term::pixel_position (int *x, int *y) NOTHROW
3662{
3663 *x = Pixel2Col (*x);
3664 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3665 *y = Pixel2Row (*y);
3666 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3667} 3545}
3668 3546
3669/* ------------------------------------------------------------------------- */ 3547/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3548#ifdef USE_XIM
3671void 3549void
… …
3699 h += 2; min_it (h, nrow); 3577 h += 2; min_it (h, nrow);
3700 3578
3701 x -= 1; clamp_it (x, 0, ncol - w); 3579 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3580 y -= 1; clamp_it (y, 0, nrow - h);
3703 3581
3704 ov_x = x; ov_y = y; 3582 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3583 ov.w = w; ov.h = h;
3706 3584
3707 ov_text = new text_t *[h]; 3585 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3586 ov.rend = new rend_t *[h];
3709 3587
3710 for (y = 0; y < h; y++) 3588 for (y = 0; y < h; y++)
3711 { 3589 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3590 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3591 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3592
3715 text_t t0, t1, t2; 3593 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3594 rend_t r = OVERLAY_RSTYLE;
3717 3595
3718 if (y == 0) 3596 if (y == 0)
… …
3737} 3615}
3738 3616
3739void 3617void
3740rxvt_term::scr_overlay_off () NOTHROW 3618rxvt_term::scr_overlay_off () NOTHROW
3741{ 3619{
3742 if (!ov_text) 3620 if (!ov.text)
3743 return; 3621 return;
3744 3622
3745 want_refresh = 1; 3623 want_refresh = 1;
3746 3624
3747 for (int y = 0; y < ov_h; y++) 3625 for (int y = 0; y < ov.h; y++)
3748 { 3626 {
3749 delete [] ov_text[y]; 3627 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3628 delete [] ov.rend[y];
3751 } 3629 }
3752 3630
3753 delete [] ov_text; ov_text = 0; 3631 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3632 delete [] ov.rend; ov.rend = 0;
3755} 3633}
3756 3634
3757void 3635void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3636rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3637{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3638 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3639 return;
3762 3640
3763 x++, y++; 3641 x++, y++;
3764 3642
3765 ov_text[y][x] = text; 3643 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3644 ov.rend[y][x] = rend;
3767} 3645}
3768 3646
3769void 3647void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3648rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3649{
… …
3790} 3668}
3791 3669
3792void 3670void
3793rxvt_term::scr_swap_overlay () NOTHROW 3671rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3672{
3795 if (!ov_text) 3673 if (!ov.text)
3796 return; 3674 return;
3797 3675
3676 // hide cursor if it is within the overlay area
3677 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3678 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3679 screen.flags &= ~Screen_VisibleCursor;
3680
3798 // swap screen mem with overlay 3681 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3682 for (int y = ov.h; y--; )
3800 { 3683 {
3801 text_t *t1 = ov_text[y]; 3684 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3685 rend_t *r1 = ov.rend[y];
3803 3686
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3687 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3805 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3688 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3689
3807 for (int x = ov_w; x--; ) 3690 for (int x = ov.w; x--; )
3808 { 3691 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3692 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3693 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3694 }
3812 } 3695 }

Diff Legend

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