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.74 by pcg, Sun May 9 18:19:49 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
7 * 7 *
… …
189 } 189 }
190 190
191 if (prev_nrow == 0) 191 if (prev_nrow == 0)
192 { 192 {
193 /* 193 /*
194 * first time called so just malloc everything : don't rely on realloc 194 * first time called so just malloc everything: don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL 195 * Note: this is still needed so that all the scrollback lines are NULL
196 */ 196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
… …
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1); 256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257 257
258 for (p = nrow; p < prev_nrow; p++) 258 for (p = nrow; p < prev_nrow; p++)
259 { 259 {
260 q = p + TermWin.saveLines; 260 q = p + TermWin.saveLines;
261
261 if (screen.text[q]) 262 if (screen.text[q])
262 { 263 {
263#ifdef DEBUG_STRICT 264#ifdef DEBUG_STRICT
264 assert (screen.rend[q]); 265 assert (screen.rend[q]);
265#endif 266#endif
266 talloc->free (screen.text[q]); 267 talloc->free (screen.text[q]);
267 ralloc->free (screen.rend[q]); 268 ralloc->free (screen.rend[q]);
268 } 269 }
270
269 if (swap.text[p]) 271 if (swap.text[p])
270 { 272 {
271#ifdef DEBUG_STRICT 273#ifdef DEBUG_STRICT
272 assert (swap.rend[p]); 274 assert (swap.rend[p]);
273#endif 275#endif
274 talloc->free (swap.text[p]); 276 talloc->free (swap.text[p]);
275 ralloc->free (swap.rend[p]); 277 ralloc->free (swap.rend[p]);
276 } 278 }
279
277#ifdef DEBUG_STRICT 280#ifdef DEBUG_STRICT
278 assert (drawn_text[p] && drawn_rend[p]); 281 assert (drawn_text[p] && drawn_rend[p]);
279#endif 282#endif
280 talloc->free (drawn_text[p]); 283 talloc->free (drawn_text[p]);
281 ralloc->free (drawn_rend[p]); 284 ralloc->free (drawn_rend[p]);
… …
311 swap.tlen[p] = 0; 314 swap.tlen[p] = 0;
312 swap.text[p] = NULL; 315 swap.text[p] = NULL;
313 swap.rend[p] = NULL; 316 swap.rend[p] = NULL;
314 drawn_text[p] = NULL; 317 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL; 318 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle); 319 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle); 320 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 321 }
319 322
320 if (k > 0) 323 if (k > 0)
321 { 324 {
… …
336 } 339 }
337 340
338 /* resize columns */ 341 /* resize columns */
339 if (ncol != prev_ncol) 342 if (ncol != prev_ncol)
340 { 343 {
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 344 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 345 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 346
345 for (p = 0; p < total_rows; p++) 347 for (p = 0; p < total_rows; p++)
346 { 348 {
347 if (screen.text[p]) 349 if (screen.text[p])
348 { 350 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 351 screen.text[p] = (text_t *)ta->alloc (screen.text[p], prev_ncol * sizeof (text_t));
350 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r; 352 screen.rend[p] = (rend_t *)ra->alloc (screen.rend[p], prev_ncol * sizeof (rend_t));
351 353
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 354 MIN_IT (screen.tlen[p], (int16_t)ncol);
353 355
354 if (ncol > prev_ncol) 356 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]), 357 scr_blank_line (&screen.text[p][prev_ncol],
356 & (screen.rend[p][prev_ncol]), 358 &screen.rend[p][prev_ncol],
357 ncol - prev_ncol, 359 ncol - prev_ncol, setrstyle);
358 setrstyle);
359 } 360 }
360 } 361 }
361 362
362 for (p = 0; p < nrow; p++) 363 for (p = 0; p < nrow; p++)
363 { 364 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t; 365 drawn_text[p] = (text_t *)ta->alloc (drawn_text[p], prev_ncol * sizeof (text_t));
365 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r; 366 drawn_rend[p] = (rend_t *)ra->alloc (drawn_rend[p], prev_ncol * sizeof (rend_t));
366 367
367 if (ncol > prev_ncol) 368 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]), 369 scr_blank_line (&drawn_text[p][prev_ncol],
369 & (drawn_rend[p][prev_ncol]), 370 &drawn_rend[p][prev_ncol],
370 ncol - prev_ncol, setrstyle); 371 ncol - prev_ncol, setrstyle);
371 372
372 if (swap.text[p]) 373 if (swap.text[p])
373 { 374 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t; 375 swap.text[p] = (text_t *)ta->alloc (swap.text[p], prev_ncol * sizeof (text_t));
375 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r; 376 swap.rend[p] = (rend_t *)ra->alloc (swap.rend[p], prev_ncol * sizeof (rend_t));
376 377
377 MIN_IT (swap.tlen[p], (int16_t)ncol); 378 MIN_IT (swap.tlen[p], (int16_t)ncol);
378 379
379 if (ncol > prev_ncol) 380 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]), 381 scr_blank_line (&swap.text[p][prev_ncol],
381 & (swap.rend[p][prev_ncol]), 382 &swap.rend[p][prev_ncol],
382 ncol - prev_ncol, setrstyle); 383 ncol - prev_ncol, setrstyle);
383 } 384 }
384 385
385 } 386 }
386 387
… …
438{ 439{
439 uint16_t total_rows; 440 uint16_t total_rows;
440 int i; 441 int i;
441 442
442 total_rows = TermWin.nrow + TermWin.saveLines; 443 total_rows = TermWin.nrow + TermWin.saveLines;
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 444
453 delete talloc; talloc = 0; 445 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 446 delete ralloc; ralloc = 0;
455 447
456 free (screen.text); 448 free (screen.text);
… …
485 477
486 scr_release (); 478 scr_release ();
487 prev_nrow = prev_ncol = 0; 479 prev_nrow = prev_ncol = 0;
488 scr_reset (); 480 scr_reset ();
489 481
490 scr_clear (); 482 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 483 scr_refresh (SLOW_REFRESH);
492} 484}
493 485
494/* ------------------------------------------------------------------------- * 486/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 487 * PROCESS SCREEN COMMANDS *
… …
500 * XTERM_SEQ: Restore cursor: ESC 8 492 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 493 */
502void 494void
503rxvt_term::scr_cursor (int mode) 495rxvt_term::scr_cursor (int mode)
504{ 496{
505 screen_t *s; 497 screen_t *s;
506 498
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); 499 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 500
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 501#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 502 if (current_screen == SECONDARY)
511 s = & (swap); 503 s = &swap;
512 else 504 else
513#endif 505#endif
514 s = & (screen); 506 s = &screen;
507
515 switch (mode) 508 switch (mode)
516 { 509 {
517 case SAVE: 510 case SAVE:
518 s->s_cur.row = s->cur.row; 511 s->s_cur.row = s->cur.row;
519 s->s_cur.col = s->cur.col; 512 s->s_cur.col = s->cur.col;
520 s->s_rstyle = rstyle; 513 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 514 s->s_charset = s->charset;
522 s->s_charset_char = charsets[s->charset]; 515 s->s_charset_char = charsets[s->charset];
523 break; 516 break;
517
524 case RESTORE: 518 case RESTORE:
525 want_refresh = 1; 519 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 520 s->cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 521 s->cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 522 s->flags &= ~Screen_WrapNext;
… …
530 s->charset = s->s_charset; 524 s->charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 525 charsets[s->charset] = s->s_charset_char;
532 set_font_style (); 526 set_font_style ();
533 break; 527 break;
534 } 528 }
529
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 530 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 531 MIN_IT (s->cur.row, TermWin.nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 532 MIN_IT (s->cur.col, TermWin.ncol - 1);
538#ifdef DEBUG_STRICT 533#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
… …
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 546 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 547 */
553int 548int
554rxvt_term::scr_change_screen (int scrn) 549rxvt_term::scr_change_screen (int scrn)
555{ 550{
556 int i; 551 int i;
557#if NSCREENS 552#if NSCREENS
558 int offset; 553 int offset;
559#endif 554#endif
560 555
561 want_refresh = 1; 556 want_refresh = 1;
562 557
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); 558 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564 559
565 TermWin.view_start = 0; 560 TermWin.view_start = 0;
566 561
567 if (current_screen == scrn) 562 if (current_screen == scrn)
568 return current_screen; 563 return scrn;
569 564
570 selection_check (2); /* check for boundary cross */ 565 selection_check (2); /* check for boundary cross */
571 566
572 SWAP_IT (current_screen, scrn, int); 567 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS 568#if NSCREENS
569 if (Options & Opt_secondaryScreen)
570 {
574 num_scr = 0; 571 num_scr = 0;
575 offset = TermWin.saveLines; 572 offset = TermWin.saveLines;
576 for (i = prev_nrow; i--;) 573 for (i = prev_nrow; i--;)
577 { 574 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 575 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 576 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 577 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 578 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 579 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t); 580 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT 581# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); 582 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); 583 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */ 584# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0); 585 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); 586 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0); 587 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); 588 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif 589# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 590 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 591 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 592 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 593 swap.flags |= Screen_VisibleCursor;
597#else 594 }
598# ifdef SCROLL_ON_NO_SECONDARY 595 else
596#endif
597 if (Options & Opt_secondaryScroll)
599 if (current_screen == PRIMARY) 598 //if (current_screen == PRIMARY)
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 599 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0);
601# endif
602#endif
603 return scrn; 600 return scrn;
604} 601}
605 602
606/* ------------------------------------------------------------------------- */ 603/* ------------------------------------------------------------------------- */
607/* 604/*
… …
649 return 0; 646 return 0;
650 647
651 want_refresh = 1; 648 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 649 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
653 650
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 651 if (row1 == 0 && count > 0
652 && (current_screen == PRIMARY || Options & Opt_secondaryScroll))
655 { 653 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 654 nscrolled = (long)TermWin.nscrolled + (long)count;
657 655
658 if (nscrolled > (long)TermWin.saveLines) 656 if (nscrolled > (long)TermWin.saveLines)
659 TermWin.nscrolled = TermWin.saveLines; 657 TermWin.nscrolled = TermWin.saveLines;
… …
712 for (i = 0, j = row1; i < count; i++, j++) 710 for (i = 0, j = row1; i < count; i++, j++)
713 { 711 {
714 buf_text[i] = screen.text[j]; 712 buf_text[i] = screen.text[j];
715 buf_rend[i] = screen.rend[j]; 713 buf_rend[i] = screen.rend[j];
716 } 714 }
715
717 /* A2: Rotate lines */ 716 /* A2: Rotate lines */
718 for (j = row1, i = j + count; i <= row2; i++, j++) 717 for (j = row1, i = j + count; i <= row2; i++, j++)
719 { 718 {
720 screen.tlen[j] = screen.tlen[i]; 719 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i]; 720 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i]; 721 screen.rend[j] = screen.rend[i];
723 } 722 }
723
724 j = row2 - count + 1, i = count; 724 j = row2 - count + 1, i = count;
725 } 725 }
726 else /* if (j < 0) */ 726 else /* if (j < 0) */
727 { 727 {
728 /* B: scroll down */ 728 /* B: scroll down */
… …
731 for (i = 0, j = row2; i < count; i++, j--) 731 for (i = 0, j = row2; i < count; i++, j--)
732 { 732 {
733 buf_text[i] = screen.text[j]; 733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j]; 734 buf_rend[i] = screen.rend[j];
735 } 735 }
736
736 /* B2: Rotate lines */ 737 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--) 738 for (j = row2, i = j - count; i >= row1; i--, j--)
738 { 739 {
739 screen.tlen[j] = screen.tlen[i]; 740 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i]; 741 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i]; 742 screen.rend[j] = screen.rend[i];
742 } 743 }
744
743 j = row1, i = count; 745 j = row1, i = count;
744 count = -count; 746 count = -count;
745 } 747 }
746 748
747 /* C: Resurrect lines */ 749 /* C: Resurrect lines */
… …
750 screen.tlen[j] = 0; 752 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i]; 753 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i]; 754 screen.rend[j] = buf_rend[i];
753 755
754 if (!spec) /* line length may not equal TermWin.ncol */ 756 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend, 757 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
756 (unsigned int)j, rstyle);
757 } 758 }
758 759
759 return count; 760 return count;
760} 761}
761 762
762/* ------------------------------------------------------------------------- */ 763/* ------------------------------------------------------------------------- */
763/* 764/*
764 * Add text given in <str> of length <len> to screen struct 765 * Add text given in <str> of length <len> to screen struct
765 */ 766 */
766void 767void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
768{ 769{
769 unsigned char checksel, clearsel; 770 unsigned char checksel, clearsel;
770 uint32_t c; 771 unicode_t c;
771 int i, row, last_col; 772 int i, row, last_col;
772 text_t *stp; 773 text_t *stp;
773 rend_t *srp; 774 rend_t *srp;
774 775
775 if (len <= 0) /* sanity */ 776 if (len <= 0) /* sanity */
… …
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif 804#endif
804 row = screen.cur.row + TermWin.saveLines; 805 row = screen.cur.row + TermWin.saveLines;
805 806
806 checksel = (selection.op 807 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0; 808 clearsel = 0;
809 809
810 stp = screen.text[row]; 810 stp = screen.text[row];
811 srp = screen.rend[row]; 811 srp = screen.rend[row];
812 812
813 for (i = 0; i < len;) 813 while (len--)
814 { 814 {
815 c = str[i++]; 815 c = *str++;
816
817 if (c < 0x20)
816 switch (c) 818 switch (c)
817 { 819 {
818 case '\t': 820 case C0_HT:
819 scr_tab (1); 821 scr_tab (1);
820 continue; 822 continue;
821 case '\n': 823
824 case C0_LF:
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 825 if (screen.tlen[row] != -1) /* XXX: think about this */
823 MAX_IT (screen.tlen[row], screen.cur.col); 826 MAX_IT (screen.tlen[row], screen.cur.col);
827
824 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
829
825 if (screen.cur.row == screen.bscroll) 830 if (screen.cur.row == screen.bscroll)
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); 831 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1)) 832 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines; 833 row = (++screen.cur.row) + TermWin.saveLines;
834
829 stp = screen.text[row]; /* _must_ refresh */ 835 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */ 836 srp = screen.rend[row]; /* _must_ refresh */
831 continue; 837 continue;
832 case '\r': 838
839 case C0_CR:
833 if (screen.tlen[row] != -1) /* XXX: think about this */ 840 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col); 841 MAX_IT (screen.tlen[row], screen.cur.col);
842
835 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 844 screen.cur.col = 0;
837 continue; 845 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 846 }
843 847
844 if (checksel /* see if we're writing within selection */ 848 if (checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
847 { 851 {
… …
864 } 868 }
865 869
866 if (screen.flags & Screen_Insert) 870 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT); 871 scr_insdel_chars (1, INSERT);
868 872
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 873 // 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 874 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes. 875 // characters have width -1 (DOH!) on GNU/Linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c); 876 int width = c < 256 ? 1 : wcwidth (c);
876 877
877 if (charsets[screen.charset] == '0') // DEC SPECIAL 878 if (charsets[screen.charset] == '0') // DEC SPECIAL
878 switch (c)
879 { 879 {
880 // vt100 special graphics and line drawing 880 // vt100 special graphics and line drawing
881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 881 static uint16_t vt100_0[32] = { // 5f .. 7e
882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0,
883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c,
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534,
885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 885 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 } 886 };
887
888 if (c >= 0x5f && c <= 0x7e)
889 {
890 c = vt100_0[c - 0x5f];
891 width = 1;
892 }
893 893 }
894 894
895 if (width > 0) 895 if (width != 0)
896 { 896 {
897#if !UNICODE_3 897#if !UNICODE_3 && ENABLE_COMBINING
898 // trim characters we can't store directly :( 898 // trim characters we can't store directly :(
899 if (c >= 0x10000) 899 if (c >= 0x10000)
900 c = rxvt_composite.compose (c); // map to lower 16 bits 900 c = rxvt_composite.compose (c); // map to lower 16 bits
901#endif 901#endif
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
… …
927 srp[c] = rend; 927 srp[c] = rend;
928 } 928 }
929 } 929 }
930 else if (width == 0) 930 else if (width == 0)
931 { 931 {
932#if ENCODING_COMPOSE 932#if ENABLE_COMBINING
933 // handle combining characters 933 // handle combining characters
934 // we just tag the accent on the previous on-screen character. 934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong. 935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet. 936 // we don't handle double-width characters nicely yet.
937 937
… …
955 // handle double-width-chars by making them look extremely ugly 955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR) 956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp; 957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958 958
959 // first try to find a precomposed character 959 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c); 960 unicode_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR) 961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c); 962 n = rxvt_composite.compose (*tp, c);
963 963
964 *tp = n; 964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
… …
992 */ 992 */
993void 993void
994rxvt_term::scr_backspace () 994rxvt_term::scr_backspace ()
995{ 995{
996 want_refresh = 1; 996 want_refresh = 1;
997
997 if (screen.cur.col == 0) 998 if (screen.cur.col == 0)
998 { 999 {
999 if (screen.cur.row > 0) 1000 if (screen.cur.row > 0)
1000 { 1001 {
1001#ifdef TERMCAP_HAS_BW 1002#ifdef TERMCAP_HAS_BW
… …
1006 1007
1007 } 1008 }
1008 } 1009 }
1009 else if ((screen.flags & Screen_WrapNext) == 0) 1010 else if ((screen.flags & Screen_WrapNext) == 0)
1010 scr_gotorc (0, -1, RELATIVE); 1011 scr_gotorc (0, -1, RELATIVE);
1012
1011 screen.flags &= ~Screen_WrapNext; 1013 screen.flags &= ~Screen_WrapNext;
1012} 1014}
1013 1015
1014/* ------------------------------------------------------------------------- */ 1016/* ------------------------------------------------------------------------- */
1015/* 1017/*
… …
1018 * XTERM_SEQ: CTRL-I 1020 * XTERM_SEQ: CTRL-I
1019 */ 1021 */
1020void 1022void
1021rxvt_term::scr_tab (int count) 1023rxvt_term::scr_tab (int count)
1022{ 1024{
1023 int i, x; 1025 int i, x;
1024 1026
1025 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); 1027 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1026 want_refresh = 1; 1028 want_refresh = 1;
1027 i = x = screen.cur.col; 1029 i = x = screen.cur.col;
1030
1028 if (count == 0) 1031 if (count == 0)
1029 return; 1032 return;
1030 else if (count > 0) 1033 else if (count > 0)
1031 { 1034 {
1032 for (; ++i < TermWin.ncol; ) 1035 for (; ++i < TermWin.ncol; )
… …
1034 { 1037 {
1035 x = i; 1038 x = i;
1036 if (!--count) 1039 if (!--count)
1037 break; 1040 break;
1038 } 1041 }
1042
1039 if (count) 1043 if (count)
1040 x = TermWin.ncol - 1; 1044 x = TermWin.ncol - 1;
1041 } 1045 }
1042 else /* if (count < 0) */ 1046 else /* if (count < 0) */
1043 { 1047 {
… …
1046 { 1050 {
1047 x = i; 1051 x = i;
1048 if (!++count) 1052 if (!++count)
1049 break; 1053 break;
1050 } 1054 }
1055
1051 if (count) 1056 if (count)
1052 x = 0; 1057 x = 0;
1053 } 1058 }
1059
1054 if (x != screen.cur.col) 1060 if (x != screen.cur.col)
1055 scr_gotorc (0, x, R_RELATIVE); 1061 scr_gotorc (0, x, R_RELATIVE);
1056} 1062}
1057 1063
1058/* ------------------------------------------------------------------------- */ 1064/* ------------------------------------------------------------------------- */
… …
1115 want_refresh = 1; 1121 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1122 ZERO_SCROLLBACK ();
1117 1123
1118 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); 1124 D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col));
1119 1125
1120 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1126 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1121 : col);
1122 MAX_IT (screen.cur.col, 0); 1127 MAX_IT (screen.cur.col, 0);
1123 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1128 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1124 1129
1125 screen.flags &= ~Screen_WrapNext; 1130 screen.flags &= ~Screen_WrapNext;
1126 if (relative & R_RELATIVE) 1131 if (relative & R_RELATIVE)
… …
1165 * direction should be UP or DN 1170 * direction should be UP or DN
1166 */ 1171 */
1167void 1172void
1168rxvt_term::scr_index (enum page_dirn direction) 1173rxvt_term::scr_index (enum page_dirn direction)
1169{ 1174{
1170 int dirn; 1175 int dirn;
1171 1176
1172 want_refresh = 1; 1177 want_refresh = 1;
1173 dirn = ((direction == UP) ? 1 : -1); 1178 dirn = ((direction == UP) ? 1 : -1);
1174 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); 1179 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1175 1180
… …
1235 default: 1240 default:
1236 return; 1241 return;
1237 } 1242 }
1238 1243
1239 if (screen.text[row]) 1244 if (screen.text[row])
1240 scr_blank_line (& (screen.text[row][col]), 1245 scr_blank_line (&screen.text[row][col], &screen.rend[row][col], num, rstyle);
1241 & (screen.rend[row][col]), num, rstyle);
1242 else 1246 else
1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle); 1247 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1244} 1248}
1245 1249
1246/* ------------------------------------------------------------------------- */ 1250/* ------------------------------------------------------------------------- */
… …
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1255 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1256 */
1253void 1257void
1254rxvt_term::scr_erase_screen (int mode) 1258rxvt_term::scr_erase_screen (int mode)
1255{ 1259{
1256 int num; 1260 int num;
1257 int32_t row, row_offset; 1261 int32_t row, row_offset;
1258 rend_t ren; 1262 rend_t ren;
1259 XGCValues gcvalue; 1263 XGCValues gcvalue;
1260 1264
1261 want_refresh = 1; 1265 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); 1266 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1267 ZERO_SCROLLBACK ();
1264 row_offset = (int32_t)TermWin.saveLines; 1268 row_offset = (int32_t)TermWin.saveLines;
… …
1283 num = TermWin.nrow; 1287 num = TermWin.nrow;
1284 break; 1288 break;
1285 default: 1289 default:
1286 return; 1290 return;
1287 } 1291 }
1292
1288 refresh_type |= REFRESH_BOUNDS; 1293 refresh_type |= REFRESH_BOUNDS;
1294
1289 if (selection.op && current_screen == selection.screen 1295 if (selection.op && current_screen == selection.screen
1290 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1296 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1291 || (selection.end.row >= row 1297 || (selection.end.row >= row
1292 && selection.end.row <= row + num))) 1298 && selection.end.row <= row + num)))
1293 CLEAR_SELECTION (); 1299 CLEAR_SELECTION ();
1300
1294 if (row >= TermWin.nrow) /* Out Of Bounds */ 1301 if (row >= TermWin.nrow) /* Out Of Bounds */
1295 return; 1302 return;
1303
1296 MIN_IT (num, (TermWin.nrow - row)); 1304 MIN_IT (num, (TermWin.nrow - row));
1305
1297 if (rstyle & (RS_RVid | RS_Uline)) 1306 if (rstyle & (RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1307 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1308 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1309 {
1301 ren = DEFAULT_RSTYLE; 1310 ren = DEFAULT_RSTYLE;
… …
1308 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1317 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1318 ERASE_ROWS (row, num);
1310 gcvalue.foreground = PixColors[Color_fg]; 1319 gcvalue.foreground = PixColors[Color_fg];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1312 } 1321 }
1322
1313 for (; num--; row++) 1323 for (; num--; row++)
1314 { 1324 {
1315 scr_blank_screen_mem (screen.text, screen.rend, 1325 scr_blank_screen_mem (screen.text, screen.rend,
1316 (unsigned int) (row + row_offset), rstyle); 1326 (unsigned int) (row + row_offset), rstyle);
1317 screen.tlen[row + row_offset] = 0; 1327 screen.tlen[row + row_offset] = 0;
… …
1351 * Insert/Delete <count> lines 1361 * Insert/Delete <count> lines
1352 */ 1362 */
1353void 1363void
1354rxvt_term::scr_insdel_lines (int count, int insdel) 1364rxvt_term::scr_insdel_lines (int count, int insdel)
1355{ 1365{
1356 int end; 1366 int end;
1357 1367
1358 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
1359 1369
1360 selection_check (1); 1370 selection_check (1);
1361 1371
… …
1380 * Insert/Delete <count> characters from the current position 1390 * Insert/Delete <count> characters from the current position
1381 */ 1391 */
1382void 1392void
1383rxvt_term::scr_insdel_chars (int count, int insdel) 1393rxvt_term::scr_insdel_chars (int count, int insdel)
1384{ 1394{
1385 int col, row; 1395 int col, row;
1386 rend_t tr; 1396 rend_t tr;
1387 text_t *stp; 1397 text_t *stp;
1388 rend_t *srp; 1398 rend_t *srp;
1389 int16_t *slp; 1399 int16_t *slp;
1390 1400
1391 want_refresh = 1; 1401 want_refresh = 1;
1392 ZERO_SCROLLBACK (); 1402 ZERO_SCROLLBACK ();
1393 1403
1394 if (count <= 0) 1404 if (count <= 0)
… …
1401 screen.flags &= ~Screen_WrapNext; 1411 screen.flags &= ~Screen_WrapNext;
1402 1412
1403 stp = screen.text[row]; 1413 stp = screen.text[row];
1404 srp = screen.rend[row]; 1414 srp = screen.rend[row];
1405 slp = & (screen.tlen[row]); 1415 slp = & (screen.tlen[row]);
1416
1406 switch (insdel) 1417 switch (insdel)
1407 { 1418 {
1408 case INSERT: 1419 case INSERT:
1409 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1420 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1410 col--) 1421 col--)
1411 { 1422 {
1412 stp[col] = stp[col - count]; 1423 stp[col] = stp[col - count];
1413 srp[col] = srp[col - count]; 1424 srp[col] = srp[col - count];
1414 } 1425 }
1426
1415 if (*slp != -1) 1427 if (*slp != -1)
1416 { 1428 {
1417 *slp += count; 1429 *slp += count;
1418 MIN_IT (*slp, TermWin.ncol); 1430 MIN_IT (*slp, TermWin.ncol);
1419 } 1431 }
1432
1420 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1421 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1422 { 1435 {
1423 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
1424 || (selection.end.col + count >= TermWin.ncol)) 1437 || (selection.end.col + count >= TermWin.ncol))
… …
1428 selection.beg.col += count; 1441 selection.beg.col += count;
1429 selection.mark.col += count; /* XXX: yes? */ 1442 selection.mark.col += count; /* XXX: yes? */
1430 selection.end.col += count; 1443 selection.end.col += count;
1431 } 1444 }
1432 } 1445 }
1446
1433 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1447 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1434 (unsigned int)count, rstyle); 1448 (unsigned int)count, rstyle);
1435 break; 1449 break;
1450
1436 case ERASE: 1451 case ERASE:
1437 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1452 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1438 selection_check (1); 1453 selection_check (1);
1439 screen.cur.col -= count; 1454 screen.cur.col -= count;
1440 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1455 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]),
1441 (unsigned int)count, rstyle); 1456 (unsigned int)count, rstyle);
1442 break; 1457 break;
1458
1443 case DELETE: 1459 case DELETE:
1444 tr = srp[TermWin.ncol - 1]
1445 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1461
1446 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1462 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1447 { 1463 {
1448 stp[col] = stp[col + count]; 1464 stp[col] = stp[col + count];
1449 srp[col] = srp[col + count]; 1465 srp[col] = srp[col + count];
1450 } 1466 }
1467
1451 scr_blank_line (& (stp[TermWin.ncol - count]), 1468 scr_blank_line (& (stp[TermWin.ncol - count]),
1452 & (srp[TermWin.ncol - count]), 1469 & (srp[TermWin.ncol - count]),
1453 (unsigned int)count, tr); 1470 (unsigned int)count, tr);
1471
1454 if (*slp == -1) /* break line continuation */ 1472 if (*slp == -1) /* break line continuation */
1455 *slp = TermWin.ncol; 1473 *slp = TermWin.ncol;
1474
1456 *slp -= count; 1475 *slp -= count;
1457 MAX_IT (*slp, 0); 1476 MAX_IT (*slp, 0);
1477
1458 if (selection.op && current_screen == selection.screen 1478 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1479 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1480 {
1461 if (selection.end.row != screen.cur.row 1481 if (selection.end.row != screen.cur.row
1462 || (screen.cur.col >= selection.beg.col - count) 1482 || (screen.cur.col >= selection.beg.col - count)
… …
1468 selection.beg.col -= count; 1488 selection.beg.col -= count;
1469 selection.mark.col -= count; /* XXX: yes? */ 1489 selection.mark.col -= count; /* XXX: yes? */
1470 selection.end.col -= count; 1490 selection.end.col -= count;
1471 } 1491 }
1472 } 1492 }
1493
1473 break; 1494 break;
1474 } 1495 }
1475} 1496}
1476 1497
1477/* ------------------------------------------------------------------------- */ 1498/* ------------------------------------------------------------------------- */
… …
1482void 1503void
1483rxvt_term::scr_scroll_region (int top, int bot) 1504rxvt_term::scr_scroll_region (int top, int bot)
1484{ 1505{
1485 MAX_IT (top, 0); 1506 MAX_IT (top, 0);
1486 MIN_IT (bot, (int)TermWin.nrow - 1); 1507 MIN_IT (bot, (int)TermWin.nrow - 1);
1508
1487 if (top > bot) 1509 if (top > bot)
1488 return; 1510 return;
1511
1489 screen.tscroll = top; 1512 screen.tscroll = top;
1490 screen.bscroll = bot; 1513 screen.bscroll = bot;
1491 scr_gotorc (0, 0, 0); 1514 scr_gotorc (0, 0, 0);
1492} 1515}
1493 1516
… …
1499 */ 1522 */
1500void 1523void
1501rxvt_term::scr_cursor_visible (int mode) 1524rxvt_term::scr_cursor_visible (int mode)
1502{ 1525{
1503 want_refresh = 1; 1526 want_refresh = 1;
1527
1504 if (mode) 1528 if (mode)
1505 screen.flags |= Screen_VisibleCursor; 1529 screen.flags |= Screen_VisibleCursor;
1506 else 1530 else
1507 screen.flags &= ~Screen_VisibleCursor; 1531 screen.flags &= ~Screen_VisibleCursor;
1508} 1532}
… …
1746 } 1770 }
1747 1771
1748 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1772 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1749 1773
1750 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1774 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1751 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1775 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1752 (rc[PART_END].col - rc[PART_BEG].col + 1));
1753 1776
1754 if (refresh) 1777 if (refresh)
1755 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1778 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1756} 1779}
1757 1780
… …
1824 if (TermWin.view_start != oldviewstart) 1847 if (TermWin.view_start != oldviewstart)
1825 { 1848 {
1826 want_refresh = 1; 1849 want_refresh = 1;
1827 num_scr -= (TermWin.view_start - oldviewstart); 1850 num_scr -= (TermWin.view_start - oldviewstart);
1828 } 1851 }
1852
1829 return (int) (TermWin.view_start - oldviewstart); 1853 return (int) (TermWin.view_start - oldviewstart);
1830} 1854}
1831 1855
1832/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1833void 1857void
… …
1951 1975
1952 /* 1976 /*
1953 * C: set the cursor character (s) 1977 * C: set the cursor character (s)
1954 */ 1978 */
1955 { 1979 {
1956 unsigned char setoldcursor; 1980 unsigned char setoldcursor;
1957 rend_t ccol1, /* Cursor colour */ 1981 rend_t ccol1, /* Cursor colour */
1958 ccol2; /* Cursor colour2 */ 1982 ccol2; /* Cursor colour2 */
1959 1983
1960 showcursor = (screen.flags & Screen_VisibleCursor); 1984 showcursor = (screen.flags & Screen_VisibleCursor);
1961#ifdef CURSOR_BLINK 1985#ifdef CURSOR_BLINK
1962 if (hidden_cursor) 1986 if (hidden_cursor)
1963 showcursor = 0; 1987 showcursor = 0;
1964#endif 1988#endif
1965 1989
1966 if (showcursor) 1990 if (showcursor)
1967 { 1991 {
1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 1992 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]);
1969 [screen.cur.col]);
1970 1993
1971 if (showcursor && TermWin.focus) 1994 if (showcursor && TermWin.focus)
1972 { 1995 {
1973 *srp ^= RS_RVid; 1996 *srp ^= RS_RVid;
1974#ifndef NO_CURSORCOLOR 1997#ifndef NO_CURSORCOLOR
… …
2002 if (screen.cur.row + TermWin.view_start != ocrow 2025 if (screen.cur.row + TermWin.view_start != ocrow
2003 || screen.cur.col != oldcursor.col) 2026 || screen.cur.col != oldcursor.col)
2004 { 2027 {
2005 if (ocrow < TermWin.nrow 2028 if (ocrow < TermWin.nrow
2006 && oldcursor.col < TermWin.ncol) 2029 && oldcursor.col < TermWin.ncol)
2007 {
2008 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2030 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2009 } 2031
2010 if (TermWin.focus || !showcursor) 2032 if (TermWin.focus || !showcursor)
2011 oldcursor.row = -1; 2033 oldcursor.row = -1;
2012 else 2034 else
2013 setoldcursor = 1; 2035 setoldcursor = 1;
2014 } 2036 }
2015 } 2037 }
2016 else if (!TermWin.focus) 2038 else if (!TermWin.focus)
2017 setoldcursor = 1; 2039 setoldcursor = 1;
2040
2018 if (setoldcursor) 2041 if (setoldcursor)
2019 { 2042 {
2020 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2043 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2021 oldcursor.row = -1; 2044 oldcursor.row = -1;
2022 else 2045 else
… …
2034 */ 2057 */
2035 i = num_scr; 2058 i = num_scr;
2036 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2059 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2037 && abs (i) < TermWin.nrow && !must_clear) 2060 && abs (i) < TermWin.nrow && !must_clear)
2038 { 2061 {
2039 int16_t nits; 2062 int16_t nits;
2040 int j; 2063 int j;
2041 rend_t *drp2; 2064 rend_t *drp2;
2042 text_t *dtp2; 2065 text_t *dtp2;
2043 int len, wlen; 2066 int len, wlen;
2044 2067
2045 j = TermWin.nrow; 2068 j = TermWin.nrow;
2046 wlen = len = -1; 2069 wlen = len = -1;
2047 row = i > 0 ? 0 : j - 1; 2070 row = i > 0 ? 0 : j - 1;
2048 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2071 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2192 else 2215 else
2193 rvid = !rvid; 2216 rvid = !rvid;
2194 } 2217 }
2195 2218
2196 if (rend & RS_Uline) 2219 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL)) 2220 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL; 2221 fore = Color_UL;
2200 }
2201#endif 2222#endif
2202 2223
2203 if (rvid) 2224 if (rvid)
2204 { 2225 {
2205 SWAP_IT (fore, back, int); 2226 SWAP_IT (fore, back, int);
… …
2502 { 2523 {
2503 n = min (len - i, PROP_SIZE); 2524 n = min (len - i, PROP_SIZE);
2504 MEMCPY (ds, data + i, n); 2525 MEMCPY (ds, data + i, n);
2505 2526
2506 for (j = 0; j < n; j++) 2527 for (j = 0; j < n; j++)
2507 if (ds[j] == '\n') 2528 if (ds[j] == C0_LF)
2508 ds[j] = '\r'; 2529 ds[j] = C0_CR;
2509 2530
2510 tt_write (ds, (int)n); 2531 tt_write (ds, (int)n);
2511 } 2532 }
2512 2533
2513 free (ds); 2534 free (ds);
… …
2594 2615
2595 nread += ct.nitems; 2616 nread += ct.nitems;
2596 2617
2597 char **cl; 2618 char **cl;
2598 int cr; 2619 int cr;
2599 if (XmbTextPropertyToTextList (display->display, &ct, &cl, 2620 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl)
2600 &cr) >= 0 && cl)
2601 { 2621 {
2602 for (int i = 0; i < cr; i++) 2622 for (int i = 0; i < cr; i++)
2603 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2623 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2604 2624
2605 XFreeStringList (cl); 2625 XFreeStringList (cl);
… …
2626void 2646void
2627rxvt_term::incr_cb (time_watcher &w) 2647rxvt_term::incr_cb (time_watcher &w)
2628{ 2648{
2629 selection_wait = Sel_none; 2649 selection_wait = Sel_none;
2630 2650
2631 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2651 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2632} 2652}
2633 2653
2634/* 2654/*
2635 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2655 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2636 */ 2656 */
… …
2715 { 2735 {
2716 int i; 2736 int i;
2717 2737
2718 selection_request_time = tm; 2738 selection_request_time = tm;
2719 selection_wait = Sel_normal; 2739 selection_wait = Sel_normal;
2740
2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2741 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2721 { 2742 {
2722#if X_HAVE_UTF8_STRING 2743#if X_HAVE_UTF8_STRING
2723 selection_type = Sel_UTF8String; 2744 selection_type = Sel_UTF8String;
2724 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2745 if (selection_request_other (xa[XA_UTF8_STRING], i))
… …
2778 want_refresh = 1; 2799 want_refresh = 1;
2779 free (selection.text); 2800 free (selection.text);
2780 selection.text = NULL; 2801 selection.text = NULL;
2781 selection.len = 0; 2802 selection.len = 0;
2782 CLEAR_SELECTION (); 2803 CLEAR_SELECTION ();
2804
2805 if (display->selection_owner == this)
2806 display->selection_owner = 0;
2783} 2807}
2784 2808
2785/* ------------------------------------------------------------------------- */ 2809/* ------------------------------------------------------------------------- */
2786/* 2810/*
2787 * Copy a selection into the cut buffer 2811 * Copy a selection into the cut buffer
… …
2838 2862
2839 for (; col < end_col; col++) 2863 for (; col < end_col; col++)
2840 { 2864 {
2841 if (*t == NOCHAR) 2865 if (*t == NOCHAR)
2842 t++; 2866 t++;
2867#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 2868 else if (IS_COMPOSE (*t))
2844 { 2869 {
2845 int len = rxvt_composite.expand (*t, 0); 2870 int len = rxvt_composite.expand (*t, 0);
2846 2871
2847 extra -= (len - 1); 2872 extra -= (len - 1);
… …
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2878 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 } 2879 }
2855 2880
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2881 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 } 2882 }
2883#endif
2858 else 2884 else
2859 new_selection_text[ofs++] = *t++; 2885 new_selection_text[ofs++] = *t++;
2860 } 2886 }
2861 2887
2862 if (screen.tlen[row] != -1 && row != end_row) 2888 if (screen.tlen[row] != -1 && row != end_row)
2863 new_selection_text[ofs++] = L'\n'; 2889 new_selection_text[ofs++] = C0_LF;
2864 } 2890 }
2865 2891
2866#ifndef NO_OLD_SELECTION
2867 if (selection_style == OLD_SELECT)
2868 if (end_col == TermWin.ncol)
2869 new_selection_text[ofs++] = L'\n';
2870#endif
2871#ifndef NO_NEW_SELECTION
2872 if (selection_style != OLD_SELECT)
2873 if (end_col != selection.end.col) 2892 if (end_col != selection.end.col)
2874 new_selection_text[ofs++] = L'\n'; 2893 new_selection_text[ofs++] = C0_LF;
2875#endif 2894
2876 new_selection_text[ofs] = 0; 2895 new_selection_text[ofs] = 0;
2877 2896
2878 if (ofs == 0) 2897 if (ofs == 0)
2879 { 2898 {
2880 free (new_selection_text); 2899 free (new_selection_text);
… …
2889 2908
2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2909 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm);
2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2910 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt)
2892 display->set_selection_owner (this); 2911 display->set_selection_owner (this);
2893 else 2912 else
2894 rxvt_print_error ("can't get primary selection"); 2913 rxvt_warn ("can't get primary selection, ignoring.\n");
2895 2914
2896#if 0 2915#if 0
2897 XTextProperty ct; 2916 XTextProperty ct;
2898 2917
2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2918 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
2939rxvt_term::selection_start_colrow (int col, int row) 2958rxvt_term::selection_start_colrow (int col, int row)
2940{ 2959{
2941 want_refresh = 1; 2960 want_refresh = 1;
2942 selection.mark.col = col; 2961 selection.mark.col = col;
2943 selection.mark.row = row - TermWin.view_start; 2962 selection.mark.row = row - TermWin.view_start;
2963
2944 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 2964 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled);
2945 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 2965 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1);
2946 MAX_IT (selection.mark.col, 0); 2966 MAX_IT (selection.mark.col, 0);
2947 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 2967 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1);
2948 2968
2969 while (selection.mark.col > 0
2970 && screen.text[selection.mark.row + TermWin.saveLines][selection.mark.col] == NOCHAR)
2971 --selection.mark.col;
2972
2949 if (selection.op) 2973 if (selection.op)
2950 { /* clear the old selection */ 2974 { /* clear the old selection */
2951 selection.beg.row = selection.end.row = selection.mark.row; 2975 selection.beg.row = selection.end.row = selection.mark.row;
2952 selection.beg.col = selection.end.col = selection.mark.col; 2976 selection.beg.col = selection.end.col = selection.mark.col;
2953 } 2977 }
2978
2954 selection.op = SELECTION_INIT; 2979 selection.op = SELECTION_INIT;
2955 selection.screen = current_screen; 2980 selection.screen = current_screen;
2956} 2981}
2957 2982
2958/* ------------------------------------------------------------------------- */ 2983/* ------------------------------------------------------------------------- */
… …
2960 * Word select: select text for 2 clicks 2985 * Word select: select text for 2 clicks
2961 * We now only find out the boundary in one direction 2986 * We now only find out the boundary in one direction
2962 */ 2987 */
2963 2988
2964/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2989/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2965#define DELIMIT_TEXT(x) \ 2990#define DELIMIT_TEXT(x) \
2966 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 2991 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x)))
2967#define DELIMIT_REND(x) 1 2992#define DELIMIT_REND(x) 1
2968 2993
2969void 2994void
2970rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2995rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2971{ 2996{
2972 int col, row, dirnadd, tcol, trow, w1, w2; 2997 int col, row, dirnadd, tcol, trow, w1, w2;
2973 row_col_t bound; 2998 row_col_t bound;
2974 text_t *stp; 2999 text_t *stp;
2975 rend_t *srp; 3000 rend_t *srp;
2976 3001
2977 if (dirn == UP) 3002 if (dirn == UP)
2978 { 3003 {
2979 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3004 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2980 bound.col = 0; 3005 bound.col = 0;
… …
2984 { 3009 {
2985 bound.row = TermWin.saveLines + TermWin.nrow; 3010 bound.row = TermWin.saveLines + TermWin.nrow;
2986 bound.col = TermWin.ncol - 1; 3011 bound.col = TermWin.ncol - 1;
2987 dirnadd = 1; 3012 dirnadd = 1;
2988 } 3013 }
3014
2989 row = mark->row + TermWin.saveLines; 3015 row = mark->row + TermWin.saveLines;
2990 col = mark->col; 3016 col = mark->col;
2991 MAX_IT (col, 0); 3017 MAX_IT (col, 0);
2992 /* find the edge of a word */ 3018 /* find the edge of a word */
2993 stp = & (screen.text[row][col]); 3019 stp = & (screen.text[row][col]);
2994 w1 = DELIMIT_TEXT (*stp); 3020 w1 = DELIMIT_TEXT (*stp);
2995 3021
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]); 3022 srp = (&screen.rend[row][col]);
3008 w2 = DELIMIT_REND (*srp); 3023 w2 = DELIMIT_REND (*srp);
3009 3024
3010 for (;;) 3025 for (;;)
3011 { 3026 {
3012 for (; col != bound.col; col += dirnadd) 3027 for (; col != bound.col; col += dirnadd)
3013 { 3028 {
3014 stp += dirnadd; 3029 stp += dirnadd;
3030 srp += dirnadd;
3031
3032 if (*stp == NOCHAR)
3033 continue;
3034
3015 if (DELIMIT_TEXT (*stp) != w1) 3035 if (DELIMIT_TEXT (*stp) != w1)
3016 break; 3036 break;
3017 srp += dirnadd;
3018 if (DELIMIT_REND (*srp) != w2) 3037 if (DELIMIT_REND (*srp) != w2)
3019 break; 3038 break;
3020 } 3039 }
3040
3021 if ((col == bound.col) && (row != bound.row)) 3041 if ((col == bound.col) && (row != bound.row))
3022 { 3042 {
3023 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3043 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1)
3024 { 3044 {
3025 trow = row + dirnadd; 3045 trow = row + dirnadd;
3026 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3046 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
3047
3027 if (screen.text[trow] == NULL) 3048 if (screen.text[trow] == NULL)
3028 break; 3049 break;
3050
3029 stp = & (screen.text[trow][tcol]); 3051 stp = & (screen.text[trow][tcol]);
3030 srp = & (screen.rend[trow][tcol]); 3052 srp = & (screen.rend[trow][tcol]);
3053
3031 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3054 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3032 break; 3055 break;
3056
3033 row = trow; 3057 row = trow;
3034 col = tcol; 3058 col = tcol;
3035 continue; 3059 continue;
3036 } 3060 }
3037 } 3061 }
3038 break; 3062 break;
3039 } 3063 }
3064
3040Old_Word_Selection_You_Die: 3065Old_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)); 3066 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 3067
3043 if (dirn == DN) 3068 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3069 col++; /* put us on one past the end */
… …
3066 MAX_IT (row, 0); 3091 MAX_IT (row, 0);
3067 MIN_IT (row, (int)TermWin.nrow - 1); 3092 MIN_IT (row, (int)TermWin.nrow - 1);
3068 MAX_IT (col, 0); 3093 MAX_IT (col, 0);
3069 MIN_IT (col, (int)TermWin.ncol); 3094 MIN_IT (col, (int)TermWin.ncol);
3070 3095
3071#ifndef NO_NEW_SELECTION
3072 /* 3096 /*
3073 * If we're selecting characters (single click) then we must check first 3097 * 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 3098 * 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 3099 * 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. 3100 * be _past_ a character for it to be selected.
3077 */ 3101 */
3078 if (selection_style != OLD_SELECT)
3079 {
3080 if (((selection.clicks % 3) == 1) && !flag 3102 if (((selection.clicks % 3) == 1) && !flag
3081 && (col == selection.mark.col 3103 && (col == selection.mark.col
3082 && (row == selection.mark.row + TermWin.view_start))) 3104 && (row == selection.mark.row + TermWin.view_start)))
3083 { 3105 {
3084 /* select nothing */ 3106 /* select nothing */
3085 selection.beg.row = selection.end.row = 0; 3107 selection.beg.row = selection.end.row = 0;
3086 selection.beg.col = selection.end.col = 0; 3108 selection.beg.col = selection.end.col = 0;
3087 selection.clicks = 4; 3109 selection.clicks = 4;
3088 want_refresh = 1; 3110 want_refresh = 1;
3089 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); 3111 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3090 return; 3112 return;
3091 }
3092 } 3113 }
3093#endif 3114
3094 if (selection.clicks == 4) 3115 if (selection.clicks == 4)
3095 selection.clicks = 1; 3116 selection.clicks = 1;
3096 3117
3097 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3118 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3098 flag == 1 ? 1 : 0, /* ? button press */ 3119 flag == 1 ? 1 : 0, /* ? button press */
… …
3104 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3105 */ 3126 */
3106void 3127void
3107rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3108{ 3129{
3109 int16_t ncol = TermWin.ncol; 3130 int16_t ncol = TermWin.ncol;
3110 int end_col; 3131 int end_col;
3111 row_col_t pos; 3132 row_col_t pos;
3112 enum { 3133 enum {
3113 LEFT, RIGHT 3134 LEFT, RIGHT
3114 } closeto = RIGHT; 3135 } closeto = RIGHT;
3115 3136
3116 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); 3137 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
… …
3152 pos.col = col; 3173 pos.col = col;
3153 pos.row = row; 3174 pos.row = row;
3154 3175
3155 pos.row -= TermWin.view_start; /* adjust for scroll */ 3176 pos.row -= TermWin.view_start; /* adjust for scroll */
3156 3177
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 /* 3178 /*
3219 * This is mainly xterm style selection with a couple of differences, mainly 3179 * This is mainly xterm style selection with a couple of differences, mainly
3220 * in the way button3 drag extension works. 3180 * in the way button3 drag extension works.
3221 * We're either doing: button1 drag; button3 press; or button3 drag 3181 * 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 3182 * 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 3187 * 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 3188 * and it was decided by whichever point/word/line was `fixed' at the
3229 * time of the most recent button3 press 3189 * time of the most recent button3 press
3230 */ 3190 */
3231 if (button3 && buttonpress) 3191 if (button3 && buttonpress)
3232 { /* button3 press */ 3192 { /* button3 press */
3233 /* 3193 /*
3234 * first determine which edge of the selection we are closest to 3194 * first determine which edge of the selection we are closest to
3235 */ 3195 */
3236 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3196 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3237 || (!ROWCOL_IS_AFTER (pos, selection.end) 3197 || (!ROWCOL_IS_AFTER (pos, selection.end)
3238 && (((pos.col - selection.beg.col) 3198 && (((pos.col - selection.beg.col)
3239 + ((pos.row - selection.beg.row) * ncol)) 3199 + ((pos.row - selection.beg.row) * ncol))
3240 < ((selection.end.col - pos.col) 3200 < ((selection.end.col - pos.col)
3241 + ((selection.end.row - pos.row) * ncol))))) 3201 + ((selection.end.row - pos.row) * ncol)))))
3242 closeto = LEFT; 3202 closeto = LEFT;
3203
3243 if (closeto == LEFT) 3204 if (closeto == LEFT)
3244 { 3205 {
3245 selection.beg.row = pos.row; 3206 selection.beg.row = pos.row;
3246 selection.beg.col = pos.col; 3207 selection.beg.col = pos.col;
3247 selection.mark.row = selection.end.row; 3208 selection.mark.row = selection.end.row;
3248 selection.mark.col = selection.end.col 3209 selection.mark.col = selection.end.col - (selection.clicks == 2);
3249 - (selection.clicks == 2);
3250 } 3210 }
3251 else 3211 else
3252 { 3212 {
3253 selection.end.row = pos.row; 3213 selection.end.row = pos.row;
3254 selection.end.col = pos.col; 3214 selection.end.col = pos.col;
3255 selection.mark.row = selection.beg.row; 3215 selection.mark.row = selection.beg.row;
3256 selection.mark.col = selection.beg.col; 3216 selection.mark.col = selection.beg.col;
3257 } 3217 }
3258 } 3218 }
3259 else 3219 else
3260 { /* button1 drag or button3 drag */ 3220 { /* button1 drag or button3 drag */
3261 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3221 if (ROWCOL_IS_AFTER (selection.mark, pos))
3262 { 3222 {
3263 if ((selection.mark.row == selection.end.row) 3223 if ((selection.mark.row == selection.end.row)
3264 && (selection.mark.col == selection.end.col) 3224 && (selection.mark.col == selection.end.col)
3265 && clickchange && selection.clicks == 2) 3225 && clickchange && selection.clicks == 2)
3266 selection.mark.col--; 3226 selection.mark.col--;
3227
3267 selection.beg.row = pos.row; 3228 selection.beg.row = pos.row;
3268 selection.beg.col = pos.col; 3229 selection.beg.col = pos.col;
3269 selection.end.row = selection.mark.row; 3230 selection.end.row = selection.mark.row;
3270 selection.end.col = selection.mark.col 3231 selection.end.col = selection.mark.col + (selection.clicks == 2);
3271 + (selection.clicks == 2);
3272 } 3232 }
3273 else 3233 else
3274 { 3234 {
3275 selection.beg.row = selection.mark.row; 3235 selection.beg.row = selection.mark.row;
3276 selection.beg.col = selection.mark.col; 3236 selection.beg.col = selection.mark.col;
… …
3280 } 3240 }
3281 3241
3282 if (selection.clicks == 1) 3242 if (selection.clicks == 1)
3283 { 3243 {
3284 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3244 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3245
3285 if (end_col != -1 && selection.beg.col > end_col) 3246 if (end_col != -1 && selection.beg.col > end_col)
3286 { 3247 {
3287#if 1 3248#if 1
3288 selection.beg.col = ncol; 3249 selection.beg.col = ncol;
3289#else 3250#else
3290 if (selection.beg.row != selection.end.row) 3251 if (selection.beg.row != selection.end.row)
3291 selection.beg.col = ncol; 3252 selection.beg.col = ncol;
3292 else 3253 else
3293 selection.beg.col = selection.mark.col; 3254 selection.beg.col = selection.mark.col;
3294#endif 3255#endif
3295
3296 } 3256 }
3257
3297 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3258 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3259
3298 if (end_col != -1 && selection.end.col > end_col) 3260 if (end_col != -1 && selection.end.col > end_col)
3299 selection.end.col = ncol; 3261 selection.end.col = ncol;
3300
3301 } 3262 }
3302 else if (selection.clicks == 2) 3263 else if (selection.clicks == 2)
3303 { 3264 {
3304 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3265 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3305 selection.end.col--; 3266 selection.end.col--;
3267
3306 selection_delimit_word (UP, & (selection.beg), 3268 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3307 & (selection.beg));
3308 selection_delimit_word (DN, & (selection.end), 3269 selection_delimit_word (DN, & (selection.end), & (selection.end));
3309 & (selection.end));
3310 } 3270 }
3311 else if (selection.clicks == 3) 3271 else if (selection.clicks == 3)
3312 { 3272 {
3313#ifndef NO_FRILLS 3273#ifndef NO_FRILLS
3314 if ((Options & Opt_tripleclickwords)) 3274 if ((Options & Opt_tripleclickwords))
3315 { 3275 {
3316 int end_row; 3276 int end_row;
3317 3277
3318 selection_delimit_word (UP, & (selection.beg), 3278 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3319 & (selection.beg));
3320 end_row = screen.tlen[selection.mark.row 3279 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3321 + TermWin.saveLines]; 3280
3322 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3281 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3323 end_row++)
3324 { 3282 {
3325 end_col = screen.tlen[end_row + TermWin.saveLines]; 3283 end_col = screen.tlen[end_row + TermWin.saveLines];
3284
3326 if (end_col != -1) 3285 if (end_col != -1)
3327 { 3286 {
3328 selection.end.row = end_row; 3287 selection.end.row = end_row;
3329 selection.end.col = end_col; 3288 selection.end.col = end_col;
3330 selection_remove_trailing_spaces (); 3289 selection_remove_trailing_spaces ();
… …
3332 } 3291 }
3333 } 3292 }
3334 } 3293 }
3335 else 3294 else
3336#endif 3295#endif
3337
3338 { 3296 {
3339 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3297 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3340 selection.mark.col++; 3298 selection.mark.col++;
3341 selection.beg.col = 0; 3299 selection.beg.col = 0;
3342 selection.end.col = ncol; 3300 selection.end.col = ncol;
3343 } 3301 }
3344 } 3302 }
3303
3345 if (button3 && buttonpress) 3304 if (button3 && buttonpress)
3346 { /* mark may need to be changed */ 3305 { /* mark may need to be changed */
3347 if (closeto == LEFT) 3306 if (closeto == LEFT)
3348 { 3307 {
3349 selection.mark.row = selection.end.row; 3308 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col 3309 selection.mark.col = selection.end.col
3351 - (selection.clicks == 2); 3310 - (selection.clicks == 2);
… …
3355 selection.mark.row = selection.beg.row; 3314 selection.mark.row = selection.beg.row;
3356 selection.mark.col = selection.beg.col; 3315 selection.mark.col = selection.beg.col;
3357 } 3316 }
3358 } 3317 }
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)); 3318 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} 3319}
3362 3320
3363#ifndef NO_FRILLS 3321#ifndef NO_FRILLS
3364void 3322void
3365rxvt_term::selection_remove_trailing_spaces () 3323rxvt_term::selection_remove_trailing_spaces ()
… …
3464 /* TODO: Handle MULTIPLE */ 3422 /* TODO: Handle MULTIPLE */
3465 } 3423 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3424 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3467 { 3425 {
3468 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3426 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
3469 (8 * sizeof (Time)), PropModeReplace, 3427 (8 * sizeof (Time)), PropModeReplace,
3470 (unsigned char *)&selection_time, 1); 3428 (unsigned char *)&selection_time, 1);
3471 ev.property = rq.property; 3429 ev.property = rq.property;
3472 } 3430 }
3473 else if (rq.target == XA_STRING 3431 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3432 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3433 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3562 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3520 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3563} 3521}
3564 3522
3565#endif 3523#endif
3566/* ------------------------------------------------------------------------- */ 3524/* ------------------------------------------------------------------------- */
3567
3568/* ------------------------------------------------------------------------- *
3569 * DEBUG ROUTINES *
3570 * ------------------------------------------------------------------------- */
3571#if 0
3572void
3573rxvt_debug_colors (void)
3574{
3575 int color;
3576 const char *name[] =
3577 {
3578 "fg", "bg",
3579 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3580 };
3581
3582 fprintf (stderr, "Color ( ");
3583 if (rstyle & RS_RVid)
3584 fprintf (stderr, "rvid ");
3585 if (rstyle & RS_Bold)
3586 fprintf (stderr, "bold ");
3587 if (rstyle & RS_Blink)
3588 fprintf (stderr, "blink ");
3589 if (rstyle & RS_Uline)
3590 fprintf (stderr, "uline ");
3591 fprintf (stderr, "): ");
3592
3593 color = GET_FGCOLOR (rstyle);
3594#ifndef NO_BRIGHTCOLOR
3595 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3596 {
3597 color -= (minBrightCOLOR - minCOLOR);
3598 fprintf (stderr, "bright ");
3599 }
3600#endif
3601 fprintf (stderr, "%s on ", name[color]);
3602
3603 color = GET_BGCOLOR (rstyle);
3604#ifndef NO_BRIGHTCOLOR
3605 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3606 {
3607 color -= (minBrightCOLOR - minCOLOR);
3608 fprintf (stderr, "bright ");
3609 }
3610#endif
3611 fprintf (stderr, "%s\n", name[color]);
3612}
3613#endif

Diff Legend

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