ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.14 by pcg, Fri Dec 26 07:42:23 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 02:14:58 2004 UTC

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

Diff Legend

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