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.187 by root, Wed Dec 21 23:57:12 2005 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 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.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
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 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 278 }
273 279
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
275 281
276 // re-wrap lines, this is rather ugly, possibly because I am too dumb
277 // to come up with a lean and mean algorithm.
278
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start - nsaved , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 while (p != pend && q > 0) 286 if (nsaved)
287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
284 { 294 do
285 p = MOD (p - 1, prev_total_rows);
286#ifdef DEBUG_STRICT
287 assert (old_buf [MOD (p, prev_total_rows)].t);
288#endif
289
290 int llen = old_buf [MOD (p, prev_total_rows)].l;
291
292 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
293 { 295 {
294 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 302
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 {
305 p = MOD (p - 1, prev_total_rows);
306
307 plines++;
296 llen += prev_ncol; 308 llen += prev_ncol;
309 }
310
311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
319 int lofs = 0;
320 line_t *qline;
321
322 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++)
324 {
325 qline = row_buf + qrow;
326 lalloc (*qline);
327 qline->l = ncol;
328 qline->is_longer (1);
329
330 int qcol = 0;
331
332 // fill a single destination line
333 while (lofs < llen && qcol < ncol)
334 {
335 int prow = lofs / prev_ncol;
336 int pcol = lofs % prev_ncol;
337
338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
347 line_t &pline = old_buf [prow];
348
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350
351 assert (len);
352 assert (pline.t);
353
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
356
357 lofs += len;
358 qcol += len;
359 }
360 }
361
362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
297 } 365 }
366 while (p != pend && q > 0);
298 367
299 int qlines = max (0, (llen - 1) / ncol) + 1; 368 term_start = total_rows - nrow;
300 369 nsaved = term_start - q;
301 // drop partial lines completely 370
302 if (q < qlines) 371 // make sure all terminal lines exist
303 break; 372 while (nsaved < 0)
304 373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
305 q -= qlines; 374 }
306 375 else
307 int lofs = 0; 376 {
308 line_t *qline; 377 // if no scrollback exists (yet), wing, instead of wrap
309 378
310 // re-assemble the full line by destination lines 379 for (int row = min (nrow, prev_nrow); row--; )
311 for (int qrow = q; qlines--; qrow++)
312 { 380 {
313 qline = row_buf + qrow;
314 lalloc (*qline);
315 qline->set_is_longer ();
316
317 int qcol = 0;
318
319 // fill a single destination line
320 while (lofs < llen && qcol < ncol)
321 {
322 int prow = lofs / prev_ncol;
323 int pcol = lofs % prev_ncol;
324
325 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row];
326 383
327 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 384 qline = pline;
328 385 lresize (qline);
329 assert (len);
330 assert (pline.t);
331
332 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
333 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
334
335 lofs += len;
336 qcol += len;
337 }
338 } 386 }
339 387
340 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 388 for (int row = prev_nrow; row < nrow; row++)
341 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
342 } 391 }
343 392
344 term_start = total_rows - nrow;
345 view_start = 0; 393 term_start = 0;
346 nsaved = term_start - q; 394 }
347 395
348 // make sure all terminal lines exist 396#ifdef DEBUG_STRICT //TODO: remove
349 while (nsaved < 0)
350 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
351
352 for (int i = -nsaved; i < nrow; i++) 397 for (int i = -nsaved; i < nrow; i++)
353 assert (ROW (i).t);//D 398 assert (ROW (i).t);
399#endif
354 400
355 free (old_buf); 401 free (old_buf);
356 delete old_ta; 402 delete old_ta;
357 delete old_ra; 403 delete old_ra;
358 404
359 min_it (screen.cur.row, nrow - 1); 405 clamp_it (screen.cur.row, 0, nrow - 1);
360 min_it (screen.cur.col, ncol - 1); 406 clamp_it (screen.cur.col, 0, ncol - 1);
361 407
362 if (tabs) 408 if (tabs)
363 free (tabs); 409 free (tabs);
364 } 410 }
365 411
… …
370 416
371 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
372 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
373 419
374 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
375} 423}
376 424
377/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
378/* 426/*
379 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
483 531
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 534
487#if NSCREENS 535#if NSCREENS
488 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
489 { 537 {
490 num_scr = 0; 538 num_scr = 0;
491 539
492 for (int i = nrow; i--; ) 540 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 541 ::swap (ROW(i), swap_buf [i]);
494 542
495 ::swap (screen.charset, swap.charset); 543 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 544 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
499 } 547 }
500 else 548 else
501#endif 549#endif
502 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 552
505 return scrn; 553 return scrn;
506} 554}
507 555
… …
569 num_scr += count; 617 num_scr += count;
570 618
571 if (count > 0 619 if (count > 0
572 && row1 == 0 620 && row1 == 0
573 && row2 == nrow - 1 621 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 623 {
576 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
577 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
578 629
579 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
580 { 631 {
581 selection.beg.row -= count; 632 selection.beg.row -= count;
582 selection.end.row -= count; 633 selection.end.row -= count;
583 selection.mark.row -= count; 634 selection.mark.row -= count;
584 635
585 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
586 } 643 }
587 644
588 for (int i = count; i--; ) 645 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
590 656
591 if ((options & Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
592 && view_start != 0 658 && view_start != 0
593 && view_start != saveLines) 659 && view_start != saveLines)
594 scr_page (UP, count); 660 scr_page (UP, count);
595 } 661 }
596 else 662 else
597 { 663 {
598 if (selection.op && current_screen == selection.screen) 664 if (selection.op && current_screen == selection.screen)
599 { 665 {
600 int i = selection.beg.row; 666 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 667 || (selection.beg.row < row2 && selection.end.row > row2)
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1) 668 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 669 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 670 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 671 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 672 {
610 CLEAR_ALL_SELECTION (); 673 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 674 selection.op = SELECTION_CLEAR;
612 } 675 }
613 else if (j >= row1 && j <= row2) 676 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 677 {
615 /* move selected region too */ 678 /* move selected region too */
616 selection.beg.row -= count; 679 selection.beg.row -= count;
617 selection.end.row -= count; 680 selection.end.row -= count;
618 selection.mark.row -= count; 681 selection.mark.row -= count;
… …
646/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
647/* 710/*
648 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
649 */ 712 */
650void 713void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 715{
653 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
654 return; 717 return;
655 718
656 unsigned char checksel; 719 unsigned char checksel;
657 unicode_t c; 720 unicode_t c;
658 int row, last_col; 721 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
660 723
661 want_refresh = 1; 724 want_refresh = 1;
662 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 726
665 if (nlines > 0) 727 if (minlines > 0)
666 { 728 {
667 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
730
668 if (nlines > 0 731 if (minlines > 0
669 && screen.tscroll == 0 732 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 733 && screen.bscroll == nrow - 1)
671 { 734 {
672 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
675 } 738 }
676 } 739 }
677 740
678#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 743 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 744 && screen.cur.row >= -nsaved);
682#endif 745#endif
683 row = screen.cur.row; 746 int row = screen.cur.row;
684 747
685 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 748 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
686 749
687 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
688 751
689 while (str < strend) 752 while (str < strend)
690 { 753 {
691 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
692 755
693 if (c < 0x20) 756 if (c < 0x20)
694 if (c == C0_LF) 757 if (c == C0_LF)
695 { 758 {
696 if (!line->is_longer ()) /* XXX: think about this */
697 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
698 760
699 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
700 762
701 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
702 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
706 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
707 continue; 769 continue;
708 } 770 }
709 else if (c == C0_CR) 771 else if (c == C0_CR)
710 { 772 {
711 if (!line->is_longer ()) /* XXX: think about this */
712 max_it (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
713 774
714 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
715 screen.cur.col = 0; 776 screen.cur.col = 0;
716 continue; 777 continue;
717 } 778 }
… …
734 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
735 } 796 }
736 797
737 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
738 { 799 {
800 max_it (line->l, ncol);
739 line->set_is_longer (); 801 line->is_longer (1);
740 802
741 scr_do_wrap (); 803 scr_do_wrap ();
742 804
743 row = screen.cur.row; 805 row = screen.cur.row;
744 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
752 // do wcwidth before further replacements, as wcwidth might return -1 814 // do wcwidth before further replacements, as wcwidth might return -1
753 // for the line drawing characters below as they might be invalid in the current 815 // for the line drawing characters below as they might be invalid in the current
754 // locale. 816 // locale.
755 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
756 818
757 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
758 { 820 {
759 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
760 // 5f-7e standard vt100 822 // 5f-7e standard vt100
761 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
762 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
814 } 876 }
815 877
816 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
817 879
818 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
819 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
820 { 882 {
821 // ...output spaces 883 // ...output spaces
822 c = ' '; 884 c = ' ';
823 // and try the same character next loop iteration 885 // and try the same character next loop iteration
824 --str; 886 --str;
825 } 887 }
826 888
889 line->touch ();
890
827 do 891 do
828 { 892 {
829 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
830 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
831 895
832 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
833 screen.cur.col++; 897 screen.cur.col++;
834 else 898 else
835 { 899 {
836 line->l = last_col; 900 line->l = ncol;
837 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
838 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
839 break; 903 break;
840 } 904 }
841 905
… …
843 } 907 }
844 while (--width > 0); 908 while (--width > 0);
845 909
846 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
847 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
848 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
849 { 916 {
850 line->t[c] = ' '; 917 line->t[c] = ' ';
851 line->r[c] = rend; 918 line->r[c] = rend;
852 } 919 }
920 }
853 } 921 }
854 else // width == 0 922 else // width == 0
855 { 923 {
856#if ENABLE_COMBINING 924#if ENABLE_COMBINING
857 // handle combining characters 925 // handle combining characters
858 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
859 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
860 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
861 text_t *tp; 930 text_t *tp;
862 rend_t *rp; 931 rend_t *rp;
863 932
864 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
865 { 934 {
935 linep = line;
866 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
867 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
868
869 while (*tp == NOCHAR && tp > line->t)
870 tp--, rp--;
871 } 938 }
872 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
873 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
874 { 941 {
875 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
876
877 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
878 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
879
880 while (*tp == NOCHAR && tp > line->t)
881 tp--, rp--;
882 } 945 }
883 else 946 else
884 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
885 953
886 // first try to find a precomposed character 954 // first try to find a precomposed character
887 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
888 if (n == NOCHAR) 956 if (n == NOCHAR)
889 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
892 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
893#endif 961#endif
894 } 962 }
895 } 963 }
896 964
897 if (!line->is_longer ()) /* XXX: think about this */
898 max_it (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
899 966
900#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
901 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
902#endif 969#endif
903} 970}
… …
945 1012
946 if (count == 0) 1013 if (count == 0)
947 return; 1014 return;
948 else if (count > 0) 1015 else if (count > 0)
949 { 1016 {
950 int row = screen.cur.row;
951
952 line_t &l = ROW(row); 1017 line_t &l = ROW(screen.cur.row);
953 rend_t base_rend = l.r[i]; 1018 rend_t base_rend = l.r[i];
954 ht &= l.t[i] == ' '; 1019 ht &= l.t[i] == ' ';
955 1020
956 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
957 if (tabs[i]) 1022 if (tabs[i])
958 { 1023 {
959 x = i; 1024 x = i;
1025
960 if (!--count) 1026 if (!--count)
961 break; 1027 break;
962 } 1028 }
963 else 1029 else
964 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
967 if (count) 1033 if (count)
968 x = ncol - 1; 1034 x = ncol - 1;
969 1035
970 // store horizontal tab commands as characters inside the text 1036 // store horizontal tab commands as characters inside the text
971 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
972 if (ht && options & Opt_pastableTabs) 1038 if (ht && OPTION (Opt_pastableTabs))
973 { 1039 {
974 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
975 1041
976 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
977 max_it (l.l, x);
978 1043
979 i = screen.cur.col; 1044 i = screen.cur.col;
980 1045
981 l.t[i] = '\t'; 1046 l.t[i] = '\t';
982 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1032 */ 1097 */
1033#if ENABLE_FRILLS 1098#if ENABLE_FRILLS
1034void 1099void
1035rxvt_term::scr_forwardindex () 1100rxvt_term::scr_forwardindex ()
1036{ 1101{
1037 int row;
1038
1039 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1040 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1041 else 1104 else
1042 { 1105 {
1043 row = screen.cur.row; 1106 line_t &l = ROW(screen.cur.row);
1044 1107
1045 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1108 l.touch ();
1046 ROW(row).l = ncol; 1109 l.is_longer (0);
1047 1110
1048 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1049 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1050 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1051 } 1114 }
… …
1134 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1135 */ 1198 */
1136void 1199void
1137rxvt_term::scr_erase_line (int mode) 1200rxvt_term::scr_erase_line (int mode)
1138{ 1201{
1139 unsigned int row, col, num; 1202 unsigned int col, num;
1140 1203
1141 want_refresh = 1; 1204 want_refresh = 1;
1142 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1143 1206
1144 selection_check (1); 1207 selection_check (1);
1145 1208
1146 row = screen.cur.row; 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1147 1213
1148 switch (mode) 1214 switch (mode)
1149 { 1215 {
1150 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1151 col = screen.cur.col; 1217 col = screen.cur.col;
1152 num = ncol - col; 1218 num = ncol - col;
1153 min_it (ROW(row).l, col); 1219 min_it (line.l, col);
1154 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1220 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1155 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1221 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1156 CLEAR_SELECTION (); 1222 CLEAR_SELECTION ();
1157 break; 1223 break;
1158 case 1: /* erase to beginning of line */ 1224 case 1: /* erase to beginning of line */
… …
1163 CLEAR_SELECTION (); 1229 CLEAR_SELECTION ();
1164 break; 1230 break;
1165 case 2: /* erase whole line */ 1231 case 2: /* erase whole line */
1166 col = 0; 1232 col = 0;
1167 num = ncol; 1233 num = ncol;
1168 ROW(row).l = 0; 1234 line.l = 0;
1169 if (selection.beg.row <= screen.cur.row 1235 if (selection.beg.row <= screen.cur.row
1170 && selection.end.row >= screen.cur.row) 1236 && selection.end.row >= screen.cur.row)
1171 CLEAR_SELECTION (); 1237 CLEAR_SELECTION ();
1172 break; 1238 break;
1173 default: 1239 default:
1174 return; 1240 return;
1175 } 1241 }
1176 1242
1177 scr_blank_line (ROW(row), col, num, rstyle); 1243 scr_blank_line (line, col, num, rstyle);
1178} 1244}
1179 1245
1180/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1181/* 1247/*
1182 * Erase part of whole of the screen 1248 * Erase part of whole of the screen
… …
1237 CLEAR_ROWS (row, num); 1303 CLEAR_ROWS (row, num);
1238 } 1304 }
1239 else 1305 else
1240 { 1306 {
1241 ren = rstyle & (RS_fgMask | RS_bgMask); 1307 ren = rstyle & (RS_fgMask | RS_bgMask);
1242 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1243 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1244 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1245 gcvalue.foreground = pix_colors[Color_fg]; 1311 gcvalue.foreground = pix_colors[Color_fg];
1246 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1247 } 1313 }
1248 1314
1249 for (; num--; row++) 1315 for (; num--; row++)
1250 { 1316 {
1251 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1252 ROW (row).l = 0;
1253 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1254 } 1319 }
1255} 1320}
1256 1321
1257#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1290 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1291 1356
1292 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1293 *r1++ = fs; 1358 *r1++ = fs;
1294 1359
1295 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1296 } 1362 }
1297} 1363}
1298 1364
1299/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1300/* 1366/*
… …
1348 min_it (count, ncol - screen.cur.col); 1414 min_it (count, ncol - screen.cur.col);
1349 1415
1350 row = screen.cur.row; 1416 row = screen.cur.row;
1351 1417
1352 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1353 1422
1354 switch (insdel) 1423 switch (insdel)
1355 { 1424 {
1356 case INSERT: 1425 case INSERT:
1357 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1358 { 1427 {
1359 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1360 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1361 } 1430 }
1362 1431
1363 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1364 {
1365 line->l += count;
1366 min_it (line->l, ncol);
1367 }
1368 1433
1369 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1370 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1371 { 1436 {
1372 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1385 1450
1386 case ERASE: 1451 case ERASE:
1387 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1388 selection_check (1); 1453 selection_check (1);
1389 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1390 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1391 break; 1458 break;
1392 1459
1393 case DELETE: 1460 case DELETE:
1394 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1397 { 1464 {
1398 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1399 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1400 } 1467 }
1401 1468
1469 line->l = max (line->l - count, 0);
1402 scr_blank_line (*line, ncol - count, count, tr); 1470 scr_blank_line (*line, ncol - count, count, tr);
1403
1404 if (line->is_longer ()) /* break line continuation */
1405 line->l = ncol;
1406
1407 line->l = max (line->l - count, 0);
1408 1471
1409 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1410 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1411 { 1474 {
1412 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1524rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1525{ 1588{
1526 if (mode < 0) 1589 if (mode < 0)
1527 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1528 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1529 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1530} 1593}
1531 1594
1532/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1533/* 1596/*
1534 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1546 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1547#if XPM_BACKGROUND 1610#if XPM_BACKGROUND
1548 if (bgPixmap.pixmap == None) 1611 if (bgPixmap.pixmap == None)
1549#endif 1612#endif
1550#if TRANSPARENT 1613#if TRANSPARENT
1551 if (! (options & Opt_transparent) || am_transparent == 0) 1614 if (! OPTION (Opt_transparent) || am_transparent == 0)
1552#endif 1615#endif
1553 XSetWindowBackground (display->display, vt, 1616 XSetWindowBackground (display->display, vt,
1554 pix_colors[Color_bg]); 1617 pix_colors[Color_bg]);
1555 1618
1556 gcvalue.foreground = pix_colors[Color_fg]; 1619 gcvalue.foreground = pix_colors[Color_fg];
… …
1581 * Set font style 1644 * Set font style
1582 */ 1645 */
1583void 1646void
1584rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1585{ 1648{
1649#if 0
1586 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1587 { 1651 {
1588 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1589 break; 1653 break;
1590 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1591 break; 1655 break;
… …
1598 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1599 break; 1663 break;
1600 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1601 break; 1665 break;
1602 } 1666 }
1667#endif
1603} 1668}
1604 1669
1605/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1606/* 1671/*
1607 * Choose a font 1672 * Choose a font
… …
1774int 1839int
1775rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1776{ 1841{
1777 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1778 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1779 want_refresh = 1; 1846 want_refresh = 1;
1780 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1781 } 1848 }
1782 1849
1783 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1784} 1851}
1785 1852
1786/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1787void 1854void
1788rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
1789{ 1856{
1790#ifndef NO_BELL 1857#ifndef NO_BELL
1791 1858
1792# ifndef NO_MAPALERT 1859# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1860# ifdef MAPALERT_OPTION
1794 if (options & Opt_mapAlert) 1861 if (OPTION (Opt_mapAlert))
1795# endif 1862# endif
1796 XMapWindow (display->display, parent[0]); 1863 XMapWindow (display->display, parent[0]);
1797# endif 1864# endif
1798 1865
1799 if (options & Opt_visualBell) 1866 if (OPTION (Opt_visualBell))
1800 { 1867 {
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1802 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1803 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1804 } 1871 }
… …
1895 1962
1896#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1897 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1898#endif 1965#endif
1899#if TRANSPARENT 1966#if TRANSPARENT
1900 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1901#endif 1968#endif
1902 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1903 1970
1904 /* 1971 /*
1905 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1929 1996
1930 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
1931 1998
1932 if (showcursor && focus) 1999 if (showcursor && focus)
1933 { 2000 {
1934 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
1935 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
1936 else 2003 else
1937 { 2004 {
1938 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
1939 2006
… …
1941 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1942 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1943 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1944 else 2011 else
1945#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1946 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1947#else 2014#else
1948 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
1949#endif 2016#endif
1950 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
1951 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
1952 else 2019 else
1953#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1954 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
1955#else 2022#else
1956 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
1957#endif 2024#endif
1958 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
1959 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1992 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
1993 } 2060 }
1994 } 2061 }
1995 } 2062 }
1996 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
1997#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
1998 scr_swap_overlay (); 2066 scr_swap_overlay ();
1999#endif 2067#endif
2000 2068
2001#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2051 if (wlen < len) 2119 if (wlen < len)
2052 ::swap (wlen, len); 2120 ::swap (wlen, len);
2053 2121
2054 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2055 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2056 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2057 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2058 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2059 len = -1; 2127 len = -1;
2060 } 2128 }
2061 } 2129 }
… …
2140 count++, i--; 2208 count++, i--;
2141 2209
2142 /* 2210 /*
2143 * Determine the attributes for the string 2211 * Determine the attributes for the string
2144 */ 2212 */
2145 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2146 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2147 2215
2148 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2149 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2150 { 2218 {
2151#if ENABLE_STYLES 2219#if ENABLE_STYLES
2152 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2153 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2264 } /* for (row....) */ 2332 } /* for (row....) */
2265 2333
2266#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2267 scr_swap_overlay (); 2335 scr_swap_overlay ();
2268#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2269 2338
2270 /* 2339 /*
2271 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2272 */ 2341 */
2273 if (showcursor) 2342 if (showcursor)
2274 { 2343 {
2275 if (focus) 2344 if (focus)
2276 { 2345 {
2277 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2278 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2279 else 2348 else
2280 { 2349 {
2281 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2282#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2320 num_scr = 0; 2389 num_scr = 0;
2321 num_scr_allow = 1; 2390 num_scr_allow = 1;
2322} 2391}
2323 2392
2324void 2393void
2325rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2326{ 2395{
2327 if (!l.t) 2396 if (!l.t)
2328 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2329 2400
2330 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2331 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2332} 2403}
2333 2404
… …
2401 2472
2402#if ENABLE_FRILLS 2473#if ENABLE_FRILLS
2403 if (selection.rect) 2474 if (selection.rect)
2404 { 2475 {
2405 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2477 {
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2406 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2481 for (col = selection.beg.col; col < selection.end.col; col++)
2407 srp[col] ^= RS_RVid; 2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2408 } 2490 }
2409 else 2491 else
2410#endif 2492#endif
2411 { 2493 {
2412 if (selection.beg.row >= -view_start) 2494 if (selection.beg.row >= -view_start)
… …
2415 row = selection.beg.row; 2497 row = selection.beg.row;
2416 } 2498 }
2417 else 2499 else
2418 { 2500 {
2419 col = 0; 2501 col = 0;
2420 row = view_start; 2502 row = -view_start;
2421 } 2503 }
2422 2504
2423 for (; row < min (selection.end.row, view_end); row++, col = 0) 2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2424 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2425 srp[col] ^= RS_RVid; 2507 srp[col] ^= RS_RVid;
… …
2496/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2497/* 2579/*
2498 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2499 */ 2581 */
2500void 2582void
2501rxvt_term::paste (unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2502{ 2584{
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (unsigned int i = 0; i < len; i++) 2586 for (unsigned int i = 0; i < len; i++)
2505 if (data[i] == C0_LF) 2587 if (data[i] == C0_LF)
2506 data[i] = C0_CR; 2588 data[i] = C0_CR;
… …
2650 { 2732 {
2651 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2652 char *s = rxvt_wcstombs (w); 2734 char *s = rxvt_wcstombs (w);
2653 free (w); 2735 free (w);
2654 // TODO: strlen == only the first element will be converted. well... 2736 // TODO: strlen == only the first element will be converted. well...
2655 paste ((unsigned char *)s, strlen (s)); 2737 paste (s, strlen (s));
2656 free (s); 2738 free (s);
2657 } 2739 }
2658 else 2740 else
2659#endif 2741#endif
2660 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2661 && cl) 2743 && cl)
2662 { 2744 {
2663 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2664 paste ((unsigned char *)cl[i], strlen (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2665 2747
2666 XFreeStringList (cl); 2748 XFreeStringList (cl);
2667 } 2749 }
2668 else 2750 else
2669 paste (ct.value, ct.nitems); // paste raw 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2670 2752
2671bailout: 2753bailout:
2672 XFree (ct.value); 2754 XFree (ct.value);
2673 2755
2674 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
… …
2712 return; /* outside window */ 2794 return; /* outside window */
2713 2795
2714 if (selection.text) 2796 if (selection.text)
2715 { /* internal selection */ 2797 { /* internal selection */
2716 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2717 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2718 free (str); 2800 free (str);
2719 return; 2801 return;
2720 } 2802 }
2721 else 2803 else
2722 { 2804 {
… …
2814 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2815 2897
2816 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2817 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2818 2900
2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2902 return;
2903
2819 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2820 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2821 2906
2822 int ofs = 0; 2907 int ofs = 0;
2823 int extra = 0; 2908 int extra = 0;
… …
2835 col = selection.beg.col; 2920 col = selection.beg.col;
2836 end_col = ncol + 1; 2921 end_col = ncol + 1;
2837 } 2922 }
2838 else 2923 else
2839#endif 2924#endif
2840 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2841 2926
2842 col = max (col, 0); 2927 col = max (col, 0);
2843 2928
2844 if (row == selection.end.row || selection.rect) 2929 if (row == selection.end.row
2930#if ENABLE_FRILLS
2931 || selection.rect
2932#endif
2933 )
2845 end_col = min (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2846 2935
2847 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2848 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2849 { 2939 {
2850 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2851 t++; 2941 t++;
2852#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2868#endif 2958#endif
2869 else 2959 else
2870 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
2871 } 2961 }
2872 2962
2963#if ENABLE_FRILLS
2964 if (selection.rect)
2965 {
2966 while (ofs
2967 && new_selection_text[ofs - 1] != C0_LF
2968 && unicode::is_space (new_selection_text[ofs - 1]))
2969 --ofs;
2970
2971 new_selection_text[ofs++] = C0_LF;
2972 }
2973 else
2974#endif
2873 if (!ROW(row).is_longer () && row != selection.end.row) 2975 if (!ROW(row).is_longer () && row != selection.end.row)
2874 new_selection_text[ofs++] = C0_LF; 2976 new_selection_text[ofs++] = C0_LF;
2875 } 2977 }
2876 2978
2877 if (end_col != selection.end.col) 2979 if (end_col != selection.end.col)
2878 new_selection_text[ofs++] = C0_LF; 2980 new_selection_text[ofs++] = C0_LF;
2879 2981
… …
2889 2991
2890 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2891 selection.len = ofs; 2993 selection.len = ofs;
2892 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2893 2995
2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2997 return;
2998
2999 selection_grab (tm);
3000}
3001
3002bool
3003rxvt_term::selection_grab (Time tm)
3004{
3005 selection_time = tm;
3006
2894 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2895 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 {
2896 display->set_selection_owner (this); 3010 display->set_selection_owner (this);
3011 return true;
3012 }
2897 else 3013 else
2898 rxvt_warn ("can't get primary selection, ignoring.\n"); 3014 return false;
2899 3015
2900#if 0 3016#if 0
2901 XTextProperty ct; 3017 XTextProperty ct;
2902 3018
2903 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2904 { 3020 {
2905 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2906 XFree (ct.value); 3022 XFree (ct.value);
2907 } 3023 }
2908#endif 3024#endif
2909
2910 selection_time = tm;
2911} 3025}
2912 3026
2913/* ------------------------------------------------------------------------- */ 3027/* ------------------------------------------------------------------------- */
2914/* 3028/*
2915 * Mark or select text based upon number of clicks: 1, 2, or 3 3029 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3037 } 3151 }
3038 } 3152 }
3039 break; 3153 break;
3040 } 3154 }
3041 3155
3042Old_Word_Selection_You_Die:
3043 if (dirn == DN) 3156 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3045 3158
3046 /* Poke the values back in */ 3159 /* Poke the values back in */
3047 ret->row = row; 3160 ret->row = row;
… …
3224 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3225 { 3338 {
3226 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3227 selection.end.col--; 3340 selection.end.col--;
3228 3341
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3229 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3230 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3231 } 3347 }
3232 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3233 { 3349 {
3234#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3235 if (options & Opt_tripleclickwords) 3351 if (OPTION (Opt_tripleclickwords))
3236 { 3352 {
3237 selection_delimit_word (UP, &selection.beg, &selection.beg); 3353 selection_delimit_word (UP, &selection.beg, &selection.beg);
3238 3354
3239 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3355 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3240 { 3356 {
… …
3301 { 3417 {
3302 stp = ROW(end_row).t; 3418 stp = ROW(end_row).t;
3303 3419
3304 while (--end_col >= 0) 3420 while (--end_col >= 0)
3305 { 3421 {
3306 if (stp[end_col] != ' ' 3422 if (stp[end_col] != NOCHAR
3307 && stp[end_col] != '\t' 3423 && !unicode::is_space (stp[end_col]))
3308 && stp[end_col] != NOCHAR)
3309 break; 3424 break;
3310 } 3425 }
3311 3426
3312 if (end_col >= 0 3427 if (end_col >= 0
3313 || !ROW(end_row - 1).is_longer ()) 3428 || !ROW(end_row - 1).is_longer ())
… …
3512 3627
3513#if ENABLE_OVERLAY 3628#if ENABLE_OVERLAY
3514void 3629void
3515rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3630rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3516{ 3631{
3517 if (nrow < 3 || ncol < 3) 3632 if (nrow < 1 || ncol < 1)
3518 return; 3633 return;
3519 3634
3520 want_refresh = 1; 3635 want_refresh = 1;
3521 3636
3522 scr_overlay_off (); 3637 scr_overlay_off ();
… …
3629 for (int y = ov_h; y--; ) 3744 for (int y = ov_h; y--; )
3630 { 3745 {
3631 text_t *t1 = ov_text[y]; 3746 text_t *t1 = ov_text[y];
3632 rend_t *r1 = ov_rend[y]; 3747 rend_t *r1 = ov_rend[y];
3633 3748
3634 text_t *t2 = ROW(y - view_start).t + ov_x; 3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3635 rend_t *r2 = ROW(y - view_start).r + ov_x; 3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3636 3751
3637 for (int x = ov_w; x--; ) 3752 for (int x = ov_w; x--; )
3638 { 3753 {
3639 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3754 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3640 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3755 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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