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.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.342 by root, Thu Jul 1 20:02:43 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
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;
… …
640 l.touch (); 647 l.touch ();
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--; )
652 {
653 line_t &l = ROW(nrow - 1 - i);
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 {
659 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0;
661 l.f = 0;
662 }
663 else
645 scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle); 664 scr_blank_screen_mem (l, rstyle);
665 }
646 666
647 // now copy lines below the scroll region bottom to the 667 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 668 // bottom of the screen again, so they look as if they
649 // hadn't moved. 669 // hadn't moved.
650 for (int i = nrow; --i > row2; ) 670 for (int i = nrow; --i > row2; )
… …
653 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
654 674
655 ::swap (l1, l2); 675 ::swap (l1, l2);
656 l2.touch (); 676 l2.touch ();
657 } 677 }
658 678
659 // move and/or clear selection, if any 679 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 680 if (selection.op && current_screen == selection.screen)
661 { 681 {
662 selection.beg.row -= count; 682 selection.beg.row -= count;
663 selection.end.row -= count; 683 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 691 selection.op = SELECTION_CLEAR;
672 } 692 }
673 } 693 }
674 694
675 // finally move the view window, if desired 695 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 696 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 697 && view_start != 0
678 && view_start != -saveLines) 698 && view_start != -saveLines)
679 scr_page (UP, count); 699 scr_page (UP, count);
680 700
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 701 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 719 {
700 /* move selected region too */ 720 /* move selected region too */
701 selection.beg.row -= count; 721 selection.beg.row -= count;
702 selection.end.row -= count; 722 selection.end.row -= count;
703 selection.mark.row -= count; 723 selection.mark.row -= count;
704 724
705 selection_check (0); 725 selection_check (0);
706 } 726 }
707 } 727 }
708 728
709 // use a simple and robust scrolling algorithm, this 729 // use a simple and robust scrolling algorithm, this
… …
761 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
762 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
763 } 783 }
764 } 784 }
765 785
766#ifdef DEBUG_STRICT
767 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
768 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
769 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
770#endif
771 int row = screen.cur.row; 789 int row = screen.cur.row;
772 790
773 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
774 792
775 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
776 794
777 while (str < strend) 795 while (str < strend)
778 { 796 {
779 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
780 798
781 if (c < 0x20) 799 if (expect_false (c < 0x20))
782 if (c == C0_LF) 800 if (c == C0_LF)
783 { 801 {
784 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
785 803
786 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
805 { 823 {
806 scr_tab (1, true); 824 scr_tab (1, true);
807 continue; 825 continue;
808 } 826 }
809 827
828 if (expect_false (
810 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
811 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
812 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
813 { 833 {
814 checksel = 0; 834 checksel = 0;
815 /* 835 /*
816 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
817 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
818 * should be a similar check. 838 * should be a similar check.
819 */ 839 */
820 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
821 } 841 }
822 842
823 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
824 { 844 {
825 scr_do_wrap (); 845 scr_do_wrap ();
826 846
827 line->l = ncol; 847 line->l = ncol;
828 line->is_longer (1); 848 line->is_longer (1);
829 849
830 row = screen.cur.row; 850 row = screen.cur.row;
831 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
832 } 852 }
833 853
834 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
835 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
836 c = 0xfffd; 856 c = 0xfffd;
837 857
838 // rely on wcwidth to tell us the character width, do wcwidth before 858 // rely on wcwidth to tell us the character width, do wcwidth before
839 // further replacements, as wcwidth might return -1 for the line 859 // further replacements, as wcwidth might return -1 for the line
840 // drawing characters below as they might be invalid in the current 860 // drawing characters below as they might be invalid in the current
841 // locale. 861 // locale.
842 int width = WCWIDTH (c); 862 int width = WCWIDTH (c);
843 863
844 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
845 { 865 {
846 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
847 // 5f-7e standard vt100 867 // 5f-7e standard vt100
848 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
849 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
862 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
863 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
864 } 884 }
865 } 885 }
866 886
867 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
868 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
869 889
870 if (width != 0) 890 if (width != 0)
871 { 891 {
872#if !UNICODE_3 892#if !UNICODE_3
… …
878 c = 0xfffd; 898 c = 0xfffd;
879# endif 899# endif
880#endif 900#endif
881 901
882 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
883 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
884 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
885 && 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))
886 { 914 {
887 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
888
889 // find begin
890 while (col > 0 && line->t[col] == NOCHAR)
891 col--;
892
893 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
894
895 // found begin, nuke
896 do {
897 line->t[col] = ' ';
898 line->r[col] = rend;
899 col++;
900 } while (col < ncol && line->t[col] == NOCHAR);
901 }
902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (screen.cur.col > ncol - width && ncol >= width)
907 {
908 // ...output spaces
909 c = ' '; 916 c = NOCHAR;
910 // and try the same character next loop iteration 917 // and try the same character next loop iteration
911 --str; 918 --str;
912 } 919 }
913 920
914 line->touch (); 921 line->touch ();
… …
916 do 923 do
917 { 924 {
918 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
919 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
920 927
921 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
922 screen.cur.col++; 929 screen.cur.col++;
923 else 930 else
924 { 931 {
925 line->l = ncol; 932 line->l = ncol;
926 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
928 break; 935 break;
929 } 936 }
930 937
931 c = NOCHAR; 938 c = NOCHAR;
932 } 939 }
933 while (--width > 0); 940 while (expect_false (--width > 0));
934 941
935 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
936 if (!width) 943 if (expect_false (!width))
937 { 944 {
938 line->touch (); 945 line->touch ();
939 946
940 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++)
941 { 948 {
942 line->t[c] = ' '; 949 line->t[c] = ' ';
943 line->r[c] = rend; 950 line->r[c] = rend;
944 } 951 }
945 } 952 }
946 } 953 }
954#if ENABLE_COMBINING
947 else // width == 0 955 else // width == 0
948 { 956 {
949#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
950 // handle combining characters
951 // we just tag the accent on the previous on-screen character.
952 // this is arguably not correct, but also arguably not wrong.
953 // we don't handle double-width characters nicely yet.
954 line_t *linep;
955 text_t *tp;
956 rend_t *rp;
957
958 if (screen.cur.col > 0)
959 { 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 {
960 linep = line; 969 linep = line;
961 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
962 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));
963 } 995 }
964 else if (screen.cur.row > 0
965 && ROW(screen.cur.row - 1).is_longer ())
966 {
967 linep = &ROW(screen.cur.row - 1);
968 tp = line->t + ncol - 1;
969 rp = line->r + ncol - 1;
970 } 996 }
971 else
972 continue;
973
974 linep->touch ();
975
976 while (*tp == NOCHAR && tp > linep->t)
977 tp--, rp--;
978
979 // first try to find a precomposed character
980 unicode_t n = rxvt_compose (*tp, c);
981 if (n == NOCHAR)
982 n = rxvt_composite.compose (*tp, c);
983
984 *tp = n;
985 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
986#endif 997#endif
987 }
988 } 998 }
989 999
990 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
991 1001
992#ifdef DEBUG_STRICT
993 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
994#endif
995} 1003}
996 1004
997/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
998/* 1006/*
999 * 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
1000 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1001 */ 1009 */
1002void 1010void
1003rxvt_term::scr_backspace () NOTHROW 1011rxvt_term::scr_backspace () NOTHROW
1004{ 1012{
1005 want_refresh = 1;
1006
1007 if (screen.cur.col == 0) 1013 if (screen.cur.col == 0)
1008 { 1014 {
1009 if (screen.cur.row > 0) 1015 if (screen.cur.row > 0)
1010 { 1016 {
1011#ifdef TERMCAP_HAS_BW 1017#ifdef TERMCAP_HAS_BW
1012 screen.cur.col = ncol - 1; 1018 screen.cur.col = ncol - 1;
1013 screen.cur.row--; 1019 --screen.cur.row;
1014 return; 1020
1021 want_refresh = 1;
1015#endif 1022#endif
1016 } 1023 }
1017 } 1024 }
1018 else if (!(screen.flags & Screen_WrapNext)) 1025 else
1019 scr_gotorc (0, -1, RELATIVE); 1026 scr_gotorc (0, -1, RELATIVE);
1020
1021 screen.flags &= ~Screen_WrapNext;
1022} 1027}
1023 1028
1024/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
1025/* 1030/*
1026 * Process Horizontal Tab 1031 * Process Horizontal Tab
… …
1049 x = i; 1054 x = i;
1050 1055
1051 if (!--count) 1056 if (!--count)
1052 break; 1057 break;
1053 } 1058 }
1054 else 1059 else
1055 ht &= l.t[i] == ' ' 1060 ht &= l.t[i] == ' '
1056 && RS_SAME (l.r[i], base_rend); 1061 && RS_SAME (l.r[i], base_rend);
1057 1062
1058 if (count) 1063 if (count)
1059 x = ncol - 1; 1064 x = ncol - 1;
1060 1065
1061 // store horizontal tab commands as characters inside the text 1066 // store horizontal tab commands as characters inside the text
1062 // buffer so they can be selected and pasted. 1067 // buffer so they can be selected and pasted.
1063 if (ht && OPTION (Opt_pastableTabs)) 1068 if (ht && option (Opt_pastableTabs))
1064 { 1069 {
1065 base_rend = SET_FONT (base_rend, 0); 1070 base_rend = SET_FONT (base_rend, 0);
1066 1071
1067 l.touch (x); 1072 l.touch (x);
1068 1073
… …
1101 * Process DEC Back Index 1106 * Process DEC Back Index
1102 * XTERM_SEQ: ESC 6 1107 * XTERM_SEQ: ESC 6
1103 * 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
1104 * in that row right. Clear left column. 1109 * in that row right. Clear left column.
1105 */ 1110 */
1106#if ENABLE_FRILLS 1111#if !ENABLE_MINIMAL
1107void 1112void
1108rxvt_term::scr_backindex () NOTHROW 1113rxvt_term::scr_backindex () NOTHROW
1109{ 1114{
1110 if (screen.cur.col > 0) 1115 if (screen.cur.col > 0)
1111 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1118 * Process DEC Forward Index 1123 * Process DEC Forward Index
1119 * XTERM_SEQ: ESC 9 1124 * XTERM_SEQ: ESC 9
1120 * 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
1121 * in that row left. Clear right column. 1126 * in that row left. Clear right column.
1122 */ 1127 */
1123#if ENABLE_FRILLS 1128#if !ENABLE_MINIMAL
1124void 1129void
1125rxvt_term::scr_forwardindex () NOTHROW 1130rxvt_term::scr_forwardindex () NOTHROW
1126{ 1131{
1127 if (screen.cur.col < ncol - 1) 1132 if (screen.cur.col < ncol - 1)
1128 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1175 } 1180 }
1176 } 1181 }
1177 else 1182 else
1178 { 1183 {
1179 if (screen.flags & Screen_Relative) 1184 if (screen.flags & Screen_Relative)
1185 {
1180 { /* relative origin mode */ 1186 /* relative origin mode */
1181 screen.cur.row = row + screen.tscroll; 1187 screen.cur.row = row + screen.tscroll;
1182 min_it (screen.cur.row, screen.bscroll); 1188 min_it (screen.cur.row, screen.bscroll);
1183 } 1189 }
1184 else 1190 else
1185 screen.cur.row = row; 1191 screen.cur.row = row;
… …
1218/* 1224/*
1219 * Erase part or whole of a line 1225 * Erase part or whole of a line
1220 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1226 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1221 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1222 * 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
1223 */ 1230 */
1224void 1231void
1225rxvt_term::scr_erase_line (int mode) NOTHROW 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1226{ 1233{
1227 unsigned int col, num; 1234 unsigned int col, num;
… …
1236 line.touch (); 1243 line.touch ();
1237 line.is_longer (0); 1244 line.is_longer (0);
1238 1245
1239 switch (mode) 1246 switch (mode)
1240 { 1247 {
1248 case 3:
1249 if (screen.flags & Screen_WrapNext)
1250 return;
1251
1252 /* fall through */
1253
1241 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1242 col = screen.cur.col; 1255 col = screen.cur.col;
1243 num = ncol - col; 1256 num = ncol - col;
1244 min_it (line.l, col); 1257 min_it (line.l, col);
1258
1245 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1259 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1246 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1260 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1247 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1248 break; 1262 break;
1263
1249 case 1: /* erase to beginning of line */ 1264 case 1: /* erase to beginning of line */
1250 col = 0; 1265 col = 0;
1251 num = screen.cur.col + 1; 1266 num = screen.cur.col + 1;
1267
1252 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1253 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1254 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1255 break; 1271 break;
1272
1256 case 2: /* erase whole line */ 1273 case 2: /* erase whole line */
1257 col = 0; 1274 col = 0;
1258 num = ncol; 1275 num = ncol;
1259 line.l = 0; 1276 line.l = 0;
1260 if (selection.beg.row <= screen.cur.row 1277 if (selection.beg.row <= screen.cur.row
… …
1318 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1319 return; 1336 return;
1320 1337
1321 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1322 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.
1323 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1324 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1325 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1326 { 1346 {
1327 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1328 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);
1329 } 1353 }
1330 else 1354 else
1331 { 1355 {
1332 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1357
1358 if (mapped && !view_start)
1359 {
1333 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1334 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 ERASE_ROWS (row, num); 1362 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start),
1364 (unsigned int)width,
1365 (unsigned int)Height2Pixel (num));
1336 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1337 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1338 } 1369 }
1339 1370
1340 for (; num--; row++) 1371 for (; num--; row++)
1341 { 1372 {
1342 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1343 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1344 } 1377 }
1345} 1378}
1346 1379
1347#if ENABLE_FRILLS 1380#if !ENABLE_MINIMAL
1348void 1381void
1349rxvt_term::scr_erase_savelines () NOTHROW 1382rxvt_term::scr_erase_savelines () NOTHROW
1350{ 1383{
1351 want_refresh = 1; 1384 want_refresh = 1;
1352 ZERO_SCROLLBACK (); 1385 ZERO_SCROLLBACK ();
… …
1422 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1423 */ 1456 */
1424void 1457void
1425rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1426{ 1459{
1427 int col, row;
1428 rend_t tr;
1429
1430 want_refresh = 1; 1460 want_refresh = 1;
1431 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1432 1462
1433 if (count <= 0) 1463 if (count <= 0)
1434 return; 1464 return;
… …
1436 scr_do_wrap (); 1466 scr_do_wrap ();
1437 1467
1438 selection_check (1); 1468 selection_check (1);
1439 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1440 1470
1441 row = screen.cur.row; 1471 int row = screen.cur.row;
1442 1472
1443 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1444 1474
1445 line->touch (); 1475 line->touch ();
1446 line->is_longer (0); 1476 line->is_longer (0);
1447 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1448 switch (insdel) 1482 switch (insdel)
1449 { 1483 {
1450 case INSERT: 1484 case INSERT:
1451 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--)
1452 { 1491 {
1453 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1454 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1455 } 1494 }
1456
1457 line->l = min (line->l + count, ncol);
1458 1495
1459 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1460 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1461 { 1498 {
1462 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1463 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1464 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1465 else 1502 else
1503 {
1466 { /* shift selection */ 1504 /* shift selection */
1467 selection.beg.col += count; 1505 selection.beg.col += count;
1468 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1469 selection.end.col += count; 1507 selection.end.col += count;
1470 } 1508 }
1471 } 1509 }
… …
1476 case ERASE: 1514 case ERASE:
1477 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1478 selection_check (1); 1516 selection_check (1);
1479 screen.cur.col -= count; 1517 screen.cur.col -= count;
1480 1518
1481 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
1482 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1483 break; 1524 break;
1484 1525
1485 case DELETE: 1526 case DELETE:
1486 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1487 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
1488 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1489 { 1534 {
1490 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1491 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1492 } 1537 }
1493 1538
1494 line->l = max (line->l - count, 0);
1495 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1496 1540
1497 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1499 { 1543 {
1500 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1610 */ 1654 */
1611void 1655void
1612rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1613{ 1657{
1614 if (mode < 0) 1658 if (mode < 0)
1615 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1616 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1617 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1618} 1662}
1619 1663
1620/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1635 if (rvideo_state != on) 1679 if (rvideo_state != on)
1636 { 1680 {
1637 rvideo_state = on; 1681 rvideo_state = on;
1638 1682
1639 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1640#if XPM_BACKGROUND 1684#ifdef HAVE_BG_PIXMAP
1641 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1642#endif 1686#endif
1643#if TRANSPARENT
1644 if (!OPTION (Opt_transparent) || am_transparent == 0)
1645#endif
1646 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1647 1688
1648 XGCValues gcvalue; 1689 XGCValues gcvalue;
1649 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
1650 gcvalue.background = pix_colors[Color_bg]; 1691 gcvalue.background = pix_colors[Color_bg];
1651 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1692 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1652 1693
1653 scr_clear (); 1694 scr_clear ();
1654 scr_touch (true); 1695 scr_touch (true);
1655 } 1696 }
1656} 1697}
… …
1741{ 1782{
1742 bool found = false; 1783 bool found = false;
1743 1784
1744 for (int i = 0; i < nrow; i++) 1785 for (int i = 0; i < nrow; i++)
1745 { 1786 {
1746 int col = 0;
1747 rend_t *drp = drawn_buf[i].r; 1787 rend_t *drp = drawn_buf[i].r;
1748 1788
1749 for (; col < ncol; col++, drp++) 1789 for (int col = 0; col < ncol; col++, drp++)
1750 if ((*drp & mask) == value) 1790 if ((*drp & mask) == value)
1751 { 1791 {
1752 found = true; 1792 found = true;
1753 *drp = ~value; 1793 *drp = ~value;
1754 } 1794 }
… …
1859 return true; 1899 return true;
1860} 1900}
1861 1901
1862#ifndef NO_BELL 1902#ifndef NO_BELL
1863void 1903void
1864rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1865{ 1905{
1866 rvideo_bell = false; 1906 rvideo_bell = false;
1867 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1868} 1909}
1869#endif 1910#endif
1870 1911
1871/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1872void 1913void
… …
1874{ 1915{
1875#ifndef NO_BELL 1916#ifndef NO_BELL
1876 1917
1877# ifndef NO_MAPALERT 1918# ifndef NO_MAPALERT
1878# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1879 if (OPTION (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1880# endif 1921# endif
1881 XMapWindow (xdisp, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1882# endif 1923# endif
1883 1924
1925# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell))
1927 set_urgency (1);
1928# endif
1929
1884 if (OPTION (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1885 { 1931 {
1886 rvideo_bell = true; 1932 rvideo_bell = true;
1887 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1888 display->flush (); 1934 flush ();
1889 1935
1890 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1891 } 1937 }
1892 else 1938 else
1893 XBell (xdisp, 0); 1939 XBell (dpy, 0);
1894 1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1895#endif 1941#endif
1896} 1942}
1897 1943
1898/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1899/* ARGSUSED */ 1945/* ARGSUSED */
1900void 1946void
1901rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1902{ 1948{
1903#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1904 int nrows, row_start; 1950 int nrows, row_start;
1905 FILE *fd; 1951 FILE *fd = popen_printer ();
1906 1952
1907 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1908 return; 1954 return;
1909 1955
1910 if (fullhist) 1956 if (fullhist)
1911 { 1957 {
1912 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1918 row_start = view_start; 1964 row_start = view_start;
1919 } 1965 }
1920 1966
1921 wctomb (0, 0); 1967 wctomb (0, 0);
1922 1968
1923 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1924 { 1970 {
1925 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1926 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1927 1973
1928 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
… …
1957 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1958 */ 2004 */
1959void 2005void
1960rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1961{ 2007{
1962 unsigned char must_clear, /* use draw_string not draw_image_string */
1963 showcursor; /* show the cursor */
1964 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1965 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1966 int i; /* tmp */ 2010 int i; /* tmp */
1967#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1968 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
1969#endif 2013#endif
1970 rend_t *crp; // cursor rendition pointer 2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */
1971 2017
1972 want_refresh = 0; /* screen is current */ 2018 want_refresh = 0; /* screen is current */
1973 2019
1974 if (refresh_type == NO_REFRESH || !mapped) 2020 if (refresh_type == NO_REFRESH || !mapped)
1975 return; 2021 return;
1976 2022
1977 /* 2023 /*
1978 * A: set up vars 2024 * A: set up vars
1979 */ 2025 */
1980 must_clear = 0;
1981 refresh_count = 0; 2026 refresh_count = 0;
1982 2027
1983#if XPM_BACKGROUND 2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP
1984 must_clear |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
1985#endif
1986#if TRANSPARENT
1987 must_clear |= OPTION (Opt_transparent) && am_transparent;
1988#endif 2032#endif
1989 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1990 2034
1991 /* 2035 /*
1992 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
1993 */ 2037 */
1994 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;
1995 2046
1996 /* 2047 /*
1997 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
1998 */ 2049 */
1999 { 2050 {
2000 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2001 rend_t ccol1, /* Cursor colour */
2002 ccol2; /* Cursor colour2 */
2003 2052
2004 showcursor = (screen.flags & Screen_VisibleCursor);
2005#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2006 if (hidden_cursor) 2054 if (hidden_cursor)
2007 showcursor = 0; 2055 showcursor = 0;
2008#endif 2056#endif
2009 2057
… …
2014 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2015 col--; 2063 col--;
2016 2064
2017 crp = &ROW(screen.cur.row).r[col]; 2065 crp = &ROW(screen.cur.row).r[col];
2018 2066
2019 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)
2020 { 2091 {
2021 if (OPTION (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2022 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2023 else 2094 else
2024 { 2095 {
2025 *crp ^= RS_RVid; 2096 *crp ^= RS_RVid;
2026
2027#ifndef NO_CURSORCOLOR
2028 cc1 = *crp & (RS_fgMask | RS_bgMask);
2029 if (ISSET_PIXCOLOR (Color_cursor))
2030 ccol1 = Color_cursor;
2031 else
2032#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2033 ccol1 = fgcolor_of (rstyle);
2034#else
2035 ccol1 = Color_fg;
2036#endif
2037 if (ISSET_PIXCOLOR (Color_cursor2))
2038 ccol2 = Color_cursor2;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol2 = bgcolor_of (rstyle);
2042#else
2043 ccol2 = Color_bg;
2044#endif
2045 *crp = SET_FGCOLOR (*crp, ccol1); 2097 *crp = SET_FGCOLOR (*crp, ccol1);
2046 *crp = SET_BGCOLOR (*crp, ccol2); 2098 *crp = SET_BGCOLOR (*crp, ccol2);
2047#endif
2048 } 2099 }
2049 } 2100 }
2050 } 2101 }
2051 2102
2052 /* make sure no outline cursor is left around */ 2103 /* make sure no outline cursor is left around */
… …
2079 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2080 } 2131 }
2081 } 2132 }
2082 } 2133 }
2083 2134
2084 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2085#if ENABLE_OVERLAY
2086 scr_swap_overlay ();
2087#endif
2088
2089#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2090 /* 2136 /*
2091 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2092 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2093 */ 2139 */
2094 if (!display->is_local 2140 if (!display->is_local
2095 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2141 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2096 && abs (num_scr) < nrow && !must_clear) 2142 && abs (num_scr) < nrow && !have_bg)
2097 { 2143 {
2098 int16_t nits; 2144 int16_t nits;
2145 int i = num_scr;
2099 int j; 2146 int j;
2100 int len, wlen; 2147 int len, wlen;
2101 dLocal (int, num_scr); 2148 dLocal (int, num_scr);
2102 2149
2103 j = nrow; 2150 j = nrow;
2104 wlen = len = -1; 2151 wlen = len = -1;
2105 row = i > 0 ? 0 : j - 1; 2152 row = i > 0 ? 0 : j - 1;
2153
2106 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2154 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2107 { 2155 {
2108 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2156 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2109 { 2157 {
2110 line_t s = ROW(view_start + row); 2158 line_t s = ROW(view_start + row);
… …
2131 wlen = row; 2179 wlen = row;
2132 continue; 2180 continue;
2133 } 2181 }
2134 } 2182 }
2135 2183
2136 if (len != -1) 2184 if (len >= 0)
2137 { 2185 {
2138 /* also comes here at end if needed because of >= above */ 2186 /* also comes here at end if needed because of >= above */
2139 if (wlen < len) 2187 if (wlen < len)
2140 ::swap (wlen, len); 2188 ::swap (wlen, len);
2141 2189
2190 XGCValues gcv;
2191
2192 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2142 XCopyArea (xdisp, vt, vt, 2193 XCopyArea (dpy, vt, vt,
2143 gc, 0, Row2Pixel (len + i), 2194 gc, 0, Row2Pixel (len + i),
2144 (unsigned int)this->width, 2195 (unsigned int)this->width,
2145 (unsigned int)Height2Pixel (wlen - len + 1), 2196 (unsigned int)Height2Pixel (wlen - len + 1),
2146 0, Row2Pixel (len)); 2197 0, Row2Pixel (len));
2198 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2199
2147 len = -1; 2200 len = -1;
2148 } 2201 }
2149 } 2202 }
2150 } 2203 }
2151#endif 2204#endif
… …
2175 continue; 2228 continue;
2176 2229
2177 // redraw one or more characters 2230 // redraw one or more characters
2178 2231
2179 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2180 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2181 --col; 2234 --col;
2182 2235
2183 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2184 text_t *text = stp + col; 2237 text_t *text = stp + col;
2185 int count = 1; 2238 int count = 1;
2186 2239
2187 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2188 drp[col] = rend; 2241 drp[col] = rend;
… …
2192 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2193 { 2246 {
2194 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2195 { 2248 {
2196 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2197 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2198 count++; 2252 count++;
2199 i++; 2253 i++;
2200 2254
2201 continue; 2255 continue;
2202 } 2256 }
… …
2207 count++; 2261 count++;
2208 2262
2209 if (stp[col] != dtp[col] 2263 if (stp[col] != dtp[col]
2210 || !RS_SAME (srp[col], drp[col])) 2264 || !RS_SAME (srp[col], drp[col]))
2211 { 2265 {
2212 if (must_clear && (i++ > count / 2)) 2266 if (have_bg && (i++ > count / 2))
2213 break; 2267 break;
2214 2268
2215 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2216 drp[col] = rend; 2270 drp[col] = rend;
2217 i = 0; 2271 i = 0;
2218 } 2272 }
2219 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2273 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2220 break; 2274 break;
2221 } 2275 }
2222 2276
2223 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2224 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2225 2279
2226 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2227 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2228 count++, i--; 2282 count++, i--;
2229 2283
2230 /* 2284 /*
2231 * Determine the attributes for the string 2285 * Determine the attributes for the string
2232 */ 2286 */
2233 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2234 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2235 2289
2236 // 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
2237 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2238 { 2292 {
2239#if ENABLE_STYLES
2240 // "careful" (too wide) character handling
2241
2242 // include previous careful character(s) if possible, looks nicer (best effort...)
2243 while (text > stp
2244 && srp[text - stp - 1] & RS_Careful
2245 && RS_SAME (rend, srp[text - stp - 1]))
2246 text--, count++, xpixel -= fwidth;
2247
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2250 drp[col + i + 1] = ~srp[col + i + 1];
2251
2252 // force redraw before "careful" characters to avoid pixel droppings
2253 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2254 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2255#endif
2256
2257 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2258 2294
2259#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2260 if (rend & RS_Bold
2261 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2262 { 2297 {
2263 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2264 fore = Color_BD; 2299 fore = Color_BD;
2265# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2266 else 2301 else
2267 invert = !invert; 2302 invert = !invert;
2268# endif 2303# endif
2269 } 2304 }
2270 2305
2271 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2272 && fore == Color_fg)
2273 { 2307 {
2274 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2275 fore = Color_IT; 2309 fore = Color_IT;
2276# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2277 else 2311 else
2278 invert = !invert; 2312 invert = !invert;
2279# endif 2313# endif
2280 } 2314 }
2281 2315
2282 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2283 fore = Color_UL; 2317 fore = Color_UL;
2318#endif
2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333
2334 back = Color_HC;
2335 invert = 0;
2336 }
2337 }
2284#endif 2338#endif
2285 2339
2286 if (invert) 2340 if (invert)
2287 { 2341 {
2288 ::swap (fore, back); 2342 ::swap (fore, back);
2289 2343
2290#ifndef NO_BOLD_UNDERLINE_REVERSE 2344#ifndef NO_BOLD_UNDERLINE_REVERSE
2291 if (ISSET_PIXCOLOR (Color_RV))
2292 back = Color_RV;
2293
2294 if (fore == back) 2345 if (fore == back)
2295 { 2346 {
2296 fore = Color_bg; 2347 fore = Color_bg;
2297 back = Color_fg; 2348 back = Color_fg;
2298 } 2349 }
… …
2300 } 2351 }
2301 2352
2302#ifdef TEXT_BLINK 2353#ifdef TEXT_BLINK
2303 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2354 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2304 { 2355 {
2305 if (!text_blink_ev.active) 2356 if (!text_blink_ev.is_active ())
2306 { 2357 {
2307 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2358 text_blink_ev.again ();
2308 hidden_text = 0; 2359 hidden_text = 0;
2309 } 2360 }
2310 else if (hidden_text) 2361 else if (hidden_text)
2311 fore = back; 2362 fore = back;
2312 } 2363 }
2313#endif 2364#endif
2365
2366#if ENABLE_STYLES
2367 // "careful" (too wide) character handling
2368
2369 // include previous careful character(s) if possible, looks nicer (best effort...)
2370 while (text > stp
2371 && srp[text - stp - 1] & RS_Careful
2372 && RS_SAME (rend, srp[text - stp - 1]))
2373 text--, count++, xpixel -= fwidth;
2374
2375 // force redraw after "careful" characters to avoid pixel droppings
2376 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2377 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2378
2379 // force redraw before "careful" characters to avoid pixel droppings
2380 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2381 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2382#endif
2314 } 2383 }
2315 2384
2316 /* 2385 /*
2317 * Actually do the drawing of the string here 2386 * Actually do the drawing of the string here
2318 */ 2387 */
2319 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2320 2389
2321 if (back == fore) 2390 if (expect_true (have_bg && back == Color_bg))
2322 font->clear_rect (*drawable, xpixel, ypixel,
2323 fwidth * count, fheight,
2324 back);
2325 else if (back == Color_bg)
2326 { 2391 {
2327 if (must_clear) 2392 // this is very ugly, maybe push it into ->draw?
2328 {
2329 CLEAR_CHARS (xpixel, ypixel, count);
2330 2393
2331 for (i = 0; i < count; i++) /* don't draw empty strings */ 2394 for (i = 0; i < count; i++) /* don't draw empty strings */
2332 if (text[i] != ' ') 2395 if (text[i] != ' ')
2333 { 2396 {
2334 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2335 break; 2398 goto did_clear;
2336 }
2337 } 2399 }
2338 else 2400
2339 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2401 CLEAR_CHARS (xpixel, ypixel, count);
2402 did_clear: ;
2340 } 2403 }
2341 else 2404 else
2342 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2343 2406
2344 if (rend & RS_Uline && font->descent > 1 && fore != back) 2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2345 { 2408 {
2346#if ENABLE_FRILLS 2409#if ENABLE_FRILLS
2347 if (ISSET_PIXCOLOR (Color_underline)) 2410 if (ISSET_PIXCOLOR (Color_underline))
2348 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2411 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2349 else 2412 else
2350#endif 2413#endif
2351 XSetForeground (xdisp, gc, pix_colors[fore]); 2414 XSetForeground (dpy, gc, pix_colors[fore]);
2352 2415
2353 XDrawLine (xdisp, drawBuffer, gc, 2416 XDrawLine (dpy, vt, gc,
2354 xpixel, ypixel + font->ascent + 1, 2417 xpixel, ypixel + font->ascent + 1,
2355 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2356 } 2419 }
2357 } /* for (col....) */ 2420 } /* for (col....) */
2358 } /* for (row....) */ 2421 } /* for (row....) */
2359 2422
2360#if ENABLE_OVERLAY
2361 scr_swap_overlay ();
2362#endif
2363 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2364
2365 /* 2423 /*
2366 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2367 */ 2425 */
2368 if (showcursor) 2426 if (showcursor)
2369 { 2427 {
2370 if (focus) 2428 if (focus)
2371 { 2429 {
2372 if (OPTION (Opt_cursorUnderline)) 2430 if (option (Opt_cursorUnderline))
2373 *crp ^= RS_Uline; 2431 *crp ^= RS_Uline;
2374 else 2432 else
2375 { 2433 {
2376 *crp ^= RS_RVid; 2434 *crp ^= RS_RVid;
2377#ifndef NO_CURSORCOLOR 2435#ifndef NO_CURSORCOLOR
… …
2391 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2449 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2392 cursorwidth++; 2450 cursorwidth++;
2393 2451
2394#ifndef NO_CURSORCOLOR 2452#ifndef NO_CURSORCOLOR
2395 if (ISSET_PIXCOLOR (Color_cursor)) 2453 if (ISSET_PIXCOLOR (Color_cursor))
2396 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2455 else
2397#endif 2456#endif
2457 XSetForeground (dpy, gc, pix_colors[ccol1]);
2398 2458
2399 XDrawRectangle (xdisp, drawBuffer, gc, 2459 XDrawRectangle (dpy, vt, gc,
2400 Col2Pixel (col), 2460 Col2Pixel (col),
2401 Row2Pixel (oldcursor.row), 2461 Row2Pixel (oldcursor.row),
2402 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2462 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2403 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2404 } 2464 }
2405 } 2465 }
2406 2466
2407 /* 2467 /*
2408 * H: cleanup selection 2468 * H: cleanup selection
2409 */ 2469 */
2470#if ENABLE_OVERLAY
2471 scr_swap_overlay ();
2472#endif
2473 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2474
2410 scr_reverse_selection (); 2475 scr_reverse_selection ();
2411 2476
2477 screen.flags = old_screen_flags;
2412 num_scr = 0; 2478 num_scr = 0;
2413 num_scr_allow = 1; 2479 num_scr_allow = 1;
2414} 2480}
2415 2481
2416void 2482void
… …
2439} 2505}
2440 2506
2441void 2507void
2442rxvt_term::scr_recolour () NOTHROW 2508rxvt_term::scr_recolour () NOTHROW
2443{ 2509{
2444 if (1 2510#ifdef HAVE_BG_PIXMAP
2445#if TRANSPARENT 2511 bgPixmap.apply ();
2446 && !am_transparent 2512#else
2447#endif 2513
2448#if XPM_BACKGROUND
2449 && !bgPixmap.pixmap
2450#endif
2451 )
2452 {
2453 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2454 XClearWindow (xdisp, parent[0]); 2515 XClearWindow (dpy, parent[0]);
2455 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2516 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2456#if HAVE_SCROLLBARS 2517
2457 if (scrollBar.win) 2518 if (scrollBar.win)
2458 { 2519 {
2459 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2520 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2460 scrollBar.setIdle (); 2521 scrollBar.state = STATE_IDLE;
2461 scrollbar_show (0); 2522 scrollBar.show (0);
2462 }
2463#endif
2464 } 2523 }
2465 2524
2525#endif
2526
2527 /* bgPixmap.apply () does not do the following : */
2466 scr_clear (); 2528 scr_clear ();
2467 scr_touch (true); 2529 scr_touch (true);
2468 want_refresh = 1; 2530 want_refresh = 1;
2469} 2531}
2470 2532
… …
2477 2539
2478 num_scr_allow = 0; 2540 num_scr_allow = 0;
2479 want_refresh = 1; 2541 want_refresh = 1;
2480 2542
2481 if (really) 2543 if (really)
2482 XClearWindow (xdisp, vt); 2544 XClearWindow (dpy, vt);
2483} 2545}
2484 2546
2485void 2547void
2486rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2548rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2487{ 2549{
… …
2536{ 2598{
2537 if (selection.op 2599 if (selection.op
2538 && current_screen == selection.screen 2600 && current_screen == selection.screen
2539 && selection.end.row >= view_start) 2601 && selection.end.row >= view_start)
2540 { 2602 {
2541#if ENABLE_FRILLS 2603#if !ENABLE_MINIMAL
2542 if (selection.rect) 2604 if (selection.rect)
2543 scr_xor_rect (selection.beg.row, selection.beg.col, 2605 scr_xor_rect (selection.beg.row, selection.beg.col,
2544 selection.end.row, selection.end.col, 2606 selection.end.row, selection.end.col,
2545 RS_RVid, RS_RVid | RS_Uline); 2607 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2546 else 2608 else
2547#endif 2609#endif
2548 scr_xor_span (selection.beg.row, selection.beg.col, 2610 scr_xor_span (selection.beg.row, selection.beg.col,
2549 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2550 RS_RVid); 2612 RS_Sel | RS_RVid);
2551 } 2613 }
2552} 2614}
2553 2615
2554/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2555/* 2617/*
… …
2562{ 2624{
2563 int row, wrote; 2625 int row, wrote;
2564 unsigned int width, towrite; 2626 unsigned int width, towrite;
2565 char r1[] = "\n"; 2627 char r1[] = "\n";
2566 2628
2567 for (row = saveLines - nsaved; 2629 for (row = saveLines + top_row;
2568 row < saveLines + nrow - 1; row++) 2630 row < saveLines + nrow - 1; row++)
2569 { 2631 {
2570 width = row_buf[row].l >= 0 ? row_buf[row].l 2632 width = row_buf[row].l >= 0 ? row_buf[row].l
2571 : ncol; 2633 : ncol;
2572 for (towrite = width; towrite; towrite -= wrote) 2634 for (towrite = width; towrite; towrite -= wrote)
… …
2623 /* convert normal newline chars into common keyboard Return key sequence */ 2685 /* convert normal newline chars into common keyboard Return key sequence */
2624 for (unsigned int i = 0; i < len; i++) 2686 for (unsigned int i = 0; i < len; i++)
2625 if (data[i] == C0_LF) 2687 if (data[i] == C0_LF)
2626 data[i] = C0_CR; 2688 data[i] = C0_CR;
2627 2689
2690 if (priv_modes & PrivMode_BracketPaste)
2691 tt_printf ("\e[200~");
2692
2628 tt_write (data, len); 2693 tt_write (data, len);
2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[201~");
2629} 2697}
2630 2698
2631/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2632/* 2700/*
2633 * Respond to a notification that a primary selection has been sent 2701 * Respond to a notification that a primary selection has been sent
… …
2662 } 2730 }
2663 2731
2664 unsigned long bytes_after; 2732 unsigned long bytes_after;
2665 XTextProperty ct; 2733 XTextProperty ct;
2666 2734
2667 if (XGetWindowProperty (xdisp, win, prop, 2735 if (XGetWindowProperty (dpy, win, prop,
2668 0, PROP_SIZE / 4, 2736 0, PROP_SIZE / 4,
2669 delete_prop, AnyPropertyType, 2737 delete_prop, AnyPropertyType,
2670 &ct.encoding, &ct.format, 2738 &ct.encoding, &ct.format,
2671 &ct.nitems, &bytes_after, 2739 &ct.nitems, &bytes_after,
2672 &ct.value) != Success) 2740 &ct.value) != Success)
… …
2681 if (bytes_after) 2749 if (bytes_after)
2682 { 2750 {
2683 // fetch and append remaining data 2751 // fetch and append remaining data
2684 XTextProperty ct2; 2752 XTextProperty ct2;
2685 2753
2686 if (XGetWindowProperty (xdisp, win, prop, 2754 if (XGetWindowProperty (dpy, win, prop,
2687 ct.nitems / 4, (bytes_after + 3) / 4, 2755 ct.nitems / 4, (bytes_after + 3) / 4,
2688 delete_prop, AnyPropertyType, 2756 delete_prop, AnyPropertyType,
2689 &ct2.encoding, &ct2.format, 2757 &ct2.encoding, &ct2.format,
2690 &ct2.nitems, &bytes_after, 2758 &ct2.nitems, &bytes_after,
2691 &ct2.value) != Success) 2759 &ct2.value) != Success)
… …
2704 2772
2705 if (ct.encoding == xa[XA_INCR]) 2773 if (ct.encoding == xa[XA_INCR])
2706 { 2774 {
2707 // INCR selection, start handshake 2775 // INCR selection, start handshake
2708 if (!delete_prop) 2776 if (!delete_prop)
2709 XDeleteProperty (xdisp, win, prop); 2777 XDeleteProperty (dpy, win, prop);
2710 2778
2711 selection_wait = Sel_incr; 2779 selection_wait = Sel_incr;
2712 incr_buf_fill = 0; 2780 incr_buf_fill = 0;
2713 incr_ev.start (NOW + 10); 2781 incr_ev.start (10);
2714 2782
2715 goto bailout; 2783 goto bailout;
2716 } 2784 }
2717 2785
2718 if (ct.nitems == 0) 2786 if (ct.nitems == 0)
… …
2727 ct.nitems = incr_buf_fill; 2795 ct.nitems = incr_buf_fill;
2728 incr_buf = 0; 2796 incr_buf = 0;
2729 incr_buf_size = 0; 2797 incr_buf_size = 0;
2730 incr_ev.stop (); 2798 incr_ev.stop ();
2731 } 2799 }
2732 else 2800 else
2733 { 2801 {
2734 if (selection_wait == Sel_normal 2802 if (selection_wait == Sel_normal
2735 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2803 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2736 { 2804 {
2737 /* 2805 /*
… …
2744 goto bailout; 2812 goto bailout;
2745 } 2813 }
2746 } 2814 }
2747 else if (selection_wait == Sel_incr) 2815 else if (selection_wait == Sel_incr)
2748 { 2816 {
2749 incr_ev.start (NOW + 10); 2817 incr_ev.start (10);
2750 2818
2751 while (incr_buf_fill + ct.nitems > incr_buf_size) 2819 while (incr_buf_fill + ct.nitems > incr_buf_size)
2752 { 2820 {
2753 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2821 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2754 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2822 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2761 } 2829 }
2762 2830
2763 char **cl; 2831 char **cl;
2764 int cr; 2832 int cr;
2765 2833
2766#if ENABLE_FRILLS 2834#if !ENABLE_MINIMAL
2767 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2835 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2768 // so recode it manually 2836 // so recode it manually
2769 if (ct.encoding == xa[XA_UTF8_STRING]) 2837 if (ct.encoding == xa[XA_UTF8_STRING])
2770 { 2838 {
2771 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2839 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2775 paste (s, strlen (s)); 2843 paste (s, strlen (s));
2776 free (s); 2844 free (s);
2777 } 2845 }
2778 else 2846 else
2779#endif 2847#endif
2780 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2848 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2781 && cl) 2849 && cl)
2782 { 2850 {
2783 for (int i = 0; i < cr; i++) 2851 for (int i = 0; i < cr; i++)
2784 paste (cl[i], strlen (cl[i])); 2852 paste (cl[i], strlen (cl[i]));
2785 2853
… …
2794 if (selection_wait == Sel_normal) 2862 if (selection_wait == Sel_normal)
2795 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2796} 2864}
2797 2865
2798void 2866void
2799rxvt_term::incr_cb (time_watcher &w) NOTHROW 2867rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2800{ 2868{
2801 selection_wait = Sel_none; 2869 selection_wait = Sel_none;
2802 2870
2803 incr_buf_size = 0; 2871 incr_buf_size = 0;
2804 free (incr_buf); 2872 free (incr_buf);
… …
2815 selection_paste (win, prop, true); 2883 selection_paste (win, prop, true);
2816} 2884}
2817 2885
2818/* ------------------------------------------------------------------------- */ 2886/* ------------------------------------------------------------------------- */
2819/* 2887/*
2820 * Request the current selection: 2888 * Request the current selection:
2821 * Order: > internal selection if available 2889 * Order: > internal selection if available
2822 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2890 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2823 * > CUT_BUFFER0 2891 * > CUT_BUFFER0
2824 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2892 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2825 * will auto fallback to CUT_BUFFER0 2893 * will auto fallback to CUT_BUFFER0
… …
2827 */ 2895 */
2828void 2896void
2829rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2897rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2830{ 2898{
2831 if (selection.text && selnum == Sel_Primary) 2899 if (selection.text && selnum == Sel_Primary)
2900 {
2832 { /* internal selection */ 2901 /* internal selection */
2833 char *str = rxvt_wcstombs (selection.text, selection.len); 2902 char *str = rxvt_wcstombs (selection.text, selection.len);
2834 paste (str, strlen (str)); 2903 paste (str, strlen (str));
2835 free (str); 2904 free (str);
2836 return; 2905 return;
2837 } 2906 }
… …
2841 selection_wait = Sel_normal; 2910 selection_wait = Sel_normal;
2842 2911
2843#if X_HAVE_UTF8_STRING 2912#if X_HAVE_UTF8_STRING
2844 selection_type = Sel_UTF8String; 2913 selection_type = Sel_UTF8String;
2845 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2846 return; 2915 return;
2847#else 2916#else
2848 selection_type = Sel_CompoundText; 2917 selection_type = Sel_CompoundText;
2849 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2850 return; 2919 return;
2851#endif 2920#endif
2852 } 2921 }
2853 2922
2854 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2855 selection_paste (display->root, XA_CUT_BUFFER0, false); 2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2867 else if (selnum == Sel_Secondary) 2936 else if (selnum == Sel_Secondary)
2868 sel = XA_SECONDARY; 2937 sel = XA_SECONDARY;
2869 else 2938 else
2870 sel = xa[XA_CLIPBOARD]; 2939 sel = xa[XA_CLIPBOARD];
2871 2940
2872 if (XGetSelectionOwner (xdisp, sel) != None) 2941 if (XGetSelectionOwner (dpy, sel) != None)
2873 { 2942 {
2874 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2943 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2875 vt, selection_request_time); 2944 vt, selection_request_time);
2876 return 1; 2945 return 1;
2877 } 2946 }
2878 2947
2879 return 0; 2948 return 0;
… …
2883/* 2952/*
2884 * Clear all selected text 2953 * Clear all selected text
2885 * EXT: SelectionClear 2954 * EXT: SelectionClear
2886 */ 2955 */
2887void 2956void
2888rxvt_term::selection_clear () NOTHROW 2957rxvt_term::selection_clear (bool clipboard) NOTHROW
2889{ 2958{
2959 if (!clipboard)
2960 {
2890 want_refresh = 1; 2961 want_refresh = 1;
2891 free (selection.text); 2962 free (selection.text);
2892 selection.text = NULL; 2963 selection.text = NULL;
2893 selection.len = 0; 2964 selection.len = 0;
2894 CLEAR_SELECTION (); 2965 CLEAR_SELECTION ();
2895 2966
2896 if (display->selection_owner == this) 2967 if (display->selection_owner == this)
2897 display->selection_owner = 0; 2968 display->selection_owner = 0;
2969 }
2970 else
2971 {
2972 free (selection.clip_text);
2973 selection.clip_text = NULL;
2974 selection.clip_len = 0;
2975
2976 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0;
2978 }
2979}
2980
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2898} 2993}
2899 2994
2900/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2901/* 2996/*
2902 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
2942 3037
2943 int end_col; 3038 int end_col;
2944 3039
2945 for (; row <= selection.end.row; row++, col = 0) 3040 for (; row <= selection.end.row; row++, col = 0)
2946 { 3041 {
2947#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
2948 if (selection.rect) 3043 if (selection.rect)
2949 { 3044 {
2950 col = selection.beg.col; 3045 col = selection.beg.col;
2951 end_col = ncol + 1; 3046 end_col = ncol + 1;
2952 } 3047 }
… …
2955 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
2956 3051
2957 col = max (col, 0); 3052 col = max (col, 0);
2958 3053
2959 if (row == selection.end.row 3054 if (row == selection.end.row
2960#if ENABLE_FRILLS 3055#if !ENABLE_MINIMAL
2961 || selection.rect 3056 || selection.rect
2962#endif 3057#endif
2963 ) 3058 )
2964 min_it (end_col, selection.end.col); 3059 min_it (end_col, selection.end.col);
2965 3060
… …
2988#endif 3083#endif
2989 else 3084 else
2990 new_selection_text[ofs++] = *t++; 3085 new_selection_text[ofs++] = *t++;
2991 } 3086 }
2992 3087
2993#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
2994 if (selection.rect) 3089 if (selection.rect)
2995 { 3090 {
2996 while (ofs 3091 while (ofs
2997 && new_selection_text[ofs - 1] != C0_LF 3092 && new_selection_text[ofs - 1] != C0_LF
2998 && unicode::is_space (new_selection_text[ofs - 1])) 3093 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3028 3123
3029 selection_grab (tm); 3124 selection_grab (tm);
3030} 3125}
3031 3126
3032bool 3127bool
3033rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3034{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3035 selection_time = tm; 3134 selection_time = tm;
3036 3135 sel = XA_PRIMARY;
3037 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
3038 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
3039 { 3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3142
3143 XSetSelectionOwner (dpy, sel, vt, tm);
3144 if (XGetSelectionOwner (dpy, sel) == vt)
3145 {
3040 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3041 return true; 3147 return true;
3042 } 3148 }
3043 else 3149 else
3044 { 3150 {
3045 selection_clear (); 3151 selection_clear (clipboard);
3046 return false; 3152 return false;
3047 } 3153 }
3048 3154
3049#if 0 3155#if 0
3050 XTextProperty ct; 3156 XTextProperty ct;
3051 3157
3052 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3158 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3053 { 3159 {
3054 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3160 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3055 XFree (ct.value); 3161 XFree (ct.value);
3056 } 3162 }
3057#endif 3163#endif
… …
3103 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3209 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3104 3210
3105 while (selection.mark.col > 0 3211 while (selection.mark.col > 0
3106 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3212 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3107 --selection.mark.col; 3213 --selection.mark.col;
3108 3214
3109 if (selection.op) 3215 if (selection.op)
3216 {
3110 { /* clear the old selection */ 3217 /* clear the old selection */
3111 selection.beg.row = selection.end.row = selection.mark.row; 3218 selection.beg.row = selection.end.row = selection.mark.row;
3112 selection.beg.col = selection.end.col = selection.mark.col; 3219 selection.beg.col = selection.end.col = selection.mark.col;
3113 } 3220 }
3114 3221
3115 selection.op = SELECTION_INIT; 3222 selection.op = SELECTION_INIT;
… …
3304 * a point/word/line which is either the start or end of the selection 3411 * a point/word/line which is either the start or end of the selection
3305 * and it was decided by whichever point/word/line was `fixed' at the 3412 * and it was decided by whichever point/word/line was `fixed' at the
3306 * time of the most recent button3 press 3413 * time of the most recent button3 press
3307 */ 3414 */
3308 if (button3 && buttonpress) 3415 if (button3 && buttonpress)
3416 {
3309 { /* button3 press */ 3417 /* button3 press */
3310 /* 3418 /*
3311 * first determine which edge of the selection we are closest to 3419 * first determine which edge of the selection we are closest to
3312 */ 3420 */
3313 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3421 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3314 || (!ROWCOL_IS_AFTER (pos, selection.end) 3422 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3332 selection.mark.row = selection.beg.row; 3440 selection.mark.row = selection.beg.row;
3333 selection.mark.col = selection.beg.col; 3441 selection.mark.col = selection.beg.col;
3334 } 3442 }
3335 } 3443 }
3336 else 3444 else
3445 {
3337 { /* button1 drag or button3 drag */ 3446 /* button1 drag or button3 drag */
3338 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3447 if (ROWCOL_IS_AFTER (selection.mark, pos))
3339 { 3448 {
3340 if (selection.mark.row == selection.end.row 3449 if (selection.mark.row == selection.end.row
3341 && selection.mark.col == selection.end.col 3450 && selection.mark.col == selection.end.col
3342 && clickchange 3451 && clickchange
… …
3359 3468
3360 if (selection.clicks == 1) 3469 if (selection.clicks == 1)
3361 { 3470 {
3362 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3471 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3363 && !ROW(selection.beg.row).is_longer () 3472 && !ROW(selection.beg.row).is_longer ()
3364#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3365 && !selection.rect 3474 && !selection.rect
3366#endif 3475#endif
3367 ) 3476 )
3368 selection.beg.col = ncol; 3477 selection.beg.col = ncol;
3369 3478
3370 if ( 3479 if (
3371 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3480 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3372 && !ROW(selection.end.row).is_longer () 3481 && !ROW(selection.end.row).is_longer ()
3373#if ENABLE_FRILLS 3482#if !ENABLE_MINIMAL
3374 && !selection.rect 3483 && !selection.rect
3375#endif 3484#endif
3376 ) 3485 )
3377 selection.end.col = ncol; 3486 selection.end.col = ncol;
3378 } 3487 }
… …
3385 selection_delimit_word (DN, &selection.end, &selection.end); 3494 selection_delimit_word (DN, &selection.end, &selection.end);
3386 } 3495 }
3387 else if (selection.clicks == 3) 3496 else if (selection.clicks == 3)
3388 { 3497 {
3389#if ENABLE_FRILLS 3498#if ENABLE_FRILLS
3390 if (OPTION (Opt_tripleclickwords)) 3499 if (option (Opt_tripleclickwords))
3391 { 3500 {
3392 selection_delimit_word (UP, &selection.beg, &selection.beg); 3501 selection_delimit_word (UP, &selection.beg, &selection.beg);
3393 3502
3394 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3503 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3395 { 3504 {
3396 if (!ROW(end_row).is_longer ()) 3505 if (!ROW(end_row).is_longer ())
3397 { 3506 {
3398 selection.end.row = end_row; 3507 selection.end.row = end_row;
3399 selection.end.col = ROW(end_row).l; 3508 selection.end.col = ROW(end_row).l;
3509# if !ENABLE_MINIMAL
3400 selection_remove_trailing_spaces (); 3510 selection_remove_trailing_spaces ();
3511# endif
3401 break; 3512 break;
3402 } 3513 }
3403 } 3514 }
3404 } 3515 }
3405 else 3516 else
… …
3421 selection.end.row++; 3532 selection.end.row++;
3422 } 3533 }
3423 } 3534 }
3424 3535
3425 if (button3 && buttonpress) 3536 if (button3 && buttonpress)
3537 {
3426 { /* mark may need to be changed */ 3538 /* mark may need to be changed */
3427 if (closeto == LEFT) 3539 if (closeto == LEFT)
3428 { 3540 {
3429 selection.mark.row = selection.end.row; 3541 selection.mark.row = selection.end.row;
3430 selection.mark.col = selection.end.col - (selection.clicks == 2); 3542 selection.mark.col = selection.end.col - (selection.clicks == 2);
3431 } 3543 }
… …
3434 selection.mark.row = selection.beg.row; 3546 selection.mark.row = selection.beg.row;
3435 selection.mark.col = selection.beg.col; 3547 selection.mark.col = selection.beg.col;
3436 } 3548 }
3437 } 3549 }
3438 3550
3439#if ENABLE_FRILLS 3551#if !ENABLE_MINIMAL
3440 if (selection.rect && selection.beg.col > selection.end.col) 3552 if (selection.rect && selection.beg.col > selection.end.col)
3441 ::swap (selection.beg.col, selection.end.col); 3553 ::swap (selection.beg.col, selection.end.col);
3442#endif 3554#endif
3443} 3555}
3444 3556
3445#if ENABLE_FRILLS 3557#if !ENABLE_MINIMAL
3446void 3558void
3447rxvt_term::selection_remove_trailing_spaces () NOTHROW 3559rxvt_term::selection_remove_trailing_spaces () NOTHROW
3448{ 3560{
3449 int32_t end_col, end_row; 3561 int32_t end_col, end_row;
3450 text_t *stp; 3562 text_t *stp;
… …
3528 *target++ = xa[XA_COMPOUND_TEXT]; 3640 *target++ = xa[XA_COMPOUND_TEXT];
3529#if X_HAVE_UTF8_STRING 3641#if X_HAVE_UTF8_STRING
3530 *target++ = xa[XA_UTF8_STRING]; 3642 *target++ = xa[XA_UTF8_STRING];
3531#endif 3643#endif
3532 3644
3533 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3534 32, PropModeReplace, 3646 32, PropModeReplace,
3535 (unsigned char *)target_list, target - target_list); 3647 (unsigned char *)target_list, target - target_list);
3536 ev.property = rq.property; 3648 ev.property = rq.property;
3537 } 3649 }
3538#if TODO // TODO 3650#if TODO // TODO
3539 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3540 { 3652 {
3541 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3542 } 3654 }
3543#endif 3655#endif
3544 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3545 { 3657 {
3546 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3547 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3548 ev.property = rq.property; 3666 ev.property = rq.property;
3549 } 3667 }
3550 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3551 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3552 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3575 style = enc_string; 3693 style = enc_string;
3576 else if (target == xa[XA_TEXT]) 3694 else if (target == xa[XA_TEXT])
3577 style = enc_text; 3695 style = enc_text;
3578 else if (target == xa[XA_COMPOUND_TEXT]) 3696 else if (target == xa[XA_COMPOUND_TEXT])
3579 style = enc_compound_text; 3697 style = enc_compound_text;
3580#if ENABLE_FRILLS 3698#if !ENABLE_MINIMAL
3581 else if (target == xa[XA_UTF8_STRING]) 3699 else if (target == xa[XA_UTF8_STRING])
3582 style = enc_utf8; 3700 style = enc_utf8;
3583#endif 3701#endif
3584 else 3702 else
3585 { 3703 {
3586 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3587 style = enc_compound_text; 3705 style = enc_compound_text;
3588 } 3706 }
3589 3707
3590 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3591 { 3709 {
3592 cl = selection.text; 3710 cl = selection.text;
3593 selectlen = selection.len; 3711 selectlen = selection.len;
3594 } 3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3717 }
3595 else 3718 else
3596 { 3719 {
3597 cl = L""; 3720 cl = L"";
3598 selectlen = 0; 3721 selectlen = 0;
3599 } 3722 }
3600 3723
3601#if ENABLE_FRILLS 3724#if !ENABLE_MINIMAL
3602 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3725 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3603 // so recode it manually 3726 // so recode it manually
3604 if (style == enc_utf8) 3727 if (style == enc_utf8)
3605 { 3728 {
3606 freect = 1; 3729 freect = 1;
… …
3609 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3732 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3610 ct.nitems = strlen ((char *)ct.value); 3733 ct.nitems = strlen ((char *)ct.value);
3611 } 3734 }
3612 else 3735 else
3613#endif 3736#endif
3614 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3737 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3615 freect = 1; 3738 freect = 1;
3616 else 3739 else
3617 { 3740 {
3618 /* if we failed to convert then send it raw */ 3741 /* if we failed to convert then send it raw */
3619 ct.value = (unsigned char *)cl; 3742 ct.value = (unsigned char *)cl;
3620 ct.nitems = selectlen; 3743 ct.nitems = selectlen;
3621 ct.encoding = target; 3744 ct.encoding = target;
3622 } 3745 }
3623 3746
3624 XChangeProperty (xdisp, rq.requestor, rq.property, 3747 XChangeProperty (dpy, rq.requestor, rq.property,
3625 ct.encoding, 8, PropModeReplace, 3748 ct.encoding, 8, PropModeReplace,
3626 ct.value, (int)ct.nitems); 3749 ct.value, (int)ct.nitems);
3627 ev.property = rq.property; 3750 ev.property = rq.property;
3628 3751
3629 if (freect) 3752 if (freect)
3630 XFree (ct.value); 3753 XFree (ct.value);
3631 } 3754 }
3632 3755
3633 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3634}
3635
3636/* ------------------------------------------------------------------------- *
3637 * MOUSE ROUTINES *
3638 * ------------------------------------------------------------------------- */
3639
3640/*
3641 * return col/row values corresponding to x/y pixel values
3642 */
3643void
3644rxvt_term::pixel_position (int *x, int *y) NOTHROW
3645{
3646 *x = Pixel2Col (*x);
3647 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3648 *y = Pixel2Row (*y);
3649 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3650} 3757}
3651 3758
3652/* ------------------------------------------------------------------------- */ 3759/* ------------------------------------------------------------------------- */
3653#ifdef USE_XIM 3760#ifdef USE_XIM
3654void 3761void
3655rxvt_term::im_set_position (XPoint &pos) NOTHROW 3762rxvt_term::im_set_position (XPoint &pos) NOTHROW
3656{ 3763{
3657 XWindowAttributes xwa; 3764 XWindowAttributes xwa;
3658 3765
3659 XGetWindowAttributes (xdisp, vt, &xwa); 3766 XGetWindowAttributes (dpy, vt, &xwa);
3660 3767
3661 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3768 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3662 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3769 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3663} 3770}
3664#endif 3771#endif
… …
3682 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3683 3790
3684 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3685 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3686 3793
3687 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3688 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3689 3796
3690 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3691 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3692 3799
3693 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3694 { 3801 {
3695 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3696 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3697 3804
3698 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3699 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3700 3807
3701 if (y == 0) 3808 if (y == 0)
… …
3720} 3827}
3721 3828
3722void 3829void
3723rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3724{ 3831{
3725 if (!ov_text) 3832 if (!ov.text)
3726 return; 3833 return;
3727 3834
3728 want_refresh = 1; 3835 want_refresh = 1;
3729 3836
3730 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3731 { 3838 {
3732 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3733 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3734 } 3841 }
3735 3842
3736 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3737 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3738} 3845}
3739 3846
3740void 3847void
3741rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3742{ 3849{
3743 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3744 return; 3851 return;
3745 3852
3746 x++, y++; 3853 x++, y++;
3747 3854
3748 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3749 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3750} 3857}
3751 3858
3752void 3859void
3753rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3754{ 3861{
… …
3773} 3880}
3774 3881
3775void 3882void
3776rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3777{ 3884{
3778 if (!ov_text) 3885 if (!ov.text)
3779 return; 3886 return;
3780 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3781 // swap screen mem with overlay 3893 // swap screen mem with overlay
3782 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3783 { 3895 {
3784 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3785 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3786 3898
3787 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3788 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3789 3901
3790 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3791 { 3903 {
3792 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3793 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3794 } 3906 }
3795 } 3907 }

Diff Legend

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