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.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.339 by sf-exg, Sat Apr 17 06:48:27 2010 UTC

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

Diff Legend

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