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.36 by pcg, Tue Feb 24 22:28:42 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 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);
… …
498 * XTERM_SEQ: Restore cursor: ESC 8 491 * XTERM_SEQ: Restore cursor: ESC 8
499 */ 492 */
500void 493void
501rxvt_term::scr_cursor (int mode) 494rxvt_term::scr_cursor (int mode)
502{ 495{
503 screen_t *s; 496 screen_t *s;
504 497
505 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
506 499
507#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
508 if (current_screen == SECONDARY) 501 if (current_screen == SECONDARY)
509 s = & (swap); 502 s = &swap;
510 else 503 else
511#endif 504#endif
512 s = & (screen); 505 s = &screen;
506
513 switch (mode) 507 switch (mode)
514 { 508 {
515 case SAVE: 509 case SAVE:
516 s->s_cur.row = s->cur.row; 510 s->s_cur.row = s->cur.row;
517 s->s_cur.col = s->cur.col; 511 s->s_cur.col = s->cur.col;
… …
528 s->charset = s->s_charset; 522 s->charset = s->s_charset;
529 charsets[s->charset] = s->s_charset_char; 523 charsets[s->charset] = s->s_charset_char;
530 set_font_style (); 524 set_font_style ();
531 break; 525 break;
532 } 526 }
527
533 /* boundary check in case screen size changed between SAVE and RESTORE */ 528 /* boundary check in case screen size changed between SAVE and RESTORE */
534 MIN_IT (s->cur.row, TermWin.nrow - 1); 529 MIN_IT (s->cur.row, TermWin.nrow - 1);
535 MIN_IT (s->cur.col, TermWin.ncol - 1); 530 MIN_IT (s->cur.col, TermWin.ncol - 1);
536#ifdef DEBUG_STRICT 531#ifdef DEBUG_STRICT
537 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
… …
549 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 544 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
550 */ 545 */
551int 546int
552rxvt_term::scr_change_screen (int scrn) 547rxvt_term::scr_change_screen (int scrn)
553{ 548{
554 int i; 549 int i;
555#if NSCREENS 550#if NSCREENS
556 int offset; 551 int offset;
557#endif 552#endif
558 553
559 want_refresh = 1; 554 want_refresh = 1;
560 555
561 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
562 557
563 TermWin.view_start = 0; 558 TermWin.view_start = 0;
564 559
565 if (current_screen == scrn) 560 if (current_screen == scrn)
566 return current_screen; 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 SWAP_IT (current_screen, scrn, int);
571#if NSCREENS 566#if NSCREENS
567 if (Options & Opt_secondaryScreen)
568 {
572 num_scr = 0; 569 num_scr = 0;
573 offset = TermWin.saveLines; 570 offset = TermWin.saveLines;
574 for (i = prev_nrow; i--;) 571 for (i = prev_nrow; i--;)
575 { 572 {
576 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
577 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 574 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
578 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 575 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
579 } 576 }
580 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 577 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
581 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 578 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
582# ifdef DEBUG_STRICT 579# ifdef DEBUG_STRICT
583 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 580 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
584 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 581 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
585# else /* drive with your eyes closed */ 582# else /* drive with your eyes closed */
586 MAX_IT (screen.cur.row, 0); 583 MAX_IT (screen.cur.row, 0);
587 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 584 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
588 MAX_IT (screen.cur.col, 0); 585 MAX_IT (screen.cur.col, 0);
589 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 586 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
590# endif 587# endif
591 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
592 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
593 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
594 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
595#else 592 }
596# ifdef SCROLL_ON_NO_SECONDARY 593 else
594#endif
595 if (Options & Opt_secondaryScroll)
597 if (current_screen == PRIMARY) 596 //if (current_screen == PRIMARY)
598 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
599# endif
600#endif
601 return scrn; 598 return scrn;
602} 599}
603 600
604/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
605/* 602/*
… …
647 return 0; 644 return 0;
648 645
649 want_refresh = 1; 646 want_refresh = 1;
650 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
651 648
652 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 649 if (row1 == 0 && count > 0
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
653 { 651 {
654 nscrolled = (long)TermWin.nscrolled + (long)count; 652 nscrolled = (long)TermWin.nscrolled + (long)count;
655 653
656 if (nscrolled > (long)TermWin.saveLines) 654 if (nscrolled > (long)TermWin.saveLines)
657 TermWin.nscrolled = TermWin.saveLines; 655 TermWin.nscrolled = TermWin.saveLines;
… …
760/* ------------------------------------------------------------------------- */ 758/* ------------------------------------------------------------------------- */
761/* 759/*
762 * Add text given in <str> of length <len> to screen struct 760 * Add text given in <str> of length <len> to screen struct
763 */ 761 */
764void 762void
765rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 763rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
766{ 764{
767 unsigned char checksel, clearsel; 765 unsigned char checksel, clearsel;
768 uint32_t c; 766 unicode_t c;
769 int i, row, last_col; 767 int i, row, last_col;
770 text_t *stp; 768 text_t *stp;
771 rend_t *srp; 769 rend_t *srp;
772 770
773 if (len <= 0) /* sanity */ 771 if (len <= 0) /* sanity */
774 return; 772 return;
775 773
776 want_refresh = 1; 774 want_refresh = 1;
… …
799 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
800 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
801#endif 799#endif
802 row = screen.cur.row + TermWin.saveLines; 800 row = screen.cur.row + TermWin.saveLines;
803 801
804 checksel = (selection.op 802 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
805 && current_screen == selection.screen) ? 1 : 0;
806 clearsel = 0; 803 clearsel = 0;
807 804
808 stp = screen.text[row]; 805 stp = screen.text[row];
809 srp = screen.rend[row]; 806 srp = screen.rend[row];
810 807
811 for (i = 0; i < len;) 808 while (len--)
812 { 809 {
813 c = str[i++]; 810 c = *str++;
811
812 if (c < 0x20)
814 switch (c) 813 switch (c)
815 { 814 {
816 case '\t': 815 case '\t':
817 scr_tab (1); 816 scr_tab (1);
818 continue; 817 continue;
818
819 case '\n': 819 case '\n':
820 if (screen.tlen[row] != -1) /* XXX: think about this */ 820 if (screen.tlen[row] != -1) /* XXX: think about this */
821 MAX_IT (screen.tlen[row], screen.cur.col); 821 MAX_IT (screen.tlen[row], screen.cur.col);
822
822 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
824
823 if (screen.cur.row == screen.bscroll) 825 if (screen.cur.row == screen.bscroll)
824 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
825 else if (screen.cur.row < (TermWin.nrow - 1)) 827 else if (screen.cur.row < (TermWin.nrow - 1))
826 row = (++screen.cur.row) + TermWin.saveLines; 828 row = (++screen.cur.row) + TermWin.saveLines;
829
827 stp = screen.text[row]; /* _must_ refresh */ 830 stp = screen.text[row]; /* _must_ refresh */
828 srp = screen.rend[row]; /* _must_ refresh */ 831 srp = screen.rend[row]; /* _must_ refresh */
829 continue; 832 continue;
833
830 case '\r': 834 case '\r':
831 if (screen.tlen[row] != -1) /* XXX: think about this */ 835 if (screen.tlen[row] != -1) /* XXX: think about this */
832 MAX_IT (screen.tlen[row], screen.cur.col); 836 MAX_IT (screen.tlen[row], screen.cur.col);
837
833 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
834 screen.cur.col = 0; 839 screen.cur.col = 0;
835 continue; 840 continue;
836 default:
837 if (c == 127)
838 continue; /* yummmm..... */
839 break;
840 } 841 }
841 842
842 if (checksel /* see if we're writing within selection */ 843 if (checksel /* see if we're writing within selection */
843 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
844 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 845 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
845 { 846 {
846 checksel = 0; 847 checksel = 0;
847 clearsel = 1; 848 clearsel = 1;
848 } 849 }
850
849 if (screen.flags & Screen_WrapNext) 851 if (screen.flags & Screen_WrapNext)
850 { 852 {
851 screen.tlen[row] = -1; 853 screen.tlen[row] = -1;
852 if (screen.cur.row == screen.bscroll) 854 if (screen.cur.row == screen.bscroll)
853 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
854 else if (screen.cur.row < (TermWin.nrow - 1)) 856 else if (screen.cur.row < (TermWin.nrow - 1))
855 row = (++screen.cur.row) + TermWin.saveLines; 857 row = (++screen.cur.row) + TermWin.saveLines;
858
856 stp = screen.text[row]; /* _must_ refresh */ 859 stp = screen.text[row]; /* _must_ refresh */
857 srp = screen.rend[row]; /* _must_ refresh */ 860 srp = screen.rend[row]; /* _must_ refresh */
858 screen.cur.col = 0; 861 screen.cur.col = 0;
859 screen.flags &= ~Screen_WrapNext; 862 screen.flags &= ~Screen_WrapNext;
860 } 863 }
864
861 if (screen.flags & Screen_Insert) 865 if (screen.flags & Screen_Insert)
862 scr_insdel_chars (1, INSERT); 866 scr_insdel_chars (1, INSERT);
863 867
868 // rely on wcwidth to tell us the character width, at least for non-latin1
869 // do wcwidth before further replacements, as wcwidth says that line-drawing
870 // characters have width -1 (DOH!) on GNU/Linux sometimes.
871 int width = c < 256 ? 1 : wcwidth (c);
872
864 if (charsets[screen.charset] == '0') // DEC SPECIAL 873 if (charsets[screen.charset] == '0') // DEC SPECIAL
865 switch (c)
866 { 874 {
867 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break; 875 // vt100 special graphics and line drawing
868 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break; 876 static uint16_t vt100_0[32] = { // 5f .. 7e
869 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break; 877 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
870 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break; 878 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
871 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break; 879 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
872 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break; 880 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
873 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
874 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
875 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
876 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
877 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
878 } 881 };
879 882
880 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 883 if (c >= 0x5f && c <= 0x7e)
881 // rely on wcwidth to tell us the character width, at least for non-ascii 884 {
882 int width = c <= 128 ? 1 : wcwidth (c); 885 c = vt100_0[c - 0x5f];
886 width = 1;
887 }
888 }
883 889
884 // width -1 characters (e.g. combining chars) are ignored currently.
885 if (width > 0) 890 if (width > 0)
891 {
892#if !UNICODE_3 && ENABLE_COMBINING
893 // trim characters we can't store directly :(
894 if (c >= 0x10000)
895 c = rxvt_composite.compose (c); // map to lower 16 bits
896#endif
897 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
898
886 do 899 do
887 { 900 {
888 stp[screen.cur.col] = c; 901 stp[screen.cur.col] = c;
889 srp[screen.cur.col] = rend; 902 srp[screen.cur.col] = rend;
890 903
891 if (screen.cur.col < last_col - 1) 904 if (screen.cur.col < last_col - 1)
892 screen.cur.col++; 905 screen.cur.col++;
893 else 906 else
894 { 907 {
895 screen.tlen[row] = last_col; 908 screen.tlen[row] = last_col;
896 if (screen.flags & Screen_Autowrap) 909 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 910 screen.flags |= Screen_WrapNext;
898 break; 911 break;
899 } 912 }
900 913
901 c = NOCHAR; 914 c = NOCHAR;
902 } 915 }
903 while (--width > 0); 916 while (--width > 0);
917
918 // pad with spaces when overwriting wide character with smaller one
919 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
920 {
921 stp[c] = ' ';
922 srp[c] = rend;
923 }
924 }
925 else if (width == 0)
926 {
927#if ENABLE_COMBINING
928 // handle combining characters
929 // we just tag the accent on the previous on-screen character.
930 // this is arguably not correct, but also arguably not wrong.
931 // we don't handle double-width characters nicely yet.
932
933 text_t *tp;
934 rend_t *rp;
935
936 if (screen.cur.col > 0)
937 {
938 tp = stp + screen.cur.col - 1;
939 rp = srp + screen.cur.col - 1;
940 }
941 else if (screen.cur.row > 0
942 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
943 {
944 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
945 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
946 }
904 else 947 else
905 (void)0; /* handle combining character etc. here. */ 948 continue;
949
950 // handle double-width-chars by making them look extremely ugly
951 if (*tp == NOCHAR)
952 *tp = ' '; // hack //D //TODO //--tp, --rp;
953
954 // first try to find a precomposed character
955 unicode_t n = rxvt_compose (*tp, c);
956 if (n == NOCHAR)
957 n = rxvt_composite.compose (*tp, c);
958
959 *tp = n;
960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
961#endif
962 }
906 } 963 }
907 964
908 if (screen.tlen[row] != -1) /* XXX: think about this */ 965 if (screen.tlen[row] != -1) /* XXX: think about this */
909 MAX_IT (screen.tlen[row], screen.cur.col); 966 MAX_IT (screen.tlen[row], screen.cur.col);
910 967
… …
956 * XTERM_SEQ: CTRL-I 1013 * XTERM_SEQ: CTRL-I
957 */ 1014 */
958void 1015void
959rxvt_term::scr_tab (int count) 1016rxvt_term::scr_tab (int count)
960{ 1017{
961 int i, x; 1018 int i, x;
962 1019
963 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
964 want_refresh = 1; 1021 want_refresh = 1;
965 i = x = screen.cur.col; 1022 i = x = screen.cur.col;
1023
966 if (count == 0) 1024 if (count == 0)
967 return; 1025 return;
968 else if (count > 0) 1026 else if (count > 0)
969 { 1027 {
970 for (; ++i < TermWin.ncol; ) 1028 for (; ++i < TermWin.ncol; )
… …
972 { 1030 {
973 x = i; 1031 x = i;
974 if (!--count) 1032 if (!--count)
975 break; 1033 break;
976 } 1034 }
1035
977 if (count) 1036 if (count)
978 x = TermWin.ncol - 1; 1037 x = TermWin.ncol - 1;
979 } 1038 }
980 else /* if (count < 0) */ 1039 else /* if (count < 0) */
981 { 1040 {
… …
984 { 1043 {
985 x = i; 1044 x = i;
986 if (!++count) 1045 if (!++count)
987 break; 1046 break;
988 } 1047 }
1048
989 if (count) 1049 if (count)
990 x = 0; 1050 x = 0;
991 } 1051 }
1052
992 if (x != screen.cur.col) 1053 if (x != screen.cur.col)
993 scr_gotorc (0, x, R_RELATIVE); 1054 scr_gotorc (0, x, R_RELATIVE);
994} 1055}
995 1056
996/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1090 else 1151 else
1091 screen.cur.row = row; 1152 screen.cur.row = row;
1092 } 1153 }
1093 MAX_IT (screen.cur.row, 0); 1154 MAX_IT (screen.cur.row, 0);
1094 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1155 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1156
1157 while (screen.cur.col > 0
1158 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1159 screen.cur.col--;
1095} 1160}
1096 1161
1097/* ------------------------------------------------------------------------- */ 1162/* ------------------------------------------------------------------------- */
1098/* 1163/*
1099 * direction should be UP or DN 1164 * direction should be UP or DN
… …
1185 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1186 */ 1251 */
1187void 1252void
1188rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1189{ 1254{
1190 int num; 1255 int num;
1191 int32_t row, row_offset; 1256 int32_t row, row_offset;
1192 rend_t ren; 1257 rend_t ren;
1193 XGCValues gcvalue; 1258 XGCValues gcvalue;
1194 1259
1195 want_refresh = 1; 1260 want_refresh = 1;
1196 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1197 ZERO_SCROLLBACK (); 1262 ZERO_SCROLLBACK ();
1198 row_offset = (int32_t)TermWin.saveLines; 1263 row_offset = (int32_t)TermWin.saveLines;
… …
1217 num = TermWin.nrow; 1282 num = TermWin.nrow;
1218 break; 1283 break;
1219 default: 1284 default:
1220 return; 1285 return;
1221 } 1286 }
1287
1222 refresh_type |= REFRESH_BOUNDS; 1288 refresh_type |= REFRESH_BOUNDS;
1289
1223 if (selection.op && current_screen == selection.screen 1290 if (selection.op && current_screen == selection.screen
1224 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1291 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1225 || (selection.end.row >= row 1292 || (selection.end.row >= row
1226 && selection.end.row <= row + num))) 1293 && selection.end.row <= row + num)))
1227 CLEAR_SELECTION (); 1294 CLEAR_SELECTION ();
1295
1228 if (row >= TermWin.nrow) /* Out Of Bounds */ 1296 if (row >= TermWin.nrow) /* Out Of Bounds */
1229 return; 1297 return;
1298
1230 MIN_IT (num, (TermWin.nrow - row)); 1299 MIN_IT (num, (TermWin.nrow - row));
1300
1231 if (rstyle & (RS_RVid | RS_Uline)) 1301 if (rstyle & (RS_RVid | RS_Uline))
1232 ren = (rend_t) ~RS_None; 1302 ren = (rend_t) ~RS_None;
1233 else if (GET_BASEBG (rstyle) == Color_bg) 1303 else if (GET_BASEBG (rstyle) == Color_bg)
1234 { 1304 {
1235 ren = DEFAULT_RSTYLE; 1305 ren = DEFAULT_RSTYLE;
… …
1242 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1243 ERASE_ROWS (row, num); 1313 ERASE_ROWS (row, num);
1244 gcvalue.foreground = PixColors[Color_fg]; 1314 gcvalue.foreground = PixColors[Color_fg];
1245 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1246 } 1316 }
1317
1247 for (; num--; row++) 1318 for (; num--; row++)
1248 { 1319 {
1249 scr_blank_screen_mem (screen.text, screen.rend, 1320 scr_blank_screen_mem (screen.text, screen.rend,
1250 (unsigned int) (row + row_offset), rstyle); 1321 (unsigned int) (row + row_offset), rstyle);
1251 screen.tlen[row + row_offset] = 0; 1322 screen.tlen[row + row_offset] = 0;
… …
1285 * Insert/Delete <count> lines 1356 * Insert/Delete <count> lines
1286 */ 1357 */
1287void 1358void
1288rxvt_term::scr_insdel_lines (int count, int insdel) 1359rxvt_term::scr_insdel_lines (int count, int insdel)
1289{ 1360{
1290 int end; 1361 int end;
1291 1362
1292 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
1293 1364
1294 selection_check (1); 1365 selection_check (1);
1295 1366
… …
1314 * Insert/Delete <count> characters from the current position 1385 * Insert/Delete <count> characters from the current position
1315 */ 1386 */
1316void 1387void
1317rxvt_term::scr_insdel_chars (int count, int insdel) 1388rxvt_term::scr_insdel_chars (int count, int insdel)
1318{ 1389{
1319 int col, row; 1390 int col, row;
1320 rend_t tr; 1391 rend_t tr;
1321 text_t *stp; 1392 text_t *stp;
1322 rend_t *srp; 1393 rend_t *srp;
1323 int16_t *slp; 1394 int16_t *slp;
1324 1395
1325 want_refresh = 1; 1396 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1397 ZERO_SCROLLBACK ();
1327 1398
1328 if (count <= 0) 1399 if (count <= 0)
… …
1335 screen.flags &= ~Screen_WrapNext; 1406 screen.flags &= ~Screen_WrapNext;
1336 1407
1337 stp = screen.text[row]; 1408 stp = screen.text[row];
1338 srp = screen.rend[row]; 1409 srp = screen.rend[row];
1339 slp = & (screen.tlen[row]); 1410 slp = & (screen.tlen[row]);
1411
1340 switch (insdel) 1412 switch (insdel)
1341 { 1413 {
1342 case INSERT: 1414 case INSERT:
1343 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1344 col--) 1416 col--)
1345 { 1417 {
1346 stp[col] = stp[col - count]; 1418 stp[col] = stp[col - count];
1347 srp[col] = srp[col - count]; 1419 srp[col] = srp[col - count];
1348 } 1420 }
1421
1349 if (*slp != -1) 1422 if (*slp != -1)
1350 { 1423 {
1351 *slp += count; 1424 *slp += count;
1352 MIN_IT (*slp, TermWin.ncol); 1425 MIN_IT (*slp, TermWin.ncol);
1353 } 1426 }
1427
1354 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1355 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1356 { 1430 {
1357 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
1358 || (selection.end.col + count >= TermWin.ncol)) 1432 || (selection.end.col + count >= TermWin.ncol))
… …
1362 selection.beg.col += count; 1436 selection.beg.col += count;
1363 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1364 selection.end.col += count; 1438 selection.end.col += count;
1365 } 1439 }
1366 } 1440 }
1441
1367 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1368 (unsigned int)count, rstyle); 1443 (unsigned int)count, rstyle);
1369 break; 1444 break;
1445
1370 case ERASE: 1446 case ERASE:
1371 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1372 selection_check (1); 1448 selection_check (1);
1373 screen.cur.col -= count; 1449 screen.cur.col -= count;
1374 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1375 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1376 break; 1452 break;
1453
1377 case DELETE: 1454 case DELETE:
1378 tr = srp[TermWin.ncol - 1]
1379 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1456
1380 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1457 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1381 { 1458 {
1382 stp[col] = stp[col + count]; 1459 stp[col] = stp[col + count];
1383 srp[col] = srp[col + count]; 1460 srp[col] = srp[col + count];
1384 } 1461 }
1462
1385 scr_blank_line (& (stp[TermWin.ncol - count]), 1463 scr_blank_line (& (stp[TermWin.ncol - count]),
1386 & (srp[TermWin.ncol - count]), 1464 & (srp[TermWin.ncol - count]),
1387 (unsigned int)count, tr); 1465 (unsigned int)count, tr);
1466
1388 if (*slp == -1) /* break line continuation */ 1467 if (*slp == -1) /* break line continuation */
1389 *slp = TermWin.ncol; 1468 *slp = TermWin.ncol;
1469
1390 *slp -= count; 1470 *slp -= count;
1391 MAX_IT (*slp, 0); 1471 MAX_IT (*slp, 0);
1472
1392 if (selection.op && current_screen == selection.screen 1473 if (selection.op && current_screen == selection.screen
1393 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1474 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1394 { 1475 {
1395 if (selection.end.row != screen.cur.row 1476 if (selection.end.row != screen.cur.row
1396 || (screen.cur.col >= selection.beg.col - count) 1477 || (screen.cur.col >= selection.beg.col - count)
… …
1402 selection.beg.col -= count; 1483 selection.beg.col -= count;
1403 selection.mark.col -= count; /* XXX: yes? */ 1484 selection.mark.col -= count; /* XXX: yes? */
1404 selection.end.col -= count; 1485 selection.end.col -= count;
1405 } 1486 }
1406 } 1487 }
1488
1407 break; 1489 break;
1408 } 1490 }
1409} 1491}
1410 1492
1411/* ------------------------------------------------------------------------- */ 1493/* ------------------------------------------------------------------------- */
… …
1416void 1498void
1417rxvt_term::scr_scroll_region (int top, int bot) 1499rxvt_term::scr_scroll_region (int top, int bot)
1418{ 1500{
1419 MAX_IT (top, 0); 1501 MAX_IT (top, 0);
1420 MIN_IT (bot, (int)TermWin.nrow - 1); 1502 MIN_IT (bot, (int)TermWin.nrow - 1);
1503
1421 if (top > bot) 1504 if (top > bot)
1422 return; 1505 return;
1506
1423 screen.tscroll = top; 1507 screen.tscroll = top;
1424 screen.bscroll = bot; 1508 screen.bscroll = bot;
1425 scr_gotorc (0, 0, 0); 1509 scr_gotorc (0, 0, 0);
1426} 1510}
1427 1511
… …
1885 1969
1886 /* 1970 /*
1887 * C: set the cursor character (s) 1971 * C: set the cursor character (s)
1888 */ 1972 */
1889 { 1973 {
1890 unsigned char setoldcursor; 1974 unsigned char setoldcursor;
1891 rend_t ccol1, /* Cursor colour */ 1975 rend_t ccol1, /* Cursor colour */
1892 ccol2; /* Cursor colour2 */ 1976 ccol2; /* Cursor colour2 */
1893 1977
1894 showcursor = (screen.flags & Screen_VisibleCursor); 1978 showcursor = (screen.flags & Screen_VisibleCursor);
1895#ifdef CURSOR_BLINK 1979#ifdef CURSOR_BLINK
1896 if (hidden_cursor) 1980 if (hidden_cursor)
1897 showcursor = 0; 1981 showcursor = 0;
1898#endif 1982#endif
1899 1983
1900 if (showcursor) 1984 if (showcursor)
1901 { 1985 {
1902 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1903 [screen.cur.col]);
1904 1987
1905 if (showcursor && TermWin.focus) 1988 if (showcursor && TermWin.focus)
1906 { 1989 {
1907 *srp ^= RS_RVid; 1990 *srp ^= RS_RVid;
1908#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
… …
1936 if (screen.cur.row + TermWin.view_start != ocrow 2019 if (screen.cur.row + TermWin.view_start != ocrow
1937 || screen.cur.col != oldcursor.col) 2020 || screen.cur.col != oldcursor.col)
1938 { 2021 {
1939 if (ocrow < TermWin.nrow 2022 if (ocrow < TermWin.nrow
1940 && oldcursor.col < TermWin.ncol) 2023 && oldcursor.col < TermWin.ncol)
1941 {
1942 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1943 } 2025
1944 if (TermWin.focus || !showcursor) 2026 if (TermWin.focus || !showcursor)
1945 oldcursor.row = -1; 2027 oldcursor.row = -1;
1946 else 2028 else
1947 setoldcursor = 1; 2029 setoldcursor = 1;
1948 } 2030 }
1949 } 2031 }
1950 else if (!TermWin.focus) 2032 else if (!TermWin.focus)
1951 setoldcursor = 1; 2033 setoldcursor = 1;
2034
1952 if (setoldcursor) 2035 if (setoldcursor)
1953 { 2036 {
1954 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1955 oldcursor.row = -1; 2038 oldcursor.row = -1;
1956 else 2039 else
… …
1968 */ 2051 */
1969 i = num_scr; 2052 i = num_scr;
1970 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1971 && abs (i) < TermWin.nrow && !must_clear) 2054 && abs (i) < TermWin.nrow && !must_clear)
1972 { 2055 {
1973 int16_t nits; 2056 int16_t nits;
1974 int j; 2057 int j;
1975 rend_t *drp2; 2058 rend_t *drp2;
1976 text_t *dtp2; 2059 text_t *dtp2;
1977 int len, wlen; 2060 int len, wlen;
1978 2061
1979 j = TermWin.nrow; 2062 j = TermWin.nrow;
1980 wlen = len = -1; 2063 wlen = len = -1;
1981 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
1982 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2046 int ypixel = (int)Row2Pixel (row); 2129 int ypixel = (int)Row2Pixel (row);
2047 2130
2048 for (col = 0; col < TermWin.ncol; col++) 2131 for (col = 0; col < TermWin.ncol; col++)
2049 { 2132 {
2050 /* compare new text with old - if exactly the same then continue */ 2133 /* compare new text with old - if exactly the same then continue */
2134 if (stp[col] == dtp[col] /* Must match characters to skip. */
2135 && (srp[col] == drp[col] /* Either rendition the same or */
2136 || (stp[col] == ' ' /* space w/ no background change */
2137 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2138 continue;
2139
2140 // redraw one or more characters
2141
2142 // seek to the beginning if wide characters
2143 while (stp[col] == NOCHAR && col > 0)
2144 --col;
2145
2051 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2146 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2052
2053 if (stp[col] == dtp[col] /* Must match characters to skip. */
2054 && (rend == drp[col] /* Either rendition the same or */
2055 || (stp[col] == ' ' /* space w/ no background change */
2056 && GET_BGATTR (rend) == GET_BGATTR (drp[col]))))
2057 continue;
2058
2059 text_t *text = stp + col; 2147 text_t *text = stp + col;
2060 int count = 1; 2148 int count = 1;
2061 2149
2062 /* redraw one or more characters */
2063
2064 dtp[col] = stp[col]; 2150 dtp[col] = stp[col];
2065 drp[col] = rend; 2151 drp[col] = rend;
2066
2067 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2068 continue;
2069 2152
2070 int xpixel = Col2Pixel (col); 2153 int xpixel = Col2Pixel (col);
2071 2154
2072 // this loop looks very messy, it can probably be optimized 2155 // this loop looks very messy, it can probably be optimized
2073 // and cleaned a bit by you? 2156 // and cleaned a bit by you?
… …
2116 2199
2117 rend = GET_ATTR (rend); 2200 rend = GET_ATTR (rend);
2118 2201
2119 rvid = !!(rend & RS_RVid); 2202 rvid = !!(rend & RS_RVid);
2120 2203
2204#ifndef NO_BOLD_UNDERLINE_REVERSE
2205 if (rend & RS_Bold && fore == Color_fg)
2206 {
2207 if (ISSET_PIXCOLOR (Color_BD))
2208 fore = Color_BD;
2209 else
2210 rvid = !rvid;
2211 }
2212
2213 if (rend & RS_Uline)
2214 if (ISSET_PIXCOLOR (Color_UL))
2215 fore = Color_UL;
2216#endif
2217
2218 if (rvid)
2219 {
2220 SWAP_IT (fore, back, int);
2221
2222#ifndef NO_BOLD_UNDERLINE_REVERSE
2223 if (ISSET_PIXCOLOR (Color_RV)
2224# ifndef NO_CURSORCOLOR
2225 && !ISSET_PIXCOLOR (Color_cursor)
2226# endif
2227 )
2228 back = Color_RV;
2229#endif
2230 }
2231
2121#ifdef TEXT_BLINK 2232#ifdef TEXT_BLINK
2122 if (rend & RS_Blink) 2233 if (rend & RS_Blink && back == Color_bg)
2123 { 2234 {
2124 if (!text_blink_ev.active) 2235 if (!text_blink_ev.active)
2125 { 2236 {
2126 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2237 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2127 hidden_text = 0; 2238 hidden_text = 0;
2128 } 2239 }
2129 else if (hidden_text) 2240 else if (hidden_text)
2130 fore = back; 2241 fore = back;
2131 } 2242 }
2132#endif 2243#endif
2133
2134#ifndef NO_BOLD_UNDERLINE_REVERSE
2135 if (rend & RS_Bold && fore == Color_fg)
2136 {
2137 if (ISSET_PIXCOLOR (Color_BD))
2138 fore = Color_BD;
2139 else
2140 rvid = !rvid;
2141 }
2142
2143 if (rend & RS_Uline)
2144 {
2145 if (ISSET_PIXCOLOR (Color_UL))
2146 fore = Color_UL;
2147 }
2148#endif
2149
2150 if (rvid)
2151 {
2152 SWAP_IT (fore, back, int);
2153
2154#ifndef NO_BOLD_UNDERLINE_REVERSE
2155 if (ISSET_PIXCOLOR (Color_RV)
2156# ifndef NO_CURSORCOLOR
2157 && !ISSET_PIXCOLOR (Color_cursor)
2158# endif
2159 )
2160 back = Color_RV;
2161#endif
2162 }
2163 2244
2164 /* 2245 /*
2165 * Actually do the drawing of the string here 2246 * Actually do the drawing of the string here
2166 */ 2247 */
2167 rxvt_font *font = (*TermWin.fontset)[fid]; 2248 rxvt_font *font = (*TermWin.fontset)[fid];
… …
2189 else 2270 else
2190 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2271 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2191 2272
2192 if ((rend & RS_Uline) && (font->descent > 1)) 2273 if ((rend & RS_Uline) && (font->descent > 1))
2193 XDrawLine (display->display, drawBuffer, TermWin.gc, 2274 XDrawLine (display->display, drawBuffer, TermWin.gc,
2194 xpixel, ypixel + font->ascent + 1, 2275 xpixel, ypixel + font->ascent + 1,
2195 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2276 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2196 } /* for (col....) */ 2277 } /* for (col....) */
2197 } /* for (row....) */ 2278 } /* for (row....) */
2198 2279
2199 /* 2280 /*
2200 * G: cleanup cursor and display outline cursor if necessary 2281 * G: cleanup cursor and display outline cursor if necessary
… …
2220 while (oldcursor.col + cursorwidth < TermWin.ncol 2301 while (oldcursor.col + cursorwidth < TermWin.ncol
2221 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2302 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2222 cursorwidth++; 2303 cursorwidth++;
2223 2304
2224 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2305 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2225 Col2Pixel (oldcursor.col), 2306 Col2Pixel (oldcursor.col),
2226 Row2Pixel (oldcursor.row), 2307 Row2Pixel (oldcursor.row),
2227 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2308 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2228 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2309 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2229 } 2310 }
2230 } 2311 }
2231 2312
2232 /* 2313 /*
2233 * H: cleanup selection 2314 * H: cleanup selection
… …
2241 /* 2322 /*
2242 * clear the whole screen height, note that width == 0 is treated 2323 * clear the whole screen height, note that width == 0 is treated
2243 * specially by XClearArea 2324 * specially by XClearArea
2244 */ 2325 */
2245 XClearArea (display->display, TermWin.vt, 0, 0, 2326 XClearArea (display->display, TermWin.vt, 0, 0,
2246 (unsigned int)TermWin.int_bwidth, 2327 (unsigned int)TermWin.int_bwidth,
2247 (unsigned int)TermWin_TotalHeight (), False); 2328 (unsigned int)TermWin_TotalHeight (), False);
2329
2248 if (clearlast && TermWin.int_bwidth) 2330 if (clearlast && TermWin.int_bwidth)
2249 /* 2331 /*
2250 * clear the whole screen height, note that width == 0 is treated 2332 * clear the whole screen height, note that width == 0 is treated
2251 * specially by XClearArea 2333 * specially by XClearArea
2252 */ 2334 */
2253 XClearArea (display->display, TermWin.vt, 2335 XClearArea (display->display, TermWin.vt,
2254 TermWin.width + TermWin.int_bwidth, 0, 2336 TermWin.width + TermWin.int_bwidth, 0,
2255 (unsigned int)TermWin.int_bwidth, 2337 (unsigned int)TermWin.int_bwidth,
2256 (unsigned int)TermWin_TotalHeight (), False); 2338 (unsigned int)TermWin_TotalHeight (), False);
2339
2257 if (refresh_type & SMOOTH_REFRESH) 2340 if (refresh_type & SMOOTH_REFRESH)
2258 XSync (display->display, False); 2341 XSync (display->display, False);
2259 2342
2260 num_scr = 0; 2343 num_scr = 0;
2261 num_scr_allow = 1; 2344 num_scr_allow = 1;
… …
2285 } 2368 }
2286} 2369}
2287 2370
2288/* ------------------------------------------------------------------------- */ 2371/* ------------------------------------------------------------------------- */
2289void 2372void
2290rxvt_term::scr_clear () 2373rxvt_term::scr_clear (bool really)
2291{ 2374{
2292 if (!TermWin.mapped) 2375 if (!TermWin.mapped)
2293 return; 2376 return;
2294 2377
2295 num_scr_allow = 0; 2378 num_scr_allow = 0;
2296 want_refresh = 1; 2379 want_refresh = 1;
2380
2297#ifdef TRANSPARENT 2381#ifdef TRANSPARENT
2298 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2382 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2299 { 2383 {
2300 int i; 2384 int i;
2301 2385
… …
2308 if (TermWin.parent[i] != None) 2392 if (TermWin.parent[i] != None)
2309 XClearWindow (display->display, TermWin.parent[i]); 2393 XClearWindow (display->display, TermWin.parent[i]);
2310 } 2394 }
2311#endif 2395#endif
2312 2396
2397 if (really)
2313 XClearWindow (display->display, TermWin.vt); 2398 XClearWindow (display->display, TermWin.vt);
2314} 2399}
2315 2400
2316/* ------------------------------------------------------------------------- */ 2401/* ------------------------------------------------------------------------- */
2317void 2402void
2318rxvt_term::scr_reverse_selection () 2403rxvt_term::scr_reverse_selection ()
2319{ 2404{
2320 int i, col, row, end_row;
2321 rend_t *srp;
2322
2323 if (selection.op && current_screen == selection.screen) 2405 if (selection.op && current_screen == selection.screen)
2324 { 2406 {
2325 end_row = TermWin.saveLines - TermWin.view_start; 2407 int end_row = TermWin.saveLines - TermWin.view_start;
2326 i = selection.beg.row + TermWin.saveLines; 2408 int i = selection.beg.row + TermWin.saveLines;
2327 row = selection.end.row + TermWin.saveLines; 2409 int col, row = selection.end.row + TermWin.saveLines;
2410 rend_t *srp;
2411
2328 if (i >= end_row) 2412 if (i >= end_row)
2329 col = selection.beg.col; 2413 col = selection.beg.col;
2330 else 2414 else
2331 { 2415 {
2332 col = 0; 2416 col = 0;
2333 i = end_row; 2417 i = end_row;
2334 } 2418 }
2419
2335 end_row += TermWin.nrow; 2420 end_row += TermWin.nrow;
2336 for (; i < row && i < end_row; i++, col = 0) 2421 for (; i < row && i < end_row; i++, col = 0)
2337 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2422 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2338 srp[col] ^= RS_RVid; 2423 srp[col] ^= RS_RVid;
2424
2339 if (i == row && i < end_row) 2425 if (i == row && i < end_row)
2340 for (srp = screen.rend[i]; col < selection.end.col; col++) 2426 for (srp = screen.rend[i]; col < selection.end.col; col++)
2341 srp[col] ^= RS_RVid; 2427 srp[col] ^= RS_RVid;
2342 } 2428 }
2343} 2429}
… …
2482 } 2568 }
2483 2569
2484 for (;;) 2570 for (;;)
2485 { 2571 {
2486 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2572 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2487 (long) (PROP_SIZE / 4), delete_prop, 2573 (long) (PROP_SIZE / 4), delete_prop,
2488 AnyPropertyType, &ct.encoding, &ct.format, 2574 AnyPropertyType, &ct.encoding, &ct.format,
2489 &ct.nitems, &bytes_after, 2575 &ct.nitems, &bytes_after,
2490 &ct.value) != Success) 2576 &ct.value) != Success)
2491 break; 2577 break;
2492 2578
2493 if (ct.encoding == 0) 2579 if (ct.encoding == 0)
2494 { 2580 {
2495 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2581 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
… …
2503 } 2589 }
2504 2590
2505 if (ct.nitems == 0) 2591 if (ct.nitems == 0)
2506 { 2592 {
2507 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2593 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2594
2508 if (selection_wait == Sel_normal && nread == 0) 2595 if (selection_wait == Sel_normal && nread == 0
2596 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2509 { 2597 {
2510 /* 2598 /*
2511 * pass through again trying CUT_BUFFER0 if we've come from 2599 * pass through again trying CUT_BUFFER0 if we've come from
2512 * XConvertSelection () but nothing was presented 2600 * XConvertSelection () but nothing was presented
2513 */ 2601 */
… …
2553void 2641void
2554rxvt_term::incr_cb (time_watcher &w) 2642rxvt_term::incr_cb (time_watcher &w)
2555{ 2643{
2556 selection_wait = Sel_none; 2644 selection_wait = Sel_none;
2557 2645
2558 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2646 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2559} 2647}
2560 2648
2561/* 2649/*
2562 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2563 */ 2651 */
… …
2566{ 2654{
2567 int reget_time = 0; 2655 int reget_time = 0;
2568 2656
2569 if (prop == None) 2657 if (prop == None)
2570 return; 2658 return;
2659
2571 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop)); 2660 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2572 if (selection_wait == Sel_normal) 2661 if (selection_wait == Sel_normal)
2573 { 2662 {
2574 int a, afmt; 2663 int a, afmt;
2575 Atom atype; 2664 Atom atype;
2576 unsigned long bytes_after, nitems; 2665 unsigned long bytes_after, nitems;
2577 unsigned char *s = NULL; 2666 unsigned char *s = NULL;
2578 2667
2579 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2668 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2580 xa[XA_INCR], &atype, &afmt, &nitems, 2669 xa[XA_INCR], &atype, &afmt, &nitems,
2581 &bytes_after, &s); 2670 &bytes_after, &s);
2582 if (s) 2671 if (s)
2583 XFree (s); 2672 XFree (s);
2584 if (a != Success) 2673 if (a != Success)
2585 return; 2674 return;
2675
2586#ifndef __CYGWIN32__ 2676#ifndef __CYGWIN32__
2587 if (atype == xa[XA_INCR]) 2677 if (atype == xa[XA_INCR])
2588 { /* start an INCR transfer */ 2678 { /* start an INCR transfer */
2589 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2590 XDeleteProperty (display->display, win, prop); 2680 XDeleteProperty (display->display, win, prop);
… …
2596 2686
2597 } 2687 }
2598 else if (selection_wait == Sel_incr) 2688 else if (selection_wait == Sel_incr)
2599 { 2689 {
2600 reget_time = 1; 2690 reget_time = 1;
2691
2601 if (selection_paste (win, prop, True) == -1) 2692 if (selection_paste (win, prop, True) == -1)
2602 { 2693 {
2603 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2694 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2604 selection_wait = Sel_none; 2695 selection_wait = Sel_none;
2605 incr_ev.stop (); 2696 incr_ev.stop ();
2606 } 2697 }
2607 } 2698 }
2608 if (reget_time) /* received more data so reget time */ 2699 if (reget_time) /* received more data so reget time */
2609 incr_ev.start (NOW + 10); 2700 incr_ev.start (NOW + 10);
2610} 2701}
2702
2611/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2612/* 2704/*
2613 * Request the current selection: 2705 * Request the current selection:
2614 * Order: > internal selection if available 2706 * Order: > internal selection if available
2615 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2707 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2620 */ 2712 */
2621void 2713void
2622rxvt_term::selection_request (Time tm, int x, int y) 2714rxvt_term::selection_request (Time tm, int x, int y)
2623{ 2715{
2624 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2716 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2717
2625 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2718 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2626 return; /* outside window */ 2719 return; /* outside window */
2627 2720
2628 if (selection.text != NULL) 2721 if (selection.text)
2629 { /* internal selection */ 2722 { /* internal selection */
2630 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2723 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2631 paste (selection.text, selection.len); 2724 char *str = rxvt_wcstombs (selection.text, selection.len);
2725 paste ((unsigned char *)str, strlen (str));
2726 free (str);
2632 return; 2727 return;
2633 } 2728 }
2634 else 2729 else
2635 { 2730 {
2636 int i; 2731 int i;
2637 2732
2638 selection_request_time = tm; 2733 selection_request_time = tm;
2639 selection_wait = Sel_normal; 2734 selection_wait = Sel_normal;
2735
2640 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2736 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2641 { 2737 {
2642#if X_HAVE_UTF8_STRING 2738#if X_HAVE_UTF8_STRING
2643 selection_type = Sel_UTF8String; 2739 selection_type = Sel_UTF8String;
2644 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2740 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2649 return; 2745 return;
2650#endif 2746#endif
2651 2747
2652 } 2748 }
2653 } 2749 }
2750
2654 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2751 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2655 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2752 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 selection_paste (display->root, XA_CUT_BUFFER0, False); 2753 selection_paste (display->root, XA_CUT_BUFFER0, False);
2657} 2754}
2658 2755
2659int 2756int
2660rxvt_term::selection_request_other (Atom target, int selnum) 2757rxvt_term::selection_request_other (Atom target, int selnum)
2661{ 2758{
2662 Atom sel; 2759 Atom sel;
2663#ifdef DEBUG_SELECT 2760#ifdef DEBUG_SELECT
2664 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2761 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2665#endif 2762#endif
2666 2763
2667 selection_type |= selnum; 2764 selection_type |= selnum;
2765
2668 if (selnum == Sel_Primary) 2766 if (selnum == Sel_Primary)
2669 sel = XA_PRIMARY; 2767 sel = XA_PRIMARY;
2670 else if (selnum == Sel_Secondary) 2768 else if (selnum == Sel_Secondary)
2671 sel = XA_SECONDARY; 2769 sel = XA_SECONDARY;
2672 else 2770 else
2673 sel = xa[XA_CLIPBOARD]; 2771 sel = xa[XA_CLIPBOARD];
2772
2674 if (XGetSelectionOwner (display->display, sel) != None) 2773 if (XGetSelectionOwner (display->display, sel) != None)
2675 { 2774 {
2676 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2775 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2677 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2776 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2678 TermWin.vt, selection_request_time); 2777 TermWin.vt, selection_request_time);
2679 return 1; 2778 return 1;
2680 } 2779 }
2780
2681 return 0; 2781 return 0;
2682} 2782}
2683 2783
2684/* ------------------------------------------------------------------------- */ 2784/* ------------------------------------------------------------------------- */
2685/* 2785/*
… …
2694 want_refresh = 1; 2794 want_refresh = 1;
2695 free (selection.text); 2795 free (selection.text);
2696 selection.text = NULL; 2796 selection.text = NULL;
2697 selection.len = 0; 2797 selection.len = 0;
2698 CLEAR_SELECTION (); 2798 CLEAR_SELECTION ();
2799
2800 if (display->selection_owner == this)
2801 display->selection_owner = 0;
2699} 2802}
2700 2803
2701/* ------------------------------------------------------------------------- */ 2804/* ------------------------------------------------------------------------- */
2702/* 2805/*
2703 * Copy a selection into the cut buffer 2806 * Copy a selection into the cut buffer
2704 * EXT: button 1 or 3 release 2807 * EXT: button 1 or 3 release
2705 */ 2808 */
2706void 2809void
2707rxvt_term::selection_make (Time tm) 2810rxvt_term::selection_make (Time tm)
2708{ 2811{
2709 int i, col, end_col, row, end_row; 2812 int i, col, end_col, row, end_row;
2710 unsigned char *new_selection_text; 2813 wchar_t *new_selection_text;
2711 char *str;
2712 text_t *t; 2814 text_t *t;
2713#ifdef ACS_ASCII
2714 rend_t *re;
2715#endif
2716 2815
2717 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); 2816 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2718 switch (selection.op) 2817 switch (selection.op)
2719 { 2818 {
2720 case SELECTION_CONT: 2819 case SELECTION_CONT:
… …
2726 selection.op = SELECTION_DONE; 2825 selection.op = SELECTION_DONE;
2727 /* FALLTHROUGH */ 2826 /* FALLTHROUGH */
2728 default: 2827 default:
2729 return; 2828 return;
2730 } 2829 }
2830
2731 selection.op = SELECTION_DONE; 2831 selection.op = SELECTION_DONE;
2732 2832
2733 if (selection.clicks == 4) 2833 if (selection.clicks == 4)
2734 return; /* nothing selected, go away */ 2834 return; /* nothing selected, go away */
2735 2835
2736 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2836 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2737 str = (char *)rxvt_malloc (i * MB_CUR_MAX + 1); 2837 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2738
2739 new_selection_text = (unsigned char *)str;
2740 2838
2741 col = selection.beg.col; 2839 col = selection.beg.col;
2742 MAX_IT (col, 0); 2840 MAX_IT (col, 0);
2743 row = selection.beg.row + TermWin.saveLines; 2841 row = selection.beg.row + TermWin.saveLines;
2744 end_row = selection.end.row + TermWin.saveLines; 2842 end_row = selection.end.row + TermWin.saveLines;
2843 int ofs = 0;
2844 int extra = 0;
2745 2845
2746 for (; row <= end_row; row++, col = 0) 2846 for (; row <= end_row; row++, col = 0)
2747 { 2847 {
2748 t = & (screen.text[row][col]); 2848 t = &(screen.text[row][col]);
2749 2849
2750 end_col = screen.tlen[row]; 2850 end_col = screen.tlen[row];
2751 2851
2752 if (end_col == -1) 2852 if (end_col == -1)
2753 end_col = TermWin.ncol; 2853 end_col = TermWin.ncol;
2754 2854
2755 if (row == end_row) 2855 if (row == end_row)
2756 MIN_IT (end_col, selection.end.col); 2856 MIN_IT (end_col, selection.end.col);
2757 2857
2758 for (; col < end_col; col++) 2858 for (; col < end_col; col++)
2859 {
2759 if (*t == NOCHAR) 2860 if (*t == NOCHAR)
2760 t++; 2861 t++;
2862#if ENABLE_COMBINING
2863 else if (IS_COMPOSE (*t))
2864 {
2865 int len = rxvt_composite.expand (*t, 0);
2866
2867 extra -= (len - 1);
2868
2869 if (extra < 0)
2870 {
2871 extra += i;
2872 i += i;
2873 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2874 }
2875
2876 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2877 }
2878#endif
2761 else 2879 else
2762 { 2880 new_selection_text[ofs++] = *t++;
2763 int len = wctomb (str, *t++);
2764 if (len > 0)
2765 str += len;
2766 } 2881 }
2767 2882
2768 if (screen.tlen[row] != -1 && row != end_row) 2883 if (screen.tlen[row] != -1 && row != end_row)
2769 *str++ = '\n'; 2884 new_selection_text[ofs++] = L'\n';
2770 } 2885 }
2771 2886
2772#ifndef NO_OLD_SELECTION
2773 if (selection_style == OLD_SELECT)
2774 if (end_col == TermWin.ncol)
2775 *str++ = '\n';
2776#endif
2777#ifndef NO_NEW_SELECTION
2778 if (selection_style != OLD_SELECT)
2779 if (end_col != selection.end.col) 2887 if (end_col != selection.end.col)
2780 *str++ = '\n'; 2888 new_selection_text[ofs++] = L'\n';
2781#endif
2782 *str = '\0';
2783 2889
2784 i = str - (char *)new_selection_text; 2890 new_selection_text[ofs] = 0;
2891
2785 if (i == 0) 2892 if (ofs == 0)
2786 { 2893 {
2787 free (new_selection_text); 2894 free (new_selection_text);
2788 return; 2895 return;
2789 } 2896 }
2790 2897
2791 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2792 if (str - (char *)new_selection_text > 1024)
2793 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2794
2795 selection.len = i;
2796
2797 if (selection.text)
2798 free (selection.text); 2898 free (selection.text);
2799 2899
2800 selection.text = new_selection_text; 2900 // we usually allocate much more than necessary, so realloc it smaller again
2901 selection.len = ofs;
2902 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2801 2903
2802 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2904 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2803 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2905 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2804 display->set_selection_owner (this); 2906 display->set_selection_owner (this);
2805 else 2907 else
2806 rxvt_print_error ("can't get primary selection"); 2908 rxvt_warn ("can't get primary selection, ignoring.\n");
2807 2909
2808 { 2910#if 0
2809 XTextProperty ct; 2911 XTextProperty ct;
2810 char *cl = (char *)selection.text;
2811 2912
2812 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2913 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2813 { 2914 {
2814 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2815 PropModeReplace, ct.value, ct.nitems);
2816 XFree (ct.value);
2817 }
2818 else
2819 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2915 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2820 PropModeReplace, selection.text, (int)selection.len); 2916 PropModeReplace, ct.value, ct.nitems);
2917 XFree (ct.value);
2821 } 2918 }
2919#endif
2822 2920
2823 selection_time = tm; 2921 selection_time = tm;
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2922 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2825} 2923}
2826 2924
… …
2855rxvt_term::selection_start_colrow (int col, int row) 2953rxvt_term::selection_start_colrow (int col, int row)
2856{ 2954{
2857 want_refresh = 1; 2955 want_refresh = 1;
2858 selection.mark.col = col; 2956 selection.mark.col = col;
2859 selection.mark.row = row - TermWin.view_start; 2957 selection.mark.row = row - TermWin.view_start;
2958
2860 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2959 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2861 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2960 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2862 MAX_IT (selection.mark.col, 0); 2961 MAX_IT (selection.mark.col, 0);
2863 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2962 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2864 2963
2964 while (selection.mark.col > 0
2965 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2966 --selection.mark.col;
2967
2865 if (selection.op) 2968 if (selection.op)
2866 { /* clear the old selection */ 2969 { /* clear the old selection */
2867 selection.beg.row = selection.end.row = selection.mark.row; 2970 selection.beg.row = selection.end.row = selection.mark.row;
2868 selection.beg.col = selection.end.col = selection.mark.col; 2971 selection.beg.col = selection.end.col = selection.mark.col;
2869 } 2972 }
2973
2870 selection.op = SELECTION_INIT; 2974 selection.op = SELECTION_INIT;
2871 selection.screen = current_screen; 2975 selection.screen = current_screen;
2872} 2976}
2873 2977
2874/* ------------------------------------------------------------------------- */ 2978/* ------------------------------------------------------------------------- */
… …
2876 * Word select: select text for 2 clicks 2980 * Word select: select text for 2 clicks
2877 * We now only find out the boundary in one direction 2981 * We now only find out the boundary in one direction
2878 */ 2982 */
2879 2983
2880/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2984/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2881#define DELIMIT_TEXT(x) \ 2985#define DELIMIT_TEXT(x) \
2882 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2986 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2883#define DELIMIT_REND(x) 1 2987#define DELIMIT_REND(x) 1
2884 2988
2885void 2989void
2886rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2990rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2887{ 2991{
2888 int col, row, dirnadd, tcol, trow, w1, w2; 2992 int col, row, dirnadd, tcol, trow, w1, w2;
2889 row_col_t bound; 2993 row_col_t bound;
2890 text_t *stp; 2994 text_t *stp;
2891 rend_t *srp; 2995 rend_t *srp;
2892 2996
2893 if (dirn == UP) 2997 if (dirn == UP)
2894 { 2998 {
2895 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2999 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2896 bound.col = 0; 3000 bound.col = 0;
… …
2900 { 3004 {
2901 bound.row = TermWin.saveLines + TermWin.nrow; 3005 bound.row = TermWin.saveLines + TermWin.nrow;
2902 bound.col = TermWin.ncol - 1; 3006 bound.col = TermWin.ncol - 1;
2903 dirnadd = 1; 3007 dirnadd = 1;
2904 } 3008 }
3009
2905 row = mark->row + TermWin.saveLines; 3010 row = mark->row + TermWin.saveLines;
2906 col = mark->col; 3011 col = mark->col;
2907 MAX_IT (col, 0); 3012 MAX_IT (col, 0);
2908 /* find the edge of a word */ 3013 /* find the edge of a word */
2909 stp = & (screen.text[row][col]); 3014 stp = & (screen.text[row][col]);
2910 w1 = DELIMIT_TEXT (*stp); 3015 w1 = DELIMIT_TEXT (*stp);
2911 3016
2912 if (selection_style != NEW_SELECT)
2913 {
2914 if (w1 == 1)
2915 {
2916 stp += dirnadd;
2917 if (DELIMIT_TEXT (*stp) == 1)
2918 goto Old_Word_Selection_You_Die;
2919 col += dirnadd;
2920 }
2921 w1 = 0;
2922 }
2923 srp = (&screen.rend[row][col]); 3017 srp = (&screen.rend[row][col]);
2924 w2 = DELIMIT_REND (*srp); 3018 w2 = DELIMIT_REND (*srp);
2925 3019
2926 for (;;) 3020 for (;;)
2927 { 3021 {
2928 for (; col != bound.col; col += dirnadd) 3022 for (; col != bound.col; col += dirnadd)
2929 { 3023 {
2930 stp += dirnadd; 3024 stp += dirnadd;
3025 srp += dirnadd;
3026
3027 if (*stp == NOCHAR)
3028 continue;
3029
2931 if (DELIMIT_TEXT (*stp) != w1) 3030 if (DELIMIT_TEXT (*stp) != w1)
2932 break; 3031 break;
2933 srp += dirnadd;
2934 if (DELIMIT_REND (*srp) != w2) 3032 if (DELIMIT_REND (*srp) != w2)
2935 break; 3033 break;
2936 } 3034 }
3035
2937 if ((col == bound.col) && (row != bound.row)) 3036 if ((col == bound.col) && (row != bound.row))
2938 { 3037 {
2939 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3038 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2940 { 3039 {
2941 trow = row + dirnadd; 3040 trow = row + dirnadd;
2942 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3041 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3042
2943 if (screen.text[trow] == NULL) 3043 if (screen.text[trow] == NULL)
2944 break; 3044 break;
3045
2945 stp = & (screen.text[trow][tcol]); 3046 stp = & (screen.text[trow][tcol]);
2946 srp = & (screen.rend[trow][tcol]); 3047 srp = & (screen.rend[trow][tcol]);
3048
2947 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3049 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2948 break; 3050 break;
3051
2949 row = trow; 3052 row = trow;
2950 col = tcol; 3053 col = tcol;
2951 continue; 3054 continue;
2952 } 3055 }
2953 } 3056 }
2954 break; 3057 break;
2955 } 3058 }
3059
2956Old_Word_Selection_You_Die: 3060Old_Word_Selection_You_Die:
2957 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)); 3061 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));
2958 3062
2959 if (dirn == DN) 3063 if (dirn == DN)
2960 col++; /* put us on one past the end */ 3064 col++; /* put us on one past the end */
… …
2982 MAX_IT (row, 0); 3086 MAX_IT (row, 0);
2983 MIN_IT (row, (int)TermWin.nrow - 1); 3087 MIN_IT (row, (int)TermWin.nrow - 1);
2984 MAX_IT (col, 0); 3088 MAX_IT (col, 0);
2985 MIN_IT (col, (int)TermWin.ncol); 3089 MIN_IT (col, (int)TermWin.ncol);
2986 3090
2987#ifndef NO_NEW_SELECTION
2988 /* 3091 /*
2989 * If we're selecting characters (single click) then we must check first 3092 * If we're selecting characters (single click) then we must check first
2990 * if we are at the same place as the original mark. If we are then 3093 * if we are at the same place as the original mark. If we are then
2991 * select nothing. Otherwise, if we're to the right of the mark, you have to 3094 * select nothing. Otherwise, if we're to the right of the mark, you have to
2992 * be _past_ a character for it to be selected. 3095 * be _past_ a character for it to be selected.
2993 */ 3096 */
2994 if (selection_style != OLD_SELECT)
2995 {
2996 if (((selection.clicks % 3) == 1) && !flag 3097 if (((selection.clicks % 3) == 1) && !flag
2997 && (col == selection.mark.col 3098 && (col == selection.mark.col
2998 && (row == selection.mark.row + TermWin.view_start))) 3099 && (row == selection.mark.row + TermWin.view_start)))
2999 { 3100 {
3000 /* select nothing */ 3101 /* select nothing */
3001 selection.beg.row = selection.end.row = 0; 3102 selection.beg.row = selection.end.row = 0;
3002 selection.beg.col = selection.end.col = 0; 3103 selection.beg.col = selection.end.col = 0;
3003 selection.clicks = 4; 3104 selection.clicks = 4;
3004 want_refresh = 1; 3105 want_refresh = 1;
3005 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3106 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3006 return; 3107 return;
3007 }
3008 } 3108 }
3009#endif 3109
3010 if (selection.clicks == 4) 3110 if (selection.clicks == 4)
3011 selection.clicks = 1; 3111 selection.clicks = 1;
3012 3112
3013 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3113 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3014 flag == 1 ? 1 : 0, /* ? button press */ 3114 flag == 1 ? 1 : 0, /* ? button press */
… …
3068 pos.col = col; 3168 pos.col = col;
3069 pos.row = row; 3169 pos.row = row;
3070 3170
3071 pos.row -= TermWin.view_start; /* adjust for scroll */ 3171 pos.row -= TermWin.view_start; /* adjust for scroll */
3072 3172
3073#ifndef NO_OLD_SELECTION
3074 /*
3075 * This mimics some of the selection behaviour of version 2.20 and before.
3076 * There are no ``selection modes'', button3 is always character extension.
3077 * Note: button3 drag is always available, c.f. v2.20
3078 * Selection always terminates (left or right as appropriate) at the mark.
3079 */
3080 if (selection_style == OLD_SELECT)
3081 {
3082 if (selection.clicks == 1 || button3)
3083 {
3084 if (hate_those_clicks)
3085 {
3086 hate_those_clicks = 0;
3087 if (selection.clicks == 1)
3088 {
3089 selection.beg.row = selection.mark.row;
3090 selection.beg.col = selection.mark.col;
3091 }
3092 else
3093 {
3094 selection.mark.row = selection.beg.row;
3095 selection.mark.col = selection.beg.col;
3096 }
3097 }
3098 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3099 {
3100 selection.end.row = selection.mark.row;
3101 selection.end.col = selection.mark.col + 1;
3102 selection.beg.row = pos.row;
3103 selection.beg.col = pos.col;
3104 }
3105 else
3106 {
3107 selection.beg.row = selection.mark.row;
3108 selection.beg.col = selection.mark.col;
3109 selection.end.row = pos.row;
3110 selection.end.col = pos.col + 1;
3111 }
3112 }
3113 else if (selection.clicks == 2)
3114 {
3115 selection_delimit_word (UP, & (selection.mark),
3116 & (selection.beg));
3117 selection_delimit_word (DN, & (selection.mark),
3118 & (selection.end));
3119 hate_those_clicks = 1;
3120 }
3121 else if (selection.clicks == 3)
3122 {
3123 selection.beg.row = selection.end.row = selection.mark.row;
3124 selection.beg.col = 0;
3125 selection.end.col = ncol;
3126 hate_those_clicks = 1;
3127 }
3128 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));
3129 return;
3130 }
3131#endif /* ! NO_OLD_SELECTION */
3132#ifndef NO_NEW_SELECTION
3133 /* selection_style must not be OLD_SELECT to get here */
3134 /* 3173 /*
3135 * This is mainly xterm style selection with a couple of differences, mainly 3174 * This is mainly xterm style selection with a couple of differences, mainly
3136 * in the way button3 drag extension works. 3175 * in the way button3 drag extension works.
3137 * We're either doing: button1 drag; button3 press; or button3 drag 3176 * We're either doing: button1 drag; button3 press; or button3 drag
3138 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3177 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3143 * a point/word/line which is either the start or end of the selection 3182 * a point/word/line which is either the start or end of the selection
3144 * and it was decided by whichever point/word/line was `fixed' at the 3183 * and it was decided by whichever point/word/line was `fixed' at the
3145 * time of the most recent button3 press 3184 * time of the most recent button3 press
3146 */ 3185 */
3147 if (button3 && buttonpress) 3186 if (button3 && buttonpress)
3148 { /* button3 press */ 3187 { /* button3 press */
3149 /* 3188 /*
3150 * first determine which edge of the selection we are closest to 3189 * first determine which edge of the selection we are closest to
3151 */ 3190 */
3152 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3191 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3153 || (!ROWCOL_IS_AFTER (pos, selection.end) 3192 || (!ROWCOL_IS_AFTER (pos, selection.end)
3154 && (((pos.col - selection.beg.col) 3193 && (((pos.col - selection.beg.col)
3155 + ((pos.row - selection.beg.row) * ncol)) 3194 + ((pos.row - selection.beg.row) * ncol))
3156 < ((selection.end.col - pos.col) 3195 < ((selection.end.col - pos.col)
3157 + ((selection.end.row - pos.row) * ncol))))) 3196 + ((selection.end.row - pos.row) * ncol)))))
3158 closeto = LEFT; 3197 closeto = LEFT;
3198
3159 if (closeto == LEFT) 3199 if (closeto == LEFT)
3160 { 3200 {
3161 selection.beg.row = pos.row; 3201 selection.beg.row = pos.row;
3162 selection.beg.col = pos.col; 3202 selection.beg.col = pos.col;
3163 selection.mark.row = selection.end.row; 3203 selection.mark.row = selection.end.row;
3164 selection.mark.col = selection.end.col 3204 selection.mark.col = selection.end.col - (selection.clicks == 2);
3165 - (selection.clicks == 2);
3166 } 3205 }
3167 else 3206 else
3168 { 3207 {
3169 selection.end.row = pos.row; 3208 selection.end.row = pos.row;
3170 selection.end.col = pos.col; 3209 selection.end.col = pos.col;
3171 selection.mark.row = selection.beg.row; 3210 selection.mark.row = selection.beg.row;
3172 selection.mark.col = selection.beg.col; 3211 selection.mark.col = selection.beg.col;
3173 } 3212 }
3174 } 3213 }
3175 else 3214 else
3176 { /* button1 drag or button3 drag */ 3215 { /* button1 drag or button3 drag */
3177 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3216 if (ROWCOL_IS_AFTER (selection.mark, pos))
3178 { 3217 {
3179 if ((selection.mark.row == selection.end.row) 3218 if ((selection.mark.row == selection.end.row)
3180 && (selection.mark.col == selection.end.col) 3219 && (selection.mark.col == selection.end.col)
3181 && clickchange && selection.clicks == 2) 3220 && clickchange && selection.clicks == 2)
3182 selection.mark.col--; 3221 selection.mark.col--;
3222
3183 selection.beg.row = pos.row; 3223 selection.beg.row = pos.row;
3184 selection.beg.col = pos.col; 3224 selection.beg.col = pos.col;
3185 selection.end.row = selection.mark.row; 3225 selection.end.row = selection.mark.row;
3186 selection.end.col = selection.mark.col 3226 selection.end.col = selection.mark.col + (selection.clicks == 2);
3187 + (selection.clicks == 2);
3188 } 3227 }
3189 else 3228 else
3190 { 3229 {
3191 selection.beg.row = selection.mark.row; 3230 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col; 3231 selection.beg.col = selection.mark.col;
… …
3196 } 3235 }
3197 3236
3198 if (selection.clicks == 1) 3237 if (selection.clicks == 1)
3199 { 3238 {
3200 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3239 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3240
3201 if (end_col != -1 && selection.beg.col > end_col) 3241 if (end_col != -1 && selection.beg.col > end_col)
3202 { 3242 {
3203#if 1 3243#if 1
3204 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3205#else 3245#else
3206 if (selection.beg.row != selection.end.row) 3246 if (selection.beg.row != selection.end.row)
3207 selection.beg.col = ncol; 3247 selection.beg.col = ncol;
3208 else 3248 else
3209 selection.beg.col = selection.mark.col; 3249 selection.beg.col = selection.mark.col;
3210#endif 3250#endif
3211
3212 } 3251 }
3252
3213 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3253 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3254
3214 if (end_col != -1 && selection.end.col > end_col) 3255 if (end_col != -1 && selection.end.col > end_col)
3215 selection.end.col = ncol; 3256 selection.end.col = ncol;
3216
3217 } 3257 }
3218 else if (selection.clicks == 2) 3258 else if (selection.clicks == 2)
3219 { 3259 {
3220 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3260 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3221 selection.end.col--; 3261 selection.end.col--;
3262
3222 selection_delimit_word (UP, & (selection.beg), 3263 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 & (selection.beg));
3224 selection_delimit_word (DN, & (selection.end), 3264 selection_delimit_word (DN, & (selection.end), & (selection.end));
3225 & (selection.end));
3226 } 3265 }
3227 else if (selection.clicks == 3) 3266 else if (selection.clicks == 3)
3228 { 3267 {
3229#ifndef NO_FRILLS 3268#ifndef NO_FRILLS
3230 if ((Options & Opt_tripleclickwords)) 3269 if ((Options & Opt_tripleclickwords))
3231 { 3270 {
3232 int end_row; 3271 int end_row;
3233 3272
3234 selection_delimit_word (UP, & (selection.beg), 3273 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3235 & (selection.beg));
3236 end_row = screen.tlen[selection.mark.row 3274 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3237 + TermWin.saveLines]; 3275
3238 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3276 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3239 end_row++)
3240 { 3277 {
3241 end_col = screen.tlen[end_row + TermWin.saveLines]; 3278 end_col = screen.tlen[end_row + TermWin.saveLines];
3279
3242 if (end_col != -1) 3280 if (end_col != -1)
3243 { 3281 {
3244 selection.end.row = end_row; 3282 selection.end.row = end_row;
3245 selection.end.col = end_col; 3283 selection.end.col = end_col;
3246 selection_remove_trailing_spaces (); 3284 selection_remove_trailing_spaces ();
… …
3248 } 3286 }
3249 } 3287 }
3250 } 3288 }
3251 else 3289 else
3252#endif 3290#endif
3253
3254 { 3291 {
3255 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3292 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3256 selection.mark.col++; 3293 selection.mark.col++;
3257 selection.beg.col = 0; 3294 selection.beg.col = 0;
3258 selection.end.col = ncol; 3295 selection.end.col = ncol;
3259 } 3296 }
3260 } 3297 }
3298
3261 if (button3 && buttonpress) 3299 if (button3 && buttonpress)
3262 { /* mark may need to be changed */ 3300 { /* mark may need to be changed */
3263 if (closeto == LEFT) 3301 if (closeto == LEFT)
3264 { 3302 {
3265 selection.mark.row = selection.end.row; 3303 selection.mark.row = selection.end.row;
3266 selection.mark.col = selection.end.col 3304 selection.mark.col = selection.end.col
3267 - (selection.clicks == 2); 3305 - (selection.clicks == 2);
… …
3271 selection.mark.row = selection.beg.row; 3309 selection.mark.row = selection.beg.row;
3272 selection.mark.col = selection.beg.col; 3310 selection.mark.col = selection.beg.col;
3273 } 3311 }
3274 } 3312 }
3275 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)); 3313 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));
3276#endif /* ! NO_NEW_SELECTION */
3277} 3314}
3278 3315
3279#ifndef NO_FRILLS 3316#ifndef NO_FRILLS
3280void 3317void
3281rxvt_term::selection_remove_trailing_spaces () 3318rxvt_term::selection_remove_trailing_spaces ()
… …
3355 ev.target = rq.target; 3392 ev.target = rq.target;
3356 ev.time = rq.time; 3393 ev.time = rq.time;
3357 3394
3358 if (rq.target == xa[XA_TARGETS]) 3395 if (rq.target == xa[XA_TARGETS])
3359 { 3396 {
3360 Atom32 target_list[5]; 3397 Atom32 target_list[6];
3361 Atom32 *target = target_list; 3398 Atom32 *target = target_list;
3362 3399
3363 *target++ = (Atom32) xa[XA_TARGETS]; 3400 *target++ = (Atom32) xa[XA_TARGETS];
3401 *target++ = (Atom32) xa[XA_TIMESTAMP];
3364 *target++ = (Atom32) XA_STRING; 3402 *target++ = (Atom32) XA_STRING;
3365 *target++ = (Atom32) xa[XA_TEXT]; 3403 *target++ = (Atom32) xa[XA_TEXT];
3366 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3404 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3367#if X_HAVE_UTF8_STRING 3405#if X_HAVE_UTF8_STRING
3368 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3406 *target++ = (Atom32) xa[XA_UTF8_STRING];
3369#endif 3407#endif
3408
3370 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3409 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3371 (8 * sizeof (target_list[0])), PropModeReplace, 3410 (8 * sizeof (target_list[0])), PropModeReplace,
3372 (unsigned char *)target_list, 3411 (unsigned char *)target_list,
3373 target - target_list); 3412 target - target_list);
3374 ev.property = rq.property; 3413 ev.property = rq.property;
3375 } 3414 }
3376 else if (rq.target == xa[XA_MULTIPLE]) 3415 else if (rq.target == xa[XA_MULTIPLE])
3377 { 3416 {
3378 /* TODO: Handle MULTIPLE */ 3417 /* TODO: Handle MULTIPLE */
3379 } 3418 }
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3419 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3420 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3421 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3383 (8 * sizeof (Time)), PropModeReplace, 3422 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3423 (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3424 ev.property = rq.property;
3386 } 3425 }
3387 else if (rq.target == XA_STRING 3426 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3427 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3428 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3429 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3430 )
3392 { 3431 {
3393 short freect = 0; 3432 short freect = 0;
3394 int selectlen; 3433 int selectlen;
3395 char *cl; 3434 wchar_t *cl;
3396 3435
3397 target = rq.target; 3436 target = rq.target;
3398 3437
3399 if (target == XA_STRING) 3438 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3439 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3440 // will ask for another format anyways.
3402 style = XStringStyle; 3441 style = XStringStyle;
3403 else if (target == xa[XA_TEXT]) 3442 else if (target == xa[XA_TEXT])
3404 style = XTextStyle; 3443 style = XStdICCTextStyle;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3444 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3445 style = XCompoundTextStyle;
3407#if X_HAVE_UTF8_STRING 3446#if X_HAVE_UTF8_STRING
3408 else if (target == xa[XA_UTF8_STRING]) 3447 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3448 style = XUTF8StringStyle;
… …
3414 style = XCompoundTextStyle; 3453 style = XCompoundTextStyle;
3415 } 3454 }
3416 3455
3417 if (selection.text) 3456 if (selection.text)
3418 { 3457 {
3419 cl = (char *)selection.text; 3458 cl = selection.text;
3420 selectlen = selection.len; 3459 selectlen = selection.len;
3421 } 3460 }
3422 else 3461 else
3423 { 3462 {
3424 cl = ""; 3463 cl = L"";
3425 selectlen = 0; 3464 selectlen = 0;
3426 } 3465 }
3427 3466
3467 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3468 // manually for XUTF8StringStyle.
3428 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3469 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3429 freect = 1; 3470 freect = 1;
3430 else 3471 else
3431 { 3472 {
3432 /* if we failed to convert then send it raw */ 3473 /* if we failed to convert then send it raw */
3433 ct.value = (unsigned char *)cl; 3474 ct.value = (unsigned char *)cl;
… …
3440 ev.property = rq.property; 3481 ev.property = rq.property;
3441 3482
3442 if (freect) 3483 if (freect)
3443 XFree (ct.value); 3484 XFree (ct.value);
3444 } 3485 }
3486
3445 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3487 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3446} 3488}
3447 3489
3448/* ------------------------------------------------------------------------- * 3490/* ------------------------------------------------------------------------- *
3449 * MOUSE ROUTINES * 3491 * MOUSE ROUTINES *

Diff Legend

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