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.54 by pcg, Thu Mar 11 00:53:19 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 */
… …
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 {
… …
864 } 860 }
865 861
866 if (screen.flags & Screen_Insert) 862 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 863 scr_insdel_chars (1, INSERT);
868 864
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1 865 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing 866 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes. 867 // characters have width -1 (DOH!) on GNU/Linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c); 868 int width = c < 256 ? 1 : wcwidth (c);
876 869
877 if (charsets[screen.charset] == '0') // DEC SPECIAL 870 if (charsets[screen.charset] == '0') // DEC SPECIAL
878 switch (c)
879 { 871 {
880 // vt100 special graphics and line drawing 872 // vt100 special graphics and line drawing
881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 873 static uint16_t vt100_0[32] = { // 5f .. 7e
882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 874 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 875 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 876 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 877 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
892 } 878 };
879
880 if (c >= 0x5f && c <= 0x7e)
881 {
882 c = vt100_0[c - 0x5f];
883 width = 1;
884 }
893 885 }
894 886
895 if (width > 0) 887 if (width > 0)
896 { 888 {
897#if !UNICODE_3 889#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :( 890 // trim characters we can't store directly :(
899 if (c >= 0x10000) 891 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits 892 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif 893#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 894 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
… …
927 srp[c] = rend; 919 srp[c] = rend;
928 } 920 }
929 } 921 }
930 else if (width == 0) 922 else if (width == 0)
931 { 923 {
932#if ENCODING_COMPOSE 924#if ENABLE_COMBINING
933 // handle combining characters 925 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
937 929
… …
955 // handle double-width-chars by making them look extremely ugly 947 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR) 948 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp; 949 *tp = ' '; // hack //D //TODO //--tp, --rp;
958 950
959 // first try to find a precomposed character 951 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c); 952 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 953 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 954 n = rxvt_composite.compose (*tp, c);
963 955
964 *tp = n; 956 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 957 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
… …
1018 * XTERM_SEQ: CTRL-I 1010 * XTERM_SEQ: CTRL-I
1019 */ 1011 */
1020void 1012void
1021rxvt_term::scr_tab (int count) 1013rxvt_term::scr_tab (int count)
1022{ 1014{
1023 int i, x; 1015 int i, x;
1024 1016
1025 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1017 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1026 want_refresh = 1; 1018 want_refresh = 1;
1027 i = x = screen.cur.col; 1019 i = x = screen.cur.col;
1020
1028 if (count == 0) 1021 if (count == 0)
1029 return; 1022 return;
1030 else if (count > 0) 1023 else if (count > 0)
1031 { 1024 {
1032 for (; ++i < TermWin.ncol; ) 1025 for (; ++i < TermWin.ncol; )
… …
1034 { 1027 {
1035 x = i; 1028 x = i;
1036 if (!--count) 1029 if (!--count)
1037 break; 1030 break;
1038 } 1031 }
1032
1039 if (count) 1033 if (count)
1040 x = TermWin.ncol - 1; 1034 x = TermWin.ncol - 1;
1041 } 1035 }
1042 else /* if (count < 0) */ 1036 else /* if (count < 0) */
1043 { 1037 {
… …
1046 { 1040 {
1047 x = i; 1041 x = i;
1048 if (!++count) 1042 if (!++count)
1049 break; 1043 break;
1050 } 1044 }
1045
1051 if (count) 1046 if (count)
1052 x = 0; 1047 x = 0;
1053 } 1048 }
1049
1054 if (x != screen.cur.col) 1050 if (x != screen.cur.col)
1055 scr_gotorc (0, x, R_RELATIVE); 1051 scr_gotorc (0, x, R_RELATIVE);
1056} 1052}
1057 1053
1058/* ------------------------------------------------------------------------- */ 1054/* ------------------------------------------------------------------------- */
… …
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1247 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1248 */
1253void 1249void
1254rxvt_term::scr_erase_screen (int mode) 1250rxvt_term::scr_erase_screen (int mode)
1255{ 1251{
1256 int num; 1252 int num;
1257 int32_t row, row_offset; 1253 int32_t row, row_offset;
1258 rend_t ren; 1254 rend_t ren;
1259 XGCValues gcvalue; 1255 XGCValues gcvalue;
1260 1256
1261 want_refresh = 1; 1257 want_refresh = 1;
1262 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));
1263 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
1264 row_offset = (int32_t)TermWin.saveLines; 1260 row_offset = (int32_t)TermWin.saveLines;
… …
1283 num = TermWin.nrow; 1279 num = TermWin.nrow;
1284 break; 1280 break;
1285 default: 1281 default:
1286 return; 1282 return;
1287 } 1283 }
1284
1288 refresh_type |= REFRESH_BOUNDS; 1285 refresh_type |= REFRESH_BOUNDS;
1286
1289 if (selection.op && current_screen == selection.screen 1287 if (selection.op && current_screen == selection.screen
1290 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1288 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1291 || (selection.end.row >= row 1289 || (selection.end.row >= row
1292 && selection.end.row <= row + num))) 1290 && selection.end.row <= row + num)))
1293 CLEAR_SELECTION (); 1291 CLEAR_SELECTION ();
1292
1294 if (row >= TermWin.nrow) /* Out Of Bounds */ 1293 if (row >= TermWin.nrow) /* Out Of Bounds */
1295 return; 1294 return;
1295
1296 MIN_IT (num, (TermWin.nrow - row)); 1296 MIN_IT (num, (TermWin.nrow - row));
1297
1297 if (rstyle & (RS_RVid | RS_Uline)) 1298 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1299 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1300 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1301 {
1301 ren = DEFAULT_RSTYLE; 1302 ren = DEFAULT_RSTYLE;
… …
1308 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1310 gcvalue.foreground = PixColors[Color_fg]; 1311 gcvalue.foreground = PixColors[Color_fg];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 } 1313 }
1314
1313 for (; num--; row++) 1315 for (; num--; row++)
1314 { 1316 {
1315 scr_blank_screen_mem (screen.text, screen.rend, 1317 scr_blank_screen_mem (screen.text, screen.rend,
1316 (unsigned int) (row + row_offset), rstyle); 1318 (unsigned int) (row + row_offset), rstyle);
1317 screen.tlen[row + row_offset] = 0; 1319 screen.tlen[row + row_offset] = 0;
… …
1351 * Insert/Delete <count> lines 1353 * Insert/Delete <count> lines
1352 */ 1354 */
1353void 1355void
1354rxvt_term::scr_insdel_lines (int count, int insdel) 1356rxvt_term::scr_insdel_lines (int count, int insdel)
1355{ 1357{
1356 int end; 1358 int end;
1357 1359
1358 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1359 1361
1360 selection_check (1); 1362 selection_check (1);
1361 1363
… …
1380 * Insert/Delete <count> characters from the current position 1382 * Insert/Delete <count> characters from the current position
1381 */ 1383 */
1382void 1384void
1383rxvt_term::scr_insdel_chars (int count, int insdel) 1385rxvt_term::scr_insdel_chars (int count, int insdel)
1384{ 1386{
1385 int col, row; 1387 int col, row;
1386 rend_t tr; 1388 rend_t tr;
1387 text_t *stp; 1389 text_t *stp;
1388 rend_t *srp; 1390 rend_t *srp;
1389 int16_t *slp; 1391 int16_t *slp;
1390 1392
1391 want_refresh = 1; 1393 want_refresh = 1;
1392 ZERO_SCROLLBACK (); 1394 ZERO_SCROLLBACK ();
1393 1395
1394 if (count <= 0) 1396 if (count <= 0)
… …
1401 screen.flags &= ~Screen_WrapNext; 1403 screen.flags &= ~Screen_WrapNext;
1402 1404
1403 stp = screen.text[row]; 1405 stp = screen.text[row];
1404 srp = screen.rend[row]; 1406 srp = screen.rend[row];
1405 slp = & (screen.tlen[row]); 1407 slp = & (screen.tlen[row]);
1408
1406 switch (insdel) 1409 switch (insdel)
1407 { 1410 {
1408 case INSERT: 1411 case INSERT:
1409 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1412 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1410 col--) 1413 col--)
1411 { 1414 {
1412 stp[col] = stp[col - count]; 1415 stp[col] = stp[col - count];
1413 srp[col] = srp[col - count]; 1416 srp[col] = srp[col - count];
1414 } 1417 }
1418
1415 if (*slp != -1) 1419 if (*slp != -1)
1416 { 1420 {
1417 *slp += count; 1421 *slp += count;
1418 MIN_IT (*slp, TermWin.ncol); 1422 MIN_IT (*slp, TermWin.ncol);
1419 } 1423 }
1424
1420 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1421 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1422 { 1427 {
1423 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
1424 || (selection.end.col + count >= TermWin.ncol)) 1429 || (selection.end.col + count >= TermWin.ncol))
… …
1428 selection.beg.col += count; 1433 selection.beg.col += count;
1429 selection.mark.col += count; /* XXX: yes? */ 1434 selection.mark.col += count; /* XXX: yes? */
1430 selection.end.col += count; 1435 selection.end.col += count;
1431 } 1436 }
1432 } 1437 }
1438
1433 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1439 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1434 (unsigned int)count, rstyle); 1440 (unsigned int)count, rstyle);
1435 break; 1441 break;
1442
1436 case ERASE: 1443 case ERASE:
1437 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1444 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1438 selection_check (1); 1445 selection_check (1);
1439 screen.cur.col -= count; 1446 screen.cur.col -= count;
1440 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1441 (unsigned int)count, rstyle); 1448 (unsigned int)count, rstyle);
1442 break; 1449 break;
1450
1443 case DELETE: 1451 case DELETE:
1444 tr = srp[TermWin.ncol - 1]
1445 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1453
1446 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1454 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1447 { 1455 {
1448 stp[col] = stp[col + count]; 1456 stp[col] = stp[col + count];
1449 srp[col] = srp[col + count]; 1457 srp[col] = srp[col + count];
1450 } 1458 }
1459
1451 scr_blank_line (& (stp[TermWin.ncol - count]), 1460 scr_blank_line (& (stp[TermWin.ncol - count]),
1452 & (srp[TermWin.ncol - count]), 1461 & (srp[TermWin.ncol - count]),
1453 (unsigned int)count, tr); 1462 (unsigned int)count, tr);
1463
1454 if (*slp == -1) /* break line continuation */ 1464 if (*slp == -1) /* break line continuation */
1455 *slp = TermWin.ncol; 1465 *slp = TermWin.ncol;
1466
1456 *slp -= count; 1467 *slp -= count;
1457 MAX_IT (*slp, 0); 1468 MAX_IT (*slp, 0);
1469
1458 if (selection.op && current_screen == selection.screen 1470 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1472 {
1461 if (selection.end.row != screen.cur.row 1473 if (selection.end.row != screen.cur.row
1462 || (screen.cur.col >= selection.beg.col - count) 1474 || (screen.cur.col >= selection.beg.col - count)
… …
1468 selection.beg.col -= count; 1480 selection.beg.col -= count;
1469 selection.mark.col -= count; /* XXX: yes? */ 1481 selection.mark.col -= count; /* XXX: yes? */
1470 selection.end.col -= count; 1482 selection.end.col -= count;
1471 } 1483 }
1472 } 1484 }
1485
1473 break; 1486 break;
1474 } 1487 }
1475} 1488}
1476 1489
1477/* ------------------------------------------------------------------------- */ 1490/* ------------------------------------------------------------------------- */
… …
1482void 1495void
1483rxvt_term::scr_scroll_region (int top, int bot) 1496rxvt_term::scr_scroll_region (int top, int bot)
1484{ 1497{
1485 MAX_IT (top, 0); 1498 MAX_IT (top, 0);
1486 MIN_IT (bot, (int)TermWin.nrow - 1); 1499 MIN_IT (bot, (int)TermWin.nrow - 1);
1500
1487 if (top > bot) 1501 if (top > bot)
1488 return; 1502 return;
1503
1489 screen.tscroll = top; 1504 screen.tscroll = top;
1490 screen.bscroll = bot; 1505 screen.bscroll = bot;
1491 scr_gotorc (0, 0, 0); 1506 scr_gotorc (0, 0, 0);
1492} 1507}
1493 1508
… …
1951 1966
1952 /* 1967 /*
1953 * C: set the cursor character (s) 1968 * C: set the cursor character (s)
1954 */ 1969 */
1955 { 1970 {
1956 unsigned char setoldcursor; 1971 unsigned char setoldcursor;
1957 rend_t ccol1, /* Cursor colour */ 1972 rend_t ccol1, /* Cursor colour */
1958 ccol2; /* Cursor colour2 */ 1973 ccol2; /* Cursor colour2 */
1959 1974
1960 showcursor = (screen.flags & Screen_VisibleCursor); 1975 showcursor = (screen.flags & Screen_VisibleCursor);
1961#ifdef CURSOR_BLINK 1976#ifdef CURSOR_BLINK
1962 if (hidden_cursor) 1977 if (hidden_cursor)
1963 showcursor = 0; 1978 showcursor = 0;
1964#endif 1979#endif
1965 1980
1966 if (showcursor) 1981 if (showcursor)
1967 { 1982 {
1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1983 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1969 [screen.cur.col]);
1970 1984
1971 if (showcursor && TermWin.focus) 1985 if (showcursor && TermWin.focus)
1972 { 1986 {
1973 *srp ^= RS_RVid; 1987 *srp ^= RS_RVid;
1974#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
… …
2002 if (screen.cur.row + TermWin.view_start != ocrow 2016 if (screen.cur.row + TermWin.view_start != ocrow
2003 || screen.cur.col != oldcursor.col) 2017 || screen.cur.col != oldcursor.col)
2004 { 2018 {
2005 if (ocrow < TermWin.nrow 2019 if (ocrow < TermWin.nrow
2006 && oldcursor.col < TermWin.ncol) 2020 && oldcursor.col < TermWin.ncol)
2007 {
2008 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2021 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2009 } 2022
2010 if (TermWin.focus || !showcursor) 2023 if (TermWin.focus || !showcursor)
2011 oldcursor.row = -1; 2024 oldcursor.row = -1;
2012 else 2025 else
2013 setoldcursor = 1; 2026 setoldcursor = 1;
2014 } 2027 }
2015 } 2028 }
2016 else if (!TermWin.focus) 2029 else if (!TermWin.focus)
2017 setoldcursor = 1; 2030 setoldcursor = 1;
2031
2018 if (setoldcursor) 2032 if (setoldcursor)
2019 { 2033 {
2020 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2034 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2021 oldcursor.row = -1; 2035 oldcursor.row = -1;
2022 else 2036 else
… …
2034 */ 2048 */
2035 i = num_scr; 2049 i = num_scr;
2036 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2050 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2037 && abs (i) < TermWin.nrow && !must_clear) 2051 && abs (i) < TermWin.nrow && !must_clear)
2038 { 2052 {
2039 int16_t nits; 2053 int16_t nits;
2040 int j; 2054 int j;
2041 rend_t *drp2; 2055 rend_t *drp2;
2042 text_t *dtp2; 2056 text_t *dtp2;
2043 int len, wlen; 2057 int len, wlen;
2044 2058
2045 j = TermWin.nrow; 2059 j = TermWin.nrow;
2046 wlen = len = -1; 2060 wlen = len = -1;
2047 row = i > 0 ? 0 : j - 1; 2061 row = i > 0 ? 0 : j - 1;
2048 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2062 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2192 else 2206 else
2193 rvid = !rvid; 2207 rvid = !rvid;
2194 } 2208 }
2195 2209
2196 if (rend & RS_Uline) 2210 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL)) 2211 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL; 2212 fore = Color_UL;
2200 }
2201#endif 2213#endif
2202 2214
2203 if (rvid) 2215 if (rvid)
2204 { 2216 {
2205 SWAP_IT (fore, back, int); 2217 SWAP_IT (fore, back, int);
… …
2626void 2638void
2627rxvt_term::incr_cb (time_watcher &w) 2639rxvt_term::incr_cb (time_watcher &w)
2628{ 2640{
2629 selection_wait = Sel_none; 2641 selection_wait = Sel_none;
2630 2642
2631 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2643 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2632} 2644}
2633 2645
2634/* 2646/*
2635 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2647 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2636 */ 2648 */
… …
2715 { 2727 {
2716 int i; 2728 int i;
2717 2729
2718 selection_request_time = tm; 2730 selection_request_time = tm;
2719 selection_wait = Sel_normal; 2731 selection_wait = Sel_normal;
2732
2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2733 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2721 { 2734 {
2722#if X_HAVE_UTF8_STRING 2735#if X_HAVE_UTF8_STRING
2723 selection_type = Sel_UTF8String; 2736 selection_type = Sel_UTF8String;
2724 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2737 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2778 want_refresh = 1; 2791 want_refresh = 1;
2779 free (selection.text); 2792 free (selection.text);
2780 selection.text = NULL; 2793 selection.text = NULL;
2781 selection.len = 0; 2794 selection.len = 0;
2782 CLEAR_SELECTION (); 2795 CLEAR_SELECTION ();
2796
2797 if (display->selection_owner == this)
2798 display->selection_owner = 0;
2783} 2799}
2784 2800
2785/* ------------------------------------------------------------------------- */ 2801/* ------------------------------------------------------------------------- */
2786/* 2802/*
2787 * Copy a selection into the cut buffer 2803 * Copy a selection into the cut buffer
… …
2838 2854
2839 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
2840 { 2856 {
2841 if (*t == NOCHAR) 2857 if (*t == NOCHAR)
2842 t++; 2858 t++;
2859#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2860 else if (IS_COMPOSE (*t))
2844 { 2861 {
2845 int len = rxvt_composite.expand (*t, 0); 2862 int len = rxvt_composite.expand (*t, 0);
2846 2863
2847 extra -= (len - 1); 2864 extra -= (len - 1);
… …
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 } 2871 }
2855 2872
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 } 2874 }
2875#endif
2858 else 2876 else
2859 new_selection_text[ofs++] = *t++; 2877 new_selection_text[ofs++] = *t++;
2860 } 2878 }
2861 2879
2862 if (screen.tlen[row] != -1 && row != end_row) 2880 if (screen.tlen[row] != -1 && row != end_row)
2863 new_selection_text[ofs++] = L'\n'; 2881 new_selection_text[ofs++] = L'\n';
2864 } 2882 }
2865 2883
2866#ifndef NO_OLD_SELECTION 2884 if (end_col != selection.end.col)
2867 if (selection_style == OLD_SELECT)
2868 if (end_col == TermWin.ncol)
2869 new_selection_text[ofs++] = L'\n'; 2885 new_selection_text[ofs++] = L'\n';
2870#endif 2886
2871#ifndef NO_NEW_SELECTION
2872 if (selection_style != OLD_SELECT)
2873 if (end_col != selection.end.col)
2874 new_selection_text[ofs++] = L'\n';
2875#endif
2876 new_selection_text[ofs] = 0; 2887 new_selection_text[ofs] = 0;
2877 2888
2878 if (ofs == 0) 2889 if (ofs == 0)
2879 { 2890 {
2880 free (new_selection_text); 2891 free (new_selection_text);
… …
2889 2900
2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2901 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2902 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2892 display->set_selection_owner (this); 2903 display->set_selection_owner (this);
2893 else 2904 else
2894 rxvt_print_error ("can't get primary selection"); 2905 rxvt_warn ("can't get primary selection, ignoring.\n");
2895 2906
2896#if 0 2907#if 0
2897 XTextProperty ct; 2908 XTextProperty ct;
2898 2909
2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2910 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
2939rxvt_term::selection_start_colrow (int col, int row) 2950rxvt_term::selection_start_colrow (int col, int row)
2940{ 2951{
2941 want_refresh = 1; 2952 want_refresh = 1;
2942 selection.mark.col = col; 2953 selection.mark.col = col;
2943 selection.mark.row = row - TermWin.view_start; 2954 selection.mark.row = row - TermWin.view_start;
2955
2944 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2956 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2945 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2957 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2946 MAX_IT (selection.mark.col, 0); 2958 MAX_IT (selection.mark.col, 0);
2947 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2959 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2948 2960
2961 while (selection.mark.col > 0
2962 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2963 --selection.mark.col;
2964
2949 if (selection.op) 2965 if (selection.op)
2950 { /* clear the old selection */ 2966 { /* clear the old selection */
2951 selection.beg.row = selection.end.row = selection.mark.row; 2967 selection.beg.row = selection.end.row = selection.mark.row;
2952 selection.beg.col = selection.end.col = selection.mark.col; 2968 selection.beg.col = selection.end.col = selection.mark.col;
2953 } 2969 }
2970
2954 selection.op = SELECTION_INIT; 2971 selection.op = SELECTION_INIT;
2955 selection.screen = current_screen; 2972 selection.screen = current_screen;
2956} 2973}
2957 2974
2958/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
… …
2960 * Word select: select text for 2 clicks 2977 * Word select: select text for 2 clicks
2961 * We now only find out the boundary in one direction 2978 * We now only find out the boundary in one direction
2962 */ 2979 */
2963 2980
2964/* 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 */
2965#define DELIMIT_TEXT(x) \ 2982#define DELIMIT_TEXT(x) \
2966 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2983 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2967#define DELIMIT_REND(x) 1 2984#define DELIMIT_REND(x) 1
2968 2985
2969void 2986void
2970rxvt_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)
2971{ 2988{
2972 int col, row, dirnadd, tcol, trow, w1, w2; 2989 int col, row, dirnadd, tcol, trow, w1, w2;
2973 row_col_t bound; 2990 row_col_t bound;
2974 text_t *stp; 2991 text_t *stp;
2975 rend_t *srp; 2992 rend_t *srp;
2976 2993
2977 if (dirn == UP) 2994 if (dirn == UP)
2978 { 2995 {
2979 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2996 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2980 bound.col = 0; 2997 bound.col = 0;
… …
2984 { 3001 {
2985 bound.row = TermWin.saveLines + TermWin.nrow; 3002 bound.row = TermWin.saveLines + TermWin.nrow;
2986 bound.col = TermWin.ncol - 1; 3003 bound.col = TermWin.ncol - 1;
2987 dirnadd = 1; 3004 dirnadd = 1;
2988 } 3005 }
3006
2989 row = mark->row + TermWin.saveLines; 3007 row = mark->row + TermWin.saveLines;
2990 col = mark->col; 3008 col = mark->col;
2991 MAX_IT (col, 0); 3009 MAX_IT (col, 0);
2992 /* find the edge of a word */ 3010 /* find the edge of a word */
2993 stp = & (screen.text[row][col]); 3011 stp = & (screen.text[row][col]);
2994 w1 = DELIMIT_TEXT (*stp); 3012 w1 = DELIMIT_TEXT (*stp);
2995 3013
2996 if (selection_style != NEW_SELECT)
2997 {
2998 if (w1 == 1)
2999 {
3000 stp += dirnadd;
3001 if (DELIMIT_TEXT (*stp) == 1)
3002 goto Old_Word_Selection_You_Die;
3003 col += dirnadd;
3004 }
3005 w1 = 0;
3006 }
3007 srp = (&screen.rend[row][col]); 3014 srp = (&screen.rend[row][col]);
3008 w2 = DELIMIT_REND (*srp); 3015 w2 = DELIMIT_REND (*srp);
3009 3016
3010 for (;;) 3017 for (;;)
3011 { 3018 {
3012 for (; col != bound.col; col += dirnadd) 3019 for (; col != bound.col; col += dirnadd)
3013 { 3020 {
3014 stp += dirnadd; 3021 stp += dirnadd;
3022 srp += dirnadd;
3023
3024 if (*stp == NOCHAR)
3025 continue;
3026
3015 if (DELIMIT_TEXT (*stp) != w1) 3027 if (DELIMIT_TEXT (*stp) != w1)
3016 break; 3028 break;
3017 srp += dirnadd;
3018 if (DELIMIT_REND (*srp) != w2) 3029 if (DELIMIT_REND (*srp) != w2)
3019 break; 3030 break;
3020 } 3031 }
3032
3021 if ((col == bound.col) && (row != bound.row)) 3033 if ((col == bound.col) && (row != bound.row))
3022 { 3034 {
3023 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3035 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3024 { 3036 {
3025 trow = row + dirnadd; 3037 trow = row + dirnadd;
3026 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3038 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3039
3027 if (screen.text[trow] == NULL) 3040 if (screen.text[trow] == NULL)
3028 break; 3041 break;
3042
3029 stp = & (screen.text[trow][tcol]); 3043 stp = & (screen.text[trow][tcol]);
3030 srp = & (screen.rend[trow][tcol]); 3044 srp = & (screen.rend[trow][tcol]);
3045
3031 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3046 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3032 break; 3047 break;
3048
3033 row = trow; 3049 row = trow;
3034 col = tcol; 3050 col = tcol;
3035 continue; 3051 continue;
3036 } 3052 }
3037 } 3053 }
3038 break; 3054 break;
3039 } 3055 }
3056
3040Old_Word_Selection_You_Die: 3057Old_Word_Selection_You_Die:
3041 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));
3042 3059
3043 if (dirn == DN) 3060 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3061 col++; /* put us on one past the end */
… …
3066 MAX_IT (row, 0); 3083 MAX_IT (row, 0);
3067 MIN_IT (row, (int)TermWin.nrow - 1); 3084 MIN_IT (row, (int)TermWin.nrow - 1);
3068 MAX_IT (col, 0); 3085 MAX_IT (col, 0);
3069 MIN_IT (col, (int)TermWin.ncol); 3086 MIN_IT (col, (int)TermWin.ncol);
3070 3087
3071#ifndef NO_NEW_SELECTION
3072 /* 3088 /*
3073 * 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
3074 * 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
3075 * 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
3076 * be _past_ a character for it to be selected. 3092 * be _past_ a character for it to be selected.
3077 */ 3093 */
3078 if (selection_style != OLD_SELECT)
3079 {
3080 if (((selection.clicks % 3) == 1) && !flag 3094 if (((selection.clicks % 3) == 1) && !flag
3081 && (col == selection.mark.col 3095 && (col == selection.mark.col
3082 && (row == selection.mark.row + TermWin.view_start))) 3096 && (row == selection.mark.row + TermWin.view_start)))
3083 { 3097 {
3084 /* select nothing */ 3098 /* select nothing */
3085 selection.beg.row = selection.end.row = 0; 3099 selection.beg.row = selection.end.row = 0;
3086 selection.beg.col = selection.end.col = 0; 3100 selection.beg.col = selection.end.col = 0;
3087 selection.clicks = 4; 3101 selection.clicks = 4;
3088 want_refresh = 1; 3102 want_refresh = 1;
3089 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3103 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3090 return; 3104 return;
3091 }
3092 } 3105 }
3093#endif 3106
3094 if (selection.clicks == 4) 3107 if (selection.clicks == 4)
3095 selection.clicks = 1; 3108 selection.clicks = 1;
3096 3109
3097 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3110 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3098 flag == 1 ? 1 : 0, /* ? button press */ 3111 flag == 1 ? 1 : 0, /* ? button press */
… …
3152 pos.col = col; 3165 pos.col = col;
3153 pos.row = row; 3166 pos.row = row;
3154 3167
3155 pos.row -= TermWin.view_start; /* adjust for scroll */ 3168 pos.row -= TermWin.view_start; /* adjust for scroll */
3156 3169
3157#ifndef NO_OLD_SELECTION
3158 /*
3159 * This mimics some of the selection behaviour of version 2.20 and before.
3160 * There are no ``selection modes'', button3 is always character extension.
3161 * Note: button3 drag is always available, c.f. v2.20
3162 * Selection always terminates (left or right as appropriate) at the mark.
3163 */
3164 if (selection_style == OLD_SELECT)
3165 {
3166 if (selection.clicks == 1 || button3)
3167 {
3168 if (hate_those_clicks)
3169 {
3170 hate_those_clicks = 0;
3171 if (selection.clicks == 1)
3172 {
3173 selection.beg.row = selection.mark.row;
3174 selection.beg.col = selection.mark.col;
3175 }
3176 else
3177 {
3178 selection.mark.row = selection.beg.row;
3179 selection.mark.col = selection.beg.col;
3180 }
3181 }
3182 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3183 {
3184 selection.end.row = selection.mark.row;
3185 selection.end.col = selection.mark.col + 1;
3186 selection.beg.row = pos.row;
3187 selection.beg.col = pos.col;
3188 }
3189 else
3190 {
3191 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col;
3193 selection.end.row = pos.row;
3194 selection.end.col = pos.col + 1;
3195 }
3196 }
3197 else if (selection.clicks == 2)
3198 {
3199 selection_delimit_word (UP, & (selection.mark),
3200 & (selection.beg));
3201 selection_delimit_word (DN, & (selection.mark),
3202 & (selection.end));
3203 hate_those_clicks = 1;
3204 }
3205 else if (selection.clicks == 3)
3206 {
3207 selection.beg.row = selection.end.row = selection.mark.row;
3208 selection.beg.col = 0;
3209 selection.end.col = ncol;
3210 hate_those_clicks = 1;
3211 }
3212 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));
3213 return;
3214 }
3215#endif /* ! NO_OLD_SELECTION */
3216#ifndef NO_NEW_SELECTION
3217 /* selection_style must not be OLD_SELECT to get here */
3218 /* 3170 /*
3219 * 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
3220 * in the way button3 drag extension works. 3172 * in the way button3 drag extension works.
3221 * We're either doing: button1 drag; button3 press; or button3 drag 3173 * We're either doing: button1 drag; button3 press; or button3 drag
3222 * 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
… …
3227 * 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
3228 * 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
3229 * time of the most recent button3 press 3181 * time of the most recent button3 press
3230 */ 3182 */
3231 if (button3 && buttonpress) 3183 if (button3 && buttonpress)
3232 { /* button3 press */ 3184 { /* button3 press */
3233 /* 3185 /*
3234 * first determine which edge of the selection we are closest to 3186 * first determine which edge of the selection we are closest to
3235 */ 3187 */
3236 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3188 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3237 || (!ROWCOL_IS_AFTER (pos, selection.end) 3189 || (!ROWCOL_IS_AFTER (pos, selection.end)
3238 && (((pos.col - selection.beg.col) 3190 && (((pos.col - selection.beg.col)
3239 + ((pos.row - selection.beg.row) * ncol)) 3191 + ((pos.row - selection.beg.row) * ncol))
3240 < ((selection.end.col - pos.col) 3192 < ((selection.end.col - pos.col)
3241 + ((selection.end.row - pos.row) * ncol))))) 3193 + ((selection.end.row - pos.row) * ncol)))))
3242 closeto = LEFT; 3194 closeto = LEFT;
3195
3243 if (closeto == LEFT) 3196 if (closeto == LEFT)
3244 { 3197 {
3245 selection.beg.row = pos.row; 3198 selection.beg.row = pos.row;
3246 selection.beg.col = pos.col; 3199 selection.beg.col = pos.col;
3247 selection.mark.row = selection.end.row; 3200 selection.mark.row = selection.end.row;
3248 selection.mark.col = selection.end.col 3201 selection.mark.col = selection.end.col - (selection.clicks == 2);
3249 - (selection.clicks == 2);
3250 } 3202 }
3251 else 3203 else
3252 { 3204 {
3253 selection.end.row = pos.row; 3205 selection.end.row = pos.row;
3254 selection.end.col = pos.col; 3206 selection.end.col = pos.col;
3255 selection.mark.row = selection.beg.row; 3207 selection.mark.row = selection.beg.row;
3256 selection.mark.col = selection.beg.col; 3208 selection.mark.col = selection.beg.col;
3257 } 3209 }
3258 } 3210 }
3259 else 3211 else
3260 { /* button1 drag or button3 drag */ 3212 { /* button1 drag or button3 drag */
3261 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3213 if (ROWCOL_IS_AFTER (selection.mark, pos))
3262 { 3214 {
3263 if ((selection.mark.row == selection.end.row) 3215 if ((selection.mark.row == selection.end.row)
3264 && (selection.mark.col == selection.end.col) 3216 && (selection.mark.col == selection.end.col)
3265 && clickchange && selection.clicks == 2) 3217 && clickchange && selection.clicks == 2)
3266 selection.mark.col--; 3218 selection.mark.col--;
3219
3267 selection.beg.row = pos.row; 3220 selection.beg.row = pos.row;
3268 selection.beg.col = pos.col; 3221 selection.beg.col = pos.col;
3269 selection.end.row = selection.mark.row; 3222 selection.end.row = selection.mark.row;
3270 selection.end.col = selection.mark.col 3223 selection.end.col = selection.mark.col + (selection.clicks == 2);
3271 + (selection.clicks == 2);
3272 } 3224 }
3273 else 3225 else
3274 { 3226 {
3275 selection.beg.row = selection.mark.row; 3227 selection.beg.row = selection.mark.row;
3276 selection.beg.col = selection.mark.col; 3228 selection.beg.col = selection.mark.col;
… …
3280 } 3232 }
3281 3233
3282 if (selection.clicks == 1) 3234 if (selection.clicks == 1)
3283 { 3235 {
3284 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3236 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3237
3285 if (end_col != -1 && selection.beg.col > end_col) 3238 if (end_col != -1 && selection.beg.col > end_col)
3286 { 3239 {
3287#if 1 3240#if 1
3288 selection.beg.col = ncol; 3241 selection.beg.col = ncol;
3289#else 3242#else
3290 if (selection.beg.row != selection.end.row) 3243 if (selection.beg.row != selection.end.row)
3291 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3292 else 3245 else
3293 selection.beg.col = selection.mark.col; 3246 selection.beg.col = selection.mark.col;
3294#endif 3247#endif
3295
3296 } 3248 }
3249
3297 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3250 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3251
3298 if (end_col != -1 && selection.end.col > end_col) 3252 if (end_col != -1 && selection.end.col > end_col)
3299 selection.end.col = ncol; 3253 selection.end.col = ncol;
3300
3301 } 3254 }
3302 else if (selection.clicks == 2) 3255 else if (selection.clicks == 2)
3303 { 3256 {
3304 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3257 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3305 selection.end.col--; 3258 selection.end.col--;
3259
3306 selection_delimit_word (UP, & (selection.beg), 3260 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3307 & (selection.beg));
3308 selection_delimit_word (DN, & (selection.end), 3261 selection_delimit_word (DN, & (selection.end), & (selection.end));
3309 & (selection.end));
3310 } 3262 }
3311 else if (selection.clicks == 3) 3263 else if (selection.clicks == 3)
3312 { 3264 {
3313#ifndef NO_FRILLS 3265#ifndef NO_FRILLS
3314 if ((Options & Opt_tripleclickwords)) 3266 if ((Options & Opt_tripleclickwords))
3315 { 3267 {
3316 int end_row; 3268 int end_row;
3317 3269
3318 selection_delimit_word (UP, & (selection.beg), 3270 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3319 & (selection.beg));
3320 end_row = screen.tlen[selection.mark.row 3271 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3321 + TermWin.saveLines]; 3272
3322 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3273 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3323 end_row++)
3324 { 3274 {
3325 end_col = screen.tlen[end_row + TermWin.saveLines]; 3275 end_col = screen.tlen[end_row + TermWin.saveLines];
3276
3326 if (end_col != -1) 3277 if (end_col != -1)
3327 { 3278 {
3328 selection.end.row = end_row; 3279 selection.end.row = end_row;
3329 selection.end.col = end_col; 3280 selection.end.col = end_col;
3330 selection_remove_trailing_spaces (); 3281 selection_remove_trailing_spaces ();
… …
3332 } 3283 }
3333 } 3284 }
3334 } 3285 }
3335 else 3286 else
3336#endif 3287#endif
3337
3338 { 3288 {
3339 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3289 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3340 selection.mark.col++; 3290 selection.mark.col++;
3341 selection.beg.col = 0; 3291 selection.beg.col = 0;
3342 selection.end.col = ncol; 3292 selection.end.col = ncol;
3343 } 3293 }
3344 } 3294 }
3295
3345 if (button3 && buttonpress) 3296 if (button3 && buttonpress)
3346 { /* mark may need to be changed */ 3297 { /* mark may need to be changed */
3347 if (closeto == LEFT) 3298 if (closeto == LEFT)
3348 { 3299 {
3349 selection.mark.row = selection.end.row; 3300 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col 3301 selection.mark.col = selection.end.col
3351 - (selection.clicks == 2); 3302 - (selection.clicks == 2);
… …
3355 selection.mark.row = selection.beg.row; 3306 selection.mark.row = selection.beg.row;
3356 selection.mark.col = selection.beg.col; 3307 selection.mark.col = selection.beg.col;
3357 } 3308 }
3358 } 3309 }
3359 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));
3360#endif /* ! NO_NEW_SELECTION */
3361} 3311}
3362 3312
3363#ifndef NO_FRILLS 3313#ifndef NO_FRILLS
3364void 3314void
3365rxvt_term::selection_remove_trailing_spaces () 3315rxvt_term::selection_remove_trailing_spaces ()
… …
3464 /* TODO: Handle MULTIPLE */ 3414 /* TODO: Handle MULTIPLE */
3465 } 3415 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3416 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3467 { 3417 {
3468 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3418 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3469 (8 * sizeof (Time)), PropModeReplace, 3419 (8 * sizeof (Time)), PropModeReplace,
3470 (unsigned char *)&selection_time, 1); 3420 (unsigned char *)&selection_time, 1);
3471 ev.property = rq.property; 3421 ev.property = rq.property;
3472 } 3422 }
3473 else if (rq.target == XA_STRING 3423 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3424 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3425 || rq.target == xa[XA_COMPOUND_TEXT]

Diff Legend

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