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.19 by pcg, Thu Jan 29 23:26:01 2004 UTC vs.
Revision 1.24 by pcg, Sat Jan 31 04:12:10 2004 UTC

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

Diff Legend

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