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.255 by root, Mon Jan 30 04:27:17 2006 UTC vs.
Revision 1.357 by sf-exg, Tue Jan 4 17:51:05 2011 UTC

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

Diff Legend

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