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.14 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 20:12:53 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.14 2003/12/26 07:42:23 pcg Exp $
5 * 4 *
6 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
7 * 6 *
8 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
… …
46#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK(R) \ 50#define ZERO_SCROLLBACK() \
52 if (((R)->Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 51 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \
53 (R)->TermWin.view_start = 0 52 TermWin.view_start = 0
54#define CLEAR_SELECTION(R) \ 53#define CLEAR_SELECTION() \
55 (R)->selection.beg.row = (R)->selection.beg.col \ 54 selection.beg.row = selection.beg.col \
56 = (R)->selection.end.row = (R)->selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION(R) \ 56#define CLEAR_ALL_SELECTION() \
58 (R)->selection.beg.row = (R)->selection.beg.col \ 57 selection.beg.row = selection.beg.col \
59 = (R)->selection.mark.row = (R)->selection.mark.col \ 58 = selection.mark.row = selection.mark.col \
60 = (R)->selection.end.row = (R)->selection.end.col = 0 59 = selection.end.row = selection.end.col = 0
61 60
62#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
63 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 62 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
64#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
65 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 64 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
… …
184 if (!talloc) 183 if (!talloc)
185 { 184 {
186 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 185 talloc = new rxvt_salloc (ncol * sizeof (text_t));
187 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 186 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
188 } 187 }
189 188
190 if (prev_nrow == 0) 189 if (prev_nrow == 0)
191 { 190 {
192 /* 191 /*
193 * first time called so just malloc everything : don't rely on realloc 192 * first time called so just malloc everything : don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL 193 * Note: this is still needed so that all the scrollback lines are NULL
… …
220 rstyle = DEFAULT_RSTYLE; 219 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 220 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 221 screen.cur.row = screen.cur.col = 0;
223 screen.charset = 0; 222 screen.charset = 0;
224 current_screen = PRIMARY; 223 current_screen = PRIMARY;
225 rxvt_scr_cursor (this, SAVE); 224 scr_cursor (SAVE);
226 225
227#if NSCREENS 226#if NSCREENS
228 swap.flags = Screen_DefaultFlags; 227 swap.flags = Screen_DefaultFlags;
229 swap.cur.row = swap.cur.col = 0; 228 swap.cur.row = swap.cur.col = 0;
230 swap.charset = 0; 229 swap.charset = 0;
231 current_screen = SECONDARY; 230 current_screen = SECONDARY;
232 rxvt_scr_cursor (this, SAVE); 231 scr_cursor (SAVE);
233 current_screen = PRIMARY; 232 current_screen = PRIMARY;
234#endif 233#endif
235 234
236 selection.text = NULL; 235 selection.text = NULL;
237 selection.len = 0; 236 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 237 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 238 selection.screen = PRIMARY;
240 selection.clicks = 0; 239 selection.clicks = 0;
241 CLEAR_ALL_SELECTION (this); 240 CLEAR_ALL_SELECTION ();
242 rvideo = 0; 241 rvideo = 0;
243 } 242 }
244 else 243 else
245 { 244 {
246 /* 245 /*
… …
338 if (ncol != prev_ncol) 337 if (ncol != prev_ncol)
339 { 338 {
340 int common = min (prev_ncol, ncol); 339 int common = min (prev_ncol, ncol);
341 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t)); 340 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
342 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t)); 341 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
343 342
344 for (p = 0; p < total_rows; p++) 343 for (p = 0; p < total_rows; p++)
345 { 344 {
346 if (screen.text[p]) 345 if (screen.text[p])
347 { 346 {
348 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t; 347 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
… …
447 /* then so is screen.rend[i] */ 446 /* then so is screen.rend[i] */
448 assert(screen.rend[i]); 447 assert(screen.rend[i]);
449 } 448 }
450#endif 449#endif
451 450
452 delete talloc; 451 delete talloc; talloc = 0;
453 delete ralloc; 452 delete ralloc; ralloc = 0;
454 453
455 free (screen.text); 454 free (screen.text);
456 free (screen.tlen); 455 free (screen.tlen);
457 free (screen.rend); 456 free (screen.rend);
458 free (drawn_text); 457 free (drawn_text);
… …
475 474
476/* ------------------------------------------------------------------------- */ 475/* ------------------------------------------------------------------------- */
477/* 476/*
478 * Hard reset 477 * Hard reset
479 */ 478 */
480/* EXTPROTO */
481void 479void
482rxvt_scr_poweron(pR) 480rxvt_term::scr_poweron ()
483{ 481{
484 D_SCREEN((stderr, "rxvt_scr_poweron()")); 482 D_SCREEN((stderr, "rxvt_scr_poweron()"));
485 483
486 R->scr_release (); 484 scr_release ();
487 R->prev_nrow = R->prev_ncol = 0; 485 prev_nrow = prev_ncol = 0;
488 R->scr_reset (); 486 scr_reset ();
489 487
490 R->scr_clear (); 488 scr_clear ();
491 R->scr_refresh (SLOW_REFRESH); 489 scr_refresh (SLOW_REFRESH);
492#ifdef RXVT_GRAPHICS 490#ifdef RXVT_GRAPHICS
493 rxvt_Gr_reset (aR); 491 Gr_reset ();
494#endif 492#endif
495} 493}
496 494
497/* ------------------------------------------------------------------------- * 495/* ------------------------------------------------------------------------- *
498 * PROCESS SCREEN COMMANDS * 496 * PROCESS SCREEN COMMANDS *
… …
500/* 498/*
501 * Save and Restore cursor 499 * Save and Restore cursor
502 * XTERM_SEQ: Save cursor : ESC 7 500 * XTERM_SEQ: Save cursor : ESC 7
503 * XTERM_SEQ: Restore cursor: ESC 8 501 * XTERM_SEQ: Restore cursor: ESC 8
504 */ 502 */
505/* EXTPROTO */
506void 503void
507rxvt_scr_cursor(pR_ int mode) 504rxvt_term::scr_cursor (int mode)
508{ 505{
509 screen_t *s; 506 screen_t *s;
510 507
511 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode)); 508 D_SCREEN((stderr, "rxvt_scr_cursor(%c)", mode));
512 509
513#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 510#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
514 if (R->current_screen == SECONDARY) 511 if (current_screen == SECONDARY)
515 s = &(R->swap); 512 s = &(swap);
516 else 513 else
517#endif 514#endif
518 s = &(R->screen); 515 s = &(screen);
519 switch (mode) { 516 switch (mode)
517 {
520 case SAVE: 518 case SAVE:
521 s->s_cur.row = s->cur.row; 519 s->s_cur.row = s->cur.row;
522 s->s_cur.col = s->cur.col; 520 s->s_cur.col = s->cur.col;
523 s->s_rstyle = R->rstyle; 521 s->s_rstyle = rstyle;
524 s->s_charset = s->charset; 522 s->s_charset = s->charset;
525 s->s_charset_char = R->charsets[s->charset]; 523 s->s_charset_char = charsets[s->charset];
526 break; 524 break;
527 case RESTORE: 525 case RESTORE:
528 R->want_refresh = 1; 526 want_refresh = 1;
529 s->cur.row = s->s_cur.row; 527 s->cur.row = s->s_cur.row;
530 s->cur.col = s->s_cur.col; 528 s->cur.col = s->s_cur.col;
531 s->flags &= ~Screen_WrapNext; 529 s->flags &= ~Screen_WrapNext;
532 R->rstyle = s->s_rstyle; 530 rstyle = s->s_rstyle;
533 s->charset = s->s_charset; 531 s->charset = s->s_charset;
534 R->charsets[s->charset] = s->s_charset_char; 532 charsets[s->charset] = s->s_charset_char;
535 rxvt_set_font_style(aR); 533 set_font_style ();
536 break; 534 break;
537 } 535 }
538/* boundary check in case screen size changed between SAVE and RESTORE */ 536 /* boundary check in case screen size changed between SAVE and RESTORE */
539 MIN_IT(s->cur.row, R->TermWin.nrow - 1); 537 MIN_IT(s->cur.row, TermWin.nrow - 1);
540 MIN_IT(s->cur.col, R->TermWin.ncol - 1); 538 MIN_IT(s->cur.col, TermWin.ncol - 1);
541#ifdef DEBUG_STRICT 539#ifdef DEBUG_STRICT
542 assert(s->cur.row >= 0); 540 assert(s->cur.row >= 0);
543 assert(s->cur.col >= 0); 541 assert(s->cur.col >= 0);
544#else /* drive with your eyes closed */ 542#else /* drive with your eyes closed */
545 MAX_IT(s->cur.row, 0); 543 MAX_IT(s->cur.row, 0);
546 MAX_IT(s->cur.col, 0); 544 MAX_IT(s->cur.col, 0);
547#endif 545#endif
548} 546}
549 547
550/* ------------------------------------------------------------------------- */ 548/* ------------------------------------------------------------------------- */
551/* 549/*
552 * Swap between primary and secondary screens 550 * Swap between primary and secondary screens
553 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 551 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
554 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 552 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
555 */ 553 */
556/* EXTPROTO */
557int 554int
558rxvt_scr_change_screen(pR_ int scrn) 555rxvt_term::scr_change_screen (int scrn)
559{ 556{
560 int i; 557 int i;
561#if NSCREENS 558#if NSCREENS
562 int offset; 559 int offset;
563#endif 560#endif
564 561
565 R->want_refresh = 1; 562 want_refresh = 1;
566 563
567 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn)); 564 D_SCREEN((stderr, "rxvt_scr_change_screen(%d)", scrn));
568 565
569 R->TermWin.view_start = 0; 566 TermWin.view_start = 0;
570 567
571 if (R->current_screen == scrn) 568 if (current_screen == scrn)
572 return R->current_screen; 569 return current_screen;
573 570
574 rxvt_selection_check(aR_ 2); /* check for boundary cross */ 571 selection_check (2); /* check for boundary cross */
575 572
576 SWAP_IT(R->current_screen, scrn, int); 573 SWAP_IT(current_screen, scrn, int);
577#if NSCREENS 574#if NSCREENS
578 R->num_scr = 0; 575 num_scr = 0;
579 offset = R->TermWin.saveLines; 576 offset = TermWin.saveLines;
580 for (i = R->prev_nrow; i--;) { 577 for (i = prev_nrow; i--;)
578 {
581 SWAP_IT(R->screen.text[i + offset], R->swap.text[i], text_t *); 579 SWAP_IT(screen.text[i + offset], swap.text[i], text_t *);
582 SWAP_IT(R->screen.tlen[i + offset], R->swap.tlen[i], int16_t); 580 SWAP_IT(screen.tlen[i + offset], swap.tlen[i], int16_t);
583 SWAP_IT(R->screen.rend[i + offset], R->swap.rend[i], rend_t *); 581 SWAP_IT(screen.rend[i + offset], swap.rend[i], rend_t *);
584 } 582 }
585 SWAP_IT(R->screen.cur.row, R->swap.cur.row, int16_t); 583 SWAP_IT(screen.cur.row, swap.cur.row, int16_t);
586 SWAP_IT(R->screen.cur.col, R->swap.cur.col, int16_t); 584 SWAP_IT(screen.cur.col, swap.cur.col, int16_t);
587# ifdef DEBUG_STRICT 585# ifdef DEBUG_STRICT
588 assert((R->screen.cur.row >= 0) && (R->screen.cur.row < R->prev_nrow)); 586 assert((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
589 assert((R->screen.cur.col >= 0) && (R->screen.cur.col < R->prev_ncol)); 587 assert((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
590# else /* drive with your eyes closed */ 588# else /* drive with your eyes closed */
591 MAX_IT(R->screen.cur.row, 0); 589 MAX_IT(screen.cur.row, 0);
592 MIN_IT(R->screen.cur.row, (int32_t)R->prev_nrow - 1); 590 MIN_IT(screen.cur.row, (int32_t)prev_nrow - 1);
593 MAX_IT(R->screen.cur.col, 0); 591 MAX_IT(screen.cur.col, 0);
594 MIN_IT(R->screen.cur.col, (int32_t)R->prev_ncol - 1); 592 MIN_IT(screen.cur.col, (int32_t)prev_ncol - 1);
595# endif 593# endif
596 SWAP_IT(R->screen.charset, R->swap.charset, int16_t); 594 SWAP_IT(screen.charset, swap.charset, int16_t);
597 SWAP_IT(R->screen.flags, R->swap.flags, int); 595 SWAP_IT(screen.flags, swap.flags, int);
598 R->screen.flags |= Screen_VisibleCursor; 596 screen.flags |= Screen_VisibleCursor;
599 R->swap.flags |= Screen_VisibleCursor; 597 swap.flags |= Screen_VisibleCursor;
600 598
601# ifdef RXVT_GRAPHICS 599# ifdef RXVT_GRAPHICS
602 600
603 if (rxvt_Gr_Displayed(aR)) { 601 if (Gr_Displayed ())
602 {
604 rxvt_Gr_scroll(aR_ 0); 603 Gr_scroll (0);
605 rxvt_Gr_ChangeScreen(aR); 604 Gr_ChangeScreen ();
606 } 605 }
607# endif 606# endif
608#else 607#else
609# ifdef SCROLL_ON_NO_SECONDARY 608# ifdef SCROLL_ON_NO_SECONDARY
610# ifdef RXVT_GRAPHICS 609# ifdef RXVT_GRAPHICS
611 if (rxvt_Gr_Displayed(aR)) 610 if (Gr_Displayed ())
612 rxvt_Gr_ClearScreen(aR); 611 Gr_ClearScreen ();
613# endif 612# endif
614 if (R->current_screen == PRIMARY 613 if (current_screen == PRIMARY
615# ifdef RXVT_GRAPHICS 614# ifdef RXVT_GRAPHICS
616 && !rxvt_Gr_Displayed(aR) 615 && !Gr_Displayed ()
617# endif 616# endif
618 ) 617 )
619 R->scr_scroll_text(0, (R->prev_nrow - 1), R->prev_nrow, 0); 618 scr_scroll_text(0, (prev_nrow - 1), prev_nrow, 0);
620# endif 619# endif
621#endif 620#endif
622 return scrn; 621 return scrn;
623} 622}
624 623
625/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
626/* 625/*
627 * Change the colour for following text 626 * Change the colour for following text
628 */ 627 */
629/* EXTPROTO */
630void 628void
631rxvt_scr_color(pR_ unsigned int color, int fgbg) 629rxvt_term::scr_color (unsigned int color, int fgbg)
632{ 630{
633 color &= RS_fgMask; 631 color &= RS_fgMask;
634 if (fgbg == Color_fg) 632 if (fgbg == Color_fg)
635 R->rstyle = SET_FGCOLOR(R->rstyle, color); 633 rstyle = SET_FGCOLOR(rstyle, color);
636 else 634 else
637 R->rstyle = SET_BGCOLOR(R->rstyle, color); 635 rstyle = SET_BGCOLOR(rstyle, color);
638} 636}
639 637
640/* ------------------------------------------------------------------------- */ 638/* ------------------------------------------------------------------------- */
641/* 639/*
642 * Change the rendition style for following text 640 * Change the rendition style for following text
643 */ 641 */
644/* EXTPROTO */
645void 642void
646rxvt_scr_rendition(pR_ int set, int style) 643rxvt_term::scr_rendition (int set, int style)
647{ 644 {
648 if (set) 645 if (set)
649 R->rstyle |= style; 646 rstyle |= style;
650 else if (style == ~RS_None) 647 else if (style == ~RS_None)
651 R->rstyle = DEFAULT_RSTYLE; 648 rstyle = DEFAULT_RSTYLE;
652 else 649 else
653 R->rstyle &= ~style; 650 rstyle &= ~style;
654} 651 }
655 652
656/* ------------------------------------------------------------------------- */ 653/* ------------------------------------------------------------------------- */
657/* 654/*
658 * Scroll text between <row1> and <row2> inclusive, by <count> lines 655 * Scroll text between <row1> and <row2> inclusive, by <count> lines
659 * count positive ==> scroll up 656 * count positive ==> scroll up
… …
682 TermWin.nscrolled = (uint16_t)nscrolled; 679 TermWin.nscrolled = (uint16_t)nscrolled;
683 680
684 if ((Options & Opt_scrollWithBuffer) 681 if ((Options & Opt_scrollWithBuffer)
685 && TermWin.view_start != 0 682 && TermWin.view_start != 0
686 && TermWin.view_start != TermWin.saveLines) 683 && TermWin.view_start != TermWin.saveLines)
687 rxvt_scr_page (this, UP, count); 684 scr_page (UP, count);
688 } 685 }
689 else if (!spec) 686 else if (!spec)
690 row1 += TermWin.saveLines; 687 row1 += TermWin.saveLines;
691 688
692 row2 += TermWin.saveLines; 689 row2 += TermWin.saveLines;
… …
700 || (i - count < row1 && i >= row1) 697 || (i - count < row1 && i >= row1)
701 || (i - count > row2 && i <= row2) 698 || (i - count > row2 && i <= row2)
702 || (j - count < row1 && j >= row1) 699 || (j - count < row1 && j >= row1)
703 || (j - count > row2 && j <= row2)) 700 || (j - count > row2 && j <= row2))
704 { 701 {
705 CLEAR_ALL_SELECTION (this); 702 CLEAR_ALL_SELECTION ();
706 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 703 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
707 } 704 }
708 else if (j >= row1 && j <= row2) 705 else if (j >= row1 && j <= row2)
709 { 706 {
710 /* move selected region too */ 707 /* move selected region too */
… …
712 selection.end.row -= count; 709 selection.end.row -= count;
713 selection.mark.row -= count; 710 selection.mark.row -= count;
714 } 711 }
715 } 712 }
716 713
717 rxvt_selection_check (this, 0); /* _after_ TermWin.nscrolled update */ 714 selection_check (0); /* _after_ TermWin.nscrolled update */
718 715
719 num_scr += count; 716 num_scr += count;
720 j = count; 717 j = count;
721 718
722 if (count < 0) 719 if (count < 0)
… …
776 scr_blank_screen_mem (screen.text, screen.rend, 773 scr_blank_screen_mem (screen.text, screen.rend,
777 (unsigned int)j, rstyle); 774 (unsigned int)j, rstyle);
778 } 775 }
779 776
780#ifdef RXVT_GRAPHICS 777#ifdef RXVT_GRAPHICS
781 if (rxvt_Gr_Displayed (this)) 778 if (Gr_Displayed ())
782 rxvt_Gr_scroll(this, count); 779 Gr_scroll (count);
783#endif 780#endif
784 781
785 return count; 782 return count;
786} 783}
787 784
788/* ------------------------------------------------------------------------- */ 785/* ------------------------------------------------------------------------- */
789/* 786/*
790 * Add text given in <str> of length <len> to screen struct 787 * Add text given in <str> of length <len> to screen struct
791 */ 788 */
792/* EXTPROTO */
793void 789void
794rxvt_scr_add_lines(pR_ const uint32_t *str, int nlines, int len) 790rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len)
795{ 791{
796 unsigned char checksel, clearsel; 792 unsigned char checksel, clearsel;
797 uint32_t c; 793 uint32_t c;
798 int i, row, last_col; 794 int i, row, last_col;
799 text_t *stp; 795 text_t *stp;
800 rend_t *srp; 796 rend_t *srp;
801 797
802 if (len <= 0) /* sanity */ 798 if (len <= 0) /* sanity */
803 return; 799 return;
804 800
805 R->want_refresh = 1; 801 want_refresh = 1;
806 last_col = R->TermWin.ncol; 802 last_col = TermWin.ncol;
807 803
808 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len)); 804 D_SCREEN((stderr, "rxvt_scr_add_lines(%d,%d)", nlines, len));
809 ZERO_SCROLLBACK(R); 805 ZERO_SCROLLBACK();
810 if (nlines > 0) { 806 if (nlines > 0)
807 {
811 nlines += (R->screen.cur.row - R->screen.bscroll); 808 nlines += (screen.cur.row - screen.bscroll);
812 if ((nlines > 0) 809 if ((nlines > 0)
813 && (R->screen.tscroll == 0) 810 && (screen.tscroll == 0)
814 && (R->screen.bscroll == (R->TermWin.nrow - 1))) { 811 && (screen.bscroll == (TermWin.nrow - 1)))
812 {
815 /* _at least_ this many lines need to be scrolled */ 813 /* _at least_ this many lines need to be scrolled */
816 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, nlines, 0); 814 scr_scroll_text(screen.tscroll, screen.bscroll, nlines, 0);
817 R->screen.cur.row -= nlines; 815 screen.cur.row -= nlines;
818 } 816 }
819 } 817 }
820#ifdef DEBUG_STRICT 818#ifdef DEBUG_STRICT
821 assert(R->screen.cur.col < last_col); 819 assert(screen.cur.col < last_col);
822 assert((R->screen.cur.row < R->TermWin.nrow) 820 assert((screen.cur.row < TermWin.nrow)
823 && (R->screen.cur.row >= -(int32_t)R->TermWin.nscrolled)); 821 && (screen.cur.row >= -(int32_t)TermWin.nscrolled));
824#else /* drive with your eyes closed */ 822#else /* drive with your eyes closed */
825 MIN_IT(R->screen.cur.col, last_col - 1); 823 MIN_IT(screen.cur.col, last_col - 1);
826 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 824 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
827 MAX_IT(R->screen.cur.row, -(int32_t)R->TermWin.nscrolled); 825 MAX_IT(screen.cur.row, -(int32_t)TermWin.nscrolled);
828#endif 826#endif
829 row = R->screen.cur.row + R->TermWin.saveLines; 827 row = screen.cur.row + TermWin.saveLines;
830 828
831 checksel = (R->selection.op 829 checksel = (selection.op
832 && R->current_screen == R->selection.screen) ? 1 : 0; 830 && current_screen == selection.screen) ? 1 : 0;
833 clearsel = 0; 831 clearsel = 0;
834 832
835 stp = R->screen.text[row]; 833 stp = screen.text[row];
836 srp = R->screen.rend[row]; 834 srp = screen.rend[row];
837 835
838 for (i = 0; i < len;) { 836 for (i = 0; i < len;)
837 {
839 c = str[i++]; 838 c = str[i++];
840 switch (c) { 839 switch (c)
840 {
841 case '\t': 841 case '\t':
842 rxvt_scr_tab (aR_ 1); 842 scr_tab (1);
843 continue; 843 continue;
844 case '\n': 844 case '\n':
845 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 845 if (screen.tlen[row] != -1) /* XXX: think about this */
846 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 846 MAX_IT(screen.tlen[row], screen.cur.col);
847 R->screen.flags &= ~Screen_WrapNext; 847 screen.flags &= ~Screen_WrapNext;
848 if (R->screen.cur.row == R->screen.bscroll) 848 if (screen.cur.row == screen.bscroll)
849 R->scr_scroll_text (R->screen.tscroll, R->screen.bscroll, 1, 0); 849 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
850 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 850 else if (screen.cur.row < (TermWin.nrow - 1))
851 row = (++R->screen.cur.row) + R->TermWin.saveLines; 851 row = (++screen.cur.row) + TermWin.saveLines;
852 stp = R->screen.text[row]; /* _must_ refresh */ 852 stp = screen.text[row]; /* _must_ refresh */
853 srp = R->screen.rend[row]; /* _must_ refresh */ 853 srp = screen.rend[row]; /* _must_ refresh */
854 continue; 854 continue;
855 case '\r': 855 case '\r':
856 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 856 if (screen.tlen[row] != -1) /* XXX: think about this */
857 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 857 MAX_IT(screen.tlen[row], screen.cur.col);
858 R->screen.flags &= ~Screen_WrapNext; 858 screen.flags &= ~Screen_WrapNext;
859 R->screen.cur.col = 0; 859 screen.cur.col = 0;
860 continue; 860 continue;
861 default: 861 default:
862 if (c == 127) 862 if (c == 127)
863 continue; /* yummmm..... */ 863 continue; /* yummmm..... */
864 break; 864 break;
865 } 865 }
866 866
867 if (checksel /* see if we're writing within selection */ 867 if (checksel /* see if we're writing within selection */
868 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 868 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg)
869 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) { 869 && ROWCOL_IS_BEFORE(screen.cur, selection.end))
870 {
870 checksel = 0; 871 checksel = 0;
871 clearsel = 1; 872 clearsel = 1;
872 } 873 }
873 if (R->screen.flags & Screen_WrapNext) { 874 if (screen.flags & Screen_WrapNext)
875 {
874 R->screen.tlen[row] = -1; 876 screen.tlen[row] = -1;
875 if (R->screen.cur.row == R->screen.bscroll) 877 if (screen.cur.row == screen.bscroll)
876 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, 1, 0); 878 scr_scroll_text(screen.tscroll, screen.bscroll, 1, 0);
877 else if (R->screen.cur.row < (R->TermWin.nrow - 1)) 879 else if (screen.cur.row < (TermWin.nrow - 1))
878 row = (++R->screen.cur.row) + R->TermWin.saveLines; 880 row = (++screen.cur.row) + TermWin.saveLines;
879 stp = R->screen.text[row]; /* _must_ refresh */ 881 stp = screen.text[row]; /* _must_ refresh */
880 srp = R->screen.rend[row]; /* _must_ refresh */ 882 srp = screen.rend[row]; /* _must_ refresh */
881 R->screen.cur.col = 0; 883 screen.cur.col = 0;
882 R->screen.flags &= ~Screen_WrapNext; 884 screen.flags &= ~Screen_WrapNext;
883 } 885 }
884 if (R->screen.flags & Screen_Insert) 886 if (screen.flags & Screen_Insert)
885 rxvt_scr_insdel_chars(aR_ 1, INSERT); 887 scr_insdel_chars (1, INSERT);
886 888
887 if (R->charsets[R->screen.charset] == '0') // DEC SPECIAL 889 if (charsets[screen.charset] == '0') // DEC SPECIAL
888 switch (c) 890 switch (c)
889 {
890 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
891 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
892 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
893 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
894 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
895 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
896 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
897 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
898 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
899 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
900 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
901 }
902
903 rend_t rend = SET_FONT (R->rstyle, R->TermWin.fontset->find_font (c));
904 // rely on wcwidth to tell us the character width, at least for non-ascii
905 int width = c <= 128 ? 1 : wcwidth (c);
906
907 // width 0 characters (e.g. combining chars) are ignored. your problem, really
908 while (width-- > 0)
909 { 891 {
892 case '+': c = 0x2192; break; case ',': c = 0x2190; break; case '-': c = 0x2191; break;
893 case '.': c = 0x2193; break; case '0': c = 0x25ae; break; case '`': c = 0x25c6; break;
894 case 'a': c = 0x2592; break; case 'f': c = 0x00b0; break; case 'g': c = 0x00b1; break;
895 case 'h': c = 0x2592; break; case 'i': c = 0x2603; break; case 'j': c = 0x2518; break;
896 case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; case 'm': c = 0x2514; break;
897 case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; case 'p': c = 0x23bb; break;
898 case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; case 's': c = 0x23bd; break;
899 case 't': c = 0x251c; break; case 'u': c = 0x2524; break; case 'v': c = 0x2534; break;
900 case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; case 'y': c = 0x2264; break;
901 case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; case '|': c = 0x2260; break;
902 case '}': c = 0x00a3; break; case '~': c = 0x00b7; break;
903 }
904
905 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c));
906 // rely on wcwidth to tell us the character width, at least for non-ascii
907 int width = c <= 128 ? 1 : wcwidth (c);
908
909 // width -1 characters (e.g. combining chars) are ignored currently.
910 if (width > 0)
911 do
912 {
910 stp[R->screen.cur.col] = c; 913 stp[screen.cur.col] = c;
911 srp[R->screen.cur.col] = rend; 914 srp[screen.cur.col] = rend;
912 915
913 if (R->screen.cur.col < last_col - 1) 916 if (screen.cur.col < last_col - 1)
914 R->screen.cur.col++; 917 screen.cur.col++;
915 else 918 else
916 { 919 {
917 R->screen.tlen[row] = last_col; 920 screen.tlen[row] = last_col;
918 if (R->screen.flags & Screen_Autowrap) 921 if (screen.flags & Screen_Autowrap)
919 R->screen.flags |= Screen_WrapNext; 922 screen.flags |= Screen_WrapNext;
920 break; 923 break;
921 } 924 }
922 925
923 c = NOCHAR; 926 c = NOCHAR;
924 } 927 }
928 while (--width > 0);
929 else
930 (void)0; /* handle combining character etc. here. */
925 } 931 }
932
926 if (R->screen.tlen[row] != -1) /* XXX: think about this */ 933 if (screen.tlen[row] != -1) /* XXX: think about this */
927 MAX_IT(R->screen.tlen[row], R->screen.cur.col); 934 MAX_IT(screen.tlen[row], screen.cur.col);
928 935
929/* 936 /*
930 * If we wrote anywhere in the selected area, kill the selection 937 * If we wrote anywhere in the selected area, kill the selection
931 * XXX: should we kill the mark too? Possibly, but maybe that 938 * XXX: should we kill the mark too? Possibly, but maybe that
932 * should be a similar check. 939 * should be a similar check.
933 */ 940 */
934 if (clearsel) 941 if (clearsel)
935 CLEAR_SELECTION(R); 942 CLEAR_SELECTION();
936 943
937#ifdef DEBUG_STRICT 944#ifdef DEBUG_STRICT
938 assert(R->screen.cur.row >= 0); 945 assert(screen.cur.row >= 0);
939#else /* drive with your eyes closed */ 946#else /* drive with your eyes closed */
940 MAX_IT(R->screen.cur.row, 0); 947 MAX_IT(screen.cur.row, 0);
941#endif 948#endif
942} 949}
943 950
944/* ------------------------------------------------------------------------- */ 951/* ------------------------------------------------------------------------- */
945/* 952/*
946 * Process Backspace. Move back the cursor back a position, wrap if have to 953 * Process Backspace. Move back the cursor back a position, wrap if have to
947 * XTERM_SEQ: CTRL-H 954 * XTERM_SEQ: CTRL-H
948 */ 955 */
949/* EXTPROTO */
950void 956void
951rxvt_scr_backspace(pR) 957rxvt_term::scr_backspace ()
952{ 958{
953 R->want_refresh = 1; 959 want_refresh = 1;
954 if (R->screen.cur.col == 0) { 960 if (screen.cur.col == 0)
961 {
955 if (R->screen.cur.row > 0) { 962 if (screen.cur.row > 0)
963 {
956#ifdef TERMCAP_HAS_BW 964#ifdef TERMCAP_HAS_BW
957 R->screen.cur.col = R->TermWin.ncol - 1; 965 screen.cur.col = TermWin.ncol - 1;
958 R->screen.cur.row--; 966 screen.cur.row--;
959 return; 967 return;
960#endif 968#endif
969
961 } 970 }
971 }
962 } else if ((R->screen.flags & Screen_WrapNext) == 0) 972 else if ((screen.flags & Screen_WrapNext) == 0)
963 rxvt_scr_gotorc(aR_ 0, -1, RELATIVE); 973 scr_gotorc (0, -1, RELATIVE);
964 R->screen.flags &= ~Screen_WrapNext; 974 screen.flags &= ~Screen_WrapNext;
965} 975}
966 976
967/* ------------------------------------------------------------------------- */ 977/* ------------------------------------------------------------------------- */
968/* 978/*
969 * Process Horizontal Tab 979 * Process Horizontal Tab
970 * count: +ve = forward; -ve = backwards 980 * count: +ve = forward; -ve = backwards
971 * XTERM_SEQ: CTRL-I 981 * XTERM_SEQ: CTRL-I
972 */ 982 */
973/* EXTPROTO */
974void 983void
975rxvt_scr_tab(pR_ int count) 984rxvt_term::scr_tab (int count)
976{ 985{
977 int i, x; 986 int i, x;
978 987
979 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count)); 988 D_SCREEN((stderr, "rxvt_scr_tab(%d)", count));
980 R->want_refresh = 1; 989 want_refresh = 1;
981 i = x = R->screen.cur.col; 990 i = x = screen.cur.col;
982 if (count == 0) 991 if (count == 0)
983 return; 992 return;
984 else if (count > 0) { 993 else if (count > 0)
994 {
985 for (; ++i < R->TermWin.ncol; ) 995 for (; ++i < TermWin.ncol; )
986 if (R->tabs[i]) { 996 if (tabs[i])
997 {
987 x = i; 998 x = i;
988 if (!--count) 999 if (!--count)
989 break; 1000 break;
990 } 1001 }
991 if (count) 1002 if (count)
992 x = R->TermWin.ncol - 1; 1003 x = TermWin.ncol - 1;
1004 }
993 } else /* if (count < 0) */ { 1005 else /* if (count < 0) */
1006 {
994 for (; --i >= 0; ) 1007 for (; --i >= 0; )
995 if (R->tabs[i]) { 1008 if (tabs[i])
996 x = i;
997 if (!++count)
998 break;
999 } 1009 {
1000 if (count)
1001 x = 0; 1010 x = i;
1011 if (!++count)
1012 break;
1013 }
1014 if (count)
1015 x = 0;
1002 } 1016 }
1003 if (x != R->screen.cur.col) 1017 if (x != screen.cur.col)
1004 rxvt_scr_gotorc(aR_ 0, x, R_RELATIVE); 1018 scr_gotorc (0, x, R_RELATIVE);
1005} 1019}
1006 1020
1007/* ------------------------------------------------------------------------- */ 1021/* ------------------------------------------------------------------------- */
1008/* 1022/*
1009 * Process DEC Back Index 1023 * Process DEC Back Index
1010 * XTERM_SEQ: ESC 6 1024 * XTERM_SEQ: ESC 6
1011 * Move cursor left in row. If we're at the left boundary, shift everything 1025 * Move cursor left in row. If we're at the left boundary, shift everything
1012 * in that row right. Clear left column. 1026 * in that row right. Clear left column.
1013 */ 1027 */
1014#ifndef NO_FRILLS 1028#ifndef NO_FRILLS
1015/* EXTPROTO */
1016void 1029void
1017rxvt_scr_backindex(pR) 1030rxvt_term::scr_backindex ()
1018{ 1031{
1019 if (R->screen.cur.col > 0) 1032 if (screen.cur.col > 0)
1020 rxvt_scr_gotorc(aR_ 0, -1, R_RELATIVE | C_RELATIVE); 1033 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1021 else { 1034 else
1035 {
1022 if (R->screen.tlen[R->screen.cur.row + R->TermWin.saveLines] == 0) 1036 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1023 return; /* um, yeah? */ 1037 return; /* um, yeah? */
1024 rxvt_scr_insdel_chars(aR_ 1, INSERT); 1038 scr_insdel_chars (1, INSERT);
1025 } 1039 }
1026} 1040}
1027#endif 1041#endif
1028/* ------------------------------------------------------------------------- */ 1042/* ------------------------------------------------------------------------- */
1029/* 1043/*
… …
1031 * XTERM_SEQ: ESC 9 1045 * XTERM_SEQ: ESC 9
1032 * Move cursor right in row. If we're at the right boundary, shift everything 1046 * Move cursor right in row. If we're at the right boundary, shift everything
1033 * in that row left. Clear right column. 1047 * in that row left. Clear right column.
1034 */ 1048 */
1035#ifndef NO_FRILLS 1049#ifndef NO_FRILLS
1036/* EXTPROTO */
1037void 1050void
1038rxvt_scr_forwardindex(pR) 1051rxvt_term::scr_forwardindex ()
1039{ 1052{
1040 int row; 1053 int row;
1041 1054
1042 if (R->screen.cur.col < R->TermWin.ncol - 1) 1055 if (screen.cur.col < TermWin.ncol - 1)
1043 rxvt_scr_gotorc(aR_ 0, 1, R_RELATIVE | C_RELATIVE); 1056 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1044 else { 1057 else
1058 {
1045 row = R->screen.cur.row + R->TermWin.saveLines; 1059 row = screen.cur.row + TermWin.saveLines;
1046 if (R->screen.tlen[row] == 0) 1060 if (screen.tlen[row] == 0)
1047 return; /* um, yeah? */ 1061 return; /* um, yeah? */
1048 else if (R->screen.tlen[row] == -1) 1062 else if (screen.tlen[row] == -1)
1049 R->screen.tlen[row] = R->TermWin.ncol; 1063 screen.tlen[row] = TermWin.ncol;
1050 rxvt_scr_gotorc(aR_ 0, 0, R_RELATIVE); 1064 scr_gotorc (0, 0, R_RELATIVE);
1051 rxvt_scr_insdel_chars(aR_ 1, DELETE); 1065 scr_insdel_chars (1, DELETE);
1052 rxvt_scr_gotorc(aR_ 0, R->TermWin.ncol - 1, R_RELATIVE); 1066 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1053 } 1067 }
1054} 1068}
1055#endif 1069#endif
1056 1070
1057/* ------------------------------------------------------------------------- */ 1071/* ------------------------------------------------------------------------- */
1058/* 1072/*
1059 * Goto Row/Column 1073 * Goto Row/Column
1060 */ 1074 */
1061/* EXTPROTO */
1062void 1075void
1063rxvt_scr_gotorc(pR_ int row, int col, int relative) 1076rxvt_term::scr_gotorc (int row, int col, int relative)
1064{ 1077{
1065 R->want_refresh = 1; 1078 want_refresh = 1;
1066 ZERO_SCROLLBACK(R); 1079 ZERO_SCROLLBACK();
1067#ifdef RXVT_GRAPHICS 1080#ifdef RXVT_GRAPHICS
1068 if (rxvt_Gr_Displayed(aR)) 1081 if (Gr_Displayed ())
1069 rxvt_Gr_scroll(aR_ 0); 1082 Gr_scroll (0);
1070#endif 1083#endif
1071 1084
1072 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, R->screen.cur.row, R->screen.cur.col)); 1085 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));
1073 1086
1074 R->screen.cur.col = ((relative & C_RELATIVE) ? (R->screen.cur.col + col) 1087 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col)
1075 : col); 1088 : col);
1076 MAX_IT(R->screen.cur.col, 0); 1089 MAX_IT(screen.cur.col, 0);
1077 MIN_IT(R->screen.cur.col, (int32_t)R->TermWin.ncol - 1); 1090 MIN_IT(screen.cur.col, (int32_t)TermWin.ncol - 1);
1078 1091
1079 R->screen.flags &= ~Screen_WrapNext; 1092 screen.flags &= ~Screen_WrapNext;
1080 if (relative & R_RELATIVE) { 1093 if (relative & R_RELATIVE)
1094 {
1081 if (row > 0) { 1095 if (row > 0)
1096 {
1082 if (R->screen.cur.row <= R->screen.bscroll 1097 if (screen.cur.row <= screen.bscroll
1083 && (R->screen.cur.row + row) > R->screen.bscroll) 1098 && (screen.cur.row + row) > screen.bscroll)
1084 R->screen.cur.row = R->screen.bscroll; 1099 screen.cur.row = screen.bscroll;
1085 else 1100 else
1086 R->screen.cur.row += row;
1087 } else if (row < 0) {
1088 if (R->screen.cur.row >= R->screen.tscroll
1089 && (R->screen.cur.row + row) < R->screen.tscroll)
1090 R->screen.cur.row = R->screen.tscroll;
1091 else
1092 R->screen.cur.row += row;
1093 }
1094 } else {
1095 if (R->screen.flags & Screen_Relative) { /* relative origin mode */
1096 R->screen.cur.row = row + R->screen.tscroll;
1097 MIN_IT(R->screen.cur.row, R->screen.bscroll);
1098 } else
1099 R->screen.cur.row = row; 1101 screen.cur.row += row;
1102 }
1103 else if (row < 0)
1104 {
1105 if (screen.cur.row >= screen.tscroll
1106 && (screen.cur.row + row) < screen.tscroll)
1107 screen.cur.row = screen.tscroll;
1108 else
1109 screen.cur.row += row;
1110 }
1111 }
1112 else
1100 } 1113 {
1114 if (screen.flags & Screen_Relative)
1115 { /* relative origin mode */
1116 screen.cur.row = row + screen.tscroll;
1117 MIN_IT(screen.cur.row, screen.bscroll);
1118 }
1119 else
1120 screen.cur.row = row;
1121 }
1101 MAX_IT(R->screen.cur.row, 0); 1122 MAX_IT(screen.cur.row, 0);
1102 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1123 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
1103} 1124}
1104 1125
1105/* ------------------------------------------------------------------------- */ 1126/* ------------------------------------------------------------------------- */
1106/* 1127/*
1107 * direction should be UP or DN 1128 * direction should be UP or DN
1108 */ 1129 */
1109/* EXTPROTO */
1110void 1130void
1111rxvt_scr_index(pR_ enum page_dirn direction) 1131rxvt_term::scr_index (enum page_dirn direction)
1112{ 1132{
1113 int dirn; 1133 int dirn;
1114 1134
1115 R->want_refresh = 1; 1135 want_refresh = 1;
1116 dirn = ((direction == UP) ? 1 : -1); 1136 dirn = ((direction == UP) ? 1 : -1);
1117 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn)); 1137 D_SCREEN((stderr, "rxvt_scr_index(%d)", dirn));
1118 1138
1119 ZERO_SCROLLBACK(R); 1139 ZERO_SCROLLBACK();
1120 1140
1121#ifdef RXVT_GRAPHICS 1141#ifdef RXVT_GRAPHICS
1122 if (rxvt_Gr_Displayed(aR)) 1142 if (Gr_Displayed ())
1123 rxvt_Gr_scroll(aR_ 0); 1143 Gr_scroll (0);
1124#endif 1144#endif
1125 1145
1126 R->screen.flags &= ~Screen_WrapNext; 1146 screen.flags &= ~Screen_WrapNext;
1127 if ((R->screen.cur.row == R->screen.bscroll && direction == UP) 1147 if ((screen.cur.row == screen.bscroll && direction == UP)
1128 || (R->screen.cur.row == R->screen.tscroll && direction == DN)) 1148 || (screen.cur.row == screen.tscroll && direction == DN))
1129 R->scr_scroll_text(R->screen.tscroll, R->screen.bscroll, dirn, 0); 1149 scr_scroll_text(screen.tscroll, screen.bscroll, dirn, 0);
1130 else 1150 else
1131 R->screen.cur.row += dirn; 1151 screen.cur.row += dirn;
1132 MAX_IT(R->screen.cur.row, 0); 1152 MAX_IT(screen.cur.row, 0);
1133 MIN_IT(R->screen.cur.row, (int32_t)R->TermWin.nrow - 1); 1153 MIN_IT(screen.cur.row, (int32_t)TermWin.nrow - 1);
1134 rxvt_selection_check(aR_ 0); 1154 selection_check (0);
1135} 1155}
1136 1156
1137/* ------------------------------------------------------------------------- */ 1157/* ------------------------------------------------------------------------- */
1138/* 1158/*
1139 * Erase part or whole of a line 1159 * Erase part or whole of a line
1140 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1160 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1141 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1161 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1142 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1162 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1143 */ 1163 */
1144/* EXTPROTO */
1145void 1164void
1146rxvt_scr_erase_line(pR_ int mode) 1165rxvt_term::scr_erase_line (int mode)
1147{ 1166{
1148 unsigned int row, col, num; 1167 unsigned int row, col, num;
1149 1168
1150 R->want_refresh = 1; 1169 want_refresh = 1;
1151 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, R->screen.cur.row)); 1170 D_SCREEN((stderr, "rxvt_scr_erase_line(%d) at screen row: %d", mode, screen.cur.row));
1152 ZERO_SCROLLBACK (R); 1171 ZERO_SCROLLBACK ();
1153 1172
1154#ifdef RXVT_GRAPHICS 1173#ifdef RXVT_GRAPHICS
1155 if (rxvt_Gr_Displayed (aR)) 1174 if (Gr_Displayed ())
1156 rxvt_Gr_scroll (aR_ 0); 1175 Gr_scroll (0);
1157#endif 1176#endif
1158 1177
1159 rxvt_selection_check (aR_ 1); 1178 selection_check (1);
1160 1179
1161 R->screen.flags &= ~Screen_WrapNext; 1180 screen.flags &= ~Screen_WrapNext;
1162 1181
1163 row = R->TermWin.saveLines + R->screen.cur.row; 1182 row = TermWin.saveLines + screen.cur.row;
1164 switch (mode) 1183 switch (mode)
1165 { 1184 {
1166 case 0: /* erase to end of line */ 1185 case 0: /* erase to end of line */
1167 col = R->screen.cur.col; 1186 col = screen.cur.col;
1168 num = R->TermWin.ncol - col; 1187 num = TermWin.ncol - col;
1169 MIN_IT(R->screen.tlen[row], (int16_t)col); 1188 MIN_IT(screen.tlen[row], (int16_t)col);
1170 if (ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur) 1189 if (ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)
1171 || ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.end, R->screen.cur)) 1190 || ROWCOL_IN_ROW_AT_OR_AFTER(selection.end, screen.cur))
1172 CLEAR_SELECTION(R); 1191 CLEAR_SELECTION();
1173 break; 1192 break;
1174 case 1: /* erase to beginning of line */ 1193 case 1: /* erase to beginning of line */
1175 col = 0; 1194 col = 0;
1176 num = R->screen.cur.col + 1; 1195 num = screen.cur.col + 1;
1177 if (ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.beg, R->screen.cur) 1196 if (ROWCOL_IN_ROW_AT_OR_BEFORE(selection.beg, screen.cur)
1178 || ROWCOL_IN_ROW_AT_OR_BEFORE(R->selection.end, R->screen.cur)) 1197 || ROWCOL_IN_ROW_AT_OR_BEFORE(selection.end, screen.cur))
1179 CLEAR_SELECTION(R); 1198 CLEAR_SELECTION();
1180 break; 1199 break;
1181 case 2: /* erase whole line */ 1200 case 2: /* erase whole line */
1182 col = 0; 1201 col = 0;
1183 num = R->TermWin.ncol; 1202 num = TermWin.ncol;
1184 R->screen.tlen[row] = 0; 1203 screen.tlen[row] = 0;
1185 if (R->selection.beg.row <= R->screen.cur.row 1204 if (selection.beg.row <= screen.cur.row
1186 && R->selection.end.row >= R->screen.cur.row) 1205 && selection.end.row >= screen.cur.row)
1187 CLEAR_SELECTION(R); 1206 CLEAR_SELECTION();
1188 break; 1207 break;
1189 default: 1208 default:
1190 return; 1209 return;
1191 } 1210 }
1192 1211
1193 if (R->screen.text[row]) 1212 if (screen.text[row])
1194 R->scr_blank_line (&(R->screen.text[row][col]), 1213 scr_blank_line (&(screen.text[row][col]),
1195 &(R->screen.rend[row][col]), num, R->rstyle); 1214 &(screen.rend[row][col]), num, rstyle);
1196 else 1215 else
1197 R->scr_blank_screen_mem (R->screen.text, R->screen.rend, row, R->rstyle); 1216 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1198} 1217}
1199 1218
1200/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
1201/* 1220/*
1202 * Erase part of whole of the screen 1221 * Erase part of whole of the screen
… …
1205 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1224 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1206 */ 1225 */
1207void 1226void
1208rxvt_term::scr_erase_screen (int mode) 1227rxvt_term::scr_erase_screen (int mode)
1209{ 1228{
1210 int num; 1229 int num;
1211 int32_t row, row_offset; 1230 int32_t row, row_offset;
1212 rend_t ren; 1231 rend_t ren;
1213 XGCValues gcvalue; 1232 XGCValues gcvalue;
1214 1233
1215 want_refresh = 1; 1234 want_refresh = 1;
1216 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row)); 1235 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1217 ZERO_SCROLLBACK(this); 1236 ZERO_SCROLLBACK ();
1218 row_offset = (int32_t)TermWin.saveLines; 1237 row_offset = (int32_t)TermWin.saveLines;
1219 1238
1220 switch (mode) { 1239 switch (mode)
1240 {
1221 case 0: /* erase to end of screen */ 1241 case 0: /* erase to end of screen */
1222 rxvt_selection_check(this,1); 1242 selection_check (1);
1223 rxvt_scr_erase_line(this,0); 1243 scr_erase_line (0);
1224 row = screen.cur.row + 1; /* possible OOB */ 1244 row = screen.cur.row + 1; /* possible OOB */
1225 num = TermWin.nrow - row; 1245 num = TermWin.nrow - row;
1226 break; 1246 break;
1227 case 1: /* erase to beginning of screen */ 1247 case 1: /* erase to beginning of screen */
1228 rxvt_selection_check(this,3); 1248 selection_check (3);
1229 rxvt_scr_erase_line(this,1); 1249 scr_erase_line (1);
1230 row = 0; 1250 row = 0;
1231 num = screen.cur.row; 1251 num = screen.cur.row;
1232 break; 1252 break;
1233 case 2: /* erase whole screen */ 1253 case 2: /* erase whole screen */
1234 rxvt_selection_check (this, 3); 1254 selection_check (3);
1235#ifdef RXVT_GRAPHICS 1255#ifdef RXVT_GRAPHICS
1236 rxvt_Gr_ClearScreen (this); 1256 Gr_ClearScreen ();
1237#endif 1257#endif
1238 row = 0; 1258 row = 0;
1239 num = TermWin.nrow; 1259 num = TermWin.nrow;
1240 break; 1260 break;
1241 default: 1261 default:
1242 return; 1262 return;
1243 } 1263 }
1244 refresh_type |= REFRESH_BOUNDS; 1264 refresh_type |= REFRESH_BOUNDS;
1245 if (selection.op && current_screen == selection.screen 1265 if (selection.op && current_screen == selection.screen
1246 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1266 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1247 || (selection.end.row >= row 1267 || (selection.end.row >= row
1248 && selection.end.row <= row + num))) 1268 && selection.end.row <= row + num)))
1249 CLEAR_SELECTION (this); 1269 CLEAR_SELECTION ();
1250 if (row >= TermWin.nrow) /* Out Of Bounds */ 1270 if (row >= TermWin.nrow) /* Out Of Bounds */
1251 return; 1271 return;
1252 MIN_IT(num, (TermWin.nrow - row)); 1272 MIN_IT(num, (TermWin.nrow - row));
1253 if (rstyle & (RS_RVid | RS_Uline)) 1273 if (rstyle & (RS_RVid | RS_Uline))
1254 ren = (rend_t) ~RS_None; 1274 ren = (rend_t) ~RS_None;
1255 else if (GET_BASEBG(rstyle) == Color_bg) { 1275 else if (GET_BASEBG(rstyle) == Color_bg)
1276 {
1256 ren = DEFAULT_RSTYLE; 1277 ren = DEFAULT_RSTYLE;
1257 CLEAR_ROWS(row, num); 1278 CLEAR_ROWS(row, num);
1258 } else { 1279 }
1280 else
1281 {
1259 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1282 ren = (rstyle & (RS_fgMask | RS_bgMask));
1260 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)]; 1283 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)];
1261 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1284 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1262 ERASE_ROWS(row, num); 1285 ERASE_ROWS(row, num);
1263 gcvalue.foreground = PixColors[Color_fg]; 1286 gcvalue.foreground = PixColors[Color_fg];
1264 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue); 1287 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1265 } 1288 }
1266 for (; num--; row++) { 1289 for (; num--; row++)
1290 {
1267 scr_blank_screen_mem (screen.text, screen.rend, 1291 scr_blank_screen_mem (screen.text, screen.rend,
1268 (unsigned int)(row + row_offset), rstyle); 1292 (unsigned int)(row + row_offset), rstyle);
1269 screen.tlen[row + row_offset] = 0; 1293 screen.tlen[row + row_offset] = 0;
1270 scr_blank_line (drawn_text[row], drawn_rend[row], 1294 scr_blank_line (drawn_text[row], drawn_rend[row],
1271 (unsigned int)TermWin.ncol, ren); 1295 (unsigned int)TermWin.ncol, ren);
1272 } 1296 }
1273} 1297}
1274 1298
1275/* ------------------------------------------------------------------------- */ 1299/* ------------------------------------------------------------------------- */
1276/* 1300/*
1277 * Fill the screen with `E's 1301 * Fill the screen with `E's
1278 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1302 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1279 */ 1303 */
1280/* EXTPROTO */
1281void 1304void
1282rxvt_scr_E(pR) 1305rxvt_term::scr_E ()
1283{ 1306{
1284 int i, j, k; 1307 int i, j, k;
1285 rend_t *r1, fs; 1308 rend_t *r1, fs;
1286 1309
1287 R->want_refresh = 1; 1310 want_refresh = 1;
1288 R->num_scr_allow = 0; 1311 num_scr_allow = 0;
1289 ZERO_SCROLLBACK(R); 1312 ZERO_SCROLLBACK();
1290 rxvt_selection_check(aR_ 3); 1313 selection_check (3);
1291 1314
1292 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1315 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1293 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1316 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1317 {
1294 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1318 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1295 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1319 fill_text (screen.text[k], 'E', TermWin.ncol);
1296 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1320 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1297 *r1++ = fs; 1321 *r1++ = fs;
1298 } 1322 }
1299} 1323}
1300 1324
1301/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1302/* 1326/*
1303 * Insert/Delete <count> lines 1327 * Insert/Delete <count> lines
1304 */ 1328 */
1305/* EXTPROTO */
1306void 1329void
1307rxvt_scr_insdel_lines(pR_ int count, int insdel) 1330rxvt_term::scr_insdel_lines (int count, int insdel)
1308{ 1331{
1309 int end; 1332 int end;
1310 1333
1311 ZERO_SCROLLBACK(R); 1334 ZERO_SCROLLBACK();
1312 1335
1313#ifdef RXVT_GRAPHICS 1336#ifdef RXVT_GRAPHICS
1314 if (rxvt_Gr_Displayed(aR)) 1337 if (Gr_Displayed ())
1315 rxvt_Gr_scroll(aR_ 0); 1338 Gr_scroll (0);
1316#endif 1339#endif
1317 1340
1318 rxvt_selection_check(aR_ 1); 1341 selection_check (1);
1319 1342
1320 if (R->screen.cur.row > R->screen.bscroll) 1343 if (screen.cur.row > screen.bscroll)
1344 return;
1345
1346 end = screen.bscroll - screen.cur.row + 1;
1347 if (count > end)
1348 {
1349 if (insdel == DELETE)
1321 return; 1350 return;
1322
1323 end = R->screen.bscroll - R->screen.cur.row + 1;
1324 if (count > end) {
1325 if (insdel == DELETE)
1326 return;
1327 else if (insdel == INSERT) 1351 else if (insdel == INSERT)
1328 count = end; 1352 count = end;
1329 } 1353 }
1330 R->screen.flags &= ~Screen_WrapNext; 1354 screen.flags &= ~Screen_WrapNext;
1331 1355
1332 R->scr_scroll_text(R->screen.cur.row, R->screen.bscroll, insdel * count, 0); 1356 scr_scroll_text(screen.cur.row, screen.bscroll, insdel * count, 0);
1333} 1357}
1334 1358
1335/* ------------------------------------------------------------------------- */ 1359/* ------------------------------------------------------------------------- */
1336/* 1360/*
1337 * Insert/Delete <count> characters from the current position 1361 * Insert/Delete <count> characters from the current position
1338 */ 1362 */
1339/* EXTPROTO */
1340void 1363void
1341rxvt_scr_insdel_chars(pR_ int count, int insdel) 1364rxvt_term::scr_insdel_chars (int count, int insdel)
1342{ 1365{
1343 int col, row; 1366 int col, row;
1344 rend_t tr; 1367 rend_t tr;
1345 text_t *stp; 1368 text_t *stp;
1346 rend_t *srp; 1369 rend_t *srp;
1347 int16_t *slp; 1370 int16_t *slp;
1348 1371
1349 R->want_refresh = 1; 1372 want_refresh = 1;
1350 ZERO_SCROLLBACK(R); 1373 ZERO_SCROLLBACK();
1351 1374
1352#ifdef RXVT_GRAPHICS 1375#ifdef RXVT_GRAPHICS
1353 if (rxvt_Gr_Displayed(aR)) 1376 if (Gr_Displayed ())
1354 rxvt_Gr_scroll(aR_ 0); 1377 Gr_scroll (0);
1355#endif 1378#endif
1356 1379
1357 if (count <= 0) 1380 if (count <= 0)
1358 return; 1381 return;
1359 1382
1360 rxvt_selection_check(aR_ 1); 1383 selection_check (1);
1361 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1384 MIN_IT(count, (TermWin.ncol - screen.cur.col));
1362 1385
1363 row = R->screen.cur.row + R->TermWin.saveLines; 1386 row = screen.cur.row + TermWin.saveLines;
1364 R->screen.flags &= ~Screen_WrapNext; 1387 screen.flags &= ~Screen_WrapNext;
1365 1388
1366 stp = R->screen.text[row]; 1389 stp = screen.text[row];
1367 srp = R->screen.rend[row]; 1390 srp = screen.rend[row];
1368 slp = &(R->screen.tlen[row]); 1391 slp = &(screen.tlen[row]);
1369 switch (insdel) { 1392 switch (insdel)
1393 {
1370 case INSERT: 1394 case INSERT:
1371 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1395 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1372 col--) { 1396 col--)
1397 {
1373 stp[col] = stp[col - count]; 1398 stp[col] = stp[col - count];
1374 srp[col] = srp[col - count]; 1399 srp[col] = srp[col - count];
1375 } 1400 }
1376 if (*slp != -1) { 1401 if (*slp != -1)
1402 {
1377 *slp += count; 1403 *slp += count;
1378 MIN_IT(*slp, R->TermWin.ncol); 1404 MIN_IT(*slp, TermWin.ncol);
1379 } 1405 }
1380 if (R->selection.op && R->current_screen == R->selection.screen 1406 if (selection.op && current_screen == selection.screen
1381 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1407 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur))
1408 {
1382 if (R->selection.end.row != R->screen.cur.row 1409 if (selection.end.row != screen.cur.row
1383 || (R->selection.end.col + count >= R->TermWin.ncol)) 1410 || (selection.end.col + count >= TermWin.ncol))
1384 CLEAR_SELECTION(R); 1411 CLEAR_SELECTION();
1412 else
1385 else { /* shift selection */ 1413 { /* shift selection */
1386 R->selection.beg.col += count; 1414 selection.beg.col += count;
1387 R->selection.mark.col += count; /* XXX: yes? */ 1415 selection.mark.col += count; /* XXX: yes? */
1388 R->selection.end.col += count; 1416 selection.end.col += count;
1389 } 1417 }
1390 } 1418 }
1391 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1419 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]),
1392 (unsigned int)count, R->rstyle); 1420 (unsigned int)count, rstyle);
1393 break; 1421 break;
1394 case ERASE: 1422 case ERASE:
1395 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1423 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1396 rxvt_selection_check(aR_ 1); 1424 selection_check (1);
1397 R->screen.cur.col -= count; 1425 screen.cur.col -= count;
1398 R->scr_blank_line (&(stp[R->screen.cur.col]), &(srp[R->screen.cur.col]), 1426 scr_blank_line (&(stp[screen.cur.col]), &(srp[screen.cur.col]),
1399 (unsigned int)count, R->rstyle); 1427 (unsigned int)count, rstyle);
1400 break; 1428 break;
1401 case DELETE: 1429 case DELETE:
1402 tr = srp[R->TermWin.ncol - 1] 1430 tr = srp[TermWin.ncol - 1]
1403 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1431 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1404 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1432 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++)
1433 {
1405 stp[col] = stp[col + count]; 1434 stp[col] = stp[col + count];
1406 srp[col] = srp[col + count]; 1435 srp[col] = srp[col + count];
1407 } 1436 }
1408 R->scr_blank_line (&(stp[R->TermWin.ncol - count]), 1437 scr_blank_line (&(stp[TermWin.ncol - count]),
1409 &(srp[R->TermWin.ncol - count]), 1438 &(srp[TermWin.ncol - count]),
1410 (unsigned int)count, tr); 1439 (unsigned int)count, tr);
1411 if (*slp == -1) /* break line continuation */ 1440 if (*slp == -1) /* break line continuation */
1412 *slp = R->TermWin.ncol; 1441 *slp = TermWin.ncol;
1413 *slp -= count; 1442 *slp -= count;
1414 MAX_IT(*slp, 0); 1443 MAX_IT(*slp, 0);
1415 if (R->selection.op && R->current_screen == R->selection.screen 1444 if (selection.op && current_screen == selection.screen
1416 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1445 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur))
1446 {
1417 if (R->selection.end.row != R->screen.cur.row 1447 if (selection.end.row != screen.cur.row
1418 || (R->screen.cur.col >= R->selection.beg.col - count) 1448 || (screen.cur.col >= selection.beg.col - count)
1419 || R->selection.end.col >= R->TermWin.ncol) 1449 || selection.end.col >= TermWin.ncol)
1420 CLEAR_SELECTION(R); 1450 CLEAR_SELECTION();
1421 else { 1451 else
1452 {
1422 /* shift selection */ 1453 /* shift selection */
1423 R->selection.beg.col -= count; 1454 selection.beg.col -= count;
1424 R->selection.mark.col -= count; /* XXX: yes? */ 1455 selection.mark.col -= count; /* XXX: yes? */
1425 R->selection.end.col -= count; 1456 selection.end.col -= count;
1426 } 1457 }
1427 } 1458 }
1428 break; 1459 break;
1429 } 1460 }
1430} 1461}
1431 1462
1432/* ------------------------------------------------------------------------- */ 1463/* ------------------------------------------------------------------------- */
1433/* 1464/*
1434 * Set the scrolling region 1465 * Set the scrolling region
1435 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1436 */ 1467 */
1437/* EXTPROTO */
1438void 1468void
1439rxvt_scr_scroll_region(pR_ int top, int bot) 1469rxvt_term::scr_scroll_region (int top, int bot)
1440{ 1470{
1441 MAX_IT(top, 0); 1471 MAX_IT(top, 0);
1442 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1472 MIN_IT(bot, (int)TermWin.nrow - 1);
1443 if (top > bot) 1473 if (top > bot)
1444 return; 1474 return;
1445 R->screen.tscroll = top; 1475 screen.tscroll = top;
1446 R->screen.bscroll = bot; 1476 screen.bscroll = bot;
1447 rxvt_scr_gotorc(aR_ 0, 0, 0); 1477 scr_gotorc (0, 0, 0);
1448} 1478}
1449 1479
1450/* ------------------------------------------------------------------------- */ 1480/* ------------------------------------------------------------------------- */
1451/* 1481/*
1452 * Make the cursor visible/invisible 1482 * Make the cursor visible/invisible
1453 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1483 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1454 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1484 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1455 */ 1485 */
1456/* EXTPROTO */
1457void 1486void
1458rxvt_scr_cursor_visible(pR_ int mode) 1487rxvt_term::scr_cursor_visible (int mode)
1459{ 1488{
1460 R->want_refresh = 1; 1489 want_refresh = 1;
1461 if (mode) 1490 if (mode)
1462 R->screen.flags |= Screen_VisibleCursor; 1491 screen.flags |= Screen_VisibleCursor;
1463 else 1492 else
1464 R->screen.flags &= ~Screen_VisibleCursor; 1493 screen.flags &= ~Screen_VisibleCursor;
1465} 1494}
1466 1495
1467/* ------------------------------------------------------------------------- */ 1496/* ------------------------------------------------------------------------- */
1468/* 1497/*
1469 * Set/unset automatic wrapping 1498 * Set/unset automatic wrapping
1470 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1499 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1471 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1500 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1472 */ 1501 */
1473/* EXTPROTO */
1474void 1502void
1475rxvt_scr_autowrap(pR_ int mode) 1503rxvt_term::scr_autowrap (int mode)
1476{ 1504{
1477 if (mode) 1505 if (mode)
1478 R->screen.flags |= Screen_Autowrap; 1506 screen.flags |= Screen_Autowrap;
1479 else 1507 else
1480 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1508 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1481} 1509}
1482 1510
1483/* ------------------------------------------------------------------------- */ 1511/* ------------------------------------------------------------------------- */
1484/* 1512/*
1485 * Set/unset margin origin mode 1513 * Set/unset margin origin mode
… …
1488 * Relative mode: line numbers are relative to top margin of scrolling region 1516 * Relative mode: line numbers are relative to top margin of scrolling region
1489 * and the cursor cannot be moved outside. 1517 * and the cursor cannot be moved outside.
1490 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1518 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1491 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1519 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1492 */ 1520 */
1493/* EXTPROTO */
1494void 1521void
1495rxvt_scr_relative_origin(pR_ int mode) 1522rxvt_term::scr_relative_origin (int mode)
1496{ 1523{
1497 if (mode) 1524 if (mode)
1498 R->screen.flags |= Screen_Relative; 1525 screen.flags |= Screen_Relative;
1499 else 1526 else
1500 R->screen.flags &= ~Screen_Relative; 1527 screen.flags &= ~Screen_Relative;
1501 rxvt_scr_gotorc(aR_ 0, 0, 0); 1528 scr_gotorc (0, 0, 0);
1502} 1529}
1503 1530
1504/* ------------------------------------------------------------------------- */ 1531/* ------------------------------------------------------------------------- */
1505/* 1532/*
1506 * Set insert/replace mode 1533 * Set insert/replace mode
1507 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1534 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1508 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1535 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1509 */ 1536 */
1510/* EXTPROTO */
1511void 1537void
1512rxvt_scr_insert_mode(pR_ int mode) 1538rxvt_term::scr_insert_mode (int mode)
1513{ 1539{
1514 if (mode) 1540 if (mode)
1515 R->screen.flags |= Screen_Insert; 1541 screen.flags |= Screen_Insert;
1516 else 1542 else
1517 R->screen.flags &= ~Screen_Insert; 1543 screen.flags &= ~Screen_Insert;
1518} 1544}
1519 1545
1520/* ------------------------------------------------------------------------- */ 1546/* ------------------------------------------------------------------------- */
1521/* 1547/*
1522 * Set/Unset tabs 1548 * Set/Unset tabs
1523 * XTERM_SEQ: Set tab at current column : ESC H 1549 * XTERM_SEQ: Set tab at current column : ESC H
1524 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1550 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1525 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1551 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1526 */ 1552 */
1527/* EXTPROTO */
1528void 1553void
1529rxvt_scr_set_tab(pR_ int mode) 1554rxvt_term::scr_set_tab (int mode)
1530{ 1555{
1531 if (mode < 0) 1556 if (mode < 0)
1532 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1557 MEMSET(tabs, 0, TermWin.ncol * sizeof(char));
1533 else if (R->screen.cur.col < R->TermWin.ncol) 1558 else if (screen.cur.col < TermWin.ncol)
1534 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1559 tabs[screen.cur.col] = (mode ? 1 : 0);
1535} 1560}
1536 1561
1537/* ------------------------------------------------------------------------- */ 1562/* ------------------------------------------------------------------------- */
1538/* 1563/*
1539 * Set reverse/normal video 1564 * Set reverse/normal video
1540 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1565 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1541 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1566 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1542 */ 1567 */
1543/* EXTPROTO */
1544void 1568void
1545rxvt_scr_rvideo_mode(pR_ int mode) 1569rxvt_term::scr_rvideo_mode (int mode)
1546{ 1570{
1547 XGCValues gcvalue; 1571 XGCValues gcvalue;
1548 1572
1549 if (R->rvideo != mode) { 1573 if (rvideo != mode)
1574 {
1550 R->rvideo = mode; 1575 rvideo = mode;
1551 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1576 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1552#if defined(XPM_BACKGROUND) 1577#if defined(XPM_BACKGROUND)
1553 if (R->bgPixmap.pixmap == None) 1578 if (bgPixmap.pixmap == None)
1554#endif 1579#endif
1555#if defined(TRANSPARENT) 1580#if defined(TRANSPARENT)
1556 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1581 if (!(Options & Opt_transparent) || am_transparent == 0)
1557#endif 1582#endif
1558 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1583 XSetWindowBackground(Xdisplay, TermWin.vt,
1559 R->PixColors[Color_bg]); 1584 PixColors[Color_bg]);
1560 1585
1561 gcvalue.foreground = R->PixColors[Color_fg]; 1586 gcvalue.foreground = PixColors[Color_fg];
1562 gcvalue.background = R->PixColors[Color_bg]; 1587 gcvalue.background = PixColors[Color_bg];
1563 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1588 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground,
1564 &gcvalue); 1589 &gcvalue);
1565 R->scr_clear (); 1590 scr_clear ();
1566 R->scr_touch (true); 1591 scr_touch (true);
1567 } 1592 }
1568} 1593}
1569 1594
1570/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1571/* 1596/*
1572 * Report current cursor position 1597 * Report current cursor position
1573 * XTERM_SEQ: Report position: ESC [ 6 n 1598 * XTERM_SEQ: Report position: ESC [ 6 n
1574 */ 1599 */
1575/* EXTPROTO */
1576void 1600void
1577rxvt_scr_report_position(pR) 1601rxvt_term::scr_report_position ()
1578{ 1602{
1579 R->tt_printf("\033[%d;%dR", R->screen.cur.row + 1, R->screen.cur.col + 1); 1603 tt_printf("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1580} 1604}
1581 1605
1582/* ------------------------------------------------------------------------- * 1606/* ------------------------------------------------------------------------- *
1583 * FONTS * 1607 * FONTS *
1584 * ------------------------------------------------------------------------- */ 1608 * ------------------------------------------------------------------------- */
1585 1609
1586/* 1610/*
1587 * Set font style 1611 * Set font style
1588 */ 1612 */
1589/* INTPROTO */
1590void 1613void
1591rxvt_set_font_style(pR) 1614rxvt_term::set_font_style ()
1592{ 1615{
1593 switch (R->charsets[R->screen.charset]) { 1616 switch (charsets[screen.charset])
1617 {
1594 case '0': /* DEC Special Character & Line Drawing Set */ 1618 case '0': /* DEC Special Character & Line Drawing Set */
1595 break; 1619 break;
1596 case 'A': /* United Kingdom (UK) */ 1620 case 'A': /* United Kingdom (UK) */
1597 break; 1621 break;
1598 case 'B': /* United States (USASCII) */ 1622 case 'B': /* United States (USASCII) */
1599 break; 1623 break;
1600 case '<': /* Multinational character set */ 1624 case '<': /* Multinational character set */
1601 break; 1625 break;
1602 case '5': /* Finnish character set */ 1626 case '5': /* Finnish character set */
1603 break; 1627 break;
1604 case 'C': /* Finnish character set */ 1628 case 'C': /* Finnish character set */
1605 break; 1629 break;
1606 case 'K': /* German character set */ 1630 case 'K': /* German character set */
1607 break; 1631 break;
1608 } 1632 }
1609} 1633}
1610 1634
1611/* ------------------------------------------------------------------------- */ 1635/* ------------------------------------------------------------------------- */
… …
1614 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1638 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1615 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1639 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1616 * XTERM_SEQ: Invoke G2 character set: ESC N 1640 * XTERM_SEQ: Invoke G2 character set: ESC N
1617 * XTERM_SEQ: Invoke G3 character set: ESC O 1641 * XTERM_SEQ: Invoke G3 character set: ESC O
1618 */ 1642 */
1619/* EXTPROTO */
1620void 1643void
1621rxvt_scr_charset_choose(pR_ int set) 1644rxvt_term::scr_charset_choose (int set)
1622{ 1645 {
1623 R->screen.charset = set; 1646 screen.charset = set;
1624 rxvt_set_font_style(aR); 1647 set_font_style ();
1625} 1648 }
1626 1649
1627/* ------------------------------------------------------------------------- */ 1650/* ------------------------------------------------------------------------- */
1628/* 1651/*
1629 * Set a font 1652 * Set a font
1630 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1653 * XTERM_SEQ: Set G0 character set: ESC ( <C>
1631 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1654 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1632 * XTERM_SEQ: Set G2 character set: ESC * <C> 1655 * XTERM_SEQ: Set G2 character set: ESC * <C>
1633 * XTERM_SEQ: Set G3 character set: ESC + <C> 1656 * XTERM_SEQ: Set G3 character set: ESC + <C>
1634 * See set_font_style for possible values for <C> 1657 * See set_font_style for possible values for <C>
1635 */ 1658 */
1636/* EXTPROTO */
1637void 1659void
1638rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1660rxvt_term::scr_charset_set (int set, unsigned int ch)
1639{ 1661 {
1640 R->charsets[set] = (unsigned char)ch; 1662 charsets[set] = (unsigned char)ch;
1641 rxvt_set_font_style(aR); 1663 set_font_style ();
1642} 1664 }
1643 1665
1644
1645/* ------------------------------------------------------------------------- *
1646 * GRAPHICS COLOURS *
1647 * ------------------------------------------------------------------------- */
1648
1649#ifdef RXVT_GRAPHICS
1650/* EXTPROTO */
1651int
1652rxvt_scr_get_fgcolor(pR)
1653{
1654 return GET_FGCOLOR(R->rstyle);
1655}
1656
1657/* ------------------------------------------------------------------------- */
1658/* EXTPROTO */
1659int
1660rxvt_scr_get_bgcolor(pR)
1661{
1662 return GET_BGCOLOR(R->rstyle);
1663}
1664#endif
1665 1666
1666/* ------------------------------------------------------------------------- * 1667/* ------------------------------------------------------------------------- *
1667 * MAJOR SCREEN MANIPULATION * 1668 * MAJOR SCREEN MANIPULATION *
1668 * ------------------------------------------------------------------------- */ 1669 * ------------------------------------------------------------------------- */
1669 1670
1670/* 1671/*
1672 * refresh matching text.
1673 */
1674bool
1675rxvt_term::scr_refresh_rend (rend_t mask, rend_t value)
1676{
1677 bool found = false;
1678
1679 for (int i = 0; i < TermWin.nrow; i++)
1680 {
1681 int col = 0;
1682 rend_t *drp = drawn_rend [i];
1683
1684 for (; col < TermWin.ncol; col++, drp++)
1685 if ((*drp & mask) == value)
1686 {
1687 found = true;
1688 *drp = ~value;
1689 }
1690 }
1691
1692 return found;
1693}
1694
1695/*
1671 * Refresh an area 1696 * Refresh an area
1672 */ 1697 */
1673enum { 1698enum {
1674 PART_BEG = 0, 1699 PART_BEG = 0,
1675 PART_END, 1700 PART_END,
1676 RC_COUNT 1701 RC_COUNT
1677}; 1702};
1678 1703
1679void 1704void
1680rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1705rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1681{ 1706{
… …
1690 x = min(x, (int)TermWin.width); 1715 x = min(x, (int)TermWin.width);
1691 y = max(y, (int)TermWin.int_bwidth); 1716 y = max(y, (int)TermWin.int_bwidth);
1692 y = min(y, (int)TermWin.height); 1717 y = min(y, (int)TermWin.height);
1693#endif 1718#endif
1694 1719
1695/* round down */ 1720 /* round down */
1696 rc[PART_BEG].col = Pixel2Col(x); 1721 rc[PART_BEG].col = Pixel2Col(x);
1697 rc[PART_BEG].row = Pixel2Row(y); 1722 rc[PART_BEG].row = Pixel2Row(y);
1698/* round up */ 1723 /* round up */
1699 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1); 1724 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1);
1700 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1); 1725 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1);
1701 1726
1702/* sanity checks */ 1727 /* sanity checks */
1703 for (i = PART_BEG; i < RC_COUNT; i++) 1728 for (i = PART_BEG; i < RC_COUNT; i++)
1704 { 1729 {
1705 MIN_IT(rc[i].col, TermWin.ncol - 1); 1730 MIN_IT(rc[i].col, TermWin.ncol - 1);
1706 MIN_IT(rc[i].row, TermWin.nrow - 1); 1731 MIN_IT(rc[i].row, TermWin.nrow - 1);
1707 } 1732 }
… …
1729/* ------------------------------------------------------------------------- */ 1754/* ------------------------------------------------------------------------- */
1730/* 1755/*
1731 * Move the display so that the line represented by scrollbar value Y is at 1756 * Move the display so that the line represented by scrollbar value Y is at
1732 * the top of the screen 1757 * the top of the screen
1733 */ 1758 */
1734/* EXTPROTO */
1735int 1759int
1736rxvt_scr_move_to(pR_ int y, int len) 1760rxvt_term::scr_move_to (int y, int len)
1737{ 1761{
1738 long p = 0; 1762 long p = 0;
1739 uint16_t oldviewstart; 1763 uint16_t oldviewstart;
1740 1764
1741 oldviewstart = R->TermWin.view_start; 1765 oldviewstart = TermWin.view_start;
1742 if (y < len) { 1766 if (y < len)
1767 {
1743 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1768 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1744 p -= (long)(R->TermWin.nrow - 1); 1769 p -= (long)(TermWin.nrow - 1);
1745 p = max(p, 0); 1770 p = max(p, 0);
1746 } 1771 }
1747 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1772 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled);
1748 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, R->TermWin.view_start)); 1773 D_SCREEN((stderr, "rxvt_scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start));
1749 1774
1750 return rxvt_scr_changeview(aR_ oldviewstart); 1775 return scr_changeview (oldviewstart);
1751} 1776}
1752 1777
1753/* ------------------------------------------------------------------------- */ 1778/* ------------------------------------------------------------------------- */
1754/* 1779/*
1755 * Page the screen up/down nlines 1780 * Page the screen up/down nlines
1756 * direction should be UP or DN 1781 * direction should be UP or DN
1757 */ 1782 */
1758/* EXTPROTO */
1759int 1783int
1760rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1784rxvt_term::scr_page (enum page_dirn direction, int nlines)
1761{ 1785{
1762 int n; 1786 int n;
1763 uint16_t oldviewstart; 1787 uint16_t oldviewstart;
1764 1788
1765 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, R->TermWin.view_start)); 1789 D_SCREEN((stderr, "rxvt_scr_page(%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1766#ifdef DEBUG_STRICT 1790#ifdef DEBUG_STRICT
1767 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1791 assert((nlines >= 0) && (nlines <= TermWin.nrow));
1768#endif 1792#endif
1769 oldviewstart = R->TermWin.view_start; 1793 oldviewstart = TermWin.view_start;
1770 if (direction == UP) { 1794 if (direction == UP)
1795 {
1771 n = R->TermWin.view_start + nlines; 1796 n = TermWin.view_start + nlines;
1772 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1797 TermWin.view_start = min(n, TermWin.nscrolled);
1773 } else { 1798 }
1799 else
1800 {
1774 n = R->TermWin.view_start - nlines; 1801 n = TermWin.view_start - nlines;
1775 R->TermWin.view_start = max(n, 0); 1802 TermWin.view_start = max(n, 0);
1776 } 1803 }
1777 return rxvt_scr_changeview(aR_ oldviewstart); 1804 return scr_changeview (oldviewstart);
1778} 1805}
1779 1806
1780/* INTPROTO */
1781int 1807int
1782rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1808rxvt_term::scr_changeview (uint16_t oldviewstart)
1783{ 1809{
1784 if (R->TermWin.view_start != oldviewstart) { 1810 if (TermWin.view_start != oldviewstart)
1811 {
1785 R->want_refresh = 1; 1812 want_refresh = 1;
1786#ifdef RXVT_GRAPHICS 1813#ifdef RXVT_GRAPHICS
1787 if (rxvt_Gr_Displayed(aR)) 1814 if (Gr_Displayed ())
1788 rxvt_Gr_scroll(aR_ 0); 1815 Gr_scroll (0);
1789#endif 1816#endif
1790 R->num_scr -= (R->TermWin.view_start - oldviewstart); 1817 num_scr -= (TermWin.view_start - oldviewstart);
1791 } 1818 }
1792 return (int)(R->TermWin.view_start - oldviewstart); 1819 return (int)(TermWin.view_start - oldviewstart);
1793} 1820}
1794 1821
1795/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1796/* EXTPROTO */
1797void 1823void
1798rxvt_scr_bell(pR) 1824rxvt_term::scr_bell ()
1799{ 1825{
1800#ifndef NO_BELL 1826#ifndef NO_BELL
1801# ifndef NO_MAPALERT 1827# ifndef NO_MAPALERT
1802# ifdef MAPALERT_OPTION 1828# ifdef MAPALERT_OPTION
1803 if (R->Options & Opt_mapAlert) 1829 if (Options & Opt_mapAlert)
1804# endif 1830# endif
1805 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1831 XMapWindow(Xdisplay, TermWin.parent[0]);
1806# endif 1832# endif
1807 if (R->Options & Opt_visualBell) { 1833 if (Options & Opt_visualBell)
1834 {
1808 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1835 scr_rvideo_mode (!rvideo); /* refresh also done */
1809 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1836 scr_rvideo_mode (!rvideo); /* refresh also done */
1837 }
1810 } else 1838 else
1811 XBell(R->Xdisplay, 0); 1839 XBell(Xdisplay, 0);
1812#endif 1840#endif
1813} 1841}
1814 1842
1815/* ------------------------------------------------------------------------- */ 1843/* ------------------------------------------------------------------------- */
1816/* ARGSUSED */ 1844/* ARGSUSED */
1817/* EXTPROTO */
1818void 1845void
1819rxvt_scr_printscreen(pR_ int fullhist) 1846rxvt_term::scr_printscreen (int fullhist)
1820{ 1847{
1821#ifdef PRINTPIPE 1848#ifdef PRINTPIPE
1822 int i, r1, nrows, row_offset; 1849 int i, r1, nrows, row_offset;
1823 text_t *t; 1850 text_t *t;
1824 FILE *fd; 1851 FILE *fd;
1825 1852
1826 if ((fd = rxvt_popen_printer(aR)) == NULL) 1853 if ((fd = popen_printer ()) == NULL)
1827 return; 1854 return;
1828 nrows = R->TermWin.nrow; 1855 nrows = TermWin.nrow;
1829 row_offset = R->TermWin.saveLines; 1856 row_offset = TermWin.saveLines;
1830 if (!fullhist) 1857 if (!fullhist)
1831 row_offset -= R->TermWin.view_start; 1858 row_offset -= TermWin.view_start;
1832 else { 1859 else
1860 {
1833 nrows += R->TermWin.nscrolled; 1861 nrows += TermWin.nscrolled;
1834 row_offset -= R->TermWin.nscrolled; 1862 row_offset -= TermWin.nscrolled;
1835 } 1863 }
1836 1864
1837 for (r1 = 0; r1 < nrows; r1++) { 1865 for (r1 = 0; r1 < nrows; r1++)
1866 {
1838 t = R->screen.text[r1 + row_offset]; 1867 t = screen.text[r1 + row_offset];
1839 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1868 for (i = TermWin.ncol - 1; i >= 0; i--)
1840 if (!isspace(t[i])) 1869 if (!isspace(t[i]))
1841 break; 1870 break;
1842 fprintf(fd, "%.*s\n", (i + 1), t); 1871 fprintf(fd, "%.*s\n", (i + 1), t);
1843 } 1872 }
1844 rxvt_pclose_printer(fd); 1873 pclose_printer (fd);
1845#endif 1874#endif
1846} 1875}
1847 1876
1848/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1849/* 1878/*
1850 * Refresh the screen 1879 * Refresh the screen
1851 * R->drawn_text/R->drawn_rend contain the screen information before the update. 1880 * drawn_text/drawn_rend contain the screen information before the update.
1852 * R->screen.text/R->screen.rend contain what the screen will change to. 1881 * screen.text/screen.rend contain what the screen will change to.
1853 */ 1882 */
1854
1855#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1856# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1857# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1858#else
1859# define MONO_BOLD(x) \
1860 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1861# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1862#endif
1863 1883
1864#define FONT_WIDTH(X, Y) \ 1884#define FONT_WIDTH(X, Y) \
1865 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1885 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1866#define FONT_RBEAR(X, Y) \ 1886#define FONT_RBEAR(X, Y) \
1867 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1887 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
… …
1871 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1891 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1872 1892
1873void 1893void
1874rxvt_term::scr_refresh (unsigned char refresh_type) 1894rxvt_term::scr_refresh (unsigned char refresh_type)
1875{ 1895{
1876 unsigned char clearfirst, /* first character writes before cell */ 1896 unsigned char clearfirst, /* first character writes before cell */
1877 clearlast, /* last character writes beyond cell */ 1897 clearlast, /* last character writes beyond cell */
1878 must_clear, /* use draw_string not draw_image_string */ 1898 must_clear, /* use draw_string not draw_image_string */
1879#ifndef NO_BOLDFONT
1880 bfont, /* we've changed font to bold font */
1881#endif
1882 rvid, /* reverse video this position */ 1899 rvid, /* reverse video this position */
1883 wbyte, /* we're in multibyte */
1884 showcursor; /* show the cursor */ 1900 showcursor; /* show the cursor */
1885 int fore, back; /* desired foreground/background */
1886 int16_t col, row, /* column/row we're processing */ 1901 int16_t col, row, /* column/row we're processing */
1887 ocrow; /* old cursor row */ 1902 ocrow; /* old cursor row */
1888 int cursorwidth; 1903 int cursorwidth;
1889 int i, /* tmp */ 1904 int i, /* tmp */
1890 row_offset; /* basic offset in screen structure */ 1905 row_offset; /* basic offset in screen structure */
1891#ifndef NO_CURSORCOLOR 1906#ifndef NO_CURSORCOLOR
1892 rend_t cc1; /* store colours at cursor position(s) */ 1907 rend_t cc1; /* store colours at cursor position(s) */
1893 rend_t cc2; /* store colours at cursor position(s) */
1894#endif 1908#endif
1895 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1909 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1896 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1910 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1897 1911
1898 if (refresh_type == NO_REFRESH || !TermWin.mapped) 1912 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1899 return; 1913 return;
1900 1914
1901 /* 1915 /*
1902 * A: set up vars 1916 * A: set up vars
1903 */ 1917 */
1904 clearfirst = clearlast = must_clear = wbyte = 0; 1918 clearfirst = clearlast = must_clear = 0;
1905#ifndef NO_BOLDFONT
1906 bfont = 0;
1907#endif
1908 1919
1909 if (currmaxcol < TermWin.ncol) 1920 refresh_count = 0;
1921
1922 row_offset = TermWin.saveLines - TermWin.view_start;
1923
1924 if ((refresh_type & REFRESH_BOUNDS))
1925 {
1926 clearfirst = clearlast = 1;
1927 refresh_type &= ~REFRESH_BOUNDS;
1928 }
1929
1930#ifdef XPM_BACKGROUND
1931 must_clear |= (bgPixmap.pixmap != None);
1932#endif
1933#ifdef TRANSPARENT
1934 must_clear |= ((Options & Opt_transparent) && am_transparent);
1935#endif
1936 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1937
1938 /*
1939 * B: reverse any characters which are selected
1940 */
1941 scr_reverse_selection ();
1942
1943 /*
1944 * C: set the cursor character(s)
1945 */
1946 {
1947 unsigned char setoldcursor;
1948 rend_t ccol1, /* Cursor colour */
1949 ccol2; /* Cursor colour2 */
1950
1951 showcursor = (screen.flags & Screen_VisibleCursor);
1952 cursorwidth = 0;
1953#ifdef CURSOR_BLINK
1954 if (hidden_cursor)
1955 showcursor = 0;
1956#endif
1957
1958 cursorwidth = 0;
1959
1960 if (showcursor)
1910 { 1961 {
1911 currmaxcol = TermWin.ncol;
1912 buffer = (char *)rxvt_realloc (buffer,
1913 sizeof(char) * (currmaxcol + 1) * MB_CUR_MAX);
1914 }
1915
1916 refresh_count = 0;
1917
1918 row_offset = TermWin.saveLines - TermWin.view_start;
1919
1920 if ((refresh_type & REFRESH_BOUNDS))
1921 {
1922 clearfirst = clearlast = 1;
1923 refresh_type &= ~REFRESH_BOUNDS;
1924 }
1925
1926#if defined(XPM_BACKGROUND)
1927 must_clear |= (bgPixmap.pixmap != None);
1928#endif
1929#if defined(TRANSPARENT)
1930 must_clear |= ((Options & Opt_transparent) && am_transparent);
1931#endif
1932 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1933
1934 /*
1935 * B: reverse any characters which are selected
1936 */
1937 rxvt_scr_reverse_selection (this);
1938
1939 /*
1940 * C: set the cursor character(s)
1941 */
1942 {
1943 unsigned char setoldcursor;
1944 rend_t ccol1, /* Cursor colour */
1945 ccol2; /* Cursor colour2 */
1946
1947 showcursor = (screen.flags & Screen_VisibleCursor);
1948 cursorwidth = 0;
1949#ifdef CURSOR_BLINK
1950 if (hidden_cursor)
1951 showcursor = 0;
1952#endif
1953
1954 cursorwidth = 0;
1955
1956 if (showcursor)
1957 {
1958 cursorwidth++; 1962 cursorwidth++;
1959 1963
1960 srp = &(screen.rend[screen.cur.row + TermWin.saveLines] 1964 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
1961 [screen.cur.col]); 1965 [screen.cur.col]);
1962 1966
1963 if (showcursor && TermWin.focus) 1967 if (showcursor && TermWin.focus)
1964 { 1968 {
1965 *srp ^= RS_RVid; 1969 *srp ^= RS_RVid;
1966#ifndef NO_CURSORCOLOR 1970#ifndef NO_CURSORCOLOR
1967 cc1 = *srp & (RS_fgMask | RS_bgMask); 1971 cc1 = *srp & (RS_fgMask | RS_bgMask);
1968 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor)) 1972 if (ISSET_PIXCOLOR (Color_cursor))
1969 ccol1 = Color_cursor; 1973 ccol1 = Color_cursor;
1970 else 1974 else
1971#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1975#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1972 ccol1 = GET_FGCOLOR(rstyle); 1976 ccol1 = GET_FGCOLOR(rstyle);
1973#else 1977#else
1974 ccol1 = Color_fg; 1978 ccol1 = Color_fg;
1975#endif 1979#endif
1976 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor2)) 1980 if (ISSET_PIXCOLOR (Color_cursor2))
1977 ccol2 = Color_cursor2; 1981 ccol2 = Color_cursor2;
1978 else 1982 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1983#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol2 = GET_BGCOLOR(rstyle); 1984 ccol2 = GET_BGCOLOR(rstyle);
1981#else 1985#else
1982 ccol2 = Color_bg; 1986 ccol2 = Color_bg;
1983#endif 1987#endif
1984 *srp = SET_FGCOLOR(*srp, ccol1); 1988 *srp = SET_FGCOLOR(*srp, ccol1);
1985 *srp = SET_BGCOLOR(*srp, ccol2); 1989 *srp = SET_BGCOLOR(*srp, ccol2);
1986#endif 1990#endif
1987 }
1988 1991
1989 while (IS_WIDE (*srp))
1990 cursorwidth++, srp++;
1991 }
1992
1993 /* make sure no outline cursor is left around */
1994 setoldcursor = 0;
1995 if (ocrow != -1) {
1996 if (screen.cur.row + TermWin.view_start != ocrow
1997 || screen.cur.col != oldcursor.col) {
1998 if (ocrow < TermWin.nrow
1999 && oldcursor.col < TermWin.ncol) {
2000 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2001 }
2002 if (TermWin.focus || !showcursor)
2003 oldcursor.row = -1;
2004 else
2005 setoldcursor = 1;
2006 }
2007 } else if (!TermWin.focus)
2008 setoldcursor = 1;
2009 if (setoldcursor) {
2010 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2011 oldcursor.row = -1;
2012 else {
2013 oldcursor.row = screen.cur.row + TermWin.view_start;
2014 oldcursor.col = screen.cur.col;
2015 } 1992 }
2016 } 1993 }
1994
1995 /* make sure no outline cursor is left around */
1996 setoldcursor = 0;
1997 if (ocrow != -1)
1998 {
1999 if (screen.cur.row + TermWin.view_start != ocrow
2000 || screen.cur.col != oldcursor.col)
2001 {
2002 if (ocrow < TermWin.nrow
2003 && oldcursor.col < TermWin.ncol)
2004 {
2005 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2006 }
2007 if (TermWin.focus || !showcursor)
2008 oldcursor.row = -1;
2009 else
2010 setoldcursor = 1;
2011 }
2017 } 2012 }
2013 else if (!TermWin.focus)
2014 setoldcursor = 1;
2015 if (setoldcursor)
2016 {
2017 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2018 oldcursor.row = -1;
2019 else
2020 {
2021 oldcursor.row = screen.cur.row + TermWin.view_start;
2022 oldcursor.col = screen.cur.col;
2023 }
2024 }
2025 }
2018 2026
2019#ifndef NO_SLOW_LINK_SUPPORT 2027#ifndef NO_SLOW_LINK_SUPPORT
2028 /*
2029 * D: CopyArea pass - very useful for slower links
2030 * This has been deliberately kept simple.
2031 */
2032 i = num_scr;
2033 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2034 && abs(i) < TermWin.nrow && !must_clear)
2035 {
2036 int16_t nits;
2037 int j;
2038 rend_t *drp2;
2039 text_t *dtp2;
2040 int len, wlen;
2041
2042 j = TermWin.nrow;
2043 wlen = len = -1;
2044 row = i > 0 ? 0 : j - 1;
2045 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2046 {
2047 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2048 {
2049 stp = screen.text[row + row_offset];
2050 srp = screen.rend[row + row_offset];
2051 dtp = drawn_text[row];
2052 dtp2 = drawn_text[row + i];
2053 drp = drawn_rend[row];
2054 drp2 = drawn_rend[row + i];
2055
2056 for (nits = 0, col = TermWin.ncol; col--; )
2057 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2058 nits--;
2059 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2060 nits++;
2061
2062 if (nits > 8) /* XXX: arbitrary choice */
2063 {
2064 for (col = TermWin.ncol; col--; )
2065 {
2066 *dtp++ = *dtp2++;
2067 *drp++ = *drp2++;
2068 }
2069
2070 if (len == -1)
2071 len = row;
2072
2073 wlen = row;
2074 continue;
2075 }
2076 }
2077
2078 if (len != -1)
2079 {
2080 /* also comes here at end if needed because of >= above */
2081 if (wlen < len)
2082 SWAP_IT(wlen, len, int);
2083
2084 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2085 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2086 TermWin.gc, 0, Row2Pixel (len + i),
2087 (unsigned int)TermWin_TotalWidth (),
2088 (unsigned int)Height2Pixel (wlen - len + 1),
2089 0, Row2Pixel (len));
2090 len = -1;
2091 }
2092 }
2093 }
2094#endif
2095
2096 /*
2097 * E: main pass across every character
2098 */
2099 for (row = 0; row < TermWin.nrow; row++)
2100 {
2101 stp = screen.text[row + row_offset];
2102 srp = screen.rend[row + row_offset];
2103 dtp = drawn_text[row];
2104 drp = drawn_rend[row];
2105
2106 /*
2107 * E2: OK, now the real pass
2108 */
2109 int ypixel = (int)Row2Pixel(row);
2110
2111 for (col = 0; col < TermWin.ncol; col++)
2112 {
2113 /* compare new text with old - if exactly the same then continue */
2114 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2115
2116 if (stp[col] == dtp[col] /* Must match characters to skip. */
2117 && (rend == drp[col] /* Either rendition the same or */
2118 || (stp[col] == ' ' /* space w/ no background change */
2119 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2120 continue;
2121
2122 text_t *text = stp + col;
2123 int count = 1;
2124
2125 /* redraw one or more characters */
2126
2127 dtp[col] = stp[col];
2128 drp[col] = rend;
2129
2130 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2131 continue;
2132
2133 int xpixel = Col2Pixel(col);
2134
2135 // this loop looks very messy, it can probably be optimized
2136 // and cleaned a bit by you?
2137 for (i = 0; ++col < TermWin.ncol; )
2138 {
2139 if (stp[col] == NOCHAR)
2140 {
2141 dtp[col] = stp[col];
2142 drp[col] = rend;
2143 count++;
2144
2145 if (i) // only possible skip if char unchanged
2146 i++;
2147
2148 continue;
2149 }
2150
2151 if (rend != srp[col])
2152 break;
2153
2154 count++;
2155
2156 if (stp[col] != dtp[col]
2157 || srp[col] != drp[col])
2158 {
2159 if (must_clear && (i++ > (count / 2)))
2160 break;
2161
2162 dtp[col] = stp[col];
2163 drp[col] = rend;
2164 i = 0;
2165 }
2166 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2167 break;
2168 }
2169
2170 col--; /* went one too far. move back */
2171 count -= i; /* dump any matching trailing chars */
2172
2173 /*
2174 * Determine the attributes for the string
2175 */
2176 int fid = GET_FONT (rend);
2177 int fore = GET_FGCOLOR (rend); // desired foreground
2178 int back = GET_BGCOLOR (rend); // desired background
2179
2180 rend = GET_ATTR (rend);
2181
2182 rvid = !!(rend & RS_RVid);
2183 if (rvid)
2184 {
2185 SWAP_IT(fore, back, int);
2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (ISSET_PIXCOLOR (Color_RV)
2189# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (Color_cursor)
2191# endif
2192 )
2193 back = Color_RV;
2194#endif
2195
2196 }
2197#ifdef TEXT_BLINK
2198 if (rend & RS_Blink)
2199 {
2200 if (!text_blink_ev.active)
2201 {
2202 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2203 hidden_text = 0;
2204 }
2205 else if (hidden_text)
2206 fore = back;
2207 }
2208#endif
2209#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold)
2211 {
2212 if (ISSET_PIXCOLOR (Color_BD))
2213 fore = Color_BD;
2214 else if (fore == Color_fg)
2215 fore = Color_White;
2216 }
2217 else if (rend & RS_Uline)
2218 {
2219 if (ISSET_PIXCOLOR (Color_UL))
2220 fore = Color_UL;
2221 }
2222#endif
2223
2224 /*
2225 * Actually do the drawing of the string here
2226 */
2227 rxvt_font *font = (*TermWin.fontset)[fid];
2228
2229 if (back == fore)
2230 font->clear_rect (xpixel, ypixel,
2231 TermWin.fwidth * count, TermWin.fheight,
2232 back);
2233 else if (back == Color_bg)
2234 {
2235 if (must_clear)
2236 {
2237 CLEAR_CHARS (xpixel, ypixel, count);
2238
2239 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ')
2241 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1);
2243 break;
2244 }
2245 }
2246 else
2247 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2248 }
2249 else
2250 font->draw (xpixel, ypixel, text, count, fore, back);
2251
2252 if ((rend & RS_Uline) && (font->descent > 1))
2253 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2254 xpixel, ypixel + font->ascent + 1,
2255 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2256 } /* for (col....) */
2257 } /* for (row....) */
2258
2259 /*
2260 * G: cleanup cursor and display outline cursor if necessary
2261 */
2262 if (showcursor)
2263 {
2264 if (TermWin.focus)
2265 {
2266 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2267 [screen.cur.col]);
2268 *srp ^= RS_RVid;
2269#ifndef NO_CURSORCOLOR
2270 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2271#endif
2272
2273 }
2274 else if (oldcursor.row >= 0)
2275 {
2276#ifndef NO_CURSORCOLOR
2277 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2279#endif
2280 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2281 Col2Pixel(oldcursor.col),
2282 Row2Pixel(oldcursor.row),
2283 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2284 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2285 }
2286 }
2287
2288 /*
2289 * H: cleanup selection
2290 */
2291 scr_reverse_selection ();
2292
2293 /*
2294 * I: other general cleanup
2295 */
2296 if (clearfirst && TermWin.int_bwidth)
2020 /* 2297 /*
2021 * D: CopyArea pass - very useful for slower links 2298 * clear the whole screen height, note that width == 0 is treated
2022 * This has been deliberately kept simple. 2299 * specially by XClearArea
2023 */ 2300 */
2024 i = num_scr; 2301 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2025 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2302 (unsigned int)TermWin.int_bwidth,
2026 && abs(i) < TermWin.nrow && !must_clear)
2027 {
2028 int16_t nits;
2029 int j;
2030 rend_t *drp2;
2031 text_t *dtp2;
2032 int len, wlen;
2033
2034 j = TermWin.nrow;
2035 wlen = len = -1;
2036 row = i > 0 ? 0 : j - 1;
2037 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2038 {
2039 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2040 {
2041 stp = screen.text[row + row_offset];
2042 srp = screen.rend[row + row_offset];
2043 dtp = drawn_text[row];
2044 dtp2 = drawn_text[row + i];
2045 drp = drawn_rend[row];
2046 drp2 = drawn_rend[row + i];
2047
2048 for (nits = 0, col = TermWin.ncol; col--; )
2049 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2050 nits--;
2051 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2052 nits++;
2053
2054 if (nits > 8) /* XXX: arbitrary choice */
2055 {
2056 for (col = TermWin.ncol; col--; )
2057 {
2058 *dtp++ = *dtp2++;
2059 *drp++ = *drp2++;
2060 }
2061
2062 if (len == -1)
2063 len = row;
2064
2065 wlen = row;
2066 continue;
2067 }
2068 }
2069
2070 if (len != -1)
2071 {
2072 /* also comes here at end if needed because of >= above */
2073 if (wlen < len)
2074 SWAP_IT(wlen, len, int);
2075
2076 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2077 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2078 TermWin.gc, 0, Row2Pixel (len + i),
2079 (unsigned int)TermWin_TotalWidth (), 2303 (unsigned int)TermWin_TotalHeight(), False);
2080 (unsigned int)Height2Pixel (wlen - len + 1), 2304 if (clearlast && TermWin.int_bwidth)
2081 0, Row2Pixel (len));
2082 len = -1;
2083 }
2084 }
2085 }
2086#endif
2087
2088 /* 2305 /*
2089 * E: main pass across every character 2306 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea
2090 */ 2308 */
2091 for (row = 0; row < TermWin.nrow; row++)
2092 {
2093 stp = screen.text[row + row_offset];
2094 srp = screen.rend[row + row_offset];
2095 dtp = drawn_text[row];
2096 drp = drawn_rend[row];
2097
2098 /*
2099 * E2: OK, now the real pass
2100 */
2101 int ypixel = (int)Row2Pixel(row);
2102
2103 for (col = 0; col < TermWin.ncol; col++)
2104 {
2105 /* compare new text with old - if exactly the same then continue */
2106 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2107
2108 if (stp[col] == dtp[col] /* Must match characters to skip. */
2109 && (rend == drp[col] /* Either rendition the same or */
2110 || (stp[col] == ' ' /* space w/ no background change */
2111 && GET_BGATTR(rend) == GET_BGATTR(drp[col]))))
2112 continue;
2113
2114 text_t *text = stp + col;
2115 int count = 1;
2116
2117 /* redraw one or more characters */
2118
2119 dtp[col] = stp[col];
2120 drp[col] = rend;
2121
2122 if (*text == NOCHAR) // never start redrawing at invisible characters. */
2123 continue;
2124
2125 int xpixel = Col2Pixel(col);
2126
2127 // this loop looks very messy, it can probably be optimized
2128 // and cleaned a bit by you?
2129 for (i = 0; ++col < TermWin.ncol; )
2130 {
2131 if (stp[col] == NOCHAR)
2132 {
2133 dtp[col] = stp[col];
2134 drp[col] = rend;
2135 count++;
2136
2137 if (i) // only possible skip if char unchanged
2138 i++;
2139
2140 continue;
2141 }
2142
2143 if (((rend ^ srp[col]) & ~RS_wide) != 0)
2144 break;
2145
2146 count++;
2147
2148 if (stp[col] != dtp[col]
2149 || srp[col] != drp[col])
2150 {
2151 if (must_clear && (i++ > (count / 2)))
2152 break;
2153
2154 dtp[col] = stp[col];
2155 drp[col] = rend;
2156 i = 0;
2157 }
2158 else if (must_clear || (stp[col] != ' ' && ++i >= 32))
2159 break;
2160 }
2161
2162 col--; /* went one too far. move back */
2163 count -= i; /* dump any matching trailing chars */
2164
2165 /*
2166 * Determine the attributes for the string
2167 */
2168 int fid = GET_FONT(rend);
2169 fore = GET_FGCOLOR(rend);
2170 back = GET_BGCOLOR(rend);
2171 rend = GET_ATTR(rend);
2172
2173 rvid = (rend & RS_RVid) ? 1 : 0;
2174#ifdef OPTION_HC
2175 if (!rvid && (rend & RS_Blink))
2176 {
2177 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_HC))
2178 back = Color_HC;
2179 else
2180 rvid = !rvid; /* fall back */
2181 }
2182#endif
2183 if (rvid)
2184 {
2185 SWAP_IT(fore, back, int);
2186
2187#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_RV)
2189# ifndef NO_CURSORCOLOR
2190 && !ISSET_PIXCOLOR (this, Color_cursor)
2191# endif
2192 )
2193 back = Color_RV;
2194#endif
2195 }
2196#ifndef NO_BOLD_UNDERLINE_REVERSE
2197 else if (rend & RS_Bold)
2198 {
2199 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_BD))
2200 {
2201 fore = Color_BD;
2202# ifndef VERYBOLD
2203 rend &= ~RS_Bold; /* we've taken care of it */
2204# endif
2205 }
2206 }
2207 else if (rend & RS_Uline)
2208 {
2209 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_UL))
2210 {
2211 fore = Color_UL;
2212 rend &= ~RS_Uline; /* we've taken care of it */
2213 }
2214 }
2215#endif
2216
2217 /*
2218 * Actually do the drawing of the string here
2219 */
2220 rxvt_font *font = (*TermWin.fontset)[fid];
2221
2222 if (back == Color_bg)
2223 {
2224 if (must_clear)
2225 {
2226 for (i = 0; i < count; i++) /* don't draw empty strings */
2227 if (text[i] != ' ')
2228 {
2229 font->draw (xpixel, ypixel, text, count, fore, -1);
2230 goto nodraw;
2231 }
2232
2233 CLEAR_CHARS (xpixel, ypixel, count);
2234nodraw: ;
2235 }
2236 else
2237 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2238 }
2239 else
2240 font->draw (xpixel, ypixel, text, count, fore, back);
2241
2242 if ((rend & RS_Uline) && (font->descent > 1))
2243 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2244 xpixel, ypixel + font->ascent + 1,
2245 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2246 } /* for (col....) */
2247 } /* for (row....) */
2248
2249 /*
2250 * G: cleanup cursor and display outline cursor if necessary
2251 */
2252 if (showcursor) {
2253 if (TermWin.focus) {
2254 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2255 [screen.cur.col]);
2256 *srp ^= RS_RVid;
2257#ifndef NO_CURSORCOLOR
2258 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2259#endif
2260 } else if (oldcursor.row >= 0) {
2261#ifndef NO_CURSORCOLOR
2262 unsigned long gcmask; /* Graphics Context mask */
2263
2264 if (Xdepth > 2 && ISSET_PIXCOLOR (this, Color_cursor))
2265 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2266#endif
2267 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2268 Col2Pixel(oldcursor.col),
2269 Row2Pixel(oldcursor.row),
2270 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2271 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2272 }
2273 }
2274
2275 /*
2276 * H: cleanup selection
2277 */
2278 rxvt_scr_reverse_selection (this);
2279
2280 /*
2281 * I: other general cleanup
2282 */
2283 if (clearfirst && TermWin.int_bwidth)
2284 /*
2285 * clear the whole screen height, note that width == 0 is treated
2286 * specially by XClearArea
2287 */
2288 XClearArea(Xdisplay, TermWin.vt, 0, 0, 2309 XClearArea(Xdisplay, TermWin.vt,
2310 TermWin.width + TermWin.int_bwidth, 0,
2289 (unsigned int)TermWin.int_bwidth, 2311 (unsigned int)TermWin.int_bwidth,
2290 (unsigned int)TermWin_TotalHeight(), False); 2312 (unsigned int)TermWin_TotalHeight(), False);
2291 if (clearlast && TermWin.int_bwidth)
2292 /*
2293 * clear the whole screen height, note that width == 0 is treated
2294 * specially by XClearArea
2295 */
2296 XClearArea(Xdisplay, TermWin.vt,
2297 TermWin.width + TermWin.int_bwidth, 0,
2298 (unsigned int)TermWin.int_bwidth,
2299 (unsigned int)TermWin_TotalHeight(), False);
2300 if (refresh_type & SMOOTH_REFRESH) 2313 if (refresh_type & SMOOTH_REFRESH)
2301 XSync(Xdisplay, False); 2314 XSync(Xdisplay, False);
2302 2315
2303 num_scr = 0; 2316 num_scr = 0;
2304 num_scr_allow = 1; 2317 num_scr_allow = 1;
2305 want_refresh = 0; /* screen is current */ 2318 want_refresh = 0; /* screen is current */
2306} 2319}
2307 2320
2308/* ------------------------------------------------------------------------- */ 2321/* ------------------------------------------------------------------------- */
2309void 2322void
2310rxvt_term::scr_clear() 2323rxvt_term::scr_clear()
… …
2332 2345
2333 XClearWindow (Xdisplay, TermWin.vt); 2346 XClearWindow (Xdisplay, TermWin.vt);
2334} 2347}
2335 2348
2336/* ------------------------------------------------------------------------- */ 2349/* ------------------------------------------------------------------------- */
2337/* INTPROTO */
2338void 2350void
2339rxvt_scr_reverse_selection(pR) 2351rxvt_term::scr_reverse_selection ()
2340{ 2352{
2341 int i, col, row, end_row; 2353 int i, col, row, end_row;
2342 rend_t *srp; 2354 rend_t *srp;
2343 2355
2344 if (R->selection.op && R->current_screen == R->selection.screen) { 2356 if (selection.op && current_screen == selection.screen)
2357 {
2345 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2358 end_row = TermWin.saveLines - TermWin.view_start;
2346 i = R->selection.beg.row + R->TermWin.saveLines; 2359 i = selection.beg.row + TermWin.saveLines;
2347 row = R->selection.end.row + R->TermWin.saveLines; 2360 row = selection.end.row + TermWin.saveLines;
2348 if (i >= end_row) 2361 if (i >= end_row)
2349 col = R->selection.beg.col; 2362 col = selection.beg.col;
2350 else { 2363 else
2364 {
2351 col = 0; 2365 col = 0;
2352 i = end_row; 2366 i = end_row;
2353 } 2367 }
2354 end_row += R->TermWin.nrow; 2368 end_row += TermWin.nrow;
2355 for (; i < row && i < end_row; i++, col = 0) 2369 for (; i < row && i < end_row; i++, col = 0)
2356 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2370 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2357#ifndef OPTION_HC
2358 srp[col] ^= RS_RVid; 2371 srp[col] ^= RS_RVid;
2359#else
2360 srp[col] ^= RS_Blink;
2361#endif
2362 if (i == row && i < end_row) 2372 if (i == row && i < end_row)
2363 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2373 for (srp = screen.rend[i]; col < selection.end.col; col++)
2364#ifndef OPTION_HC
2365 srp[col] ^= RS_RVid; 2374 srp[col] ^= RS_RVid;
2366#else
2367 srp[col] ^= RS_Blink;
2368#endif
2369 } 2375 }
2370} 2376}
2371 2377
2372/* ------------------------------------------------------------------------- */ 2378/* ------------------------------------------------------------------------- */
2373/* 2379/*
2374 * Dump the whole scrollback and screen to the passed filedescriptor. The 2380 * Dump the whole scrollback and screen to the passed filedescriptor. The
2375 * invoking routine must close the fd. 2381 * invoking routine must close the fd.
2376 */ 2382 */
2377#if 0 2383#if 0
2378/* EXTPROTO */
2379void 2384void
2380rxvt_scr_dump(pR_ int fd) 2385rxvt_term::scr_dump (int fd)
2381{ 2386{
2382 int row, wrote; 2387 int row, wrote;
2383 unsigned int width, towrite; 2388 unsigned int width, towrite;
2384 char r1[] = "\n"; 2389 char r1[] = "\n";
2385 2390
2386 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2391 for (row = TermWin.saveLines - TermWin.nscrolled;
2387 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2392 row < TermWin.saveLines + TermWin.nrow - 1; row++)
2393 {
2388 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2394 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2389 : R->TermWin.ncol; 2395 : TermWin.ncol;
2390 for (towrite = width; towrite; towrite -= wrote) { 2396 for (towrite = width; towrite; towrite -= wrote)
2397 {
2391 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2398 wrote = write(fd, &(screen.text[row][width - towrite]),
2392 towrite); 2399 towrite);
2393 if (wrote < 0) 2400 if (wrote < 0)
2394 return; /* XXX: death, no report */ 2401 return; /* XXX: death, no report */
2395 } 2402 }
2396 if (R->screen.tlen[row] >= 0) 2403 if (screen.tlen[row] >= 0)
2397 if (write(fd, r1, 1) <= 0) 2404 if (write(fd, r1, 1) <= 0)
2398 return; /* XXX: death, no report */ 2405 return; /* XXX: death, no report */
2399 } 2406 }
2400} 2407}
2401#endif 2408#endif
2402 2409
2403/* ------------------------------------------------------------------------- * 2410/* ------------------------------------------------------------------------- *
2404 * CHARACTER SELECTION * 2411 * CHARACTER SELECTION *
2405 * ------------------------------------------------------------------------- */ 2412 * ------------------------------------------------------------------------- */
2406 2413
2407/* 2414/*
2408 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2415 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2409 */ 2416 */
2410/* EXTPROTO */
2411void 2417void
2412rxvt_selection_check(pR_ int check_more) 2418rxvt_term::selection_check (int check_more)
2413{ 2419{
2414 row_col_t pos; 2420 row_col_t pos;
2415 2421
2416 if (!R->selection.op) 2422 if (!selection.op)
2417 return; 2423 return;
2418 2424
2419 pos.row = pos.col = 0; 2425 pos.row = pos.col = 0;
2420 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2426 if ((selection.beg.row < -(int32_t)TermWin.nscrolled)
2421 || (R->selection.beg.row >= R->TermWin.nrow) 2427 || (selection.beg.row >= TermWin.nrow)
2422 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2428 || (selection.mark.row < -(int32_t)TermWin.nscrolled)
2423 || (R->selection.mark.row >= R->TermWin.nrow) 2429 || (selection.mark.row >= TermWin.nrow)
2424 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2430 || (selection.end.row < -(int32_t)TermWin.nscrolled)
2425 || (R->selection.end.row >= R->TermWin.nrow) 2431 || (selection.end.row >= TermWin.nrow)
2426 || (check_more == 1 2432 || (check_more == 1
2427 && R->current_screen == R->selection.screen 2433 && current_screen == selection.screen
2428 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2434 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg)
2429 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2435 && ROWCOL_IS_BEFORE(screen.cur, selection.end))
2430 || (check_more == 2 2436 || (check_more == 2
2431 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2437 && ROWCOL_IS_BEFORE(selection.beg, pos)
2432 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2438 && ROWCOL_IS_AFTER(selection.end, pos))
2433 || (check_more == 3 2439 || (check_more == 3
2434 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2440 && ROWCOL_IS_AFTER(selection.end, pos))
2435 || (check_more == 4 /* screen width change */ 2441 || (check_more == 4 /* screen width change */
2436 && (R->selection.beg.row != R->selection.end.row 2442 && (selection.beg.row != selection.end.row
2437 || R->selection.end.col > R->TermWin.ncol))) 2443 || selection.end.col > TermWin.ncol)))
2438 CLEAR_SELECTION(R); 2444 CLEAR_SELECTION();
2439} 2445}
2440 2446
2441/* ------------------------------------------------------------------------- */ 2447/* ------------------------------------------------------------------------- */
2442/* 2448/*
2443 * Paste a selection direct to the command fd 2449 * Paste a selection direct to the command fd
… …
2445void 2451void
2446rxvt_term::paste (const unsigned char *data, unsigned int len) 2452rxvt_term::paste (const unsigned char *data, unsigned int len)
2447{ 2453{
2448 unsigned int i, j, n; 2454 unsigned int i, j, n;
2449 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); 2455 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2450 2456
2451#if 0 2457#if 0
2452 /* a paste should act like the user is typing, so check scrollTtyKeypress */ 2458 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2453 ZERO_SCROLLBACK (r); 2459 ZERO_SCROLLBACK (r);
2454#endif 2460#endif
2455 2461
… …
2472/* ------------------------------------------------------------------------- */ 2478/* ------------------------------------------------------------------------- */
2473/* 2479/*
2474 * Respond to a notification that a primary selection has been sent 2480 * Respond to a notification that a primary selection has been sent
2475 * EXT: SelectionNotify 2481 * EXT: SelectionNotify
2476 */ 2482 */
2477/* EXTPROTO */
2478int 2483int
2479rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2484rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2480{ 2485{
2481 long nread = 0; 2486 long nread = 0;
2482 unsigned long bytes_after; 2487 unsigned long bytes_after;
2483 XTextProperty ct; 2488 XTextProperty ct;
2484 int dummy_count;
2485 char **cl;
2486 2489
2487 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2490 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2488 2491
2489 if (prop == None) /* check for failed XConvertSelection */ 2492 if (prop == None) /* check for failed XConvertSelection */
2490 { 2493 {
2491 if ((R->selection_type & Sel_CompoundText)) 2494 if ((selection_type & Sel_CompoundText))
2492 { 2495 {
2493 int selnum = R->selection_type & Sel_whereMask; 2496 int selnum = selection_type & Sel_whereMask;
2494 2497
2495 R->selection_type = 0; 2498 selection_type = 0;
2496 if (selnum != Sel_direct) 2499 if (selnum != Sel_direct)
2497 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2500 selection_request_other (XA_STRING, selnum);
2501 }
2502
2503 if ((selection_type & Sel_UTF8String))
2498 } 2504 {
2505 int selnum = selection_type & Sel_whereMask;
2506
2507 selection_type = Sel_CompoundText;
2508 if (selnum != Sel_direct)
2509 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2510 else
2511 selection_type = 0;
2499 2512 }
2513
2500 return 0; 2514 return 0;
2501 } 2515 }
2502 2516
2503 for (;;) 2517 for (;;)
2504 { 2518 {
2505 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2519 if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4),
2506 (long)(PROP_SIZE / 4), delete_prop, 2520 (long)(PROP_SIZE / 4), delete_prop,
2507 AnyPropertyType, &ct.encoding, &ct.format, 2521 AnyPropertyType, &ct.encoding, &ct.format,
2508 &ct.nitems, &bytes_after, 2522 &ct.nitems, &bytes_after,
2509 &ct.value) != Success) 2523 &ct.value) != Success)
2510 break; 2524 break;
… …
2522 } 2536 }
2523 2537
2524 if (ct.nitems == 0) 2538 if (ct.nitems == 0)
2525 { 2539 {
2526 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2540 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2527 if (R->selection_wait == Sel_normal && nread == 0) 2541 if (selection_wait == Sel_normal && nread == 0)
2528 { 2542 {
2529 /* 2543 /*
2530 * pass through again trying CUT_BUFFER0 if we've come from 2544 * pass through again trying CUT_BUFFER0 if we've come from
2531 * XConvertSelection() but nothing was presented 2545 * XConvertSelection() but nothing was presented
2532 */ 2546 */
2533 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2547 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2534 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); 2548 selection_paste (Xroot, XA_CUT_BUFFER0, False);
2535 } 2549 }
2536 2550
2537 nread = -1; /* discount any previous stuff */ 2551 nread = -1; /* discount any previous stuff */
2538 break; 2552 break;
2539 } 2553 }
2540 2554
2541 nread += ct.nitems; 2555 nread += ct.nitems;
2556
2557 char **cl;
2558 int cr;
2542 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, 2559 if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl,
2543 &dummy_count) == Success && cl) 2560 &cr) >= 0 && cl)
2544 { 2561 {
2562 for (int i = 0; i < cr; i++)
2545 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2563 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2564
2546 XFreeStringList (cl); 2565 XFreeStringList (cl);
2547 } 2566 }
2548 else 2567 else
2549 R->paste (ct.value, ct.nitems); 2568 paste (ct.value, ct.nitems);
2550 2569
2551 if (bytes_after == 0) 2570 if (bytes_after == 0)
2552 break; 2571 break;
2553 2572
2554 XFree (ct.value); 2573 XFree (ct.value);
2555 } 2574 }
2556 2575
2557 if (ct.value) 2576 if (ct.value)
2558 XFree (ct.value); 2577 XFree (ct.value);
2559 2578
2560 if (R->selection_wait == Sel_normal) 2579 if (selection_wait == Sel_normal)
2561 R->selection_wait = Sel_none; 2580 selection_wait = Sel_none;
2562 2581
2563 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2582 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2564 return (int)nread; 2583 return (int)nread;
2565} 2584}
2566 2585
2567void 2586void
2568rxvt_term::incr_cb (time_watcher &w) 2587rxvt_term::incr_cb (time_watcher &w)
2569{ 2588{
2570 w.stop ();
2571 selection_wait = Sel_none; 2589 selection_wait = Sel_none;
2572 2590
2573 rxvt_print_error("data loss: timeout on INCR selection paste"); 2591 rxvt_print_error ("data loss: timeout on INCR selection paste");
2574} 2592}
2575 2593
2576/* 2594/*
2577 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2595 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2578 */ 2596 */
2579/* EXTPROTO */
2580void 2597void
2581rxvt_selection_property(pR_ Window win, Atom prop) 2598rxvt_term::selection_property (Window win, Atom prop)
2582{ 2599{
2583 int reget_time = 0; 2600 int reget_time = 0;
2584 2601
2585 if (prop == None) 2602 if (prop == None)
2603 return;
2604 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2605 if (selection_wait == Sel_normal)
2606 {
2607 int a, afmt;
2608 Atom atype;
2609 unsigned long bytes_after, nitems;
2610 unsigned char *s = NULL;
2611
2612 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2613 xa[XA_INCR], &atype, &afmt, &nitems,
2614 &bytes_after, &s);
2615 if (s)
2616 XFree(s);
2617 if (a != Success)
2586 return; 2618 return;
2587 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2588 if (R->selection_wait == Sel_normal) {
2589 int a, afmt;
2590 Atom atype;
2591 unsigned long bytes_after, nitems;
2592 unsigned char *s = NULL;
2593
2594 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False,
2595 R->xa[XA_INCR], &atype, &afmt, &nitems,
2596 &bytes_after, &s);
2597 if (s)
2598 XFree(s);
2599 if (a != Success)
2600 return;
2601#ifndef __CYGWIN32__ 2619#ifndef __CYGWIN32__
2602 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ 2620 if (atype == xa[XA_INCR])
2621 { /* start an INCR transfer */
2603 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2622 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2604 XDeleteProperty(R->Xdisplay, win, prop); 2623 XDeleteProperty(Xdisplay, win, prop);
2605 XFlush(R->Xdisplay); 2624 XFlush(Xdisplay);
2606 reget_time = 1; 2625 reget_time = 1;
2607 R->selection_wait = Sel_incr; 2626 selection_wait = Sel_incr;
2608 } 2627 }
2609#endif 2628#endif
2629
2630 }
2610 } else if (R->selection_wait == Sel_incr) { 2631 else if (selection_wait == Sel_incr)
2632 {
2611 reget_time = 1; 2633 reget_time = 1;
2612 if (rxvt_selection_paste(aR_ win, prop, True) == -1) { 2634 if (selection_paste (win, prop, True) == -1)
2635 {
2613 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2636 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2614 R->selection_wait = Sel_none; 2637 selection_wait = Sel_none;
2615 R->incr_ev.stop (); 2638 incr_ev.stop ();
2616 } 2639 }
2617 } 2640 }
2618 if (reget_time) /* received more data so reget time */ 2641 if (reget_time) /* received more data so reget time */
2619 R->incr_ev.start (NOW + 10); 2642 incr_ev.start (NOW + 10);
2620} 2643}
2621/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2622/* 2645/*
2623 * Request the current selection: 2646 * Request the current selection:
2624 * Order: > internal selection if available 2647 * Order: > internal selection if available
… …
2626 * > CUT_BUFFER0 2649 * > CUT_BUFFER0
2627 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2650 * (+) if ownership is claimed but property is empty, rxvt_selection_paste()
2628 * will auto fallback to CUT_BUFFER0 2651 * will auto fallback to CUT_BUFFER0
2629 * EXT: button 2 release 2652 * EXT: button 2 release
2630 */ 2653 */
2631/* EXTPROTO */
2632void 2654void
2633rxvt_selection_request(pR_ Time tm, int x, int y) 2655rxvt_term::selection_request (Time tm, int x, int y)
2634{ 2656{
2635 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2657 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2636 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2658 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2637 return; /* outside window */ 2659 return; /* outside window */
2638 2660
2639 if (R->selection.text != NULL) { /* internal selection */ 2661 if (selection.text != NULL)
2662 { /* internal selection */
2640 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2663 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2641 R->paste (R->selection.text, R->selection.len); 2664 paste (selection.text, selection.len);
2642 return; 2665 return;
2643 } else { 2666 }
2667 else
2668 {
2644 int i; 2669 int i;
2645 2670
2646 R->selection_request_time = tm; 2671 selection_request_time = tm;
2647 R->selection_wait = Sel_normal; 2672 selection_wait = Sel_normal;
2648 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2673 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2674 {
2675#if X_HAVE_UTF8_STRING
2676 selection_type = Sel_UTF8String;
2677 if (selection_request_other (xa[XA_UTF8_STRING], i))
2678 return;
2679#else
2649 R->selection_type = Sel_CompoundText; 2680 selection_type = Sel_CompoundText;
2650 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2681 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2651 return; 2682 return;
2683#endif
2684
2652 } 2685 }
2653 } 2686 }
2654 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2687 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2655 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2688 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2656 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2689 selection_paste (Xroot, XA_CUT_BUFFER0, False);
2657} 2690}
2658 2691
2659/* INTPROTO */
2660int 2692int
2661rxvt_selection_request_other(pR_ Atom target, int selnum) 2693rxvt_term::selection_request_other (Atom target, int selnum)
2662{ 2694{
2663 Atom sel; 2695 Atom sel;
2664#ifdef DEBUG_SELECT 2696#ifdef DEBUG_SELECT
2665 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2697 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2666#endif 2698#endif
2667 2699
2668 R->selection_type |= selnum; 2700 selection_type |= selnum;
2669 if (selnum == Sel_Primary) 2701 if (selnum == Sel_Primary)
2670 sel = XA_PRIMARY; 2702 sel = XA_PRIMARY;
2671 else if (selnum == Sel_Secondary) 2703 else if (selnum == Sel_Secondary)
2672 sel = XA_SECONDARY; 2704 sel = XA_SECONDARY;
2673 else 2705 else
2674 sel = R->xa[XA_CLIPBOARD]; 2706 sel = xa[XA_CLIPBOARD];
2675 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2707 if (XGetSelectionOwner(Xdisplay, sel) != None)
2708 {
2676 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2709 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2677 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2710 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION],
2678 R->TermWin.vt, R->selection_request_time); 2711 TermWin.vt, selection_request_time);
2679 return 1; 2712 return 1;
2680 } 2713 }
2681 return 0; 2714 return 0;
2682} 2715}
2683 2716
2684/* ------------------------------------------------------------------------- */ 2717/* ------------------------------------------------------------------------- */
2685/* 2718/*
2686 * Clear all selected text 2719 * Clear all selected text
2687 * EXT: SelectionClear 2720 * EXT: SelectionClear
2688 */ 2721 */
2689/* EXTPROTO */
2690void 2722void
2691rxvt_selection_clear(pR) 2723rxvt_term::selection_clear ()
2692{ 2724{
2693 D_SELECT((stderr, "rxvt_selection_clear()")); 2725 D_SELECT((stderr, "rxvt_selection_clear()"));
2694 2726
2695 R->want_refresh = 1; 2727 want_refresh = 1;
2696 if (R->selection.text) 2728 if (selection.text)
2697 free(R->selection.text); 2729 free(selection.text);
2698 R->selection.text = NULL; 2730 selection.text = NULL;
2699 R->selection.len = 0; 2731 selection.len = 0;
2700 CLEAR_SELECTION(R); 2732 CLEAR_SELECTION();
2701} 2733}
2702 2734
2703/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2704/* 2736/*
2705 * Copy a selection into the cut buffer 2737 * Copy a selection into the cut buffer
2706 * EXT: button 1 or 3 release 2738 * EXT: button 1 or 3 release
2707 */ 2739 */
2708/* EXTPROTO */
2709void 2740void
2710rxvt_selection_make(pR_ Time tm) 2741rxvt_term::selection_make (Time tm)
2711{ 2742{
2712 int i, col, end_col, row, end_row; 2743 int i, col, end_col, row, end_row;
2713 unsigned char *new_selection_text; 2744 unsigned char *new_selection_text;
2714 char *str; 2745 char *str;
2715 text_t *t; 2746 text_t *t;
2716#ifdef ACS_ASCII 2747#ifdef ACS_ASCII
2717 rend_t *re; 2748 rend_t *re;
2718#endif 2749#endif
2719 2750
2720 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); 2751 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2721 switch (R->selection.op) { 2752 switch (selection.op)
2753 {
2722 case SELECTION_CONT: 2754 case SELECTION_CONT:
2723 break; 2755 break;
2724 case SELECTION_INIT: 2756 case SELECTION_INIT:
2725 CLEAR_SELECTION(R); 2757 CLEAR_SELECTION();
2726 /* FALLTHROUGH */ 2758 /* FALLTHROUGH */
2727 case SELECTION_BEGIN: 2759 case SELECTION_BEGIN:
2728 R->selection.op = SELECTION_DONE; 2760 selection.op = SELECTION_DONE;
2729 /* FALLTHROUGH */ 2761 /* FALLTHROUGH */
2730 default: 2762 default:
2731 return; 2763 return;
2732 } 2764 }
2733 R->selection.op = SELECTION_DONE; 2765 selection.op = SELECTION_DONE;
2734 2766
2735 if (R->selection.clicks == 4) 2767 if (selection.clicks == 4)
2736 return; /* nothing selected, go away */ 2768 return; /* nothing selected, go away */
2737 2769
2738 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2770 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
2739 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2771 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1);
2740 2772
2741 new_selection_text = (unsigned char *)str; 2773 new_selection_text = (unsigned char *)str;
2742 2774
2743 col = R->selection.beg.col; 2775 col = selection.beg.col;
2744 MAX_IT(col, 0); 2776 MAX_IT(col, 0);
2745 row = R->selection.beg.row + R->TermWin.saveLines; 2777 row = selection.beg.row + TermWin.saveLines;
2746 end_row = R->selection.end.row + R->TermWin.saveLines; 2778 end_row = selection.end.row + TermWin.saveLines;
2747 2779
2748 for (; row <= end_row; row++, col = 0) 2780 for (; row <= end_row; row++, col = 0)
2781 {
2782 t = &(screen.text[row][col]);
2783
2784 end_col = screen.tlen[row];
2785
2786 if (end_col == -1)
2787 end_col = TermWin.ncol;
2788
2789 if (row == end_row)
2790 MIN_IT (end_col, selection.end.col);
2791
2792 for (; col < end_col; col++)
2793 if (*t == NOCHAR)
2794 t++;
2795 else
2796 {
2797 int len = wctomb (str, *t++);
2798 if (len > 0)
2799 str += len;
2800 }
2801
2802 if (screen.tlen[row] != -1 && row != end_row)
2803 *str++ = '\n';
2804 }
2805
2806#ifndef NO_OLD_SELECTION
2807 if (selection_style == OLD_SELECT)
2808 if (end_col == TermWin.ncol)
2809 *str++ = '\n';
2810#endif
2811#ifndef NO_NEW_SELECTION
2812 if (selection_style != OLD_SELECT)
2813 if (end_col != selection.end.col)
2814 *str++ = '\n';
2815#endif
2816 *str = '\0';
2817
2818 i = str - (char *)new_selection_text;
2819 if (i == 0)
2820 {
2821 free (new_selection_text);
2822 return;
2823 }
2824
2825 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2826 if (str - (char *)new_selection_text > 1024)
2827 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2828
2829 selection.len = i;
2830
2831 if (selection.text)
2832 free (selection.text);
2833
2834 selection.text = new_selection_text;
2835
2836 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2837 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2838 rxvt_print_error("can't get primary selection");
2839
2840
2841 {
2842 XTextProperty ct;
2843 char *cl = (char *)selection.text;
2844
2845 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2749 { 2846 {
2750 t = &(R->screen.text[row][col]); 2847 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2751 2848 PropModeReplace, ct.value, ct.nitems);
2752 end_col = R->screen.tlen[row]; 2849 XFree (ct.value);
2753
2754 if (end_col == -1)
2755 end_col = R->TermWin.ncol;
2756
2757 if (row == end_row)
2758 MIN_IT (end_col, R->selection.end.col);
2759
2760 for (; col < end_col; col++)
2761 if (*t == NOCHAR)
2762 t++;
2763 else
2764 {
2765 int len = wctomb (str, *t++);
2766 if (len > 0)
2767 str += len;
2768 }
2769
2770 if (R->screen.tlen[row] != -1 && row != end_row)
2771 *str++ = '\n';
2772 } 2850 }
2773 2851 else
2774#ifndef NO_OLD_SELECTION
2775 if (R->selection_style == OLD_SELECT)
2776 if (end_col == R->TermWin.ncol)
2777 *str++ = '\n';
2778#endif
2779#ifndef NO_NEW_SELECTION
2780 if (R->selection_style != OLD_SELECT)
2781 if (end_col != R->selection.end.col)
2782 *str++ = '\n';
2783#endif
2784 *str = '\0';
2785
2786 i = str - (char *)new_selection_text;
2787 if (i == 0)
2788 {
2789 free (new_selection_text);
2790 return;
2791 }
2792
2793 // due to MB_MAX_CUR, selection wastage is usually high
2794 if (str - (char *)new_selection_text > 1024)
2795 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2796
2797 R->selection.len = i;
2798 if (R->selection.text)
2799 free (R->selection.text);
2800
2801 R->selection.text = new_selection_text;
2802
2803 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm);
2804 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt)
2805 rxvt_print_error("can't get primary selection");
2806 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2852 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2807 PropModeReplace, R->selection.text, (int)R->selection.len); 2853 PropModeReplace, selection.text, (int)selection.len);
2854 }
2855
2808 R->selection_time = tm; 2856 selection_time = tm;
2809 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2857 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len));
2810} 2858}
2811 2859
2812/* ------------------------------------------------------------------------- */ 2860/* ------------------------------------------------------------------------- */
2813/* 2861/*
2814 * Mark or select text based upon number of clicks: 1, 2, or 3 2862 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2820 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2868 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2821 2869
2822 clicks = ((clicks - 1) % 3) + 1; 2870 clicks = ((clicks - 1) % 3) + 1;
2823 selection.clicks = clicks; /* save clicks so extend will work */ 2871 selection.clicks = clicks; /* save clicks so extend will work */
2824 2872
2825 rxvt_selection_start_colrow (this, Pixel2Col(x), Pixel2Row(y)); 2873 selection_start_colrow (Pixel2Col(x), Pixel2Row(y));
2826 2874
2827 if (clicks == 2 || clicks == 3) 2875 if (clicks == 2 || clicks == 3)
2828 rxvt_selection_extend_colrow (this, selection.mark.col, 2876 selection_extend_colrow (selection.mark.col,
2829 selection.mark.row + TermWin.view_start, 2877 selection.mark.row + TermWin.view_start,
2830 0, /* button 3 */ 2878 0, /* button 3 */
2831 1, /* button press */ 2879 1, /* button press */
2832 0); /* click change */ 2880 0); /* click change */
2833} 2881}
2834 2882
2835/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2836/* 2884/*
2837 * Mark a selection at the specified col/row 2885 * Mark a selection at the specified col/row
2838 */ 2886 */
2839/* INTPROTO */
2840void 2887void
2841rxvt_selection_start_colrow(pR_ int col, int row) 2888rxvt_term::selection_start_colrow (int col, int row)
2842{ 2889{
2843 R->want_refresh = 1; 2890 want_refresh = 1;
2844 R->selection.mark.col = col; 2891 selection.mark.col = col;
2845 R->selection.mark.row = row - R->TermWin.view_start; 2892 selection.mark.row = row - TermWin.view_start;
2846 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 2893 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled);
2847 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 2894 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1);
2848 MAX_IT(R->selection.mark.col, 0); 2895 MAX_IT(selection.mark.col, 0);
2849 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 2896 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1);
2850 2897
2851 if (R->selection.op) { /* clear the old selection */ 2898 if (selection.op)
2899 { /* clear the old selection */
2852 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 2900 selection.beg.row = selection.end.row = selection.mark.row;
2853 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 2901 selection.beg.col = selection.end.col = selection.mark.col;
2854 } 2902 }
2855 R->selection.op = SELECTION_INIT; 2903 selection.op = SELECTION_INIT;
2856 R->selection.screen = R->current_screen; 2904 selection.screen = current_screen;
2857} 2905}
2858 2906
2859/* ------------------------------------------------------------------------- */ 2907/* ------------------------------------------------------------------------- */
2860/* 2908/*
2861 * Word select: select text for 2 clicks 2909 * Word select: select text for 2 clicks
2862 * We now only find out the boundary in one direction 2910 * We now only find out the boundary in one direction
2863 */ 2911 */
2864 2912
2865/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2913/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2866#define DELIMIT_TEXT(x) \ 2914#define DELIMIT_TEXT(x) \
2867 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 2915 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL))
2868#define DELIMIT_REND(x) 1 2916#define DELIMIT_REND(x) 1
2869 2917
2870/* INTPROTO */
2871void 2918void
2872rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2919rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2873{ 2920{
2874 int col, row, dirnadd, tcol, trow, w1, w2; 2921 int col, row, dirnadd, tcol, trow, w1, w2;
2875 row_col_t bound; 2922 row_col_t bound;
2876 text_t *stp; 2923 text_t *stp;
2877 rend_t *srp; 2924 rend_t *srp;
2878 2925
2879 if (dirn == UP) { 2926 if (dirn == UP)
2927 {
2880 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 2928 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2881 bound.col = 0; 2929 bound.col = 0;
2882 dirnadd = -1; 2930 dirnadd = -1;
2883 } else { 2931 }
2932 else
2933 {
2884 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 2934 bound.row = TermWin.saveLines + TermWin.nrow;
2885 bound.col = R->TermWin.ncol - 1; 2935 bound.col = TermWin.ncol - 1;
2886 dirnadd = 1; 2936 dirnadd = 1;
2887 } 2937 }
2888 row = mark->row + R->TermWin.saveLines; 2938 row = mark->row + TermWin.saveLines;
2889 col = mark->col; 2939 col = mark->col;
2890 MAX_IT(col, 0); 2940 MAX_IT(col, 0);
2891/* find the edge of a word */ 2941 /* find the edge of a word */
2892 stp = &(R->screen.text[row][col]); 2942 stp = &(screen.text[row][col]);
2893 w1 = DELIMIT_TEXT(*stp); 2943 w1 = DELIMIT_TEXT(*stp);
2894 2944
2895 if (R->selection_style != NEW_SELECT) { 2945 if (selection_style != NEW_SELECT)
2946 {
2896 if (w1 == 1) { 2947 if (w1 == 1)
2948 {
2897 stp += dirnadd; 2949 stp += dirnadd;
2898 if (DELIMIT_TEXT(*stp) == 1) 2950 if (DELIMIT_TEXT(*stp) == 1)
2899 goto Old_Word_Selection_You_Die; 2951 goto Old_Word_Selection_You_Die;
2900 col += dirnadd; 2952 col += dirnadd;
2901 } 2953 }
2902 w1 = 0; 2954 w1 = 0;
2903 } 2955 }
2904 srp = (&R->screen.rend[row][col]); 2956 srp = (&screen.rend[row][col]);
2905 w2 = DELIMIT_REND(*srp); 2957 w2 = DELIMIT_REND(*srp);
2906 2958
2907 for (;;) { 2959 for (;;)
2960 {
2908 for (; col != bound.col; col += dirnadd) { 2961 for (; col != bound.col; col += dirnadd)
2962 {
2909 stp += dirnadd; 2963 stp += dirnadd;
2910 if (DELIMIT_TEXT(*stp) != w1) 2964 if (DELIMIT_TEXT(*stp) != w1)
2965 break;
2966 srp += dirnadd;
2967 if (DELIMIT_REND(*srp) != w2)
2968 break;
2969 }
2970 if ((col == bound.col) && (row != bound.row))
2971 {
2972 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1)
2973 {
2974 trow = row + dirnadd;
2975 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2976 if (screen.text[trow] == NULL)
2911 break; 2977 break;
2912 srp += dirnadd; 2978 stp = &(screen.text[trow][tcol]);
2913 if (DELIMIT_REND(*srp) != w2) 2979 srp = &(screen.rend[trow][tcol]);
2980 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2914 break; 2981 break;
2915 }
2916 if ((col == bound.col) && (row != bound.row)) {
2917 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2918 trow = row + dirnadd;
2919 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0;
2920 if (R->screen.text[trow] == NULL)
2921 break;
2922 stp = &(R->screen.text[trow][tcol]);
2923 srp = &(R->screen.rend[trow][tcol]);
2924 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2925 break;
2926 row = trow; 2982 row = trow;
2927 col = tcol; 2983 col = tcol;
2928 continue; 2984 continue;
2929 } 2985 }
2930 } 2986 }
2931 break; 2987 break;
2932 } 2988 }
2933 Old_Word_Selection_You_Die: 2989Old_Word_Selection_You_Die:
2934 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 - R->TermWin.saveLines, col)); 2990 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));
2935 2991
2936 if (dirn == DN) 2992 if (dirn == DN)
2937 col++; /* put us on one past the end */ 2993 col++; /* put us on one past the end */
2938 2994
2939/* Poke the values back in */ 2995 /* Poke the values back in */
2940 ret->row = row - R->TermWin.saveLines; 2996 ret->row = row - TermWin.saveLines;
2941 ret->col = col; 2997 ret->col = col;
2942} 2998}
2943 2999
2944/* ------------------------------------------------------------------------- */ 3000/* ------------------------------------------------------------------------- */
2945/* 3001/*
2946 * Extend the selection to the specified x/y pixel location 3002 * Extend the selection to the specified x/y pixel location
… …
2985 } 3041 }
2986#endif 3042#endif
2987 if (selection.clicks == 4) 3043 if (selection.clicks == 4)
2988 selection.clicks = 1; 3044 selection.clicks = 1;
2989 3045
2990 rxvt_selection_extend_colrow (this, col, row, !!flag, /* ? button 3 */ 3046 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2991 flag == 1 ? 1 : 0, /* ? button press */ 3047 flag == 1 ? 1 : 0, /* ? button press */
2992 0); /* no click change */ 3048 0); /* no click change */
2993} 3049}
2994 3050
2995/* ------------------------------------------------------------------------- */ 3051/* ------------------------------------------------------------------------- */
2996/* 3052/*
2997 * Extend the selection to the specified col/row 3053 * Extend the selection to the specified col/row
2998 */ 3054 */
2999/* INTPROTO */
3000void 3055void
3001rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3056rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3002{ 3057{
3003 int16_t ncol = R->TermWin.ncol; 3058 int16_t ncol = TermWin.ncol;
3004 int end_col; 3059 int end_col;
3005 row_col_t pos; 3060 row_col_t pos;
3006 enum { 3061 enum {
3007 LEFT, RIGHT 3062 LEFT, RIGHT
3008 } closeto = RIGHT; 3063 } closeto = RIGHT;
3009 3064
3010 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op)); 3065 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));
3011 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3066 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT 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));
3012 3067
3013 R->want_refresh = 1; 3068 want_refresh = 1;
3014 switch (R->selection.op) { 3069 switch (selection.op)
3070 {
3015 case SELECTION_INIT: 3071 case SELECTION_INIT:
3016 CLEAR_SELECTION(R); 3072 CLEAR_SELECTION();
3017 R->selection.op = SELECTION_BEGIN; 3073 selection.op = SELECTION_BEGIN;
3018 /* FALLTHROUGH */ 3074 /* FALLTHROUGH */
3019 case SELECTION_BEGIN: 3075 case SELECTION_BEGIN:
3020 if (row != R->selection.mark.row || col != R->selection.mark.col 3076 if (row != selection.mark.row || col != selection.mark.col
3021 || (!button3 && buttonpress)) 3077 || (!button3 && buttonpress))
3022 R->selection.op = SELECTION_CONT; 3078 selection.op = SELECTION_CONT;
3023 break; 3079 break;
3024 case SELECTION_DONE: 3080 case SELECTION_DONE:
3025 R->selection.op = SELECTION_CONT; 3081 selection.op = SELECTION_CONT;
3026 /* FALLTHROUGH */ 3082 /* FALLTHROUGH */
3027 case SELECTION_CONT: 3083 case SELECTION_CONT:
3028 break; 3084 break;
3029 case SELECTION_CLEAR: 3085 case SELECTION_CLEAR:
3030 rxvt_selection_start_colrow(aR_ col, row); 3086 selection_start_colrow (col, row);
3031 /* FALLTHROUGH */ 3087 /* FALLTHROUGH */
3032 default: 3088 default:
3033 return; 3089 return;
3034 } 3090 }
3035 if (R->selection.beg.col == R->selection.end.col 3091 if (selection.beg.col == selection.end.col
3036 && R->selection.beg.col != R->selection.mark.col 3092 && selection.beg.col != selection.mark.col
3037 && R->selection.beg.row == R->selection.end.row 3093 && selection.beg.row == selection.end.row
3038 && R->selection.beg.row != R->selection.mark.row) { 3094 && selection.beg.row != selection.mark.row)
3095 {
3039 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3096 selection.beg.col = selection.end.col = selection.mark.col;
3040 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3097 selection.beg.row = selection.end.row = selection.mark.row;
3041 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3098 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 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));
3042 } 3099 }
3043 3100
3044 pos.col = col; 3101 pos.col = col;
3045 pos.row = row; 3102 pos.row = row;
3046 3103
3047 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3104 pos.row -= TermWin.view_start; /* adjust for scroll */
3048 3105
3049#ifndef NO_OLD_SELECTION 3106#ifndef NO_OLD_SELECTION
3050/* 3107 /*
3051 * This mimics some of the selection behaviour of version 2.20 and before. 3108 * This mimics some of the selection behaviour of version 2.20 and before.
3052 * There are no ``selection modes'', button3 is always character extension. 3109 * There are no ``selection modes'', button3 is always character extension.
3053 * Note: button3 drag is always available, c.f. v2.20 3110 * Note: button3 drag is always available, c.f. v2.20
3054 * Selection always terminates (left or right as appropriate) at the mark. 3111 * Selection always terminates (left or right as appropriate) at the mark.
3055 */ 3112 */
3056 if (R->selection_style == OLD_SELECT) { 3113 if (selection_style == OLD_SELECT)
3114 {
3057 if (R->selection.clicks == 1 || button3) { 3115 if (selection.clicks == 1 || button3)
3116 {
3058 if (R->hate_those_clicks) { 3117 if (hate_those_clicks)
3118 {
3059 R->hate_those_clicks = 0; 3119 hate_those_clicks = 0;
3060 if (R->selection.clicks == 1) { 3120 if (selection.clicks == 1)
3121 {
3061 R->selection.beg.row = R->selection.mark.row; 3122 selection.beg.row = selection.mark.row;
3062 R->selection.beg.col = R->selection.mark.col; 3123 selection.beg.col = selection.mark.col;
3124 }
3063 } else { 3125 else
3126 {
3064 R->selection.mark.row = R->selection.beg.row; 3127 selection.mark.row = selection.beg.row;
3065 R->selection.mark.col = R->selection.beg.col; 3128 selection.mark.col = selection.beg.col;
3066 } 3129 }
3067 } 3130 }
3068 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { 3131 if (ROWCOL_IS_BEFORE(pos, selection.mark))
3132 {
3069 R->selection.end.row = R->selection.mark.row; 3133 selection.end.row = selection.mark.row;
3070 R->selection.end.col = R->selection.mark.col + 1; 3134 selection.end.col = selection.mark.col + 1;
3071 R->selection.beg.row = pos.row; 3135 selection.beg.row = pos.row;
3072 R->selection.beg.col = pos.col; 3136 selection.beg.col = pos.col;
3073 } else {
3074 R->selection.beg.row = R->selection.mark.row;
3075 R->selection.beg.col = R->selection.mark.col;
3076 R->selection.end.row = pos.row;
3077 R->selection.end.col = pos.col + 1;
3078 } 3137 }
3138 else
3139 {
3140 selection.beg.row = selection.mark.row;
3141 selection.beg.col = selection.mark.col;
3142 selection.end.row = pos.row;
3143 selection.end.col = pos.col + 1;
3144 }
3145 }
3079 } else if (R->selection.clicks == 2) { 3146 else if (selection.clicks == 2)
3147 {
3080 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3148 selection_delimit_word (UP, &(selection.mark),
3081 &(R->selection.beg)); 3149 &(selection.beg));
3082 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3150 selection_delimit_word (DN, &(selection.mark),
3083 &(R->selection.end)); 3151 &(selection.end));
3084 R->hate_those_clicks = 1; 3152 hate_those_clicks = 1;
3153 }
3085 } else if (R->selection.clicks == 3) { 3154 else if (selection.clicks == 3)
3155 {
3086 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3156 selection.beg.row = selection.end.row = selection.mark.row;
3087 R->selection.beg.col = 0; 3157 selection.beg.col = 0;
3088 R->selection.end.col = ncol; 3158 selection.end.col = ncol;
3089 R->hate_those_clicks = 1; 3159 hate_those_clicks = 1;
3090 } 3160 }
3091 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3161 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));
3092 return; 3162 return;
3093 } 3163 }
3094#endif /* ! NO_OLD_SELECTION */ 3164#endif /* ! NO_OLD_SELECTION */
3095#ifndef NO_NEW_SELECTION 3165#ifndef NO_NEW_SELECTION
3096/* selection_style must not be OLD_SELECT to get here */ 3166 /* selection_style must not be OLD_SELECT to get here */
3097/* 3167 /*
3098 * This is mainly xterm style selection with a couple of differences, mainly 3168 * This is mainly xterm style selection with a couple of differences, mainly
3099 * in the way button3 drag extension works. 3169 * in the way button3 drag extension works.
3100 * We're either doing: button1 drag; button3 press; or button3 drag 3170 * We're either doing: button1 drag; button3 press; or button3 drag
3101 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3171 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3102 * is always at the left/right edge of the R->selection. 3172 * is always at the left/right edge of the selection.
3103 * b) button3 press: extend/contract character/word/line at whichever edge of 3173 * b) button3 press: extend/contract character/word/line at whichever edge of
3104 * the selection we are closest to. 3174 * the selection we are closest to.
3105 * c) button3 drag : extend/contract character/word/line - we select around 3175 * c) button3 drag : extend/contract character/word/line - we select around
3106 * a point/word/line which is either the start or end of the selection 3176 * a point/word/line which is either the start or end of the selection
3107 * and it was decided by whichever point/word/line was `fixed' at the 3177 * and it was decided by whichever point/word/line was `fixed' at the
3108 * time of the most recent button3 press 3178 * time of the most recent button3 press
3109 */ 3179 */
3110 if (button3 && buttonpress) { /* button3 press */ 3180 if (button3 && buttonpress)
3181 { /* button3 press */
3111 /* 3182 /*
3112 * first determine which edge of the selection we are closest to 3183 * first determine which edge of the selection we are closest to
3113 */ 3184 */
3114 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3185 if (ROWCOL_IS_BEFORE(pos, selection.beg)
3115 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3186 || (!ROWCOL_IS_AFTER(pos, selection.end)
3116 && (((pos.col - R->selection.beg.col) 3187 && (((pos.col - selection.beg.col)
3117 + ((pos.row - R->selection.beg.row) * ncol)) 3188 + ((pos.row - selection.beg.row) * ncol))
3118 < ((R->selection.end.col - pos.col) 3189 < ((selection.end.col - pos.col)
3119 + ((R->selection.end.row - pos.row) * ncol))))) 3190 + ((selection.end.row - pos.row) * ncol)))))
3120 closeto = LEFT; 3191 closeto = LEFT;
3121 if (closeto == LEFT) { 3192 if (closeto == LEFT)
3193 {
3122 R->selection.beg.row = pos.row; 3194 selection.beg.row = pos.row;
3123 R->selection.beg.col = pos.col; 3195 selection.beg.col = pos.col;
3124 R->selection.mark.row = R->selection.end.row; 3196 selection.mark.row = selection.end.row;
3125 R->selection.mark.col = R->selection.end.col 3197 selection.mark.col = selection.end.col
3126 - (R->selection.clicks == 2); 3198 - (selection.clicks == 2);
3199 }
3127 } else { 3200 else
3201 {
3128 R->selection.end.row = pos.row; 3202 selection.end.row = pos.row;
3129 R->selection.end.col = pos.col; 3203 selection.end.col = pos.col;
3130 R->selection.mark.row = R->selection.beg.row; 3204 selection.mark.row = selection.beg.row;
3131 R->selection.mark.col = R->selection.beg.col; 3205 selection.mark.col = selection.beg.col;
3132 } 3206 }
3207 }
3208 else
3133 } else { /* button1 drag or button3 drag */ 3209 { /* button1 drag or button3 drag */
3134 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { 3210 if (ROWCOL_IS_AFTER(selection.mark, pos))
3211 {
3135 if ((R->selection.mark.row == R->selection.end.row) 3212 if ((selection.mark.row == selection.end.row)
3136 && (R->selection.mark.col == R->selection.end.col) 3213 && (selection.mark.col == selection.end.col)
3137 && clickchange && R->selection.clicks == 2) 3214 && clickchange && selection.clicks == 2)
3138 R->selection.mark.col--; 3215 selection.mark.col--;
3139 R->selection.beg.row = pos.row; 3216 selection.beg.row = pos.row;
3140 R->selection.beg.col = pos.col; 3217 selection.beg.col = pos.col;
3141 R->selection.end.row = R->selection.mark.row; 3218 selection.end.row = selection.mark.row;
3142 R->selection.end.col = R->selection.mark.col 3219 selection.end.col = selection.mark.col
3143 + (R->selection.clicks == 2); 3220 + (selection.clicks == 2);
3221 }
3144 } else { 3222 else
3223 {
3145 R->selection.beg.row = R->selection.mark.row; 3224 selection.beg.row = selection.mark.row;
3146 R->selection.beg.col = R->selection.mark.col; 3225 selection.beg.col = selection.mark.col;
3147 R->selection.end.row = pos.row; 3226 selection.end.row = pos.row;
3148 R->selection.end.col = pos.col; 3227 selection.end.col = pos.col;
3149 } 3228 }
3150 } 3229 }
3151 3230
3152 if (R->selection.clicks == 1) { 3231 if (selection.clicks == 1)
3232 {
3153 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; 3233 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3154 if (end_col != -1 && R->selection.beg.col > end_col) { 3234 if (end_col != -1 && selection.beg.col > end_col)
3235 {
3155#if 1 3236#if 1
3156 R->selection.beg.col = ncol; 3237 selection.beg.col = ncol;
3157#else 3238#else
3158 if (R->selection.beg.row != R->selection.end.row) 3239 if (selection.beg.row != selection.end.row)
3159 R->selection.beg.col = ncol; 3240 selection.beg.col = ncol;
3160 else 3241 else
3161 R->selection.beg.col = R->selection.mark.col; 3242 selection.beg.col = selection.mark.col;
3162#endif 3243#endif
3244
3163 } 3245 }
3164 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; 3246 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3165 if (end_col != -1 && R->selection.end.col > end_col) 3247 if (end_col != -1 && selection.end.col > end_col)
3166 R->selection.end.col = ncol; 3248 selection.end.col = ncol;
3167 3249
3250 }
3168 } else if (R->selection.clicks == 2) { 3251 else if (selection.clicks == 2)
3252 {
3169 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) 3253 if (ROWCOL_IS_AFTER(selection.end, selection.beg))
3170 R->selection.end.col--; 3254 selection.end.col--;
3171 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3255 selection_delimit_word (UP, &(selection.beg),
3172 &(R->selection.beg)); 3256 &(selection.beg));
3173 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), 3257 selection_delimit_word (DN, &(selection.end),
3174 &(R->selection.end)); 3258 &(selection.end));
3259 }
3175 } else if (R->selection.clicks == 3) { 3260 else if (selection.clicks == 3)
3261 {
3176#ifndef NO_FRILLS 3262#ifndef NO_FRILLS
3177 if ((R->Options & Opt_tripleclickwords)) { 3263 if ((Options & Opt_tripleclickwords))
3264 {
3178 int end_row; 3265 int end_row;
3179 3266
3180 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3267 selection_delimit_word (UP, &(selection.beg),
3181 &(R->selection.beg)); 3268 &(selection.beg));
3182 end_row = R->screen.tlen[R->selection.mark.row 3269 end_row = screen.tlen[selection.mark.row
3183 + R->TermWin.saveLines]; 3270 + TermWin.saveLines];
3184 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; 3271 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3185 end_row++) { 3272 end_row++)
3273 {
3186 end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; 3274 end_col = screen.tlen[end_row + TermWin.saveLines];
3187 if (end_col != -1) { 3275 if (end_col != -1)
3276 {
3188 R->selection.end.row = end_row; 3277 selection.end.row = end_row;
3189 R->selection.end.col = end_col; 3278 selection.end.col = end_col;
3190 rxvt_selection_remove_trailing_spaces(aR); 3279 selection_remove_trailing_spaces ();
3191 break; 3280 break;
3192 } 3281 }
3193 } 3282 }
3194 } else
3195#endif
3196 { 3283 }
3284 else
3285#endif
3286
3287 {
3197 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) 3288 if (ROWCOL_IS_AFTER(selection.mark, selection.beg))
3198 R->selection.mark.col++; 3289 selection.mark.col++;
3199 R->selection.beg.col = 0; 3290 selection.beg.col = 0;
3200 R->selection.end.col = ncol; 3291 selection.end.col = ncol;
3201 } 3292 }
3202 } 3293 }
3294 if (button3 && buttonpress)
3203 if (button3 && buttonpress) { /* mark may need to be changed */ 3295 { /* mark may need to be changed */
3204 if (closeto == LEFT) { 3296 if (closeto == LEFT)
3297 {
3205 R->selection.mark.row = R->selection.end.row; 3298 selection.mark.row = selection.end.row;
3206 R->selection.mark.col = R->selection.end.col 3299 selection.mark.col = selection.end.col
3207 - (R->selection.clicks == 2); 3300 - (selection.clicks == 2);
3301 }
3208 } else { 3302 else
3303 {
3209 R->selection.mark.row = R->selection.beg.row; 3304 selection.mark.row = selection.beg.row;
3210 R->selection.mark.col = R->selection.beg.col; 3305 selection.mark.col = selection.beg.col;
3211 } 3306 }
3212 } 3307 }
3213 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3308 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));
3214#endif /* ! NO_NEW_SELECTION */ 3309#endif /* ! NO_NEW_SELECTION */
3215} 3310}
3216 3311
3217#ifndef NO_FRILLS 3312#ifndef NO_FRILLS
3218/* INTPROTO */
3219void 3313void
3220rxvt_selection_remove_trailing_spaces(pR) 3314rxvt_term::selection_remove_trailing_spaces ()
3221{ 3315{
3222 int32_t end_col, end_row; 3316 int32_t end_col, end_row;
3223 text_t *stp; 3317 text_t *stp;
3224 3318
3225 end_col = R->selection.end.col; 3319 end_col = selection.end.col;
3226 end_row = R->selection.end.row; 3320 end_row = selection.end.row;
3227 for ( ; end_row >= R->selection.beg.row; ) { 3321 for ( ; end_row >= selection.beg.row; )
3322 {
3228 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3323 stp = screen.text[end_row + TermWin.saveLines];
3229 while (--end_col >= 0) { 3324 while (--end_col >= 0)
3325 {
3230 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3326 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3231 break;
3232 }
3233 if (end_col >= 0
3234 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) {
3235 R->selection.end.col = end_col + 1;
3236 R->selection.end.row = end_row;
3237 break; 3327 break;
3238 } 3328 }
3329 if (end_col >= 0
3330 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3331 {
3332 selection.end.col = end_col + 1;
3333 selection.end.row = end_row;
3334 break;
3335 }
3239 end_row--; 3336 end_row--;
3240 end_col = R->TermWin.ncol; 3337 end_col = TermWin.ncol;
3241 } 3338 }
3242 if (R->selection.mark.row > R->selection.end.row) { 3339 if (selection.mark.row > selection.end.row)
3340 {
3243 R->selection.mark.row = R->selection.end.row; 3341 selection.mark.row = selection.end.row;
3244 R->selection.mark.col = R->selection.end.col; 3342 selection.mark.col = selection.end.col;
3343 }
3245 } else if (R->selection.mark.row == R->selection.end.row 3344 else if (selection.mark.row == selection.end.row
3246 && R->selection.mark.col > R->selection.end.col) 3345 && selection.mark.col > selection.end.col)
3247 R->selection.mark.col = R->selection.end.col; 3346 selection.mark.col = selection.end.col;
3248} 3347}
3249#endif 3348#endif
3250 3349
3251/* ------------------------------------------------------------------------- */ 3350/* ------------------------------------------------------------------------- */
3252/* 3351/*
… …
3255 */ 3354 */
3256void 3355void
3257rxvt_term::selection_rotate (int x, int y) 3356rxvt_term::selection_rotate (int x, int y)
3258{ 3357{
3259 selection.clicks = selection.clicks % 3 + 1; 3358 selection.clicks = selection.clicks % 3 + 1;
3260 rxvt_selection_extend_colrow (this, Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3359 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1);
3261} 3360}
3262 3361
3263/* ------------------------------------------------------------------------- */ 3362/* ------------------------------------------------------------------------- */
3264/* 3363/*
3265 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3364 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3266 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3365 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3267 * the X11 protocol. 3366 * the X11 protocol.
3268 */ 3367 */
3269typedef CARD32 Atom32; 3368typedef CARD32 Atom32;
3270 3369
3271/* ------------------------------------------------------------------------- */ 3370/* ------------------------------------------------------------------------- */
3272/* 3371/*
3273 * Respond to a request for our current selection 3372 * Respond to a request for our current selection
3274 * EXT: SelectionRequest 3373 * EXT: SelectionRequest
3275 */ 3374 */
3276/* EXTPROTO */
3277void 3375void
3278rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3376rxvt_term::selection_send (const XSelectionRequestEvent *rq)
3279{ 3377{
3280 XSelectionEvent ev; 3378 XSelectionEvent ev;
3281#ifdef USE_XIM
3282 Atom32 target_list[4];
3283#else
3284 Atom32 target_list[3];
3285#endif
3286 Atom target;
3287 XTextProperty ct; 3379 XTextProperty ct;
3288 XICCEncodingStyle style; 3380 XICCEncodingStyle style;
3289 char *cl[2], dummy[1]; 3381 Atom target;
3290 3382
3291 ev.type = SelectionNotify; 3383 ev.type = SelectionNotify;
3292 ev.property = None; 3384 ev.property = None;
3293 ev.display = rq->display; 3385 ev.display = rq->display;
3294 ev.requestor = rq->requestor; 3386 ev.requestor = rq->requestor;
3295 ev.selection = rq->selection; 3387 ev.selection = rq->selection;
3296 ev.target = rq->target; 3388 ev.target = rq->target;
3297 ev.time = rq->time; 3389 ev.time = rq->time;
3298 3390
3299 if (rq->target == R->xa[XA_TARGETS]) { 3391 if (rq->target == xa[XA_TARGETS])
3392 {
3393 Atom32 target_list[5];
3394 Atom32 *target = target_list;
3395
3300 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3396 *target++ = (Atom32) xa[XA_TARGETS];
3301 target_list[1] = (Atom32) XA_STRING; 3397 *target++ = (Atom32) XA_STRING;
3302 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3398 *target++ = (Atom32) xa[XA_TEXT];
3303#ifdef USE_XIM
3304 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3399 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3400#if X_HAVE_UTF8_STRING
3401 *target++ = (Atom32) xa[XA_UTF8_STRING];
3305#endif 3402#endif
3306 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3403 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM,
3307 (8 * sizeof(target_list[0])), PropModeReplace, 3404 (8 * sizeof(target_list[0])), PropModeReplace,
3308 (unsigned char *)target_list, 3405 (unsigned char *)target_list,
3309 (sizeof(target_list) / sizeof(target_list[0]))); 3406 target - target_list);
3310 ev.property = rq->property; 3407 ev.property = rq->property;
3408 }
3311 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3409 else if (rq->target == xa[XA_MULTIPLE])
3410 {
3312 /* TODO: Handle MULTIPLE */ 3411 /* TODO: Handle MULTIPLE */
3412 }
3313 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3413 else if (rq->target == xa[XA_TIMESTAMP] && selection.text)
3414 {
3314 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3415 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3315 (8 * sizeof(Time)), PropModeReplace, 3416 (8 * sizeof(Time)), PropModeReplace,
3316 (unsigned char *)&R->selection_time, 1); 3417 (unsigned char *)&selection_time, 1);
3317 ev.property = rq->property; 3418 ev.property = rq->property;
3419 }
3318 } else if (rq->target == XA_STRING 3420 else if (rq->target == XA_STRING
3421 || rq->target == xa[XA_TEXT]
3319 || rq->target == R->xa[XA_COMPOUND_TEXT] 3422 || rq->target == xa[XA_COMPOUND_TEXT]
3320 || rq->target == R->xa[XA_TEXT]) { 3423 || rq->target == xa[XA_UTF8_STRING]
3321#ifdef USE_XIM 3424 )
3425 {
3322 short freect = 0; 3426 short freect = 0;
3323#endif 3427 int selectlen;
3324 int selectlen; 3428 char *cl;
3325 3429
3326#ifdef USE_XIM 3430 target = rq->target;
3431
3327 if (rq->target != XA_STRING) { 3432 if (target == XA_STRING)
3433 // we actually don't do XA_STRING, but who cares, as i18n clients
3434 // will ask for another format anyways.
3435 style = XStringStyle;
3436 else if (target == xa[XA_TEXT])
3437 style = XTextStyle;
3438 else if (target == xa[XA_COMPOUND_TEXT])
3439 style = XCompoundTextStyle;
3440#if X_HAVE_UTF8_STRING
3441 else if (target == xa[XA_UTF8_STRING])
3442 style = XUTF8StringStyle;
3443#endif
3444 else
3445 {
3328 target = R->xa[XA_COMPOUND_TEXT]; 3446 target = xa[XA_COMPOUND_TEXT];
3329 style = (rq->target == R->xa[XA_COMPOUND_TEXT]) 3447 style = XCompoundTextStyle;
3330 ? XCompoundTextStyle : XStdICCTextStyle;
3331 } else
3332#endif
3333 { 3448 }
3334 target = XA_STRING; 3449
3335 style = XStringStyle; 3450 if (selection.text)
3336 } 3451 {
3337 if (R->selection.text) {
3338 cl[0] = (char *)R->selection.text; 3452 cl = (char *)selection.text;
3339 selectlen = R->selection.len; 3453 selectlen = selection.len;
3454 }
3340 } else { 3455 else
3341 cl[0] = dummy; 3456 {
3342 *dummy = '\0'; 3457 cl = "";
3343 selectlen = 0; 3458 selectlen = 0;
3344 } 3459 }
3345#ifdef USE_XIM 3460
3346 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3461 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0)
3347 == Success) /* if we failed to convert then send it raw */
3348 freect = 1; 3462 freect = 1;
3349 else 3463 else
3350#endif
3351 { 3464 {
3465 /* if we failed to convert then send it raw */
3352 ct.value = (unsigned char *)cl[0]; 3466 ct.value = (unsigned char *)cl;
3353 ct.nitems = selectlen; 3467 ct.nitems = selectlen;
3354 } 3468 }
3469
3355 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3470 XChangeProperty(Xdisplay, rq->requestor, rq->property,
3356 target, 8, PropModeReplace, 3471 target, 8, PropModeReplace,
3357 ct.value, (int)ct.nitems); 3472 ct.value, (int)ct.nitems);
3358 ev.property = rq->property; 3473 ev.property = rq->property;
3359#ifdef USE_XIM 3474
3360 if (freect) 3475 if (freect)
3361 XFree(ct.value); 3476 XFree (ct.value);
3362#endif
3363 } 3477 }
3364 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3478 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3365} 3479}
3366 3480
3367/* ------------------------------------------------------------------------- * 3481/* ------------------------------------------------------------------------- *
3368 * MOUSE ROUTINES * 3482 * MOUSE ROUTINES *
3369 * ------------------------------------------------------------------------- */ 3483 * ------------------------------------------------------------------------- */
… …
3373 */ 3487 */
3374void 3488void
3375rxvt_term::pixel_position (int *x, int *y) 3489rxvt_term::pixel_position (int *x, int *y)
3376{ 3490{
3377 *x = Pixel2Col(*x); 3491 *x = Pixel2Col(*x);
3378 /* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3492 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */
3379 *y = Pixel2Row(*y); 3493 *y = Pixel2Row(*y);
3380 /* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3494 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */
3381} 3495}
3382 3496
3383/* ------------------------------------------------------------------------- */ 3497/* ------------------------------------------------------------------------- */
3384#ifdef USE_XIM 3498#ifdef USE_XIM
3385void 3499void
… …
3397 3511
3398/* ------------------------------------------------------------------------- * 3512/* ------------------------------------------------------------------------- *
3399 * DEBUG ROUTINES * 3513 * DEBUG ROUTINES *
3400 * ------------------------------------------------------------------------- */ 3514 * ------------------------------------------------------------------------- */
3401#if 0 3515#if 0
3402/* INTPROTO */
3403void 3516void
3404rxvt_debug_colors(void) 3517rxvt_debug_colors(void)
3405{ 3518{
3406 int color; 3519 int color;
3407 const char *name[] = { 3520 const char *name[] =
3521 {
3408 "fg", "bg", 3522 "fg", "bg",
3409 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3523 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3410 }; 3524 };
3411 3525
3412 fprintf(stderr, "Color ( "); 3526 fprintf(stderr, "Color ( ");
3413 if (R->rstyle & RS_RVid) 3527 if (rstyle & RS_RVid)
3414 fprintf(stderr, "rvid "); 3528 fprintf(stderr, "rvid ");
3415 if (R->rstyle & RS_Bold) 3529 if (rstyle & RS_Bold)
3416 fprintf(stderr, "bold "); 3530 fprintf(stderr, "bold ");
3417 if (R->rstyle & RS_Blink) 3531 if (rstyle & RS_Blink)
3418 fprintf(stderr, "blink "); 3532 fprintf(stderr, "blink ");
3419 if (R->rstyle & RS_Uline) 3533 if (rstyle & RS_Uline)
3420 fprintf(stderr, "uline "); 3534 fprintf(stderr, "uline ");
3421 fprintf(stderr, "): "); 3535 fprintf(stderr, "): ");
3422 3536
3423 color = GET_FGCOLOR(R->rstyle); 3537 color = GET_FGCOLOR(rstyle);
3424#ifndef NO_BRIGHTCOLOR 3538#ifndef NO_BRIGHTCOLOR
3425 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3539 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3540 {
3426 color -= (minBrightCOLOR - minCOLOR); 3541 color -= (minBrightCOLOR - minCOLOR);
3427 fprintf(stderr, "bright "); 3542 fprintf(stderr, "bright ");
3428 } 3543 }
3429#endif 3544#endif
3430 fprintf(stderr, "%s on ", name[color]); 3545 fprintf(stderr, "%s on ", name[color]);
3431 3546
3432 color = GET_BGCOLOR(R->rstyle); 3547 color = GET_BGCOLOR(rstyle);
3433#ifndef NO_BRIGHTCOLOR 3548#ifndef NO_BRIGHTCOLOR
3434 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3549 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3550 {
3435 color -= (minBrightCOLOR - minCOLOR); 3551 color -= (minBrightCOLOR - minCOLOR);
3436 fprintf(stderr, "bright "); 3552 fprintf(stderr, "bright ");
3437 } 3553 }
3438#endif 3554#endif
3439 fprintf(stderr, "%s\n", name[color]); 3555 fprintf(stderr, "%s\n", name[color]);
3440} 3556}
3441#endif 3557#endif

Diff Legend

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