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

Diff Legend

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