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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.68 by pcg, Sun Apr 4 14:35:00 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));
564 557
565 TermWin.view_start = 0; 558 TermWin.view_start = 0;
566 559
567 if (current_screen == scrn) 560 if (current_screen == scrn)
568 return current_screen; 561 return scrn;
569 562
570 selection_check (2); /* check for boundary cross */ 563 selection_check (2); /* check for boundary cross */
571 564
572 SWAP_IT (current_screen, scrn, int); 565 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 566#if NSCREENS
567 if (Options & Opt_secondaryScreen)
568 {
574 num_scr = 0; 569 num_scr = 0;
575 offset = TermWin.saveLines; 570 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) 571 for (i = prev_nrow; i--;)
577 { 572 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 573 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 574 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 575 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 576 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 577 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 578 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT 579# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 580 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 581 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */ 582# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0); 583 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 584 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0); 585 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 586 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif 587# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
597#else 592 }
598# ifdef SCROLL_ON_NO_SECONDARY 593 else
594#endif
595 if (Options & Opt_secondaryScroll)
599 if (current_screen == PRIMARY) 596 //if (current_screen == PRIMARY)
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 597 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
601# endif
602#endif
603 return scrn; 598 return scrn;
604} 599}
605 600
606/* ------------------------------------------------------------------------- */ 601/* ------------------------------------------------------------------------- */
607/* 602/*
… …
649 return 0; 644 return 0;
650 645
651 want_refresh = 1; 646 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 647 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
653 648
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 649 if (row1 == 0 && count > 0
650 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
655 { 651 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 652 nscrolled = (long)TermWin.nscrolled + (long)count;
657 653
658 if (nscrolled > (long)TermWin.saveLines) 654 if (nscrolled > (long)TermWin.saveLines)
659 TermWin.nscrolled = TermWin.saveLines; 655 TermWin.nscrolled = TermWin.saveLines;
… …
762/* ------------------------------------------------------------------------- */ 758/* ------------------------------------------------------------------------- */
763/* 759/*
764 * Add text given in <str> of length <len> to screen struct 760 * Add text given in <str> of length <len> to screen struct
765 */ 761 */
766void 762void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 763rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
768{ 764{
769 unsigned char checksel, clearsel; 765 unsigned char checksel, clearsel;
770 uint32_t c; 766 unicode_t c;
771 int i, row, last_col; 767 int i, row, last_col;
772 text_t *stp; 768 text_t *stp;
773 rend_t *srp; 769 rend_t *srp;
774 770
775 if (len <= 0) /* sanity */ 771 if (len <= 0) /* sanity */
… …
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 797 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 798 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 799#endif
804 row = screen.cur.row + TermWin.saveLines; 800 row = screen.cur.row + TermWin.saveLines;
805 801
806 checksel = (selection.op 802 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 803 clearsel = 0;
809 804
810 stp = screen.text[row]; 805 stp = screen.text[row];
811 srp = screen.rend[row]; 806 srp = screen.rend[row];
812 807
813 for (i = 0; i < len;) 808 while (len--)
814 { 809 {
815 c = str[i++]; 810 c = *str++;
811
812 if (c < 0x20)
816 switch (c) 813 switch (c)
817 { 814 {
818 case '\t': 815 case '\t':
819 scr_tab (1); 816 scr_tab (1);
820 continue; 817 continue;
818
821 case '\n': 819 case '\n':
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 820 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 821 MAX_IT (screen.tlen[row], screen.cur.col);
822
824 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
824
825 if (screen.cur.row == screen.bscroll) 825 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 827 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 828 row = (++screen.cur.row) + TermWin.saveLines;
829
829 stp = screen.text[row]; /* _must_ refresh */ 830 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 831 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 832 continue;
833
832 case '\r': 834 case '\r':
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 835 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 836 MAX_IT (screen.tlen[row], screen.cur.col);
837
835 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 839 screen.cur.col = 0;
837 continue; 840 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 841 }
843 842
844 if (checksel /* see if we're writing within selection */ 843 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 844 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 845 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 846 {
… …
866 if (screen.flags & Screen_Insert) 865 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 866 scr_insdel_chars (1, INSERT);
868 867
869 // rely on wcwidth to tell us the character width, at least for non-latin1 868 // rely on wcwidth to tell us the character width, at least for non-latin1
870 // do wcwidth before further replacements, as wcwidth says that line-drawing 869 // do wcwidth before further replacements, as wcwidth says that line-drawing
871 // characters have width -1 (DOH!) on gnu/linux sometimes. 870 // characters have width -1 (DOH!) on GNU/Linux sometimes.
872 int width = c < 256 ? 1 : wcwidth (c); 871 int width = c < 256 ? 1 : wcwidth (c);
873 872
874 if (charsets[screen.charset] == '0') // DEC SPECIAL 873 if (charsets[screen.charset] == '0') // DEC SPECIAL
875 switch (c)
876 { 874 {
877 // vt100 special graphics and line drawing 875 // vt100 special graphics and line drawing
878 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 876 static uint16_t vt100_0[32] = { // 5f .. 7e
879 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 877 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
880 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 878 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
881 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 879 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
882 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 880 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7,
883 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break;
884 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break;
885 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break;
886 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break;
887 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break;
888 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
889 } 881 };
882
883 if (c >= 0x5f && c <= 0x7e)
884 {
885 c = vt100_0[c - 0x5f];
886 width = 1;
887 }
888 }
890 889
891 if (width > 0) 890 if (width > 0)
892 { 891 {
893#if !UNICODE_3 && ENABLE_COMBINING 892#if !UNICODE_3 && ENABLE_COMBINING
894 // trim characters we can't store directly :( 893 // trim characters we can't store directly :(
… …
951 // handle double-width-chars by making them look extremely ugly 950 // handle double-width-chars by making them look extremely ugly
952 if (*tp == NOCHAR) 951 if (*tp == NOCHAR)
953 *tp = ' '; // hack //D //TODO //--tp, --rp; 952 *tp = ' '; // hack //D //TODO //--tp, --rp;
954 953
955 // first try to find a precomposed character 954 // first try to find a precomposed character
956 uint32_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
957 if (n == NOCHAR) 956 if (n == NOCHAR)
958 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
959 958
960 *tp = n; 959 *tp = n;
961 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 960 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
… …
1014 * XTERM_SEQ: CTRL-I 1013 * XTERM_SEQ: CTRL-I
1015 */ 1014 */
1016void 1015void
1017rxvt_term::scr_tab (int count) 1016rxvt_term::scr_tab (int count)
1018{ 1017{
1019 int i, x; 1018 int i, x;
1020 1019
1021 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1020 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1022 want_refresh = 1; 1021 want_refresh = 1;
1023 i = x = screen.cur.col; 1022 i = x = screen.cur.col;
1023
1024 if (count == 0) 1024 if (count == 0)
1025 return; 1025 return;
1026 else if (count > 0) 1026 else if (count > 0)
1027 { 1027 {
1028 for (; ++i < TermWin.ncol; ) 1028 for (; ++i < TermWin.ncol; )
… …
1030 { 1030 {
1031 x = i; 1031 x = i;
1032 if (!--count) 1032 if (!--count)
1033 break; 1033 break;
1034 } 1034 }
1035
1035 if (count) 1036 if (count)
1036 x = TermWin.ncol - 1; 1037 x = TermWin.ncol - 1;
1037 } 1038 }
1038 else /* if (count < 0) */ 1039 else /* if (count < 0) */
1039 { 1040 {
… …
1042 { 1043 {
1043 x = i; 1044 x = i;
1044 if (!++count) 1045 if (!++count)
1045 break; 1046 break;
1046 } 1047 }
1048
1047 if (count) 1049 if (count)
1048 x = 0; 1050 x = 0;
1049 } 1051 }
1052
1050 if (x != screen.cur.col) 1053 if (x != screen.cur.col)
1051 scr_gotorc (0, x, R_RELATIVE); 1054 scr_gotorc (0, x, R_RELATIVE);
1052} 1055}
1053 1056
1054/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1247 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1248 */ 1251 */
1249void 1252void
1250rxvt_term::scr_erase_screen (int mode) 1253rxvt_term::scr_erase_screen (int mode)
1251{ 1254{
1252 int num; 1255 int num;
1253 int32_t row, row_offset; 1256 int32_t row, row_offset;
1254 rend_t ren; 1257 rend_t ren;
1255 XGCValues gcvalue; 1258 XGCValues gcvalue;
1256 1259
1257 want_refresh = 1; 1260 want_refresh = 1;
1258 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1261 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1259 ZERO_SCROLLBACK (); 1262 ZERO_SCROLLBACK ();
1260 row_offset = (int32_t)TermWin.saveLines; 1263 row_offset = (int32_t)TermWin.saveLines;
… …
1279 num = TermWin.nrow; 1282 num = TermWin.nrow;
1280 break; 1283 break;
1281 default: 1284 default:
1282 return; 1285 return;
1283 } 1286 }
1287
1284 refresh_type |= REFRESH_BOUNDS; 1288 refresh_type |= REFRESH_BOUNDS;
1289
1285 if (selection.op && current_screen == selection.screen 1290 if (selection.op && current_screen == selection.screen
1286 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1291 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1287 || (selection.end.row >= row 1292 || (selection.end.row >= row
1288 && selection.end.row <= row + num))) 1293 && selection.end.row <= row + num)))
1289 CLEAR_SELECTION (); 1294 CLEAR_SELECTION ();
1295
1290 if (row >= TermWin.nrow) /* Out Of Bounds */ 1296 if (row >= TermWin.nrow) /* Out Of Bounds */
1291 return; 1297 return;
1298
1292 MIN_IT (num, (TermWin.nrow - row)); 1299 MIN_IT (num, (TermWin.nrow - row));
1300
1293 if (rstyle & (RS_RVid | RS_Uline)) 1301 if (rstyle & (RS_RVid | RS_Uline))
1294 ren = (rend_t) ~RS_None; 1302 ren = (rend_t) ~RS_None;
1295 else if (GET_BASEBG (rstyle) == Color_bg) 1303 else if (GET_BASEBG (rstyle) == Color_bg)
1296 { 1304 {
1297 ren = DEFAULT_RSTYLE; 1305 ren = DEFAULT_RSTYLE;
… …
1304 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1305 ERASE_ROWS (row, num); 1313 ERASE_ROWS (row, num);
1306 gcvalue.foreground = PixColors[Color_fg]; 1314 gcvalue.foreground = PixColors[Color_fg];
1307 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1315 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1308 } 1316 }
1317
1309 for (; num--; row++) 1318 for (; num--; row++)
1310 { 1319 {
1311 scr_blank_screen_mem (screen.text, screen.rend, 1320 scr_blank_screen_mem (screen.text, screen.rend,
1312 (unsigned int) (row + row_offset), rstyle); 1321 (unsigned int) (row + row_offset), rstyle);
1313 screen.tlen[row + row_offset] = 0; 1322 screen.tlen[row + row_offset] = 0;
… …
1347 * Insert/Delete <count> lines 1356 * Insert/Delete <count> lines
1348 */ 1357 */
1349void 1358void
1350rxvt_term::scr_insdel_lines (int count, int insdel) 1359rxvt_term::scr_insdel_lines (int count, int insdel)
1351{ 1360{
1352 int end; 1361 int end;
1353 1362
1354 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
1355 1364
1356 selection_check (1); 1365 selection_check (1);
1357 1366
… …
1376 * Insert/Delete <count> characters from the current position 1385 * Insert/Delete <count> characters from the current position
1377 */ 1386 */
1378void 1387void
1379rxvt_term::scr_insdel_chars (int count, int insdel) 1388rxvt_term::scr_insdel_chars (int count, int insdel)
1380{ 1389{
1381 int col, row; 1390 int col, row;
1382 rend_t tr; 1391 rend_t tr;
1383 text_t *stp; 1392 text_t *stp;
1384 rend_t *srp; 1393 rend_t *srp;
1385 int16_t *slp; 1394 int16_t *slp;
1386 1395
1387 want_refresh = 1; 1396 want_refresh = 1;
1388 ZERO_SCROLLBACK (); 1397 ZERO_SCROLLBACK ();
1389 1398
1390 if (count <= 0) 1399 if (count <= 0)
… …
1397 screen.flags &= ~Screen_WrapNext; 1406 screen.flags &= ~Screen_WrapNext;
1398 1407
1399 stp = screen.text[row]; 1408 stp = screen.text[row];
1400 srp = screen.rend[row]; 1409 srp = screen.rend[row];
1401 slp = & (screen.tlen[row]); 1410 slp = & (screen.tlen[row]);
1411
1402 switch (insdel) 1412 switch (insdel)
1403 { 1413 {
1404 case INSERT: 1414 case INSERT:
1405 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1415 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1406 col--) 1416 col--)
1407 { 1417 {
1408 stp[col] = stp[col - count]; 1418 stp[col] = stp[col - count];
1409 srp[col] = srp[col - count]; 1419 srp[col] = srp[col - count];
1410 } 1420 }
1421
1411 if (*slp != -1) 1422 if (*slp != -1)
1412 { 1423 {
1413 *slp += count; 1424 *slp += count;
1414 MIN_IT (*slp, TermWin.ncol); 1425 MIN_IT (*slp, TermWin.ncol);
1415 } 1426 }
1427
1416 if (selection.op && current_screen == selection.screen 1428 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1429 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1430 {
1419 if (selection.end.row != screen.cur.row 1431 if (selection.end.row != screen.cur.row
1420 || (selection.end.col + count >= TermWin.ncol)) 1432 || (selection.end.col + count >= TermWin.ncol))
… …
1424 selection.beg.col += count; 1436 selection.beg.col += count;
1425 selection.mark.col += count; /* XXX: yes? */ 1437 selection.mark.col += count; /* XXX: yes? */
1426 selection.end.col += count; 1438 selection.end.col += count;
1427 } 1439 }
1428 } 1440 }
1441
1429 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1442 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1430 (unsigned int)count, rstyle); 1443 (unsigned int)count, rstyle);
1431 break; 1444 break;
1445
1432 case ERASE: 1446 case ERASE:
1433 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1447 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1434 selection_check (1); 1448 selection_check (1);
1435 screen.cur.col -= count; 1449 screen.cur.col -= count;
1436 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1437 (unsigned int)count, rstyle); 1451 (unsigned int)count, rstyle);
1438 break; 1452 break;
1453
1439 case DELETE: 1454 case DELETE:
1440 tr = srp[TermWin.ncol - 1]
1441 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1455 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1456
1442 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1457 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1443 { 1458 {
1444 stp[col] = stp[col + count]; 1459 stp[col] = stp[col + count];
1445 srp[col] = srp[col + count]; 1460 srp[col] = srp[col + count];
1446 } 1461 }
1462
1447 scr_blank_line (& (stp[TermWin.ncol - count]), 1463 scr_blank_line (& (stp[TermWin.ncol - count]),
1448 & (srp[TermWin.ncol - count]), 1464 & (srp[TermWin.ncol - count]),
1449 (unsigned int)count, tr); 1465 (unsigned int)count, tr);
1466
1450 if (*slp == -1) /* break line continuation */ 1467 if (*slp == -1) /* break line continuation */
1451 *slp = TermWin.ncol; 1468 *slp = TermWin.ncol;
1469
1452 *slp -= count; 1470 *slp -= count;
1453 MAX_IT (*slp, 0); 1471 MAX_IT (*slp, 0);
1472
1454 if (selection.op && current_screen == selection.screen 1473 if (selection.op && current_screen == selection.screen
1455 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1474 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1456 { 1475 {
1457 if (selection.end.row != screen.cur.row 1476 if (selection.end.row != screen.cur.row
1458 || (screen.cur.col >= selection.beg.col - count) 1477 || (screen.cur.col >= selection.beg.col - count)
… …
1464 selection.beg.col -= count; 1483 selection.beg.col -= count;
1465 selection.mark.col -= count; /* XXX: yes? */ 1484 selection.mark.col -= count; /* XXX: yes? */
1466 selection.end.col -= count; 1485 selection.end.col -= count;
1467 } 1486 }
1468 } 1487 }
1488
1469 break; 1489 break;
1470 } 1490 }
1471} 1491}
1472 1492
1473/* ------------------------------------------------------------------------- */ 1493/* ------------------------------------------------------------------------- */
… …
1478void 1498void
1479rxvt_term::scr_scroll_region (int top, int bot) 1499rxvt_term::scr_scroll_region (int top, int bot)
1480{ 1500{
1481 MAX_IT (top, 0); 1501 MAX_IT (top, 0);
1482 MIN_IT (bot, (int)TermWin.nrow - 1); 1502 MIN_IT (bot, (int)TermWin.nrow - 1);
1503
1483 if (top > bot) 1504 if (top > bot)
1484 return; 1505 return;
1506
1485 screen.tscroll = top; 1507 screen.tscroll = top;
1486 screen.bscroll = bot; 1508 screen.bscroll = bot;
1487 scr_gotorc (0, 0, 0); 1509 scr_gotorc (0, 0, 0);
1488} 1510}
1489 1511
… …
1947 1969
1948 /* 1970 /*
1949 * C: set the cursor character (s) 1971 * C: set the cursor character (s)
1950 */ 1972 */
1951 { 1973 {
1952 unsigned char setoldcursor; 1974 unsigned char setoldcursor;
1953 rend_t ccol1, /* Cursor colour */ 1975 rend_t ccol1, /* Cursor colour */
1954 ccol2; /* Cursor colour2 */ 1976 ccol2; /* Cursor colour2 */
1955 1977
1956 showcursor = (screen.flags & Screen_VisibleCursor); 1978 showcursor = (screen.flags & Screen_VisibleCursor);
1957#ifdef CURSOR_BLINK 1979#ifdef CURSOR_BLINK
1958 if (hidden_cursor) 1980 if (hidden_cursor)
1959 showcursor = 0; 1981 showcursor = 0;
1960#endif 1982#endif
1961 1983
1962 if (showcursor) 1984 if (showcursor)
1963 { 1985 {
1964 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1986 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1965 [screen.cur.col]);
1966 1987
1967 if (showcursor && TermWin.focus) 1988 if (showcursor && TermWin.focus)
1968 { 1989 {
1969 *srp ^= RS_RVid; 1990 *srp ^= RS_RVid;
1970#ifndef NO_CURSORCOLOR 1991#ifndef NO_CURSORCOLOR
… …
1998 if (screen.cur.row + TermWin.view_start != ocrow 2019 if (screen.cur.row + TermWin.view_start != ocrow
1999 || screen.cur.col != oldcursor.col) 2020 || screen.cur.col != oldcursor.col)
2000 { 2021 {
2001 if (ocrow < TermWin.nrow 2022 if (ocrow < TermWin.nrow
2002 && oldcursor.col < TermWin.ncol) 2023 && oldcursor.col < TermWin.ncol)
2003 {
2004 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2024 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2005 } 2025
2006 if (TermWin.focus || !showcursor) 2026 if (TermWin.focus || !showcursor)
2007 oldcursor.row = -1; 2027 oldcursor.row = -1;
2008 else 2028 else
2009 setoldcursor = 1; 2029 setoldcursor = 1;
2010 } 2030 }
2011 } 2031 }
2012 else if (!TermWin.focus) 2032 else if (!TermWin.focus)
2013 setoldcursor = 1; 2033 setoldcursor = 1;
2034
2014 if (setoldcursor) 2035 if (setoldcursor)
2015 { 2036 {
2016 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2037 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2017 oldcursor.row = -1; 2038 oldcursor.row = -1;
2018 else 2039 else
… …
2030 */ 2051 */
2031 i = num_scr; 2052 i = num_scr;
2032 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2053 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2033 && abs (i) < TermWin.nrow && !must_clear) 2054 && abs (i) < TermWin.nrow && !must_clear)
2034 { 2055 {
2035 int16_t nits; 2056 int16_t nits;
2036 int j; 2057 int j;
2037 rend_t *drp2; 2058 rend_t *drp2;
2038 text_t *dtp2; 2059 text_t *dtp2;
2039 int len, wlen; 2060 int len, wlen;
2040 2061
2041 j = TermWin.nrow; 2062 j = TermWin.nrow;
2042 wlen = len = -1; 2063 wlen = len = -1;
2043 row = i > 0 ? 0 : j - 1; 2064 row = i > 0 ? 0 : j - 1;
2044 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2620void 2641void
2621rxvt_term::incr_cb (time_watcher &w) 2642rxvt_term::incr_cb (time_watcher &w)
2622{ 2643{
2623 selection_wait = Sel_none; 2644 selection_wait = Sel_none;
2624 2645
2625 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2646 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2626} 2647}
2627 2648
2628/* 2649/*
2629 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2650 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2630 */ 2651 */
… …
2709 { 2730 {
2710 int i; 2731 int i;
2711 2732
2712 selection_request_time = tm; 2733 selection_request_time = tm;
2713 selection_wait = Sel_normal; 2734 selection_wait = Sel_normal;
2735
2714 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2736 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2715 { 2737 {
2716#if X_HAVE_UTF8_STRING 2738#if X_HAVE_UTF8_STRING
2717 selection_type = Sel_UTF8String; 2739 selection_type = Sel_UTF8String;
2718 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2740 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2772 want_refresh = 1; 2794 want_refresh = 1;
2773 free (selection.text); 2795 free (selection.text);
2774 selection.text = NULL; 2796 selection.text = NULL;
2775 selection.len = 0; 2797 selection.len = 0;
2776 CLEAR_SELECTION (); 2798 CLEAR_SELECTION ();
2799
2800 if (display->selection_owner == this)
2801 display->selection_owner = 0;
2777} 2802}
2778 2803
2779/* ------------------------------------------------------------------------- */ 2804/* ------------------------------------------------------------------------- */
2780/* 2805/*
2781 * Copy a selection into the cut buffer 2806 * Copy a selection into the cut buffer
… …
2857 2882
2858 if (screen.tlen[row] != -1 && row != end_row) 2883 if (screen.tlen[row] != -1 && row != end_row)
2859 new_selection_text[ofs++] = L'\n'; 2884 new_selection_text[ofs++] = L'\n';
2860 } 2885 }
2861 2886
2862#ifndef NO_OLD_SELECTION 2887 if (end_col != selection.end.col)
2863 if (selection_style == OLD_SELECT)
2864 if (end_col == TermWin.ncol)
2865 new_selection_text[ofs++] = L'\n'; 2888 new_selection_text[ofs++] = L'\n';
2866#endif 2889
2867#ifndef NO_NEW_SELECTION
2868 if (selection_style != OLD_SELECT)
2869 if (end_col != selection.end.col)
2870 new_selection_text[ofs++] = L'\n';
2871#endif
2872 new_selection_text[ofs] = 0; 2890 new_selection_text[ofs] = 0;
2873 2891
2874 if (ofs == 0) 2892 if (ofs == 0)
2875 { 2893 {
2876 free (new_selection_text); 2894 free (new_selection_text);
… …
2885 2903
2886 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2904 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2887 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2905 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2888 display->set_selection_owner (this); 2906 display->set_selection_owner (this);
2889 else 2907 else
2890 rxvt_print_error ("can't get primary selection"); 2908 rxvt_warn ("can't get primary selection, ignoring.\n");
2891 2909
2892#if 0 2910#if 0
2893 XTextProperty ct; 2911 XTextProperty ct;
2894 2912
2895 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2913 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
2935rxvt_term::selection_start_colrow (int col, int row) 2953rxvt_term::selection_start_colrow (int col, int row)
2936{ 2954{
2937 want_refresh = 1; 2955 want_refresh = 1;
2938 selection.mark.col = col; 2956 selection.mark.col = col;
2939 selection.mark.row = row - TermWin.view_start; 2957 selection.mark.row = row - TermWin.view_start;
2958
2940 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2959 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2941 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2960 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2942 MAX_IT (selection.mark.col, 0); 2961 MAX_IT (selection.mark.col, 0);
2943 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2962 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2944 2963
2964 while (selection.mark.col > 0
2965 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2966 --selection.mark.col;
2967
2945 if (selection.op) 2968 if (selection.op)
2946 { /* clear the old selection */ 2969 { /* clear the old selection */
2947 selection.beg.row = selection.end.row = selection.mark.row; 2970 selection.beg.row = selection.end.row = selection.mark.row;
2948 selection.beg.col = selection.end.col = selection.mark.col; 2971 selection.beg.col = selection.end.col = selection.mark.col;
2949 } 2972 }
2973
2950 selection.op = SELECTION_INIT; 2974 selection.op = SELECTION_INIT;
2951 selection.screen = current_screen; 2975 selection.screen = current_screen;
2952} 2976}
2953 2977
2954/* ------------------------------------------------------------------------- */ 2978/* ------------------------------------------------------------------------- */
… …
2956 * Word select: select text for 2 clicks 2980 * Word select: select text for 2 clicks
2957 * We now only find out the boundary in one direction 2981 * We now only find out the boundary in one direction
2958 */ 2982 */
2959 2983
2960/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2984/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2961#define DELIMIT_TEXT(x) \ 2985#define DELIMIT_TEXT(x) \
2962 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2986 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2963#define DELIMIT_REND(x) 1 2987#define DELIMIT_REND(x) 1
2964 2988
2965void 2989void
2966rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2990rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2967{ 2991{
2968 int col, row, dirnadd, tcol, trow, w1, w2; 2992 int col, row, dirnadd, tcol, trow, w1, w2;
2969 row_col_t bound; 2993 row_col_t bound;
2970 text_t *stp; 2994 text_t *stp;
2971 rend_t *srp; 2995 rend_t *srp;
2972 2996
2973 if (dirn == UP) 2997 if (dirn == UP)
2974 { 2998 {
2975 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 2999 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2976 bound.col = 0; 3000 bound.col = 0;
… …
2980 { 3004 {
2981 bound.row = TermWin.saveLines + TermWin.nrow; 3005 bound.row = TermWin.saveLines + TermWin.nrow;
2982 bound.col = TermWin.ncol - 1; 3006 bound.col = TermWin.ncol - 1;
2983 dirnadd = 1; 3007 dirnadd = 1;
2984 } 3008 }
3009
2985 row = mark->row + TermWin.saveLines; 3010 row = mark->row + TermWin.saveLines;
2986 col = mark->col; 3011 col = mark->col;
2987 MAX_IT (col, 0); 3012 MAX_IT (col, 0);
2988 /* find the edge of a word */ 3013 /* find the edge of a word */
2989 stp = & (screen.text[row][col]); 3014 stp = & (screen.text[row][col]);
2990 w1 = DELIMIT_TEXT (*stp); 3015 w1 = DELIMIT_TEXT (*stp);
2991 3016
2992 if (selection_style != NEW_SELECT)
2993 {
2994 if (w1 == 1)
2995 {
2996 stp += dirnadd;
2997 if (DELIMIT_TEXT (*stp) == 1)
2998 goto Old_Word_Selection_You_Die;
2999 col += dirnadd;
3000 }
3001 w1 = 0;
3002 }
3003 srp = (&screen.rend[row][col]); 3017 srp = (&screen.rend[row][col]);
3004 w2 = DELIMIT_REND (*srp); 3018 w2 = DELIMIT_REND (*srp);
3005 3019
3006 for (;;) 3020 for (;;)
3007 { 3021 {
3008 for (; col != bound.col; col += dirnadd) 3022 for (; col != bound.col; col += dirnadd)
3009 { 3023 {
3010 stp += dirnadd; 3024 stp += dirnadd;
3025 srp += dirnadd;
3026
3027 if (*stp == NOCHAR)
3028 continue;
3029
3011 if (DELIMIT_TEXT (*stp) != w1) 3030 if (DELIMIT_TEXT (*stp) != w1)
3012 break; 3031 break;
3013 srp += dirnadd;
3014 if (DELIMIT_REND (*srp) != w2) 3032 if (DELIMIT_REND (*srp) != w2)
3015 break; 3033 break;
3016 } 3034 }
3035
3017 if ((col == bound.col) && (row != bound.row)) 3036 if ((col == bound.col) && (row != bound.row))
3018 { 3037 {
3019 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3038 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3020 { 3039 {
3021 trow = row + dirnadd; 3040 trow = row + dirnadd;
3022 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3041 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3042
3023 if (screen.text[trow] == NULL) 3043 if (screen.text[trow] == NULL)
3024 break; 3044 break;
3045
3025 stp = & (screen.text[trow][tcol]); 3046 stp = & (screen.text[trow][tcol]);
3026 srp = & (screen.rend[trow][tcol]); 3047 srp = & (screen.rend[trow][tcol]);
3048
3027 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3049 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3028 break; 3050 break;
3051
3029 row = trow; 3052 row = trow;
3030 col = tcol; 3053 col = tcol;
3031 continue; 3054 continue;
3032 } 3055 }
3033 } 3056 }
3034 break; 3057 break;
3035 } 3058 }
3059
3036Old_Word_Selection_You_Die: 3060Old_Word_Selection_You_Die:
3037 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); 3061 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3038 3062
3039 if (dirn == DN) 3063 if (dirn == DN)
3040 col++; /* put us on one past the end */ 3064 col++; /* put us on one past the end */
… …
3062 MAX_IT (row, 0); 3086 MAX_IT (row, 0);
3063 MIN_IT (row, (int)TermWin.nrow - 1); 3087 MIN_IT (row, (int)TermWin.nrow - 1);
3064 MAX_IT (col, 0); 3088 MAX_IT (col, 0);
3065 MIN_IT (col, (int)TermWin.ncol); 3089 MIN_IT (col, (int)TermWin.ncol);
3066 3090
3067#ifndef NO_NEW_SELECTION
3068 /* 3091 /*
3069 * If we're selecting characters (single click) then we must check first 3092 * If we're selecting characters (single click) then we must check first
3070 * if we are at the same place as the original mark. If we are then 3093 * if we are at the same place as the original mark. If we are then
3071 * select nothing. Otherwise, if we're to the right of the mark, you have to 3094 * select nothing. Otherwise, if we're to the right of the mark, you have to
3072 * be _past_ a character for it to be selected. 3095 * be _past_ a character for it to be selected.
3073 */ 3096 */
3074 if (selection_style != OLD_SELECT)
3075 {
3076 if (((selection.clicks % 3) == 1) && !flag 3097 if (((selection.clicks % 3) == 1) && !flag
3077 && (col == selection.mark.col 3098 && (col == selection.mark.col
3078 && (row == selection.mark.row + TermWin.view_start))) 3099 && (row == selection.mark.row + TermWin.view_start)))
3079 { 3100 {
3080 /* select nothing */ 3101 /* select nothing */
3081 selection.beg.row = selection.end.row = 0; 3102 selection.beg.row = selection.end.row = 0;
3082 selection.beg.col = selection.end.col = 0; 3103 selection.beg.col = selection.end.col = 0;
3083 selection.clicks = 4; 3104 selection.clicks = 4;
3084 want_refresh = 1; 3105 want_refresh = 1;
3085 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3106 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3086 return; 3107 return;
3087 }
3088 } 3108 }
3089#endif 3109
3090 if (selection.clicks == 4) 3110 if (selection.clicks == 4)
3091 selection.clicks = 1; 3111 selection.clicks = 1;
3092 3112
3093 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3113 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3094 flag == 1 ? 1 : 0, /* ? button press */ 3114 flag == 1 ? 1 : 0, /* ? button press */
… …
3148 pos.col = col; 3168 pos.col = col;
3149 pos.row = row; 3169 pos.row = row;
3150 3170
3151 pos.row -= TermWin.view_start; /* adjust for scroll */ 3171 pos.row -= TermWin.view_start; /* adjust for scroll */
3152 3172
3153#ifndef NO_OLD_SELECTION
3154 /*
3155 * This mimics some of the selection behaviour of version 2.20 and before.
3156 * There are no ``selection modes'', button3 is always character extension.
3157 * Note: button3 drag is always available, c.f. v2.20
3158 * Selection always terminates (left or right as appropriate) at the mark.
3159 */
3160 if (selection_style == OLD_SELECT)
3161 {
3162 if (selection.clicks == 1 || button3)
3163 {
3164 if (hate_those_clicks)
3165 {
3166 hate_those_clicks = 0;
3167 if (selection.clicks == 1)
3168 {
3169 selection.beg.row = selection.mark.row;
3170 selection.beg.col = selection.mark.col;
3171 }
3172 else
3173 {
3174 selection.mark.row = selection.beg.row;
3175 selection.mark.col = selection.beg.col;
3176 }
3177 }
3178 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3179 {
3180 selection.end.row = selection.mark.row;
3181 selection.end.col = selection.mark.col + 1;
3182 selection.beg.row = pos.row;
3183 selection.beg.col = pos.col;
3184 }
3185 else
3186 {
3187 selection.beg.row = selection.mark.row;
3188 selection.beg.col = selection.mark.col;
3189 selection.end.row = pos.row;
3190 selection.end.col = pos.col + 1;
3191 }
3192 }
3193 else if (selection.clicks == 2)
3194 {
3195 selection_delimit_word (UP, & (selection.mark),
3196 & (selection.beg));
3197 selection_delimit_word (DN, & (selection.mark),
3198 & (selection.end));
3199 hate_those_clicks = 1;
3200 }
3201 else if (selection.clicks == 3)
3202 {
3203 selection.beg.row = selection.end.row = selection.mark.row;
3204 selection.beg.col = 0;
3205 selection.end.col = ncol;
3206 hate_those_clicks = 1;
3207 }
3208 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));
3209 return;
3210 }
3211#endif /* ! NO_OLD_SELECTION */
3212#ifndef NO_NEW_SELECTION
3213 /* selection_style must not be OLD_SELECT to get here */
3214 /* 3173 /*
3215 * This is mainly xterm style selection with a couple of differences, mainly 3174 * This is mainly xterm style selection with a couple of differences, mainly
3216 * in the way button3 drag extension works. 3175 * in the way button3 drag extension works.
3217 * We're either doing: button1 drag; button3 press; or button3 drag 3176 * We're either doing: button1 drag; button3 press; or button3 drag
3218 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3177 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3223 * a point/word/line which is either the start or end of the selection 3182 * a point/word/line which is either the start or end of the selection
3224 * and it was decided by whichever point/word/line was `fixed' at the 3183 * and it was decided by whichever point/word/line was `fixed' at the
3225 * time of the most recent button3 press 3184 * time of the most recent button3 press
3226 */ 3185 */
3227 if (button3 && buttonpress) 3186 if (button3 && buttonpress)
3228 { /* button3 press */ 3187 { /* button3 press */
3229 /* 3188 /*
3230 * first determine which edge of the selection we are closest to 3189 * first determine which edge of the selection we are closest to
3231 */ 3190 */
3232 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3191 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3233 || (!ROWCOL_IS_AFTER (pos, selection.end) 3192 || (!ROWCOL_IS_AFTER (pos, selection.end)
3234 && (((pos.col - selection.beg.col) 3193 && (((pos.col - selection.beg.col)
3235 + ((pos.row - selection.beg.row) * ncol)) 3194 + ((pos.row - selection.beg.row) * ncol))
3236 < ((selection.end.col - pos.col) 3195 < ((selection.end.col - pos.col)
3237 + ((selection.end.row - pos.row) * ncol))))) 3196 + ((selection.end.row - pos.row) * ncol)))))
3238 closeto = LEFT; 3197 closeto = LEFT;
3198
3239 if (closeto == LEFT) 3199 if (closeto == LEFT)
3240 { 3200 {
3241 selection.beg.row = pos.row; 3201 selection.beg.row = pos.row;
3242 selection.beg.col = pos.col; 3202 selection.beg.col = pos.col;
3243 selection.mark.row = selection.end.row; 3203 selection.mark.row = selection.end.row;
3244 selection.mark.col = selection.end.col 3204 selection.mark.col = selection.end.col - (selection.clicks == 2);
3245 - (selection.clicks == 2);
3246 } 3205 }
3247 else 3206 else
3248 { 3207 {
3249 selection.end.row = pos.row; 3208 selection.end.row = pos.row;
3250 selection.end.col = pos.col; 3209 selection.end.col = pos.col;
3251 selection.mark.row = selection.beg.row; 3210 selection.mark.row = selection.beg.row;
3252 selection.mark.col = selection.beg.col; 3211 selection.mark.col = selection.beg.col;
3253 } 3212 }
3254 } 3213 }
3255 else 3214 else
3256 { /* button1 drag or button3 drag */ 3215 { /* button1 drag or button3 drag */
3257 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3216 if (ROWCOL_IS_AFTER (selection.mark, pos))
3258 { 3217 {
3259 if ((selection.mark.row == selection.end.row) 3218 if ((selection.mark.row == selection.end.row)
3260 && (selection.mark.col == selection.end.col) 3219 && (selection.mark.col == selection.end.col)
3261 && clickchange && selection.clicks == 2) 3220 && clickchange && selection.clicks == 2)
3262 selection.mark.col--; 3221 selection.mark.col--;
3222
3263 selection.beg.row = pos.row; 3223 selection.beg.row = pos.row;
3264 selection.beg.col = pos.col; 3224 selection.beg.col = pos.col;
3265 selection.end.row = selection.mark.row; 3225 selection.end.row = selection.mark.row;
3266 selection.end.col = selection.mark.col 3226 selection.end.col = selection.mark.col + (selection.clicks == 2);
3267 + (selection.clicks == 2);
3268 } 3227 }
3269 else 3228 else
3270 { 3229 {
3271 selection.beg.row = selection.mark.row; 3230 selection.beg.row = selection.mark.row;
3272 selection.beg.col = selection.mark.col; 3231 selection.beg.col = selection.mark.col;
… …
3276 } 3235 }
3277 3236
3278 if (selection.clicks == 1) 3237 if (selection.clicks == 1)
3279 { 3238 {
3280 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3239 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3240
3281 if (end_col != -1 && selection.beg.col > end_col) 3241 if (end_col != -1 && selection.beg.col > end_col)
3282 { 3242 {
3283#if 1 3243#if 1
3284 selection.beg.col = ncol; 3244 selection.beg.col = ncol;
3285#else 3245#else
3286 if (selection.beg.row != selection.end.row) 3246 if (selection.beg.row != selection.end.row)
3287 selection.beg.col = ncol; 3247 selection.beg.col = ncol;
3288 else 3248 else
3289 selection.beg.col = selection.mark.col; 3249 selection.beg.col = selection.mark.col;
3290#endif 3250#endif
3291
3292 } 3251 }
3252
3293 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3253 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3254
3294 if (end_col != -1 && selection.end.col > end_col) 3255 if (end_col != -1 && selection.end.col > end_col)
3295 selection.end.col = ncol; 3256 selection.end.col = ncol;
3296
3297 } 3257 }
3298 else if (selection.clicks == 2) 3258 else if (selection.clicks == 2)
3299 { 3259 {
3300 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3260 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3301 selection.end.col--; 3261 selection.end.col--;
3262
3302 selection_delimit_word (UP, & (selection.beg), 3263 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3303 & (selection.beg));
3304 selection_delimit_word (DN, & (selection.end), 3264 selection_delimit_word (DN, & (selection.end), & (selection.end));
3305 & (selection.end));
3306 } 3265 }
3307 else if (selection.clicks == 3) 3266 else if (selection.clicks == 3)
3308 { 3267 {
3309#ifndef NO_FRILLS 3268#ifndef NO_FRILLS
3310 if ((Options & Opt_tripleclickwords)) 3269 if ((Options & Opt_tripleclickwords))
3311 { 3270 {
3312 int end_row; 3271 int end_row;
3313 3272
3314 selection_delimit_word (UP, & (selection.beg), 3273 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3315 & (selection.beg));
3316 end_row = screen.tlen[selection.mark.row 3274 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3317 + TermWin.saveLines]; 3275
3318 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3276 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3319 end_row++)
3320 { 3277 {
3321 end_col = screen.tlen[end_row + TermWin.saveLines]; 3278 end_col = screen.tlen[end_row + TermWin.saveLines];
3279
3322 if (end_col != -1) 3280 if (end_col != -1)
3323 { 3281 {
3324 selection.end.row = end_row; 3282 selection.end.row = end_row;
3325 selection.end.col = end_col; 3283 selection.end.col = end_col;
3326 selection_remove_trailing_spaces (); 3284 selection_remove_trailing_spaces ();
… …
3328 } 3286 }
3329 } 3287 }
3330 } 3288 }
3331 else 3289 else
3332#endif 3290#endif
3333
3334 { 3291 {
3335 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3292 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3336 selection.mark.col++; 3293 selection.mark.col++;
3337 selection.beg.col = 0; 3294 selection.beg.col = 0;
3338 selection.end.col = ncol; 3295 selection.end.col = ncol;
3339 } 3296 }
3340 } 3297 }
3298
3341 if (button3 && buttonpress) 3299 if (button3 && buttonpress)
3342 { /* mark may need to be changed */ 3300 { /* mark may need to be changed */
3343 if (closeto == LEFT) 3301 if (closeto == LEFT)
3344 { 3302 {
3345 selection.mark.row = selection.end.row; 3303 selection.mark.row = selection.end.row;
3346 selection.mark.col = selection.end.col 3304 selection.mark.col = selection.end.col
3347 - (selection.clicks == 2); 3305 - (selection.clicks == 2);
… …
3351 selection.mark.row = selection.beg.row; 3309 selection.mark.row = selection.beg.row;
3352 selection.mark.col = selection.beg.col; 3310 selection.mark.col = selection.beg.col;
3353 } 3311 }
3354 } 3312 }
3355 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); 3313 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3356#endif /* ! NO_NEW_SELECTION */
3357} 3314}
3358 3315
3359#ifndef NO_FRILLS 3316#ifndef NO_FRILLS
3360void 3317void
3361rxvt_term::selection_remove_trailing_spaces () 3318rxvt_term::selection_remove_trailing_spaces ()
… …
3460 /* TODO: Handle MULTIPLE */ 3417 /* TODO: Handle MULTIPLE */
3461 } 3418 }
3462 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3419 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3463 { 3420 {
3464 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3421 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3465 (8 * sizeof (Time)), PropModeReplace, 3422 (8 * sizeof (Time)), PropModeReplace,
3466 (unsigned char *)&selection_time, 1); 3423 (unsigned char *)&selection_time, 1);
3467 ev.property = rq.property; 3424 ev.property = rq.property;
3468 } 3425 }
3469 else if (rq.target == XA_STRING 3426 else if (rq.target == XA_STRING
3470 || rq.target == xa[XA_TEXT] 3427 || rq.target == xa[XA_TEXT]
3471 || rq.target == xa[XA_COMPOUND_TEXT] 3428 || rq.target == xa[XA_COMPOUND_TEXT]

Diff Legend

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