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