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.409 by sf-exg, Mon Nov 21 18:35:52 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
… …
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{
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
… …
537 return; 549 return;
538 550
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 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
543 560
544 int i = current_screen; current_screen = scrn; scrn = i; 561 current_screen = scrn;
545 562
546#if NSCREENS 563#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
548 { 565 {
549 num_scr = 0; 566 num_scr = 0;
550 567
551 scr_swap_screen (); 568 scr_swap_screen ();
552 569
… …
555 screen.flags |= Screen_VisibleCursor; 572 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 573 swap.flags |= Screen_VisibleCursor;
557 } 574 }
558 else 575 else
559#endif 576#endif
560 if (OPTION (Opt_secondaryScroll)) 577 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 578 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 579}
563 580
564// clear WrapNext indicator, solidifying position on next line 581// clear WrapNext indicator, solidifying position on next line
565void 582void
… …
598/* 615/*
599 * Change the rendition style for following text 616 * Change the rendition style for following text
600 */ 617 */
601void 618void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 619rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 620{
604 if (set) 621 if (set)
605 rstyle |= style; 622 rstyle |= style;
606 else if (style == ~RS_None) 623 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 624 rstyle = DEFAULT_RSTYLE;
608 else 625 else
609 rstyle &= ~style; 626 rstyle &= ~style;
610 } 627}
611 628
612/* ------------------------------------------------------------------------- */ 629/* ------------------------------------------------------------------------- */
613/* 630/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 631 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 632 * count positive ==> scroll up
… …
624 want_refresh = 1; 641 want_refresh = 1;
625 num_scr += count; 642 num_scr += count;
626 643
627 if (count > 0 644 if (count > 0
628 && row1 == 0 645 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 646 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 647 {
648 min_it (count, total_rows - (nrow - (row2 + 1)));
649
631 top_row = max (top_row - count, -saveLines); 650 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635 651
636 // sever bottommost line 652 // sever bottommost line
637 { 653 {
638 line_t &l = ROW(row2 - count); 654 line_t &l = ROW(row2);
639 l.is_longer (0); 655 l.is_longer (0);
640 l.touch (); 656 l.touch ();
641 } 657 }
642 658
659 // scroll everything up 'count' lines
660 term_start = (term_start + count) % total_rows;
661
662 // now copy lines below the scroll region bottom to the
663 // bottom of the screen again, so they look as if they
664 // hadn't moved.
665 for (int i = nrow; --i > row2; )
666 {
667 line_t &l1 = ROW(i - count);
668 line_t &l2 = ROW(i);
669
670 ::swap (l1, l2);
671 l2.touch ();
672 }
673
643 // erase newly scrolled-in lines 674 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 675 for (int i = count; i--; )
645 { 676 {
646 line_t &l = ROW(nrow - 1 - i); 677 line_t &l = ROW(row2 - i);
647 678
648 // optimize if already cleared, can be significant on slow machines 679 // optimise if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 680 // 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))) 681 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 682 {
652 scr_blank_line (l, 0, l.l, rstyle); 683 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 684 l.l = 0;
… …
655 } 686 }
656 else 687 else
657 scr_blank_screen_mem (l, rstyle); 688 scr_blank_screen_mem (l, rstyle);
658 } 689 }
659 690
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 691 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 692 if (selection.op && current_screen == selection.screen
693 && selection.beg.row <= row2)
674 { 694 {
675 selection.beg.row -= count; 695 selection.beg.row -= count;
676 selection.end.row -= count; 696 selection.end.row -= count;
677 selection.mark.row -= count; 697 selection.mark.row -= count;
678 698
679 if (selection.beg.row < top_row 699 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 } 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
723 // part of scr_scroll_text is not time-critical. 737 // part of scr_scroll_text is not time-critical.
724 738
739 // sever line above scroll region
740 if (row1)
741 {
742 line_t &l = ROW(row1 - 1);
743 l.is_longer (0);
744 l.touch ();
745 }
746
725 int rows = row2 - row1 + 1; 747 int rows = row2 - row1 + 1;
726 748
727 min_it (count, rows); 749 min_it (count, rows);
728 750
729 line_t *temp_buf = row_buf + total_rows; 751 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
730 752
731 for (int row = 0; row < rows; row++) 753 for (int row = 0; row < rows; row++)
732 { 754 {
733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 755 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
734 756
… …
736 scr_blank_screen_mem (temp_buf [row], rstyle); 758 scr_blank_screen_mem (temp_buf [row], rstyle);
737 } 759 }
738 760
739 for (int row = 0; row < rows; row++) 761 for (int row = 0; row < rows; row++)
740 ROW(row1 + row) = temp_buf [row]; 762 ROW(row1 + row) = temp_buf [row];
763
764 // sever bottommost line
765 {
766 line_t &l = ROW(row2);
767 l.is_longer (0);
768 l.touch ();
769 }
741 } 770 }
742 771
743 return count; 772 return count;
744} 773}
745 774
… …
751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
752{ 781{
753 if (len <= 0) /* sanity */ 782 if (len <= 0) /* sanity */
754 return; 783 return;
755 784
756 unsigned char checksel; 785 bool checksel;
757 unicode_t c; 786 unicode_t c;
758 int ncol = this->ncol; 787 int ncol = this->ncol;
759 const wchar_t *strend = str + len; 788 const wchar_t *strend = str + len;
760 789
761 want_refresh = 1; 790 want_refresh = 1;
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 803 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 804 screen.cur.row -= minlines;
776 } 805 }
777 } 806 }
778 807
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 808 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 809 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 810 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 811 int row = screen.cur.row;
785 812
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 813 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 814
788 line_t *line = &ROW(row); 815 line_t *line = &ROW(row);
789 816
790 while (str < strend) 817 while (str < strend)
791 { 818 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 819 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 820
794 if (c < 0x20) 821 if (ecb_unlikely (c < 0x20))
795 if (c == C0_LF) 822 if (c == C0_LF)
796 { 823 {
797 max_it (line->l, screen.cur.col); 824 max_it (line->l, screen.cur.col);
798 825
799 screen.flags &= ~Screen_WrapNext; 826 screen.flags &= ~Screen_WrapNext;
… …
818 { 845 {
819 scr_tab (1, true); 846 scr_tab (1, true);
820 continue; 847 continue;
821 } 848 }
822 849
850 if (ecb_unlikely (
823 if (checksel /* see if we're writing within selection */ 851 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 852 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 853 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
854 ))
826 { 855 {
827 checksel = 0; 856 checksel = 0;
828 /* 857 /*
829 * If we wrote anywhere in the selected area, kill the selection 858 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 859 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 860 * should be a similar check.
832 */ 861 */
833 CLEAR_SELECTION (); 862 CLEAR_SELECTION ();
834 } 863 }
835 864
836 if (screen.flags & Screen_WrapNext) 865 if (ecb_unlikely (screen.flags & Screen_WrapNext))
837 { 866 {
838 scr_do_wrap (); 867 scr_do_wrap ();
839 868
840 line->l = ncol; 869 line->l = ncol;
841 line->is_longer (1); 870 line->is_longer (1);
842 871
843 row = screen.cur.row; 872 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 873 line = &ROW(row); /* _must_ refresh */
845 } 874 }
846 875
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 876 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 877 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 878 c = 0xfffd;
850 879
851 // rely on wcwidth to tell us the character width, do wcwidth before 880 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 881 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 882 // drawing characters below as they might be invalid in the current
854 // locale. 883 // locale.
855 int width = WCWIDTH (c); 884 int width = WCWIDTH (c);
856 885
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 886 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 887 {
859 // vt100 special graphics and line drawing 888 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 889 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 890 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 891 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 904 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 905 width = 1; // vt100 line drawing characters are always single-width
877 } 906 }
878 } 907 }
879 908
880 if (screen.flags & Screen_Insert) 909 if (ecb_unlikely (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 910 scr_insdel_chars (width, INSERT);
882 911
883 if (width != 0) 912 if (width != 0)
884 { 913 {
885#if !UNICODE_3 914#if !UNICODE_3
… …
890# else 919# else
891 c = 0xfffd; 920 c = 0xfffd;
892# endif 921# endif
893#endif 922#endif
894 923
924 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
925
926 // if the character doesn't fit into the remaining columns...
927 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
928 {
929 if (screen.flags & Screen_Autowrap)
930 {
931 // ... artificially enlargen the previous one
932 c = NOCHAR;
933 // and try the same character next loop iteration
934 --str;
935 }
936 else
937 screen.cur.col = ncol - width;
938 }
939
895 // nuke the character at this position, if required 940 // nuke the character at this position, if required
941 // due to wonderful coincidences everywhere else in this loop
942 // we never have to check for overwriting a wide char itself,
943 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 944 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 945 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 946
927 line->touch (); 947 line->touch ();
928 948
929 do 949 do
930 { 950 {
931 line->t[screen.cur.col] = c; 951 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 952 line->r[screen.cur.col] = rend;
933 953
934 if (screen.cur.col < ncol - 1) 954 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 955 screen.cur.col++;
936 else 956 else
937 { 957 {
938 line->l = ncol; 958 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 959 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 960 screen.flags |= Screen_WrapNext;
941 break; 961
962 goto end_of_line;
942 } 963 }
943 964
944 c = NOCHAR; 965 c = NOCHAR;
945 } 966 }
946 while (--width > 0); 967 while (ecb_unlikely (--width > 0));
947 968
948 // pad with spaces when overwriting wide character with smaller one 969 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 970 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 971 {
951 line->touch (); 972 line->t[c] = ' ';
973 line->r[c] = rend;
974 }
952 975
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 976end_of_line:
977 ;
978 }
979#if ENABLE_COMBINING
980 else // width == 0
981 {
982 if (c != 0xfeff) // ignore BOM
983 {
984 // handle combining characters
985 // we just tag the accent on the previous on-screen character.
986 // this is arguably not correct, but also arguably not wrong.
987 // we don't handle double-width characters nicely yet.
988 line_t *linep;
989 text_t *tp;
990 rend_t *rp;
991
992 if (screen.cur.col > 0)
954 { 993 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 994 linep = line;
995 tp = line->t + screen.cur.col - 1;
996 rp = line->r + screen.cur.col - 1;
957 } 997 }
998 else if (screen.cur.row > 0
999 && ROW(screen.cur.row - 1).is_longer ())
1000 {
1001 linep = &ROW(screen.cur.row - 1);
1002 tp = line->t + ncol - 1;
1003 rp = line->r + ncol - 1;
1004 }
1005 else
1006 continue;
1007
1008 linep->touch ();
1009
1010 while (*tp == NOCHAR && tp > linep->t)
1011 tp--, rp--;
1012
1013 // first try to find a precomposed character
1014 unicode_t n = rxvt_compose (*tp, c);
1015 if (n == NOCHAR)
1016 n = rxvt_composite.compose (*tp, c);
1017
1018 *tp = n;
1019 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1020 }
959 } 1021 }
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 1022#endif
1000 }
1001 } 1023 }
1002 1024
1003 max_it (line->l, screen.cur.col); 1025 max_it (line->l, screen.cur.col);
1004 1026
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1027 assert (screen.cur.row >= 0);
1007#endif
1008} 1028}
1009 1029
1010/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1011/* 1031/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1032 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1033 * XTERM_SEQ: CTRL-H
1014 */ 1034 */
1015void 1035void
1016rxvt_term::scr_backspace () NOTHROW 1036rxvt_term::scr_backspace () NOTHROW
1017{ 1037{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1038 if (screen.cur.col == 0)
1021 { 1039 {
1022 if (screen.cur.row > 0) 1040 if (screen.cur.row > 0)
1023 { 1041 {
1024#ifdef TERMCAP_HAS_BW 1042#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1043 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1044 --screen.cur.row;
1027 return; 1045
1046 want_refresh = 1;
1028#endif 1047#endif
1029 } 1048 }
1030 } 1049 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1050 else if (screen.flags & Screen_WrapNext)
1051 screen.flags &= ~Screen_WrapNext;
1052 else
1032 scr_gotorc (0, -1, RELATIVE); 1053 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1054}
1036 1055
1037/* ------------------------------------------------------------------------- */ 1056/* ------------------------------------------------------------------------- */
1038/* 1057/*
1039 * Process Horizontal Tab 1058 * Process Horizontal Tab
… …
1062 x = i; 1081 x = i;
1063 1082
1064 if (!--count) 1083 if (!--count)
1065 break; 1084 break;
1066 } 1085 }
1067 else 1086 else
1068 ht &= l.t[i] == ' ' 1087 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1088 && RS_SAME (l.r[i], base_rend);
1070 1089
1071 if (count) 1090 if (count)
1072 x = ncol - 1; 1091 x = ncol - 1;
1073 1092
1074 // store horizontal tab commands as characters inside the text 1093 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1094 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1095 if (ht && option (Opt_pastableTabs))
1077 { 1096 {
1078 base_rend = SET_FONT (base_rend, 0); 1097 base_rend = SET_FONT (base_rend, 0);
1079 1098
1080 l.touch (x); 1099 l.touch (x);
1081 1100
… …
1188 } 1207 }
1189 } 1208 }
1190 else 1209 else
1191 { 1210 {
1192 if (screen.flags & Screen_Relative) 1211 if (screen.flags & Screen_Relative)
1212 {
1193 { /* relative origin mode */ 1213 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1214 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1215 min_it (screen.cur.row, screen.bscroll);
1196 } 1216 }
1197 else 1217 else
1198 screen.cur.row = row; 1218 screen.cur.row = row;
… …
1231/* 1251/*
1232 * Erase part or whole of a line 1252 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1253 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1254 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1255 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1256 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1257 */
1237void 1258void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1259rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1260{
1240 unsigned int col, num; 1261 unsigned int col, num;
… …
1249 line.touch (); 1270 line.touch ();
1250 line.is_longer (0); 1271 line.is_longer (0);
1251 1272
1252 switch (mode) 1273 switch (mode)
1253 { 1274 {
1275 case 3:
1276 if (screen.flags & Screen_WrapNext)
1277 return;
1278
1279 /* fall through */
1280
1254 case 0: /* erase to end of line */ 1281 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1282 col = screen.cur.col;
1256 num = ncol - col; 1283 num = ncol - col;
1257 min_it (line.l, col); 1284 min_it (line.l, col);
1285
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1286 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1287 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1288 CLEAR_SELECTION ();
1261 break; 1289 break;
1290
1262 case 1: /* erase to beginning of line */ 1291 case 1: /* erase to beginning of line */
1263 col = 0; 1292 col = 0;
1264 num = screen.cur.col + 1; 1293 num = screen.cur.col + 1;
1294
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1295 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1296 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1297 CLEAR_SELECTION ();
1268 break; 1298 break;
1299
1269 case 2: /* erase whole line */ 1300 case 2: /* erase whole line */
1270 col = 0; 1301 col = 0;
1271 num = ncol; 1302 num = ncol;
1272 line.l = 0; 1303 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1304 if (selection.beg.row <= screen.cur.row
… …
1281 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1282} 1313}
1283 1314
1284/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1285/* 1316/*
1286 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1290 */ 1321 */
1291void 1322void
… …
1300 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1301 1332
1302 switch (mode) 1333 switch (mode)
1303 { 1334 {
1304 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1305 selection_check (1);
1306 scr_erase_line (0); 1336 scr_erase_line (0);
1307 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1308 num = nrow - row; 1338 num = nrow - row;
1309 break; 1339 break;
1310 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1311 selection_check (3);
1312 scr_erase_line (1); 1341 scr_erase_line (1);
1313 row = 0; 1342 row = 0;
1314 num = screen.cur.row; 1343 num = screen.cur.row;
1315 break; 1344 break;
1316 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1317 selection_check (3);
1318 row = 0; 1346 row = 0;
1319 num = nrow; 1347 num = nrow;
1320 break; 1348 break;
1321 default: 1349 default:
1322 return; 1350 return;
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1359 if (row >= nrow) /* Out Of Bounds */
1332 return; 1360 return;
1333 1361
1334 min_it (num, nrow - row); 1362 min_it (num, nrow - row);
1335 1363
1336 if (rstyle & (RS_RVid | RS_Uline)) 1364 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1365 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1366 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1367 {
1340 ren = DEFAULT_RSTYLE; 1368 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1369
1370 if (mapped)
1371 XClearArea (dpy, vt, 0,
1372 Row2Pixel (row - view_start), (unsigned int)width,
1373 (unsigned int)Height2Pixel (num), False);
1342 } 1374 }
1343 else 1375 else
1344 { 1376 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1377 ren = rstyle & (RS_fgMask | RS_bgMask);
1378
1379 if (mapped)
1380 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1381 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1382 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1383 XFillRectangle (dpy, vt, gc,
1384 0, Row2Pixel (row - view_start),
1385 (unsigned int)width,
1386 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1387 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1389 }
1351 } 1390 }
1352 1391
1353 for (; num--; row++) 1392 for (; num--; row++)
1354 { 1393 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1394 scr_blank_screen_mem (ROW(row), rstyle);
1395
1396 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1397 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1398 }
1358} 1399}
1359 1400
1360#if !ENABLE_MINIMAL 1401#if !ENABLE_MINIMAL
1361void 1402void
… …
1380 1421
1381 want_refresh = 1; 1422 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1383 1424
1384 num_scr_allow = 0; 1425 num_scr_allow = 0;
1385 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1386 1431
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1389 { 1434 {
1390 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1480 * Insert/Delete <count> characters from the current position
1436 */ 1481 */
1437void 1482void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1483rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1484{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1485 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1486 ZERO_SCROLLBACK ();
1445 1487
1446 if (count <= 0) 1488 if (count <= 0)
1447 return; 1489 return;
… …
1449 scr_do_wrap (); 1491 scr_do_wrap ();
1450 1492
1451 selection_check (1); 1493 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1494 min_it (count, ncol - screen.cur.col);
1453 1495
1454 row = screen.cur.row; 1496 int row = screen.cur.row;
1455 1497
1456 line_t *line = &ROW(row); 1498 line_t *line = &ROW(row);
1457 1499
1458 line->touch (); 1500 line->touch ();
1459 line->is_longer (0); 1501 line->is_longer (0);
1460 1502
1503 // nuke wide spanning the start
1504 if (line->t[screen.cur.col] == NOCHAR)
1505 scr_kill_char (*line, screen.cur.col);
1506
1461 switch (insdel) 1507 switch (insdel)
1462 { 1508 {
1463 case INSERT: 1509 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1510 line->l = min (line->l + count, ncol);
1511
1512 if (line->t[screen.cur.col] == NOCHAR)
1513 scr_kill_char (*line, screen.cur.col);
1514
1515 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1516 {
1466 line->t[col] = line->t[col - count]; 1517 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1518 line->r[col] = line->r[col - count];
1468 } 1519 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1520
1472 if (selection.op && current_screen == selection.screen 1521 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1523 {
1475 if (selection.end.row != screen.cur.row 1524 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1525 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1526 CLEAR_SELECTION ();
1478 else 1527 else
1528 {
1479 { /* shift selection */ 1529 /* shift selection */
1480 selection.beg.col += count; 1530 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1531 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1532 selection.end.col += count;
1483 } 1533 }
1484 } 1534 }
… …
1489 case ERASE: 1539 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1540 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1541 selection_check (1);
1492 screen.cur.col -= count; 1542 screen.cur.col -= count;
1493 1543
1494 line->l = max (line->l - count, 0); 1544 // nuke wide char after the end
1545 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1546 scr_kill_char (*line, screen.cur.col + count);
1547
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1548 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1549 break;
1497 1550
1498 case DELETE: 1551 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1552 line->l = max (line->l - count, 0);
1500 1553
1554 // nuke wide char spanning the end
1555 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1556 scr_kill_char (*line, screen.cur.col + count);
1557
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1558 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1559 {
1503 line->t[col] = line->t[col + count]; 1560 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1561 line->r[col] = line->r[col + count];
1505 } 1562 }
1506 1563
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1564 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1565
1510 if (selection.op && current_screen == selection.screen 1566 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1567 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1568 {
1513 if (selection.end.row != screen.cur.row 1569 if (selection.end.row != screen.cur.row
… …
1623 */ 1679 */
1624void 1680void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1681rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1682{
1627 if (mode < 0) 1683 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1684 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1685 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1686 tabs [screen.cur.col] = !!mode;
1631} 1687}
1632 1688
1633/* ------------------------------------------------------------------------- */ 1689/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1704 if (rvideo_state != on)
1649 { 1705 {
1650 rvideo_state = on; 1706 rvideo_state = on;
1651 1707
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1709#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1710 if (bg_pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1711#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1713
1661 XGCValues gcvalue; 1714 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1715 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1924 return true;
1872} 1925}
1873 1926
1874#ifndef NO_BELL 1927#ifndef NO_BELL
1875void 1928void
1876rxvt_term::bell_cb (time_watcher &w) 1929rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1930{
1878 rvideo_bell = false; 1931 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1932 scr_rvideo_mode (rvideo_mode);
1933 refresh_check ();
1880} 1934}
1881#endif 1935#endif
1882 1936
1883/* ------------------------------------------------------------------------- */ 1937/* ------------------------------------------------------------------------- */
1884void 1938void
… …
1886{ 1940{
1887#ifndef NO_BELL 1941#ifndef NO_BELL
1888 1942
1889# ifndef NO_MAPALERT 1943# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1944# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1945 if (option (Opt_mapAlert))
1892# endif 1946# endif
1893 XMapWindow (dpy, parent[0]); 1947 XMapWindow (dpy, parent);
1894# endif 1948# endif
1895 1949
1950# if ENABLE_FRILLS
1951 if (option (Opt_urgentOnBell))
1952 set_urgency (1);
1953# endif
1954
1896 if (OPTION (Opt_visualBell)) 1955 if (option (Opt_visualBell))
1897 { 1956 {
1898 rvideo_bell = true; 1957 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1958 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1959 flush ();
1901 1960
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1961 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1962 }
1904 else 1963 else
1905 XBell (dpy, 0); 1964 XBell (dpy, 0);
1906 1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1966#endif
1908} 1967}
1909 1968
1910/* ------------------------------------------------------------------------- */ 1969/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */
1912void 1970void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1971rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1972{
1915#ifdef PRINTPIPE 1973#ifdef PRINTPIPE
1916 int nrows, row_start; 1974 int nrows, row_start;
1917 FILE *fd; 1975 FILE *fd = popen_printer ();
1918 1976
1919 if ((fd = popen_printer ()) == NULL) 1977 if (!fd)
1920 return; 1978 return;
1921 1979
1922 if (fullhist) 1980 if (fullhist)
1923 { 1981 {
1924 nrows = nrow - top_row; 1982 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1988 row_start = view_start;
1931 } 1989 }
1932 1990
1933 wctomb (0, 0); 1991 wctomb (0, 0);
1934 1992
1935 for (int r1 = 0; r1 < nrows; r1++) 1993 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1994 {
1937 text_t *tp = ROW(r1).t; 1995 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1996 int len = ROW(r1).l;
1939 1997
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1998 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2027 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2028 */
1971void 2029void
1972rxvt_term::scr_refresh () NOTHROW 2030rxvt_term::scr_refresh () NOTHROW
1973{ 2031{
1974 unsigned char have_bg,
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2032 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2033 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2034 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2035#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2036 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2037#endif
1982 rend_t *crp; // cursor rendition pointer 2038 rend_t *crp; // cursor rendition pointer
2039 rend_t ccol1, /* Cursor colour */
2040 ccol2; /* Cursor colour2 */
1983 2041
1984 want_refresh = 0; /* screen is current */ 2042 want_refresh = 0; /* screen is current */
1985 2043
1986 if (refresh_type == NO_REFRESH || !mapped) 2044 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2045 return;
1988 2046
1989 /* 2047 /*
1990 * A: set up vars 2048 * A: set up vars
1991 */ 2049 */
1992 have_bg = 0;
1993 refresh_count = 0; 2050 refresh_count = 0;
1994 2051
1995#if XPM_BACKGROUND 2052 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP
1996 have_bg |= bgPixmap.pixmap != None; 2055 have_bg = bg_pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2056#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2058
2003 /* 2059 /*
2004 * B: reverse any characters which are selected 2060 * B: reverse any characters which are selected
2005 */ 2061 */
2006 scr_reverse_selection (); 2062 scr_reverse_selection ();
2007 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY
2066 scr_swap_overlay ();
2067#endif
2068
2069 bool showcursor = screen.flags & Screen_VisibleCursor;
2070
2008 /* 2071 /*
2009 * C: set the cursor character (s) 2072 * C: set the cursor character (s)
2010 */ 2073 */
2011 { 2074 {
2012 unsigned char setoldcursor; 2075 bool setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2076
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2077#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2078 if (hidden_cursor)
2019 showcursor = 0; 2079 showcursor = 0;
2020#endif 2080#endif
2021 2081
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2086 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2087 col--;
2028 2088
2029 crp = &ROW(screen.cur.row).r[col]; 2089 crp = &ROW(screen.cur.row).r[col];
2030 2090
2031 if (showcursor && focus) 2091#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor;
2095 else
2096#endif
2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2098 ccol1 = fgcolor_of (rstyle);
2099#else
2100 ccol1 = Color_fg;
2101#endif
2102
2103#ifndef NO_CURSORCOLOR
2104 if (ISSET_PIXCOLOR (Color_cursor2))
2105 ccol2 = Color_cursor2;
2106 else
2107#endif
2108#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2109 ccol2 = bgcolor_of (rstyle);
2110#else
2111 ccol2 = Color_bg;
2112#endif
2113
2114 if (focus)
2032 { 2115 {
2033 if (OPTION (Opt_cursorUnderline)) 2116 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2117 *crp ^= RS_Uline;
2035 else 2118 else
2036 { 2119 {
2037 *crp ^= RS_RVid; 2120 *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); 2121 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2122 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2123 }
2061 } 2124 }
2062 } 2125 }
2063 2126
2064 /* make sure no outline cursor is left around */ 2127 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2154 oldcursor.col = screen.cur.col;
2092 } 2155 }
2093 } 2156 }
2094 } 2157 }
2095 2158
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 2159#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2160 /*
2103 * D: CopyArea pass - very useful for slower links 2161 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2162 * This has been deliberately kept simple.
2105 */ 2163 */
… …
2194 continue; 2252 continue;
2195 2253
2196 // redraw one or more characters 2254 // redraw one or more characters
2197 2255
2198 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2199 while (stp[col] == NOCHAR && col > 0) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2200 --col; 2258 --col;
2201 2259
2202 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2203 text_t *text = stp + col; 2261 text_t *text = stp + col;
2204 int count = 1; 2262 int count = 1;
2205 2263
2206 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2207 drp[col] = rend; 2265 drp[col] = rend;
… …
2211 for (i = 0; ++col < ncol; ) 2269 for (i = 0; ++col < ncol; )
2212 { 2270 {
2213 if (stp[col] == NOCHAR) 2271 if (stp[col] == NOCHAR)
2214 { 2272 {
2215 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2216 drp[col] = rend; 2274 drp[col] = srp[col];
2275
2217 count++; 2276 count++;
2218 i++; 2277 i++;
2219 2278
2220 continue; 2279 continue;
2221 } 2280 }
… …
2241 2300
2242 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2243 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2244 2303
2245 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2246 while (i && text[count] == NOCHAR) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2247 count++, i--; 2306 count++, i--;
2248 2307
2249 /* 2308 /*
2250 * Determine the attributes for the string 2309 * Determine the attributes for the string
2251 */ 2310 */
2252 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2253 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2254 2313
2255 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2257 { 2316 {
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; 2317 bool invert = rend & RS_RVid;
2277 2318
2278#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2279 if (rend & RS_Bold
2280 && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
2281 { 2321 {
2282 if (ISSET_PIXCOLOR (Color_BD)) 2322 if (ISSET_PIXCOLOR (Color_BD))
2283 fore = Color_BD; 2323 fore = Color_BD;
2284# if !ENABLE_STYLES 2324# if !ENABLE_STYLES
2285 else 2325 else
2286 invert = !invert; 2326 invert = !invert;
2287# endif 2327# endif
2288 } 2328 }
2289 2329
2290 if (rend & RS_Italic 2330 if (rend & RS_Italic && fore == Color_fg)
2291 && fore == Color_fg)
2292 { 2331 {
2293 if (ISSET_PIXCOLOR (Color_IT)) 2332 if (ISSET_PIXCOLOR (Color_IT))
2294 fore = Color_IT; 2333 fore = Color_IT;
2295# if !ENABLE_STYLES 2334# if !ENABLE_STYLES
2296 else 2335 else
2297 invert = !invert; 2336 invert = !invert;
2298# endif 2337# endif
2299 } 2338 }
2300 2339
2301 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2302 fore = Color_UL; 2341 fore = Color_UL;
2342#endif
2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2303#endif 2362#endif
2304 2363
2305 if (invert) 2364 if (invert)
2306 { 2365 {
2307 ::swap (fore, back); 2366 ::swap (fore, back);
2308 2367
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#ifndef NO_BOLD_UNDERLINE_REVERSE
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312
2313 if (fore == back) 2369 if (fore == back)
2314 { 2370 {
2315 fore = Color_bg; 2371 fore = Color_bg;
2316 back = Color_fg; 2372 back = Color_fg;
2317 } 2373 }
… …
2319 } 2375 }
2320 2376
2321#ifdef TEXT_BLINK 2377#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2378 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2379 {
2324 if (!text_blink_ev.active) 2380 if (!text_blink_ev.is_active ())
2325 { 2381 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2382 text_blink_ev.again ();
2327 hidden_text = 0; 2383 hidden_text = 0;
2328 } 2384 }
2329 else if (hidden_text) 2385 else if (hidden_text)
2330 fore = back; 2386 fore = back;
2331 } 2387 }
2332#endif 2388#endif
2389
2390#if ENABLE_STYLES
2391 // "careful" (too wide) character handling
2392
2393 // include previous careful character(s) if possible, looks nicer (best effort...)
2394 while (text > stp
2395 && srp[text - stp - 1] & RS_Careful
2396 && RS_SAME (rend, srp[text - stp - 1]))
2397 text--, count++, xpixel -= fwidth;
2398
2399 // force redraw after "careful" characters to avoid pixel droppings
2400 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2401 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2402
2403 // force redraw before "careful" characters to avoid pixel droppings
2404 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2405 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2406#endif
2333 } 2407 }
2334 2408
2335 /* 2409 /*
2336 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2337 */ 2411 */
2338 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2339 2413
2340 if (back == fore) 2414 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 { 2415 {
2344 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2345 2417
2346 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2347 if (text[i] != ' ') 2419 if (text[i] != ' ')
2348 { 2420 {
2349 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2421 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2350 goto did_clear; 2422 goto did_clear;
2351 } 2423 }
2352 2424
2353 CLEAR_CHARS (xpixel, ypixel, count); 2425 CLEAR_CHARS (xpixel, ypixel, count);
2354 did_clear: ; 2426 did_clear: ;
2355 } 2427 }
2356 else 2428 else
2357 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2358 2430
2359 if (rend & RS_Uline && font->descent > 1 && fore != back) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2360 { 2432 {
2361#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2362 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2363 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2364 else 2436 else
2365#endif 2437#endif
2366 XSetForeground (dpy, gc, pix_colors[fore]); 2438 XSetForeground (dpy, gc, pix_colors[fore]);
2367 2439
2368 XDrawLine (dpy, drawBuffer, gc, 2440 XDrawLine (dpy, vt, gc,
2369 xpixel, ypixel + font->ascent + 1, 2441 xpixel, ypixel + font->ascent + 1,
2370 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2442 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2371 } 2443 }
2372 } /* for (col....) */ 2444 } /* for (col....) */
2373 } /* for (row....) */ 2445 } /* for (row....) */
2374 2446
2375#if ENABLE_OVERLAY
2376 scr_swap_overlay ();
2377#endif
2378 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2379
2380 /* 2447 /*
2381 * G: cleanup cursor and display outline cursor if necessary 2448 * G: cleanup cursor and display outline cursor if necessary
2382 */ 2449 */
2383 if (showcursor) 2450 if (showcursor)
2384 { 2451 {
2385 if (focus) 2452 if (focus)
2386 { 2453 {
2387 if (OPTION (Opt_cursorUnderline)) 2454 if (option (Opt_cursorUnderline))
2388 *crp ^= RS_Uline; 2455 *crp ^= RS_Uline;
2389 else 2456 else
2390 { 2457 {
2391 *crp ^= RS_RVid; 2458 *crp ^= RS_RVid;
2392#ifndef NO_CURSORCOLOR 2459#ifndef NO_CURSORCOLOR
… …
2407 cursorwidth++; 2474 cursorwidth++;
2408 2475
2409#ifndef NO_CURSORCOLOR 2476#ifndef NO_CURSORCOLOR
2410 if (ISSET_PIXCOLOR (Color_cursor)) 2477 if (ISSET_PIXCOLOR (Color_cursor))
2411 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2478 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2479 else
2412#endif 2480#endif
2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2413 2482
2414 XDrawRectangle (dpy, drawBuffer, gc, 2483 XDrawRectangle (dpy, vt, gc,
2415 Col2Pixel (col), 2484 Col2Pixel (col),
2416 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2417 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2418 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2419 } 2488 }
2420 } 2489 }
2421 2490
2422 /* 2491 /*
2423 * H: cleanup selection 2492 * H: cleanup selection
2424 */ 2493 */
2494#if ENABLE_OVERLAY
2495 scr_swap_overlay ();
2496#endif
2497 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2498
2425 scr_reverse_selection (); 2499 scr_reverse_selection ();
2426 2500
2501 screen.flags = old_screen_flags;
2427 num_scr = 0; 2502 num_scr = 0;
2428 num_scr_allow = 1; 2503 num_scr_allow = 1;
2429} 2504}
2430 2505
2431void 2506void
… …
2452 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2453 } 2528 }
2454} 2529}
2455 2530
2456void 2531void
2457rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2458{ 2533{
2459 if (1 2534 bool transparent = false;
2460#if TRANSPARENT 2535
2461 && !am_transparent 2536#ifdef HAVE_BG_PIXMAP
2537 if (bg_pixmap != None)
2538 {
2539# ifdef ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544
2545 transparent = true;
2546 }
2547 else
2462#endif 2548# endif
2463#if XPM_BACKGROUND
2464 && !bgPixmap.pixmap
2465#endif
2466 ) 2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2552 }
2467 { 2553 }
2554 else
2555#endif
2556 {
2468 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2469 XClearWindow (dpy, parent[0]);
2470 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2471#if HAVE_SCROLLBARS 2559 }
2560
2561 XClearWindow (dpy, parent);
2562
2472 if (scrollBar.win) 2563 if (scrollBar.win)
2473 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2474 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2475 scrollBar.setIdle (); 2569 scrollBar.state = SB_STATE_IDLE;
2476 scrollbar_show (0); 2570 scrollBar.show (0);
2477 } 2571 }
2478#endif 2572
2573 if (refresh)
2479 } 2574 {
2480
2481 scr_clear (); 2575 scr_clear ();
2482 scr_touch (true); 2576 scr_touch (true);
2577 }
2483 want_refresh = 1; 2578 want_refresh = 1;
2484} 2579}
2485 2580
2486/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2487void 2582void
… …
2555 { 2650 {
2556#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2557 if (selection.rect) 2652 if (selection.rect)
2558 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2559 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2560 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2561 else 2656 else
2562#endif 2657#endif
2563 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2564 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2565 RS_RVid); 2660 RS_Sel | RS_RVid);
2566 } 2661 }
2567} 2662}
2568 2663
2569/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2570/* 2665/*
… …
2573 */ 2668 */
2574#if 0 2669#if 0
2575void 2670void
2576rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2577{ 2672{
2578 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2579 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2580 char r1[] = "\n";
2581
2582 for (row = saveLines - nsaved;
2583 row < saveLines + nrow - 1; row++)
2584 {
2585 width = row_buf[row].l >= 0 ? row_buf[row].l
2586 : ncol;
2587 for (towrite = width; towrite; towrite -= wrote)
2588 {
2589 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2590 towrite);
2591 if (wrote < 0)
2592 return; /* XXX: death, no report */
2593 }
2594 if (row_buf[row].l >= 0)
2595 if (write (fd, r1, 1) <= 0)
2596 return; /* XXX: death, no report */
2597 }
2598} 2675}
2599#endif 2676#endif
2600 2677
2601/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2602 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2603 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2604void 2681void
2605rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2606{ 2683{
2607 row_col_t pos;
2608
2609 if (!selection.op) 2684 if (!selection.op)
2610 return; 2685 return;
2611 2686
2612 pos.row = pos.col = 0;
2613 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2614 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2615 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2616 || (check_more == 1 2690 || (check_more == 1
2617 && current_screen == selection.screen 2691 && current_screen == selection.screen
2618 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2619 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2620 || (check_more == 2
2621 && ROWCOL_IS_BEFORE (selection.beg, pos)
2622 && ROWCOL_IS_AFTER (selection.end, pos))
2623 || (check_more == 3
2624 && ROWCOL_IS_AFTER (selection.end, pos))
2625 || (check_more == 4 /* screen width change */
2626 && (selection.beg.row != selection.end.row
2627 || selection.end.col > ncol)))
2628 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2629} 2695}
2630 2696
2631/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2632/* 2698/*
2633 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2634 */ 2700 */
2635void 2701void
2636rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2637{ 2703{
2638 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2639 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2640 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2641 data[i] = C0_CR; 2707 data[i] = C0_CR;
2642 2708
2709 if (priv_modes & PrivMode_BracketPaste)
2710 tt_printf ("\e[200~");
2711
2643 tt_write (data, len); 2712 tt_write (data, len);
2644}
2645 2713
2646/* ------------------------------------------------------------------------- */ 2714 if (priv_modes & PrivMode_BracketPaste)
2647/* 2715 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} 2716}
2812 2717
2813void 2718void
2814rxvt_term::incr_cb (time_watcher &w) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2815{ 2720{
2816 selection_wait = Sel_none; 2721 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; 2722 return;
2829 2723
2830 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2831} 2725}
2832 2726
2833/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2834/* 2728/*
2835 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2836 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2837 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * 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 2732 * EXT: button 2 release
2842 */ 2733 */
2843void 2734void
2844rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2845{ 2736{
2846 if (selection.text && selnum == Sel_Primary) 2737 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 } 2738 {
2853 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2854 { 2741 }
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} 2742}
2896 2743
2897/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2898/* 2745/*
2899 * Clear all selected text 2746 * Clear all selected text
2900 * EXT: SelectionClear 2747 * EXT: SelectionClear
2901 */ 2748 */
2902void 2749void
2903rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2904{ 2751{
2752 if (!clipboard)
2753 {
2905 want_refresh = 1; 2754 want_refresh = 1;
2906 free (selection.text); 2755 free (selection.text);
2907 selection.text = NULL; 2756 selection.text = NULL;
2908 selection.len = 0; 2757 selection.len = 0;
2909 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2910 2759
2911 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2912 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2913} 2772}
2914 2773
2915/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2916/* 2775/*
2917 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2918 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2919 */ 2778 */
2920void 2779void
2921rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2922{ 2781{
2923 int i; 2782 int size;
2924 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2925 text_t *t; 2784 text_t *t;
2926 2785
2927 switch (selection.op) 2786 switch (selection.op)
2928 { 2787 {
… …
2944 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2945 2804
2946 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2947 return; 2806 return;
2948 2807
2949 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2950 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2951 2810
2952 int ofs = 0; 2811 int ofs = 0;
2953 int extra = 0; 2812 int extra = 0;
2954 2813
2955 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
2961 { 2820 {
2962#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
2963 if (selection.rect) 2822 if (selection.rect)
2964 { 2823 {
2965 col = selection.beg.col; 2824 col = selection.beg.col;
2966 end_col = ncol + 1; 2825 end_col = selection.end.col;
2967 } 2826 }
2968 else 2827 else
2969#endif 2828#endif
2970 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
2971 2830
2972 col = max (col, 0); 2831 col = max (col, 0);
2973 2832
2974 if (row == selection.end.row 2833 if (row == selection.end.row)
2975#if !ENABLE_MINIMAL
2976 || selection.rect
2977#endif
2978 )
2979 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
2980 2835
2981 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
2982 2837
2983 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
2991 2846
2992 extra -= (len - 1); 2847 extra -= (len - 1);
2993 2848
2994 if (extra < 0) 2849 if (extra < 0)
2995 { 2850 {
2996 extra += i; 2851 extra += size;
2997 i += i; 2852 size += size;
2998 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2999 } 2854 }
3000 2855
3001 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3002 } 2857 }
3003#endif 2858#endif
… …
3015 2870
3016 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3017 } 2872 }
3018 else 2873 else
3019#endif 2874#endif
3020 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3021 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3022 } 2879 }
3023
3024 if (end_col != selection.end.col)
3025 new_selection_text[ofs++] = C0_LF;
3026 2880
3027 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3028 2882
3029 if (ofs == 0) 2883 if (ofs == 0)
3030 { 2884 {
… …
3043 2897
3044 selection_grab (tm); 2898 selection_grab (tm);
3045} 2899}
3046 2900
3047bool 2901bool
3048rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3049{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3050 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3051 2916
3052 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3053 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3054 { 2919 {
3055 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3056 return true; 2921 return true;
3057 } 2922 }
3058 else 2923 else
3059 { 2924 {
3060 selection_clear (); 2925 selection_clear (clipboard);
3061 return false; 2926 return false;
3062 } 2927 }
3063 2928
3064#if 0 2929#if 0
3065 XTextProperty ct; 2930 XTextProperty ct;
… …
3118 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2983 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3119 2984
3120 while (selection.mark.col > 0 2985 while (selection.mark.col > 0
3121 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2986 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3122 --selection.mark.col; 2987 --selection.mark.col;
3123 2988
3124 if (selection.op) 2989 if (selection.op)
2990 {
3125 { /* clear the old selection */ 2991 /* clear the old selection */
3126 selection.beg.row = selection.end.row = selection.mark.row; 2992 selection.beg.row = selection.end.row = selection.mark.row;
3127 selection.beg.col = selection.end.col = selection.mark.col; 2993 selection.beg.col = selection.end.col = selection.mark.col;
3128 } 2994 }
3129 2995
3130 selection.op = SELECTION_INIT; 2996 selection.op = SELECTION_INIT;
… …
3319 * a point/word/line which is either the start or end of the selection 3185 * 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 3186 * and it was decided by whichever point/word/line was `fixed' at the
3321 * time of the most recent button3 press 3187 * time of the most recent button3 press
3322 */ 3188 */
3323 if (button3 && buttonpress) 3189 if (button3 && buttonpress)
3190 {
3324 { /* button3 press */ 3191 /* button3 press */
3325 /* 3192 /*
3326 * first determine which edge of the selection we are closest to 3193 * first determine which edge of the selection we are closest to
3327 */ 3194 */
3328 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3195 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3329 || (!ROWCOL_IS_AFTER (pos, selection.end) 3196 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3347 selection.mark.row = selection.beg.row; 3214 selection.mark.row = selection.beg.row;
3348 selection.mark.col = selection.beg.col; 3215 selection.mark.col = selection.beg.col;
3349 } 3216 }
3350 } 3217 }
3351 else 3218 else
3219 {
3352 { /* button1 drag or button3 drag */ 3220 /* button1 drag or button3 drag */
3353 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3221 if (ROWCOL_IS_AFTER (selection.mark, pos))
3354 { 3222 {
3355 if (selection.mark.row == selection.end.row 3223 if (selection.mark.row == selection.end.row
3356 && selection.mark.col == selection.end.col 3224 && selection.mark.col == selection.end.col
3357 && clickchange 3225 && clickchange
… …
3400 selection_delimit_word (DN, &selection.end, &selection.end); 3268 selection_delimit_word (DN, &selection.end, &selection.end);
3401 } 3269 }
3402 else if (selection.clicks == 3) 3270 else if (selection.clicks == 3)
3403 { 3271 {
3404#if ENABLE_FRILLS 3272#if ENABLE_FRILLS
3405 if (OPTION (Opt_tripleclickwords)) 3273 if (option (Opt_tripleclickwords))
3406 { 3274 {
3407 selection_delimit_word (UP, &selection.beg, &selection.beg); 3275 selection_delimit_word (UP, &selection.beg, &selection.beg);
3408 3276
3409 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3277 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3410 { 3278 {
… …
3438 selection.end.row++; 3306 selection.end.row++;
3439 } 3307 }
3440 } 3308 }
3441 3309
3442 if (button3 && buttonpress) 3310 if (button3 && buttonpress)
3311 {
3443 { /* mark may need to be changed */ 3312 /* mark may need to be changed */
3444 if (closeto == LEFT) 3313 if (closeto == LEFT)
3445 { 3314 {
3446 selection.mark.row = selection.end.row; 3315 selection.mark.row = selection.end.row;
3447 selection.mark.col = selection.end.col - (selection.clicks == 2); 3316 selection.mark.col = selection.end.col - (selection.clicks == 2);
3448 } 3317 }
… …
3521 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3522 */ 3391 */
3523void 3392void
3524rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3525{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3526 XSelectionEvent ev; 3396 XSelectionEvent ev;
3527 3397
3528 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3529 ev.property = None; 3399 ev.property = None;
3530 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3545 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3546#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3547 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3548#endif 3418#endif
3549 3419
3550 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3551 32, PropModeReplace, 3421 32, PropModeReplace,
3552 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3553 ev.property = rq.property; 3423 ev.property = property;
3554 } 3424 }
3555#if TODO // TODO 3425#if TODO // TODO
3556 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3557 { 3427 {
3558 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3559 } 3429 }
3560#endif 3430#endif
3561 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3562 { 3432 {
3563 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3564 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3565 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3566 } 3442 }
3567 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3568 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3569 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3570 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3602 { 3478 {
3603 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3604 style = enc_compound_text; 3480 style = enc_compound_text;
3605 } 3481 }
3606 3482
3607 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3608 { 3484 {
3609 cl = selection.text; 3485 cl = selection.text;
3610 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3611 } 3492 }
3612 else 3493 else
3613 { 3494 {
3614 cl = L""; 3495 cl = L"";
3615 selectlen = 0; 3496 selectlen = 0;
… …
3636 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3637 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3638 ct.encoding = target; 3519 ct.encoding = target;
3639 } 3520 }
3640 3521
3641 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3642 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3643 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3644 ev.property = rq.property; 3525 ev.property = property;
3645 3526
3646 if (freect) 3527 if (freect)
3647 XFree (ct.value); 3528 XFree (ct.value);
3648 } 3529 }
3649 3530
3650 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 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} 3532}
3668 3533
3669/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3670#ifdef USE_XIM 3535#ifdef USE_XIM
3671void 3536void
… …
3699 h += 2; min_it (h, nrow); 3564 h += 2; min_it (h, nrow);
3700 3565
3701 x -= 1; clamp_it (x, 0, ncol - w); 3566 x -= 1; clamp_it (x, 0, ncol - w);
3702 y -= 1; clamp_it (y, 0, nrow - h); 3567 y -= 1; clamp_it (y, 0, nrow - h);
3703 3568
3704 ov_x = x; ov_y = y; 3569 ov.x = x; ov.y = y;
3705 ov_w = w; ov_h = h; 3570 ov.w = w; ov.h = h;
3706 3571
3707 ov_text = new text_t *[h]; 3572 ov.text = new text_t *[h];
3708 ov_rend = new rend_t *[h]; 3573 ov.rend = new rend_t *[h];
3709 3574
3710 for (y = 0; y < h; y++) 3575 for (y = 0; y < h; y++)
3711 { 3576 {
3712 text_t *tp = ov_text[y] = new text_t[w]; 3577 text_t *tp = ov.text[y] = new text_t[w];
3713 rend_t *rp = ov_rend[y] = new rend_t[w]; 3578 rend_t *rp = ov.rend[y] = new rend_t[w];
3714 3579
3715 text_t t0, t1, t2; 3580 text_t t0, t1, t2;
3716 rend_t r = OVERLAY_RSTYLE; 3581 rend_t r = OVERLAY_RSTYLE;
3717 3582
3718 if (y == 0) 3583 if (y == 0)
… …
3737} 3602}
3738 3603
3739void 3604void
3740rxvt_term::scr_overlay_off () NOTHROW 3605rxvt_term::scr_overlay_off () NOTHROW
3741{ 3606{
3742 if (!ov_text) 3607 if (!ov.text)
3743 return; 3608 return;
3744 3609
3745 want_refresh = 1; 3610 want_refresh = 1;
3746 3611
3747 for (int y = 0; y < ov_h; y++) 3612 for (int y = 0; y < ov.h; y++)
3748 { 3613 {
3749 delete [] ov_text[y]; 3614 delete [] ov.text[y];
3750 delete [] ov_rend[y]; 3615 delete [] ov.rend[y];
3751 } 3616 }
3752 3617
3753 delete [] ov_text; ov_text = 0; 3618 delete [] ov.text; ov.text = 0;
3754 delete [] ov_rend; ov_rend = 0; 3619 delete [] ov.rend; ov.rend = 0;
3755} 3620}
3756 3621
3757void 3622void
3758rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3623rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3759{ 3624{
3760 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3625 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3761 return; 3626 return;
3762 3627
3763 x++, y++; 3628 x++, y++;
3764 3629
3765 ov_text[y][x] = text; 3630 ov.text[y][x] = text;
3766 ov_rend[y][x] = rend; 3631 ov.rend[y][x] = rend;
3767} 3632}
3768 3633
3769void 3634void
3770rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3771{ 3636{
… …
3790} 3655}
3791 3656
3792void 3657void
3793rxvt_term::scr_swap_overlay () NOTHROW 3658rxvt_term::scr_swap_overlay () NOTHROW
3794{ 3659{
3795 if (!ov_text) 3660 if (!ov.text)
3796 return; 3661 return;
3797 3662
3663 // hide cursor if it is within the overlay area
3664 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3665 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3666 screen.flags &= ~Screen_VisibleCursor;
3667
3798 // swap screen mem with overlay 3668 // swap screen mem with overlay
3799 for (int y = ov_h; y--; ) 3669 for (int y = ov.h; y--; )
3800 { 3670 {
3801 text_t *t1 = ov_text[y]; 3671 text_t *t1 = ov.text[y];
3802 rend_t *r1 = ov_rend[y]; 3672 rend_t *r1 = ov.rend[y];
3803 3673
3804 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3674 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; 3675 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3806 3676
3807 for (int x = ov_w; x--; ) 3677 for (int x = ov.w; x--; )
3808 { 3678 {
3809 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3679 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3810 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3680 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3811 } 3681 }
3812 } 3682 }

Diff Legend

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