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.17 by pcg, Mon Jan 19 17:26:43 2004 UTC vs.
Revision 1.27 by pcg, Mon Feb 9 07:11:49 2004 UTC

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

Diff Legend

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