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.265 by root, Tue Oct 3 11:56:48 2006 UTC vs.
Revision 1.404 by sf-exg, Tue Nov 15 20:07:10 2011 UTC

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

Diff Legend

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