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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.167 by root, Fri Aug 5 16:42:44 2005 UTC

… …
23/* 23/*
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#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30 29
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 31
33#include <inttypes.h> 32#include <inttypes.h>
34#include <wchar.h>
35 33
36#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
37 35
38inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
39{ 37{
40 while (len--) 38 while (len--)
41 *start++ = value; 39 *start++ = value;
42} 40}
43 41
44/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
45#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
… …
112 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
113 112
114/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
120{ 120{
121 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 123
124 while (width--) 124 while (width--)
125 { 125 {
126 *et++ = ' '; 126 *et++ = ' ';
127 *er++ = efs; 127 *er++ = efs;
… …
202 /* 202 /*
203 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 205 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 218
219 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
220 { 220 {
221 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
293 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
294 } 294 }
295 295
296 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 298
300 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
301 } 300 }
302 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
303 { 302 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 334 screen.cur.row += k;
336 screen.s_cur.row += k; 335 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
338 } 337 }
338
339#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 343#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 345 }
349 346
350 /* resize columns */ 347 /* resize columns */
… …
393 } 390 }
394 391
395 } 392 }
396 393
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 395
400 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
402 } 398 }
403 399
… …
417} 413}
418 414
419void 415void
420rxvt_term::scr_reset_realloc () 416rxvt_term::scr_reset_realloc ()
421{ 417{
422 uint16_t total_rows, nrow; 418 unsigned int total_rows, nrow;
423 419
424 nrow = TermWin.nrow; 420 nrow = TermWin.nrow;
425 total_rows = nrow + TermWin.saveLines; 421 total_rows = nrow + TermWin.saveLines;
426 /* *INDENT-OFF* */ 422 /* *INDENT-OFF* */
427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
444 * Free everything. That way malloc debugging can find leakage. 440 * Free everything. That way malloc debugging can find leakage.
445 */ 441 */
446void 442void
447rxvt_term::scr_release () 443rxvt_term::scr_release ()
448{ 444{
449 uint16_t total_rows; 445 unsigned int total_rows;
450 int i; 446 int i;
451 447
452 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
453 449
454 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
… …
511 s = &screen; 507 s = &screen;
512 508
513 switch (mode) 509 switch (mode)
514 { 510 {
515 case SAVE: 511 case SAVE:
516 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
517 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
518 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
520 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
521 break; 517 break;
522 518
523 case RESTORE: 519 case RESTORE:
524 want_refresh = 1; 520 want_refresh = 1;
525 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
526 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
527 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
528 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
529 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
530 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
531 set_font_style (); 527 set_font_style ();
532 break; 528 break;
533 } 529 }
534 530
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return scrn; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
571#if NSCREENS 575#if NSCREENS
572 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
573 { 577 {
574 num_scr = 0; 578 num_scr = 0;
575 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
576 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
577 { 582 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 586 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
597 } 592 }
598 else 593 else
599#endif 594#endif
600 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
603 return scrn; 598 return scrn;
604} 599}
605 600
606// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
607void 602void
… …
625 * Change the colour for following text 620 * Change the colour for following text
626 */ 621 */
627void 622void
628rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
629{ 624{
630 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
631 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
632 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
633 else 630 else
634 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
635} 632}
… …
673 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
674 671
675 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
676 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
677 else 674 else
678 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
679 676
680 if ((options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
681 && TermWin.view_start != 0 678 && TermWin.view_start != 0
682 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
683 scr_page (UP, count); 680 scr_page (UP, count);
… …
702 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
703 } 700 }
704 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
705 { 702 {
706 /* move selected region too */ 703 /* move selected region too */
707 selection.beg.row -= count; 704 selection.beg.row -= count;
708 selection.end.row -= count; 705 selection.end.row -= count;
709 selection.mark.row -= count; 706 selection.mark.row -= count;
710 } 707 }
711 } 708 }
712 709
713 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
721 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
722 MIN_IT (count, i); 719 MIN_IT (count, i);
723 720
724 if (j > 0) 721 if (j > 0)
725 { 722 {
726 /* A: scroll up */ 723 /* scroll up */
727 724
728 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
731 728
732 /* A2: Rotate lines */ 729 /* Rotate lines */
733 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
737 734
738 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
739 } 736 }
740 else /* if (j < 0) */ 737 else /* if (j < 0) */
741 { 738 {
742 /* B: scroll down */ 739 /* scroll down */
743 740
744 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
745 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
746 { 743 {
747 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
748 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
749 } 746 }
750 747
751 /* B2: Rotate lines */ 748 /* Rotate lines */
752 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
753 { 750 {
754 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
755 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
756 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
758 755
759 j = row1, i = count; 756 j = row1, i = count;
760 count = -count; 757 count = -count;
761 } 758 }
762 759
763 /* C: Resurrect lines */ 760 /* Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
768 for (; i--; j++) 765 for (; i--; j++)
… …
776 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
777 */ 774 */
778void 775void
779rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
780{ 777{
778 if (len <= 0) /* sanity */
779 return;
780
781 unsigned char checksel; 781 unsigned char checksel;
782 unicode_t c; 782 unicode_t c;
783 int i, row, last_col; 783 int i, row, last_col;
784 text_t *stp; 784 text_t *stp;
785 rend_t *srp; 785 rend_t *srp;
786 786 const unicode_t *strend = str + len;
787 if (len <= 0) /* sanity */
788 return;
789 787
790 want_refresh = 1; 788 want_refresh = 1;
791 ZERO_SCROLLBACK (); 789 ZERO_SCROLLBACK ();
792 last_col = TermWin.ncol; 790 last_col = TermWin.ncol;
793 791
… …
818 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
819 817
820 stp = screen.text[row]; 818 stp = screen.text[row];
821 srp = screen.rend[row]; 819 srp = screen.rend[row];
822 820
823 while (len--) 821 while (str < strend)
824 { 822 {
825 c = *str++; 823 c = *str++;
826 824
827 if (c < 0x20) 825 if (c < 0x20)
828 switch (c) 826 if (c == C0_LF)
827 {
828 if (screen.tlen[row] != -1) /* XXX: think about this */
829 MAX_IT (screen.tlen[row], screen.cur.col);
830
831 screen.flags &= ~Screen_WrapNext;
832
833 if (screen.cur.row == screen.bscroll)
834 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
835 else if (screen.cur.row < (TermWin.nrow - 1))
836 row = (++screen.cur.row) + TermWin.saveLines;
837
838 stp = screen.text[row]; /* _must_ refresh */
839 srp = screen.rend[row]; /* _must_ refresh */
840 continue;
841 }
842 else if (c == C0_CR)
829 { 843 {
830 case C0_HT:
831 scr_tab (1);
832 continue;
833
834 case C0_LF:
835 if (screen.tlen[row] != -1) /* XXX: think about this */ 844 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col); 845 MAX_IT (screen.tlen[row], screen.cur.col);
837 846
838 screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
839
840 if (screen.cur.row == screen.bscroll)
841 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
842 else if (screen.cur.row < (TermWin.nrow - 1))
843 row = (++screen.cur.row) + TermWin.saveLines;
844
845 stp = screen.text[row]; /* _must_ refresh */
846 srp = screen.rend[row]; /* _must_ refresh */
847 continue;
848
849 case C0_CR:
850 if (screen.tlen[row] != -1) /* XXX: think about this */
851 MAX_IT (screen.tlen[row], screen.cur.col);
852
853 screen.flags &= ~Screen_WrapNext;
854 screen.cur.col = 0; 848 screen.cur.col = 0;
855 continue; 849 continue;
850 }
851 else if (c == C0_HT)
852 {
853 scr_tab (1, true);
854 continue;
856 } 855 }
857 856
858 if (checksel /* see if we're writing within selection */ 857 if (checksel /* see if we're writing within selection */
859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
860 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
… …
870 869
871 if (screen.flags & Screen_WrapNext) 870 if (screen.flags & Screen_WrapNext)
872 { 871 {
873 screen.tlen[row] = -1; 872 screen.tlen[row] = -1;
874 873
874 scr_do_wrap ();
875
875 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; 876 row = screen.cur.row + TermWin.saveLines;
876
877 stp = screen.text[row]; /* _must_ refresh */ 877 stp = screen.text[row]; /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */ 878 srp = screen.rend[row]; /* _must_ refresh */
879 } 879 }
880 880
881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
882 if (IN_RANGE (c, 0xd800, 0xdfff))
883 c = 0xfffd;
884
885 // rely on wcwidth to tell us the character width, at least for non-latin1
886 // do wcwidth before further replacements, as wcwidth might return -1
887 // for the line drawing characters below as they might be invalid in the current
888 // locale.
889 int width = c < 0x100 ? 1 : wcwidth (c);
890
891 if (charsets[screen.charset] == '0') // DEC SPECIAL
892 {
893 // vt100 special graphics and line drawing
894 // 5f-7e standard vt100
895 // 40-5e rxvt extension for extra curses acs chars
896 static uint16_t vt100_0[62] = { // 41 .. 7e
897 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
898 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
899 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
900 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
901 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
902 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
903 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
904 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
905 };
906
907 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
908 {
909 c = vt100_0[c - 0x41];
910 width = 1; // vt100 line drawing characters are always single-width
911 }
912 }
913
881 if (screen.flags & Screen_Insert) 914 if (screen.flags & Screen_Insert)
882 scr_insdel_chars (1, INSERT); 915 scr_insdel_chars (width, INSERT);
883
884 // rely on wcwidth to tell us the character width, at least for non-latin1
885 // do wcwidth before further replacements, as wcwidth says that line-drawing
886 // characters have width -1 (DOH!) on GNU/Linux sometimes.
887 int width = c < 0x100 ? 1 : wcwidth (c);
888
889 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 {
891 // vt100 special graphics and line drawing
892 static uint16_t vt100_0[32] = { // 5f .. 7e
893 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
894 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
895 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
896 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
897 };
898
899 if (c >= 0x5f && c <= 0x7e)
900 {
901 c = vt100_0[c - 0x5f];
902 width = 1;
903 }
904 }
905 916
906 if (width != 0) 917 if (width != 0)
907 { 918 {
908#if !UNICODE_3 919#if !UNICODE_3
909 // trim characters we can't store directly :( 920 // trim characters we can't store directly :(
… …
912 c = rxvt_composite.compose (c); // map to lower 16 bits 923 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else 924# else
914 c = 0xfffd; 925 c = 0xfffd;
915# endif 926# endif
916#endif 927#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 928
918 rend_t rend = SET_FONT (rstyle, 929 // nuke the character at this position, if required
919 c > 0x7f || bold || c < 0x20 930 if (stp[screen.cur.col] == NOCHAR
920 ? TermWin.fontset->find_font (c, bold) 931 || (screen.cur.col < TermWin.ncol - 1
921 : TermWin.ascii_map [c - 0x20]); 932 && stp[screen.cur.col + 1] == NOCHAR))
933 {
934 int col = screen.cur.col;
935
936 // find begin
937 while (col > 0 && stp[col] == NOCHAR)
938 col--;
939
940 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
941
942 // found begin, nuke
943 do {
944 stp[col] = ' ';
945 srp[col] = rend;
946 col++;
947 } while (col < TermWin.ncol && stp[col] == NOCHAR);
948 }
949
950 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
951
952 // if the character doesn't fit into the remaining columns...
953 if (screen.cur.col > last_col - width && last_col >= width)
954 {
955 // ...output spaces
956 c = ' ';
957 // and try the same character next loop iteration
958 --str;
959 }
922 960
923 do 961 do
924 { 962 {
925 stp[screen.cur.col] = c; 963 stp[screen.cur.col] = c;
926 srp[screen.cur.col] = rend; 964 srp[screen.cur.col] = rend;
… …
938 c = NOCHAR; 976 c = NOCHAR;
939 } 977 }
940 while (--width > 0); 978 while (--width > 0);
941 979
942 // pad with spaces when overwriting wide character with smaller one 980 // pad with spaces when overwriting wide character with smaller one
981 if (!width)
943 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 982 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944 { 983 {
945 stp[c] = ' '; 984 stp[c] = ' ';
946 srp[c] = rend; 985 srp[c] = rend;
947 } 986 }
948 } 987 }
949 else if (width == 0) 988 else // width == 0
950 { 989 {
951#if ENABLE_COMBINING 990#if ENABLE_COMBINING
952 // handle combining characters 991 // handle combining characters
953 // we just tag the accent on the previous on-screen character. 992 // we just tag the accent on the previous on-screen character.
954 // this is arguably not correct, but also arguably not wrong. 993 // this is arguably not correct, but also arguably not wrong.
955 // we don't handle double-width characters nicely yet. 994 // we don't handle double-width characters nicely yet.
956
957 text_t *tp; 995 text_t *tp;
958 rend_t *rp; 996 rend_t *rp;
959 997
960 if (screen.cur.col > 0) 998 if (screen.cur.col > 0)
961 { 999 {
962 tp = stp + screen.cur.col - 1; 1000 tp = stp + screen.cur.col - 1;
963 rp = srp + screen.cur.col - 1; 1001 rp = srp + screen.cur.col - 1;
1002
1003 while (*tp == NOCHAR && tp > stp)
1004 tp--, rp--;
964 } 1005 }
965 else if (screen.cur.row > 0 1006 else if (screen.cur.row > 0
966 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 1007 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967 { 1008 {
968 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1009 int line = screen.cur.row - 1 + TermWin.saveLines;
969 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 1010
1011 tp = screen.text[line] + last_col - 1;
1012 rp = screen.rend[line] + last_col - 1;
1013
1014 while (*tp == NOCHAR && tp > screen.text[line])
1015 tp--, rp--;
970 } 1016 }
971 else 1017 else
972 continue; 1018 continue;
973
974 // handle double-width-chars by making them look extremely ugly
975 if (*tp == NOCHAR)
976 *tp = ' '; // hack //D //TODO //--tp, --rp;
977 1019
978 // first try to find a precomposed character 1020 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c); 1021 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR) 1022 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c); 1023 n = rxvt_composite.compose (*tp, c);
982 1024
983 *tp = n; 1025 *tp = n;
984 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1026 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif 1027#endif
986 } 1028 }
987 } 1029 }
988 1030
989 if (screen.tlen[row] != -1) /* XXX: think about this */ 1031 if (screen.tlen[row] != -1) /* XXX: think about this */
… …
1028 * Process Horizontal Tab 1070 * Process Horizontal Tab
1029 * count: +ve = forward; -ve = backwards 1071 * count: +ve = forward; -ve = backwards
1030 * XTERM_SEQ: CTRL-I 1072 * XTERM_SEQ: CTRL-I
1031 */ 1073 */
1032void 1074void
1033rxvt_term::scr_tab (int count) 1075rxvt_term::scr_tab (int count, bool ht)
1034{ 1076{
1035 int i, x; 1077 int i, x;
1036 1078
1037 want_refresh = 1; 1079 want_refresh = 1;
1038 i = x = screen.cur.col; 1080 i = x = screen.cur.col;
1039 1081
1040 if (count == 0) 1082 if (count == 0)
1041 return; 1083 return;
1042 else if (count > 0) 1084 else if (count > 0)
1043 { 1085 {
1086 int row = TermWin.saveLines + screen.cur.row;
1087 text_t *tp = screen.text[row];
1088 rend_t *rp = screen.rend[row];
1089 rend_t base_rend = rp[i];
1090 ht &= tp[i] == ' ';
1091
1044 for (; ++i < TermWin.ncol; ) 1092 for (; ++i < TermWin.ncol; )
1045 if (tabs[i]) 1093 if (tabs[i])
1046 { 1094 {
1047 x = i; 1095 x = i;
1048 if (!--count) 1096 if (!--count)
1049 break; 1097 break;
1050 } 1098 }
1099 else
1100 ht &= tp[i] == ' '
1101 && RS_SAME (rp[i], base_rend);
1051 1102
1052 if (count) 1103 if (count)
1053 x = TermWin.ncol - 1; 1104 x = TermWin.ncol - 1;
1105
1106 // store horizontal tab commands as characters inside the text
1107 // buffer so they can be selected and pasted.
1108 if (ht && options & Opt_pastableTabs)
1109 {
1110 base_rend = SET_FONT (base_rend, 0);
1111
1112 if (screen.tlen[row] != -1) /* XXX: think about this */
1113 MAX_IT (screen.tlen[row], x);
1114
1115 i = screen.cur.col;
1116
1117 tp[i] = '\t';
1118 rp[i] = base_rend;
1119
1120 while (++i < x)
1121 {
1122 tp[i] = NOCHAR;
1123 rp[i] = base_rend;
1124 }
1125 }
1054 } 1126 }
1055 else /* if (count < 0) */ 1127 else /* if (count < 0) */
1056 { 1128 {
1057 for (; --i >= 0; ) 1129 for (; --i >= 0; )
1058 if (tabs[i]) 1130 if (tabs[i])
… …
1101 */ 1173 */
1102#if ENABLE_FRILLS 1174#if ENABLE_FRILLS
1103void 1175void
1104rxvt_term::scr_forwardindex () 1176rxvt_term::scr_forwardindex ()
1105{ 1177{
1106 int row; 1178 int row;
1107 1179
1108 if (screen.cur.col < TermWin.ncol - 1) 1180 if (screen.cur.col < TermWin.ncol - 1)
1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1181 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1110 else 1182 else
1111 { 1183 {
… …
1314 ren = DEFAULT_RSTYLE; 1386 ren = DEFAULT_RSTYLE;
1315 CLEAR_ROWS (row, num); 1387 CLEAR_ROWS (row, num);
1316 } 1388 }
1317 else 1389 else
1318 { 1390 {
1319 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1392 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1393 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1394 ERASE_ROWS (row, num);
1323 gcvalue.foreground = pix_colors[Color_fg]; 1395 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1396 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1325 } 1397 }
1326 1398
1327 for (; num--; row++) 1399 for (; num--; row++)
1328 { 1400 {
1329 scr_blank_screen_mem (screen.text, screen.rend, 1401 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1330 (unsigned int) (row + row_offset), rstyle);
1331 screen.tlen[row + row_offset] = 0; 1402 screen.tlen[row + row_offset] = 0;
1332 scr_blank_line (drawn_text[row], drawn_rend[row], 1403 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1333 (unsigned int)TermWin.ncol, ren);
1334 } 1404 }
1335} 1405}
1406
1407#if ENABLE_FRILLS
1408void
1409rxvt_term::scr_erase_savelines ()
1410{
1411 want_refresh = 1;
1412 ZERO_SCROLLBACK ();
1413
1414 TermWin.nscrolled = 0;
1415}
1416#endif
1336 1417
1337/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1338/* 1419/*
1339 * Fill the screen with `E's 1420 * Fill the screen with `E's
1340 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1341 */ 1422 */
1342void 1423void
1343rxvt_term::scr_E () 1424rxvt_term::scr_E ()
1344{ 1425{
1345 int i, j, k; 1426 int i, j, k;
1346 rend_t *r1, fs; 1427 rend_t *r1, fs;
1347 1428
1348 want_refresh = 1; 1429 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1350 1431
1351 num_scr_allow = 0; 1432 num_scr_allow = 0;
1352 selection_check (3); 1433 selection_check (3);
1353 1434
1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1436 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1356 { 1437 {
1357 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1438 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1358 fill_text (screen.text[k], 'E', TermWin.ncol); 1439 fill_text (screen.text[k], 'E', TermWin.ncol);
1359 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1440 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1422 slp = &screen.tlen[row]; 1503 slp = &screen.tlen[row];
1423 1504
1424 switch (insdel) 1505 switch (insdel)
1425 { 1506 {
1426 case INSERT: 1507 case INSERT:
1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1508 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1428 col--)
1429 { 1509 {
1430 stp[col] = stp[col - count]; 1510 stp[col] = stp[col - count];
1431 srp[col] = srp[col - count]; 1511 srp[col] = srp[col - count];
1432 } 1512 }
1433 1513
… …
1443 if (selection.end.row != screen.cur.row 1523 if (selection.end.row != screen.cur.row
1444 || (selection.end.col + count >= TermWin.ncol)) 1524 || (selection.end.col + count >= TermWin.ncol))
1445 CLEAR_SELECTION (); 1525 CLEAR_SELECTION ();
1446 else 1526 else
1447 { /* shift selection */ 1527 { /* shift selection */
1448 selection.beg.col += count; 1528 selection.beg.col += count;
1449 selection.mark.col += count; /* XXX: yes? */ 1529 selection.mark.col += count; /* XXX: yes? */
1450 selection.end.col += count; 1530 selection.end.col += count;
1451 } 1531 }
1452 } 1532 }
1453 1533
1454 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1534 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1455 (unsigned int)count, rstyle); 1535 (unsigned int)count, rstyle);
1456 break; 1536 break;
1457 1537
1458 case ERASE: 1538 case ERASE:
1459 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1539 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1460 selection_check (1); 1540 selection_check (1);
1461 screen.cur.col -= count; 1541 screen.cur.col -= count;
1462 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1542 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1463 (unsigned int)count, rstyle); 1543 (unsigned int)count, rstyle);
1464 break; 1544 break;
1465 1545
1466 case DELETE: 1546 case DELETE:
1467 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1547 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1470 { 1550 {
1471 stp[col] = stp[col + count]; 1551 stp[col] = stp[col + count];
1472 srp[col] = srp[col + count]; 1552 srp[col] = srp[col + count];
1473 } 1553 }
1474 1554
1475 scr_blank_line (& (stp[TermWin.ncol - count]), 1555 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1476 & (srp[TermWin.ncol - count]),
1477 (unsigned int)count, tr); 1556 (unsigned int)count, tr);
1478 1557
1479 if (*slp == -1) /* break line continuation */ 1558 if (*slp == -1) /* break line continuation */
1480 *slp = TermWin.ncol; 1559 *slp = TermWin.ncol;
1481 1560
… …
1490 || selection.end.col >= TermWin.ncol) 1569 || selection.end.col >= TermWin.ncol)
1491 CLEAR_SELECTION (); 1570 CLEAR_SELECTION ();
1492 else 1571 else
1493 { 1572 {
1494 /* shift selection */ 1573 /* shift selection */
1495 selection.beg.col -= count; 1574 selection.beg.col -= count;
1496 selection.mark.col -= count; /* XXX: yes? */ 1575 selection.mark.col -= count; /* XXX: yes? */
1497 selection.end.col -= count; 1576 selection.end.col -= count;
1498 } 1577 }
1499 } 1578 }
1500 1579
1501 break; 1580 break;
1502 } 1581 }
… …
1568{ 1647{
1569 if (mode) 1648 if (mode)
1570 screen.flags |= Screen_Relative; 1649 screen.flags |= Screen_Relative;
1571 else 1650 else
1572 screen.flags &= ~Screen_Relative; 1651 screen.flags &= ~Screen_Relative;
1652
1573 scr_gotorc (0, 0, 0); 1653 scr_gotorc (0, 0, 0);
1574} 1654}
1575 1655
1576/* ------------------------------------------------------------------------- */ 1656/* ------------------------------------------------------------------------- */
1577/* 1657/*
… …
1617 1697
1618 if (rvideo != mode) 1698 if (rvideo != mode)
1619 { 1699 {
1620 rvideo = mode; 1700 rvideo = mode;
1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1701 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1622#if defined(XPM_BACKGROUND) 1702#if XPM_BACKGROUND
1623 if (bgPixmap.pixmap == None) 1703 if (bgPixmap.pixmap == None)
1624#endif 1704#endif
1625#if defined(TRANSPARENT) 1705#if TRANSPARENT
1626 if (! (options & Opt_transparent) || am_transparent == 0) 1706 if (! (options & Opt_transparent) || am_transparent == 0)
1627#endif 1707#endif
1628 XSetWindowBackground (display->display, TermWin.vt, 1708 XSetWindowBackground (display->display, TermWin.vt,
1629 pix_colors[Color_bg]); 1709 pix_colors[Color_bg]);
1630 1710
… …
1685 * XTERM_SEQ: Invoke G2 character set: ESC N 1765 * XTERM_SEQ: Invoke G2 character set: ESC N
1686 * XTERM_SEQ: Invoke G3 character set: ESC O 1766 * XTERM_SEQ: Invoke G3 character set: ESC O
1687 */ 1767 */
1688void 1768void
1689rxvt_term::scr_charset_choose (int set) 1769rxvt_term::scr_charset_choose (int set)
1690 { 1770{
1691 screen.charset = set; 1771 screen.charset = set;
1692 set_font_style (); 1772 set_font_style ();
1693 } 1773}
1694 1774
1695/* ------------------------------------------------------------------------- */ 1775/* ------------------------------------------------------------------------- */
1696/* 1776/*
1697 * Set a font 1777 * Set a font
1698 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1778 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1701 * XTERM_SEQ: Set G3 character set: ESC + <C> 1781 * XTERM_SEQ: Set G3 character set: ESC + <C>
1702 * See set_font_style for possible values for <C> 1782 * See set_font_style for possible values for <C>
1703 */ 1783 */
1704void 1784void
1705rxvt_term::scr_charset_set (int set, unsigned int ch) 1785rxvt_term::scr_charset_set (int set, unsigned int ch)
1706 { 1786{
1707 charsets[set] = (unsigned char)ch; 1787 charsets[set] = (unsigned char)ch;
1708 set_font_style (); 1788 set_font_style ();
1709 } 1789}
1710 1790
1711 1791
1712/* ------------------------------------------------------------------------- * 1792/* ------------------------------------------------------------------------- *
1713 * MAJOR SCREEN MANIPULATION * 1793 * MAJOR SCREEN MANIPULATION *
1714 * ------------------------------------------------------------------------- */ 1794 * ------------------------------------------------------------------------- */
… …
1808 */ 1888 */
1809int 1889int
1810rxvt_term::scr_move_to (int y, int len) 1890rxvt_term::scr_move_to (int y, int len)
1811{ 1891{
1812 long p = 0; 1892 long p = 0;
1813 uint16_t oldviewstart; 1893 unsigned int oldviewstart;
1814 1894
1815 oldviewstart = TermWin.view_start; 1895 oldviewstart = TermWin.view_start;
1816 1896
1817 if (y < len) 1897 if (y < len)
1818 { 1898 {
1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1899 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1820 p -= (long) (TermWin.nrow - 1); 1900 p -= (long) (TermWin.nrow - 1);
1821 p = max (p, 0); 1901 p = max (p, 0);
1822 } 1902 }
1823 1903
1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1904 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1825 1905
1826 return scr_changeview (oldviewstart); 1906 return scr_changeview (oldviewstart);
1827} 1907}
1828 1908
1829/* ------------------------------------------------------------------------- */ 1909/* ------------------------------------------------------------------------- */
… …
1833 */ 1913 */
1834int 1914int
1835rxvt_term::scr_page (enum page_dirn direction, int nlines) 1915rxvt_term::scr_page (enum page_dirn direction, int nlines)
1836{ 1916{
1837 int n; 1917 int n;
1838 uint16_t oldviewstart; 1918 unsigned int oldviewstart;
1839 1919
1840#ifdef DEBUG_STRICT
1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1842#endif
1843 oldviewstart = TermWin.view_start; 1920 oldviewstart = TermWin.view_start;
1921
1844 if (direction == UP) 1922 if (direction == UP)
1845 { 1923 {
1846 n = TermWin.view_start + nlines; 1924 n = TermWin.view_start + nlines;
1847 TermWin.view_start = min (n, TermWin.nscrolled); 1925 TermWin.view_start = min (n, TermWin.nscrolled);
1848 } 1926 }
1849 else 1927 else
1850 { 1928 {
1851 n = TermWin.view_start - nlines; 1929 n = TermWin.view_start - nlines;
1852 TermWin.view_start = max (n, 0); 1930 TermWin.view_start = max (n, 0);
1853 } 1931 }
1932
1854 return scr_changeview (oldviewstart); 1933 return scr_changeview (oldviewstart);
1855} 1934}
1856 1935
1857int 1936int
1858rxvt_term::scr_changeview (uint16_t oldviewstart) 1937rxvt_term::scr_changeview (unsigned int oldviewstart)
1859{ 1938{
1860 if (TermWin.view_start != oldviewstart) 1939 if (TermWin.view_start != oldviewstart)
1861 { 1940 {
1862 want_refresh = 1; 1941 want_refresh = 1;
1863 num_scr -= (TermWin.view_start - oldviewstart); 1942 num_scr -= (TermWin.view_start - oldviewstart);
… …
1869/* ------------------------------------------------------------------------- */ 1948/* ------------------------------------------------------------------------- */
1870void 1949void
1871rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1872{ 1951{
1873#ifndef NO_BELL 1952#ifndef NO_BELL
1953
1874# ifndef NO_MAPALERT 1954# ifndef NO_MAPALERT
1875# ifdef MAPALERT_OPTION 1955# ifdef MAPALERT_OPTION
1876 if (options & Opt_mapAlert) 1956 if (options & Opt_mapAlert)
1877# endif 1957# endif
1878 XMapWindow (display->display, TermWin.parent[0]); 1958 XMapWindow (display->display, TermWin.parent[0]);
1879# endif 1959# endif
1960
1880 if (options & Opt_visualBell) 1961 if (options & Opt_visualBell)
1881 { 1962 {
1882 scr_rvideo_mode (!rvideo); /* refresh also done */ 1963 scr_rvideo_mode (!rvideo); /* refresh also done */
1964 rxvt_usleep (VISUAL_BELL_DURATION);
1883 scr_rvideo_mode (!rvideo); /* refresh also done */ 1965 scr_rvideo_mode (!rvideo); /* refresh also done */
1884 } 1966 }
1885 else 1967 else
1886 XBell (display->display, 0); 1968 XBell (display->display, 0);
1969
1887#endif 1970#endif
1888} 1971}
1889 1972
1890/* ------------------------------------------------------------------------- */ 1973/* ------------------------------------------------------------------------- */
1891/* ARGSUSED */ 1974/* ARGSUSED */
… …
1946/* 2029/*
1947 * Refresh the screen 2030 * Refresh the screen
1948 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
1949 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
1950 */ 2033 */
1951
1952#define FONT_WIDTH(X, Y) \
1953 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1954#define FONT_RBEAR(X, Y) \
1955 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1956#define FONT_LBEAR(X, Y) \
1957 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1958#define IS_FONT_CHAR(X, Y) \
1959 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1960
1961void 2034void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 2035rxvt_term::scr_refresh (unsigned char refresh_type)
1963{ 2036{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */ 2037 unsigned char must_clear, /* use draw_string not draw_image_string */
1965 rvid, /* reverse video this position */
1966 showcursor; /* show the cursor */ 2038 showcursor; /* show the cursor */
1967 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
1968 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
1969 int i, /* tmp */ 2041 int i, /* tmp */
1970 row_offset; /* basic offset in screen structure */ 2042 row_offset; /* basic offset in screen structure */
1971#ifndef NO_CURSORCOLOR 2043#ifndef NO_CURSORCOLOR
1972 rend_t cc1; /* store colours at cursor position (s) */ 2044 rend_t cc1; /* store colours at cursor position (s) */
1973#endif 2045#endif
1974 rend_t *crp; // cursor rendition pointer 2046 rend_t *crp; // cursor rendition pointer
1975 2047
2048 want_refresh = 0; /* screen is current */
2049
1976 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2050 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1977 return; 2051 return;
1978 2052
1979 /* 2053 /*
1980 * A: set up vars 2054 * A: set up vars
… …
1982 must_clear = 0; 2056 must_clear = 0;
1983 refresh_count = 0; 2057 refresh_count = 0;
1984 2058
1985 row_offset = TermWin.saveLines - TermWin.view_start; 2059 row_offset = TermWin.saveLines - TermWin.view_start;
1986 2060
1987#ifdef XPM_BACKGROUND 2061#if XPM_BACKGROUND
1988 must_clear |= (bgPixmap.pixmap != None); 2062 must_clear |= bgPixmap.pixmap != None;
1989#endif 2063#endif
1990#ifdef TRANSPARENT 2064#if TRANSPARENT
1991 must_clear |= ((options & Opt_transparent) && am_transparent); 2065 must_clear |= (options & Opt_transparent) && am_transparent;
1992#endif 2066#endif
1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1994 2068
1995 /* 2069 /*
1996 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
1997 */ 2071 */
1998 scr_reverse_selection (); 2072 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
2002 2073
2003 /* 2074 /*
2004 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2005 */ 2076 */
2006 { 2077 {
… …
2023 2094
2024 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; 2095 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
2025 2096
2026 if (showcursor && TermWin.focus) 2097 if (showcursor && TermWin.focus)
2027 { 2098 {
2099 if (options & Opt_cursorUnderline)
2100 *crp ^= RS_Uline;
2101 else
2102 {
2028 *crp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2104
2029#ifndef NO_CURSORCOLOR 2105#ifndef NO_CURSORCOLOR
2030 cc1 = *crp & (RS_fgMask | RS_bgMask); 2106 cc1 = *crp & (RS_fgMask | RS_bgMask);
2031 if (ISSET_PIXCOLOR (Color_cursor)) 2107 if (ISSET_PIXCOLOR (Color_cursor))
2032 ccol1 = Color_cursor; 2108 ccol1 = Color_cursor;
2033 else 2109 else
2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2110#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2035 ccol1 = GET_FGCOLOR (rstyle); 2111 ccol1 = GET_FGCOLOR (rstyle);
2036#else 2112#else
2037 ccol1 = Color_fg; 2113 ccol1 = Color_fg;
2038#endif 2114#endif
2039 if (ISSET_PIXCOLOR (Color_cursor2)) 2115 if (ISSET_PIXCOLOR (Color_cursor2))
2040 ccol2 = Color_cursor2; 2116 ccol2 = Color_cursor2;
2041 else 2117 else
2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2118#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2043 ccol2 = GET_BGCOLOR (rstyle); 2119 ccol2 = GET_BGCOLOR (rstyle);
2044#else 2120#else
2045 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2046#endif 2122#endif
2047 *crp = SET_FGCOLOR (*crp, ccol1); 2123 *crp = SET_FGCOLOR (*crp, ccol1);
2048 *crp = SET_BGCOLOR (*crp, ccol2); 2124 *crp = SET_BGCOLOR (*crp, ccol2);
2049#endif 2125#endif
2126 }
2050 } 2127 }
2051 } 2128 }
2052 2129
2053 /* make sure no outline cursor is left around */ 2130 /* make sure no outline cursor is left around */
2054 setoldcursor = 0; 2131 setoldcursor = 0;
… …
2080 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2081 } 2158 }
2082 } 2159 }
2083 } 2160 }
2084 2161
2162#if ENABLE_OVERLAY
2163 scr_swap_overlay ();
2164#endif
2165
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2166 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2167 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2168
2087#ifndef NO_SLOW_LINK_SUPPORT 2169#ifndef NO_SLOW_LINK_SUPPORT
2088 /* 2170 /*
2089 * D: CopyArea pass - very useful for slower links 2171 * D: CopyArea pass - very useful for slower links
2090 * This has been deliberately kept simple. 2172 * This has been deliberately kept simple.
2091 */ 2173 */
… …
2168 2250
2169 for (col = 0; col < TermWin.ncol; col++) 2251 for (col = 0; col < TermWin.ncol; col++)
2170 { 2252 {
2171 /* compare new text with old - if exactly the same then continue */ 2253 /* compare new text with old - if exactly the same then continue */
2172 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2254 if (stp[col] == dtp[col] /* Must match characters to skip. */
2173 && (srp[col] == drp[col] /* Either rendition the same or */ 2255 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2174 || (stp[col] == ' ' /* space w/ no background change */ 2256 || (stp[col] == ' ' /* space w/ no background change */
2175 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2257 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176 continue; 2258 continue;
2177 2259
2178 // redraw one or more characters 2260 // redraw one or more characters
2179 2261
2180 // seek to the beginning if wide characters 2262 // seek to the beginning of wide characters
2181 while (stp[col] == NOCHAR && col > 0) 2263 while (stp[col] == NOCHAR && col > 0)
2182 --col; 2264 --col;
2183 2265
2184 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2185 text_t *text = stp + col; 2267 text_t *text = stp + col;
… …
2188 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2189 drp[col] = rend; 2271 drp[col] = rend;
2190 2272
2191 int xpixel = Col2Pixel (col); 2273 int xpixel = Col2Pixel (col);
2192 2274
2193 // this loop looks very messy, it can probably be optimized
2194 // and cleaned a bit by you?
2195 for (i = 0; ++col < TermWin.ncol; ) 2275 for (i = 0; ++col < TermWin.ncol; )
2196 { 2276 {
2197 if (stp[col] == NOCHAR) 2277 if (stp[col] == NOCHAR)
2198 { 2278 {
2199 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
… …
2202 i++; 2282 i++;
2203 2283
2204 continue; 2284 continue;
2205 } 2285 }
2206 2286
2207 if (rend != srp[col]) 2287 if (!RS_SAME (rend, srp[col]))
2208 break; 2288 break;
2209 2289
2210 count++; 2290 count++;
2211 2291
2212 if (stp[col] != dtp[col] 2292 if (stp[col] != dtp[col]
2213 || srp[col] != drp[col]) 2293 || !RS_SAME (srp[col], drp[col]))
2214 { 2294 {
2215 if (must_clear && (i++ > count / 2)) 2295 if (must_clear && (i++ > count / 2))
2216 break; 2296 break;
2217 2297
2218 dtp[col] = stp[col]; 2298 dtp[col] = stp[col];
… …
2228 2308
2229 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR) 2310 while (i && text[count] == NOCHAR)
2231 count++, i--; 2311 count++, i--;
2232 2312
2313#if ENABLE_STYLES
2314 // force redraw after "careful" characters to avoid pixel droppings
2315 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2316 drp[col + 1] = ~srp[col + 1];
2317
2318 // include previous careful character(s) if possible, looks nicer (best effort...)
2319 while (text > stp
2320 && srp[text - stp - 1] & RS_Careful
2321 && RS_SAME (rend, srp[text - stp - 1]))
2322 text--, count++, xpixel -= TermWin.fwidth;
2323#endif
2324
2233 /* 2325 /*
2234 * Determine the attributes for the string 2326 * Determine the attributes for the string
2235 */ 2327 */
2236 int fid = GET_FONT (rend);
2237 int fore = GET_FGCOLOR (rend); // desired foreground 2328 int fore = GET_FGCOLOR (rend); // desired foreground
2238 int back = GET_BGCOLOR (rend); // desired background 2329 int back = GET_BGCOLOR (rend); // desired background
2239 2330
2240 rend = GET_ATTR (rend); 2331 // only do special processing if ana attributes are set, which is rare
2241 2332 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2242 rvid = !!(rend & RS_RVid); 2333 {
2334 bool invert = rend & RS_RVid;
2243 2335
2244#ifndef NO_BOLD_UNDERLINE_REVERSE 2336#ifndef NO_BOLD_UNDERLINE_REVERSE
2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) 2337 if (rend & RS_Bold
2338 && fore == Color_fg)
2246 { 2339 {
2247 if (ISSET_PIXCOLOR (Color_BD)) 2340 if (ISSET_PIXCOLOR (Color_BD))
2248 fore = Color_BD; 2341 fore = Color_BD;
2342# if !ENABLE_STYLES
2249 else 2343 else
2250 rvid = !rvid; 2344 invert = !invert;
2345# endif
2346 }
2347
2348 if (rend & RS_Italic
2349 && fore == Color_fg)
2350 {
2351 if (ISSET_PIXCOLOR (Color_IT))
2352 fore = Color_IT;
2353# if !ENABLE_STYLES
2354 else
2355 invert = !invert;
2356# endif
2357 }
2358
2359 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2360 fore = Color_UL;
2361#endif
2362
2363 if (invert)
2364 {
2365 SWAP_IT (fore, back, int);
2366
2367#ifndef NO_BOLD_UNDERLINE_REVERSE
2368 if (ISSET_PIXCOLOR (Color_RV))
2369 back = Color_RV;
2370#endif
2371 }
2372
2373#ifdef TEXT_BLINK
2374 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2375 {
2376 if (!text_blink_ev.active)
2377 {
2378 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2379 hidden_text = 0;
2380 }
2381 else if (hidden_text)
2382 fore = back;
2383 }
2384#endif
2251 } 2385 }
2252
2253 if (rend & RS_Uline)
2254 if (ISSET_PIXCOLOR (Color_UL))
2255 fore = Color_UL;
2256#endif
2257
2258 if (rvid)
2259 {
2260 SWAP_IT (fore, back, int);
2261
2262#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (ISSET_PIXCOLOR (Color_RV)
2264# ifndef NO_CURSORCOLOR
2265 && !ISSET_PIXCOLOR (Color_cursor)
2266# endif
2267 )
2268 back = Color_RV;
2269#endif
2270 }
2271
2272#ifdef TEXT_BLINK
2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2274 {
2275 if (!text_blink_ev.active)
2276 {
2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2278 hidden_text = 0;
2279 }
2280 else if (hidden_text)
2281 fore = back;
2282 }
2283#endif
2284 2386
2285 /* 2387 /*
2286 * Actually do the drawing of the string here 2388 * Actually do the drawing of the string here
2287 */ 2389 */
2288 rxvt_font *font = (*TermWin.fontset)[fid]; 2390 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2289 2391
2290 if (back == fore) 2392 if (back == fore)
2291 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2393 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2292 TermWin.fwidth * count, TermWin.fheight, 2394 TermWin.fwidth * count, TermWin.fheight,
2293 back); 2395 back);
… …
2309 } 2411 }
2310 else 2412 else
2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2413 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2312 2414
2313 if (rend & RS_Uline && font->descent > 1 && fore != back) 2415 if (rend & RS_Uline && font->descent > 1 && fore != back)
2416 {
2417#if ENABLE_FRILLS
2418 if (ISSET_PIXCOLOR (Color_underline))
2419 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2420 else
2421#endif
2422 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2423
2314 XDrawLine (display->display, drawBuffer, TermWin.gc, 2424 XDrawLine (display->display, drawBuffer, TermWin.gc,
2315 xpixel, ypixel + font->ascent + 1, 2425 xpixel, ypixel + font->ascent + 1,
2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2426 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2427 }
2317 } /* for (col....) */ 2428 } /* for (col....) */
2318 } /* for (row....) */ 2429 } /* for (row....) */
2430
2431#if ENABLE_OVERLAY
2432 scr_swap_overlay ();
2433#endif
2319 2434
2320 /* 2435 /*
2321 * G: cleanup cursor and display outline cursor if necessary 2436 * G: cleanup cursor and display outline cursor if necessary
2322 */ 2437 */
2323 if (showcursor) 2438 if (showcursor)
2324 { 2439 {
2325 if (TermWin.focus) 2440 if (TermWin.focus)
2326 { 2441 {
2442 if (options & Opt_cursorUnderline)
2443 *crp ^= RS_Uline;
2444 else
2445 {
2327 *crp ^= RS_RVid; 2446 *crp ^= RS_RVid;
2328#ifndef NO_CURSORCOLOR 2447#ifndef NO_CURSORCOLOR
2329 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2448 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2330#endif 2449#endif
2450 }
2331 } 2451 }
2332 else if (oldcursor.row >= 0) 2452 else if (oldcursor.row >= 0)
2333 { 2453 {
2454 int cursorwidth = 1;
2455 int col = oldcursor.col;
2456
2457 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2458 col--;
2459
2460 while (col + cursorwidth < TermWin.ncol
2461 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2462 cursorwidth++;
2463
2334#ifndef NO_CURSORCOLOR 2464#ifndef NO_CURSORCOLOR
2335 if (ISSET_PIXCOLOR (Color_cursor)) 2465 if (ISSET_PIXCOLOR (Color_cursor))
2336 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); 2466 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2337#endif 2467#endif
2338 int cursorwidth = 1;
2339 while (oldcursor.col + cursorwidth < TermWin.ncol
2340 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2341 cursorwidth++;
2342 2468
2343 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2469 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2344 Col2Pixel (oldcursor.col), 2470 Col2Pixel (col),
2345 Row2Pixel (oldcursor.row), 2471 Row2Pixel (oldcursor.row),
2346 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2472 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2347 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2473 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2348 } 2474 }
2349 } 2475 }
2350 2476
2351 /* 2477 /*
2352 * H: cleanup selection 2478 * H: cleanup selection
2353 */ 2479 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2357 scr_reverse_selection (); 2480 scr_reverse_selection ();
2358 2481
2359 if (refresh_type & SMOOTH_REFRESH) 2482 if (refresh_type & SMOOTH_REFRESH)
2360 XFlush (display->display); 2483 XFlush (display->display);
2361 2484
2362 num_scr = 0; 2485 num_scr = 0;
2363 num_scr_allow = 1; 2486 num_scr_allow = 1;
2364 want_refresh = 0; /* screen is current */
2365} 2487}
2366 2488
2367void 2489void
2368rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2490rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2369{ 2491{
2370 if (!rp || !tp) 2492 if (!rp || !tp)
2371 return; 2493 return;
2372 2494
2373 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2495 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2374 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2496 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2375} 2497}
2376 2498
2377void 2499void
2378rxvt_term::scr_remap_chars () 2500rxvt_term::scr_remap_chars ()
2379{ 2501{
… …
2385 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2507 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2386 scr_remap_chars (swap.text[i], swap.rend[i]); 2508 scr_remap_chars (swap.text[i], swap.rend[i]);
2387 } 2509 }
2388} 2510}
2389 2511
2512void
2513rxvt_term::scr_recolour ()
2514{
2515 if (1
2516#if TRANSPARENT
2517 && !am_transparent
2518#endif
2519#if XPM_BACKGROUND
2520 && !bgPixmap.pixmap
2521#endif
2522 )
2523 {
2524 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2525 XClearWindow (display->display, TermWin.parent[0]);
2526 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2527#if HAVE_SCROLLBARS
2528 if (scrollBar.win)
2529 {
2530 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2531 scrollBar.setIdle ();
2532 scrollbar_show (0);
2533 }
2534#endif
2535 }
2536
2537 scr_clear ();
2538 scr_touch (true);
2539 want_refresh = 1;
2540}
2541
2390/* ------------------------------------------------------------------------- */ 2542/* ------------------------------------------------------------------------- */
2391void 2543void
2392rxvt_term::scr_clear (bool really) 2544rxvt_term::scr_clear (bool really)
2393{ 2545{
2394 if (!TermWin.mapped) 2546 if (!TermWin.mapped)
2395 return; 2547 return;
2396 2548
2397 num_scr_allow = 0; 2549 num_scr_allow = 0;
2398 want_refresh = 1; 2550 want_refresh = 1;
2399 2551
2400#ifdef TRANSPARENT 2552#if TRANSPARENT
2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2553 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2402 { 2554 {
2403 int i; 2555 int i;
2404 2556
2405 if (! (options & Opt_transparent_all)) 2557 if (!(options & Opt_transparent_all))
2406 i = 0; 2558 i = 0;
2407 else 2559 else
2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2560 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2409 2561
2410 while (i--) 2562 while (i--)
… …
2426 int end_row = TermWin.saveLines - TermWin.view_start; 2578 int end_row = TermWin.saveLines - TermWin.view_start;
2427 int i = selection.beg.row + TermWin.saveLines; 2579 int i = selection.beg.row + TermWin.saveLines;
2428 int col, row = selection.end.row + TermWin.saveLines; 2580 int col, row = selection.end.row + TermWin.saveLines;
2429 rend_t *srp; 2581 rend_t *srp;
2430 2582
2431 if (i >= end_row) 2583#if ENABLE_FRILLS
2432 col = selection.beg.col; 2584 if (selection.rect)
2585 {
2586 end_row += TermWin.nrow;
2587
2588 for (; i <= row && i <= end_row; i++)
2589 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2590 srp[col] ^= RS_RVid;
2591 }
2433 else 2592 else
2593#endif
2594 {
2595 if (i >= end_row)
2596 col = selection.beg.col;
2597 else
2434 { 2598 {
2435 col = 0; 2599 col = 0;
2436 i = end_row; 2600 i = end_row;
2437 } 2601 }
2438 2602
2439 end_row += TermWin.nrow; 2603 end_row += TermWin.nrow;
2604
2440 for (; i < row && i < end_row; i++, col = 0) 2605 for (; i < row && i < end_row; i++, col = 0)
2441 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2606 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2442 srp[col] ^= RS_RVid; 2607 srp[col] ^= RS_RVid;
2443 2608
2444 if (i == row && i < end_row) 2609 if (i == row && i < end_row)
2445 for (srp = screen.rend[i]; col < selection.end.col; col++) 2610 for (srp = screen.rend[i]; col < selection.end.col; col++)
2446 srp[col] ^= RS_RVid; 2611 srp[col] ^= RS_RVid;
2612 }
2447 } 2613 }
2448} 2614}
2449 2615
2450/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2451/* 2617/*
… …
2519/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2520/* 2686/*
2521 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2522 */ 2688 */
2523void 2689void
2524rxvt_term::paste (const unsigned char *data, unsigned int len) 2690rxvt_term::paste (unsigned char *data, unsigned int len)
2525{ 2691{
2526 unsigned int i, j, n;
2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2528
2529 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2530 for (i = 0; i < len; i += PROP_SIZE) 2693 for (unsigned int i = 0; i < len; i++)
2531 {
2532 n = min (len - i, PROP_SIZE);
2533 memcpy (ds, data + i, n);
2534
2535 for (j = 0; j < n; j++)
2536 if (ds[j] == C0_LF) 2694 if (data[i] == C0_LF)
2537 ds[j] = C0_CR; 2695 data[i] = C0_CR;
2538 2696
2539 tt_write (ds, (int)n); 2697 tt_write (data, len);
2540 }
2541
2542 free (ds);
2543} 2698}
2544 2699
2545/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2546/* 2701/*
2547 * Respond to a notification that a primary selection has been sent 2702 * Respond to a notification that a primary selection has been sent
2548 * EXT: SelectionNotify 2703 * EXT: SelectionNotify
2549 */ 2704 */
2550int 2705void
2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2552{ 2707{
2553 long nread = 0;
2554 unsigned long bytes_after;
2555 XTextProperty ct;
2556
2557 if (prop == None) /* check for failed XConvertSelection */ 2708 if (prop == None) /* check for failed XConvertSelection */
2558 { 2709 {
2559 if ((selection_type & Sel_CompoundText)) 2710 if ((selection_type & Sel_CompoundText))
2560 { 2711 {
2561 int selnum = selection_type & Sel_whereMask; 2712 int selnum = selection_type & Sel_whereMask;
… …
2574 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2575 else 2726 else
2576 selection_type = 0; 2727 selection_type = 0;
2577 } 2728 }
2578 2729
2579 return 0; 2730 return;
2580 }
2581
2582 for (;;)
2583 { 2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (display->display, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2584 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2755 if (XGetWindowProperty (display->display, win, prop,
2585 (long) (PROP_SIZE / 4), delete_prop, 2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2586 AnyPropertyType, &ct.encoding, &ct.format, 2758 &ct2.encoding, &ct2.format,
2587 &ct.nitems, &bytes_after, 2759 &ct2.nitems, &bytes_after,
2588 &ct.value) != Success) 2760 &ct2.value) != Success)
2589 break; 2761 goto bailout;
2590 2762
2591 if (ct.encoding == 0) 2763 // realloc should be compatible to XFree, here, and elsewhere, too
2592 break; 2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2593 2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2594 if (ct.encoding == xa[XA_INCR]) 2774 if (ct.encoding == xa[XA_INCR])
2595 { 2775 {
2596 // INCR selection, start handshake 2776 // INCR selection, start handshake
2777 if (!delete_prop)
2597 XDeleteProperty (display->display, win, prop); 2778 XDeleteProperty (display->display, win, prop);
2779
2598 selection_wait = Sel_incr; 2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2599 incr_ev.start (NOW + 10); 2782 incr_ev.start (NOW + 10);
2600 break;
2601 }
2602 2783
2603 if (ct.value == NULL) 2784 goto bailout;
2604 continue; 2785 }
2605 2786
2606 if (ct.nitems == 0) 2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2607 { 2800 }
2801 else
2802 {
2608 if (selection_wait == Sel_normal && nread == 0 2803 if (selection_wait == Sel_normal
2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2610 { 2805 {
2611 /* 2806 /*
2612 * pass through again trying CUT_BUFFER0 if we've come from 2807 * pass through again trying CUT_BUFFER0 if we've come from
2613 * XConvertSelection () but nothing was presented 2808 * XConvertSelection () but nothing was presented
2614 */ 2809 */
2615 selection_paste (display->root, XA_CUT_BUFFER0, False); 2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2616 } 2811 }
2617 2812
2618 nread = -1; /* discount any previous stuff */ 2813 goto bailout;
2619 break; 2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (NOW + 10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2620 } 2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2621 2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2622 nread += ct.nitems; 2827 incr_buf_fill += ct.nitems;
2623 2828
2829 goto bailout;
2830 }
2831
2624 char **cl; 2832 char **cl;
2625 int cr; 2833 int cr;
2834
2835#if ENABLE_FRILLS
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste ((unsigned char *)s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2849 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2627 { 2850 && cl)
2851 {
2628 for (int i = 0; i < cr; i++) 2852 for (int i = 0; i < cr; i++)
2629 paste ((unsigned char *)cl[i], strlen (cl[i])); 2853 paste ((unsigned char *)cl[i], strlen (cl[i]));
2630 2854
2631 XFreeStringList (cl); 2855 XFreeStringList (cl);
2632 } 2856 }
2633 else 2857 else
2634 paste (ct.value, ct.nitems); 2858 paste (ct.value, ct.nitems); // paste raw
2635 2859
2636 if (bytes_after == 0) 2860bailout:
2637 break;
2638
2639 XFree (ct.value);
2640 }
2641
2642 if (ct.value)
2643 XFree (ct.value); 2861 XFree (ct.value);
2644 2862
2645 if (selection_wait == Sel_normal) 2863 if (selection_wait == Sel_normal)
2646 selection_wait = Sel_none; 2864 selection_wait = Sel_none;
2647
2648 return (int)nread;
2649} 2865}
2650 2866
2651void 2867void
2652rxvt_term::incr_cb (time_watcher &w) 2868rxvt_term::incr_cb (time_watcher &w)
2653{ 2869{
2654 selection_wait = Sel_none; 2870 selection_wait = Sel_none;
2655 2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2656 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2657} 2876}
2658 2877
2659/*
2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2661 */
2662void 2878void
2663rxvt_term::selection_property (Window win, Atom prop) 2879rxvt_term::selection_property (Window win, Atom prop)
2664{ 2880{
2665 if (prop == None || selection_wait != Sel_incr) 2881 if (prop == None || selection_wait != Sel_incr)
2666 return; 2882 return;
2667 2883
2668 if (selection_paste (win, prop, 1) > 0) 2884 selection_paste (win, prop, true);
2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2675} 2885}
2676 2886
2677/* ------------------------------------------------------------------------- */ 2887/* ------------------------------------------------------------------------- */
2678/* 2888/*
2679 * Request the current selection: 2889 * Request the current selection:
… …
2713#else 2923#else
2714 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2715 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2716 return; 2926 return;
2717#endif 2927#endif
2718
2719 } 2928 }
2720 } 2929 }
2721 2930
2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2931 selection_wait = Sel_none; /* don't loop in selection_paste () */
2723 selection_paste (display->root, XA_CUT_BUFFER0, False); 2932 selection_paste (display->root, XA_CUT_BUFFER0, false);
2724} 2933}
2725 2934
2726int 2935int
2727rxvt_term::selection_request_other (Atom target, int selnum) 2936rxvt_term::selection_request_other (Atom target, int selnum)
2728{ 2937{
2729 Atom sel; 2938 Atom sel;
2730#ifdef DEBUG_SELECT
2731 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2732#endif
2733 2939
2734 selection_type |= selnum; 2940 selection_type |= selnum;
2735 2941
2736 if (selnum == Sel_Primary) 2942 if (selnum == Sel_Primary)
2737 sel = XA_PRIMARY; 2943 sel = XA_PRIMARY;
… …
2801 3007
2802 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3008 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2803 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3009 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2804 3010
2805 col = selection.beg.col; 3011 col = selection.beg.col;
2806 MAX_IT (col, 0);
2807 row = selection.beg.row + TermWin.saveLines; 3012 row = selection.beg.row + TermWin.saveLines;
2808 end_row = selection.end.row + TermWin.saveLines; 3013 end_row = selection.end.row + TermWin.saveLines;
2809 int ofs = 0; 3014 int ofs = 0;
2810 int extra = 0; 3015 int extra = 0;
2811 3016
2812 for (; row <= end_row; row++, col = 0) 3017 for (; row <= end_row; row++, col = 0)
2813 { 3018 {
2814 t = &screen.text[row][col];
2815
2816 end_col = screen.tlen[row]; 3019 end_col = screen.tlen[row];
3020
3021#if ENABLE_FRILLS
3022 if (selection.rect)
3023 {
3024 col = selection.beg.col;
3025 end_col = TermWin.ncol + 1;
3026 }
3027#endif
3028
3029 MAX_IT (col, 0);
2817 3030
2818 if (end_col == -1) 3031 if (end_col == -1)
2819 end_col = TermWin.ncol; 3032 end_col = TermWin.ncol;
2820 3033
2821 if (row == end_row) 3034 if (row == end_row || selection.rect)
2822 MIN_IT (end_col, selection.end.col); 3035 MIN_IT (end_col, selection.end.col);
2823 3036
3037 t = &screen.text[row][col];
2824 for (; col < end_col; col++) 3038 for (; col < end_col; col++)
2825 { 3039 {
2826 if (*t == NOCHAR) 3040 if (*t == NOCHAR)
2827 t++; 3041 t++;
2828#if ENABLE_COMBINING 3042#if ENABLE_COMBINING
… …
2876#if 0 3090#if 0
2877 XTextProperty ct; 3091 XTextProperty ct;
2878 3092
2879 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2880 { 3094 {
2881 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2882 PropModeReplace, ct.value, ct.nitems);
2883 XFree (ct.value); 3096 XFree (ct.value);
2884 } 3097 }
2885#endif 3098#endif
2886 3099
2887 selection_time = tm; 3100 selection_time = tm;
… …
3088 enum { 3301 enum {
3089 LEFT, RIGHT 3302 LEFT, RIGHT
3090 } closeto = RIGHT; 3303 } closeto = RIGHT;
3091 3304
3092 want_refresh = 1; 3305 want_refresh = 1;
3306
3093 switch (selection.op) 3307 switch (selection.op)
3094 { 3308 {
3095 case SELECTION_INIT: 3309 case SELECTION_INIT:
3096 CLEAR_SELECTION (); 3310 CLEAR_SELECTION ();
3097 selection.op = SELECTION_BEGIN; 3311 selection.op = SELECTION_BEGIN;
… …
3110 selection_start_colrow (col, row); 3324 selection_start_colrow (col, row);
3111 /* FALLTHROUGH */ 3325 /* FALLTHROUGH */
3112 default: 3326 default:
3113 return; 3327 return;
3114 } 3328 }
3329
3115 if (selection.beg.col == selection.end.col 3330 if (selection.beg.col == selection.end.col
3116 && selection.beg.col != selection.mark.col 3331 && selection.beg.col != selection.mark.col
3117 && selection.beg.row == selection.end.row 3332 && selection.beg.row == selection.end.row
3118 && selection.beg.row != selection.mark.row) 3333 && selection.beg.row != selection.mark.row)
3119 { 3334 {
… …
3169 } 3384 }
3170 else 3385 else
3171 { /* button1 drag or button3 drag */ 3386 { /* button1 drag or button3 drag */
3172 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3387 if (ROWCOL_IS_AFTER (selection.mark, pos))
3173 { 3388 {
3174 if ((selection.mark.row == selection.end.row) 3389 if (selection.mark.row == selection.end.row
3175 && (selection.mark.col == selection.end.col) 3390 && selection.mark.col == selection.end.col
3391 && clickchange
3176 && clickchange && selection.clicks == 2) 3392 && selection.clicks == 2)
3177 selection.mark.col--; 3393 selection.mark.col--;
3178 3394
3179 selection.beg.row = pos.row; 3395 selection.beg.row = pos.row;
3180 selection.beg.col = pos.col; 3396 selection.beg.col = pos.col;
3181 selection.end.row = selection.mark.row; 3397 selection.end.row = selection.mark.row;
… …
3192 3408
3193 if (selection.clicks == 1) 3409 if (selection.clicks == 1)
3194 { 3410 {
3195 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3411 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196 3412
3197 if (end_col != -1 && selection.beg.col > end_col) 3413 if (selection.beg.col > end_col
3414 && end_col != -1
3415#if ENABLE_FRILLS
3416 && !selection.rect
3417#endif
3198 { 3418 )
3199#if 1
3200 selection.beg.col = ncol; 3419 selection.beg.col = ncol;
3201#else
3202 if (selection.beg.row != selection.end.row)
3203 selection.beg.col = ncol;
3204 else
3205 selection.beg.col = selection.mark.col;
3206#endif
3207 }
3208 3420
3209 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3421 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210 3422
3211 if (end_col != -1 && selection.end.col > end_col) 3423 if (
3424 selection.end.col > end_col
3425 && end_col != -1
3426#if ENABLE_FRILLS
3427 && !selection.rect
3428#endif
3429 )
3212 selection.end.col = ncol; 3430 selection.end.col = ncol;
3213 } 3431 }
3214 else if (selection.clicks == 2) 3432 else if (selection.clicks == 2)
3215 { 3433 {
3216 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3434 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3217 selection.end.col--; 3435 selection.end.col--;
3218 3436
3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3437 selection_delimit_word (UP, &selection.beg, &selection.beg);
3438 selection_delimit_word (DN, &selection.end, &selection.end);
3221 } 3439 }
3222 else if (selection.clicks == 3) 3440 else if (selection.clicks == 3)
3223 { 3441 {
3224#if ENABLE_FRILLS 3442#if ENABLE_FRILLS
3225 if ((options & Opt_tripleclickwords)) 3443 if (options & Opt_tripleclickwords)
3226 { 3444 {
3227 int end_row; 3445 int end_row;
3228 3446
3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3447 selection_delimit_word (UP, &selection.beg, &selection.beg);
3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3448 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3231 3449
3232 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3450 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3233 { 3451 {
3234 end_col = screen.tlen[end_row + TermWin.saveLines]; 3452 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3245 else 3463 else
3246#endif 3464#endif
3247 { 3465 {
3248 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3466 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3249 selection.mark.col++; 3467 selection.mark.col++;
3468
3250 selection.beg.col = 0; 3469 selection.beg.col = 0;
3251 selection.end.col = ncol; 3470 selection.end.col = ncol;
3471
3472 // select a complete logical line
3473 while (selection.beg.row > -TermWin.saveLines
3474 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3475 selection.beg.row--;
3476
3477 while (selection.end.row < TermWin.nrow
3478 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3479 selection.end.row++;
3252 } 3480 }
3253 } 3481 }
3254 3482
3255 if (button3 && buttonpress) 3483 if (button3 && buttonpress)
3256 { /* mark may need to be changed */ 3484 { /* mark may need to be changed */
… …
3263 { 3491 {
3264 selection.mark.row = selection.beg.row; 3492 selection.mark.row = selection.beg.row;
3265 selection.mark.col = selection.beg.col; 3493 selection.mark.col = selection.beg.col;
3266 } 3494 }
3267 } 3495 }
3268}
3269 3496
3270#if ENABLE_FRILLS 3497#if ENABLE_FRILLS
3498 if (selection.rect && selection.beg.col > selection.end.col)
3499 SWAP_IT (selection.beg.col, selection.end.col, int);
3500#endif
3501}
3502
3503#if ENABLE_FRILLS
3271void 3504void
3272rxvt_term::selection_remove_trailing_spaces () 3505rxvt_term::selection_remove_trailing_spaces ()
3273{ 3506{
3274 int32_t end_col, end_row; 3507 int32_t end_col, end_row;
3275 text_t *stp; 3508 text_t *stp;
3276 3509
3277 end_col = selection.end.col; 3510 end_col = selection.end.col;
3278 end_row = selection.end.row; 3511 end_row = selection.end.row;
3512
3279 for ( ; end_row >= selection.beg.row; ) 3513 for ( ; end_row >= selection.beg.row; )
3280 { 3514 {
3281 stp = screen.text[end_row + TermWin.saveLines]; 3515 stp = screen.text[end_row + TermWin.saveLines];
3516
3282 while (--end_col >= 0) 3517 while (--end_col >= 0)
3283 { 3518 {
3284 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3519 if (stp[end_col] != ' '
3520 && stp[end_col] != '\t'
3521 && stp[end_col] != NOCHAR)
3285 break; 3522 break;
3286 } 3523 }
3524
3287 if (end_col >= 0 3525 if (end_col >= 0
3288 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3526 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3289 { 3527 {
3290 selection.end.col = end_col + 1; 3528 selection.end.col = end_col + 1;
3291 selection.end.row = end_row; 3529 selection.end.row = end_row;
3292 break; 3530 break;
3293 } 3531 }
3532
3294 end_row--; 3533 end_row--;
3295 end_col = TermWin.ncol; 3534 end_col = TermWin.ncol;
3296 } 3535 }
3536
3297 if (selection.mark.row > selection.end.row) 3537 if (selection.mark.row > selection.end.row)
3298 { 3538 {
3299 selection.mark.row = selection.end.row; 3539 selection.mark.row = selection.end.row;
3300 selection.mark.col = selection.end.col; 3540 selection.mark.col = selection.end.col;
3301 } 3541 }
… …
3317 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3557 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3318} 3558}
3319 3559
3320/* ------------------------------------------------------------------------- */ 3560/* ------------------------------------------------------------------------- */
3321/* 3561/*
3322 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3323 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3324 * the X11 protocol.
3325 */
3326typedef CARD32 Atom32;
3327
3328/* ------------------------------------------------------------------------- */
3329/*
3330 * Respond to a request for our current selection 3562 * Respond to a request for our current selection
3331 * EXT: SelectionRequest 3563 * EXT: SelectionRequest
3332 */ 3564 */
3333void 3565void
3334rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3566rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3335{ 3567{
3336 XSelectionEvent ev; 3568 XSelectionEvent ev;
3337 XTextProperty ct; 3569 dDisp;
3338 XICCEncodingStyle style;
3339 Atom target;
3340 3570
3341 ev.type = SelectionNotify; 3571 ev.type = SelectionNotify;
3342 ev.property = None; 3572 ev.property = None;
3343 ev.display = rq.display; 3573 ev.display = rq.display;
3344 ev.requestor = rq.requestor; 3574 ev.requestor = rq.requestor;
… …
3346 ev.target = rq.target; 3576 ev.target = rq.target;
3347 ev.time = rq.time; 3577 ev.time = rq.time;
3348 3578
3349 if (rq.target == xa[XA_TARGETS]) 3579 if (rq.target == xa[XA_TARGETS])
3350 { 3580 {
3351 Atom32 target_list[6]; 3581 Atom target_list[6];
3352 Atom32 *target = target_list; 3582 Atom *target = target_list;
3353 3583
3354 *target++ = (Atom32) xa[XA_TARGETS]; 3584 *target++ = xa[XA_TARGETS];
3355 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3585 *target++ = xa[XA_TIMESTAMP];
3356 *target++ = (Atom32) XA_STRING; 3586 *target++ = XA_STRING;
3357 *target++ = (Atom32) xa[XA_TEXT]; 3587 *target++ = xa[XA_TEXT];
3358 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3588 *target++ = xa[XA_COMPOUND_TEXT];
3359#if X_HAVE_UTF8_STRING 3589#if X_HAVE_UTF8_STRING
3360 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3590 *target++ = xa[XA_UTF8_STRING];
3361#endif 3591#endif
3362 3592
3363 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3593 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3364 (8 * sizeof (target_list[0])), PropModeReplace, 3594 32, PropModeReplace,
3365 (unsigned char *)target_list, 3595 (unsigned char *)target_list, target - target_list);
3366 target - target_list);
3367 ev.property = rq.property; 3596 ev.property = rq.property;
3368 } 3597 }
3369#if TODO // TODO 3598#if TODO // TODO
3370 else if (rq.target == xa[XA_MULTIPLE]) 3599 else if (rq.target == xa[XA_MULTIPLE])
3371 { 3600 {
3372 /* TODO: Handle MULTIPLE */ 3601 /* TODO: Handle MULTIPLE */
3373 } 3602 }
3374#endif 3603#endif
3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3604 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3376 { 3605 {
3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3606 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3378 (8 * sizeof (Time)), PropModeReplace,
3379 (unsigned char *)&selection_time, 1); 3607 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3380 ev.property = rq.property; 3608 ev.property = rq.property;
3381 } 3609 }
3382 else if (rq.target == XA_STRING 3610 else if (rq.target == XA_STRING
3383 || rq.target == xa[XA_TEXT] 3611 || rq.target == xa[XA_TEXT]
3384 || rq.target == xa[XA_COMPOUND_TEXT] 3612 || rq.target == xa[XA_COMPOUND_TEXT]
3385 || rq.target == xa[XA_UTF8_STRING] 3613 || rq.target == xa[XA_UTF8_STRING]
3386 ) 3614 )
3387 { 3615 {
3616 XTextProperty ct;
3617 Atom target = rq.target;
3388 short freect = 0; 3618 short freect = 0;
3389 int selectlen; 3619 int selectlen;
3390 wchar_t *cl; 3620 wchar_t *cl;
3391 3621 enum {
3392 target = rq.target; 3622 enc_string = XStringStyle,
3623 enc_text = XStdICCTextStyle,
3624 enc_compound_text = XCompoundTextStyle,
3625#ifdef X_HAVE_UTF8_STRING
3626 enc_utf8 = XUTF8StringStyle,
3627#else
3628 enc_utf8 = -1,
3629#endif
3630 } style;
3393 3631
3394 if (target == XA_STRING) 3632 if (target == XA_STRING)
3395 // we actually don't do XA_STRING, but who cares, as i18n clients 3633 // we actually don't do XA_STRING, but who cares, as i18n clients
3396 // will ask for another format anyways. 3634 // will ask for another format anyways.
3397 style = XStringStyle; 3635 style = enc_string;
3398 else if (target == xa[XA_TEXT]) 3636 else if (target == xa[XA_TEXT])
3399 style = XStdICCTextStyle; 3637 style = enc_text;
3400 else if (target == xa[XA_COMPOUND_TEXT]) 3638 else if (target == xa[XA_COMPOUND_TEXT])
3401 style = XCompoundTextStyle; 3639 style = enc_compound_text;
3402#if X_HAVE_UTF8_STRING 3640#if ENABLE_FRILLS
3403 else if (target == xa[XA_UTF8_STRING]) 3641 else if (target == xa[XA_UTF8_STRING])
3404 style = XUTF8StringStyle; 3642 style = enc_utf8;
3405#endif 3643#endif
3406 else 3644 else
3407 { 3645 {
3408 target = xa[XA_COMPOUND_TEXT]; 3646 target = xa[XA_COMPOUND_TEXT];
3409 style = XCompoundTextStyle; 3647 style = enc_compound_text;
3410 } 3648 }
3411 3649
3412 if (selection.text) 3650 if (selection.text)
3413 { 3651 {
3414 cl = selection.text; 3652 cl = selection.text;
… …
3418 { 3656 {
3419 cl = L""; 3657 cl = L"";
3420 selectlen = 0; 3658 selectlen = 0;
3421 } 3659 }
3422 3660
3423 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3661#if ENABLE_FRILLS
3424 // manually for XUTF8StringStyle. 3662 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3663 // so recode it manually
3664 if (style == enc_utf8)
3665 {
3666 freect = 1;
3667 ct.encoding = target;
3668 ct.format = 8;
3669 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3670 ct.nitems = strlen ((char *)ct.value);
3671 }
3672 else
3673#endif
3425 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3674 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426 freect = 1; 3675 freect = 1;
3427 else 3676 else
3428 { 3677 {
3429 /* if we failed to convert then send it raw */ 3678 /* if we failed to convert then send it raw */
3430 ct.value = (unsigned char *)cl; 3679 ct.value = (unsigned char *)cl;
3431 ct.nitems = selectlen; 3680 ct.nitems = selectlen;
3681 ct.encoding = target;
3432 } 3682 }
3433 3683
3434 XChangeProperty (display->display, rq.requestor, rq.property, 3684 XChangeProperty (disp, rq.requestor, rq.property,
3435 target, 8, PropModeReplace, 3685 ct.encoding, 8, PropModeReplace,
3436 ct.value, (int)ct.nitems); 3686 ct.value, (int)ct.nitems);
3437 ev.property = rq.property; 3687 ev.property = rq.property;
3438 3688
3439 if (freect) 3689 if (freect)
3440 XFree (ct.value); 3690 XFree (ct.value);
3441 } 3691 }
3442 3692
3443 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3693 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3444} 3694}
3445 3695
3446/* ------------------------------------------------------------------------- * 3696/* ------------------------------------------------------------------------- *
3447 * MOUSE ROUTINES * 3697 * MOUSE ROUTINES *
3448 * ------------------------------------------------------------------------- */ 3698 * ------------------------------------------------------------------------- */
… …
3507 { 3757 {
3508 text_t *tp = ov_text[y] = new text_t[w]; 3758 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w]; 3759 rend_t *rp = ov_rend[y] = new rend_t[w];
3510 3760
3511 text_t t0, t1, t2; 3761 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg); 3762 rend_t r = OVERLAY_RSTYLE;
3513 3763
3514 if (y == 0) 3764 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 3765 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1) 3766 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 3767 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
… …
3551} 3801}
3552 3802
3553void 3803void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3804rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{ 3805{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h) 3806 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3557 return; 3807 return;
3558 3808
3559 x++, y++; 3809 x++, y++;
3560 3810
3561 ov_text[y][x] = text; 3811 ov_text[y][x] = text;
… …
3568 while (*s) 3818 while (*s)
3569 scr_overlay_set (x++, y, *s++); 3819 scr_overlay_set (x++, y, *s++);
3570} 3820}
3571 3821
3572void 3822void
3823rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3824{
3825 while (*s)
3826 {
3827 text_t t = *s++;
3828 int width = wcwidth (t);
3829
3830 while (width--)
3831 {
3832 scr_overlay_set (x++, y, t);
3833 t = NOCHAR;
3834 }
3835 }
3836}
3837
3838void
3573rxvt_term::scr_swap_overlay () 3839rxvt_term::scr_swap_overlay ()
3574{ 3840{
3575 if (!ov_text) 3841 if (!ov_text)
3576 return; 3842 return;
3577 3843
… …
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3853 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588 3854
3589 for (int x = ov_w; x--; ) 3855 for (int x = ov_w; x--; )
3590 { 3856 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3857 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false)); 3858 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3593 } 3859 }
3594 } 3860 }
3595} 3861}
3596 3862
3597#endif 3863#endif

Diff Legend

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