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.30 by pcg, Fri Feb 13 12:16:21 2004 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
6 * 7 *
7 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version. 11 * (at your option) any later version.
… …
16 * 17 *
17 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 *--------------------------------------------------------------------------*/ 21 *--------------------------------------------------------------------------*/
22
21/* 23/*
22 * We handle _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
23 */ 25 */
24 26
25#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
26#define INTERN_SCREEN 28#define INTERN_SCREEN
27#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
… …
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 32#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 33
32#include <stdint.h> 34#include <stdint.h>
33#include <wchar.h> 35#include <wchar.h>
34 36
35#include "salloc.C" // HACK!! 37#include "salloc.C" // HACK, should be a seperate compile!
36 38
37inline void fill_text (text_t *start, text_t value, int len) 39inline void fill_text (text_t *start, text_t value, int len)
38{ 40{
39 while (len--) 41 while (len--)
40 *start++ = value; 42 *start++ = value;
… …
437 uint16_t total_rows; 439 uint16_t total_rows;
438 int i; 440 int i;
439 441
440 total_rows = TermWin.nrow + TermWin.saveLines; 442 total_rows = TermWin.nrow + TermWin.saveLines;
441 443
442#ifdef DEBUG_STRICT
443 for (i = 0; i < total_rows; i++)
444 {
445 if (screen.text[i])
446 /* then so is screen.rend[i] */
447 assert (screen.rend[i]);
448 }
449#endif
450
451 delete talloc; talloc = 0; 444 delete talloc; talloc = 0;
452 delete ralloc; ralloc = 0; 445 delete ralloc; ralloc = 0;
453 446
454 free (screen.text); 447 free (screen.text);
455 free (screen.tlen); 448 free (screen.tlen);
… …
485 prev_nrow = prev_ncol = 0; 478 prev_nrow = prev_ncol = 0;
486 scr_reset (); 479 scr_reset ();
487 480
488 scr_clear (); 481 scr_clear ();
489 scr_refresh (SLOW_REFRESH); 482 scr_refresh (SLOW_REFRESH);
490#ifdef RXVT_GRAPHICS
491 Gr_reset ();
492#endif
493} 483}
494 484
495/* ------------------------------------------------------------------------- * 485/* ------------------------------------------------------------------------- *
496 * PROCESS SCREEN COMMANDS * 486 * PROCESS SCREEN COMMANDS *
497 * ------------------------------------------------------------------------- */ 487 * ------------------------------------------------------------------------- */
… …
501 * XTERM_SEQ: Restore cursor: ESC 8 491 * XTERM_SEQ: Restore cursor: ESC 8
502 */ 492 */
503void 493void
504rxvt_term::scr_cursor (int mode) 494rxvt_term::scr_cursor (int mode)
505{ 495{
506 screen_t *s; 496 screen_t *s;
507 497
508 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
509 499
510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
511 if (current_screen == SECONDARY) 501 if (current_screen == SECONDARY)
512 s = & (swap); 502 s = &swap;
513 else 503 else
514#endif 504#endif
515 s = & (screen); 505 s = &screen;
506
516 switch (mode) 507 switch (mode)
517 { 508 {
518 case SAVE: 509 case SAVE:
519 s->s_cur.row = s->cur.row; 510 s->s_cur.row = s->cur.row;
520 s->s_cur.col = s->cur.col; 511 s->s_cur.col = s->cur.col;
… …
531 s->charset = s->s_charset; 522 s->charset = s->s_charset;
532 charsets[s->charset] = s->s_charset_char; 523 charsets[s->charset] = s->s_charset_char;
533 set_font_style (); 524 set_font_style ();
534 break; 525 break;
535 } 526 }
527
536 /* boundary check in case screen size changed between SAVE and RESTORE */ 528 /* boundary check in case screen size changed between SAVE and RESTORE */
537 MIN_IT (s->cur.row, TermWin.nrow - 1); 529 MIN_IT (s->cur.row, TermWin.nrow - 1);
538 MIN_IT (s->cur.col, TermWin.ncol - 1); 530 MIN_IT (s->cur.col, TermWin.ncol - 1);
539#ifdef DEBUG_STRICT 531#ifdef DEBUG_STRICT
540 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
… …
552 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 544 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
553 */ 545 */
554int 546int
555rxvt_term::scr_change_screen (int scrn) 547rxvt_term::scr_change_screen (int scrn)
556{ 548{
557 int i; 549 int i;
558#if NSCREENS 550#if NSCREENS
559 int offset; 551 int offset;
560#endif 552#endif
561 553
562 want_refresh = 1; 554 want_refresh = 1;
563 555
564 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
… …
593# endif 585# endif
594 SWAP_IT (screen.charset, swap.charset, int16_t); 586 SWAP_IT (screen.charset, swap.charset, int16_t);
595 SWAP_IT (screen.flags, swap.flags, int); 587 SWAP_IT (screen.flags, swap.flags, int);
596 screen.flags |= Screen_VisibleCursor; 588 screen.flags |= Screen_VisibleCursor;
597 swap.flags |= Screen_VisibleCursor; 589 swap.flags |= Screen_VisibleCursor;
598
599# ifdef RXVT_GRAPHICS
600
601 if (Gr_Displayed ())
602 {
603 Gr_scroll (0);
604 Gr_ChangeScreen ();
605 }
606# endif
607#else 590#else
608# ifdef SCROLL_ON_NO_SECONDARY 591# ifdef SCROLL_ON_NO_SECONDARY
609# ifdef RXVT_GRAPHICS
610 if (Gr_Displayed ())
611 Gr_ClearScreen ();
612# endif
613 if (current_screen == PRIMARY 592 if (current_screen == PRIMARY)
614# ifdef RXVT_GRAPHICS
615 && !Gr_Displayed ()
616# endif
617 )
618 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 593 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
619# endif 594# endif
620#endif 595#endif
621 return scrn; 596 return scrn;
622} 597}
… …
772 if (!spec) /* line length may not equal TermWin.ncol */ 747 if (!spec) /* line length may not equal TermWin.ncol */
773 scr_blank_screen_mem (screen.text, screen.rend, 748 scr_blank_screen_mem (screen.text, screen.rend,
774 (unsigned int)j, rstyle); 749 (unsigned int)j, rstyle);
775 } 750 }
776 751
777#ifdef RXVT_GRAPHICS
778 if (Gr_Displayed ())
779 Gr_scroll (count);
780#endif
781
782 return count; 752 return count;
783} 753}
784 754
785/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
786/* 756/*
787 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
788 */ 758 */
789void 759void
790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 760rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
791{ 761{
792 unsigned char checksel, clearsel; 762 unsigned char checksel, clearsel;
793 uint32_t c; 763 unicode_t c;
794 int i, row, last_col; 764 int i, row, last_col;
795 text_t *stp; 765 text_t *stp;
796 rend_t *srp; 766 rend_t *srp;
797 767
798 if (len <= 0) /* sanity */ 768 if (len <= 0) /* sanity */
799 return; 769 return;
800 770
801 want_refresh = 1; 771 want_refresh = 1;
… …
824 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
825 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
826#endif 796#endif
827 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row + TermWin.saveLines;
828 798
829 checksel = (selection.op 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
830 && current_screen == selection.screen) ? 1 : 0;
831 clearsel = 0; 800 clearsel = 0;
832 801
833 stp = screen.text[row]; 802 stp = screen.text[row];
834 srp = screen.rend[row]; 803 srp = screen.rend[row];
835 804
836 for (i = 0; i < len;) 805 while (len--)
837 { 806 {
838 c = str[i++]; 807 c = *str++;
808
809 if (c < 0x20)
839 switch (c) 810 switch (c)
840 { 811 {
841 case '\t': 812 case '\t':
842 scr_tab (1); 813 scr_tab (1);
843 continue; 814 continue;
815
844 case '\n': 816 case '\n':
845 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (screen.tlen[row] != -1) /* XXX: think about this */
846 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (screen.tlen[row], screen.cur.col);
819
847 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
821
848 if (screen.cur.row == screen.bscroll) 822 if (screen.cur.row == screen.bscroll)
849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
850 else if (screen.cur.row < (TermWin.nrow - 1)) 824 else if (screen.cur.row < (TermWin.nrow - 1))
851 row = (++screen.cur.row) + TermWin.saveLines; 825 row = (++screen.cur.row) + TermWin.saveLines;
826
852 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
853 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 829 continue;
830
855 case '\r': 831 case '\r':
856 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
857 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
834
858 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
859 screen.cur.col = 0; 836 screen.cur.col = 0;
860 continue; 837 continue;
861 default:
862 if (c == 127)
863 continue; /* yummmm..... */
864 break;
865 } 838 }
866 839
867 if (checksel /* see if we're writing within selection */ 840 if (checksel /* see if we're writing within selection */
868 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
869 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 842 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
870 { 843 {
871 checksel = 0; 844 checksel = 0;
872 clearsel = 1; 845 clearsel = 1;
873 } 846 }
847
874 if (screen.flags & Screen_WrapNext) 848 if (screen.flags & Screen_WrapNext)
875 { 849 {
876 screen.tlen[row] = -1; 850 screen.tlen[row] = -1;
877 if (screen.cur.row == screen.bscroll) 851 if (screen.cur.row == screen.bscroll)
878 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
879 else if (screen.cur.row < (TermWin.nrow - 1)) 853 else if (screen.cur.row < (TermWin.nrow - 1))
880 row = (++screen.cur.row) + TermWin.saveLines; 854 row = (++screen.cur.row) + TermWin.saveLines;
855
881 stp = screen.text[row]; /* _must_ refresh */ 856 stp = screen.text[row]; /* _must_ refresh */
882 srp = screen.rend[row]; /* _must_ refresh */ 857 srp = screen.rend[row]; /* _must_ refresh */
883 screen.cur.col = 0; 858 screen.cur.col = 0;
884 screen.flags &= ~Screen_WrapNext; 859 screen.flags &= ~Screen_WrapNext;
885 } 860 }
861
886 if (screen.flags & Screen_Insert) 862 if (screen.flags & Screen_Insert)
887 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
888 864
865 // rely on wcwidth to tell us the character width, at least for non-latin1
866 // do wcwidth before further replacements, as wcwidth says that line-drawing
867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
868 int width = c < 256 ? 1 : wcwidth (c);
869
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 switch (c)
891 { 871 {
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 872 // vt100 special graphics and line drawing
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 873 static uint16_t vt100_0[32] = { // 5f .. 7e
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 } 878 };
904 879
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 880 if (c >= 0x5f && c <= 0x7e)
906 // rely on wcwidth to tell us the character width, at least for non-ascii 881 {
907 int width = c <= 128 ? 1 : wcwidth (c); 882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
908 886
909 // width -1 characters (e.g. combining chars) are ignored currently.
910 if (width > 0) 887 if (width > 0)
888 {
889#if !UNICODE_3 && ENABLE_COMBINING
890 // trim characters we can't store directly :(
891 if (c >= 0x10000)
892 c = rxvt_composite.compose (c); // map to lower 16 bits
893#endif
894 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
895
911 do 896 do
912 { 897 {
913 stp[screen.cur.col] = c; 898 stp[screen.cur.col] = c;
914 srp[screen.cur.col] = rend; 899 srp[screen.cur.col] = rend;
915 900
916 if (screen.cur.col < last_col - 1) 901 if (screen.cur.col < last_col - 1)
917 screen.cur.col++; 902 screen.cur.col++;
918 else 903 else
919 { 904 {
920 screen.tlen[row] = last_col; 905 screen.tlen[row] = last_col;
921 if (screen.flags & Screen_Autowrap) 906 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 907 screen.flags |= Screen_WrapNext;
923 break; 908 break;
924 } 909 }
925 910
926 c = NOCHAR; 911 c = NOCHAR;
927 } 912 }
928 while (--width > 0); 913 while (--width > 0);
914
915 // pad with spaces when overwriting wide character with smaller one
916 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
917 {
918 stp[c] = ' ';
919 srp[c] = rend;
920 }
921 }
922 else if (width == 0)
923 {
924#if ENABLE_COMBINING
925 // handle combining characters
926 // we just tag the accent on the previous on-screen character.
927 // this is arguably not correct, but also arguably not wrong.
928 // we don't handle double-width characters nicely yet.
929
930 text_t *tp;
931 rend_t *rp;
932
933 if (screen.cur.col > 0)
934 {
935 tp = stp + screen.cur.col - 1;
936 rp = srp + screen.cur.col - 1;
937 }
938 else if (screen.cur.row > 0
939 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
940 {
941 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
942 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
943 }
929 else 944 else
930 (void)0; /* handle combining character etc. here. */ 945 continue;
946
947 // handle double-width-chars by making them look extremely ugly
948 if (*tp == NOCHAR)
949 *tp = ' '; // hack //D //TODO //--tp, --rp;
950
951 // first try to find a precomposed character
952 unicode_t n = rxvt_compose (*tp, c);
953 if (n == NOCHAR)
954 n = rxvt_composite.compose (*tp, c);
955
956 *tp = n;
957 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
958#endif
959 }
931 } 960 }
932 961
933 if (screen.tlen[row] != -1) /* XXX: think about this */ 962 if (screen.tlen[row] != -1) /* XXX: think about this */
934 MAX_IT (screen.tlen[row], screen.cur.col); 963 MAX_IT (screen.tlen[row], screen.cur.col);
935 964
… …
981 * XTERM_SEQ: CTRL-I 1010 * XTERM_SEQ: CTRL-I
982 */ 1011 */
983void 1012void
984rxvt_term::scr_tab (int count) 1013rxvt_term::scr_tab (int count)
985{ 1014{
986 int i, x; 1015 int i, x;
987 1016
988 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1017 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
989 want_refresh = 1; 1018 want_refresh = 1;
990 i = x = screen.cur.col; 1019 i = x = screen.cur.col;
1020
991 if (count == 0) 1021 if (count == 0)
992 return; 1022 return;
993 else if (count > 0) 1023 else if (count > 0)
994 { 1024 {
995 for (; ++i < TermWin.ncol; ) 1025 for (; ++i < TermWin.ncol; )
… …
997 { 1027 {
998 x = i; 1028 x = i;
999 if (!--count) 1029 if (!--count)
1000 break; 1030 break;
1001 } 1031 }
1032
1002 if (count) 1033 if (count)
1003 x = TermWin.ncol - 1; 1034 x = TermWin.ncol - 1;
1004 } 1035 }
1005 else /* if (count < 0) */ 1036 else /* if (count < 0) */
1006 { 1037 {
… …
1009 { 1040 {
1010 x = i; 1041 x = i;
1011 if (!++count) 1042 if (!++count)
1012 break; 1043 break;
1013 } 1044 }
1045
1014 if (count) 1046 if (count)
1015 x = 0; 1047 x = 0;
1016 } 1048 }
1049
1017 if (x != screen.cur.col) 1050 if (x != screen.cur.col)
1018 scr_gotorc (0, x, R_RELATIVE); 1051 scr_gotorc (0, x, R_RELATIVE);
1019} 1052}
1020 1053
1021/* ------------------------------------------------------------------------- */ 1054/* ------------------------------------------------------------------------- */
… …
1075void 1108void
1076rxvt_term::scr_gotorc (int row, int col, int relative) 1109rxvt_term::scr_gotorc (int row, int col, int relative)
1077{ 1110{
1078 want_refresh = 1; 1111 want_refresh = 1;
1079 ZERO_SCROLLBACK (); 1112 ZERO_SCROLLBACK ();
1080#ifdef RXVT_GRAPHICS
1081 if (Gr_Displayed ())
1082 Gr_scroll (0);
1083#endif
1084 1113
1085 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1114 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1086 1115
1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1116 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1088 : col); 1117 : col);
… …
1119 else 1148 else
1120 screen.cur.row = row; 1149 screen.cur.row = row;
1121 } 1150 }
1122 MAX_IT (screen.cur.row, 0); 1151 MAX_IT (screen.cur.row, 0);
1123 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1152 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1153
1154 while (screen.cur.col > 0
1155 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1156 screen.cur.col--;
1124} 1157}
1125 1158
1126/* ------------------------------------------------------------------------- */ 1159/* ------------------------------------------------------------------------- */
1127/* 1160/*
1128 * direction should be UP or DN 1161 * direction should be UP or DN
… …
1135 want_refresh = 1; 1168 want_refresh = 1;
1136 dirn = ((direction == UP) ? 1 : -1); 1169 dirn = ((direction == UP) ? 1 : -1);
1137 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1170 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1138 1171
1139 ZERO_SCROLLBACK (); 1172 ZERO_SCROLLBACK ();
1140
1141#ifdef RXVT_GRAPHICS
1142 if (Gr_Displayed ())
1143 Gr_scroll (0);
1144#endif
1145 1173
1146 screen.flags &= ~Screen_WrapNext; 1174 screen.flags &= ~Screen_WrapNext;
1147 if ((screen.cur.row == screen.bscroll && direction == UP) 1175 if ((screen.cur.row == screen.bscroll && direction == UP)
1148 || (screen.cur.row == screen.tscroll && direction == DN)) 1176 || (screen.cur.row == screen.tscroll && direction == DN))
1149 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1177 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
… …
1167 unsigned int row, col, num; 1195 unsigned int row, col, num;
1168 1196
1169 want_refresh = 1; 1197 want_refresh = 1;
1170 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); 1198 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1171 ZERO_SCROLLBACK (); 1199 ZERO_SCROLLBACK ();
1172
1173#ifdef RXVT_GRAPHICS
1174 if (Gr_Displayed ())
1175 Gr_scroll (0);
1176#endif
1177 1200
1178 selection_check (1); 1201 selection_check (1);
1179 1202
1180 screen.flags &= ~Screen_WrapNext; 1203 screen.flags &= ~Screen_WrapNext;
1181 1204
… …
1224 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1247 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1225 */ 1248 */
1226void 1249void
1227rxvt_term::scr_erase_screen (int mode) 1250rxvt_term::scr_erase_screen (int mode)
1228{ 1251{
1229 int num; 1252 int num;
1230 int32_t row, row_offset; 1253 int32_t row, row_offset;
1231 rend_t ren; 1254 rend_t ren;
1232 XGCValues gcvalue; 1255 XGCValues gcvalue;
1233 1256
1234 want_refresh = 1; 1257 want_refresh = 1;
1235 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1258 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1236 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
1237 row_offset = (int32_t)TermWin.saveLines; 1260 row_offset = (int32_t)TermWin.saveLines;
… …
1250 row = 0; 1273 row = 0;
1251 num = screen.cur.row; 1274 num = screen.cur.row;
1252 break; 1275 break;
1253 case 2: /* erase whole screen */ 1276 case 2: /* erase whole screen */
1254 selection_check (3); 1277 selection_check (3);
1255#ifdef RXVT_GRAPHICS
1256 Gr_ClearScreen ();
1257#endif
1258 row = 0; 1278 row = 0;
1259 num = TermWin.nrow; 1279 num = TermWin.nrow;
1260 break; 1280 break;
1261 default: 1281 default:
1262 return; 1282 return;
1263 } 1283 }
1284
1264 refresh_type |= REFRESH_BOUNDS; 1285 refresh_type |= REFRESH_BOUNDS;
1286
1265 if (selection.op && current_screen == selection.screen 1287 if (selection.op && current_screen == selection.screen
1266 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1288 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1267 || (selection.end.row >= row 1289 || (selection.end.row >= row
1268 && selection.end.row <= row + num))) 1290 && selection.end.row <= row + num)))
1269 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1292
1270 if (row >= TermWin.nrow) /* Out Of Bounds */ 1293 if (row >= TermWin.nrow) /* Out Of Bounds */
1271 return; 1294 return;
1295
1272 MIN_IT (num, (TermWin.nrow - row)); 1296 MIN_IT (num, (TermWin.nrow - row));
1297
1273 if (rstyle & (RS_RVid | RS_Uline)) 1298 if (rstyle & (RS_RVid | RS_Uline))
1274 ren = (rend_t) ~RS_None; 1299 ren = (rend_t) ~RS_None;
1275 else if (GET_BASEBG (rstyle) == Color_bg) 1300 else if (GET_BASEBG (rstyle) == Color_bg)
1276 { 1301 {
1277 ren = DEFAULT_RSTYLE; 1302 ren = DEFAULT_RSTYLE;
… …
1284 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1285 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1286 gcvalue.foreground = PixColors[Color_fg]; 1311 gcvalue.foreground = PixColors[Color_fg];
1287 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1288 } 1313 }
1314
1289 for (; num--; row++) 1315 for (; num--; row++)
1290 { 1316 {
1291 scr_blank_screen_mem (screen.text, screen.rend, 1317 scr_blank_screen_mem (screen.text, screen.rend,
1292 (unsigned int) (row + row_offset), rstyle); 1318 (unsigned int) (row + row_offset), rstyle);
1293 screen.tlen[row + row_offset] = 0; 1319 screen.tlen[row + row_offset] = 0;
… …
1327 * Insert/Delete <count> lines 1353 * Insert/Delete <count> lines
1328 */ 1354 */
1329void 1355void
1330rxvt_term::scr_insdel_lines (int count, int insdel) 1356rxvt_term::scr_insdel_lines (int count, int insdel)
1331{ 1357{
1332 int end; 1358 int end;
1333 1359
1334 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1335
1336#ifdef RXVT_GRAPHICS
1337 if (Gr_Displayed ())
1338 Gr_scroll (0);
1339#endif
1340 1361
1341 selection_check (1); 1362 selection_check (1);
1342 1363
1343 if (screen.cur.row > screen.bscroll) 1364 if (screen.cur.row > screen.bscroll)
1344 return; 1365 return;
… …
1361 * Insert/Delete <count> characters from the current position 1382 * Insert/Delete <count> characters from the current position
1362 */ 1383 */
1363void 1384void
1364rxvt_term::scr_insdel_chars (int count, int insdel) 1385rxvt_term::scr_insdel_chars (int count, int insdel)
1365{ 1386{
1366 int col, row; 1387 int col, row;
1367 rend_t tr; 1388 rend_t tr;
1368 text_t *stp; 1389 text_t *stp;
1369 rend_t *srp; 1390 rend_t *srp;
1370 int16_t *slp; 1391 int16_t *slp;
1371 1392
1372 want_refresh = 1; 1393 want_refresh = 1;
1373 ZERO_SCROLLBACK (); 1394 ZERO_SCROLLBACK ();
1374
1375#ifdef RXVT_GRAPHICS
1376 if (Gr_Displayed ())
1377 Gr_scroll (0);
1378#endif
1379 1395
1380 if (count <= 0) 1396 if (count <= 0)
1381 return; 1397 return;
1382 1398
1383 selection_check (1); 1399 selection_check (1);
… …
1387 screen.flags &= ~Screen_WrapNext; 1403 screen.flags &= ~Screen_WrapNext;
1388 1404
1389 stp = screen.text[row]; 1405 stp = screen.text[row];
1390 srp = screen.rend[row]; 1406 srp = screen.rend[row];
1391 slp = & (screen.tlen[row]); 1407 slp = & (screen.tlen[row]);
1408
1392 switch (insdel) 1409 switch (insdel)
1393 { 1410 {
1394 case INSERT: 1411 case INSERT:
1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1412 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1396 col--) 1413 col--)
1397 { 1414 {
1398 stp[col] = stp[col - count]; 1415 stp[col] = stp[col - count];
1399 srp[col] = srp[col - count]; 1416 srp[col] = srp[col - count];
1400 } 1417 }
1418
1401 if (*slp != -1) 1419 if (*slp != -1)
1402 { 1420 {
1403 *slp += count; 1421 *slp += count;
1404 MIN_IT (*slp, TermWin.ncol); 1422 MIN_IT (*slp, TermWin.ncol);
1405 } 1423 }
1424
1406 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1427 {
1409 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
1410 || (selection.end.col + count >= TermWin.ncol)) 1429 || (selection.end.col + count >= TermWin.ncol))
… …
1414 selection.beg.col += count; 1433 selection.beg.col += count;
1415 selection.mark.col += count; /* XXX: yes? */ 1434 selection.mark.col += count; /* XXX: yes? */
1416 selection.end.col += count; 1435 selection.end.col += count;
1417 } 1436 }
1418 } 1437 }
1438
1419 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1439 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1420 (unsigned int)count, rstyle); 1440 (unsigned int)count, rstyle);
1421 break; 1441 break;
1442
1422 case ERASE: 1443 case ERASE:
1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1444 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1424 selection_check (1); 1445 selection_check (1);
1425 screen.cur.col -= count; 1446 screen.cur.col -= count;
1426 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1427 (unsigned int)count, rstyle); 1448 (unsigned int)count, rstyle);
1428 break; 1449 break;
1450
1429 case DELETE: 1451 case DELETE:
1430 tr = srp[TermWin.ncol - 1]
1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1453
1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1454 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 { 1455 {
1434 stp[col] = stp[col + count]; 1456 stp[col] = stp[col + count];
1435 srp[col] = srp[col + count]; 1457 srp[col] = srp[col + count];
1436 } 1458 }
1459
1437 scr_blank_line (& (stp[TermWin.ncol - count]), 1460 scr_blank_line (& (stp[TermWin.ncol - count]),
1438 & (srp[TermWin.ncol - count]), 1461 & (srp[TermWin.ncol - count]),
1439 (unsigned int)count, tr); 1462 (unsigned int)count, tr);
1463
1440 if (*slp == -1) /* break line continuation */ 1464 if (*slp == -1) /* break line continuation */
1441 *slp = TermWin.ncol; 1465 *slp = TermWin.ncol;
1466
1442 *slp -= count; 1467 *slp -= count;
1443 MAX_IT (*slp, 0); 1468 MAX_IT (*slp, 0);
1469
1444 if (selection.op && current_screen == selection.screen 1470 if (selection.op && current_screen == selection.screen
1445 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1446 { 1472 {
1447 if (selection.end.row != screen.cur.row 1473 if (selection.end.row != screen.cur.row
1448 || (screen.cur.col >= selection.beg.col - count) 1474 || (screen.cur.col >= selection.beg.col - count)
… …
1454 selection.beg.col -= count; 1480 selection.beg.col -= count;
1455 selection.mark.col -= count; /* XXX: yes? */ 1481 selection.mark.col -= count; /* XXX: yes? */
1456 selection.end.col -= count; 1482 selection.end.col -= count;
1457 } 1483 }
1458 } 1484 }
1485
1459 break; 1486 break;
1460 } 1487 }
1461} 1488}
1462 1489
1463/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
… …
1468void 1495void
1469rxvt_term::scr_scroll_region (int top, int bot) 1496rxvt_term::scr_scroll_region (int top, int bot)
1470{ 1497{
1471 MAX_IT (top, 0); 1498 MAX_IT (top, 0);
1472 MIN_IT (bot, (int)TermWin.nrow - 1); 1499 MIN_IT (bot, (int)TermWin.nrow - 1);
1500
1473 if (top > bot) 1501 if (top > bot)
1474 return; 1502 return;
1503
1475 screen.tscroll = top; 1504 screen.tscroll = top;
1476 screen.bscroll = bot; 1505 screen.bscroll = bot;
1477 scr_gotorc (0, 0, 0); 1506 scr_gotorc (0, 0, 0);
1478} 1507}
1479 1508
… …
1808rxvt_term::scr_changeview (uint16_t oldviewstart) 1837rxvt_term::scr_changeview (uint16_t oldviewstart)
1809{ 1838{
1810 if (TermWin.view_start != oldviewstart) 1839 if (TermWin.view_start != oldviewstart)
1811 { 1840 {
1812 want_refresh = 1; 1841 want_refresh = 1;
1813#ifdef RXVT_GRAPHICS
1814 if (Gr_Displayed ())
1815 Gr_scroll (0);
1816#endif
1817 num_scr -= (TermWin.view_start - oldviewstart); 1842 num_scr -= (TermWin.view_start - oldviewstart);
1818 } 1843 }
1819 return (int) (TermWin.view_start - oldviewstart); 1844 return (int) (TermWin.view_start - oldviewstart);
1820} 1845}
1821 1846
… …
1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1916 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1892 1917
1893void 1918void
1894rxvt_term::scr_refresh (unsigned char refresh_type) 1919rxvt_term::scr_refresh (unsigned char refresh_type)
1895{ 1920{
1896 unsigned char clearfirst, /* first character writes before cell */ 1921 unsigned char clearfirst, /* first character writes before cell */
1897 clearlast, /* last character writes beyond cell */ 1922 clearlast, /* last character writes beyond cell */
1898 must_clear, /* use draw_string not draw_image_string */ 1923 must_clear, /* use draw_string not draw_image_string */
1899 rvid, /* reverse video this position */ 1924 rvid, /* reverse video this position */
1900 showcursor; /* show the cursor */ 1925 showcursor; /* show the cursor */
1901 int16_t col, row, /* column/row we're processing */ 1926 int16_t col, row, /* column/row we're processing */
1902 ocrow; /* old cursor row */ 1927 ocrow; /* old cursor row */
1903 int cursorwidth;
1904 int i, /* tmp */ 1928 int i, /* tmp */
1905 row_offset; /* basic offset in screen structure */ 1929 row_offset; /* basic offset in screen structure */
1906#ifndef NO_CURSORCOLOR 1930#ifndef NO_CURSORCOLOR
1907 rend_t cc1; /* store colours at cursor position (s) */ 1931 rend_t cc1; /* store colours at cursor position (s) */
1908#endif 1932#endif
1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1933 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1934 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1911 1935
1912 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1936 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1913 return; 1937 return;
1914 1938
1915 /* 1939 /*
… …
1942 1966
1943 /* 1967 /*
1944 * C: set the cursor character (s) 1968 * C: set the cursor character (s)
1945 */ 1969 */
1946 { 1970 {
1947 unsigned char setoldcursor; 1971 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */ 1972 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */ 1973 ccol2; /* Cursor colour2 */
1950 1974
1951 showcursor = (screen.flags & Screen_VisibleCursor); 1975 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK 1976#ifdef CURSOR_BLINK
1954 if (hidden_cursor) 1977 if (hidden_cursor)
1955 showcursor = 0; 1978 showcursor = 0;
1956#endif 1979#endif
1957 1980
1958 cursorwidth = 0;
1959
1960 if (showcursor) 1981 if (showcursor)
1961 { 1982 {
1962 cursorwidth++;
1963
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1983 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1965 [screen.cur.col]);
1966 1984
1967 if (showcursor && TermWin.focus) 1985 if (showcursor && TermWin.focus)
1968 { 1986 {
1969 *srp ^= RS_RVid; 1987 *srp ^= RS_RVid;
1970#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
… …
1986 ccol2 = Color_bg; 2004 ccol2 = Color_bg;
1987#endif 2005#endif
1988 *srp = SET_FGCOLOR (*srp, ccol1); 2006 *srp = SET_FGCOLOR (*srp, ccol1);
1989 *srp = SET_BGCOLOR (*srp, ccol2); 2007 *srp = SET_BGCOLOR (*srp, ccol2);
1990#endif 2008#endif
1991
1992 } 2009 }
1993 } 2010 }
1994 2011
1995 /* make sure no outline cursor is left around */ 2012 /* make sure no outline cursor is left around */
1996 setoldcursor = 0; 2013 setoldcursor = 0;
… …
1999 if (screen.cur.row + TermWin.view_start != ocrow 2016 if (screen.cur.row + TermWin.view_start != ocrow
2000 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
2001 { 2018 {
2002 if (ocrow < TermWin.nrow 2019 if (ocrow < TermWin.nrow
2003 && oldcursor.col < TermWin.ncol) 2020 && oldcursor.col < TermWin.ncol)
2004 {
2005 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2006 } 2022
2007 if (TermWin.focus || !showcursor) 2023 if (TermWin.focus || !showcursor)
2008 oldcursor.row = -1; 2024 oldcursor.row = -1;
2009 else 2025 else
2010 setoldcursor = 1; 2026 setoldcursor = 1;
2011 } 2027 }
2012 } 2028 }
2013 else if (!TermWin.focus) 2029 else if (!TermWin.focus)
2014 setoldcursor = 1; 2030 setoldcursor = 1;
2031
2015 if (setoldcursor) 2032 if (setoldcursor)
2016 { 2033 {
2017 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2034 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2018 oldcursor.row = -1; 2035 oldcursor.row = -1;
2019 else 2036 else
… …
2031 */ 2048 */
2032 i = num_scr; 2049 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2050 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs (i) < TermWin.nrow && !must_clear) 2051 && abs (i) < TermWin.nrow && !must_clear)
2035 { 2052 {
2036 int16_t nits; 2053 int16_t nits;
2037 int j; 2054 int j;
2038 rend_t *drp2; 2055 rend_t *drp2;
2039 text_t *dtp2; 2056 text_t *dtp2;
2040 int len, wlen; 2057 int len, wlen;
2041 2058
2042 j = TermWin.nrow; 2059 j = TermWin.nrow;
2043 wlen = len = -1; 2060 wlen = len = -1;
2044 row = i > 0 ? 0 : j - 1; 2061 row = i > 0 ? 0 : j - 1;
2045 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2062 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2109 int ypixel = (int)Row2Pixel (row); 2126 int ypixel = (int)Row2Pixel (row);
2110 2127
2111 for (col = 0; col < TermWin.ncol; col++) 2128 for (col = 0; col < TermWin.ncol; col++)
2112 { 2129 {
2113 /* compare new text with old - if exactly the same then continue */ 2130 /* compare new text with old - if exactly the same then continue */
2131 if (stp[col] == dtp[col] /* Must match characters to skip. */
2132 && (srp[col] == drp[col] /* Either rendition the same or */
2133 || (stp[col] == ' ' /* space w/ no background change */
2134 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2135 continue;
2136
2137 // redraw one or more characters
2138
2139 // seek to the beginning if wide characters
2140 while (stp[col] == NOCHAR && col > 0)
2141 --col;
2142
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2143 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2120 continue;
2121
2122 text_t *text = stp + col; 2144 text_t *text = stp + col;
2123 int count = 1; 2145 int count = 1;
2124 2146
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col]; 2147 dtp[col] = stp[col];
2128 drp[col] = rend; 2148 drp[col] = rend;
2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132 2149
2133 int xpixel = Col2Pixel (col); 2150 int xpixel = Col2Pixel (col);
2134 2151
2135 // this loop looks very messy, it can probably be optimized 2152 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you? 2153 // and cleaned a bit by you?
… …
2177 int fore = GET_FGCOLOR (rend); // desired foreground 2194 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background 2195 int back = GET_BGCOLOR (rend); // desired background
2179 2196
2180 rend = GET_ATTR (rend); 2197 rend = GET_ATTR (rend);
2181 2198
2182 rvid = !! (rend & RS_RVid); 2199 rvid = !!(rend & RS_RVid);
2200
2201#ifndef NO_BOLD_UNDERLINE_REVERSE
2202 if (rend & RS_Bold && fore == Color_fg)
2203 {
2204 if (ISSET_PIXCOLOR (Color_BD))
2205 fore = Color_BD;
2206 else
2207 rvid = !rvid;
2208 }
2209
2210 if (rend & RS_Uline)
2211 if (ISSET_PIXCOLOR (Color_UL))
2212 fore = Color_UL;
2213#endif
2214
2183 if (rvid) 2215 if (rvid)
2184 { 2216 {
2185 SWAP_IT (fore, back, int); 2217 SWAP_IT (fore, back, int);
2186 2218
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2219#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2190 && !ISSET_PIXCOLOR (Color_cursor) 2222 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif 2223# endif
2192 ) 2224 )
2193 back = Color_RV; 2225 back = Color_RV;
2194#endif 2226#endif
2195
2196 } 2227 }
2228
2197#ifdef TEXT_BLINK 2229#ifdef TEXT_BLINK
2198 if (rend & RS_Blink) 2230 if (rend & RS_Blink && back == Color_bg)
2199 { 2231 {
2200 if (!text_blink_ev.active) 2232 if (!text_blink_ev.active)
2201 { 2233 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2234 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0; 2235 hidden_text = 0;
2204 } 2236 }
2205 else if (hidden_text) 2237 else if (hidden_text)
2206 fore = back; 2238 fore = back;
2207 } 2239 }
2208#endif 2240#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223 2241
2224 /* 2242 /*
2225 * Actually do the drawing of the string here 2243 * Actually do the drawing of the string here
2226 */ 2244 */
2227 rxvt_font *font = (*TermWin.fontset)[fid]; 2245 rxvt_font *font = (*TermWin.fontset)[fid];
2228 2246
2229 if (back == fore) 2247 if (back == fore)
2230 font->clear_rect (xpixel, ypixel, 2248 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight, 2249 TermWin.fwidth * count, TermWin.fheight,
2232 back); 2250 back);
2233 else if (back == Color_bg) 2251 else if (back == Color_bg)
2234 { 2252 {
2235 if (must_clear) 2253 if (must_clear)
… …
2237 CLEAR_CHARS (xpixel, ypixel, count); 2255 CLEAR_CHARS (xpixel, ypixel, count);
2238 2256
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2257 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2258 if (text[i] != ' ')
2241 { 2259 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2260 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1);
2243 break; 2261 break;
2244 } 2262 }
2245 } 2263 }
2246 else 2264 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2265 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2248 } 2266 }
2249 else 2267 else
2250 font->draw (xpixel, ypixel, text, count, fore, back); 2268 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2251 2269
2252 if ((rend & RS_Uline) && (font->descent > 1)) 2270 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine (display->display, drawBuffer, TermWin.gc, 2271 XDrawLine (display->display, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1, 2272 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2273 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */ 2274 } /* for (col....) */
2257 } /* for (row....) */ 2275 } /* for (row....) */
2258 2276
2259 /* 2277 /*
2260 * G: cleanup cursor and display outline cursor if necessary 2278 * G: cleanup cursor and display outline cursor if necessary
… …
2267 [screen.cur.col]); 2285 [screen.cur.col]);
2268 *srp ^= RS_RVid; 2286 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR 2287#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2288 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2271#endif 2289#endif
2272
2273 } 2290 }
2274 else if (oldcursor.row >= 0) 2291 else if (oldcursor.row >= 0)
2275 { 2292 {
2276#ifndef NO_CURSORCOLOR 2293#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor)) 2294 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2295 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]);
2279#endif 2296#endif
2297 int cursorwidth = 1;
2298 while (oldcursor.col + cursorwidth < TermWin.ncol
2299 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2300 cursorwidth++;
2301
2280 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2302 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2281 Col2Pixel (oldcursor.col), 2303 Col2Pixel (oldcursor.col),
2282 Row2Pixel (oldcursor.row), 2304 Row2Pixel (oldcursor.row),
2283 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2305 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2284 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2306 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2285 } 2307 }
2286 } 2308 }
2287 2309
2288 /* 2310 /*
2289 * H: cleanup selection 2311 * H: cleanup selection
… …
2297 /* 2319 /*
2298 * clear the whole screen height, note that width == 0 is treated 2320 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2321 * specially by XClearArea
2300 */ 2322 */
2301 XClearArea (display->display, TermWin.vt, 0, 0, 2323 XClearArea (display->display, TermWin.vt, 0, 0,
2302 (unsigned int)TermWin.int_bwidth, 2324 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight (), False); 2325 (unsigned int)TermWin_TotalHeight (), False);
2326
2304 if (clearlast && TermWin.int_bwidth) 2327 if (clearlast && TermWin.int_bwidth)
2305 /* 2328 /*
2306 * clear the whole screen height, note that width == 0 is treated 2329 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2330 * specially by XClearArea
2308 */ 2331 */
2309 XClearArea (display->display, TermWin.vt, 2332 XClearArea (display->display, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0, 2333 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)TermWin.int_bwidth, 2334 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight (), False); 2335 (unsigned int)TermWin_TotalHeight (), False);
2336
2313 if (refresh_type & SMOOTH_REFRESH) 2337 if (refresh_type & SMOOTH_REFRESH)
2314 XSync (display->display, False); 2338 XSync (display->display, False);
2315 2339
2316 num_scr = 0; 2340 num_scr = 0;
2317 num_scr_allow = 1; 2341 num_scr_allow = 1;
2318 want_refresh = 0; /* screen is current */ 2342 want_refresh = 0; /* screen is current */
2319} 2343}
2320 2344
2321/* ------------------------------------------------------------------------- */
2322void 2345void
2346rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2347{
2348 if (!rp || !tp)
2349 return;
2350
2351 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2352 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2353}
2354
2355void
2323rxvt_term::scr_clear () 2356rxvt_term::scr_remap_chars ()
2357{
2358 for (int i = TermWin.nrow + TermWin.saveLines; i--; )
2359 scr_remap_chars (screen.text[i], screen.rend[i]);
2360
2361 for (int i = TermWin.nrow; i--; )
2362 {
2363 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2364 scr_remap_chars (swap.text[i], swap.rend[i]);
2365 }
2366}
2367
2368/* ------------------------------------------------------------------------- */
2369void
2370rxvt_term::scr_clear (bool really)
2324{ 2371{
2325 if (!TermWin.mapped) 2372 if (!TermWin.mapped)
2326 return; 2373 return;
2327 2374
2328 num_scr_allow = 0; 2375 num_scr_allow = 0;
2329 want_refresh = 1; 2376 want_refresh = 1;
2377
2330#ifdef TRANSPARENT 2378#ifdef TRANSPARENT
2331 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2379 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 { 2380 {
2333 int i; 2381 int i;
2334 2382
… …
2341 if (TermWin.parent[i] != None) 2389 if (TermWin.parent[i] != None)
2342 XClearWindow (display->display, TermWin.parent[i]); 2390 XClearWindow (display->display, TermWin.parent[i]);
2343 } 2391 }
2344#endif 2392#endif
2345 2393
2394 if (really)
2346 XClearWindow (display->display, TermWin.vt); 2395 XClearWindow (display->display, TermWin.vt);
2347} 2396}
2348 2397
2349/* ------------------------------------------------------------------------- */ 2398/* ------------------------------------------------------------------------- */
2350void 2399void
2351rxvt_term::scr_reverse_selection () 2400rxvt_term::scr_reverse_selection ()
2352{ 2401{
2353 int i, col, row, end_row;
2354 rend_t *srp;
2355
2356 if (selection.op && current_screen == selection.screen) 2402 if (selection.op && current_screen == selection.screen)
2357 { 2403 {
2358 end_row = TermWin.saveLines - TermWin.view_start; 2404 int end_row = TermWin.saveLines - TermWin.view_start;
2359 i = selection.beg.row + TermWin.saveLines; 2405 int i = selection.beg.row + TermWin.saveLines;
2360 row = selection.end.row + TermWin.saveLines; 2406 int col, row = selection.end.row + TermWin.saveLines;
2407 rend_t *srp;
2408
2361 if (i >= end_row) 2409 if (i >= end_row)
2362 col = selection.beg.col; 2410 col = selection.beg.col;
2363 else 2411 else
2364 { 2412 {
2365 col = 0; 2413 col = 0;
2366 i = end_row; 2414 i = end_row;
2367 } 2415 }
2416
2368 end_row += TermWin.nrow; 2417 end_row += TermWin.nrow;
2369 for (; i < row && i < end_row; i++, col = 0) 2418 for (; i < row && i < end_row; i++, col = 0)
2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2419 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2371 srp[col] ^= RS_RVid; 2420 srp[col] ^= RS_RVid;
2421
2372 if (i == row && i < end_row) 2422 if (i == row && i < end_row)
2373 for (srp = screen.rend[i]; col < selection.end.col; col++) 2423 for (srp = screen.rend[i]; col < selection.end.col; col++)
2374 srp[col] ^= RS_RVid; 2424 srp[col] ^= RS_RVid;
2375 } 2425 }
2376} 2426}
… …
2515 } 2565 }
2516 2566
2517 for (;;) 2567 for (;;)
2518 { 2568 {
2519 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2569 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2520 (long) (PROP_SIZE / 4), delete_prop, 2570 (long) (PROP_SIZE / 4), delete_prop,
2521 AnyPropertyType, &ct.encoding, &ct.format, 2571 AnyPropertyType, &ct.encoding, &ct.format,
2522 &ct.nitems, &bytes_after, 2572 &ct.nitems, &bytes_after,
2523 &ct.value) != Success) 2573 &ct.value) != Success)
2524 break; 2574 break;
2525 2575
2526 if (ct.encoding == 0) 2576 if (ct.encoding == 0)
2527 { 2577 {
2528 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2578 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2536 } 2586 }
2537 2587
2538 if (ct.nitems == 0) 2588 if (ct.nitems == 0)
2539 { 2589 {
2540 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2590 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2591
2541 if (selection_wait == Sel_normal && nread == 0) 2592 if (selection_wait == Sel_normal && nread == 0
2593 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2542 { 2594 {
2543 /* 2595 /*
2544 * pass through again trying CUT_BUFFER0 if we've come from 2596 * pass through again trying CUT_BUFFER0 if we've come from
2545 * XConvertSelection () but nothing was presented 2597 * XConvertSelection () but nothing was presented
2546 */ 2598 */
… …
2586void 2638void
2587rxvt_term::incr_cb (time_watcher &w) 2639rxvt_term::incr_cb (time_watcher &w)
2588{ 2640{
2589 selection_wait = Sel_none; 2641 selection_wait = Sel_none;
2590 2642
2591 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2643 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2592} 2644}
2593 2645
2594/* 2646/*
2595 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2647 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2596 */ 2648 */
… …
2599{ 2651{
2600 int reget_time = 0; 2652 int reget_time = 0;
2601 2653
2602 if (prop == None) 2654 if (prop == None)
2603 return; 2655 return;
2656
2604 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2657 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal) 2658 if (selection_wait == Sel_normal)
2606 { 2659 {
2607 int a, afmt; 2660 int a, afmt;
2608 Atom atype; 2661 Atom atype;
2609 unsigned long bytes_after, nitems; 2662 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL; 2663 unsigned char *s = NULL;
2611 2664
2612 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2665 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems, 2666 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s); 2667 &bytes_after, &s);
2615 if (s) 2668 if (s)
2616 XFree (s); 2669 XFree (s);
2617 if (a != Success) 2670 if (a != Success)
2618 return; 2671 return;
2672
2619#ifndef __CYGWIN32__ 2673#ifndef __CYGWIN32__
2620 if (atype == xa[XA_INCR]) 2674 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */ 2675 { /* start an INCR transfer */
2622 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2676 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2623 XDeleteProperty (display->display, win, prop); 2677 XDeleteProperty (display->display, win, prop);
… …
2629 2683
2630 } 2684 }
2631 else if (selection_wait == Sel_incr) 2685 else if (selection_wait == Sel_incr)
2632 { 2686 {
2633 reget_time = 1; 2687 reget_time = 1;
2688
2634 if (selection_paste (win, prop, True) == -1) 2689 if (selection_paste (win, prop, True) == -1)
2635 { 2690 {
2636 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2691 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2637 selection_wait = Sel_none; 2692 selection_wait = Sel_none;
2638 incr_ev.stop (); 2693 incr_ev.stop ();
2639 } 2694 }
2640 } 2695 }
2641 if (reget_time) /* received more data so reget time */ 2696 if (reget_time) /* received more data so reget time */
2642 incr_ev.start (NOW + 10); 2697 incr_ev.start (NOW + 10);
2643} 2698}
2699
2644/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2645/* 2701/*
2646 * Request the current selection: 2702 * Request the current selection:
2647 * Order: > internal selection if available 2703 * Order: > internal selection if available
2648 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2704 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2653 */ 2709 */
2654void 2710void
2655rxvt_term::selection_request (Time tm, int x, int y) 2711rxvt_term::selection_request (Time tm, int x, int y)
2656{ 2712{
2657 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2713 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2714
2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2715 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2659 return; /* outside window */ 2716 return; /* outside window */
2660 2717
2661 if (selection.text != NULL) 2718 if (selection.text)
2662 { /* internal selection */ 2719 { /* internal selection */
2663 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2720 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2664 paste (selection.text, selection.len); 2721 char *str = rxvt_wcstombs (selection.text, selection.len);
2722 paste ((unsigned char *)str, strlen (str));
2723 free (str);
2665 return; 2724 return;
2666 } 2725 }
2667 else 2726 else
2668 { 2727 {
2669 int i; 2728 int i;
2670 2729
2671 selection_request_time = tm; 2730 selection_request_time = tm;
2672 selection_wait = Sel_normal; 2731 selection_wait = Sel_normal;
2732
2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2733 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 { 2734 {
2675#if X_HAVE_UTF8_STRING 2735#if X_HAVE_UTF8_STRING
2676 selection_type = Sel_UTF8String; 2736 selection_type = Sel_UTF8String;
2677 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2737 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2682 return; 2742 return;
2683#endif 2743#endif
2684 2744
2685 } 2745 }
2686 } 2746 }
2747
2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2748 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2688 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2749 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2689 selection_paste (display->root, XA_CUT_BUFFER0, False); 2750 selection_paste (display->root, XA_CUT_BUFFER0, False);
2690} 2751}
2691 2752
2692int 2753int
2693rxvt_term::selection_request_other (Atom target, int selnum) 2754rxvt_term::selection_request_other (Atom target, int selnum)
2694{ 2755{
2695 Atom sel; 2756 Atom sel;
2696#ifdef DEBUG_SELECT 2757#ifdef DEBUG_SELECT
2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2758 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2698#endif 2759#endif
2699 2760
2700 selection_type |= selnum; 2761 selection_type |= selnum;
2762
2701 if (selnum == Sel_Primary) 2763 if (selnum == Sel_Primary)
2702 sel = XA_PRIMARY; 2764 sel = XA_PRIMARY;
2703 else if (selnum == Sel_Secondary) 2765 else if (selnum == Sel_Secondary)
2704 sel = XA_SECONDARY; 2766 sel = XA_SECONDARY;
2705 else 2767 else
2706 sel = xa[XA_CLIPBOARD]; 2768 sel = xa[XA_CLIPBOARD];
2769
2707 if (XGetSelectionOwner (display->display, sel) != None) 2770 if (XGetSelectionOwner (display->display, sel) != None)
2708 { 2771 {
2709 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2772 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2710 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2773 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2711 TermWin.vt, selection_request_time); 2774 TermWin.vt, selection_request_time);
2712 return 1; 2775 return 1;
2713 } 2776 }
2777
2714 return 0; 2778 return 0;
2715} 2779}
2716 2780
2717/* ------------------------------------------------------------------------- */ 2781/* ------------------------------------------------------------------------- */
2718/* 2782/*
… …
2723rxvt_term::selection_clear () 2787rxvt_term::selection_clear ()
2724{ 2788{
2725 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2789 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2726 2790
2727 want_refresh = 1; 2791 want_refresh = 1;
2728 if (selection.text)
2729 free (selection.text); 2792 free (selection.text);
2730 selection.text = NULL; 2793 selection.text = NULL;
2731 selection.len = 0; 2794 selection.len = 0;
2732 CLEAR_SELECTION (); 2795 CLEAR_SELECTION ();
2796
2797 if (display->selection_owner == this)
2798 display->selection_owner = 0;
2733} 2799}
2734 2800
2735/* ------------------------------------------------------------------------- */ 2801/* ------------------------------------------------------------------------- */
2736/* 2802/*
2737 * Copy a selection into the cut buffer 2803 * Copy a selection into the cut buffer
2738 * EXT: button 1 or 3 release 2804 * EXT: button 1 or 3 release
2739 */ 2805 */
2740void 2806void
2741rxvt_term::selection_make (Time tm) 2807rxvt_term::selection_make (Time tm)
2742{ 2808{
2743 int i, col, end_col, row, end_row; 2809 int i, col, end_col, row, end_row;
2744 unsigned char *new_selection_text; 2810 wchar_t *new_selection_text;
2745 char *str;
2746 text_t *t; 2811 text_t *t;
2747#ifdef ACS_ASCII
2748 rend_t *re;
2749#endif
2750 2812
2751 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2813 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2752 switch (selection.op) 2814 switch (selection.op)
2753 { 2815 {
2754 case SELECTION_CONT: 2816 case SELECTION_CONT:
… …
2760 selection.op = SELECTION_DONE; 2822 selection.op = SELECTION_DONE;
2761 /* FALLTHROUGH */ 2823 /* FALLTHROUGH */
2762 default: 2824 default:
2763 return; 2825 return;
2764 } 2826 }
2827
2765 selection.op = SELECTION_DONE; 2828 selection.op = SELECTION_DONE;
2766 2829
2767 if (selection.clicks == 4) 2830 if (selection.clicks == 4)
2768 return; /* nothing selected, go away */ 2831 return; /* nothing selected, go away */
2769 2832
2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2833 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2771 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2834 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2772
2773 new_selection_text = (unsigned char *)str;
2774 2835
2775 col = selection.beg.col; 2836 col = selection.beg.col;
2776 MAX_IT (col, 0); 2837 MAX_IT (col, 0);
2777 row = selection.beg.row + TermWin.saveLines; 2838 row = selection.beg.row + TermWin.saveLines;
2778 end_row = selection.end.row + TermWin.saveLines; 2839 end_row = selection.end.row + TermWin.saveLines;
2840 int ofs = 0;
2841 int extra = 0;
2779 2842
2780 for (; row <= end_row; row++, col = 0) 2843 for (; row <= end_row; row++, col = 0)
2781 { 2844 {
2782 t = & (screen.text[row][col]); 2845 t = &(screen.text[row][col]);
2783 2846
2784 end_col = screen.tlen[row]; 2847 end_col = screen.tlen[row];
2785 2848
2786 if (end_col == -1) 2849 if (end_col == -1)
2787 end_col = TermWin.ncol; 2850 end_col = TermWin.ncol;
2788 2851
2789 if (row == end_row) 2852 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col); 2853 MIN_IT (end_col, selection.end.col);
2791 2854
2792 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
2856 {
2793 if (*t == NOCHAR) 2857 if (*t == NOCHAR)
2794 t++; 2858 t++;
2859#if ENABLE_COMBINING
2860 else if (IS_COMPOSE (*t))
2861 {
2862 int len = rxvt_composite.expand (*t, 0);
2863
2864 extra -= (len - 1);
2865
2866 if (extra < 0)
2867 {
2868 extra += i;
2869 i += i;
2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2871 }
2872
2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2874 }
2875#endif
2795 else 2876 else
2796 { 2877 new_selection_text[ofs++] = *t++;
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 } 2878 }
2801 2879
2802 if (screen.tlen[row] != -1 && row != end_row) 2880 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n'; 2881 new_selection_text[ofs++] = L'\n';
2804 } 2882 }
2805 2883
2806#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol)
2809 *str++ = '\n';
2810#endif
2811#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col) 2884 if (end_col != selection.end.col)
2814 *str++ = '\n'; 2885 new_selection_text[ofs++] = L'\n';
2815#endif
2816 *str = '\0';
2817 2886
2818 i = str - (char *)new_selection_text; 2887 new_selection_text[ofs] = 0;
2888
2819 if (i == 0) 2889 if (ofs == 0)
2820 { 2890 {
2821 free (new_selection_text); 2891 free (new_selection_text);
2822 return; 2892 return;
2823 } 2893 }
2824 2894
2825 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2826 if (str - (char *)new_selection_text > 1024)
2827 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2828
2829 selection.len = i;
2830
2831 if (selection.text)
2832 free (selection.text); 2895 free (selection.text);
2833 2896
2834 selection.text = new_selection_text; 2897 // we usually allocate much more than necessary, so realloc it smaller again
2898 selection.len = ofs;
2899 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2835 2900
2836 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2901 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2902 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2838 display->set_selection_owner (this); 2903 display->set_selection_owner (this);
2839 else 2904 else
2840 rxvt_print_error ("can't get primary selection"); 2905 rxvt_warn ("can't get primary selection, ignoring.\n");
2841 2906
2842 { 2907#if 0
2843 XTextProperty ct; 2908 XTextProperty ct;
2844 char *cl = (char *)selection.text;
2845 2909
2846 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2910 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2847 { 2911 {
2848 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2849 PropModeReplace, ct.value, ct.nitems);
2850 XFree (ct.value);
2851 }
2852 else
2853 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2912 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2854 PropModeReplace, selection.text, (int)selection.len); 2913 PropModeReplace, ct.value, ct.nitems);
2914 XFree (ct.value);
2855 } 2915 }
2916#endif
2856 2917
2857 selection_time = tm; 2918 selection_time = tm;
2858 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2919 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2859} 2920}
2860 2921
… …
2889rxvt_term::selection_start_colrow (int col, int row) 2950rxvt_term::selection_start_colrow (int col, int row)
2890{ 2951{
2891 want_refresh = 1; 2952 want_refresh = 1;
2892 selection.mark.col = col; 2953 selection.mark.col = col;
2893 selection.mark.row = row - TermWin.view_start; 2954 selection.mark.row = row - TermWin.view_start;
2955
2894 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2956 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2895 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2957 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2896 MAX_IT (selection.mark.col, 0); 2958 MAX_IT (selection.mark.col, 0);
2897 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2959 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2898 2960
2961 while (selection.mark.col > 0
2962 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2963 --selection.mark.col;
2964
2899 if (selection.op) 2965 if (selection.op)
2900 { /* clear the old selection */ 2966 { /* clear the old selection */
2901 selection.beg.row = selection.end.row = selection.mark.row; 2967 selection.beg.row = selection.end.row = selection.mark.row;
2902 selection.beg.col = selection.end.col = selection.mark.col; 2968 selection.beg.col = selection.end.col = selection.mark.col;
2903 } 2969 }
2970
2904 selection.op = SELECTION_INIT; 2971 selection.op = SELECTION_INIT;
2905 selection.screen = current_screen; 2972 selection.screen = current_screen;
2906} 2973}
2907 2974
2908/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
… …
2910 * Word select: select text for 2 clicks 2977 * Word select: select text for 2 clicks
2911 * We now only find out the boundary in one direction 2978 * We now only find out the boundary in one direction
2912 */ 2979 */
2913 2980
2914/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2981/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2915#define DELIMIT_TEXT(x) \ 2982#define DELIMIT_TEXT(x) \
2916 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2983 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2917#define DELIMIT_REND(x) 1 2984#define DELIMIT_REND(x) 1
2918 2985
2919void 2986void
2920rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2987rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2921{ 2988{
2922 int col, row, dirnadd, tcol, trow, w1, w2; 2989 int col, row, dirnadd, tcol, trow, w1, w2;
2923 row_col_t bound; 2990 row_col_t bound;
2924 text_t *stp; 2991 text_t *stp;
2925 rend_t *srp; 2992 rend_t *srp;
2926 2993
2927 if (dirn == UP) 2994 if (dirn == UP)
2928 { 2995 {
2929 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2996 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2930 bound.col = 0; 2997 bound.col = 0;
… …
2934 { 3001 {
2935 bound.row = TermWin.saveLines + TermWin.nrow; 3002 bound.row = TermWin.saveLines + TermWin.nrow;
2936 bound.col = TermWin.ncol - 1; 3003 bound.col = TermWin.ncol - 1;
2937 dirnadd = 1; 3004 dirnadd = 1;
2938 } 3005 }
3006
2939 row = mark->row + TermWin.saveLines; 3007 row = mark->row + TermWin.saveLines;
2940 col = mark->col; 3008 col = mark->col;
2941 MAX_IT (col, 0); 3009 MAX_IT (col, 0);
2942 /* find the edge of a word */ 3010 /* find the edge of a word */
2943 stp = & (screen.text[row][col]); 3011 stp = & (screen.text[row][col]);
2944 w1 = DELIMIT_TEXT (*stp); 3012 w1 = DELIMIT_TEXT (*stp);
2945 3013
2946 if (selection_style != NEW_SELECT)
2947 {
2948 if (w1 == 1)
2949 {
2950 stp += dirnadd;
2951 if (DELIMIT_TEXT (*stp) == 1)
2952 goto Old_Word_Selection_You_Die;
2953 col += dirnadd;
2954 }
2955 w1 = 0;
2956 }
2957 srp = (&screen.rend[row][col]); 3014 srp = (&screen.rend[row][col]);
2958 w2 = DELIMIT_REND (*srp); 3015 w2 = DELIMIT_REND (*srp);
2959 3016
2960 for (;;) 3017 for (;;)
2961 { 3018 {
2962 for (; col != bound.col; col += dirnadd) 3019 for (; col != bound.col; col += dirnadd)
2963 { 3020 {
2964 stp += dirnadd; 3021 stp += dirnadd;
3022 srp += dirnadd;
3023
3024 if (*stp == NOCHAR)
3025 continue;
3026
2965 if (DELIMIT_TEXT (*stp) != w1) 3027 if (DELIMIT_TEXT (*stp) != w1)
2966 break; 3028 break;
2967 srp += dirnadd;
2968 if (DELIMIT_REND (*srp) != w2) 3029 if (DELIMIT_REND (*srp) != w2)
2969 break; 3030 break;
2970 } 3031 }
3032
2971 if ((col == bound.col) && (row != bound.row)) 3033 if ((col == bound.col) && (row != bound.row))
2972 { 3034 {
2973 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3035 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2974 { 3036 {
2975 trow = row + dirnadd; 3037 trow = row + dirnadd;
2976 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3038 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3039
2977 if (screen.text[trow] == NULL) 3040 if (screen.text[trow] == NULL)
2978 break; 3041 break;
3042
2979 stp = & (screen.text[trow][tcol]); 3043 stp = & (screen.text[trow][tcol]);
2980 srp = & (screen.rend[trow][tcol]); 3044 srp = & (screen.rend[trow][tcol]);
3045
2981 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3046 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2982 break; 3047 break;
3048
2983 row = trow; 3049 row = trow;
2984 col = tcol; 3050 col = tcol;
2985 continue; 3051 continue;
2986 } 3052 }
2987 } 3053 }
2988 break; 3054 break;
2989 } 3055 }
3056
2990Old_Word_Selection_You_Die: 3057Old_Word_Selection_You_Die:
2991 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 3058 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2992 3059
2993 if (dirn == DN) 3060 if (dirn == DN)
2994 col++; /* put us on one past the end */ 3061 col++; /* put us on one past the end */
… …
3016 MAX_IT (row, 0); 3083 MAX_IT (row, 0);
3017 MIN_IT (row, (int)TermWin.nrow - 1); 3084 MIN_IT (row, (int)TermWin.nrow - 1);
3018 MAX_IT (col, 0); 3085 MAX_IT (col, 0);
3019 MIN_IT (col, (int)TermWin.ncol); 3086 MIN_IT (col, (int)TermWin.ncol);
3020 3087
3021#ifndef NO_NEW_SELECTION
3022 /* 3088 /*
3023 * If we're selecting characters (single click) then we must check first 3089 * If we're selecting characters (single click) then we must check first
3024 * if we are at the same place as the original mark. If we are then 3090 * if we are at the same place as the original mark. If we are then
3025 * select nothing. Otherwise, if we're to the right of the mark, you have to 3091 * select nothing. Otherwise, if we're to the right of the mark, you have to
3026 * be _past_ a character for it to be selected. 3092 * be _past_ a character for it to be selected.
3027 */ 3093 */
3028 if (selection_style != OLD_SELECT)
3029 {
3030 if (((selection.clicks % 3) == 1) && !flag 3094 if (((selection.clicks % 3) == 1) && !flag
3031 && (col == selection.mark.col 3095 && (col == selection.mark.col
3032 && (row == selection.mark.row + TermWin.view_start))) 3096 && (row == selection.mark.row + TermWin.view_start)))
3033 { 3097 {
3034 /* select nothing */ 3098 /* select nothing */
3035 selection.beg.row = selection.end.row = 0; 3099 selection.beg.row = selection.end.row = 0;
3036 selection.beg.col = selection.end.col = 0; 3100 selection.beg.col = selection.end.col = 0;
3037 selection.clicks = 4; 3101 selection.clicks = 4;
3038 want_refresh = 1; 3102 want_refresh = 1;
3039 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3103 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3040 return; 3104 return;
3041 }
3042 } 3105 }
3043#endif 3106
3044 if (selection.clicks == 4) 3107 if (selection.clicks == 4)
3045 selection.clicks = 1; 3108 selection.clicks = 1;
3046 3109
3047 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3110 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3048 flag == 1 ? 1 : 0, /* ? button press */ 3111 flag == 1 ? 1 : 0, /* ? button press */
… …
3102 pos.col = col; 3165 pos.col = col;
3103 pos.row = row; 3166 pos.row = row;
3104 3167
3105 pos.row -= TermWin.view_start; /* adjust for scroll */ 3168 pos.row -= TermWin.view_start; /* adjust for scroll */
3106 3169
3107#ifndef NO_OLD_SELECTION
3108 /*
3109 * This mimics some of the selection behaviour of version 2.20 and before.
3110 * There are no ``selection modes'', button3 is always character extension.
3111 * Note: button3 drag is always available, c.f. v2.20
3112 * Selection always terminates (left or right as appropriate) at the mark.
3113 */
3114 if (selection_style == OLD_SELECT)
3115 {
3116 if (selection.clicks == 1 || button3)
3117 {
3118 if (hate_those_clicks)
3119 {
3120 hate_those_clicks = 0;
3121 if (selection.clicks == 1)
3122 {
3123 selection.beg.row = selection.mark.row;
3124 selection.beg.col = selection.mark.col;
3125 }
3126 else
3127 {
3128 selection.mark.row = selection.beg.row;
3129 selection.mark.col = selection.beg.col;
3130 }
3131 }
3132 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3133 {
3134 selection.end.row = selection.mark.row;
3135 selection.end.col = selection.mark.col + 1;
3136 selection.beg.row = pos.row;
3137 selection.beg.col = pos.col;
3138 }
3139 else
3140 {
3141 selection.beg.row = selection.mark.row;
3142 selection.beg.col = selection.mark.col;
3143 selection.end.row = pos.row;
3144 selection.end.col = pos.col + 1;
3145 }
3146 }
3147 else if (selection.clicks == 2)
3148 {
3149 selection_delimit_word (UP, & (selection.mark),
3150 & (selection.beg));
3151 selection_delimit_word (DN, & (selection.mark),
3152 & (selection.end));
3153 hate_those_clicks = 1;
3154 }
3155 else if (selection.clicks == 3)
3156 {
3157 selection.beg.row = selection.end.row = selection.mark.row;
3158 selection.beg.col = 0;
3159 selection.end.col = ncol;
3160 hate_those_clicks = 1;
3161 }
3162 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3163 return;
3164 }
3165#endif /* ! NO_OLD_SELECTION */
3166#ifndef NO_NEW_SELECTION
3167 /* selection_style must not be OLD_SELECT to get here */
3168 /* 3170 /*
3169 * This is mainly xterm style selection with a couple of differences, mainly 3171 * This is mainly xterm style selection with a couple of differences, mainly
3170 * in the way button3 drag extension works. 3172 * in the way button3 drag extension works.
3171 * We're either doing: button1 drag; button3 press; or button3 drag 3173 * We're either doing: button1 drag; button3 press; or button3 drag
3172 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3174 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3177 * a point/word/line which is either the start or end of the selection 3179 * a point/word/line which is either the start or end of the selection
3178 * and it was decided by whichever point/word/line was `fixed' at the 3180 * and it was decided by whichever point/word/line was `fixed' at the
3179 * time of the most recent button3 press 3181 * time of the most recent button3 press
3180 */ 3182 */
3181 if (button3 && buttonpress) 3183 if (button3 && buttonpress)
3182 { /* button3 press */ 3184 { /* button3 press */
3183 /* 3185 /*
3184 * first determine which edge of the selection we are closest to 3186 * first determine which edge of the selection we are closest to
3185 */ 3187 */
3186 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3188 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3187 || (!ROWCOL_IS_AFTER (pos, selection.end) 3189 || (!ROWCOL_IS_AFTER (pos, selection.end)
3188 && (((pos.col - selection.beg.col) 3190 && (((pos.col - selection.beg.col)
3189 + ((pos.row - selection.beg.row) * ncol)) 3191 + ((pos.row - selection.beg.row) * ncol))
3190 < ((selection.end.col - pos.col) 3192 < ((selection.end.col - pos.col)
3191 + ((selection.end.row - pos.row) * ncol))))) 3193 + ((selection.end.row - pos.row) * ncol)))))
3192 closeto = LEFT; 3194 closeto = LEFT;
3195
3193 if (closeto == LEFT) 3196 if (closeto == LEFT)
3194 { 3197 {
3195 selection.beg.row = pos.row; 3198 selection.beg.row = pos.row;
3196 selection.beg.col = pos.col; 3199 selection.beg.col = pos.col;
3197 selection.mark.row = selection.end.row; 3200 selection.mark.row = selection.end.row;
3198 selection.mark.col = selection.end.col 3201 selection.mark.col = selection.end.col - (selection.clicks == 2);
3199 - (selection.clicks == 2);
3200 } 3202 }
3201 else 3203 else
3202 { 3204 {
3203 selection.end.row = pos.row; 3205 selection.end.row = pos.row;
3204 selection.end.col = pos.col; 3206 selection.end.col = pos.col;
3205 selection.mark.row = selection.beg.row; 3207 selection.mark.row = selection.beg.row;
3206 selection.mark.col = selection.beg.col; 3208 selection.mark.col = selection.beg.col;
3207 } 3209 }
3208 } 3210 }
3209 else 3211 else
3210 { /* button1 drag or button3 drag */ 3212 { /* button1 drag or button3 drag */
3211 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3213 if (ROWCOL_IS_AFTER (selection.mark, pos))
3212 { 3214 {
3213 if ((selection.mark.row == selection.end.row) 3215 if ((selection.mark.row == selection.end.row)
3214 && (selection.mark.col == selection.end.col) 3216 && (selection.mark.col == selection.end.col)
3215 && clickchange && selection.clicks == 2) 3217 && clickchange && selection.clicks == 2)
3216 selection.mark.col--; 3218 selection.mark.col--;
3219
3217 selection.beg.row = pos.row; 3220 selection.beg.row = pos.row;
3218 selection.beg.col = pos.col; 3221 selection.beg.col = pos.col;
3219 selection.end.row = selection.mark.row; 3222 selection.end.row = selection.mark.row;
3220 selection.end.col = selection.mark.col 3223 selection.end.col = selection.mark.col + (selection.clicks == 2);
3221 + (selection.clicks == 2);
3222 } 3224 }
3223 else 3225 else
3224 { 3226 {
3225 selection.beg.row = selection.mark.row; 3227 selection.beg.row = selection.mark.row;
3226 selection.beg.col = selection.mark.col; 3228 selection.beg.col = selection.mark.col;
… …
3230 } 3232 }
3231 3233
3232 if (selection.clicks == 1) 3234 if (selection.clicks == 1)
3233 { 3235 {
3234 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3236 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3237
3235 if (end_col != -1 && selection.beg.col > end_col) 3238 if (end_col != -1 && selection.beg.col > end_col)
3236 { 3239 {
3237#if 1 3240#if 1
3238 selection.beg.col = ncol; 3241 selection.beg.col = ncol;
3239#else 3242#else
3240 if (selection.beg.row != selection.end.row) 3243 if (selection.beg.row != selection.end.row)
3241 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3242 else 3245 else
3243 selection.beg.col = selection.mark.col; 3246 selection.beg.col = selection.mark.col;
3244#endif 3247#endif
3245
3246 } 3248 }
3249
3247 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3250 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3251
3248 if (end_col != -1 && selection.end.col > end_col) 3252 if (end_col != -1 && selection.end.col > end_col)
3249 selection.end.col = ncol; 3253 selection.end.col = ncol;
3250
3251 } 3254 }
3252 else if (selection.clicks == 2) 3255 else if (selection.clicks == 2)
3253 { 3256 {
3254 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3257 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3255 selection.end.col--; 3258 selection.end.col--;
3259
3256 selection_delimit_word (UP, & (selection.beg), 3260 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3257 & (selection.beg));
3258 selection_delimit_word (DN, & (selection.end), 3261 selection_delimit_word (DN, & (selection.end), & (selection.end));
3259 & (selection.end));
3260 } 3262 }
3261 else if (selection.clicks == 3) 3263 else if (selection.clicks == 3)
3262 { 3264 {
3263#ifndef NO_FRILLS 3265#ifndef NO_FRILLS
3264 if ((Options & Opt_tripleclickwords)) 3266 if ((Options & Opt_tripleclickwords))
3265 { 3267 {
3266 int end_row; 3268 int end_row;
3267 3269
3268 selection_delimit_word (UP, & (selection.beg), 3270 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3269 & (selection.beg));
3270 end_row = screen.tlen[selection.mark.row 3271 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3271 + TermWin.saveLines]; 3272
3272 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3273 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3273 end_row++)
3274 { 3274 {
3275 end_col = screen.tlen[end_row + TermWin.saveLines]; 3275 end_col = screen.tlen[end_row + TermWin.saveLines];
3276
3276 if (end_col != -1) 3277 if (end_col != -1)
3277 { 3278 {
3278 selection.end.row = end_row; 3279 selection.end.row = end_row;
3279 selection.end.col = end_col; 3280 selection.end.col = end_col;
3280 selection_remove_trailing_spaces (); 3281 selection_remove_trailing_spaces ();
… …
3282 } 3283 }
3283 } 3284 }
3284 } 3285 }
3285 else 3286 else
3286#endif 3287#endif
3287
3288 { 3288 {
3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3290 selection.mark.col++; 3290 selection.mark.col++;
3291 selection.beg.col = 0; 3291 selection.beg.col = 0;
3292 selection.end.col = ncol; 3292 selection.end.col = ncol;
3293 } 3293 }
3294 } 3294 }
3295
3295 if (button3 && buttonpress) 3296 if (button3 && buttonpress)
3296 { /* mark may need to be changed */ 3297 { /* mark may need to be changed */
3297 if (closeto == LEFT) 3298 if (closeto == LEFT)
3298 { 3299 {
3299 selection.mark.row = selection.end.row; 3300 selection.mark.row = selection.end.row;
3300 selection.mark.col = selection.end.col 3301 selection.mark.col = selection.end.col
3301 - (selection.clicks == 2); 3302 - (selection.clicks == 2);
… …
3305 selection.mark.row = selection.beg.row; 3306 selection.mark.row = selection.beg.row;
3306 selection.mark.col = selection.beg.col; 3307 selection.mark.col = selection.beg.col;
3307 } 3308 }
3308 } 3309 }
3309 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3310 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3310#endif /* ! NO_NEW_SELECTION */
3311} 3311}
3312 3312
3313#ifndef NO_FRILLS 3313#ifndef NO_FRILLS
3314void 3314void
3315rxvt_term::selection_remove_trailing_spaces () 3315rxvt_term::selection_remove_trailing_spaces ()
… …
3389 ev.target = rq.target; 3389 ev.target = rq.target;
3390 ev.time = rq.time; 3390 ev.time = rq.time;
3391 3391
3392 if (rq.target == xa[XA_TARGETS]) 3392 if (rq.target == xa[XA_TARGETS])
3393 { 3393 {
3394 Atom32 target_list[5]; 3394 Atom32 target_list[6];
3395 Atom32 *target = target_list; 3395 Atom32 *target = target_list;
3396 3396
3397 *target++ = (Atom32) xa[XA_TARGETS]; 3397 *target++ = (Atom32) xa[XA_TARGETS];
3398 *target++ = (Atom32) xa[XA_TIMESTAMP];
3398 *target++ = (Atom32) XA_STRING; 3399 *target++ = (Atom32) XA_STRING;
3399 *target++ = (Atom32) xa[XA_TEXT]; 3400 *target++ = (Atom32) xa[XA_TEXT];
3400 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3401 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3401#if X_HAVE_UTF8_STRING 3402#if X_HAVE_UTF8_STRING
3402 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3403 *target++ = (Atom32) xa[XA_UTF8_STRING];
3403#endif 3404#endif
3405
3404 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3406 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3405 (8 * sizeof (target_list[0])), PropModeReplace, 3407 (8 * sizeof (target_list[0])), PropModeReplace,
3406 (unsigned char *)target_list, 3408 (unsigned char *)target_list,
3407 target - target_list); 3409 target - target_list);
3408 ev.property = rq.property; 3410 ev.property = rq.property;
3409 } 3411 }
3410 else if (rq.target == xa[XA_MULTIPLE]) 3412 else if (rq.target == xa[XA_MULTIPLE])
3411 { 3413 {
3412 /* TODO: Handle MULTIPLE */ 3414 /* TODO: Handle MULTIPLE */
3413 } 3415 }
3414 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3416 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3415 { 3417 {
3416 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3418 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3417 (8 * sizeof (Time)), PropModeReplace, 3419 (8 * sizeof (Time)), PropModeReplace,
3418 (unsigned char *)&selection_time, 1); 3420 (unsigned char *)&selection_time, 1);
3419 ev.property = rq.property; 3421 ev.property = rq.property;
3420 } 3422 }
3421 else if (rq.target == XA_STRING 3423 else if (rq.target == XA_STRING
3422 || rq.target == xa[XA_TEXT] 3424 || rq.target == xa[XA_TEXT]
3423 || rq.target == xa[XA_COMPOUND_TEXT] 3425 || rq.target == xa[XA_COMPOUND_TEXT]
3424 || rq.target == xa[XA_UTF8_STRING] 3426 || rq.target == xa[XA_UTF8_STRING]
3425 ) 3427 )
3426 { 3428 {
3427 short freect = 0; 3429 short freect = 0;
3428 int selectlen; 3430 int selectlen;
3429 char *cl; 3431 wchar_t *cl;
3430 3432
3431 target = rq.target; 3433 target = rq.target;
3432 3434
3433 if (target == XA_STRING) 3435 if (target == XA_STRING)
3434 // we actually don't do XA_STRING, but who cares, as i18n clients 3436 // we actually don't do XA_STRING, but who cares, as i18n clients
3435 // will ask for another format anyways. 3437 // will ask for another format anyways.
3436 style = XStringStyle; 3438 style = XStringStyle;
3437 else if (target == xa[XA_TEXT]) 3439 else if (target == xa[XA_TEXT])
3438 style = XTextStyle; 3440 style = XStdICCTextStyle;
3439 else if (target == xa[XA_COMPOUND_TEXT]) 3441 else if (target == xa[XA_COMPOUND_TEXT])
3440 style = XCompoundTextStyle; 3442 style = XCompoundTextStyle;
3441#if X_HAVE_UTF8_STRING 3443#if X_HAVE_UTF8_STRING
3442 else if (target == xa[XA_UTF8_STRING]) 3444 else if (target == xa[XA_UTF8_STRING])
3443 style = XUTF8StringStyle; 3445 style = XUTF8StringStyle;
… …
3448 style = XCompoundTextStyle; 3450 style = XCompoundTextStyle;
3449 } 3451 }
3450 3452
3451 if (selection.text) 3453 if (selection.text)
3452 { 3454 {
3453 cl = (char *)selection.text; 3455 cl = selection.text;
3454 selectlen = selection.len; 3456 selectlen = selection.len;
3455 } 3457 }
3456 else 3458 else
3457 { 3459 {
3458 cl = ""; 3460 cl = L"";
3459 selectlen = 0; 3461 selectlen = 0;
3460 } 3462 }
3461 3463
3464 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3465 // manually for XUTF8StringStyle.
3462 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3466 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3463 freect = 1; 3467 freect = 1;
3464 else 3468 else
3465 { 3469 {
3466 /* if we failed to convert then send it raw */ 3470 /* if we failed to convert then send it raw */
3467 ct.value = (unsigned char *)cl; 3471 ct.value = (unsigned char *)cl;
… …
3474 ev.property = rq.property; 3478 ev.property = rq.property;
3475 3479
3476 if (freect) 3480 if (freect)
3477 XFree (ct.value); 3481 XFree (ct.value);
3478 } 3482 }
3483
3479 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3484 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3480} 3485}
3481 3486
3482/* ------------------------------------------------------------------------- * 3487/* ------------------------------------------------------------------------- *
3483 * MOUSE ROUTINES * 3488 * MOUSE ROUTINES *

Diff Legend

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