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

Diff Legend

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