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.11 by pcg, Thu Dec 18 13:33:03 2003 UTC vs.
Revision 1.22 by pcg, Sat Jan 31 02:14:58 2004 UTC

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

Diff Legend

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