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.400 by sf-exg, Tue Nov 15 02:24:25 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{
… …
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 selection_check (2); /* check for boundary cross */
541 555
542 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
543 557
544#if NSCREENS 558#if NSCREENS
545 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
546 { 560 {
547 num_scr = 0; 561 num_scr = 0;
… …
596/* 610/*
597 * Change the rendition style for following text 611 * Change the rendition style for following text
598 */ 612 */
599void 613void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 615{
602 if (set) 616 if (set)
603 rstyle |= style; 617 rstyle |= style;
604 else if (style == ~RS_None) 618 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
606 else 620 else
607 rstyle &= ~style; 621 rstyle &= ~style;
608 } 622}
609 623
610/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
611/* 625/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
624 638
625 if (count > 0 639 if (count > 0
626 && row1 == 0 640 && row1 == 0
627 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 { 642 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
629 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633 646
634 // sever bottommost line 647 // sever bottommost line
635 { 648 {
636 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
637 l.is_longer (0); 650 l.is_longer (0);
638 l.touch (); 651 l.touch ();
639 } 652 }
640 653
654 // scroll everything up 'count' lines
655 term_start = (term_start + count) % total_rows;
656
657 // now copy lines below the scroll region bottom to the
658 // bottom of the screen again, so they look as if they
659 // hadn't moved.
660 for (int i = nrow; --i > row2; )
661 {
662 line_t &l1 = ROW(i - count);
663 line_t &l2 = ROW(i);
664
665 ::swap (l1, l2);
666 l2.touch ();
667 }
668
641 // erase newly scrolled-in lines 669 // erase newly scrolled-in lines
642 for (int i = count; i--; ) 670 for (int i = count; i--; )
643 { 671 {
644 line_t &l = ROW(nrow - 1 - i); 672 line_t &l = ROW(row2 - i);
645 673
646 // optimize if already cleared, can be significant on slow machines 674 // optimise if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem 675 // 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))) 676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 { 677 {
650 scr_blank_line (l, 0, l.l, rstyle); 678 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0; 679 l.l = 0;
… …
653 } 681 }
654 else 682 else
655 scr_blank_screen_mem (l, rstyle); 683 scr_blank_screen_mem (l, rstyle);
656 } 684 }
657 685
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 686 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen)
672 { 688 {
673 selection.beg.row -= count; 689 selection.beg.row -= count;
674 selection.end.row -= count; 690 selection.end.row -= count;
675 selection.mark.row -= count; 691 selection.mark.row -= count;
676 692
677 if (selection.beg.row < top_row 693 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 } 694 }
685 695
686 // finally move the view window, if desired 696 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 698 && view_start != 0
… …
710 { 720 {
711 /* move selected region too */ 721 /* move selected region too */
712 selection.beg.row -= count; 722 selection.beg.row -= count;
713 selection.end.row -= count; 723 selection.end.row -= count;
714 selection.mark.row -= count; 724 selection.mark.row -= count;
715 725
716 selection_check (0); 726 selection_check (0);
717 } 727 }
718 } 728 }
719 729
720 // use a simple and robust scrolling algorithm, this 730 // use a simple and robust scrolling algorithm, this
721 // part of scr_scroll_text is not time-critical. 731 // part of scr_scroll_text is not time-critical.
722 732
733 // sever line above scroll region
734 if (row1)
735 {
736 line_t &l = ROW(row1 - 1);
737 l.is_longer (0);
738 l.touch ();
739 }
740
723 int rows = row2 - row1 + 1; 741 int rows = row2 - row1 + 1;
724 742
725 min_it (count, rows); 743 min_it (count, rows);
726 744
727 line_t *temp_buf = row_buf + total_rows; 745 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
728 746
729 for (int row = 0; row < rows; row++) 747 for (int row = 0; row < rows; row++)
730 { 748 {
731 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 749 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
732 750
… …
734 scr_blank_screen_mem (temp_buf [row], rstyle); 752 scr_blank_screen_mem (temp_buf [row], rstyle);
735 } 753 }
736 754
737 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
738 ROW(row1 + row) = temp_buf [row]; 756 ROW(row1 + row) = temp_buf [row];
757
758 // sever bottommost line
759 {
760 line_t &l = ROW(row2);
761 l.is_longer (0);
762 l.touch ();
763 }
739 } 764 }
740 765
741 return count; 766 return count;
742} 767}
743 768
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 797 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 798 screen.cur.row -= minlines;
774 } 799 }
775 } 800 }
776 801
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 802 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 803 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 804 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 805 int row = screen.cur.row;
783 806
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 808
786 line_t *line = &ROW(row); 809 line_t *line = &ROW(row);
787 810
788 while (str < strend) 811 while (str < strend)
789 { 812 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 813 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 814
792 if (c < 0x20) 815 if (ecb_unlikely (c < 0x20))
793 if (c == C0_LF) 816 if (c == C0_LF)
794 { 817 {
795 max_it (line->l, screen.cur.col); 818 max_it (line->l, screen.cur.col);
796 819
797 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
… …
816 { 839 {
817 scr_tab (1, true); 840 scr_tab (1, true);
818 continue; 841 continue;
819 } 842 }
820 843
844 if (ecb_unlikely (
821 if (checksel /* see if we're writing within selection */ 845 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 846 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 847 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
848 ))
824 { 849 {
825 checksel = 0; 850 checksel = 0;
826 /* 851 /*
827 * If we wrote anywhere in the selected area, kill the selection 852 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 853 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 854 * should be a similar check.
830 */ 855 */
831 CLEAR_SELECTION (); 856 CLEAR_SELECTION ();
832 } 857 }
833 858
834 if (screen.flags & Screen_WrapNext) 859 if (ecb_unlikely (screen.flags & Screen_WrapNext))
835 { 860 {
836 scr_do_wrap (); 861 scr_do_wrap ();
837 862
838 line->l = ncol; 863 line->l = ncol;
839 line->is_longer (1); 864 line->is_longer (1);
840 865
841 row = screen.cur.row; 866 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 867 line = &ROW(row); /* _must_ refresh */
843 } 868 }
844 869
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 870 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 871 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 872 c = 0xfffd;
848 873
849 // rely on wcwidth to tell us the character width, do wcwidth before 874 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 875 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 876 // drawing characters below as they might be invalid in the current
852 // locale. 877 // locale.
853 int width = WCWIDTH (c); 878 int width = WCWIDTH (c);
854 879
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 880 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 881 {
857 // vt100 special graphics and line drawing 882 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 883 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 884 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 885 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 898 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 899 width = 1; // vt100 line drawing characters are always single-width
875 } 900 }
876 } 901 }
877 902
878 if (screen.flags & Screen_Insert) 903 if (ecb_unlikely (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 904 scr_insdel_chars (width, INSERT);
880 905
881 if (width != 0) 906 if (width != 0)
882 { 907 {
883#if !UNICODE_3 908#if !UNICODE_3
… …
888# else 913# else
889 c = 0xfffd; 914 c = 0xfffd;
890# endif 915# endif
891#endif 916#endif
892 917
918 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
919
920 // if the character doesn't fit into the remaining columns...
921 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
922 {
923 if (screen.flags & Screen_Autowrap)
924 {
925 // ... artificially enlargen the previous one
926 c = NOCHAR;
927 // and try the same character next loop iteration
928 --str;
929 }
930 else
931 screen.cur.col = ncol - width;
932 }
933
893 // nuke the character at this position, if required 934 // nuke the character at this position, if required
935 // due to wonderful coincidences everywhere else in this loop
936 // we never have to check for overwriting a wide char itself,
937 // only its tail.
894 if (line->t[screen.cur.col] == NOCHAR 938 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
895 || (screen.cur.col < ncol - 1 939 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 940
925 line->touch (); 941 line->touch ();
926 942
927 do 943 do
928 { 944 {
929 line->t[screen.cur.col] = c; 945 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 946 line->r[screen.cur.col] = rend;
931 947
932 if (screen.cur.col < ncol - 1) 948 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 949 screen.cur.col++;
934 else 950 else
935 { 951 {
936 line->l = ncol; 952 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 953 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 954 screen.flags |= Screen_WrapNext;
939 break; 955
956 goto end_of_line;
940 } 957 }
941 958
942 c = NOCHAR; 959 c = NOCHAR;
943 } 960 }
944 while (--width > 0); 961 while (ecb_unlikely (--width > 0));
945 962
946 // pad with spaces when overwriting wide character with smaller one 963 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 964 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 965 {
949 line->touch (); 966 line->t[c] = ' ';
967 line->r[c] = rend;
968 }
950 969
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 970end_of_line:
971 ;
972 }
973#if ENABLE_COMBINING
974 else // width == 0
975 {
976 if (c != 0xfeff) // ignore BOM
977 {
978 // handle combining characters
979 // we just tag the accent on the previous on-screen character.
980 // this is arguably not correct, but also arguably not wrong.
981 // we don't handle double-width characters nicely yet.
982 line_t *linep;
983 text_t *tp;
984 rend_t *rp;
985
986 if (screen.cur.col > 0)
952 { 987 {
953 line->t[c] = ' ';
954 line->r[c] = rend; 988 linep = line;
989 tp = line->t + screen.cur.col - 1;
990 rp = line->r + screen.cur.col - 1;
955 } 991 }
992 else if (screen.cur.row > 0
993 && ROW(screen.cur.row - 1).is_longer ())
994 {
995 linep = &ROW(screen.cur.row - 1);
996 tp = line->t + ncol - 1;
997 rp = line->r + ncol - 1;
998 }
999 else
1000 continue;
1001
1002 linep->touch ();
1003
1004 while (*tp == NOCHAR && tp > linep->t)
1005 tp--, rp--;
1006
1007 // first try to find a precomposed character
1008 unicode_t n = rxvt_compose (*tp, c);
1009 if (n == NOCHAR)
1010 n = rxvt_composite.compose (*tp, c);
1011
1012 *tp = n;
1013 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
956 } 1014 }
957 } 1015 }
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 1016#endif
998 }
999 } 1017 }
1000 1018
1001 max_it (line->l, screen.cur.col); 1019 max_it (line->l, screen.cur.col);
1002 1020
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1021 assert (screen.cur.row >= 0);
1005#endif
1006} 1022}
1007 1023
1008/* ------------------------------------------------------------------------- */ 1024/* ------------------------------------------------------------------------- */
1009/* 1025/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1026 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1027 * XTERM_SEQ: CTRL-H
1012 */ 1028 */
1013void 1029void
1014rxvt_term::scr_backspace () NOTHROW 1030rxvt_term::scr_backspace () NOTHROW
1015{ 1031{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1032 if (screen.cur.col == 0)
1019 { 1033 {
1020 if (screen.cur.row > 0) 1034 if (screen.cur.row > 0)
1021 { 1035 {
1022#ifdef TERMCAP_HAS_BW 1036#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1037 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1038 --screen.cur.row;
1025 return; 1039
1040 want_refresh = 1;
1026#endif 1041#endif
1027 } 1042 }
1028 } 1043 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1044 else if (screen.flags & Screen_WrapNext)
1045 screen.flags &= ~Screen_WrapNext;
1046 else
1030 scr_gotorc (0, -1, RELATIVE); 1047 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1048}
1034 1049
1035/* ------------------------------------------------------------------------- */ 1050/* ------------------------------------------------------------------------- */
1036/* 1051/*
1037 * Process Horizontal Tab 1052 * Process Horizontal Tab
… …
1060 x = i; 1075 x = i;
1061 1076
1062 if (!--count) 1077 if (!--count)
1063 break; 1078 break;
1064 } 1079 }
1065 else 1080 else
1066 ht &= l.t[i] == ' ' 1081 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1082 && RS_SAME (l.r[i], base_rend);
1068 1083
1069 if (count) 1084 if (count)
1070 x = ncol - 1; 1085 x = ncol - 1;
… …
1186 } 1201 }
1187 } 1202 }
1188 else 1203 else
1189 { 1204 {
1190 if (screen.flags & Screen_Relative) 1205 if (screen.flags & Screen_Relative)
1206 {
1191 { /* relative origin mode */ 1207 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1208 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1209 min_it (screen.cur.row, screen.bscroll);
1194 } 1210 }
1195 else 1211 else
1196 screen.cur.row = row; 1212 screen.cur.row = row;
… …
1229/* 1245/*
1230 * Erase part or whole of a line 1246 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1247 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1248 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1249 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1250 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1251 */
1235void 1252void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1253rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1254{
1238 unsigned int col, num; 1255 unsigned int col, num;
… …
1247 line.touch (); 1264 line.touch ();
1248 line.is_longer (0); 1265 line.is_longer (0);
1249 1266
1250 switch (mode) 1267 switch (mode)
1251 { 1268 {
1269 case 3:
1270 if (screen.flags & Screen_WrapNext)
1271 return;
1272
1273 /* fall through */
1274
1252 case 0: /* erase to end of line */ 1275 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1276 col = screen.cur.col;
1254 num = ncol - col; 1277 num = ncol - col;
1255 min_it (line.l, col); 1278 min_it (line.l, col);
1279
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1280 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1281 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1282 CLEAR_SELECTION ();
1259 break; 1283 break;
1284
1260 case 1: /* erase to beginning of line */ 1285 case 1: /* erase to beginning of line */
1261 col = 0; 1286 col = 0;
1262 num = screen.cur.col + 1; 1287 num = screen.cur.col + 1;
1288
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1289 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1290 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1266 break; 1292 break;
1293
1267 case 2: /* erase whole line */ 1294 case 2: /* erase whole line */
1268 col = 0; 1295 col = 0;
1269 num = ncol; 1296 num = ncol;
1270 line.l = 0; 1297 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1298 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1330 return; 1357 return;
1331 1358
1332 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1333 1360
1334 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1364 {
1338 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1366
1367 if (mapped)
1368 XClearArea (dpy, vt, 0,
1369 Row2Pixel (row - view_start), (unsigned int)width,
1370 (unsigned int)Height2Pixel (num), False);
1340 } 1371 }
1341 else 1372 else
1342 { 1373 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1375
1376 if (mapped)
1377 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1380 XFillRectangle (dpy, vt, gc,
1381 0, Row2Pixel (row - view_start),
1382 (unsigned int)width,
1383 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1349 } 1387 }
1350 1388
1351 for (; num--; row++) 1389 for (; num--; row++)
1352 { 1390 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1355 } 1395 }
1356} 1396}
1357 1397
1358#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1359void 1399void
… …
1433 * Insert/Delete <count> characters from the current position 1473 * Insert/Delete <count> characters from the current position
1434 */ 1474 */
1435void 1475void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1476rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1477{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1478 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1479 ZERO_SCROLLBACK ();
1443 1480
1444 if (count <= 0) 1481 if (count <= 0)
1445 return; 1482 return;
… …
1447 scr_do_wrap (); 1484 scr_do_wrap ();
1448 1485
1449 selection_check (1); 1486 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1487 min_it (count, ncol - screen.cur.col);
1451 1488
1452 row = screen.cur.row; 1489 int row = screen.cur.row;
1453 1490
1454 line_t *line = &ROW(row); 1491 line_t *line = &ROW(row);
1455 1492
1456 line->touch (); 1493 line->touch ();
1457 line->is_longer (0); 1494 line->is_longer (0);
1458 1495
1496 // nuke wide spanning the start
1497 if (line->t[screen.cur.col] == NOCHAR)
1498 scr_kill_char (*line, screen.cur.col);
1499
1459 switch (insdel) 1500 switch (insdel)
1460 { 1501 {
1461 case INSERT: 1502 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1503 line->l = min (line->l + count, ncol);
1504
1505 if (line->t[screen.cur.col] == NOCHAR)
1506 scr_kill_char (*line, screen.cur.col);
1507
1508 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1509 {
1464 line->t[col] = line->t[col - count]; 1510 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1511 line->r[col] = line->r[col - count];
1466 } 1512 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1513
1470 if (selection.op && current_screen == selection.screen 1514 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1515 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1516 {
1473 if (selection.end.row != screen.cur.row 1517 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1518 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1519 CLEAR_SELECTION ();
1476 else 1520 else
1521 {
1477 { /* shift selection */ 1522 /* shift selection */
1478 selection.beg.col += count; 1523 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1524 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1525 selection.end.col += count;
1481 } 1526 }
1482 } 1527 }
… …
1487 case ERASE: 1532 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1533 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1534 selection_check (1);
1490 screen.cur.col -= count; 1535 screen.cur.col -= count;
1491 1536
1492 line->l = max (line->l - count, 0); 1537 // nuke wide char after the end
1538 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1539 scr_kill_char (*line, screen.cur.col + count);
1540
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1541 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1542 break;
1495 1543
1496 case DELETE: 1544 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1545 line->l = max (line->l - count, 0);
1498 1546
1547 // nuke wide char spanning the end
1548 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1549 scr_kill_char (*line, screen.cur.col + count);
1550
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1551 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1552 {
1501 line->t[col] = line->t[col + count]; 1553 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1554 line->r[col] = line->r[col + count];
1503 } 1555 }
1504 1556
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1557 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1558
1508 if (selection.op && current_screen == selection.screen 1559 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1560 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1561 {
1511 if (selection.end.row != screen.cur.row 1562 if (selection.end.row != screen.cur.row
… …
1621 */ 1672 */
1622void 1673void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1674rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1675{
1625 if (mode < 0) 1676 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1677 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1678 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1679 tabs [screen.cur.col] = !!mode;
1629} 1680}
1630 1681
1631/* ------------------------------------------------------------------------- */ 1682/* ------------------------------------------------------------------------- */
… …
1647 { 1698 {
1648 rvideo_state = on; 1699 rvideo_state = on;
1649 1700
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1701 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1702#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1703 if (bg_pixmap == None)
1653#endif 1704#endif
1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1705 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1706
1656 XGCValues gcvalue; 1707 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1708 gcvalue.foreground = pix_colors[Color_fg];
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1852 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1853 {
1803 min_it (rc[i].col, ncol - 1); 1854 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1855 min_it (rc[i].row, nrow - 1);
1805 } 1856 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1857
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1858 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); 1859 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1860
1810 num_scr_allow = 0; 1861 num_scr_allow = 0;
1811 1862
… …
1866 return true; 1917 return true;
1867} 1918}
1868 1919
1869#ifndef NO_BELL 1920#ifndef NO_BELL
1870void 1921void
1871rxvt_term::bell_cb (time_watcher &w) 1922rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1923{
1873 rvideo_bell = false; 1924 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1925 scr_rvideo_mode (rvideo_mode);
1926 refresh_check ();
1875} 1927}
1876#endif 1928#endif
1877 1929
1878/* ------------------------------------------------------------------------- */ 1930/* ------------------------------------------------------------------------- */
1879void 1931void
… …
1883 1935
1884# ifndef NO_MAPALERT 1936# ifndef NO_MAPALERT
1885# ifdef MAPALERT_OPTION 1937# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1938 if (option (Opt_mapAlert))
1887# endif 1939# endif
1888 XMapWindow (dpy, parent[0]); 1940 XMapWindow (dpy, parent);
1889# endif 1941# endif
1942
1890# if ENABLE_FRILLS 1943# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1944 if (option (Opt_urgentOnBell))
1892 { 1945 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 1946# endif
1903 1947
1904 if (option (Opt_visualBell)) 1948 if (option (Opt_visualBell))
1905 { 1949 {
1906 rvideo_bell = true; 1950 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1951 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1952 flush ();
1909 1953
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1954 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1955 }
1912 else 1956 else
1913 XBell (dpy, 0); 1957 XBell (dpy, 0);
1958 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914#endif 1959#endif
1915} 1960}
1916 1961
1917/* ------------------------------------------------------------------------- */ 1962/* ------------------------------------------------------------------------- */
1918/* ARGSUSED */
1919void 1963void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1964rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1965{
1922#ifdef PRINTPIPE 1966#ifdef PRINTPIPE
1923 int nrows, row_start; 1967 int nrows, row_start;
1924 FILE *fd; 1968 FILE *fd = popen_printer ();
1925 1969
1926 if ((fd = popen_printer ()) == NULL) 1970 if (!fd)
1927 return; 1971 return;
1928 1972
1929 if (fullhist) 1973 if (fullhist)
1930 { 1974 {
1931 nrows = nrow - top_row; 1975 nrows = nrow - top_row;
… …
1937 row_start = view_start; 1981 row_start = view_start;
1938 } 1982 }
1939 1983
1940 wctomb (0, 0); 1984 wctomb (0, 0);
1941 1985
1942 for (int r1 = 0; r1 < nrows; r1++) 1986 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943 { 1987 {
1944 text_t *tp = ROW(r1).t; 1988 text_t *tp = ROW(r1).t;
1945 int len = ROW(r1).l; 1989 int len = ROW(r1).l;
1946 1990
1947 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1991 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1976 * screen.text/screen.rend contain what the screen will change to. 2020 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2021 */
1978void 2022void
1979rxvt_term::scr_refresh () NOTHROW 2023rxvt_term::scr_refresh () NOTHROW
1980{ 2024{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2025 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2026 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2027 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR 2028#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */ 2029 rend_t cc1; /* store colours at cursor position (s) */
… …
1996 return; 2038 return;
1997 2039
1998 /* 2040 /*
1999 * A: set up vars 2041 * A: set up vars
2000 */ 2042 */
2001 have_bg = 0;
2002 refresh_count = 0; 2043 refresh_count = 0;
2003 2044
2045 unsigned int old_screen_flags = screen.flags;
2046 char have_bg = 0;
2004#ifdef HAVE_BG_PIXMAP 2047#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2048 have_bg = bg_pixmap != None;
2006#endif 2049#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2051
2009 /* 2052 /*
2010 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
2011 */ 2054 */
2012 scr_reverse_selection (); 2055 scr_reverse_selection ();
2056
2057 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2058#if ENABLE_OVERLAY
2059 scr_swap_overlay ();
2060#endif
2061
2062 char showcursor = screen.flags & Screen_VisibleCursor;
2013 2063
2014 /* 2064 /*
2015 * C: set the cursor character (s) 2065 * C: set the cursor character (s)
2016 */ 2066 */
2017 { 2067 {
2018 unsigned char setoldcursor; 2068 unsigned char setoldcursor;
2019 2069
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2070#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2071 if (hidden_cursor)
2023 showcursor = 0; 2072 showcursor = 0;
2024#endif 2073#endif
2025 2074
… …
2053 ccol2 = bgcolor_of (rstyle); 2102 ccol2 = bgcolor_of (rstyle);
2054#else 2103#else
2055 ccol2 = Color_bg; 2104 ccol2 = Color_bg;
2056#endif 2105#endif
2057 2106
2058 if (showcursor && focus) 2107 if (focus)
2059 { 2108 {
2060 if (option (Opt_cursorUnderline)) 2109 if (option (Opt_cursorUnderline))
2061 *crp ^= RS_Uline; 2110 *crp ^= RS_Uline;
2062 else 2111 else
2063 { 2112 {
… …
2098 oldcursor.col = screen.cur.col; 2147 oldcursor.col = screen.cur.col;
2099 } 2148 }
2100 } 2149 }
2101 } 2150 }
2102 2151
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 2152#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2153 /*
2110 * D: CopyArea pass - very useful for slower links 2154 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2155 * This has been deliberately kept simple.
2112 */ 2156 */
… …
2201 continue; 2245 continue;
2202 2246
2203 // redraw one or more characters 2247 // redraw one or more characters
2204 2248
2205 // seek to the beginning of wide characters 2249 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2250 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2207 --col; 2251 --col;
2208 2252
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2253 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210 text_t *text = stp + col; 2254 text_t *text = stp + col;
2211 int count = 1; 2255 int count = 1;
2212 2256
2213 dtp[col] = stp[col]; 2257 dtp[col] = stp[col];
2214 drp[col] = rend; 2258 drp[col] = rend;
… …
2218 for (i = 0; ++col < ncol; ) 2262 for (i = 0; ++col < ncol; )
2219 { 2263 {
2220 if (stp[col] == NOCHAR) 2264 if (stp[col] == NOCHAR)
2221 { 2265 {
2222 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2223 drp[col] = rend; 2267 drp[col] = srp[col];
2268
2224 count++; 2269 count++;
2225 i++; 2270 i++;
2226 2271
2227 continue; 2272 continue;
2228 } 2273 }
… …
2248 2293
2249 col--; /* went one too far. move back */ 2294 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2295 count -= i; /* dump any matching trailing chars */
2251 2296
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2298 while (ecb_unlikely (i && text[count] == NOCHAR))
2254 count++, i--; 2299 count++, i--;
2255 2300
2256 /* 2301 /*
2257 * Determine the attributes for the string 2302 * Determine the attributes for the string
2258 */ 2303 */
2259 int fore = fgcolor_of (rend); // desired foreground 2304 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2305 int back = bgcolor_of (rend); // desired background
2261 2306
2262 // only do special processing if any attributes are set, which is unlikely 2307 // 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)) 2308 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2264 { 2309 {
2265 bool invert = rend & RS_RVid; 2310 bool invert = rend & RS_RVid;
2266 2311
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2312#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2313 if (rend & RS_Bold && fore == Color_fg)
2270 { 2314 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2315 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2316 fore = Color_BD;
2273# if !ENABLE_STYLES 2317# if !ENABLE_STYLES
2274 else 2318 else
2275 invert = !invert; 2319 invert = !invert;
2276# endif 2320# endif
2277 } 2321 }
2278 2322
2279 if (rend & RS_Italic 2323 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2324 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2325 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2326 fore = Color_IT;
2284# if !ENABLE_STYLES 2327# if !ENABLE_STYLES
2285 else 2328 else
… …
2289 2332
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2333 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2334 fore = Color_UL;
2292#endif 2335#endif
2293 2336
2337#ifdef OPTION_HC
2338 if (rend & RS_Sel)
2339 {
2340 /* invert the column if no highlightColor is set or it is the
2341 * current cursor column */
2342 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2343 && ISSET_PIXCOLOR (Color_HC))
2344 {
2345 if (ISSET_PIXCOLOR (Color_HTC))
2346 fore = Color_HTC;
2347 // if invert is 0 reverse video is set so we use bg color as fg color
2348 else if (!invert)
2349 fore = back;
2350
2351 back = Color_HC;
2352 invert = 0;
2353 }
2354 }
2355#endif
2356
2294 if (invert) 2357 if (invert)
2295 { 2358 {
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); 2359 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2360
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2361#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) 2362 if (fore == back)
2314 { 2363 {
2315 fore = Color_bg; 2364 fore = Color_bg;
2316 back = Color_fg; 2365 back = Color_fg;
2317 } 2366 }
… …
2319 } 2368 }
2320 2369
2321#ifdef TEXT_BLINK 2370#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2371 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2372 {
2324 if (!text_blink_ev.active) 2373 if (!text_blink_ev.is_active ())
2325 { 2374 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2375 text_blink_ev.again ();
2327 hidden_text = 0; 2376 hidden_text = 0;
2328 } 2377 }
2329 else if (hidden_text) 2378 else if (hidden_text)
2330 fore = back; 2379 fore = back;
2331 } 2380 }
… …
2353 /* 2402 /*
2354 * Actually do the drawing of the string here 2403 * Actually do the drawing of the string here
2355 */ 2404 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2405 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2406
2358 if (have_bg && back == Color_bg) 2407 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2408 {
2360 // this is very ugly, maybe push it into ->draw? 2409 // this is very ugly, maybe push it into ->draw?
2361 2410
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2411 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2412 if (text[i] != ' ')
… …
2370 did_clear: ; 2419 did_clear: ;
2371 } 2420 }
2372 else 2421 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2422 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2423
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2424 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2425 {
2377#if ENABLE_FRILLS 2426#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2427 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2428 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2429 else
2381#endif 2430#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2431 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2432
2384 XDrawLine (dpy, drawBuffer, gc, 2433 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2434 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2435 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2436 }
2388 } /* for (col....) */ 2437 } /* for (col....) */
2389 } /* for (row....) */ 2438 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2439
2396 /* 2440 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2441 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2442 */
2399 if (showcursor) 2443 if (showcursor)
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2471 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2472 else
2429#endif 2473#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2474 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2475
2432 XDrawRectangle (dpy, drawBuffer, gc, 2476 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2477 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2478 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2479 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2480 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2481 }
2438 } 2482 }
2439 2483
2440 /* 2484 /*
2441 * H: cleanup selection 2485 * H: cleanup selection
2442 */ 2486 */
2487#if ENABLE_OVERLAY
2488 scr_swap_overlay ();
2489#endif
2490 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2491
2443 scr_reverse_selection (); 2492 scr_reverse_selection ();
2444 2493
2494 screen.flags = old_screen_flags;
2445 num_scr = 0; 2495 num_scr = 0;
2446 num_scr_allow = 1; 2496 num_scr_allow = 1;
2447} 2497}
2448 2498
2449void 2499void
… …
2470 scr_remap_chars (swap_buf [i]); 2520 scr_remap_chars (swap_buf [i]);
2471 } 2521 }
2472} 2522}
2473 2523
2474void 2524void
2475rxvt_term::scr_recolour () NOTHROW 2525rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2526{
2527 bool transparent = false;
2528
2477#ifdef HAVE_BG_PIXMAP 2529#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2530 if (bg_pixmap != None)
2479#else 2531 {
2532# ifdef ENABLE_TRANSPARENCY
2533 if (bg_flags & BG_IS_TRANSPARENT)
2534 {
2535 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2536 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2537
2538 transparent = true;
2539 }
2540 else
2541# endif
2542 {
2543 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2544 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2545 }
2546 }
2547 else
2548#endif
2549 {
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2551 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2552 }
2553
2554 XClearWindow (dpy, parent);
2555
2484 if (scrollBar.win) 2556 if (scrollBar.win)
2485 { 2557 {
2558 if (transparent)
2559 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2560 else
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2562 scrollBar.state = SB_STATE_IDLE;
2488 scrollbar_show (0); 2563 scrollBar.show (0);
2489 } 2564 }
2490# endif 2565
2491#endif 2566 if (refresh)
2492 2567 {
2493 scr_clear (); 2568 scr_clear ();
2494 scr_touch (true); 2569 scr_touch (true);
2570 }
2495 want_refresh = 1; 2571 want_refresh = 1;
2496} 2572}
2497 2573
2498/* ------------------------------------------------------------------------- */ 2574/* ------------------------------------------------------------------------- */
2499void 2575void
… …
2567 { 2643 {
2568#if !ENABLE_MINIMAL 2644#if !ENABLE_MINIMAL
2569 if (selection.rect) 2645 if (selection.rect)
2570 scr_xor_rect (selection.beg.row, selection.beg.col, 2646 scr_xor_rect (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2647 selection.end.row, selection.end.col,
2572 RS_RVid, RS_RVid | RS_Uline); 2648 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2573 else 2649 else
2574#endif 2650#endif
2575 scr_xor_span (selection.beg.row, selection.beg.col, 2651 scr_xor_span (selection.beg.row, selection.beg.col,
2576 selection.end.row, selection.end.col, 2652 selection.end.row, selection.end.col,
2577 RS_RVid); 2653 RS_Sel | RS_RVid);
2578 } 2654 }
2579} 2655}
2580 2656
2581/* ------------------------------------------------------------------------- */ 2657/* ------------------------------------------------------------------------- */
2582/* 2658/*
… …
2587void 2663void
2588rxvt_term::scr_dump (int fd) NOTHROW 2664rxvt_term::scr_dump (int fd) NOTHROW
2589{ 2665{
2590 int row, wrote; 2666 int row, wrote;
2591 unsigned int width, towrite; 2667 unsigned int width, towrite;
2592 char r1[] = "\n"; 2668 const char r1[] = "\n";
2593 2669
2594 for (row = saveLines - nsaved; 2670 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2671 row < saveLines + nrow - 1; row++)
2596 { 2672 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2673 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2674 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2675 for (towrite = width; towrite; towrite -= wrote)
… …
2614 * CHARACTER SELECTION * 2690 * CHARACTER SELECTION *
2615 * ------------------------------------------------------------------------- */ 2691 * ------------------------------------------------------------------------- */
2616void 2692void
2617rxvt_term::selection_check (int check_more) NOTHROW 2693rxvt_term::selection_check (int check_more) NOTHROW
2618{ 2694{
2619 row_col_t pos;
2620
2621 if (!selection.op) 2695 if (!selection.op)
2622 return; 2696 return;
2623 2697
2698 row_col_t pos;
2624 pos.row = pos.col = 0; 2699 pos.row = pos.col = 0;
2700
2625 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2701 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2626 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2702 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2627 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2703 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2628 || (check_more == 1 2704 || (check_more == 1
2629 && current_screen == selection.screen 2705 && current_screen == selection.screen
… …
2631 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2707 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2632 || (check_more == 2 2708 || (check_more == 2
2633 && ROWCOL_IS_BEFORE (selection.beg, pos) 2709 && ROWCOL_IS_BEFORE (selection.beg, pos)
2634 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos))
2635 || (check_more == 3 2711 || (check_more == 3
2636 && ROWCOL_IS_AFTER (selection.end, pos)) 2712 && 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 (); 2713 CLEAR_ALL_SELECTION ();
2641} 2714}
2642 2715
2643/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2644/* 2717/*
2645 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
2646 */ 2719 */
2647void 2720void
2648rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2649{ 2722{
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2723 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2726 data[i] = C0_CR;
2654 2727
2728 if (priv_modes & PrivMode_BracketPaste)
2729 tt_printf ("\e[200~");
2730
2655 tt_write (data, len); 2731 tt_write (data, len);
2656}
2657 2732
2658/* ------------------------------------------------------------------------- */ 2733 if (priv_modes & PrivMode_BracketPaste)
2659/* 2734 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} 2735}
2824 2736
2825void 2737void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2827{ 2739{
2828 selection_wait = Sel_none; 2740 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; 2741 return;
2841 2742
2842 selection_paste (win, prop, true); 2743 tt_paste (data, len);
2843} 2744}
2844 2745
2845/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2846/* 2747/*
2847 * Request the current selection: 2748 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2848 * Order: > internal selection if available 2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2750 * 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 2751 * EXT: button 2 release
2854 */ 2752 */
2855void 2753void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2755{
2858 if (selection.text && selnum == Sel_Primary) 2756 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 } 2757 {
2865 else 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run ();
2866 { 2760 }
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} 2761}
2908 2762
2909/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2910/* 2764/*
2911 * Clear all selected text 2765 * Clear all selected text
2912 * EXT: SelectionClear 2766 * EXT: SelectionClear
2913 */ 2767 */
2914void 2768void
2915rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2916{ 2770{
2771 if (!clipboard)
2772 {
2917 want_refresh = 1; 2773 want_refresh = 1;
2918 free (selection.text); 2774 free (selection.text);
2919 selection.text = NULL; 2775 selection.text = NULL;
2920 selection.len = 0; 2776 selection.len = 0;
2921 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2922 2778
2923 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2924 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2925} 2791}
2926 2792
2927/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2928/* 2794/*
2929 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2930 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2931 */ 2797 */
2932void 2798void
2933rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2934{ 2800{
2935 int i; 2801 int size;
2936 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2937 text_t *t; 2803 text_t *t;
2938 2804
2939 switch (selection.op) 2805 switch (selection.op)
2940 { 2806 {
… …
2956 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2957 2823
2958 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2959 return; 2825 return;
2960 2826
2961 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2962 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2963 2829
2964 int ofs = 0; 2830 int ofs = 0;
2965 int extra = 0; 2831 int extra = 0;
2966 2832
2967 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
2973 { 2839 {
2974#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
2975 if (selection.rect) 2841 if (selection.rect)
2976 { 2842 {
2977 col = selection.beg.col; 2843 col = selection.beg.col;
2978 end_col = ncol + 1; 2844 end_col = selection.end.col;
2979 } 2845 }
2980 else 2846 else
2981#endif 2847#endif
2982 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
2983 2849
2984 col = max (col, 0); 2850 col = max (col, 0);
2985 2851
2986 if (row == selection.end.row 2852 if (row == selection.end.row)
2987#if !ENABLE_MINIMAL
2988 || selection.rect
2989#endif
2990 )
2991 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
2992 2854
2993 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
2994 2856
2995 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3003 2865
3004 extra -= (len - 1); 2866 extra -= (len - 1);
3005 2867
3006 if (extra < 0) 2868 if (extra < 0)
3007 { 2869 {
3008 extra += i; 2870 extra += size;
3009 i += i; 2871 size += size;
3010 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3011 } 2873 }
3012 2874
3013 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3014 } 2876 }
3015#endif 2877#endif
… …
3027 2889
3028 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3029 } 2891 }
3030 else 2892 else
3031#endif 2893#endif
3032 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3033 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3034 } 2898 }
3035
3036 if (end_col != selection.end.col)
3037 new_selection_text[ofs++] = C0_LF;
3038 2899
3039 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3040 2901
3041 if (ofs == 0) 2902 if (ofs == 0)
3042 { 2903 {
… …
3055 2916
3056 selection_grab (tm); 2917 selection_grab (tm);
3057} 2918}
3058 2919
3059bool 2920bool
3060rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3061{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3062 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3063 2935
3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3066 { 2938 {
3067 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3068 return true; 2940 return true;
3069 } 2941 }
3070 else 2942 else
3071 { 2943 {
3072 selection_clear (); 2944 selection_clear (clipboard);
3073 return false; 2945 return false;
3074 } 2946 }
3075 2947
3076#if 0 2948#if 0
3077 XTextProperty ct; 2949 XTextProperty ct;
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3002 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3003
3132 while (selection.mark.col > 0 3004 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3005 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3006 --selection.mark.col;
3135 3007
3136 if (selection.op) 3008 if (selection.op)
3009 {
3137 { /* clear the old selection */ 3010 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3011 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3012 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3013 }
3141 3014
3142 selection.op = SELECTION_INIT; 3015 selection.op = SELECTION_INIT;
… …
3331 * a point/word/line which is either the start or end of the selection 3204 * 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 3205 * and it was decided by whichever point/word/line was `fixed' at the
3333 * time of the most recent button3 press 3206 * time of the most recent button3 press
3334 */ 3207 */
3335 if (button3 && buttonpress) 3208 if (button3 && buttonpress)
3209 {
3336 { /* button3 press */ 3210 /* button3 press */
3337 /* 3211 /*
3338 * first determine which edge of the selection we are closest to 3212 * first determine which edge of the selection we are closest to
3339 */ 3213 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3214 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3215 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3233 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3234 selection.mark.col = selection.beg.col;
3361 } 3235 }
3362 } 3236 }
3363 else 3237 else
3238 {
3364 { /* button1 drag or button3 drag */ 3239 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3240 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3241 {
3367 if (selection.mark.row == selection.end.row 3242 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3243 && selection.mark.col == selection.end.col
3369 && clickchange 3244 && clickchange
… …
3450 selection.end.row++; 3325 selection.end.row++;
3451 } 3326 }
3452 } 3327 }
3453 3328
3454 if (button3 && buttonpress) 3329 if (button3 && buttonpress)
3330 {
3455 { /* mark may need to be changed */ 3331 /* mark may need to be changed */
3456 if (closeto == LEFT) 3332 if (closeto == LEFT)
3457 { 3333 {
3458 selection.mark.row = selection.end.row; 3334 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3335 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3336 }
… …
3533 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3534 */ 3410 */
3535void 3411void
3536rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3537{ 3413{
3414 Atom property = rq.property == None ? rq.target : rq.property;
3538 XSelectionEvent ev; 3415 XSelectionEvent ev;
3539 3416
3540 ev.type = SelectionNotify; 3417 ev.type = SelectionNotify;
3541 ev.property = None; 3418 ev.property = None;
3542 ev.display = rq.display; 3419 ev.display = rq.display;
… …
3557 *target++ = xa[XA_COMPOUND_TEXT]; 3434 *target++ = xa[XA_COMPOUND_TEXT];
3558#if X_HAVE_UTF8_STRING 3435#if X_HAVE_UTF8_STRING
3559 *target++ = xa[XA_UTF8_STRING]; 3436 *target++ = xa[XA_UTF8_STRING];
3560#endif 3437#endif
3561 3438
3562 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3439 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3563 32, PropModeReplace, 3440 32, PropModeReplace,
3564 (unsigned char *)target_list, target - target_list); 3441 (unsigned char *)target_list, target - target_list);
3565 ev.property = rq.property; 3442 ev.property = property;
3566 } 3443 }
3567#if TODO // TODO 3444#if TODO // TODO
3568 else if (rq.target == xa[XA_MULTIPLE]) 3445 else if (rq.target == xa[XA_MULTIPLE])
3569 { 3446 {
3570 /* TODO: Handle MULTIPLE */ 3447 /* TODO: Handle MULTIPLE */
3571 } 3448 }
3572#endif 3449#endif
3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3574 { 3451 {
3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3576 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3453 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3577 ev.property = rq.property; 3454 ev.property = property;
3455 }
3456 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3457 {
3458 XChangeProperty (dpy, rq.requestor, property, rq.target,
3459 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3460 ev.property = property;
3578 } 3461 }
3579 else if (rq.target == XA_STRING 3462 else if (rq.target == XA_STRING
3580 || rq.target == xa[XA_TEXT] 3463 || rq.target == xa[XA_TEXT]
3581 || rq.target == xa[XA_COMPOUND_TEXT] 3464 || rq.target == xa[XA_COMPOUND_TEXT]
3582 || rq.target == xa[XA_UTF8_STRING] 3465 || rq.target == xa[XA_UTF8_STRING]
… …
3614 { 3497 {
3615 target = xa[XA_COMPOUND_TEXT]; 3498 target = xa[XA_COMPOUND_TEXT];
3616 style = enc_compound_text; 3499 style = enc_compound_text;
3617 } 3500 }
3618 3501
3619 if (selection.text) 3502 if (rq.selection == XA_PRIMARY && selection.text)
3620 { 3503 {
3621 cl = selection.text; 3504 cl = selection.text;
3622 selectlen = selection.len; 3505 selectlen = selection.len;
3506 }
3507 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3508 {
3509 cl = selection.clip_text;
3510 selectlen = selection.clip_len;
3623 } 3511 }
3624 else 3512 else
3625 { 3513 {
3626 cl = L""; 3514 cl = L"";
3627 selectlen = 0; 3515 selectlen = 0;
… …
3648 ct.value = (unsigned char *)cl; 3536 ct.value = (unsigned char *)cl;
3649 ct.nitems = selectlen; 3537 ct.nitems = selectlen;
3650 ct.encoding = target; 3538 ct.encoding = target;
3651 } 3539 }
3652 3540
3653 XChangeProperty (dpy, rq.requestor, rq.property, 3541 XChangeProperty (dpy, rq.requestor, property,
3654 ct.encoding, 8, PropModeReplace, 3542 ct.encoding, 8, PropModeReplace,
3655 ct.value, (int)ct.nitems); 3543 ct.value, (int)ct.nitems);
3656 ev.property = rq.property; 3544 ev.property = property;
3657 3545
3658 if (freect) 3546 if (freect)
3659 XFree (ct.value); 3547 XFree (ct.value);
3660 } 3548 }
3661 3549
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 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} 3551}
3680 3552
3681/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3554#ifdef USE_XIM
3683void 3555void
… …
3711 h += 2; min_it (h, nrow); 3583 h += 2; min_it (h, nrow);
3712 3584
3713 x -= 1; clamp_it (x, 0, ncol - w); 3585 x -= 1; clamp_it (x, 0, ncol - w);
3714 y -= 1; clamp_it (y, 0, nrow - h); 3586 y -= 1; clamp_it (y, 0, nrow - h);
3715 3587
3716 ov_x = x; ov_y = y; 3588 ov.x = x; ov.y = y;
3717 ov_w = w; ov_h = h; 3589 ov.w = w; ov.h = h;
3718 3590
3719 ov_text = new text_t *[h]; 3591 ov.text = new text_t *[h];
3720 ov_rend = new rend_t *[h]; 3592 ov.rend = new rend_t *[h];
3721 3593
3722 for (y = 0; y < h; y++) 3594 for (y = 0; y < h; y++)
3723 { 3595 {
3724 text_t *tp = ov_text[y] = new text_t[w]; 3596 text_t *tp = ov.text[y] = new text_t[w];
3725 rend_t *rp = ov_rend[y] = new rend_t[w]; 3597 rend_t *rp = ov.rend[y] = new rend_t[w];
3726 3598
3727 text_t t0, t1, t2; 3599 text_t t0, t1, t2;
3728 rend_t r = OVERLAY_RSTYLE; 3600 rend_t r = OVERLAY_RSTYLE;
3729 3601
3730 if (y == 0) 3602 if (y == 0)
… …
3749} 3621}
3750 3622
3751void 3623void
3752rxvt_term::scr_overlay_off () NOTHROW 3624rxvt_term::scr_overlay_off () NOTHROW
3753{ 3625{
3754 if (!ov_text) 3626 if (!ov.text)
3755 return; 3627 return;
3756 3628
3757 want_refresh = 1; 3629 want_refresh = 1;
3758 3630
3759 for (int y = 0; y < ov_h; y++) 3631 for (int y = 0; y < ov.h; y++)
3760 { 3632 {
3761 delete [] ov_text[y]; 3633 delete [] ov.text[y];
3762 delete [] ov_rend[y]; 3634 delete [] ov.rend[y];
3763 } 3635 }
3764 3636
3765 delete [] ov_text; ov_text = 0; 3637 delete [] ov.text; ov.text = 0;
3766 delete [] ov_rend; ov_rend = 0; 3638 delete [] ov.rend; ov.rend = 0;
3767} 3639}
3768 3640
3769void 3641void
3770rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3642rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3771{ 3643{
3772 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3644 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3773 return; 3645 return;
3774 3646
3775 x++, y++; 3647 x++, y++;
3776 3648
3777 ov_text[y][x] = text; 3649 ov.text[y][x] = text;
3778 ov_rend[y][x] = rend; 3650 ov.rend[y][x] = rend;
3779} 3651}
3780 3652
3781void 3653void
3782rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3654rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3783{ 3655{
… …
3802} 3674}
3803 3675
3804void 3676void
3805rxvt_term::scr_swap_overlay () NOTHROW 3677rxvt_term::scr_swap_overlay () NOTHROW
3806{ 3678{
3807 if (!ov_text) 3679 if (!ov.text)
3808 return; 3680 return;
3809 3681
3682 // hide cursor if it is within the overlay area
3683 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3684 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3685 screen.flags &= ~Screen_VisibleCursor;
3686
3810 // swap screen mem with overlay 3687 // swap screen mem with overlay
3811 for (int y = ov_h; y--; ) 3688 for (int y = ov.h; y--; )
3812 { 3689 {
3813 text_t *t1 = ov_text[y]; 3690 text_t *t1 = ov.text[y];
3814 rend_t *r1 = ov_rend[y]; 3691 rend_t *r1 = ov.rend[y];
3815 3692
3816 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3693 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; 3694 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3818 3695
3819 for (int x = ov_w; x--; ) 3696 for (int x = ov.w; x--; )
3820 { 3697 {
3821 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3698 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3822 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3699 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3823 } 3700 }
3824 } 3701 }

Diff Legend

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