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.276 by ayin, Sun Aug 26 17:56:19 2007 UTC vs.
Revision 1.408 by sf-exg, Thu Nov 17 10:43:16 2011 UTC

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

Diff Legend

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