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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.66 by pcg, Sun Mar 28 02:07:08 2004 UTC

… …
439 uint16_t total_rows; 439 uint16_t total_rows;
440 int i; 440 int i;
441 441
442 total_rows = TermWin.nrow + TermWin.saveLines; 442 total_rows = TermWin.nrow + TermWin.saveLines;
443 443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 }
451#endif
452
453 delete talloc; talloc = 0; 444 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 445 delete ralloc; ralloc = 0;
455 446
456 free (screen.text); 447 free (screen.text);
457 free (screen.tlen); 448 free (screen.tlen);
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 491 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 492 */
502void 493void
503rxvt_term::scr_cursor (int mode) 494rxvt_term::scr_cursor (int mode)
504{ 495{
505 screen_t *s; 496 screen_t *s;
506 497
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 498 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 499
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 500#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 501 if (current_screen == SECONDARY)
511 s = & (swap); 502 s = &swap;
512 else 503 else
513#endif 504#endif
514 s = & (screen); 505 s = &screen;
506
515 switch (mode) 507 switch (mode)
516 { 508 {
517 case SAVE: 509 case SAVE:
518 s->s_cur.row = s->cur.row; 510 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 511 s->s_cur.col = s->cur.col;
… …
530 s->charset = s->s_charset; 522 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 523 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 524 set_font_style ();
533 break; 525 break;
534 } 526 }
527
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 528 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 529 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 530 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 531#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 544 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 545 */
553int 546int
554rxvt_term::scr_change_screen (int scrn) 547rxvt_term::scr_change_screen (int scrn)
555{ 548{
556 int i; 549 int i;
557#if NSCREENS 550#if NSCREENS
558 int offset; 551 int offset;
559#endif 552#endif
560 553
561 want_refresh = 1; 554 want_refresh = 1;
562 555
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 556 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
… …
762/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
763/* 756/*
764 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
765 */ 758 */
766void 759void
767rxvt_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)
768{ 761{
769 unsigned char checksel, clearsel; 762 unsigned char checksel, clearsel;
770 uint32_t c; 763 unicode_t c;
771 int i, row, last_col; 764 int i, row, last_col;
772 text_t *stp; 765 text_t *stp;
773 rend_t *srp; 766 rend_t *srp;
774 767
775 if (len <= 0) /* sanity */ 768 if (len <= 0) /* sanity */
776 return; 769 return;
777 770
778 want_refresh = 1; 771 want_refresh = 1;
… …
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 794 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 795 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 796#endif
804 row = screen.cur.row + TermWin.saveLines; 797 row = screen.cur.row + TermWin.saveLines;
805 798
806 checksel = (selection.op 799 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 800 clearsel = 0;
809 801
810 stp = screen.text[row]; 802 stp = screen.text[row];
811 srp = screen.rend[row]; 803 srp = screen.rend[row];
812 804
813 for (i = 0; i < len;) 805 while (len--)
814 { 806 {
815 c = str[i++]; 807 c = *str++;
808
809 if (c < 0x20)
816 switch (c) 810 switch (c)
817 { 811 {
818 case '\t': 812 case '\t':
819 scr_tab (1); 813 scr_tab (1);
820 continue; 814 continue;
815
821 case '\n': 816 case '\n':
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 817 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 818 MAX_IT (screen.tlen[row], screen.cur.col);
819
824 screen.flags &= ~Screen_WrapNext; 820 screen.flags &= ~Screen_WrapNext;
821
825 if (screen.cur.row == screen.bscroll) 822 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 823 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 824 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 825 row = (++screen.cur.row) + TermWin.saveLines;
826
829 stp = screen.text[row]; /* _must_ refresh */ 827 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 828 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 829 continue;
830
832 case '\r': 831 case '\r':
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
834
835 screen.flags &= ~Screen_WrapNext; 835 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 836 screen.cur.col = 0;
837 continue; 837 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 838 }
843 839
844 if (checksel /* see if we're writing within selection */ 840 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 841 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 842 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 843 {
848 checksel = 0; 844 checksel = 0;
849 clearsel = 1; 845 clearsel = 1;
850 } 846 }
847
851 if (screen.flags & Screen_WrapNext) 848 if (screen.flags & Screen_WrapNext)
852 { 849 {
853 screen.tlen[row] = -1; 850 screen.tlen[row] = -1;
854 if (screen.cur.row == screen.bscroll) 851 if (screen.cur.row == screen.bscroll)
855 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 852 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
856 else if (screen.cur.row < (TermWin.nrow - 1)) 853 else if (screen.cur.row < (TermWin.nrow - 1))
857 row = (++screen.cur.row) + TermWin.saveLines; 854 row = (++screen.cur.row) + TermWin.saveLines;
855
858 stp = screen.text[row]; /* _must_ refresh */ 856 stp = screen.text[row]; /* _must_ refresh */
859 srp = screen.rend[row]; /* _must_ refresh */ 857 srp = screen.rend[row]; /* _must_ refresh */
860 screen.cur.col = 0; 858 screen.cur.col = 0;
861 screen.flags &= ~Screen_WrapNext; 859 screen.flags &= ~Screen_WrapNext;
862 } 860 }
861
863 if (screen.flags & Screen_Insert) 862 if (screen.flags & Screen_Insert)
864 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
865 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
866 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
867 switch (c)
868 { 871 {
869 // dunno where these come from
870#if 0
871 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
872 case '.': c = 0x2193; break; case '0': c = 0x25ae; break;
873#endif
874 // vt100 special graphics and line drawing 872 // vt100 special graphics and line drawing
875 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 873 static uint16_t vt100_0[32] = { // 5f .. 7e
876 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
877 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
878 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
879 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
880 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
881 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
882 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
883 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
884 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
885 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
886 } 878 };
887 879
888 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 880 if (c >= 0x5f && c <= 0x7e)
889 // rely on wcwidth to tell us the character width, at least for non-ascii 881 {
890 int width = c <= 128 ? 1 : wcwidth (c); 882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
885 }
891 886
892 // width -1 characters (e.g. combining chars) are ignored currently.
893 if (width > 0) 887 if (width > 0)
894 { 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
895 do 896 do
896 { 897 {
897 stp[screen.cur.col] = c; 898 stp[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 899 srp[screen.cur.col] = rend;
899 900
… …
910 c = NOCHAR; 911 c = NOCHAR;
911 } 912 }
912 while (--width > 0); 913 while (--width > 0);
913 914
914 // pad with spaces when overwriting wide character with smaller one 915 // pad with spaces when overwriting wide character with smaller one
915 for (int c = screen.cur.col; stp[c] == NOCHAR && c < last_col; c++) 916 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
916 { 917 {
917 stp[c] = ' '; 918 stp[c] = ' ';
918 srp[c] = rend; 919 srp[c] = rend;
919 } 920 }
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 }
921 else 944 else
922 (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 }
923 } 960 }
924 961
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 962 if (screen.tlen[row] != -1) /* XXX: think about this */
926 MAX_IT (screen.tlen[row], screen.cur.col); 963 MAX_IT (screen.tlen[row], screen.cur.col);
927 964
… …
973 * XTERM_SEQ: CTRL-I 1010 * XTERM_SEQ: CTRL-I
974 */ 1011 */
975void 1012void
976rxvt_term::scr_tab (int count) 1013rxvt_term::scr_tab (int count)
977{ 1014{
978 int i, x; 1015 int i, x;
979 1016
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1017 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1018 want_refresh = 1;
982 i = x = screen.cur.col; 1019 i = x = screen.cur.col;
1020
983 if (count == 0) 1021 if (count == 0)
984 return; 1022 return;
985 else if (count > 0) 1023 else if (count > 0)
986 { 1024 {
987 for (; ++i < TermWin.ncol; ) 1025 for (; ++i < TermWin.ncol; )
… …
989 { 1027 {
990 x = i; 1028 x = i;
991 if (!--count) 1029 if (!--count)
992 break; 1030 break;
993 } 1031 }
1032
994 if (count) 1033 if (count)
995 x = TermWin.ncol - 1; 1034 x = TermWin.ncol - 1;
996 } 1035 }
997 else /* if (count < 0) */ 1036 else /* if (count < 0) */
998 { 1037 {
… …
1001 { 1040 {
1002 x = i; 1041 x = i;
1003 if (!++count) 1042 if (!++count)
1004 break; 1043 break;
1005 } 1044 }
1045
1006 if (count) 1046 if (count)
1007 x = 0; 1047 x = 0;
1008 } 1048 }
1049
1009 if (x != screen.cur.col) 1050 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1051 scr_gotorc (0, x, R_RELATIVE);
1011} 1052}
1012 1053
1013/* ------------------------------------------------------------------------- */ 1054/* ------------------------------------------------------------------------- */
… …
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1247 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1248 */
1208void 1249void
1209rxvt_term::scr_erase_screen (int mode) 1250rxvt_term::scr_erase_screen (int mode)
1210{ 1251{
1211 int num; 1252 int num;
1212 int32_t row, row_offset; 1253 int32_t row, row_offset;
1213 rend_t ren; 1254 rend_t ren;
1214 XGCValues gcvalue; 1255 XGCValues gcvalue;
1215 1256
1216 want_refresh = 1; 1257 want_refresh = 1;
1217 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));
1218 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
1219 row_offset = (int32_t)TermWin.saveLines; 1260 row_offset = (int32_t)TermWin.saveLines;
… …
1238 num = TermWin.nrow; 1279 num = TermWin.nrow;
1239 break; 1280 break;
1240 default: 1281 default:
1241 return; 1282 return;
1242 } 1283 }
1284
1243 refresh_type |= REFRESH_BOUNDS; 1285 refresh_type |= REFRESH_BOUNDS;
1286
1244 if (selection.op && current_screen == selection.screen 1287 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1288 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1289 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1290 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1292
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1293 if (row >= TermWin.nrow) /* Out Of Bounds */
1250 return; 1294 return;
1295
1251 MIN_IT (num, (TermWin.nrow - row)); 1296 MIN_IT (num, (TermWin.nrow - row));
1297
1252 if (rstyle & (RS_RVid | RS_Uline)) 1298 if (rstyle & (RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1299 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1300 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1301 {
1256 ren = DEFAULT_RSTYLE; 1302 ren = DEFAULT_RSTYLE;
… …
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1265 gcvalue.foreground = PixColors[Color_fg]; 1311 gcvalue.foreground = PixColors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1267 } 1313 }
1314
1268 for (; num--; row++) 1315 for (; num--; row++)
1269 { 1316 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1317 scr_blank_screen_mem (screen.text, screen.rend,
1271 (unsigned int) (row + row_offset), rstyle); 1318 (unsigned int) (row + row_offset), rstyle);
1272 screen.tlen[row + row_offset] = 0; 1319 screen.tlen[row + row_offset] = 0;
… …
1306 * Insert/Delete <count> lines 1353 * Insert/Delete <count> lines
1307 */ 1354 */
1308void 1355void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1356rxvt_term::scr_insdel_lines (int count, int insdel)
1310{ 1357{
1311 int end; 1358 int end;
1312 1359
1313 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1314 1361
1315 selection_check (1); 1362 selection_check (1);
1316 1363
… …
1335 * Insert/Delete <count> characters from the current position 1382 * Insert/Delete <count> characters from the current position
1336 */ 1383 */
1337void 1384void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1385rxvt_term::scr_insdel_chars (int count, int insdel)
1339{ 1386{
1340 int col, row; 1387 int col, row;
1341 rend_t tr; 1388 rend_t tr;
1342 text_t *stp; 1389 text_t *stp;
1343 rend_t *srp; 1390 rend_t *srp;
1344 int16_t *slp; 1391 int16_t *slp;
1345 1392
1346 want_refresh = 1; 1393 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1394 ZERO_SCROLLBACK ();
1348 1395
1349 if (count <= 0) 1396 if (count <= 0)
… …
1356 screen.flags &= ~Screen_WrapNext; 1403 screen.flags &= ~Screen_WrapNext;
1357 1404
1358 stp = screen.text[row]; 1405 stp = screen.text[row];
1359 srp = screen.rend[row]; 1406 srp = screen.rend[row];
1360 slp = & (screen.tlen[row]); 1407 slp = & (screen.tlen[row]);
1408
1361 switch (insdel) 1409 switch (insdel)
1362 { 1410 {
1363 case INSERT: 1411 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1412 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1365 col--) 1413 col--)
1366 { 1414 {
1367 stp[col] = stp[col - count]; 1415 stp[col] = stp[col - count];
1368 srp[col] = srp[col - count]; 1416 srp[col] = srp[col - count];
1369 } 1417 }
1418
1370 if (*slp != -1) 1419 if (*slp != -1)
1371 { 1420 {
1372 *slp += count; 1421 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol); 1422 MIN_IT (*slp, TermWin.ncol);
1374 } 1423 }
1424
1375 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1427 {
1378 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1429 || (selection.end.col + count >= TermWin.ncol))
… …
1383 selection.beg.col += count; 1433 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1434 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1435 selection.end.col += count;
1386 } 1436 }
1387 } 1437 }
1438
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1439 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1389 (unsigned int)count, rstyle); 1440 (unsigned int)count, rstyle);
1390 break; 1441 break;
1442
1391 case ERASE: 1443 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1444 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1393 selection_check (1); 1445 selection_check (1);
1394 screen.cur.col -= count; 1446 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1396 (unsigned int)count, rstyle); 1448 (unsigned int)count, rstyle);
1397 break; 1449 break;
1450
1398 case DELETE: 1451 case DELETE:
1399 tr = srp[TermWin.ncol - 1]
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1453
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1454 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1402 { 1455 {
1403 stp[col] = stp[col + count]; 1456 stp[col] = stp[col + count];
1404 srp[col] = srp[col + count]; 1457 srp[col] = srp[col + count];
1405 } 1458 }
1459
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1460 scr_blank_line (& (stp[TermWin.ncol - count]),
1407 & (srp[TermWin.ncol - count]), 1461 & (srp[TermWin.ncol - count]),
1408 (unsigned int)count, tr); 1462 (unsigned int)count, tr);
1463
1409 if (*slp == -1) /* break line continuation */ 1464 if (*slp == -1) /* break line continuation */
1410 *slp = TermWin.ncol; 1465 *slp = TermWin.ncol;
1466
1411 *slp -= count; 1467 *slp -= count;
1412 MAX_IT (*slp, 0); 1468 MAX_IT (*slp, 0);
1469
1413 if (selection.op && current_screen == selection.screen 1470 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1472 {
1416 if (selection.end.row != screen.cur.row 1473 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1474 || (screen.cur.col >= selection.beg.col - count)
… …
1423 selection.beg.col -= count; 1480 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1481 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1482 selection.end.col -= count;
1426 } 1483 }
1427 } 1484 }
1485
1428 break; 1486 break;
1429 } 1487 }
1430} 1488}
1431 1489
1432/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
… …
1437void 1495void
1438rxvt_term::scr_scroll_region (int top, int bot) 1496rxvt_term::scr_scroll_region (int top, int bot)
1439{ 1497{
1440 MAX_IT (top, 0); 1498 MAX_IT (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1499 MIN_IT (bot, (int)TermWin.nrow - 1);
1500
1442 if (top > bot) 1501 if (top > bot)
1443 return; 1502 return;
1503
1444 screen.tscroll = top; 1504 screen.tscroll = top;
1445 screen.bscroll = bot; 1505 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1506 scr_gotorc (0, 0, 0);
1447} 1507}
1448 1508
… …
1906 1966
1907 /* 1967 /*
1908 * C: set the cursor character (s) 1968 * C: set the cursor character (s)
1909 */ 1969 */
1910 { 1970 {
1911 unsigned char setoldcursor; 1971 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */ 1972 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */ 1973 ccol2; /* Cursor colour2 */
1914 1974
1915 showcursor = (screen.flags & Screen_VisibleCursor); 1975 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 1976#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 1977 if (hidden_cursor)
1918 showcursor = 0; 1978 showcursor = 0;
1919#endif 1979#endif
1920 1980
1921 if (showcursor) 1981 if (showcursor)
1922 { 1982 {
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1983 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1924 [screen.cur.col]);
1925 1984
1926 if (showcursor && TermWin.focus) 1985 if (showcursor && TermWin.focus)
1927 { 1986 {
1928 *srp ^= RS_RVid; 1987 *srp ^= RS_RVid;
1929#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
… …
1957 if (screen.cur.row + TermWin.view_start != ocrow 2016 if (screen.cur.row + TermWin.view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
1959 { 2018 {
1960 if (ocrow < TermWin.nrow 2019 if (ocrow < TermWin.nrow
1961 && oldcursor.col < TermWin.ncol) 2020 && oldcursor.col < TermWin.ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2022
1965 if (TermWin.focus || !showcursor) 2023 if (TermWin.focus || !showcursor)
1966 oldcursor.row = -1; 2024 oldcursor.row = -1;
1967 else 2025 else
1968 setoldcursor = 1; 2026 setoldcursor = 1;
1969 } 2027 }
1970 } 2028 }
1971 else if (!TermWin.focus) 2029 else if (!TermWin.focus)
1972 setoldcursor = 1; 2030 setoldcursor = 1;
2031
1973 if (setoldcursor) 2032 if (setoldcursor)
1974 { 2033 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2034 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
1976 oldcursor.row = -1; 2035 oldcursor.row = -1;
1977 else 2036 else
… …
1989 */ 2048 */
1990 i = num_scr; 2049 i = num_scr;
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2050 if (refresh_type == FAST_REFRESH && num_scr_allow && i
1992 && abs (i) < TermWin.nrow && !must_clear) 2051 && abs (i) < TermWin.nrow && !must_clear)
1993 { 2052 {
1994 int16_t nits; 2053 int16_t nits;
1995 int j; 2054 int j;
1996 rend_t *drp2; 2055 rend_t *drp2;
1997 text_t *dtp2; 2056 text_t *dtp2;
1998 int len, wlen; 2057 int len, wlen;
1999 2058
2000 j = TermWin.nrow; 2059 j = TermWin.nrow;
2001 wlen = len = -1; 2060 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2061 row = i > 0 ? 0 : j - 1;
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2062 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2147 else 2206 else
2148 rvid = !rvid; 2207 rvid = !rvid;
2149 } 2208 }
2150 2209
2151 if (rend & RS_Uline) 2210 if (rend & RS_Uline)
2152 {
2153 if (ISSET_PIXCOLOR (Color_UL)) 2211 if (ISSET_PIXCOLOR (Color_UL))
2154 fore = Color_UL; 2212 fore = Color_UL;
2155 }
2156#endif 2213#endif
2157 2214
2158 if (rvid) 2215 if (rvid)
2159 { 2216 {
2160 SWAP_IT (fore, back, int); 2217 SWAP_IT (fore, back, int);
… …
2529 } 2586 }
2530 2587
2531 if (ct.nitems == 0) 2588 if (ct.nitems == 0)
2532 { 2589 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2590 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2591
2534 if (selection_wait == Sel_normal && nread == 0 2592 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2593 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 { 2594 {
2537 /* 2595 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from 2596 * pass through again trying CUT_BUFFER0 if we've come from
… …
2580void 2638void
2581rxvt_term::incr_cb (time_watcher &w) 2639rxvt_term::incr_cb (time_watcher &w)
2582{ 2640{
2583 selection_wait = Sel_none; 2641 selection_wait = Sel_none;
2584 2642
2585 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2643 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2586} 2644}
2587 2645
2588/* 2646/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2647 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */ 2648 */
… …
2593{ 2651{
2594 int reget_time = 0; 2652 int reget_time = 0;
2595 2653
2596 if (prop == None) 2654 if (prop == None)
2597 return; 2655 return;
2656
2598 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));
2599 if (selection_wait == Sel_normal) 2658 if (selection_wait == Sel_normal)
2600 { 2659 {
2601 int a, afmt; 2660 int a, afmt;
2602 Atom atype; 2661 Atom atype;
2603 unsigned long bytes_after, nitems; 2662 unsigned long bytes_after, nitems;
2604 unsigned char *s = NULL; 2663 unsigned char *s = NULL;
2605 2664
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2665 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2607 xa[XA_INCR], &atype, &afmt, &nitems, 2666 xa[XA_INCR], &atype, &afmt, &nitems,
2608 &bytes_after, &s); 2667 &bytes_after, &s);
2609 if (s) 2668 if (s)
2610 XFree (s); 2669 XFree (s);
2611 if (a != Success) 2670 if (a != Success)
2612 return; 2671 return;
2672
2613#ifndef __CYGWIN32__ 2673#ifndef __CYGWIN32__
2614 if (atype == xa[XA_INCR]) 2674 if (atype == xa[XA_INCR])
2615 { /* start an INCR transfer */ 2675 { /* start an INCR transfer */
2616 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer")); 2676 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2617 XDeleteProperty (display->display, win, prop); 2677 XDeleteProperty (display->display, win, prop);
… …
2623 2683
2624 } 2684 }
2625 else if (selection_wait == Sel_incr) 2685 else if (selection_wait == Sel_incr)
2626 { 2686 {
2627 reget_time = 1; 2687 reget_time = 1;
2688
2628 if (selection_paste (win, prop, True) == -1) 2689 if (selection_paste (win, prop, True) == -1)
2629 { 2690 {
2630 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end")); 2691 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2631 selection_wait = Sel_none; 2692 selection_wait = Sel_none;
2632 incr_ev.stop (); 2693 incr_ev.stop ();
2633 } 2694 }
2634 } 2695 }
2635 if (reget_time) /* received more data so reget time */ 2696 if (reget_time) /* received more data so reget time */
2636 incr_ev.start (NOW + 10); 2697 incr_ev.start (NOW + 10);
2637} 2698}
2699
2638/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2639/* 2701/*
2640 * Request the current selection: 2702 * Request the current selection:
2641 * Order: > internal selection if available 2703 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2704 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
… …
2647 */ 2709 */
2648void 2710void
2649rxvt_term::selection_request (Time tm, int x, int y) 2711rxvt_term::selection_request (Time tm, int x, int y)
2650{ 2712{
2651 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
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2715 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2653 return; /* outside window */ 2716 return; /* outside window */
2654 2717
2655 if (selection.text != NULL) 2718 if (selection.text)
2656 { /* internal selection */ 2719 { /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); 2720 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2721 char *str = rxvt_wcstombs (selection.text, selection.len);
2722 paste ((unsigned char *)str, strlen (str));
2723 free (str);
2659 return; 2724 return;
2660 } 2725 }
2661 else 2726 else
2662 { 2727 {
2663 int i; 2728 int i;
2664 2729
2665 selection_request_time = tm; 2730 selection_request_time = tm;
2666 selection_wait = Sel_normal; 2731 selection_wait = Sel_normal;
2732
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2733 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 { 2734 {
2669#if X_HAVE_UTF8_STRING 2735#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String; 2736 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2737 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2676 return; 2742 return;
2677#endif 2743#endif
2678 2744
2679 } 2745 }
2680 } 2746 }
2747
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2748 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2749 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2683 selection_paste (display->root, XA_CUT_BUFFER0, False); 2750 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684} 2751}
2685 2752
2686int 2753int
2687rxvt_term::selection_request_other (Atom target, int selnum) 2754rxvt_term::selection_request_other (Atom target, int selnum)
2688{ 2755{
2689 Atom sel; 2756 Atom sel;
2690#ifdef DEBUG_SELECT 2757#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2758 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif 2759#endif
2693 2760
2694 selection_type |= selnum; 2761 selection_type |= selnum;
2762
2695 if (selnum == Sel_Primary) 2763 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY; 2764 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary) 2765 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY; 2766 sel = XA_SECONDARY;
2699 else 2767 else
2700 sel = xa[XA_CLIPBOARD]; 2768 sel = xa[XA_CLIPBOARD];
2769
2701 if (XGetSelectionOwner (display->display, sel) != None) 2770 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2771 {
2703 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]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2773 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time); 2774 TermWin.vt, selection_request_time);
2706 return 1; 2775 return 1;
2707 } 2776 }
2777
2708 return 0; 2778 return 0;
2709} 2779}
2710 2780
2711/* ------------------------------------------------------------------------- */ 2781/* ------------------------------------------------------------------------- */
2712/* 2782/*
… …
2721 want_refresh = 1; 2791 want_refresh = 1;
2722 free (selection.text); 2792 free (selection.text);
2723 selection.text = NULL; 2793 selection.text = NULL;
2724 selection.len = 0; 2794 selection.len = 0;
2725 CLEAR_SELECTION (); 2795 CLEAR_SELECTION ();
2796
2797 if (display->selection_owner == this)
2798 display->selection_owner = 0;
2726} 2799}
2727 2800
2728/* ------------------------------------------------------------------------- */ 2801/* ------------------------------------------------------------------------- */
2729/* 2802/*
2730 * Copy a selection into the cut buffer 2803 * Copy a selection into the cut buffer
… …
2732 */ 2805 */
2733void 2806void
2734rxvt_term::selection_make (Time tm) 2807rxvt_term::selection_make (Time tm)
2735{ 2808{
2736 int i, col, end_col, row, end_row; 2809 int i, col, end_col, row, end_row;
2737 unsigned char *new_selection_text; 2810 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2811 text_t *t;
2740 2812
2741 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));
2742 switch (selection.op) 2814 switch (selection.op)
2743 { 2815 {
… …
2756 selection.op = SELECTION_DONE; 2828 selection.op = SELECTION_DONE;
2757 2829
2758 if (selection.clicks == 4) 2830 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2831 return; /* nothing selected, go away */
2760 2832
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2833 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2834 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2763
2764 new_selection_text = (unsigned char *)str;
2765 2835
2766 col = selection.beg.col; 2836 col = selection.beg.col;
2767 MAX_IT (col, 0); 2837 MAX_IT (col, 0);
2768 row = selection.beg.row + TermWin.saveLines; 2838 row = selection.beg.row + TermWin.saveLines;
2769 end_row = selection.end.row + TermWin.saveLines; 2839 end_row = selection.end.row + TermWin.saveLines;
2770 struct mbstate mbs; 2840 int ofs = 0;
2841 int extra = 0;
2771 2842
2772 for (; row <= end_row; row++, col = 0) 2843 for (; row <= end_row; row++, col = 0)
2773 { 2844 {
2774 t = & (screen.text[row][col]); 2845 t = &(screen.text[row][col]);
2775 2846
2776 end_col = screen.tlen[row]; 2847 end_col = screen.tlen[row];
2777 2848
2778 if (end_col == -1) 2849 if (end_col == -1)
2779 end_col = TermWin.ncol; 2850 end_col = TermWin.ncol;
2780 2851
2781 if (row == end_row) 2852 if (row == end_row)
2782 MIN_IT (end_col, selection.end.col); 2853 MIN_IT (end_col, selection.end.col);
2783 2854
2784 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
2856 {
2785 if (*t == NOCHAR) 2857 if (*t == NOCHAR)
2786 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
2787 else 2876 else
2788 { 2877 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2878 }
2793 2879
2794 if (screen.tlen[row] != -1 && row != end_row) 2880 if (screen.tlen[row] != -1 && row != end_row)
2795 *str++ = '\n'; 2881 new_selection_text[ofs++] = L'\n';
2796 } 2882 }
2797 2883
2798#ifndef NO_OLD_SELECTION
2799 if (selection_style == OLD_SELECT)
2800 if (end_col == TermWin.ncol)
2801 *str++ = '\n';
2802#endif
2803#ifndef NO_NEW_SELECTION
2804 if (selection_style != OLD_SELECT)
2805 if (end_col != selection.end.col) 2884 if (end_col != selection.end.col)
2806 *str++ = '\n'; 2885 new_selection_text[ofs++] = L'\n';
2807#endif
2808 *str = '\0';
2809 2886
2810 i = str - (char *)new_selection_text; 2887 new_selection_text[ofs] = 0;
2888
2811 if (i == 0) 2889 if (ofs == 0)
2812 { 2890 {
2813 free (new_selection_text); 2891 free (new_selection_text);
2814 return; 2892 return;
2815 } 2893 }
2816 2894
2817 // due to MB_CUR_MAX, selection wastage is usually high, so realloc
2818 if (str - (char *)new_selection_text > 1024)
2819 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2820
2821 selection.len = i;
2822
2823 if (selection.text)
2824 free (selection.text); 2895 free (selection.text);
2825 2896
2826 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));
2827 2900
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2901 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2902 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2830 display->set_selection_owner (this); 2903 display->set_selection_owner (this);
2831 else 2904 else
2832 rxvt_print_error ("can't get primary selection"); 2905 rxvt_warn ("can't get primary selection, ignoring.\n");
2833 2906
2834 { 2907#if 0
2835 XTextProperty ct; 2908 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2909
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2910 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2911 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value);
2843 }
2844 else
2845 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2912 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8,
2846 PropModeReplace, selection.text, (int)selection.len); 2913 PropModeReplace, ct.value, ct.nitems);
2914 XFree (ct.value);
2847 } 2915 }
2916#endif
2848 2917
2849 selection_time = tm; 2918 selection_time = tm;
2850 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); 2919 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2851} 2920}
2852 2921
… …
2881rxvt_term::selection_start_colrow (int col, int row) 2950rxvt_term::selection_start_colrow (int col, int row)
2882{ 2951{
2883 want_refresh = 1; 2952 want_refresh = 1;
2884 selection.mark.col = col; 2953 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2954 selection.mark.row = row - TermWin.view_start;
2955
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2956 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2957 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2888 MAX_IT (selection.mark.col, 0); 2958 MAX_IT (selection.mark.col, 0);
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2959 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2890 2960
2961 while (selection.mark.col > 0
2962 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2963 --selection.mark.col;
2964
2891 if (selection.op) 2965 if (selection.op)
2892 { /* clear the old selection */ 2966 { /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 2967 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 2968 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 2969 }
2970
2896 selection.op = SELECTION_INIT; 2971 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 2972 selection.screen = current_screen;
2898} 2973}
2899 2974
2900/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 2977 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 2978 * We now only find out the boundary in one direction
2904 */ 2979 */
2905 2980
2906/* 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 */
2907#define DELIMIT_TEXT(x) \ 2982#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2983 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 2984#define DELIMIT_REND(x) 1
2910 2985
2911void 2986void
2912rxvt_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)
2913{ 2988{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 2989 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 2990 row_col_t bound;
2916 text_t *stp; 2991 text_t *stp;
2917 rend_t *srp; 2992 rend_t *srp;
2918 2993
2919 if (dirn == UP) 2994 if (dirn == UP)
2920 { 2995 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2996 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2922 bound.col = 0; 2997 bound.col = 0;
… …
2926 { 3001 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 3002 bound.row = TermWin.saveLines + TermWin.nrow;
2928 bound.col = TermWin.ncol - 1; 3003 bound.col = TermWin.ncol - 1;
2929 dirnadd = 1; 3004 dirnadd = 1;
2930 } 3005 }
3006
2931 row = mark->row + TermWin.saveLines; 3007 row = mark->row + TermWin.saveLines;
2932 col = mark->col; 3008 col = mark->col;
2933 MAX_IT (col, 0); 3009 MAX_IT (col, 0);
2934 /* find the edge of a word */ 3010 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 3011 stp = & (screen.text[row][col]);
2936 w1 = DELIMIT_TEXT (*stp); 3012 w1 = DELIMIT_TEXT (*stp);
2937 3013
2938 if (selection_style != NEW_SELECT)
2939 {
2940 if (w1 == 1)
2941 {
2942 stp += dirnadd;
2943 if (DELIMIT_TEXT (*stp) == 1)
2944 goto Old_Word_Selection_You_Die;
2945 col += dirnadd;
2946 }
2947 w1 = 0;
2948 }
2949 srp = (&screen.rend[row][col]); 3014 srp = (&screen.rend[row][col]);
2950 w2 = DELIMIT_REND (*srp); 3015 w2 = DELIMIT_REND (*srp);
2951 3016
2952 for (;;) 3017 for (;;)
2953 { 3018 {
2954 for (; col != bound.col; col += dirnadd) 3019 for (; col != bound.col; col += dirnadd)
2955 { 3020 {
2956 stp += dirnadd; 3021 stp += dirnadd;
3022 srp += dirnadd;
3023
3024 if (*stp == NOCHAR)
3025 continue;
3026
2957 if (DELIMIT_TEXT (*stp) != w1) 3027 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 3028 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 3029 if (DELIMIT_REND (*srp) != w2)
2961 break; 3030 break;
2962 } 3031 }
3032
2963 if ((col == bound.col) && (row != bound.row)) 3033 if ((col == bound.col) && (row != bound.row))
2964 { 3034 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3035 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
2966 { 3036 {
2967 trow = row + dirnadd; 3037 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3038 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3039
2969 if (screen.text[trow] == NULL) 3040 if (screen.text[trow] == NULL)
2970 break; 3041 break;
3042
2971 stp = & (screen.text[trow][tcol]); 3043 stp = & (screen.text[trow][tcol]);
2972 srp = & (screen.rend[trow][tcol]); 3044 srp = & (screen.rend[trow][tcol]);
3045
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3046 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3047 break;
3048
2975 row = trow; 3049 row = trow;
2976 col = tcol; 3050 col = tcol;
2977 continue; 3051 continue;
2978 } 3052 }
2979 } 3053 }
2980 break; 3054 break;
2981 } 3055 }
3056
2982Old_Word_Selection_You_Die: 3057Old_Word_Selection_You_Die:
2983 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));
2984 3059
2985 if (dirn == DN) 3060 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3061 col++; /* put us on one past the end */
… …
3008 MAX_IT (row, 0); 3083 MAX_IT (row, 0);
3009 MIN_IT (row, (int)TermWin.nrow - 1); 3084 MIN_IT (row, (int)TermWin.nrow - 1);
3010 MAX_IT (col, 0); 3085 MAX_IT (col, 0);
3011 MIN_IT (col, (int)TermWin.ncol); 3086 MIN_IT (col, (int)TermWin.ncol);
3012 3087
3013#ifndef NO_NEW_SELECTION
3014 /* 3088 /*
3015 * 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
3016 * 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
3017 * 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
3018 * be _past_ a character for it to be selected. 3092 * be _past_ a character for it to be selected.
3019 */ 3093 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3094 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3095 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3096 && (row == selection.mark.row + TermWin.view_start)))
3025 { 3097 {
3026 /* select nothing */ 3098 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3099 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3100 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3101 selection.clicks = 4;
3030 want_refresh = 1; 3102 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3103 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3104 return;
3033 }
3034 } 3105 }
3035#endif 3106
3036 if (selection.clicks == 4) 3107 if (selection.clicks == 4)
3037 selection.clicks = 1; 3108 selection.clicks = 1;
3038 3109
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3110 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3111 flag == 1 ? 1 : 0, /* ? button press */
… …
3094 pos.col = col; 3165 pos.col = col;
3095 pos.row = row; 3166 pos.row = row;
3096 3167
3097 pos.row -= TermWin.view_start; /* adjust for scroll */ 3168 pos.row -= TermWin.view_start; /* adjust for scroll */
3098 3169
3099#ifndef NO_OLD_SELECTION
3100 /*
3101 * This mimics some of the selection behaviour of version 2.20 and before.
3102 * There are no ``selection modes'', button3 is always character extension.
3103 * Note: button3 drag is always available, c.f. v2.20
3104 * Selection always terminates (left or right as appropriate) at the mark.
3105 */
3106 if (selection_style == OLD_SELECT)
3107 {
3108 if (selection.clicks == 1 || button3)
3109 {
3110 if (hate_those_clicks)
3111 {
3112 hate_those_clicks = 0;
3113 if (selection.clicks == 1)
3114 {
3115 selection.beg.row = selection.mark.row;
3116 selection.beg.col = selection.mark.col;
3117 }
3118 else
3119 {
3120 selection.mark.row = selection.beg.row;
3121 selection.mark.col = selection.beg.col;
3122 }
3123 }
3124 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3125 {
3126 selection.end.row = selection.mark.row;
3127 selection.end.col = selection.mark.col + 1;
3128 selection.beg.row = pos.row;
3129 selection.beg.col = pos.col;
3130 }
3131 else
3132 {
3133 selection.beg.row = selection.mark.row;
3134 selection.beg.col = selection.mark.col;
3135 selection.end.row = pos.row;
3136 selection.end.col = pos.col + 1;
3137 }
3138 }
3139 else if (selection.clicks == 2)
3140 {
3141 selection_delimit_word (UP, & (selection.mark),
3142 & (selection.beg));
3143 selection_delimit_word (DN, & (selection.mark),
3144 & (selection.end));
3145 hate_those_clicks = 1;
3146 }
3147 else if (selection.clicks == 3)
3148 {
3149 selection.beg.row = selection.end.row = selection.mark.row;
3150 selection.beg.col = 0;
3151 selection.end.col = ncol;
3152 hate_those_clicks = 1;
3153 }
3154 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));
3155 return;
3156 }
3157#endif /* ! NO_OLD_SELECTION */
3158#ifndef NO_NEW_SELECTION
3159 /* selection_style must not be OLD_SELECT to get here */
3160 /* 3170 /*
3161 * 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
3162 * in the way button3 drag extension works. 3172 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3173 * We're either doing: button1 drag; button3 press; or button3 drag
3164 * 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
… …
3169 * 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
3170 * 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
3171 * time of the most recent button3 press 3181 * time of the most recent button3 press
3172 */ 3182 */
3173 if (button3 && buttonpress) 3183 if (button3 && buttonpress)
3174 { /* button3 press */ 3184 { /* button3 press */
3175 /* 3185 /*
3176 * first determine which edge of the selection we are closest to 3186 * first determine which edge of the selection we are closest to
3177 */ 3187 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3188 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3189 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3190 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3191 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3192 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3193 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3194 closeto = LEFT;
3195
3185 if (closeto == LEFT) 3196 if (closeto == LEFT)
3186 { 3197 {
3187 selection.beg.row = pos.row; 3198 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3199 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3200 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3201 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3202 }
3193 else 3203 else
3194 { 3204 {
3195 selection.end.row = pos.row; 3205 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3206 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3207 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3208 selection.mark.col = selection.beg.col;
3199 } 3209 }
3200 } 3210 }
3201 else 3211 else
3202 { /* button1 drag or button3 drag */ 3212 { /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3213 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3214 {
3205 if ((selection.mark.row == selection.end.row) 3215 if ((selection.mark.row == selection.end.row)
3206 && (selection.mark.col == selection.end.col) 3216 && (selection.mark.col == selection.end.col)
3207 && clickchange && selection.clicks == 2) 3217 && clickchange && selection.clicks == 2)
3208 selection.mark.col--; 3218 selection.mark.col--;
3219
3209 selection.beg.row = pos.row; 3220 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3221 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3222 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3223 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3224 }
3215 else 3225 else
3216 { 3226 {
3217 selection.beg.row = selection.mark.row; 3227 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3228 selection.beg.col = selection.mark.col;
… …
3222 } 3232 }
3223 3233
3224 if (selection.clicks == 1) 3234 if (selection.clicks == 1)
3225 { 3235 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3236 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3237
3227 if (end_col != -1 && selection.beg.col > end_col) 3238 if (end_col != -1 && selection.beg.col > end_col)
3228 { 3239 {
3229#if 1 3240#if 1
3230 selection.beg.col = ncol; 3241 selection.beg.col = ncol;
3231#else 3242#else
3232 if (selection.beg.row != selection.end.row) 3243 if (selection.beg.row != selection.end.row)
3233 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3234 else 3245 else
3235 selection.beg.col = selection.mark.col; 3246 selection.beg.col = selection.mark.col;
3236#endif 3247#endif
3237
3238 } 3248 }
3249
3239 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3250 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3251
3240 if (end_col != -1 && selection.end.col > end_col) 3252 if (end_col != -1 && selection.end.col > end_col)
3241 selection.end.col = ncol; 3253 selection.end.col = ncol;
3242
3243 } 3254 }
3244 else if (selection.clicks == 2) 3255 else if (selection.clicks == 2)
3245 { 3256 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3257 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3258 selection.end.col--;
3259
3248 selection_delimit_word (UP, & (selection.beg), 3260 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3261 selection_delimit_word (DN, & (selection.end), & (selection.end));
3251 & (selection.end));
3252 } 3262 }
3253 else if (selection.clicks == 3) 3263 else if (selection.clicks == 3)
3254 { 3264 {
3255#ifndef NO_FRILLS 3265#ifndef NO_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3266 if ((Options & Opt_tripleclickwords))
3257 { 3267 {
3258 int end_row; 3268 int end_row;
3259 3269
3260 selection_delimit_word (UP, & (selection.beg), 3270 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3261 & (selection.beg));
3262 end_row = screen.tlen[selection.mark.row 3271 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3263 + TermWin.saveLines]; 3272
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3273 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3265 end_row++)
3266 { 3274 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3275 end_col = screen.tlen[end_row + TermWin.saveLines];
3276
3268 if (end_col != -1) 3277 if (end_col != -1)
3269 { 3278 {
3270 selection.end.row = end_row; 3279 selection.end.row = end_row;
3271 selection.end.col = end_col; 3280 selection.end.col = end_col;
3272 selection_remove_trailing_spaces (); 3281 selection_remove_trailing_spaces ();
… …
3274 } 3283 }
3275 } 3284 }
3276 } 3285 }
3277 else 3286 else
3278#endif 3287#endif
3279
3280 { 3288 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3290 selection.mark.col++;
3283 selection.beg.col = 0; 3291 selection.beg.col = 0;
3284 selection.end.col = ncol; 3292 selection.end.col = ncol;
3285 } 3293 }
3286 } 3294 }
3295
3287 if (button3 && buttonpress) 3296 if (button3 && buttonpress)
3288 { /* mark may need to be changed */ 3297 { /* mark may need to be changed */
3289 if (closeto == LEFT) 3298 if (closeto == LEFT)
3290 { 3299 {
3291 selection.mark.row = selection.end.row; 3300 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3301 selection.mark.col = selection.end.col
3293 - (selection.clicks == 2); 3302 - (selection.clicks == 2);
… …
3297 selection.mark.row = selection.beg.row; 3306 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3307 selection.mark.col = selection.beg.col;
3299 } 3308 }
3300 } 3309 }
3301 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));
3302#endif /* ! NO_NEW_SELECTION */
3303} 3311}
3304 3312
3305#ifndef NO_FRILLS 3313#ifndef NO_FRILLS
3306void 3314void
3307rxvt_term::selection_remove_trailing_spaces () 3315rxvt_term::selection_remove_trailing_spaces ()
… …
3381 ev.target = rq.target; 3389 ev.target = rq.target;
3382 ev.time = rq.time; 3390 ev.time = rq.time;
3383 3391
3384 if (rq.target == xa[XA_TARGETS]) 3392 if (rq.target == xa[XA_TARGETS])
3385 { 3393 {
3386 Atom32 target_list[5]; 3394 Atom32 target_list[6];
3387 Atom32 *target = target_list; 3395 Atom32 *target = target_list;
3388 3396
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3397 *target++ = (Atom32) xa[XA_TARGETS];
3398 *target++ = (Atom32) xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3399 *target++ = (Atom32) XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3400 *target++ = (Atom32) xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3401 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3402#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3403 *target++ = (Atom32) xa[XA_UTF8_STRING];
3395#endif 3404#endif
3405
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3406 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3407 (8 * sizeof (target_list[0])), PropModeReplace,
3398 (unsigned char *)target_list, 3408 (unsigned char *)target_list,
3399 target - target_list); 3409 target - target_list);
3400 ev.property = rq.property; 3410 ev.property = rq.property;
3401 } 3411 }
3402 else if (rq.target == xa[XA_MULTIPLE]) 3412 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3413 {
3404 /* TODO: Handle MULTIPLE */ 3414 /* TODO: Handle MULTIPLE */
3405 } 3415 }
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3416 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3407 { 3417 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3418 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3409 (8 * sizeof (Time)), PropModeReplace, 3419 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3420 (unsigned char *)&selection_time, 1);
3411 ev.property = rq.property; 3421 ev.property = rq.property;
3412 } 3422 }
3413 else if (rq.target == XA_STRING 3423 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3424 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3425 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3426 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3427 )
3418 { 3428 {
3419 short freect = 0; 3429 short freect = 0;
3420 int selectlen; 3430 int selectlen;
3421 char *cl; 3431 wchar_t *cl;
3422 3432
3423 target = rq.target; 3433 target = rq.target;
3424 3434
3425 if (target == XA_STRING) 3435 if (target == XA_STRING)
3426 // 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
3427 // will ask for another format anyways. 3437 // will ask for another format anyways.
3428 style = XStringStyle; 3438 style = XStringStyle;
3429 else if (target == xa[XA_TEXT]) 3439 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3440 style = XStdICCTextStyle;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3441 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3442 style = XCompoundTextStyle;
3433#if X_HAVE_UTF8_STRING 3443#if X_HAVE_UTF8_STRING
3434 else if (target == xa[XA_UTF8_STRING]) 3444 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3445 style = XUTF8StringStyle;
… …
3440 style = XCompoundTextStyle; 3450 style = XCompoundTextStyle;
3441 } 3451 }
3442 3452
3443 if (selection.text) 3453 if (selection.text)
3444 { 3454 {
3445 cl = (char *)selection.text; 3455 cl = selection.text;
3446 selectlen = selection.len; 3456 selectlen = selection.len;
3447 } 3457 }
3448 else 3458 else
3449 { 3459 {
3450 cl = ""; 3460 cl = L"";
3451 selectlen = 0; 3461 selectlen = 0;
3452 } 3462 }
3453 3463
3464 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it
3465 // manually for XUTF8StringStyle.
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3466 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0)
3455 freect = 1; 3467 freect = 1;
3456 else 3468 else
3457 { 3469 {
3458 /* if we failed to convert then send it raw */ 3470 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3471 ct.value = (unsigned char *)cl;
… …
3466 ev.property = rq.property; 3478 ev.property = rq.property;
3467 3479
3468 if (freect) 3480 if (freect)
3469 XFree (ct.value); 3481 XFree (ct.value);
3470 } 3482 }
3483
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3484 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
3472} 3485}
3473 3486
3474/* ------------------------------------------------------------------------- * 3487/* ------------------------------------------------------------------------- *
3475 * MOUSE ROUTINES * 3488 * MOUSE ROUTINES *

Diff Legend

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