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.256 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
153} 135}
154 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
172 if (nrow == 0) 169 if (nrow == 0)
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180 174
181 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
182 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
183 { 177 {
184 //TODO//FIXME 178 //TODO//FIXME
… …
237 selection.text = NULL; 231 selection.text = NULL;
238 selection.len = 0; 232 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
241 selection.clicks = 0; 235 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false; 236 selection.clip_text = NULL;
237 selection.clip_len = 0;
243 } 238 }
244 else 239 else
245 { 240 {
246 /* 241 /*
247 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 272 }
278 273
279 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 276
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
285 280
286 if (top_row) 281 if (top_row)
287 { 282 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
290 286
291 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 289
294 do 290 do
295 { 291 {
296 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 294 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 296
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 298 {
… …
330 int qcol = 0; 324 int qcol = 0;
331 325
332 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
333 if (p == ocur.row) 327 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
335 329
336 // fill a single destination line 330 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
338 { 332 {
339 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
366 } 360 }
367 while (p != pend && q > 0); 361 while (p != pend && q > 0);
368 362
369 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
370 top_row = q - term_start; 364 top_row = q - term_start;
371 365
372 // make sure all terminal lines exist 366 // make sure all terminal lines exist
373 while (top_row > 0) 367 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 369 }
376 else 370 else
377 { 371 {
378 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
379 373
380 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
381 { 375 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
384 378
… …
398 delete old_ta; 392 delete old_ta;
399 delete old_ra; 393 delete old_ra;
400 394
401 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
403 398
404 free (tabs); 399 free (tabs);
405 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
406 404
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 409
420 tt_winch (); 410 tt_winch ();
421 411
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 413}
… …
435 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
436 426
437 free (row_buf); 427 free (row_buf);
438 free (swap_buf); 428 free (swap_buf);
439 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
440 free (tabs); 432 free (tabs);
441 433 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 434 }
444} 435}
445 436
446/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
447/* 438/*
448 * Hard reset 439 * Hard/Soft reset
449 */ 440 */
450void 441void
451rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
452{ 443{
453 scr_release (); 444 scr_release ();
454 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
455 scr_reset (); 448 scr_reset ();
456 449
457 scr_clear (true); 450 scr_clear (true);
458 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
459} 468}
460 469
461/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
501 } 510 }
502 511
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
509#endif
510} 517}
511 518
512void 519void
513rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
514{ 521{
515 if (!OPTION (Opt_secondaryScreen)) 522 if (!option (Opt_secondaryScreen))
516 return; 523 return;
517 524
518 for (int i = prev_nrow; i--; ) 525 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 526 ::swap (ROW(i), swap_buf [i]);
520 527
… …
539 want_refresh = 1; 546 want_refresh = 1;
540 view_start = 0; 547 view_start = 0;
541 548
542 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
543 550
544 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
545 552
546#if NSCREENS 553#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
548 { 555 {
549 num_scr = 0; 556 num_scr = 0;
550 557
551 scr_swap_screen (); 558 scr_swap_screen ();
552 559
… …
555 screen.flags |= Screen_VisibleCursor; 562 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 563 swap.flags |= Screen_VisibleCursor;
557 } 564 }
558 else 565 else
559#endif 566#endif
560 if (OPTION (Opt_secondaryScroll)) 567 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 568 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 569}
563 570
564// clear WrapNext indicator, solidifying position on next line 571// clear WrapNext indicator, solidifying position on next line
565void 572void
… …
598/* 605/*
599 * Change the rendition style for following text 606 * Change the rendition style for following text
600 */ 607 */
601void 608void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 609rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 610{
604 if (set) 611 if (set)
605 rstyle |= style; 612 rstyle |= style;
606 else if (style == ~RS_None) 613 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 614 rstyle = DEFAULT_RSTYLE;
608 else 615 else
609 rstyle &= ~style; 616 rstyle &= ~style;
610 } 617}
611 618
612/* ------------------------------------------------------------------------- */ 619/* ------------------------------------------------------------------------- */
613/* 620/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 621 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 622 * count positive ==> scroll up
… …
624 want_refresh = 1; 631 want_refresh = 1;
625 num_scr += count; 632 num_scr += count;
626 633
627 if (count > 0 634 if (count > 0
628 && row1 == 0 635 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 636 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 637 {
631 top_row = max (top_row - count, -saveLines); 638 top_row = max (top_row - count, -saveLines);
632 639
633 // scroll everything up 'count' lines 640 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 641 term_start = (term_start + count) % total_rows;
… …
645 { 652 {
646 line_t &l = ROW(nrow - 1 - i); 653 line_t &l = ROW(nrow - 1 - i);
647 654
648 // optimize if already cleared, can be significant on slow machines 655 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 656 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 658 {
652 scr_blank_line (l, 0, l.l, rstyle); 659 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 660 l.l = 0;
654 l.f = 0; 661 l.f = 0;
655 } 662 }
… …
666 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
667 674
668 ::swap (l1, l2); 675 ::swap (l1, l2);
669 l2.touch (); 676 l2.touch ();
670 } 677 }
671 678
672 // move and/or clear selection, if any 679 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 680 if (selection.op && current_screen == selection.screen)
674 { 681 {
675 selection.beg.row -= count; 682 selection.beg.row -= count;
676 selection.end.row -= count; 683 selection.end.row -= count;
… …
684 selection.op = SELECTION_CLEAR; 691 selection.op = SELECTION_CLEAR;
685 } 692 }
686 } 693 }
687 694
688 // finally move the view window, if desired 695 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 696 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 697 && view_start != 0
691 && view_start != -saveLines) 698 && view_start != -saveLines)
692 scr_page (UP, count); 699 scr_page (UP, count);
693 700
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
712 { 719 {
713 /* move selected region too */ 720 /* move selected region too */
714 selection.beg.row -= count; 721 selection.beg.row -= count;
715 selection.end.row -= count; 722 selection.end.row -= count;
716 selection.mark.row -= count; 723 selection.mark.row -= count;
717 724
718 selection_check (0); 725 selection_check (0);
719 } 726 }
720 } 727 }
721 728
722 // use a simple and robust scrolling algorithm, this 729 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
776 } 783 }
777 } 784 }
778 785
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 789 int row = screen.cur.row;
785 790
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 792
788 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
789 794
790 while (str < strend) 795 while (str < strend)
791 { 796 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 798
794 if (c < 0x20) 799 if (expect_false (c < 0x20))
795 if (c == C0_LF) 800 if (c == C0_LF)
796 { 801 {
797 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
798 803
799 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
818 { 823 {
819 scr_tab (1, true); 824 scr_tab (1, true);
820 continue; 825 continue;
821 } 826 }
822 827
828 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
826 { 833 {
827 checksel = 0; 834 checksel = 0;
828 /* 835 /*
829 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 838 * should be a similar check.
832 */ 839 */
833 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
834 } 841 }
835 842
836 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
837 { 844 {
838 scr_do_wrap (); 845 scr_do_wrap ();
839 846
840 line->l = ncol; 847 line->l = ncol;
841 line->is_longer (1); 848 line->is_longer (1);
842 849
843 row = screen.cur.row; 850 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
845 } 852 }
846 853
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 856 c = 0xfffd;
850 857
851 // rely on wcwidth to tell us the character width, do wcwidth before 858 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 859 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 860 // drawing characters below as they might be invalid in the current
854 // locale. 861 // locale.
855 int width = WCWIDTH (c); 862 int width = WCWIDTH (c);
856 863
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 865 {
859 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 867 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
877 } 884 }
878 } 885 }
879 886
880 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
882 889
883 if (width != 0) 890 if (width != 0)
884 { 891 {
885#if !UNICODE_3 892#if !UNICODE_3
… …
891 c = 0xfffd; 898 c = 0xfffd;
892# endif 899# endif
893#endif 900#endif
894 901
895 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
896 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
897 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
898 && line->t[screen.cur.col + 1] == NOCHAR)) 906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
899 { 914 {
900 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' '; 916 c = NOCHAR;
923 // and try the same character next loop iteration 917 // and try the same character next loop iteration
924 --str; 918 --str;
925 } 919 }
926 920
927 line->touch (); 921 line->touch ();
… …
929 do 923 do
930 { 924 {
931 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
933 927
934 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 929 screen.cur.col++;
936 else 930 else
937 { 931 {
938 line->l = ncol; 932 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
941 break; 935 break;
942 } 936 }
943 937
944 c = NOCHAR; 938 c = NOCHAR;
945 } 939 }
946 while (--width > 0); 940 while (expect_false (--width > 0));
947 941
948 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 943 if (expect_false (!width))
950 { 944 {
951 line->touch (); 945 line->touch ();
952 946
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 { 948 {
955 line->t[c] = ' '; 949 line->t[c] = ' ';
956 line->r[c] = rend; 950 line->r[c] = rend;
957 } 951 }
958 } 952 }
959 } 953 }
954#if ENABLE_COMBINING
960 else // width == 0 955 else // width == 0
961 { 956 {
962#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 { 958 {
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
973 linep = line; 969 linep = line;
974 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
976 } 995 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 } 996 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 997#endif
1000 }
1001 } 998 }
1002 999
1003 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
1004 1001
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1007#endif
1008} 1003}
1009 1004
1010/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1011/* 1006/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1014 */ 1009 */
1015void 1010void
1016rxvt_term::scr_backspace () NOTHROW 1011rxvt_term::scr_backspace () NOTHROW
1017{ 1012{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1013 if (screen.cur.col == 0)
1021 { 1014 {
1022 if (screen.cur.row > 0) 1015 if (screen.cur.row > 0)
1023 { 1016 {
1024#ifdef TERMCAP_HAS_BW 1017#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1018 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1019 --screen.cur.row;
1027 return; 1020
1021 want_refresh = 1;
1028#endif 1022#endif
1029 } 1023 }
1030 } 1024 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1025 else
1032 scr_gotorc (0, -1, RELATIVE); 1026 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1027}
1036 1028
1037/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
1038/* 1030/*
1039 * Process Horizontal Tab 1031 * Process Horizontal Tab
… …
1062 x = i; 1054 x = i;
1063 1055
1064 if (!--count) 1056 if (!--count)
1065 break; 1057 break;
1066 } 1058 }
1067 else 1059 else
1068 ht &= l.t[i] == ' ' 1060 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1061 && RS_SAME (l.r[i], base_rend);
1070 1062
1071 if (count) 1063 if (count)
1072 x = ncol - 1; 1064 x = ncol - 1;
1073 1065
1074 // store horizontal tab commands as characters inside the text 1066 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1067 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1068 if (ht && option (Opt_pastableTabs))
1077 { 1069 {
1078 base_rend = SET_FONT (base_rend, 0); 1070 base_rend = SET_FONT (base_rend, 0);
1079 1071
1080 l.touch (x); 1072 l.touch (x);
1081 1073
… …
1188 } 1180 }
1189 } 1181 }
1190 else 1182 else
1191 { 1183 {
1192 if (screen.flags & Screen_Relative) 1184 if (screen.flags & Screen_Relative)
1185 {
1193 { /* relative origin mode */ 1186 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1187 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1188 min_it (screen.cur.row, screen.bscroll);
1196 } 1189 }
1197 else 1190 else
1198 screen.cur.row = row; 1191 screen.cur.row = row;
… …
1231/* 1224/*
1232 * Erase part or whole of a line 1225 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1226 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1228 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1229 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1230 */
1237void 1231void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1233{
1240 unsigned int col, num; 1234 unsigned int col, num;
… …
1249 line.touch (); 1243 line.touch ();
1250 line.is_longer (0); 1244 line.is_longer (0);
1251 1245
1252 switch (mode) 1246 switch (mode)
1253 { 1247 {
1248 case 3:
1249 if (screen.flags & Screen_WrapNext)
1250 return;
1251
1252 /* fall through */
1253
1254 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1255 col = screen.cur.col;
1256 num = ncol - col; 1256 num = ncol - col;
1257 min_it (line.l, col); 1257 min_it (line.l, col);
1258
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1259 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1260 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1261 break; 1262 break;
1263
1262 case 1: /* erase to beginning of line */ 1264 case 1: /* erase to beginning of line */
1263 col = 0; 1265 col = 0;
1264 num = screen.cur.col + 1; 1266 num = screen.cur.col + 1;
1267
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1268 break; 1271 break;
1272
1269 case 2: /* erase whole line */ 1273 case 2: /* erase whole line */
1270 col = 0; 1274 col = 0;
1271 num = ncol; 1275 num = ncol;
1272 line.l = 0; 1276 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1277 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1332 return; 1336 return;
1333 1337
1334 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1335 1339
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1336 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1346 {
1340 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1348
1349 if (mapped && !view_start)
1350 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False);
1342 } 1353 }
1343 else 1354 else
1344 { 1355 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1357
1358 if (mapped && !view_start)
1359 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1362 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start),
1364 (unsigned int)width,
1365 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1351 } 1369 }
1352 1370
1353 for (; num--; row++) 1371 for (; num--; row++)
1354 { 1372 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1377 }
1358} 1378}
1359 1379
1360#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1361void 1381void
… …
1435 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1436 */ 1456 */
1437void 1457void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1459{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1460 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1445 1462
1446 if (count <= 0) 1463 if (count <= 0)
1447 return; 1464 return;
… …
1449 scr_do_wrap (); 1466 scr_do_wrap ();
1450 1467
1451 selection_check (1); 1468 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1453 1470
1454 row = screen.cur.row; 1471 int row = screen.cur.row;
1455 1472
1456 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1457 1474
1458 line->touch (); 1475 line->touch ();
1459 line->is_longer (0); 1476 line->is_longer (0);
1460 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1461 switch (insdel) 1482 switch (insdel)
1462 { 1483 {
1463 case INSERT: 1484 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1491 {
1466 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1468 } 1494 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1495
1472 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1498 {
1475 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1478 else 1502 else
1503 {
1479 { /* shift selection */ 1504 /* shift selection */
1480 selection.beg.col += count; 1505 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1507 selection.end.col += count;
1483 } 1508 }
1484 } 1509 }
… …
1489 case ERASE: 1514 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1516 selection_check (1);
1492 screen.cur.col -= count; 1517 screen.cur.col -= count;
1493 1518
1494 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1524 break;
1497 1525
1498 case DELETE: 1526 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1500 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1534 {
1503 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1505 } 1537 }
1506 1538
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1540
1510 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1543 {
1513 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1623 */ 1654 */
1624void 1655void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1657{
1627 if (mode < 0) 1658 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1631} 1662}
1632 1663
1633/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1679 if (rvideo_state != on)
1649 { 1680 {
1650 rvideo_state = on; 1681 rvideo_state = on;
1651 1682
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1655#endif 1686#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1688
1661 XGCValues gcvalue; 1689 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1693
1666 scr_clear (); 1694 scr_clear ();
1667 scr_touch (true); 1695 scr_touch (true);
1668 } 1696 }
1669} 1697}
… …
1871 return true; 1899 return true;
1872} 1900}
1873 1901
1874#ifndef NO_BELL 1902#ifndef NO_BELL
1875void 1903void
1876rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1905{
1878 rvideo_bell = false; 1906 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1880} 1909}
1881#endif 1910#endif
1882 1911
1883/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1884void 1913void
… …
1886{ 1915{
1887#ifndef NO_BELL 1916#ifndef NO_BELL
1888 1917
1889# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1892# endif 1921# endif
1893 XMapWindow (xdisp, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1894# endif 1923# endif
1895 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1896 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1897 { 1931 {
1898 rvideo_bell = true; 1932 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1934 flush ();
1901 1935
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1903 } 1937 }
1904 else 1938 else
1905 XBell (xdisp, 0); 1939 XBell (dpy, 0);
1906 1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1907#endif 1941#endif
1908} 1942}
1909 1943
1910/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1945/* ARGSUSED */
1912void 1946void
1913rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1914{ 1948{
1915#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1916 int nrows, row_start; 1950 int nrows, row_start;
1917 FILE *fd; 1951 FILE *fd = popen_printer ();
1918 1952
1919 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1920 return; 1954 return;
1921 1955
1922 if (fullhist) 1956 if (fullhist)
1923 { 1957 {
1924 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1930 row_start = view_start; 1964 row_start = view_start;
1931 } 1965 }
1932 1966
1933 wctomb (0, 0); 1967 wctomb (0, 0);
1934 1968
1935 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1936 { 1970 {
1937 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1938 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1939 1973
1940 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1969 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1970 */ 2004 */
1971void 2005void
1972rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1973{ 2007{
1974 unsigned char must_clear, /* use draw_string not draw_image_string */
1975 showcursor; /* show the cursor */
1976 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1977 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1978 int i; /* tmp */ 2010 int i; /* tmp */
1979#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1980 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
1981#endif 2013#endif
1982 rend_t *crp; // cursor rendition pointer 2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */
1983 2017
1984 want_refresh = 0; /* screen is current */ 2018 want_refresh = 0; /* screen is current */
1985 2019
1986 if (refresh_type == NO_REFRESH || !mapped) 2020 if (refresh_type == NO_REFRESH || !mapped)
1987 return; 2021 return;
1988 2022
1989 /* 2023 /*
1990 * A: set up vars 2024 * A: set up vars
1991 */ 2025 */
1992 must_clear = 0;
1993 refresh_count = 0; 2026 refresh_count = 0;
1994 2027
1995#if XPM_BACKGROUND 2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1996 must_clear |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1997#endif
1998#if TRANSPARENT
1999 must_clear |= OPTION (Opt_transparent) && am_transparent;
2000#endif 2032#endif
2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2002 2034
2003 /* 2035 /*
2004 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2005 */ 2037 */
2006 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2007 2046
2008 /* 2047 /*
2009 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2010 */ 2049 */
2011 { 2050 {
2012 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2013 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */
2015 2052
2016 showcursor = (screen.flags & Screen_VisibleCursor);
2017#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2018 if (hidden_cursor) 2054 if (hidden_cursor)
2019 showcursor = 0; 2055 showcursor = 0;
2020#endif 2056#endif
2021 2057
… …
2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2027 col--; 2063 col--;
2028 2064
2029 crp = &ROW(screen.cur.row).r[col]; 2065 crp = &ROW(screen.cur.row).r[col];
2030 2066
2031 if (showcursor && focus) 2067#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol1 = fgcolor_of (rstyle);
2075#else
2076 ccol1 = Color_fg;
2077#endif
2078
2079#ifndef NO_CURSORCOLOR
2080 if (ISSET_PIXCOLOR (Color_cursor2))
2081 ccol2 = Color_cursor2;
2082 else
2083#endif
2084#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2085 ccol2 = bgcolor_of (rstyle);
2086#else
2087 ccol2 = Color_bg;
2088#endif
2089
2090 if (focus)
2032 { 2091 {
2033 if (OPTION (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2034 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2035 else 2094 else
2036 { 2095 {
2037 *crp ^= RS_RVid; 2096 *crp ^= RS_RVid;
2038
2039#ifndef NO_CURSORCOLOR
2040 cc1 = *crp & (RS_fgMask | RS_bgMask);
2041 if (ISSET_PIXCOLOR (Color_cursor))
2042 ccol1 = Color_cursor;
2043 else
2044#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2045 ccol1 = fgcolor_of (rstyle);
2046#else
2047 ccol1 = Color_fg;
2048#endif
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057 *crp = SET_FGCOLOR (*crp, ccol1); 2097 *crp = SET_FGCOLOR (*crp, ccol1);
2058 *crp = SET_BGCOLOR (*crp, ccol2); 2098 *crp = SET_BGCOLOR (*crp, ccol2);
2059#endif
2060 } 2099 }
2061 } 2100 }
2062 } 2101 }
2063 2102
2064 /* make sure no outline cursor is left around */ 2103 /* make sure no outline cursor is left around */
… …
2091 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2092 } 2131 }
2093 } 2132 }
2094 } 2133 }
2095 2134
2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2097#if ENABLE_OVERLAY
2098 scr_swap_overlay ();
2099#endif
2100
2101#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2102 /* 2136 /*
2103 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2104 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2105 */ 2139 */
2106 if (!display->is_local 2140 if (!display->is_local
2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2141 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2108 && abs (num_scr) < nrow && !must_clear) 2142 && abs (num_scr) < nrow && !have_bg)
2109 { 2143 {
2110 int16_t nits; 2144 int16_t nits;
2145 int i = num_scr;
2111 int j; 2146 int j;
2112 int len, wlen; 2147 int len, wlen;
2113 dLocal (int, num_scr); 2148 dLocal (int, num_scr);
2114 2149
2115 j = nrow; 2150 j = nrow;
2116 wlen = len = -1; 2151 wlen = len = -1;
2117 row = i > 0 ? 0 : j - 1; 2152 row = i > 0 ? 0 : j - 1;
2153
2118 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2154 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2119 { 2155 {
2120 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2156 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2121 { 2157 {
2122 line_t s = ROW(view_start + row); 2158 line_t s = ROW(view_start + row);
… …
2143 wlen = row; 2179 wlen = row;
2144 continue; 2180 continue;
2145 } 2181 }
2146 } 2182 }
2147 2183
2148 if (len != -1) 2184 if (len >= 0)
2149 { 2185 {
2150 /* also comes here at end if needed because of >= above */ 2186 /* also comes here at end if needed because of >= above */
2151 if (wlen < len) 2187 if (wlen < len)
2152 ::swap (wlen, len); 2188 ::swap (wlen, len);
2153 2189
2190 XGCValues gcv;
2191
2192 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2154 XCopyArea (xdisp, vt, vt, 2193 XCopyArea (dpy, vt, vt,
2155 gc, 0, Row2Pixel (len + i), 2194 gc, 0, Row2Pixel (len + i),
2156 (unsigned int)this->width, 2195 (unsigned int)this->width,
2157 (unsigned int)Height2Pixel (wlen - len + 1), 2196 (unsigned int)Height2Pixel (wlen - len + 1),
2158 0, Row2Pixel (len)); 2197 0, Row2Pixel (len));
2198 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2199
2159 len = -1; 2200 len = -1;
2160 } 2201 }
2161 } 2202 }
2162 } 2203 }
2163#endif 2204#endif
… …
2187 continue; 2228 continue;
2188 2229
2189 // redraw one or more characters 2230 // redraw one or more characters
2190 2231
2191 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2192 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2193 --col; 2234 --col;
2194 2235
2195 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2196 text_t *text = stp + col; 2237 text_t *text = stp + col;
2197 int count = 1; 2238 int count = 1;
2198 2239
2199 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2200 drp[col] = rend; 2241 drp[col] = rend;
… …
2204 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2205 { 2246 {
2206 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2207 { 2248 {
2208 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2209 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2210 count++; 2252 count++;
2211 i++; 2253 i++;
2212 2254
2213 continue; 2255 continue;
2214 } 2256 }
… …
2219 count++; 2261 count++;
2220 2262
2221 if (stp[col] != dtp[col] 2263 if (stp[col] != dtp[col]
2222 || !RS_SAME (srp[col], drp[col])) 2264 || !RS_SAME (srp[col], drp[col]))
2223 { 2265 {
2224 if (must_clear && (i++ > count / 2)) 2266 if (have_bg && (i++ > count / 2))
2225 break; 2267 break;
2226 2268
2227 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2228 drp[col] = rend; 2270 drp[col] = rend;
2229 i = 0; 2271 i = 0;
2230 } 2272 }
2231 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2273 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2232 break; 2274 break;
2233 } 2275 }
2234 2276
2235 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2236 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2237 2279
2238 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2239 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2240 count++, i--; 2282 count++, i--;
2241 2283
2242 /* 2284 /*
2243 * Determine the attributes for the string 2285 * Determine the attributes for the string
2244 */ 2286 */
2245 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2246 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2247 2289
2248 // only do special processing if any attributes are set, which is unlikely 2290 // only do special processing if any attributes are set, which is unlikely
2249 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2250 { 2292 {
2251#if ENABLE_STYLES
2252 // "careful" (too wide) character handling
2253
2254 // include previous careful character(s) if possible, looks nicer (best effort...)
2255 while (text > stp
2256 && srp[text - stp - 1] & RS_Careful
2257 && RS_SAME (rend, srp[text - stp - 1]))
2258 text--, count++, xpixel -= fwidth;
2259
2260 // force redraw after "careful" characters to avoid pixel droppings
2261 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2262 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2263
2264 // force redraw before "careful" characters to avoid pixel droppings
2265 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2266 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2267#endif
2268
2269 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2270 2294
2271#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2272 if (rend & RS_Bold
2273 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2274 { 2297 {
2275 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2276 fore = Color_BD; 2299 fore = Color_BD;
2277# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2278 else 2301 else
2279 invert = !invert; 2302 invert = !invert;
2280# endif 2303# endif
2281 } 2304 }
2282 2305
2283 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2284 && fore == Color_fg)
2285 { 2307 {
2286 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2287 fore = Color_IT; 2309 fore = Color_IT;
2288# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2289 else 2311 else
2290 invert = !invert; 2312 invert = !invert;
2291# endif 2313# endif
2292 } 2314 }
2293 2315
2294 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2317 fore = Color_UL;
2318#endif
2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333 back = Color_HC;
2334 invert = 0;
2335 }
2336 }
2296#endif 2337#endif
2297 2338
2298 if (invert) 2339 if (invert)
2299 { 2340 {
2300 ::swap (fore, back); 2341 ::swap (fore, back);
2301 2342
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (ISSET_PIXCOLOR (Color_RV))
2304 back = Color_RV;
2305
2306 if (fore == back) 2344 if (fore == back)
2307 { 2345 {
2308 fore = Color_bg; 2346 fore = Color_bg;
2309 back = Color_fg; 2347 back = Color_fg;
2310 } 2348 }
… …
2312 } 2350 }
2313 2351
2314#ifdef TEXT_BLINK 2352#ifdef TEXT_BLINK
2315 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2353 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2316 { 2354 {
2317 if (!text_blink_ev.active) 2355 if (!text_blink_ev.is_active ())
2318 { 2356 {
2319 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2357 text_blink_ev.again ();
2320 hidden_text = 0; 2358 hidden_text = 0;
2321 } 2359 }
2322 else if (hidden_text) 2360 else if (hidden_text)
2323 fore = back; 2361 fore = back;
2324 } 2362 }
2325#endif 2363#endif
2364
2365#if ENABLE_STYLES
2366 // "careful" (too wide) character handling
2367
2368 // include previous careful character(s) if possible, looks nicer (best effort...)
2369 while (text > stp
2370 && srp[text - stp - 1] & RS_Careful
2371 && RS_SAME (rend, srp[text - stp - 1]))
2372 text--, count++, xpixel -= fwidth;
2373
2374 // force redraw after "careful" characters to avoid pixel droppings
2375 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2376 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2377
2378 // force redraw before "careful" characters to avoid pixel droppings
2379 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2380 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2381#endif
2326 } 2382 }
2327 2383
2328 /* 2384 /*
2329 * Actually do the drawing of the string here 2385 * Actually do the drawing of the string here
2330 */ 2386 */
2331 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2332 2388
2333 if (back == fore) 2389 if (expect_true (have_bg && back == Color_bg))
2334 font->clear_rect (*drawable, xpixel, ypixel,
2335 fwidth * count, fheight,
2336 back);
2337 else if (back == Color_bg)
2338 { 2390 {
2339 if (must_clear) 2391 // this is very ugly, maybe push it into ->draw?
2340 {
2341 CLEAR_CHARS (xpixel, ypixel, count);
2342 2392
2343 for (i = 0; i < count; i++) /* don't draw empty strings */ 2393 for (i = 0; i < count; i++) /* don't draw empty strings */
2344 if (text[i] != ' ') 2394 if (text[i] != ' ')
2345 { 2395 {
2346 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2347 break; 2397 goto did_clear;
2348 }
2349 } 2398 }
2350 else 2399
2351 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2400 CLEAR_CHARS (xpixel, ypixel, count);
2401 did_clear: ;
2352 } 2402 }
2353 else 2403 else
2354 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2355 2405
2356 if (rend & RS_Uline && font->descent > 1 && fore != back) 2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2357 { 2407 {
2358#if ENABLE_FRILLS 2408#if ENABLE_FRILLS
2359 if (ISSET_PIXCOLOR (Color_underline)) 2409 if (ISSET_PIXCOLOR (Color_underline))
2360 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2410 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2361 else 2411 else
2362#endif 2412#endif
2363 XSetForeground (xdisp, gc, pix_colors[fore]); 2413 XSetForeground (dpy, gc, pix_colors[fore]);
2364 2414
2365 XDrawLine (xdisp, drawBuffer, gc, 2415 XDrawLine (dpy, vt, gc,
2366 xpixel, ypixel + font->ascent + 1, 2416 xpixel, ypixel + font->ascent + 1,
2367 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2368 } 2418 }
2369 } /* for (col....) */ 2419 } /* for (col....) */
2370 } /* for (row....) */ 2420 } /* for (row....) */
2371 2421
2372#if ENABLE_OVERLAY
2373 scr_swap_overlay ();
2374#endif
2375 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2376
2377 /* 2422 /*
2378 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2379 */ 2424 */
2380 if (showcursor) 2425 if (showcursor)
2381 { 2426 {
2382 if (focus) 2427 if (focus)
2383 { 2428 {
2384 if (OPTION (Opt_cursorUnderline)) 2429 if (option (Opt_cursorUnderline))
2385 *crp ^= RS_Uline; 2430 *crp ^= RS_Uline;
2386 else 2431 else
2387 { 2432 {
2388 *crp ^= RS_RVid; 2433 *crp ^= RS_RVid;
2389#ifndef NO_CURSORCOLOR 2434#ifndef NO_CURSORCOLOR
… …
2403 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2448 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2404 cursorwidth++; 2449 cursorwidth++;
2405 2450
2406#ifndef NO_CURSORCOLOR 2451#ifndef NO_CURSORCOLOR
2407 if (ISSET_PIXCOLOR (Color_cursor)) 2452 if (ISSET_PIXCOLOR (Color_cursor))
2408 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2453 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2454 else
2409#endif 2455#endif
2456 XSetForeground (dpy, gc, pix_colors[ccol1]);
2410 2457
2411 XDrawRectangle (xdisp, drawBuffer, gc, 2458 XDrawRectangle (dpy, vt, gc,
2412 Col2Pixel (col), 2459 Col2Pixel (col),
2413 Row2Pixel (oldcursor.row), 2460 Row2Pixel (oldcursor.row),
2414 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2461 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2415 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2462 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2416 } 2463 }
2417 } 2464 }
2418 2465
2419 /* 2466 /*
2420 * H: cleanup selection 2467 * H: cleanup selection
2421 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2422 scr_reverse_selection (); 2474 scr_reverse_selection ();
2423 2475
2476 screen.flags = old_screen_flags;
2424 num_scr = 0; 2477 num_scr = 0;
2425 num_scr_allow = 1; 2478 num_scr_allow = 1;
2426} 2479}
2427 2480
2428void 2481void
… …
2451} 2504}
2452 2505
2453void 2506void
2454rxvt_term::scr_recolour () NOTHROW 2507rxvt_term::scr_recolour () NOTHROW
2455{ 2508{
2456 if (1 2509#ifdef HAVE_BG_PIXMAP
2457#if TRANSPARENT 2510 bgPixmap.apply ();
2458 && !am_transparent 2511#else
2459#endif 2512
2460#if XPM_BACKGROUND
2461 && !bgPixmap.pixmap
2462#endif
2463 )
2464 {
2465 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2466 XClearWindow (xdisp, parent[0]); 2514 XClearWindow (dpy, parent[0]);
2467 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2468#if HAVE_SCROLLBARS 2516
2469 if (scrollBar.win) 2517 if (scrollBar.win)
2470 { 2518 {
2471 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2472 scrollBar.setIdle (); 2520 scrollBar.state = STATE_IDLE;
2473 scrollbar_show (0); 2521 scrollBar.show (0);
2474 }
2475#endif
2476 } 2522 }
2477 2523
2524#endif
2525
2526 /* bgPixmap.apply () does not do the following : */
2478 scr_clear (); 2527 scr_clear ();
2479 scr_touch (true); 2528 scr_touch (true);
2480 want_refresh = 1; 2529 want_refresh = 1;
2481} 2530}
2482 2531
… …
2489 2538
2490 num_scr_allow = 0; 2539 num_scr_allow = 0;
2491 want_refresh = 1; 2540 want_refresh = 1;
2492 2541
2493 if (really) 2542 if (really)
2494 XClearWindow (xdisp, vt); 2543 XClearWindow (dpy, vt);
2495} 2544}
2496 2545
2497void 2546void
2498rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2547rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2499{ 2548{
… …
2552 { 2601 {
2553#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2554 if (selection.rect) 2603 if (selection.rect)
2555 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2556 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2557 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2558 else 2607 else
2559#endif 2608#endif
2560 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2561 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2562 RS_RVid); 2611 RS_Sel | RS_RVid);
2563 } 2612 }
2564} 2613}
2565 2614
2566/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2567/* 2616/*
… …
2574{ 2623{
2575 int row, wrote; 2624 int row, wrote;
2576 unsigned int width, towrite; 2625 unsigned int width, towrite;
2577 char r1[] = "\n"; 2626 char r1[] = "\n";
2578 2627
2579 for (row = saveLines - nsaved; 2628 for (row = saveLines + top_row;
2580 row < saveLines + nrow - 1; row++) 2629 row < saveLines + nrow - 1; row++)
2581 { 2630 {
2582 width = row_buf[row].l >= 0 ? row_buf[row].l 2631 width = row_buf[row].l >= 0 ? row_buf[row].l
2583 : ncol; 2632 : ncol;
2584 for (towrite = width; towrite; towrite -= wrote) 2633 for (towrite = width; towrite; towrite -= wrote)
… …
2635 /* convert normal newline chars into common keyboard Return key sequence */ 2684 /* convert normal newline chars into common keyboard Return key sequence */
2636 for (unsigned int i = 0; i < len; i++) 2685 for (unsigned int i = 0; i < len; i++)
2637 if (data[i] == C0_LF) 2686 if (data[i] == C0_LF)
2638 data[i] = C0_CR; 2687 data[i] = C0_CR;
2639 2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[200~");
2691
2640 tt_write (data, len); 2692 tt_write (data, len);
2693
2694 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~");
2641} 2696}
2642 2697
2643/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2644/* 2699/*
2645 * Respond to a notification that a primary selection has been sent 2700 * Respond to a notification that a primary selection has been sent
… …
2674 } 2729 }
2675 2730
2676 unsigned long bytes_after; 2731 unsigned long bytes_after;
2677 XTextProperty ct; 2732 XTextProperty ct;
2678 2733
2679 if (XGetWindowProperty (xdisp, win, prop, 2734 if (XGetWindowProperty (dpy, win, prop,
2680 0, PROP_SIZE / 4, 2735 0, PROP_SIZE / 4,
2681 delete_prop, AnyPropertyType, 2736 delete_prop, AnyPropertyType,
2682 &ct.encoding, &ct.format, 2737 &ct.encoding, &ct.format,
2683 &ct.nitems, &bytes_after, 2738 &ct.nitems, &bytes_after,
2684 &ct.value) != Success) 2739 &ct.value) != Success)
… …
2693 if (bytes_after) 2748 if (bytes_after)
2694 { 2749 {
2695 // fetch and append remaining data 2750 // fetch and append remaining data
2696 XTextProperty ct2; 2751 XTextProperty ct2;
2697 2752
2698 if (XGetWindowProperty (xdisp, win, prop, 2753 if (XGetWindowProperty (dpy, win, prop,
2699 ct.nitems / 4, (bytes_after + 3) / 4, 2754 ct.nitems / 4, (bytes_after + 3) / 4,
2700 delete_prop, AnyPropertyType, 2755 delete_prop, AnyPropertyType,
2701 &ct2.encoding, &ct2.format, 2756 &ct2.encoding, &ct2.format,
2702 &ct2.nitems, &bytes_after, 2757 &ct2.nitems, &bytes_after,
2703 &ct2.value) != Success) 2758 &ct2.value) != Success)
… …
2716 2771
2717 if (ct.encoding == xa[XA_INCR]) 2772 if (ct.encoding == xa[XA_INCR])
2718 { 2773 {
2719 // INCR selection, start handshake 2774 // INCR selection, start handshake
2720 if (!delete_prop) 2775 if (!delete_prop)
2721 XDeleteProperty (xdisp, win, prop); 2776 XDeleteProperty (dpy, win, prop);
2722 2777
2723 selection_wait = Sel_incr; 2778 selection_wait = Sel_incr;
2724 incr_buf_fill = 0; 2779 incr_buf_fill = 0;
2725 incr_ev.start (NOW + 10); 2780 incr_ev.start (10);
2726 2781
2727 goto bailout; 2782 goto bailout;
2728 } 2783 }
2729 2784
2730 if (ct.nitems == 0) 2785 if (ct.nitems == 0)
… …
2739 ct.nitems = incr_buf_fill; 2794 ct.nitems = incr_buf_fill;
2740 incr_buf = 0; 2795 incr_buf = 0;
2741 incr_buf_size = 0; 2796 incr_buf_size = 0;
2742 incr_ev.stop (); 2797 incr_ev.stop ();
2743 } 2798 }
2744 else 2799 else
2745 { 2800 {
2746 if (selection_wait == Sel_normal 2801 if (selection_wait == Sel_normal
2747 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2748 { 2803 {
2749 /* 2804 /*
… …
2756 goto bailout; 2811 goto bailout;
2757 } 2812 }
2758 } 2813 }
2759 else if (selection_wait == Sel_incr) 2814 else if (selection_wait == Sel_incr)
2760 { 2815 {
2761 incr_ev.start (NOW + 10); 2816 incr_ev.start (10);
2762 2817
2763 while (incr_buf_fill + ct.nitems > incr_buf_size) 2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2764 { 2819 {
2765 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2766 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2787 paste (s, strlen (s)); 2842 paste (s, strlen (s));
2788 free (s); 2843 free (s);
2789 } 2844 }
2790 else 2845 else
2791#endif 2846#endif
2792 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2793 && cl) 2848 && cl)
2794 { 2849 {
2795 for (int i = 0; i < cr; i++) 2850 for (int i = 0; i < cr; i++)
2796 paste (cl[i], strlen (cl[i])); 2851 paste (cl[i], strlen (cl[i]));
2797 2852
… …
2806 if (selection_wait == Sel_normal) 2861 if (selection_wait == Sel_normal)
2807 selection_wait = Sel_none; 2862 selection_wait = Sel_none;
2808} 2863}
2809 2864
2810void 2865void
2811rxvt_term::incr_cb (time_watcher &w) NOTHROW 2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2812{ 2867{
2813 selection_wait = Sel_none; 2868 selection_wait = Sel_none;
2814 2869
2815 incr_buf_size = 0; 2870 incr_buf_size = 0;
2816 free (incr_buf); 2871 free (incr_buf);
… …
2827 selection_paste (win, prop, true); 2882 selection_paste (win, prop, true);
2828} 2883}
2829 2884
2830/* ------------------------------------------------------------------------- */ 2885/* ------------------------------------------------------------------------- */
2831/* 2886/*
2832 * Request the current selection: 2887 * Request the current selection:
2833 * Order: > internal selection if available 2888 * Order: > internal selection if available
2834 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2835 * > CUT_BUFFER0 2890 * > CUT_BUFFER0
2836 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2837 * will auto fallback to CUT_BUFFER0 2892 * will auto fallback to CUT_BUFFER0
… …
2839 */ 2894 */
2840void 2895void
2841rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2842{ 2897{
2843 if (selection.text && selnum == Sel_Primary) 2898 if (selection.text && selnum == Sel_Primary)
2899 {
2844 { /* internal selection */ 2900 /* internal selection */
2845 char *str = rxvt_wcstombs (selection.text, selection.len); 2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2846 paste (str, strlen (str)); 2902 paste (str, strlen (str));
2847 free (str); 2903 free (str);
2848 return; 2904 return;
2849 } 2905 }
… …
2853 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2854 2910
2855#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2856 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2857 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2858 return; 2914 return;
2859#else 2915#else
2860 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2861 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2862 return; 2918 return;
2863#endif 2919#endif
2864 } 2920 }
2865 2921
2866 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2867 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2879 else if (selnum == Sel_Secondary) 2935 else if (selnum == Sel_Secondary)
2880 sel = XA_SECONDARY; 2936 sel = XA_SECONDARY;
2881 else 2937 else
2882 sel = xa[XA_CLIPBOARD]; 2938 sel = xa[XA_CLIPBOARD];
2883 2939
2884 if (XGetSelectionOwner (xdisp, sel) != None) 2940 if (XGetSelectionOwner (dpy, sel) != None)
2885 { 2941 {
2886 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2887 vt, selection_request_time); 2943 vt, selection_request_time);
2888 return 1; 2944 return 1;
2889 } 2945 }
2890 2946
2891 return 0; 2947 return 0;
… …
2895/* 2951/*
2896 * Clear all selected text 2952 * Clear all selected text
2897 * EXT: SelectionClear 2953 * EXT: SelectionClear
2898 */ 2954 */
2899void 2955void
2900rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2901{ 2957{
2958 if (!clipboard)
2959 {
2902 want_refresh = 1; 2960 want_refresh = 1;
2903 free (selection.text); 2961 free (selection.text);
2904 selection.text = NULL; 2962 selection.text = NULL;
2905 selection.len = 0; 2963 selection.len = 0;
2906 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2907 2965
2908 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2909 display->selection_owner = 0; 2967 display->selection_owner = 0;
2968 }
2969 else
2970 {
2971 free (selection.clip_text);
2972 selection.clip_text = NULL;
2973 selection.clip_len = 0;
2974
2975 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0;
2977 }
2978}
2979
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2910} 2992}
2911 2993
2912/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2913/* 2995/*
2914 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3040 3122
3041 selection_grab (tm); 3123 selection_grab (tm);
3042} 3124}
3043 3125
3044bool 3126bool
3045rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3046{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3047 selection_time = tm; 3133 selection_time = tm;
3048 3134 sel = XA_PRIMARY;
3049 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3050 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3051 { 3135 }
3136 else
3137 {
3138 clipboard_time = tm;
3139 sel = xa[XA_CLIPBOARD];
3140 }
3141
3142 XSetSelectionOwner (dpy, sel, vt, tm);
3143 if (XGetSelectionOwner (dpy, sel) == vt)
3144 {
3052 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3053 return true; 3146 return true;
3054 } 3147 }
3055 else 3148 else
3056 { 3149 {
3057 selection_clear (); 3150 selection_clear (clipboard);
3058 return false; 3151 return false;
3059 } 3152 }
3060 3153
3061#if 0 3154#if 0
3062 XTextProperty ct; 3155 XTextProperty ct;
3063 3156
3064 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3157 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3065 { 3158 {
3066 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3159 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3067 XFree (ct.value); 3160 XFree (ct.value);
3068 } 3161 }
3069#endif 3162#endif
… …
3115 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3208 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3116 3209
3117 while (selection.mark.col > 0 3210 while (selection.mark.col > 0
3118 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3211 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3119 --selection.mark.col; 3212 --selection.mark.col;
3120 3213
3121 if (selection.op) 3214 if (selection.op)
3215 {
3122 { /* clear the old selection */ 3216 /* clear the old selection */
3123 selection.beg.row = selection.end.row = selection.mark.row; 3217 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = selection.end.col = selection.mark.col; 3218 selection.beg.col = selection.end.col = selection.mark.col;
3125 } 3219 }
3126 3220
3127 selection.op = SELECTION_INIT; 3221 selection.op = SELECTION_INIT;
… …
3316 * a point/word/line which is either the start or end of the selection 3410 * a point/word/line which is either the start or end of the selection
3317 * and it was decided by whichever point/word/line was `fixed' at the 3411 * and it was decided by whichever point/word/line was `fixed' at the
3318 * time of the most recent button3 press 3412 * time of the most recent button3 press
3319 */ 3413 */
3320 if (button3 && buttonpress) 3414 if (button3 && buttonpress)
3415 {
3321 { /* button3 press */ 3416 /* button3 press */
3322 /* 3417 /*
3323 * first determine which edge of the selection we are closest to 3418 * first determine which edge of the selection we are closest to
3324 */ 3419 */
3325 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3420 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3326 || (!ROWCOL_IS_AFTER (pos, selection.end) 3421 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3344 selection.mark.row = selection.beg.row; 3439 selection.mark.row = selection.beg.row;
3345 selection.mark.col = selection.beg.col; 3440 selection.mark.col = selection.beg.col;
3346 } 3441 }
3347 } 3442 }
3348 else 3443 else
3444 {
3349 { /* button1 drag or button3 drag */ 3445 /* button1 drag or button3 drag */
3350 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3446 if (ROWCOL_IS_AFTER (selection.mark, pos))
3351 { 3447 {
3352 if (selection.mark.row == selection.end.row 3448 if (selection.mark.row == selection.end.row
3353 && selection.mark.col == selection.end.col 3449 && selection.mark.col == selection.end.col
3354 && clickchange 3450 && clickchange
… …
3397 selection_delimit_word (DN, &selection.end, &selection.end); 3493 selection_delimit_word (DN, &selection.end, &selection.end);
3398 } 3494 }
3399 else if (selection.clicks == 3) 3495 else if (selection.clicks == 3)
3400 { 3496 {
3401#if ENABLE_FRILLS 3497#if ENABLE_FRILLS
3402 if (OPTION (Opt_tripleclickwords)) 3498 if (option (Opt_tripleclickwords))
3403 { 3499 {
3404 selection_delimit_word (UP, &selection.beg, &selection.beg); 3500 selection_delimit_word (UP, &selection.beg, &selection.beg);
3405 3501
3406 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3502 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3407 { 3503 {
… …
3435 selection.end.row++; 3531 selection.end.row++;
3436 } 3532 }
3437 } 3533 }
3438 3534
3439 if (button3 && buttonpress) 3535 if (button3 && buttonpress)
3536 {
3440 { /* mark may need to be changed */ 3537 /* mark may need to be changed */
3441 if (closeto == LEFT) 3538 if (closeto == LEFT)
3442 { 3539 {
3443 selection.mark.row = selection.end.row; 3540 selection.mark.row = selection.end.row;
3444 selection.mark.col = selection.end.col - (selection.clicks == 2); 3541 selection.mark.col = selection.end.col - (selection.clicks == 2);
3445 } 3542 }
… …
3542 *target++ = xa[XA_COMPOUND_TEXT]; 3639 *target++ = xa[XA_COMPOUND_TEXT];
3543#if X_HAVE_UTF8_STRING 3640#if X_HAVE_UTF8_STRING
3544 *target++ = xa[XA_UTF8_STRING]; 3641 *target++ = xa[XA_UTF8_STRING];
3545#endif 3642#endif
3546 3643
3547 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3644 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3548 32, PropModeReplace, 3645 32, PropModeReplace,
3549 (unsigned char *)target_list, target - target_list); 3646 (unsigned char *)target_list, target - target_list);
3550 ev.property = rq.property; 3647 ev.property = rq.property;
3551 } 3648 }
3552#if TODO // TODO 3649#if TODO // TODO
3553 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3554 { 3651 {
3555 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3556 } 3653 }
3557#endif 3654#endif
3558 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3559 { 3656 {
3560 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3561 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3658 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property;
3660 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3562 ev.property = rq.property; 3665 ev.property = rq.property;
3563 } 3666 }
3564 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3565 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3566 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3599 { 3702 {
3600 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3601 style = enc_compound_text; 3704 style = enc_compound_text;
3602 } 3705 }
3603 3706
3604 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3605 { 3708 {
3606 cl = selection.text; 3709 cl = selection.text;
3607 selectlen = selection.len; 3710 selectlen = selection.len;
3711 }
3712 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3713 {
3714 cl = selection.clip_text;
3715 selectlen = selection.clip_len;
3608 } 3716 }
3609 else 3717 else
3610 { 3718 {
3611 cl = L""; 3719 cl = L"";
3612 selectlen = 0; 3720 selectlen = 0;
… …
3623 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3731 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3624 ct.nitems = strlen ((char *)ct.value); 3732 ct.nitems = strlen ((char *)ct.value);
3625 } 3733 }
3626 else 3734 else
3627#endif 3735#endif
3628 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3736 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3629 freect = 1; 3737 freect = 1;
3630 else 3738 else
3631 { 3739 {
3632 /* if we failed to convert then send it raw */ 3740 /* if we failed to convert then send it raw */
3633 ct.value = (unsigned char *)cl; 3741 ct.value = (unsigned char *)cl;
3634 ct.nitems = selectlen; 3742 ct.nitems = selectlen;
3635 ct.encoding = target; 3743 ct.encoding = target;
3636 } 3744 }
3637 3745
3638 XChangeProperty (xdisp, rq.requestor, rq.property, 3746 XChangeProperty (dpy, rq.requestor, rq.property,
3639 ct.encoding, 8, PropModeReplace, 3747 ct.encoding, 8, PropModeReplace,
3640 ct.value, (int)ct.nitems); 3748 ct.value, (int)ct.nitems);
3641 ev.property = rq.property; 3749 ev.property = rq.property;
3642 3750
3643 if (freect) 3751 if (freect)
3644 XFree (ct.value); 3752 XFree (ct.value);
3645 } 3753 }
3646 3754
3647 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3755 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3648}
3649
3650/* ------------------------------------------------------------------------- *
3651 * MOUSE ROUTINES *
3652 * ------------------------------------------------------------------------- */
3653
3654/*
3655 * return col/row values corresponding to x/y pixel values
3656 */
3657void
3658rxvt_term::pixel_position (int *x, int *y) NOTHROW
3659{
3660 *x = Pixel2Col (*x);
3661 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3662 *y = Pixel2Row (*y);
3663 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3664} 3756}
3665 3757
3666/* ------------------------------------------------------------------------- */ 3758/* ------------------------------------------------------------------------- */
3667#ifdef USE_XIM 3759#ifdef USE_XIM
3668void 3760void
3669rxvt_term::im_set_position (XPoint &pos) NOTHROW 3761rxvt_term::im_set_position (XPoint &pos) NOTHROW
3670{ 3762{
3671 XWindowAttributes xwa; 3763 XWindowAttributes xwa;
3672 3764
3673 XGetWindowAttributes (xdisp, vt, &xwa); 3765 XGetWindowAttributes (dpy, vt, &xwa);
3674 3766
3675 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3767 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3676 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3768 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3677} 3769}
3678#endif 3770#endif
… …
3696 h += 2; min_it (h, nrow); 3788 h += 2; min_it (h, nrow);
3697 3789
3698 x -= 1; clamp_it (x, 0, ncol - w); 3790 x -= 1; clamp_it (x, 0, ncol - w);
3699 y -= 1; clamp_it (y, 0, nrow - h); 3791 y -= 1; clamp_it (y, 0, nrow - h);
3700 3792
3701 ov_x = x; ov_y = y; 3793 ov.x = x; ov.y = y;
3702 ov_w = w; ov_h = h; 3794 ov.w = w; ov.h = h;
3703 3795
3704 ov_text = new text_t *[h]; 3796 ov.text = new text_t *[h];
3705 ov_rend = new rend_t *[h]; 3797 ov.rend = new rend_t *[h];
3706 3798
3707 for (y = 0; y < h; y++) 3799 for (y = 0; y < h; y++)
3708 { 3800 {
3709 text_t *tp = ov_text[y] = new text_t[w]; 3801 text_t *tp = ov.text[y] = new text_t[w];
3710 rend_t *rp = ov_rend[y] = new rend_t[w]; 3802 rend_t *rp = ov.rend[y] = new rend_t[w];
3711 3803
3712 text_t t0, t1, t2; 3804 text_t t0, t1, t2;
3713 rend_t r = OVERLAY_RSTYLE; 3805 rend_t r = OVERLAY_RSTYLE;
3714 3806
3715 if (y == 0) 3807 if (y == 0)
… …
3734} 3826}
3735 3827
3736void 3828void
3737rxvt_term::scr_overlay_off () NOTHROW 3829rxvt_term::scr_overlay_off () NOTHROW
3738{ 3830{
3739 if (!ov_text) 3831 if (!ov.text)
3740 return; 3832 return;
3741 3833
3742 want_refresh = 1; 3834 want_refresh = 1;
3743 3835
3744 for (int y = 0; y < ov_h; y++) 3836 for (int y = 0; y < ov.h; y++)
3745 { 3837 {
3746 delete [] ov_text[y]; 3838 delete [] ov.text[y];
3747 delete [] ov_rend[y]; 3839 delete [] ov.rend[y];
3748 } 3840 }
3749 3841
3750 delete [] ov_text; ov_text = 0; 3842 delete [] ov.text; ov.text = 0;
3751 delete [] ov_rend; ov_rend = 0; 3843 delete [] ov.rend; ov.rend = 0;
3752} 3844}
3753 3845
3754void 3846void
3755rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3756{ 3848{
3757 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3849 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3758 return; 3850 return;
3759 3851
3760 x++, y++; 3852 x++, y++;
3761 3853
3762 ov_text[y][x] = text; 3854 ov.text[y][x] = text;
3763 ov_rend[y][x] = rend; 3855 ov.rend[y][x] = rend;
3764} 3856}
3765 3857
3766void 3858void
3767rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3859rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3768{ 3860{
… …
3787} 3879}
3788 3880
3789void 3881void
3790rxvt_term::scr_swap_overlay () NOTHROW 3882rxvt_term::scr_swap_overlay () NOTHROW
3791{ 3883{
3792 if (!ov_text) 3884 if (!ov.text)
3793 return; 3885 return;
3794 3886
3887 // hide cursor if it is within the overlay area
3888 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3889 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3890 screen.flags &= ~Screen_VisibleCursor;
3891
3795 // swap screen mem with overlay 3892 // swap screen mem with overlay
3796 for (int y = ov_h; y--; ) 3893 for (int y = ov.h; y--; )
3797 { 3894 {
3798 text_t *t1 = ov_text[y]; 3895 text_t *t1 = ov.text[y];
3799 rend_t *r1 = ov_rend[y]; 3896 rend_t *r1 = ov.rend[y];
3800 3897
3801 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3898 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3802 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3899 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3803 3900
3804 for (int x = ov_w; x--; ) 3901 for (int x = ov.w; x--; )
3805 { 3902 {
3806 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3903 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3807 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3904 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3808 } 3905 }
3809 } 3906 }

Diff Legend

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