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.10 by pcg, Thu Dec 18 08:06:46 2003 UTC vs.
Revision 1.23 by pcg, Sat Jan 31 02:31:17 2004 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.c 2 * File: screen.c
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * $Id: screen.C,v 1.10 2003/12/18 08:06:46 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))))
… …
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 89 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 90 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 91 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 92 */
94#define drawBuffer (R->TermWin.vt) 93#define drawBuffer TermWin.vt
95 94
96#define CLEAR_ROWS(row, num) \ 95#define CLEAR_ROWS(row, num) \
97 if (R->TermWin.mapped) \ 96 if (TermWin.mapped) \
98 XClearArea(R->Xdisplay, drawBuffer, R->TermWin.int_bwidth, \ 97 XClearArea (Xdisplay, drawBuffer, TermWin.int_bwidth, \
99 Row2Pixel(row), (unsigned int)R->TermWin.width, \ 98 Row2Pixel(row), (unsigned int)TermWin.width, \
100 (unsigned int)Height2Pixel(num), False) 99 (unsigned int)Height2Pixel(num), False)
101 100
102#define CLEAR_CHARS(x, y, num) \ 101#define CLEAR_CHARS(x, y, num) \
103 if (R->TermWin.mapped) \ 102 if (TermWin.mapped) \
104 XClearArea(R->Xdisplay, drawBuffer, x, y, \ 103 XClearArea (Xdisplay, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel(num), \ 104 (unsigned int)Width2Pixel(num), \
106 (unsigned int)Height2Pixel(1), False) 105 (unsigned int)Height2Pixel(1), False)
107 106
108#define ERASE_ROWS(row, num) \ 107#define ERASE_ROWS(row, num) \
109 XFillRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, \ 108 XFillRectangle (Xdisplay, drawBuffer, TermWin.gc, \
110 R->TermWin.int_bwidth, Row2Pixel(row), \ 109 TermWin.int_bwidth, Row2Pixel(row), \
111 (unsigned int)R->TermWin.width, \ 110 (unsigned int)TermWin.width, \
112 (unsigned int)Height2Pixel(num)) 111 (unsigned int)Height2Pixel(num))
113 112
114/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
117/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
… …
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 rxvt_scr_clear (aR); 488 scr_clear ();
491 rxvt_scr_refresh (aR_ 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
1212 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1194 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1213 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1195 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1214 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1196 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1215 */ 1197 */
1216/* EXTPROTO */
1217void 1198void
1218rxvt_scr_erase_screen(pR_ int mode) 1199rxvt_term::scr_erase_screen (int mode)
1219{ 1200{
1220 int num; 1201 int num;
1221 int32_t row, row_offset; 1202 int32_t row, row_offset;
1222 rend_t ren; 1203 rend_t ren;
1223 XGCValues gcvalue; 1204 XGCValues gcvalue;
1224 1205
1225 R->want_refresh = 1; 1206 want_refresh = 1;
1226 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, R->screen.cur.row)); 1207 D_SCREEN((stderr, "rxvt_scr_erase_screen(%d) at screen row: %d", mode, screen.cur.row));
1227 ZERO_SCROLLBACK(R); 1208 ZERO_SCROLLBACK ();
1228 row_offset = (int32_t)R->TermWin.saveLines; 1209 row_offset = (int32_t)TermWin.saveLines;
1229 1210
1230 switch (mode) { 1211 switch (mode) {
1231 case 0: /* erase to end of screen */ 1212 case 0: /* erase to end of screen */
1232 rxvt_selection_check(aR_ 1); 1213 selection_check (1);
1233 rxvt_scr_erase_line(aR_ 0); 1214 scr_erase_line (0);
1234 row = R->screen.cur.row + 1; /* possible OOB */ 1215 row = screen.cur.row + 1; /* possible OOB */
1235 num = R->TermWin.nrow - row; 1216 num = TermWin.nrow - row;
1236 break; 1217 break;
1237 case 1: /* erase to beginning of screen */ 1218 case 1: /* erase to beginning of screen */
1238 rxvt_selection_check(aR_ 3); 1219 selection_check (3);
1239 rxvt_scr_erase_line(aR_ 1); 1220 scr_erase_line (1);
1240 row = 0; 1221 row = 0;
1241 num = R->screen.cur.row; 1222 num = screen.cur.row;
1242 break; 1223 break;
1243 case 2: /* erase whole screen */ 1224 case 2: /* erase whole screen */
1244 rxvt_selection_check(aR_ 3); 1225 selection_check (3);
1245#ifdef RXVT_GRAPHICS 1226#ifdef RXVT_GRAPHICS
1246 rxvt_Gr_ClearScreen(aR); 1227 Gr_ClearScreen ();
1247#endif 1228#endif
1248 row = 0; 1229 row = 0;
1249 num = R->TermWin.nrow; 1230 num = TermWin.nrow;
1250 break; 1231 break;
1251 default: 1232 default:
1252 return; 1233 return;
1253 } 1234 }
1254 R->refresh_type |= REFRESH_BOUNDS; 1235 refresh_type |= REFRESH_BOUNDS;
1255 if (R->selection.op && R->current_screen == R->selection.screen 1236 if (selection.op && current_screen == selection.screen
1256 && ((R->selection.beg.row >= row && R->selection.beg.row <= row + num) 1237 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1257 || (R->selection.end.row >= row 1238 || (selection.end.row >= row
1258 && R->selection.end.row <= row + num))) 1239 && selection.end.row <= row + num)))
1259 CLEAR_SELECTION(R); 1240 CLEAR_SELECTION ();
1260 if (row >= R->TermWin.nrow) /* Out Of Bounds */ 1241 if (row >= TermWin.nrow) /* Out Of Bounds */
1261 return; 1242 return;
1262 MIN_IT(num, (R->TermWin.nrow - row)); 1243 MIN_IT(num, (TermWin.nrow - row));
1263 if (R->rstyle & (RS_RVid | RS_Uline)) 1244 if (rstyle & (RS_RVid | RS_Uline))
1264 ren = (rend_t) ~RS_None; 1245 ren = (rend_t) ~RS_None;
1265 else if (GET_BASEBG(R->rstyle) == Color_bg) { 1246 else if (GET_BASEBG(rstyle) == Color_bg) {
1266 ren = DEFAULT_RSTYLE; 1247 ren = DEFAULT_RSTYLE;
1267 CLEAR_ROWS(row, num); 1248 CLEAR_ROWS(row, num);
1268 } else { 1249 } else {
1269 ren = (R->rstyle & (RS_fgMask | RS_bgMask)); 1250 ren = (rstyle & (RS_fgMask | RS_bgMask));
1270 gcvalue.foreground = R->PixColors[GET_BGCOLOR(R->rstyle)]; 1251 gcvalue.foreground = PixColors[GET_BGCOLOR(rstyle)];
1271 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1252 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1272 ERASE_ROWS(row, num); 1253 ERASE_ROWS(row, num);
1273 gcvalue.foreground = R->PixColors[Color_fg]; 1254 gcvalue.foreground = PixColors[Color_fg];
1274 XChangeGC(R->Xdisplay, R->TermWin.gc, GCForeground, &gcvalue); 1255 XChangeGC(Xdisplay, TermWin.gc, GCForeground, &gcvalue);
1275 } 1256 }
1276 for (; num--; row++) { 1257 for (; num--; row++) {
1277 R->scr_blank_screen_mem (R->screen.text, R->screen.rend, 1258 scr_blank_screen_mem (screen.text, screen.rend,
1278 (unsigned int)(row + row_offset), R->rstyle); 1259 (unsigned int)(row + row_offset), rstyle);
1279 R->screen.tlen[row + row_offset] = 0; 1260 screen.tlen[row + row_offset] = 0;
1280 R->scr_blank_line (R->drawn_text[row], R->drawn_rend[row], 1261 scr_blank_line (drawn_text[row], drawn_rend[row],
1281 (unsigned int)R->TermWin.ncol, ren); 1262 (unsigned int)TermWin.ncol, ren);
1282 } 1263 }
1283} 1264}
1284 1265
1285/* ------------------------------------------------------------------------- */ 1266/* ------------------------------------------------------------------------- */
1286/* 1267/*
1287 * Fill the screen with `E's 1268 * Fill the screen with `E's
1288 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1269 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1289 */ 1270 */
1290/* EXTPROTO */
1291void 1271void
1292rxvt_scr_E(pR) 1272rxvt_term::scr_E ()
1293{ 1273{
1294 int i, j, k; 1274 int i, j, k;
1295 rend_t *r1, fs; 1275 rend_t *r1, fs;
1296 1276
1297 R->want_refresh = 1; 1277 want_refresh = 1;
1298 R->num_scr_allow = 0; 1278 num_scr_allow = 0;
1299 ZERO_SCROLLBACK(R); 1279 ZERO_SCROLLBACK();
1300 rxvt_selection_check(aR_ 3); 1280 selection_check (3);
1301 1281
1302 fs = SET_FONT (R->rstyle, R->TermWin.fontset->find_font ('E')); 1282 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E'));
1303 for (k = R->TermWin.saveLines, i = R->TermWin.nrow; i--; k++) { 1283 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) {
1304 R->screen.tlen[k] = R->TermWin.ncol; /* make the `E's selectable */ 1284 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1305 fill_text (R->screen.text[k], 'E', R->TermWin.ncol); 1285 fill_text (screen.text[k], 'E', TermWin.ncol);
1306 for (r1 = R->screen.rend[k], j = R->TermWin.ncol; j--; ) 1286 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
1307 *r1++ = fs; 1287 *r1++ = fs;
1308 } 1288 }
1309} 1289}
1310 1290
1311/* ------------------------------------------------------------------------- */ 1291/* ------------------------------------------------------------------------- */
1312/* 1292/*
1313 * Insert/Delete <count> lines 1293 * Insert/Delete <count> lines
1314 */ 1294 */
1315/* EXTPROTO */
1316void 1295void
1317rxvt_scr_insdel_lines(pR_ int count, int insdel) 1296rxvt_term::scr_insdel_lines (int count, int insdel)
1318{ 1297{
1319 int end; 1298 int end;
1320 1299
1321 ZERO_SCROLLBACK(R); 1300 ZERO_SCROLLBACK();
1322 1301
1323#ifdef RXVT_GRAPHICS 1302#ifdef RXVT_GRAPHICS
1324 if (rxvt_Gr_Displayed(aR)) 1303 if (Gr_Displayed ())
1325 rxvt_Gr_scroll(aR_ 0); 1304 Gr_scroll (0);
1326#endif 1305#endif
1327 1306
1328 rxvt_selection_check(aR_ 1); 1307 selection_check (1);
1329 1308
1330 if (R->screen.cur.row > R->screen.bscroll) 1309 if (screen.cur.row > screen.bscroll)
1331 return; 1310 return;
1332 1311
1333 end = R->screen.bscroll - R->screen.cur.row + 1; 1312 end = screen.bscroll - screen.cur.row + 1;
1334 if (count > end) { 1313 if (count > end) {
1335 if (insdel == DELETE) 1314 if (insdel == DELETE)
1336 return; 1315 return;
1337 else if (insdel == INSERT) 1316 else if (insdel == INSERT)
1338 count = end; 1317 count = end;
1339 } 1318 }
1340 R->screen.flags &= ~Screen_WrapNext; 1319 screen.flags &= ~Screen_WrapNext;
1341 1320
1342 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);
1343} 1322}
1344 1323
1345/* ------------------------------------------------------------------------- */ 1324/* ------------------------------------------------------------------------- */
1346/* 1325/*
1347 * Insert/Delete <count> characters from the current position 1326 * Insert/Delete <count> characters from the current position
1348 */ 1327 */
1349/* EXTPROTO */
1350void 1328void
1351rxvt_scr_insdel_chars(pR_ int count, int insdel) 1329rxvt_term::scr_insdel_chars (int count, int insdel)
1352{ 1330{
1353 int col, row; 1331 int col, row;
1354 rend_t tr; 1332 rend_t tr;
1355 text_t *stp; 1333 text_t *stp;
1356 rend_t *srp; 1334 rend_t *srp;
1357 int16_t *slp; 1335 int16_t *slp;
1358 1336
1359 R->want_refresh = 1; 1337 want_refresh = 1;
1360 ZERO_SCROLLBACK(R); 1338 ZERO_SCROLLBACK();
1361 1339
1362#ifdef RXVT_GRAPHICS 1340#ifdef RXVT_GRAPHICS
1363 if (rxvt_Gr_Displayed(aR)) 1341 if (Gr_Displayed ())
1364 rxvt_Gr_scroll(aR_ 0); 1342 Gr_scroll (0);
1365#endif 1343#endif
1366 1344
1367 if (count <= 0) 1345 if (count <= 0)
1368 return; 1346 return;
1369 1347
1370 rxvt_selection_check(aR_ 1); 1348 selection_check (1);
1371 MIN_IT(count, (R->TermWin.ncol - R->screen.cur.col)); 1349 MIN_IT(count, (TermWin.ncol - screen.cur.col));
1372 1350
1373 row = R->screen.cur.row + R->TermWin.saveLines; 1351 row = screen.cur.row + TermWin.saveLines;
1374 R->screen.flags &= ~Screen_WrapNext; 1352 screen.flags &= ~Screen_WrapNext;
1375 1353
1376 stp = R->screen.text[row]; 1354 stp = screen.text[row];
1377 srp = R->screen.rend[row]; 1355 srp = screen.rend[row];
1378 slp = &(R->screen.tlen[row]); 1356 slp = &(screen.tlen[row]);
1379 switch (insdel) { 1357 switch (insdel) {
1380 case INSERT: 1358 case INSERT:
1381 for (col = R->TermWin.ncol - 1; (col - count) >= R->screen.cur.col; 1359 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col;
1382 col--) { 1360 col--) {
1383 stp[col] = stp[col - count]; 1361 stp[col] = stp[col - count];
1384 srp[col] = srp[col - count]; 1362 srp[col] = srp[col - count];
1385 } 1363 }
1386 if (*slp != -1) { 1364 if (*slp != -1) {
1387 *slp += count; 1365 *slp += count;
1388 MIN_IT(*slp, R->TermWin.ncol); 1366 MIN_IT(*slp, TermWin.ncol);
1389 } 1367 }
1390 if (R->selection.op && R->current_screen == R->selection.screen 1368 if (selection.op && current_screen == selection.screen
1391 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1369 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) {
1392 if (R->selection.end.row != R->screen.cur.row 1370 if (selection.end.row != screen.cur.row
1393 || (R->selection.end.col + count >= R->TermWin.ncol)) 1371 || (selection.end.col + count >= TermWin.ncol))
1394 CLEAR_SELECTION(R); 1372 CLEAR_SELECTION();
1395 else { /* shift selection */ 1373 else { /* shift selection */
1396 R->selection.beg.col += count; 1374 selection.beg.col += count;
1397 R->selection.mark.col += count; /* XXX: yes? */ 1375 selection.mark.col += count; /* XXX: yes? */
1398 R->selection.end.col += count; 1376 selection.end.col += count;
1399 } 1377 }
1400 } 1378 }
1401 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]),
1402 (unsigned int)count, R->rstyle); 1380 (unsigned int)count, rstyle);
1403 break; 1381 break;
1404 case ERASE: 1382 case ERASE:
1405 R->screen.cur.col += count; /* don't worry if > R->TermWin.ncol */ 1383 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1406 rxvt_selection_check(aR_ 1); 1384 selection_check (1);
1407 R->screen.cur.col -= count; 1385 screen.cur.col -= count;
1408 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]),
1409 (unsigned int)count, R->rstyle); 1387 (unsigned int)count, rstyle);
1410 break; 1388 break;
1411 case DELETE: 1389 case DELETE:
1412 tr = srp[R->TermWin.ncol - 1] 1390 tr = srp[TermWin.ncol - 1]
1413 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1391 & (RS_fgMask | RS_bgMask | RS_baseattrMask);
1414 for (col = R->screen.cur.col; (col + count) < R->TermWin.ncol; col++) { 1392 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) {
1415 stp[col] = stp[col + count]; 1393 stp[col] = stp[col + count];
1416 srp[col] = srp[col + count]; 1394 srp[col] = srp[col + count];
1417 } 1395 }
1418 R->scr_blank_line (&(stp[R->TermWin.ncol - count]), 1396 scr_blank_line (&(stp[TermWin.ncol - count]),
1419 &(srp[R->TermWin.ncol - count]), 1397 &(srp[TermWin.ncol - count]),
1420 (unsigned int)count, tr); 1398 (unsigned int)count, tr);
1421 if (*slp == -1) /* break line continuation */ 1399 if (*slp == -1) /* break line continuation */
1422 *slp = R->TermWin.ncol; 1400 *slp = TermWin.ncol;
1423 *slp -= count; 1401 *slp -= count;
1424 MAX_IT(*slp, 0); 1402 MAX_IT(*slp, 0);
1425 if (R->selection.op && R->current_screen == R->selection.screen 1403 if (selection.op && current_screen == selection.screen
1426 && ROWCOL_IN_ROW_AT_OR_AFTER(R->selection.beg, R->screen.cur)) { 1404 && ROWCOL_IN_ROW_AT_OR_AFTER(selection.beg, screen.cur)) {
1427 if (R->selection.end.row != R->screen.cur.row 1405 if (selection.end.row != screen.cur.row
1428 || (R->screen.cur.col >= R->selection.beg.col - count) 1406 || (screen.cur.col >= selection.beg.col - count)
1429 || R->selection.end.col >= R->TermWin.ncol) 1407 || selection.end.col >= TermWin.ncol)
1430 CLEAR_SELECTION(R); 1408 CLEAR_SELECTION();
1431 else { 1409 else {
1432 /* shift selection */ 1410 /* shift selection */
1433 R->selection.beg.col -= count; 1411 selection.beg.col -= count;
1434 R->selection.mark.col -= count; /* XXX: yes? */ 1412 selection.mark.col -= count; /* XXX: yes? */
1435 R->selection.end.col -= count; 1413 selection.end.col -= count;
1436 } 1414 }
1437 } 1415 }
1438 break; 1416 break;
1439 } 1417 }
1440} 1418}
… …
1442/* ------------------------------------------------------------------------- */ 1420/* ------------------------------------------------------------------------- */
1443/* 1421/*
1444 * Set the scrolling region 1422 * Set the scrolling region
1445 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1423 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1446 */ 1424 */
1447/* EXTPROTO */
1448void 1425void
1449rxvt_scr_scroll_region(pR_ int top, int bot) 1426rxvt_term::scr_scroll_region (int top, int bot)
1450{ 1427{
1451 MAX_IT(top, 0); 1428 MAX_IT(top, 0);
1452 MIN_IT(bot, (int)R->TermWin.nrow - 1); 1429 MIN_IT(bot, (int)TermWin.nrow - 1);
1453 if (top > bot) 1430 if (top > bot)
1454 return; 1431 return;
1455 R->screen.tscroll = top; 1432 screen.tscroll = top;
1456 R->screen.bscroll = bot; 1433 screen.bscroll = bot;
1457 rxvt_scr_gotorc(aR_ 0, 0, 0); 1434 scr_gotorc (0, 0, 0);
1458} 1435}
1459 1436
1460/* ------------------------------------------------------------------------- */ 1437/* ------------------------------------------------------------------------- */
1461/* 1438/*
1462 * Make the cursor visible/invisible 1439 * Make the cursor visible/invisible
1463 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1440 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1464 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1441 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1465 */ 1442 */
1466/* EXTPROTO */
1467void 1443void
1468rxvt_scr_cursor_visible(pR_ int mode) 1444rxvt_term::scr_cursor_visible (int mode)
1469{ 1445{
1470 R->want_refresh = 1; 1446 want_refresh = 1;
1471 if (mode) 1447 if (mode)
1472 R->screen.flags |= Screen_VisibleCursor; 1448 screen.flags |= Screen_VisibleCursor;
1473 else 1449 else
1474 R->screen.flags &= ~Screen_VisibleCursor; 1450 screen.flags &= ~Screen_VisibleCursor;
1475} 1451}
1476 1452
1477/* ------------------------------------------------------------------------- */ 1453/* ------------------------------------------------------------------------- */
1478/* 1454/*
1479 * Set/unset automatic wrapping 1455 * Set/unset automatic wrapping
1480 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1456 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1481 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1457 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1482 */ 1458 */
1483/* EXTPROTO */
1484void 1459void
1485rxvt_scr_autowrap(pR_ int mode) 1460rxvt_term::scr_autowrap (int mode)
1486{ 1461{
1487 if (mode) 1462 if (mode)
1488 R->screen.flags |= Screen_Autowrap; 1463 screen.flags |= Screen_Autowrap;
1489 else 1464 else
1490 R->screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1465 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1491} 1466}
1492 1467
1493/* ------------------------------------------------------------------------- */ 1468/* ------------------------------------------------------------------------- */
1494/* 1469/*
1495 * Set/unset margin origin mode 1470 * Set/unset margin origin mode
… …
1498 * 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
1499 * and the cursor cannot be moved outside. 1474 * and the cursor cannot be moved outside.
1500 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1475 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1501 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1476 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1502 */ 1477 */
1503/* EXTPROTO */
1504void 1478void
1505rxvt_scr_relative_origin(pR_ int mode) 1479rxvt_term::scr_relative_origin (int mode)
1506{ 1480{
1507 if (mode) 1481 if (mode)
1508 R->screen.flags |= Screen_Relative; 1482 screen.flags |= Screen_Relative;
1509 else 1483 else
1510 R->screen.flags &= ~Screen_Relative; 1484 screen.flags &= ~Screen_Relative;
1511 rxvt_scr_gotorc(aR_ 0, 0, 0); 1485 scr_gotorc (0, 0, 0);
1512} 1486}
1513 1487
1514/* ------------------------------------------------------------------------- */ 1488/* ------------------------------------------------------------------------- */
1515/* 1489/*
1516 * Set insert/replace mode 1490 * Set insert/replace mode
1517 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1491 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1518 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1492 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1519 */ 1493 */
1520/* EXTPROTO */
1521void 1494void
1522rxvt_scr_insert_mode(pR_ int mode) 1495rxvt_term::scr_insert_mode (int mode)
1523{ 1496{
1524 if (mode) 1497 if (mode)
1525 R->screen.flags |= Screen_Insert; 1498 screen.flags |= Screen_Insert;
1526 else 1499 else
1527 R->screen.flags &= ~Screen_Insert; 1500 screen.flags &= ~Screen_Insert;
1528} 1501}
1529 1502
1530/* ------------------------------------------------------------------------- */ 1503/* ------------------------------------------------------------------------- */
1531/* 1504/*
1532 * Set/Unset tabs 1505 * Set/Unset tabs
1533 * XTERM_SEQ: Set tab at current column : ESC H 1506 * XTERM_SEQ: Set tab at current column : ESC H
1534 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1507 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1535 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1508 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1536 */ 1509 */
1537/* EXTPROTO */
1538void 1510void
1539rxvt_scr_set_tab(pR_ int mode) 1511rxvt_term::scr_set_tab (int mode)
1540{ 1512{
1541 if (mode < 0) 1513 if (mode < 0)
1542 MEMSET(R->tabs, 0, R->TermWin.ncol * sizeof(char)); 1514 MEMSET(tabs, 0, TermWin.ncol * sizeof(char));
1543 else if (R->screen.cur.col < R->TermWin.ncol) 1515 else if (screen.cur.col < TermWin.ncol)
1544 R->tabs[R->screen.cur.col] = (mode ? 1 : 0); 1516 tabs[screen.cur.col] = (mode ? 1 : 0);
1545} 1517}
1546 1518
1547/* ------------------------------------------------------------------------- */ 1519/* ------------------------------------------------------------------------- */
1548/* 1520/*
1549 * Set reverse/normal video 1521 * Set reverse/normal video
1550 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1522 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1551 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1523 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1552 */ 1524 */
1553/* EXTPROTO */
1554void 1525void
1555rxvt_scr_rvideo_mode(pR_ int mode) 1526rxvt_term::scr_rvideo_mode (int mode)
1556{ 1527{
1557 XGCValues gcvalue; 1528 XGCValues gcvalue;
1558 1529
1559 if (R->rvideo != mode) { 1530 if (rvideo != mode) {
1560 R->rvideo = mode; 1531 rvideo = mode;
1561 SWAP_IT(R->PixColors[Color_fg], R->PixColors[Color_bg], rxvt_color); 1532 SWAP_IT(PixColors[Color_fg], PixColors[Color_bg], rxvt_color);
1562#if defined(XPM_BACKGROUND) 1533#if defined(XPM_BACKGROUND)
1563 if (R->bgPixmap.pixmap == None) 1534 if (bgPixmap.pixmap == None)
1564#endif 1535#endif
1565#if defined(TRANSPARENT) 1536#if defined(TRANSPARENT)
1566 if (!(R->Options & Opt_transparent) || R->am_transparent == 0) 1537 if (!(Options & Opt_transparent) || am_transparent == 0)
1567#endif 1538#endif
1568 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 1539 XSetWindowBackground(Xdisplay, TermWin.vt,
1569 R->PixColors[Color_bg]); 1540 PixColors[Color_bg]);
1570 1541
1571 gcvalue.foreground = R->PixColors[Color_fg]; 1542 gcvalue.foreground = PixColors[Color_fg];
1572 gcvalue.background = R->PixColors[Color_bg]; 1543 gcvalue.background = PixColors[Color_bg];
1573 XChangeGC(R->Xdisplay, R->TermWin.gc, GCBackground | GCForeground, 1544 XChangeGC(Xdisplay, TermWin.gc, GCBackground | GCForeground,
1574 &gcvalue); 1545 &gcvalue);
1575 rxvt_scr_clear(aR); 1546 scr_clear ();
1576 rxvt_scr_touch(aR_ True); 1547 scr_touch (true);
1577 } 1548 }
1578} 1549}
1579 1550
1580/* ------------------------------------------------------------------------- */ 1551/* ------------------------------------------------------------------------- */
1581/* 1552/*
1582 * Report current cursor position 1553 * Report current cursor position
1583 * XTERM_SEQ: Report position: ESC [ 6 n 1554 * XTERM_SEQ: Report position: ESC [ 6 n
1584 */ 1555 */
1585/* EXTPROTO */
1586void 1556void
1587rxvt_scr_report_position(pR) 1557rxvt_term::scr_report_position ()
1588{ 1558{
1589 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);
1590} 1560}
1591 1561
1592/* ------------------------------------------------------------------------- * 1562/* ------------------------------------------------------------------------- *
1593 * FONTS * 1563 * FONTS *
1594 * ------------------------------------------------------------------------- */ 1564 * ------------------------------------------------------------------------- */
1595 1565
1596/* 1566/*
1597 * Set font style 1567 * Set font style
1598 */ 1568 */
1599/* INTPROTO */
1600void 1569void
1601rxvt_set_font_style(pR) 1570rxvt_term::set_font_style ()
1602{ 1571{
1603 switch (R->charsets[R->screen.charset]) { 1572 switch (charsets[screen.charset]) {
1604 case '0': /* DEC Special Character & Line Drawing Set */ 1573 case '0': /* DEC Special Character & Line Drawing Set */
1605 break; 1574 break;
1606 case 'A': /* United Kingdom (UK) */ 1575 case 'A': /* United Kingdom (UK) */
1607 break; 1576 break;
1608 case 'B': /* United States (USASCII) */ 1577 case 'B': /* United States (USASCII) */
… …
1624 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1593 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1625 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1594 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1626 * XTERM_SEQ: Invoke G2 character set: ESC N 1595 * XTERM_SEQ: Invoke G2 character set: ESC N
1627 * XTERM_SEQ: Invoke G3 character set: ESC O 1596 * XTERM_SEQ: Invoke G3 character set: ESC O
1628 */ 1597 */
1629/* EXTPROTO */
1630void 1598void
1631rxvt_scr_charset_choose(pR_ int set) 1599rxvt_term::scr_charset_choose (int set)
1632{ 1600{
1633 R->screen.charset = set; 1601 screen.charset = set;
1634 rxvt_set_font_style(aR); 1602 set_font_style ();
1635} 1603}
1636 1604
1637/* ------------------------------------------------------------------------- */ 1605/* ------------------------------------------------------------------------- */
1638/* 1606/*
1639 * Set a font 1607 * Set a font
… …
1641 * XTERM_SEQ: Set G1 character set: ESC ) <C> 1609 * XTERM_SEQ: Set G1 character set: ESC ) <C>
1642 * XTERM_SEQ: Set G2 character set: ESC * <C> 1610 * XTERM_SEQ: Set G2 character set: ESC * <C>
1643 * XTERM_SEQ: Set G3 character set: ESC + <C> 1611 * XTERM_SEQ: Set G3 character set: ESC + <C>
1644 * See set_font_style for possible values for <C> 1612 * See set_font_style for possible values for <C>
1645 */ 1613 */
1646/* EXTPROTO */
1647void 1614void
1648rxvt_scr_charset_set(pR_ int set, unsigned int ch) 1615rxvt_term::scr_charset_set (int set, unsigned int ch)
1649{ 1616{
1650 R->charsets[set] = (unsigned char)ch; 1617 charsets[set] = (unsigned char)ch;
1651 rxvt_set_font_style(aR); 1618 set_font_style ();
1652} 1619}
1653 1620
1654
1655/* ------------------------------------------------------------------------- *
1656 * GRAPHICS COLOURS *
1657 * ------------------------------------------------------------------------- */
1658
1659#ifdef RXVT_GRAPHICS
1660/* EXTPROTO */
1661int
1662rxvt_scr_get_fgcolor(pR)
1663{
1664 return GET_FGCOLOR(R->rstyle);
1665}
1666
1667/* ------------------------------------------------------------------------- */
1668/* EXTPROTO */
1669int
1670rxvt_scr_get_bgcolor(pR)
1671{
1672 return GET_BGCOLOR(R->rstyle);
1673}
1674#endif
1675 1621
1676/* ------------------------------------------------------------------------- * 1622/* ------------------------------------------------------------------------- *
1677 * MAJOR SCREEN MANIPULATION * 1623 * MAJOR SCREEN MANIPULATION *
1678 * ------------------------------------------------------------------------- */ 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}
1679 1649
1680/* 1650/*
1681 * Refresh an area 1651 * Refresh an area
1682 */ 1652 */
1683enum { 1653enum {
1684 PART_BEG = 0, 1654 PART_BEG = 0,
1685 PART_END, 1655 PART_END,
1686 RC_COUNT 1656 RC_COUNT
1687}; 1657};
1688 1658
1689/* EXTPROTO */
1690void 1659void
1691rxvt_scr_expose(pR_ int x, int y, int width, int height, Bool refresh) 1660rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh)
1692{ 1661{
1693 int i; 1662 int i;
1694 row_col_t rc[RC_COUNT]; 1663 row_col_t rc[RC_COUNT];
1695 1664
1696 if (R->drawn_text == NULL) /* sanity check */ 1665 if (drawn_text == NULL) /* sanity check */
1697 return; 1666 return;
1698 1667
1699#ifdef DEBUG_STRICT 1668#ifdef DEBUG_STRICT
1700 x = max(x, (int)R->TermWin.int_bwidth); 1669 x = max(x, (int)TermWin.int_bwidth);
1701 x = min(x, (int)R->TermWin.width); 1670 x = min(x, (int)TermWin.width);
1702 y = max(y, (int)R->TermWin.int_bwidth); 1671 y = max(y, (int)TermWin.int_bwidth);
1703 y = min(y, (int)R->TermWin.height); 1672 y = min(y, (int)TermWin.height);
1704#endif 1673#endif
1705 1674
1706/* round down */ 1675/* round down */
1707 rc[PART_BEG].col = Pixel2Col(x); 1676 rc[PART_BEG].col = Pixel2Col(x);
1708 rc[PART_BEG].row = Pixel2Row(y); 1677 rc[PART_BEG].row = Pixel2Row(y);
1709/* round up */ 1678/* round up */
1710 rc[PART_END].col = Pixel2Width(x + width + R->TermWin.fwidth - 1); 1679 rc[PART_END].col = Pixel2Width(x + width + TermWin.fwidth - 1);
1711 rc[PART_END].row = Pixel2Row(y + height + R->TermWin.fheight - 1); 1680 rc[PART_END].row = Pixel2Row(y + height + TermWin.fheight - 1);
1712 1681
1713/* sanity checks */ 1682/* sanity checks */
1714 for (i = PART_BEG; i < RC_COUNT; i++) { 1683 for (i = PART_BEG; i < RC_COUNT; i++)
1684 {
1715 MIN_IT(rc[i].col, R->TermWin.ncol - 1); 1685 MIN_IT(rc[i].col, TermWin.ncol - 1);
1716 MIN_IT(rc[i].row, R->TermWin.nrow - 1); 1686 MIN_IT(rc[i].row, TermWin.nrow - 1);
1717 } 1687 }
1718 1688
1719 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); 1689 D_SCREEN((stderr, "rxvt_scr_expose(x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)-(c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1720 1690
1721 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1691 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1722 fill_text (&(R->drawn_text[i][rc[PART_BEG].col]), 0, 1692 fill_text (&(drawn_text[i][rc[PART_BEG].col]), 0,
1723 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1693 (rc[PART_END].col - rc[PART_BEG].col + 1));
1724 1694
1725 if (refresh) 1695 if (refresh)
1726 rxvt_scr_refresh(aR_ SLOW_REFRESH | REFRESH_BOUNDS); 1696 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
1727} 1697}
1728 1698
1729/* ------------------------------------------------------------------------- */ 1699/* ------------------------------------------------------------------------- */
1730/* 1700/*
1731 * Refresh the entire screen 1701 * Refresh the entire screen
1732 */ 1702 */
1733/* EXTPROTO */
1734void 1703void
1735rxvt_scr_touch(pR_ Bool refresh) 1704rxvt_term::scr_touch (bool refresh)
1736{ 1705{
1737 rxvt_scr_expose(aR_ 0, 0, R->TermWin.width, R->TermWin.height, refresh); 1706 scr_expose (0, 0, TermWin.width, TermWin.height, refresh);
1738} 1707}
1739 1708
1740/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1741/* 1710/*
1742 * 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
1743 * the top of the screen 1712 * the top of the screen
1744 */ 1713 */
1745/* EXTPROTO */
1746int 1714int
1747rxvt_scr_move_to(pR_ int y, int len) 1715rxvt_term::scr_move_to (int y, int len)
1748{ 1716{
1749 long p = 0; 1717 long p = 0;
1750 uint16_t oldviewstart; 1718 uint16_t oldviewstart;
1751 1719
1752 oldviewstart = R->TermWin.view_start; 1720 oldviewstart = TermWin.view_start;
1753 if (y < len) { 1721 if (y < len) {
1754 p = (R->TermWin.nrow + R->TermWin.nscrolled) * (len - y) / len; 1722 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1755 p -= (long)(R->TermWin.nrow - 1); 1723 p -= (long)(TermWin.nrow - 1);
1756 p = max(p, 0); 1724 p = max(p, 0);
1757 } 1725 }
1758 R->TermWin.view_start = (uint16_t)min(p, R->TermWin.nscrolled); 1726 TermWin.view_start = (uint16_t)min(p, TermWin.nscrolled);
1759 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));
1760 1728
1761 return rxvt_scr_changeview(aR_ oldviewstart); 1729 return scr_changeview (oldviewstart);
1762} 1730}
1763 1731
1764/* ------------------------------------------------------------------------- */ 1732/* ------------------------------------------------------------------------- */
1765/* 1733/*
1766 * Page the screen up/down nlines 1734 * Page the screen up/down nlines
1767 * direction should be UP or DN 1735 * direction should be UP or DN
1768 */ 1736 */
1769/* EXTPROTO */
1770int 1737int
1771rxvt_scr_page(pR_ enum page_dirn direction, int nlines) 1738rxvt_term::scr_page (enum page_dirn direction, int nlines)
1772{ 1739{
1773 int n; 1740 int n;
1774 uint16_t oldviewstart; 1741 uint16_t oldviewstart;
1775 1742
1776 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));
1777#ifdef DEBUG_STRICT 1744#ifdef DEBUG_STRICT
1778 assert((nlines >= 0) && (nlines <= R->TermWin.nrow)); 1745 assert((nlines >= 0) && (nlines <= TermWin.nrow));
1779#endif 1746#endif
1780 oldviewstart = R->TermWin.view_start; 1747 oldviewstart = TermWin.view_start;
1781 if (direction == UP) { 1748 if (direction == UP) {
1782 n = R->TermWin.view_start + nlines; 1749 n = TermWin.view_start + nlines;
1783 R->TermWin.view_start = min(n, R->TermWin.nscrolled); 1750 TermWin.view_start = min(n, TermWin.nscrolled);
1784 } else { 1751 } else {
1785 n = R->TermWin.view_start - nlines; 1752 n = TermWin.view_start - nlines;
1786 R->TermWin.view_start = max(n, 0); 1753 TermWin.view_start = max(n, 0);
1787 } 1754 }
1788 return rxvt_scr_changeview(aR_ oldviewstart); 1755 return scr_changeview (oldviewstart);
1789} 1756}
1790 1757
1791/* INTPROTO */
1792int 1758int
1793rxvt_scr_changeview(pR_ uint16_t oldviewstart) 1759rxvt_term::scr_changeview (uint16_t oldviewstart)
1794{ 1760{
1795 if (R->TermWin.view_start != oldviewstart) { 1761 if (TermWin.view_start != oldviewstart) {
1796 R->want_refresh = 1; 1762 want_refresh = 1;
1797#ifdef RXVT_GRAPHICS 1763#ifdef RXVT_GRAPHICS
1798 if (rxvt_Gr_Displayed(aR)) 1764 if (Gr_Displayed ())
1799 rxvt_Gr_scroll(aR_ 0); 1765 Gr_scroll (0);
1800#endif 1766#endif
1801 R->num_scr -= (R->TermWin.view_start - oldviewstart); 1767 num_scr -= (TermWin.view_start - oldviewstart);
1802 } 1768 }
1803 return (int)(R->TermWin.view_start - oldviewstart); 1769 return (int)(TermWin.view_start - oldviewstart);
1804} 1770}
1805 1771
1806/* ------------------------------------------------------------------------- */ 1772/* ------------------------------------------------------------------------- */
1807/* EXTPROTO */
1808void 1773void
1809rxvt_scr_bell(pR) 1774rxvt_term::scr_bell ()
1810{ 1775{
1811#ifndef NO_BELL 1776#ifndef NO_BELL
1812# ifndef NO_MAPALERT 1777# ifndef NO_MAPALERT
1813# ifdef MAPALERT_OPTION 1778# ifdef MAPALERT_OPTION
1814 if (R->Options & Opt_mapAlert) 1779 if (Options & Opt_mapAlert)
1815# endif 1780# endif
1816 XMapWindow(R->Xdisplay, R->TermWin.parent[0]); 1781 XMapWindow(Xdisplay, TermWin.parent[0]);
1817# endif 1782# endif
1818 if (R->Options & Opt_visualBell) { 1783 if (Options & Opt_visualBell) {
1819 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1784 scr_rvideo_mode (!rvideo); /* refresh also done */
1820 rxvt_scr_rvideo_mode(aR_ !R->rvideo); /* refresh also done */ 1785 scr_rvideo_mode (!rvideo); /* refresh also done */
1821 } else 1786 } else
1822 XBell(R->Xdisplay, 0); 1787 XBell(Xdisplay, 0);
1823#endif 1788#endif
1824} 1789}
1825 1790
1826/* ------------------------------------------------------------------------- */ 1791/* ------------------------------------------------------------------------- */
1827/* ARGSUSED */ 1792/* ARGSUSED */
1828/* EXTPROTO */
1829void 1793void
1830rxvt_scr_printscreen(pR_ int fullhist) 1794rxvt_term::scr_printscreen (int fullhist)
1831{ 1795{
1832#ifdef PRINTPIPE 1796#ifdef PRINTPIPE
1833 int i, r1, nrows, row_offset; 1797 int i, r1, nrows, row_offset;
1834 text_t *t; 1798 text_t *t;
1835 FILE *fd; 1799 FILE *fd;
1836 1800
1837 if ((fd = rxvt_popen_printer(aR)) == NULL) 1801 if ((fd = popen_printer ()) == NULL)
1838 return; 1802 return;
1839 nrows = R->TermWin.nrow; 1803 nrows = TermWin.nrow;
1840 row_offset = R->TermWin.saveLines; 1804 row_offset = TermWin.saveLines;
1841 if (!fullhist) 1805 if (!fullhist)
1842 row_offset -= R->TermWin.view_start; 1806 row_offset -= TermWin.view_start;
1843 else { 1807 else {
1844 nrows += R->TermWin.nscrolled; 1808 nrows += TermWin.nscrolled;
1845 row_offset -= R->TermWin.nscrolled; 1809 row_offset -= TermWin.nscrolled;
1846 } 1810 }
1847 1811
1848 for (r1 = 0; r1 < nrows; r1++) { 1812 for (r1 = 0; r1 < nrows; r1++) {
1849 t = R->screen.text[r1 + row_offset]; 1813 t = screen.text[r1 + row_offset];
1850 for (i = R->TermWin.ncol - 1; i >= 0; i--) 1814 for (i = TermWin.ncol - 1; i >= 0; i--)
1851 if (!isspace(t[i])) 1815 if (!isspace(t[i]))
1852 break; 1816 break;
1853 fprintf(fd, "%.*s\n", (i + 1), t); 1817 fprintf(fd, "%.*s\n", (i + 1), t);
1854 } 1818 }
1855 rxvt_pclose_printer(fd); 1819 pclose_printer (fd);
1856#endif 1820#endif
1857} 1821}
1858 1822
1859/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1860/* 1824/*
1861 * Refresh the screen 1825 * Refresh the screen
1862 * 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.
1863 * 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.
1864 */ 1828 */
1865
1866#if defined (NO_BRIGHTCOLOR) || defined (VERYBOLD)
1867# define MONO_BOLD(x) ((x) & (RS_Bold|RS_Blink))
1868# define MONO_BOLD_FG(x, fg) MONO_BOLD(x)
1869#else
1870# define MONO_BOLD(x) \
1871 (((x) & (RS_Bold | RS_fgMask)) == (RS_Bold | Color_fg))
1872# define MONO_BOLD_FG(x, fg) (((x) & RS_Bold) && (fg) == Color_fg)
1873#endif
1874 1829
1875#define FONT_WIDTH(X, Y) \ 1830#define FONT_WIDTH(X, Y) \
1876 (X)->per_char[(Y) - (X)->min_char_or_byte2].width 1831 (X)->per_char[(Y) - (X)->min_char_or_byte2].width
1877#define FONT_RBEAR(X, Y) \ 1832#define FONT_RBEAR(X, Y) \
1878 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing 1833 (X)->per_char[(Y) - (X)->min_char_or_byte2].rbearing
1879#define FONT_LBEAR(X, Y) \ 1834#define FONT_LBEAR(X, Y) \
1880 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing 1835 (X)->per_char[(Y) - (X)->min_char_or_byte2].lbearing
1881#define IS_FONT_CHAR(X, Y) \ 1836#define IS_FONT_CHAR(X, Y) \
1882 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) 1837 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1883 1838
1884/* EXTPROTO */
1885void 1839void
1886rxvt_scr_refresh(pR_ unsigned char refresh_type) 1840rxvt_term::scr_refresh (unsigned char refresh_type)
1887{ 1841{
1888 unsigned char clearfirst, /* first character writes before cell */ 1842 unsigned char clearfirst, /* first character writes before cell */
1889 clearlast, /* last character writes beyond cell */ 1843 clearlast, /* last character writes beyond cell */
1890 must_clear, /* use draw_string not draw_image_string */ 1844 must_clear, /* use draw_string not draw_image_string */
1891#ifndef NO_BOLDFONT
1892 bfont, /* we've changed font to bold font */
1893#endif
1894 rvid, /* reverse video this position */ 1845 rvid, /* reverse video this position */
1895 wbyte, /* we're in multibyte */
1896 showcursor; /* show the cursor */ 1846 showcursor; /* show the cursor */
1897 int fore, back; /* desired foreground/background */
1898 int16_t col, row, /* column/row we're processing */ 1847 int16_t col, row, /* column/row we're processing */
1899 ocrow; /* old cursor row */ 1848 ocrow; /* old cursor row */
1900 int cursorwidth; 1849 int cursorwidth;
1901 int i, /* tmp */ 1850 int i, /* tmp */
1902 row_offset; /* basic offset in screen structure */ 1851 row_offset; /* basic offset in screen structure */
1903#ifndef NO_CURSORCOLOR 1852#ifndef NO_CURSORCOLOR
1904 rend_t cc1; /* store colours at cursor position(s) */ 1853 rend_t cc1; /* store colours at cursor position(s) */
1905 rend_t cc2; /* store colours at cursor position(s) */
1906#endif 1854#endif
1907 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 1855 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
1908 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 1856 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
1909 char *buffer; /* local copy of R->buffer */
1910 1857
1911 if (refresh_type == NO_REFRESH || !R->TermWin.mapped) 1858 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1912 return; 1859 return;
1913 1860
1914 /* 1861 /*
1915 * A: set up vars 1862 * A: set up vars
1916 */ 1863 */
1917 clearfirst = clearlast = must_clear = wbyte = 0; 1864 clearfirst = clearlast = must_clear = 0;
1918#ifndef NO_BOLDFONT
1919 bfont = 0;
1920#endif
1921 1865
1922 if (R->currmaxcol < R->TermWin.ncol)
1923 {
1924 R->currmaxcol = R->TermWin.ncol;
1925 R->buffer = (char *)rxvt_realloc (R->buffer,
1926 sizeof(char) * (R->currmaxcol + 1) * MB_CUR_MAX);
1927 }
1928
1929 buffer = R->buffer;
1930 R->refresh_count = 0; 1866 refresh_count = 0;
1931 1867
1932 row_offset = R->TermWin.saveLines - R->TermWin.view_start; 1868 row_offset = TermWin.saveLines - TermWin.view_start;
1933 1869
1934 if ((refresh_type & REFRESH_BOUNDS)) 1870 if ((refresh_type & REFRESH_BOUNDS))
1935 { 1871 {
1936 clearfirst = clearlast = 1; 1872 clearfirst = clearlast = 1;
1937 R->refresh_type &= ~REFRESH_BOUNDS; 1873 refresh_type &= ~REFRESH_BOUNDS;
1938 } 1874 }
1939 1875
1940#if defined(XPM_BACKGROUND) 1876#ifdef XPM_BACKGROUND
1941 must_clear |= (R->bgPixmap.pixmap != None); 1877 must_clear |= (bgPixmap.pixmap != None);
1942#endif 1878#endif
1943#if defined(TRANSPARENT) 1879#ifdef TRANSPARENT
1944 must_clear |= ((R->Options & Opt_transparent) && R->am_transparent); 1880 must_clear |= ((Options & Opt_transparent) && am_transparent);
1945#endif 1881#endif
1946 ocrow = R->oldcursor.row; /* is there an old outline cursor on screen? */ 1882 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1947 1883
1948/* 1884 /*
1949 * B: reverse any characters which are selected 1885 * B: reverse any characters which are selected
1950 */ 1886 */
1951 rxvt_scr_reverse_selection(aR); 1887 scr_reverse_selection ();
1952 1888
1953/* 1889 /*
1954 * C: set the cursor character(s) 1890 * C: set the cursor character(s)
1955 */ 1891 */
1956 { 1892 {
1957 unsigned char setoldcursor; 1893 unsigned char setoldcursor;
1958 rend_t ccol1, /* Cursor colour */ 1894 rend_t ccol1, /* Cursor colour */
1959 ccol2; /* Cursor colour2 */ 1895 ccol2; /* Cursor colour2 */
1960 1896
1961 showcursor = (R->screen.flags & Screen_VisibleCursor); 1897 showcursor = (screen.flags & Screen_VisibleCursor);
1962 cursorwidth = 0; 1898 cursorwidth = 0;
1963#ifdef CURSOR_BLINK 1899#ifdef CURSOR_BLINK
1964 if (R->hidden_cursor) 1900 if (hidden_cursor)
1965 showcursor = 0; 1901 showcursor = 0;
1966#endif 1902#endif
1967 1903
1968 cursorwidth = 0; 1904 cursorwidth = 0;
1969 1905
1970 if (showcursor) 1906 if (showcursor)
1971 { 1907 {
1972 cursorwidth++; 1908 cursorwidth++;
1973 1909
1974 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 1910 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
1975 [R->screen.cur.col]); 1911 [screen.cur.col]);
1976 1912
1977 if (showcursor && R->TermWin.focus) 1913 if (showcursor && TermWin.focus)
1978 { 1914 {
1979 *srp ^= RS_RVid; 1915 *srp ^= RS_RVid;
1980#ifndef NO_CURSORCOLOR 1916#ifndef NO_CURSORCOLOR
1981 cc1 = *srp & (RS_fgMask | RS_bgMask); 1917 cc1 = *srp & (RS_fgMask | RS_bgMask);
1982 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) 1918 if (ISSET_PIXCOLOR (Color_cursor))
1983 ccol1 = Color_cursor; 1919 ccol1 = Color_cursor;
1984 else 1920 else
1985#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1921#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1986 ccol1 = GET_FGCOLOR(R->rstyle); 1922 ccol1 = GET_FGCOLOR(rstyle);
1987#else 1923#else
1988 ccol1 = Color_fg; 1924 ccol1 = Color_fg;
1989#endif 1925#endif
1990 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor2)) 1926 if (ISSET_PIXCOLOR (Color_cursor2))
1991 ccol2 = Color_cursor2; 1927 ccol2 = Color_cursor2;
1992 else 1928 else
1993#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1929#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1994 ccol2 = GET_BGCOLOR(R->rstyle); 1930 ccol2 = GET_BGCOLOR(rstyle);
1995#else 1931#else
1996 ccol2 = Color_bg; 1932 ccol2 = Color_bg;
1997#endif 1933#endif
1998 *srp = SET_FGCOLOR(*srp, ccol1); 1934 *srp = SET_FGCOLOR(*srp, ccol1);
1999 *srp = SET_BGCOLOR(*srp, ccol2); 1935 *srp = SET_BGCOLOR(*srp, ccol2);
2000#endif 1936#endif
2001 } 1937 }
2002
2003 while (IS_WIDE (*srp))
2004 cursorwidth++, srp++;
2005 } 1938 }
2006 1939
2007 /* make sure no outline cursor is left around */ 1940 /* make sure no outline cursor is left around */
2008 setoldcursor = 0; 1941 setoldcursor = 0;
2009 if (ocrow != -1) { 1942 if (ocrow != -1) {
2010 if (R->screen.cur.row + R->TermWin.view_start != ocrow 1943 if (screen.cur.row + TermWin.view_start != ocrow
2011 || R->screen.cur.col != R->oldcursor.col) { 1944 || screen.cur.col != oldcursor.col) {
2012 if (ocrow < R->TermWin.nrow 1945 if (ocrow < TermWin.nrow
2013 && R->oldcursor.col < R->TermWin.ncol) { 1946 && oldcursor.col < TermWin.ncol) {
2014 R->drawn_rend[ocrow][R->oldcursor.col] ^= (RS_RVid | RS_Uline); 1947 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline);
2015 } 1948 }
2016 if (R->TermWin.focus || !showcursor) 1949 if (TermWin.focus || !showcursor)
2017 R->oldcursor.row = -1; 1950 oldcursor.row = -1;
2018 else 1951 else
2019 setoldcursor = 1; 1952 setoldcursor = 1;
2020 } 1953 }
2021 } else if (!R->TermWin.focus) 1954 } else if (!TermWin.focus)
2022 setoldcursor = 1; 1955 setoldcursor = 1;
2023 if (setoldcursor) { 1956 if (setoldcursor) {
2024 if (R->screen.cur.row + R->TermWin.view_start >= R->TermWin.nrow) 1957 if (screen.cur.row + TermWin.view_start >= TermWin.nrow)
2025 R->oldcursor.row = -1; 1958 oldcursor.row = -1;
2026 else { 1959 else {
2027 R->oldcursor.row = R->screen.cur.row + R->TermWin.view_start; 1960 oldcursor.row = screen.cur.row + TermWin.view_start;
2028 R->oldcursor.col = R->screen.cur.col; 1961 oldcursor.col = screen.cur.col;
2029 } 1962 }
2030 } 1963 }
2031 } 1964 }
2032 1965
2033#ifndef NO_SLOW_LINK_SUPPORT 1966#ifndef NO_SLOW_LINK_SUPPORT
2034/* 1967 /*
2035 * D: CopyArea pass - very useful for slower links 1968 * D: CopyArea pass - very useful for slower links
2036 * This has been deliberately kept simple. 1969 * This has been deliberately kept simple.
2037 */ 1970 */
2038 i = R->num_scr; 1971 i = num_scr;
2039 if (refresh_type == FAST_REFRESH && R->num_scr_allow && i 1972 if (refresh_type == FAST_REFRESH && num_scr_allow && i
2040 && abs(i) < R->TermWin.nrow && !must_clear) 1973 && abs(i) < TermWin.nrow && !must_clear)
2041 { 1974 {
2042 int16_t nits; 1975 int16_t nits;
2043 int j; 1976 int j;
2044 rend_t *drp2; 1977 rend_t *drp2;
2045 text_t *dtp2; 1978 text_t *dtp2;
2046 int len, wlen; 1979 int len, wlen;
2047 1980
2048 j = R->TermWin.nrow; 1981 j = TermWin.nrow;
2049 wlen = len = -1; 1982 wlen = len = -1;
2050 row = i > 0 ? 0 : j - 1; 1983 row = i > 0 ? 0 : j - 1;
2051 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 1984 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2052 { 1985 {
2053 if (row + i >= 0 && row + i < R->TermWin.nrow && row + i != ocrow) 1986 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2054 { 1987 {
2055 stp = R->screen.text[row + row_offset]; 1988 stp = screen.text[row + row_offset];
2056 srp = R->screen.rend[row + row_offset]; 1989 srp = screen.rend[row + row_offset];
2057 dtp = R->drawn_text[row]; 1990 dtp = drawn_text[row];
2058 dtp2 = R->drawn_text[row + i]; 1991 dtp2 = drawn_text[row + i];
2059 drp = R->drawn_rend[row]; 1992 drp = drawn_rend[row];
2060 drp2 = R->drawn_rend[row + i]; 1993 drp2 = drawn_rend[row + i];
2061 1994
2062 for (nits = 0, col = R->TermWin.ncol; col--; ) 1995 for (nits = 0, col = TermWin.ncol; col--; )
2063 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 1996 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2064 nits--; 1997 nits--;
2065 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 1998 else if (stp[col] != dtp[col] || srp[col] != drp[col])
2066 nits++; 1999 nits++;
2067 2000
2068 if (nits > 8) /* XXX: arbitrary choice */ 2001 if (nits > 8) /* XXX: arbitrary choice */
2069 { 2002 {
2070 for (col = R->TermWin.ncol; col--; ) 2003 for (col = TermWin.ncol; col--; )
2071 { 2004 {
2072 *dtp++ = *dtp2++; 2005 *dtp++ = *dtp2++;
2073 *drp++ = *drp2++; 2006 *drp++ = *drp2++;
2074 } 2007 }
2075 2008
… …
2084 if (len != -1) 2017 if (len != -1)
2085 { 2018 {
2086 /* also comes here at end if needed because of >= above */ 2019 /* also comes here at end if needed because of >= above */
2087 if (wlen < len) 2020 if (wlen < len)
2088 SWAP_IT(wlen, len, int); 2021 SWAP_IT(wlen, len, int);
2022
2089 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2023 D_SCREEN((stderr, "rxvt_scr_refresh(): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2090 XCopyArea(R->Xdisplay, R->TermWin.vt, R->TermWin.vt, 2024 XCopyArea (Xdisplay, TermWin.vt, TermWin.vt,
2091 R->TermWin.gc, 0, Row2Pixel(len + i), 2025 TermWin.gc, 0, Row2Pixel (len + i),
2092 (unsigned int)TermWin_TotalWidth(), 2026 (unsigned int)TermWin_TotalWidth (),
2093 (unsigned int)Height2Pixel(wlen - len + 1), 2027 (unsigned int)Height2Pixel (wlen - len + 1),
2094 0, Row2Pixel(len)); 2028 0, Row2Pixel (len));
2095 len = -1; 2029 len = -1;
2096 } 2030 }
2097 } 2031 }
2098 } 2032 }
2099#endif 2033#endif
2100 2034
2101/* 2035 /*
2102 * E: main pass across every character 2036 * E: main pass across every character
2103 */ 2037 */
2104 for (row = 0; row < R->TermWin.nrow; row++) 2038 for (row = 0; row < TermWin.nrow; row++)
2105 { 2039 {
2106 stp = R->screen.text[row + row_offset]; 2040 stp = screen.text[row + row_offset];
2107 srp = R->screen.rend[row + row_offset]; 2041 srp = screen.rend[row + row_offset];
2108 dtp = R->drawn_text[row]; 2042 dtp = drawn_text[row];
2109 drp = R->drawn_rend[row]; 2043 drp = drawn_rend[row];
2110 2044
2111/* 2045 /*
2112 * E2: OK, now the real pass 2046 * E2: OK, now the real pass
2113 */ 2047 */
2114 int ypixel = (int)Row2Pixel(row); 2048 int ypixel = (int)Row2Pixel(row);
2115 2049
2116 for (col = 0; col < R->TermWin.ncol; col++) 2050 for (col = 0; col < TermWin.ncol; col++)
2117 { 2051 {
2118 /* compare new text with old - if exactly the same then continue */ 2052 /* compare new text with old - if exactly the same then continue */
2119 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2053 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2120 2054
2121 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2055 if (stp[col] == dtp[col] /* Must match characters to skip. */
… …
2137 2071
2138 int xpixel = Col2Pixel(col); 2072 int xpixel = Col2Pixel(col);
2139 2073
2140 // this loop looks very messy, it can probably be optimized 2074 // this loop looks very messy, it can probably be optimized
2141 // and cleaned a bit by you? 2075 // and cleaned a bit by you?
2142 for (i = 0; ++col < R->TermWin.ncol; ) 2076 for (i = 0; ++col < TermWin.ncol; )
2143 { 2077 {
2144 if (stp[col] == NOCHAR) 2078 if (stp[col] == NOCHAR)
2145 { 2079 {
2146 dtp[col] = stp[col]; 2080 dtp[col] = stp[col];
2147 drp[col] = rend; 2081 drp[col] = rend;
… …
2151 i++; 2085 i++;
2152 2086
2153 continue; 2087 continue;
2154 } 2088 }
2155 2089
2156 if (((rend ^ srp[col]) & ~RS_wide) != 0) 2090 if (rend != srp[col])
2157 break; 2091 break;
2158 2092
2159 count++; 2093 count++;
2160 2094
2161 if (stp[col] != dtp[col] 2095 if (stp[col] != dtp[col]
… …
2173 } 2107 }
2174 2108
2175 col--; /* went one too far. move back */ 2109 col--; /* went one too far. move back */
2176 count -= i; /* dump any matching trailing chars */ 2110 count -= i; /* dump any matching trailing chars */
2177 2111
2178/* 2112 /*
2179 * Determine the attributes for the string 2113 * Determine the attributes for the string
2180 */ 2114 */
2181 int fid = GET_FONT(rend); 2115 int fid = GET_FONT (rend);
2182 fore = GET_FGCOLOR(rend); 2116 int fore = GET_FGCOLOR (rend); // desired foreground
2183 back = GET_BGCOLOR(rend); 2117 int back = GET_BGCOLOR (rend); // desired background
2118
2184 rend = GET_ATTR(rend); 2119 rend = GET_ATTR (rend);
2185 2120
2186 rvid = (rend & RS_RVid) ? 1 : 0; 2121 rvid = !!(rend & RS_RVid);
2187#ifdef OPTION_HC 2122#ifdef TEXT_BLINK
2188 if (!rvid && (rend & RS_Blink)) 2123 if (rend & RS_Blink)
2189 { 2124 {
2190 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_HC)) 2125 if (!text_blink_ev.active)
2191 back = Color_HC;
2192 else 2126 {
2193 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;
2194 } 2132 }
2195#endif 2133#endif
2196 if (rvid) 2134 if (rvid)
2197 { 2135 {
2198 SWAP_IT(fore, back, int); 2136 SWAP_IT(fore, back, int);
2199 2137
2200#ifndef NO_BOLD_UNDERLINE_REVERSE 2138#ifndef NO_BOLD_UNDERLINE_REVERSE
2201 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_RV) 2139 if (ISSET_PIXCOLOR (Color_RV)
2202# ifndef NO_CURSORCOLOR 2140# ifndef NO_CURSORCOLOR
2203 && !ISSET_PIXCOLOR(R, Color_cursor) 2141 && !ISSET_PIXCOLOR (Color_cursor)
2204# endif 2142# endif
2205 ) 2143 )
2206 back = Color_RV; 2144 back = Color_RV;
2207#endif 2145#endif
2208 } 2146 }
2209#ifndef NO_BOLD_UNDERLINE_REVERSE 2147#ifndef NO_BOLD_UNDERLINE_REVERSE
2210 else if (rend & RS_Bold) 2148 else if (rend & RS_Bold)
2211 { 2149 {
2212 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_BD)) 2150 if (ISSET_PIXCOLOR (Color_BD))
2213 {
2214 fore = Color_BD; 2151 fore = Color_BD;
2215# ifndef VERYBOLD 2152 else if (fore == Color_fg)
2216 rend &= ~RS_Bold; /* we've taken care of it */ 2153 fore = Color_White;
2217# endif
2218 }
2219 } 2154 }
2220 else if (rend & RS_Uline) 2155 else if (rend & RS_Uline)
2221 { 2156 {
2222 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_UL)) 2157 if (ISSET_PIXCOLOR (Color_UL))
2223 {
2224 fore = Color_UL; 2158 fore = Color_UL;
2225 rend &= ~RS_Uline; /* we've taken care of it */
2226 }
2227 } 2159 }
2228#endif 2160#endif
2229 2161
2230/* 2162 /*
2231 * Actually do the drawing of the string here 2163 * Actually do the drawing of the string here
2232 */ 2164 */
2233 rxvt_font *font = (*R->TermWin.fontset)[fid]; 2165 rxvt_font *font = (*TermWin.fontset)[fid];
2234 2166
2167 if (back == fore)
2168 font->clear_rect (xpixel, ypixel,
2169 TermWin.fwidth * count, TermWin.fheight,
2170 back);
2235 if (back == Color_bg) 2171 else if (back == Color_bg)
2236 { 2172 {
2237 if (must_clear) 2173 if (must_clear)
2238 { 2174 {
2175 CLEAR_CHARS (xpixel, ypixel, count);
2176
2239 for (i = 0; i < count; i++) /* don't draw empty strings */ 2177 for (i = 0; i < count; i++) /* don't draw empty strings */
2240 if (text[i] != ' ') 2178 if (text[i] != ' ')
2241 { 2179 {
2242 font->draw (xpixel, ypixel, text, count, fore, -1); 2180 font->draw (xpixel, ypixel, text, count, fore, -1);
2243 goto nodraw; 2181 break;
2244 } 2182 }
2245
2246 CLEAR_CHARS(xpixel, ypixel, count);
2247nodraw: ;
2248 } 2183 }
2249 else 2184 else
2250 font->draw (xpixel, ypixel, text, count, fore, Color_bg); 2185 font->draw (xpixel, ypixel, text, count, fore, Color_bg);
2251 } 2186 }
2252 else 2187 else
2253 font->draw (xpixel, ypixel, text, count, fore, back); 2188 font->draw (xpixel, ypixel, text, count, fore, back);
2254 2189
2255 if ((rend & RS_Uline) && (font->descent > 1)) 2190 if ((rend & RS_Uline) && (font->descent > 1))
2256 XDrawLine(R->Xdisplay, drawBuffer, R->TermWin.gc, 2191 XDrawLine(Xdisplay, drawBuffer, TermWin.gc,
2257 xpixel, ypixel + font->ascent + 1, 2192 xpixel, ypixel + font->ascent + 1,
2258 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1); 2193 xpixel + Width2Pixel(count) - 1, ypixel + font->ascent + 1);
2259 } /* for (col....) */ 2194 } /* for (col....) */
2260 } /* for (row....) */ 2195 } /* for (row....) */
2261 2196
2262/* 2197 /*
2263 * G: cleanup cursor and display outline cursor if necessary 2198 * G: cleanup cursor and display outline cursor if necessary
2264 */ 2199 */
2265 if (showcursor) { 2200 if (showcursor) {
2266 if (R->TermWin.focus) { 2201 if (TermWin.focus) {
2267 srp = &(R->screen.rend[R->screen.cur.row + R->TermWin.saveLines] 2202 srp = &(screen.rend[screen.cur.row + TermWin.saveLines]
2268 [R->screen.cur.col]); 2203 [screen.cur.col]);
2269 *srp ^= RS_RVid; 2204 *srp ^= RS_RVid;
2270#ifndef NO_CURSORCOLOR 2205#ifndef NO_CURSORCOLOR
2271 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1; 2206 *srp = (*srp & ~(RS_fgMask | RS_bgMask)) | cc1;
2272#endif 2207#endif
2273 } else if (R->oldcursor.row >= 0) { 2208 } else if (oldcursor.row >= 0) {
2274#ifndef NO_CURSORCOLOR 2209#ifndef NO_CURSORCOLOR
2275 unsigned long gcmask; /* Graphics Context mask */
2276
2277 if (XDEPTH > 2 && ISSET_PIXCOLOR(R, Color_cursor)) { 2210 if (ISSET_PIXCOLOR (Color_cursor))
2278 XSetForeground (R->Xdisplay, R->TermWin.gc, R->PixColors[Color_cursor]); 2211 XSetForeground (Xdisplay, TermWin.gc, PixColors[Color_cursor]);
2279 }
2280#endif 2212#endif
2281 XDrawRectangle(R->Xdisplay, drawBuffer, R->TermWin.gc, 2213 XDrawRectangle(Xdisplay, drawBuffer, TermWin.gc,
2282 Col2Pixel(R->oldcursor.col), 2214 Col2Pixel(oldcursor.col),
2283 Row2Pixel(R->oldcursor.row), 2215 Row2Pixel(oldcursor.row),
2284 (unsigned int)(Width2Pixel(cursorwidth) - 1), 2216 (unsigned int)(Width2Pixel(cursorwidth) - 1),
2285 (unsigned int)(Height2Pixel(1) - R->TermWin.lineSpace - 1)); 2217 (unsigned int)(Height2Pixel(1) - TermWin.lineSpace - 1));
2286 } 2218 }
2287 } 2219 }
2288/* 2220
2221 /*
2289 * H: cleanup selection 2222 * H: cleanup selection
2290 */ 2223 */
2291 rxvt_scr_reverse_selection(aR); 2224 scr_reverse_selection ();
2292 2225
2293/* 2226 /*
2294 * I: other general cleanup 2227 * I: other general cleanup
2295 */ 2228 */
2296 if (clearfirst && R->TermWin.int_bwidth) 2229 if (clearfirst && TermWin.int_bwidth)
2297 /* 2230 /*
2298 * clear the whole screen height, note that width == 0 is treated 2231 * clear the whole screen height, note that width == 0 is treated
2299 * specially by XClearArea 2232 * specially by XClearArea
2300 */ 2233 */
2301 XClearArea(R->Xdisplay, R->TermWin.vt, 0, 0, 2234 XClearArea(Xdisplay, TermWin.vt, 0, 0,
2302 (unsigned int)R->TermWin.int_bwidth, 2235 (unsigned int)TermWin.int_bwidth,
2303 (unsigned int)TermWin_TotalHeight(), False); 2236 (unsigned int)TermWin_TotalHeight(), False);
2304 if (clearlast && R->TermWin.int_bwidth) 2237 if (clearlast && TermWin.int_bwidth)
2305 /* 2238 /*
2306 * clear the whole screen height, note that width == 0 is treated 2239 * clear the whole screen height, note that width == 0 is treated
2307 * specially by XClearArea 2240 * specially by XClearArea
2308 */ 2241 */
2309 XClearArea(R->Xdisplay, R->TermWin.vt, 2242 XClearArea(Xdisplay, TermWin.vt,
2310 R->TermWin.width + R->TermWin.int_bwidth, 0, 2243 TermWin.width + TermWin.int_bwidth, 0,
2311 (unsigned int)R->TermWin.int_bwidth, 2244 (unsigned int)TermWin.int_bwidth,
2312 (unsigned int)TermWin_TotalHeight(), False); 2245 (unsigned int)TermWin_TotalHeight(), False);
2313 if (refresh_type & SMOOTH_REFRESH) 2246 if (refresh_type & SMOOTH_REFRESH)
2314 XSync(R->Xdisplay, False); 2247 XSync(Xdisplay, False);
2315 2248
2316 R->num_scr = 0; 2249 num_scr = 0;
2317 R->num_scr_allow = 1; 2250 num_scr_allow = 1;
2318 R->want_refresh = 0; /* screen is current */ 2251 want_refresh = 0; /* screen is current */
2319} 2252}
2320/* ------------------------------------------------------------------------- */
2321 2253
2322/* EXTPROTO */ 2254/* ------------------------------------------------------------------------- */
2323void 2255void
2324rxvt_scr_clear(pR) 2256rxvt_term::scr_clear()
2325{ 2257{
2326 if (!R->TermWin.mapped) 2258 if (!TermWin.mapped)
2327 return; 2259 return;
2260
2328 R->num_scr_allow = 0; 2261 num_scr_allow = 0;
2329 R->want_refresh = 1; 2262 want_refresh = 1;
2330#ifdef TRANSPARENT 2263#ifdef TRANSPARENT
2331 if ((R->Options & Opt_transparent) && (R->am_pixmap_trans == 0)) { 2264 if ((Options & Opt_transparent) && (am_pixmap_trans == 0))
2332 int i; 2265 {
2266 int i;
2333 2267
2334 if (!(R->Options & Opt_transparent_all)) 2268 if (!(Options & Opt_transparent_all))
2335 i = 0; 2269 i = 0;
2336 else 2270 else
2337 i = (int)(sizeof(R->TermWin.parent) / sizeof(Window)); 2271 i = (int)(sizeof(TermWin.parent) / sizeof(Window));
2338 for (; i--;) 2272
2273 while (i--)
2339 if (R->TermWin.parent[i] != None) 2274 if (TermWin.parent[i] != None)
2340 XClearWindow(R->Xdisplay, R->TermWin.parent[i]); 2275 XClearWindow(Xdisplay, TermWin.parent[i]);
2341 } 2276 }
2342#endif 2277#endif
2278
2343 XClearWindow(R->Xdisplay, R->TermWin.vt); 2279 XClearWindow (Xdisplay, TermWin.vt);
2344} 2280}
2345 2281
2346/* ------------------------------------------------------------------------- */ 2282/* ------------------------------------------------------------------------- */
2347/* INTPROTO */
2348void 2283void
2349rxvt_scr_reverse_selection(pR) 2284rxvt_term::scr_reverse_selection ()
2350{ 2285{
2351 int i, col, row, end_row; 2286 int i, col, row, end_row;
2352 rend_t *srp; 2287 rend_t *srp;
2353 2288
2354 if (R->selection.op && R->current_screen == R->selection.screen) { 2289 if (selection.op && current_screen == selection.screen) {
2355 end_row = R->TermWin.saveLines - R->TermWin.view_start; 2290 end_row = TermWin.saveLines - TermWin.view_start;
2356 i = R->selection.beg.row + R->TermWin.saveLines; 2291 i = selection.beg.row + TermWin.saveLines;
2357 row = R->selection.end.row + R->TermWin.saveLines; 2292 row = selection.end.row + TermWin.saveLines;
2358 if (i >= end_row) 2293 if (i >= end_row)
2359 col = R->selection.beg.col; 2294 col = selection.beg.col;
2360 else { 2295 else {
2361 col = 0; 2296 col = 0;
2362 i = end_row; 2297 i = end_row;
2363 } 2298 }
2364 end_row += R->TermWin.nrow; 2299 end_row += TermWin.nrow;
2365 for (; i < row && i < end_row; i++, col = 0) 2300 for (; i < row && i < end_row; i++, col = 0)
2366 for (srp = R->screen.rend[i]; col < R->TermWin.ncol; col++) 2301 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2367#ifndef OPTION_HC
2368 srp[col] ^= RS_RVid; 2302 srp[col] ^= RS_RVid;
2369#else
2370 srp[col] ^= RS_Blink;
2371#endif
2372 if (i == row && i < end_row) 2303 if (i == row && i < end_row)
2373 for (srp = R->screen.rend[i]; col < R->selection.end.col; col++) 2304 for (srp = screen.rend[i]; col < selection.end.col; col++)
2374#ifndef OPTION_HC
2375 srp[col] ^= RS_RVid; 2305 srp[col] ^= RS_RVid;
2376#else
2377 srp[col] ^= RS_Blink;
2378#endif
2379 } 2306 }
2380} 2307}
2381 2308
2382/* ------------------------------------------------------------------------- */ 2309/* ------------------------------------------------------------------------- */
2383/* 2310/*
2384 * Dump the whole scrollback and screen to the passed filedescriptor. The 2311 * Dump the whole scrollback and screen to the passed filedescriptor. The
2385 * invoking routine must close the fd. 2312 * invoking routine must close the fd.
2386 */ 2313 */
2387#if 0 2314#if 0
2388/* EXTPROTO */
2389void 2315void
2390rxvt_scr_dump(pR_ int fd) 2316rxvt_term::scr_dump (int fd)
2391{ 2317{
2392 int row, wrote; 2318 int row, wrote;
2393 unsigned int width, towrite; 2319 unsigned int width, towrite;
2394 char r1[] = "\n"; 2320 char r1[] = "\n";
2395 2321
2396 for (row = R->TermWin.saveLines - R->TermWin.nscrolled; 2322 for (row = TermWin.saveLines - TermWin.nscrolled;
2397 row < R->TermWin.saveLines + R->TermWin.nrow - 1; row++) { 2323 row < TermWin.saveLines + TermWin.nrow - 1; row++) {
2398 width = R->screen.tlen[row] >= 0 ? R->screen.tlen[row] 2324 width = screen.tlen[row] >= 0 ? screen.tlen[row]
2399 : R->TermWin.ncol; 2325 : TermWin.ncol;
2400 for (towrite = width; towrite; towrite -= wrote) { 2326 for (towrite = width; towrite; towrite -= wrote) {
2401 wrote = write(fd, &(R->screen.text[row][width - towrite]), 2327 wrote = write(fd, &(screen.text[row][width - towrite]),
2402 towrite); 2328 towrite);
2403 if (wrote < 0) 2329 if (wrote < 0)
2404 return; /* XXX: death, no report */ 2330 return; /* XXX: death, no report */
2405 } 2331 }
2406 if (R->screen.tlen[row] >= 0) 2332 if (screen.tlen[row] >= 0)
2407 if (write(fd, r1, 1) <= 0) 2333 if (write(fd, r1, 1) <= 0)
2408 return; /* XXX: death, no report */ 2334 return; /* XXX: death, no report */
2409 } 2335 }
2410} 2336}
2411#endif 2337#endif
… …
2413/* ------------------------------------------------------------------------- * 2339/* ------------------------------------------------------------------------- *
2414 * CHARACTER SELECTION * 2340 * CHARACTER SELECTION *
2415 * ------------------------------------------------------------------------- */ 2341 * ------------------------------------------------------------------------- */
2416 2342
2417/* 2343/*
2418 * -R->TermWin.nscrolled <= (selection row) <= R->TermWin.nrow - 1 2344 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2419 */ 2345 */
2420/* EXTPROTO */
2421void 2346void
2422rxvt_selection_check(pR_ int check_more) 2347rxvt_term::selection_check (int check_more)
2423{ 2348{
2424 row_col_t pos; 2349 row_col_t pos;
2425 2350
2426 if (!R->selection.op) 2351 if (!selection.op)
2427 return; 2352 return;
2428 2353
2429 pos.row = pos.col = 0; 2354 pos.row = pos.col = 0;
2430 if ((R->selection.beg.row < -(int32_t)R->TermWin.nscrolled) 2355 if ((selection.beg.row < -(int32_t)TermWin.nscrolled)
2431 || (R->selection.beg.row >= R->TermWin.nrow) 2356 || (selection.beg.row >= TermWin.nrow)
2432 || (R->selection.mark.row < -(int32_t)R->TermWin.nscrolled) 2357 || (selection.mark.row < -(int32_t)TermWin.nscrolled)
2433 || (R->selection.mark.row >= R->TermWin.nrow) 2358 || (selection.mark.row >= TermWin.nrow)
2434 || (R->selection.end.row < -(int32_t)R->TermWin.nscrolled) 2359 || (selection.end.row < -(int32_t)TermWin.nscrolled)
2435 || (R->selection.end.row >= R->TermWin.nrow) 2360 || (selection.end.row >= TermWin.nrow)
2436 || (check_more == 1 2361 || (check_more == 1
2437 && R->current_screen == R->selection.screen 2362 && current_screen == selection.screen
2438 && !ROWCOL_IS_BEFORE(R->screen.cur, R->selection.beg) 2363 && !ROWCOL_IS_BEFORE(screen.cur, selection.beg)
2439 && ROWCOL_IS_BEFORE(R->screen.cur, R->selection.end)) 2364 && ROWCOL_IS_BEFORE(screen.cur, selection.end))
2440 || (check_more == 2 2365 || (check_more == 2
2441 && ROWCOL_IS_BEFORE(R->selection.beg, pos) 2366 && ROWCOL_IS_BEFORE(selection.beg, pos)
2442 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2367 && ROWCOL_IS_AFTER(selection.end, pos))
2443 || (check_more == 3 2368 || (check_more == 3
2444 && ROWCOL_IS_AFTER(R->selection.end, pos)) 2369 && ROWCOL_IS_AFTER(selection.end, pos))
2445 || (check_more == 4 /* screen width change */ 2370 || (check_more == 4 /* screen width change */
2446 && (R->selection.beg.row != R->selection.end.row 2371 && (selection.beg.row != selection.end.row
2447 || R->selection.end.col > R->TermWin.ncol))) 2372 || selection.end.col > TermWin.ncol)))
2448 CLEAR_SELECTION(R); 2373 CLEAR_SELECTION();
2449} 2374}
2450 2375
2451/* ------------------------------------------------------------------------- */ 2376/* ------------------------------------------------------------------------- */
2452/* 2377/*
2453 * Paste a selection direct to the command fd 2378 * Paste a selection direct to the command fd
… …
2482/* ------------------------------------------------------------------------- */ 2407/* ------------------------------------------------------------------------- */
2483/* 2408/*
2484 * Respond to a notification that a primary selection has been sent 2409 * Respond to a notification that a primary selection has been sent
2485 * EXT: SelectionNotify 2410 * EXT: SelectionNotify
2486 */ 2411 */
2487/* EXTPROTO */
2488int 2412int
2489rxvt_selection_paste(pR_ Window win, Atom prop, Bool delete_prop) 2413rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2490{ 2414{
2491 long nread = 0; 2415 long nread = 0;
2492 unsigned long bytes_after; 2416 unsigned long bytes_after;
2493 XTextProperty ct; 2417 XTextProperty ct;
2494 int dummy_count;
2495 char **cl;
2496 2418
2497 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, R->selection_wait)); 2419 D_SELECT((stderr, "rxvt_selection_paste(%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2498 2420
2499 if (prop == None) /* check for failed XConvertSelection */ 2421 if (prop == None) /* check for failed XConvertSelection */
2500 { 2422 {
2501 if ((R->selection_type & Sel_CompoundText)) 2423 if ((selection_type & Sel_CompoundText))
2502 { 2424 {
2503 int selnum = R->selection_type & Sel_whereMask; 2425 int selnum = selection_type & Sel_whereMask;
2504 2426
2505 R->selection_type = 0; 2427 selection_type = 0;
2506 if (selnum != Sel_direct) 2428 if (selnum != Sel_direct)
2507 rxvt_selection_request_other(aR_ XA_STRING, selnum); 2429 selection_request_other (XA_STRING, selnum);
2430 }
2431
2432 if ((selection_type & Sel_UTF8String))
2433 {
2434 int selnum = selection_type & Sel_whereMask;
2435
2436 selection_type = Sel_CompoundText;
2437 if (selnum != Sel_direct)
2438 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2439 else
2440 selection_type = 0;
2508 } 2441 }
2509 2442
2510 return 0; 2443 return 0;
2511 } 2444 }
2512 2445
2513 for (;;) 2446 for (;;)
2514 { 2447 {
2515 if (XGetWindowProperty(R->Xdisplay, win, prop, (long)(nread / 4), 2448 if (XGetWindowProperty(Xdisplay, win, prop, (long)(nread / 4),
2516 (long)(PROP_SIZE / 4), delete_prop, 2449 (long)(PROP_SIZE / 4), delete_prop,
2517 AnyPropertyType, &ct.encoding, &ct.format, 2450 AnyPropertyType, &ct.encoding, &ct.format,
2518 &ct.nitems, &bytes_after, 2451 &ct.nitems, &bytes_after,
2519 &ct.value) != Success) 2452 &ct.value) != Success)
2520 break; 2453 break;
… …
2532 } 2465 }
2533 2466
2534 if (ct.nitems == 0) 2467 if (ct.nitems == 0)
2535 { 2468 {
2536 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2469 D_SELECT((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2537 if (R->selection_wait == Sel_normal && nread == 0) 2470 if (selection_wait == Sel_normal && nread == 0)
2538 { 2471 {
2539 /* 2472 /*
2540 * pass through again trying CUT_BUFFER0 if we've come from 2473 * pass through again trying CUT_BUFFER0 if we've come from
2541 * XConvertSelection() but nothing was presented 2474 * XConvertSelection() but nothing was presented
2542 */ 2475 */
2543 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2476 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2544 rxvt_selection_paste (aR_ Xroot, XA_CUT_BUFFER0, False); 2477 selection_paste (Xroot, XA_CUT_BUFFER0, False);
2545 } 2478 }
2546 2479
2547 nread = -1; /* discount any previous stuff */ 2480 nread = -1; /* discount any previous stuff */
2548 break; 2481 break;
2549 } 2482 }
2550 2483
2551 nread += ct.nitems; 2484 nread += ct.nitems;
2485
2486 char **cl;
2487 int cr;
2552 if (XmbTextPropertyToTextList (R->Xdisplay, &ct, &cl, 2488 if (XmbTextPropertyToTextList (Xdisplay, &ct, &cl,
2553 &dummy_count) == Success && cl) 2489 &cr) >= 0 && cl)
2554 { 2490 {
2491 for (int i = 0; i < cr; i++)
2555 R->paste ((unsigned char *)cl[0], STRLEN (cl[0])); 2492 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2493
2556 XFreeStringList (cl); 2494 XFreeStringList (cl);
2557 } 2495 }
2558 else 2496 else
2559 R->paste (ct.value, ct.nitems); 2497 paste (ct.value, ct.nitems);
2560 2498
2561 if (bytes_after == 0) 2499 if (bytes_after == 0)
2562 break; 2500 break;
2563 2501
2564 XFree (ct.value); 2502 XFree (ct.value);
2565 } 2503 }
2566 2504
2567 if (ct.value) 2505 if (ct.value)
2568 XFree (ct.value); 2506 XFree (ct.value);
2569 2507
2570 if (R->selection_wait == Sel_normal) 2508 if (selection_wait == Sel_normal)
2571 R->selection_wait = Sel_none; 2509 selection_wait = Sel_none;
2572 2510
2573 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); 2511 D_SELECT((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2574 return (int)nread; 2512 return (int)nread;
2575} 2513}
2576 2514
2577void 2515void
2578rxvt_term::incr_cb (time_watcher &w) 2516rxvt_term::incr_cb (time_watcher &w)
2579{ 2517{
2580 w.stop ();
2581 selection_wait = Sel_none; 2518 selection_wait = Sel_none;
2582 2519
2583 rxvt_print_error("data loss: timeout on INCR selection paste"); 2520 rxvt_print_error ("data loss: timeout on INCR selection paste");
2584} 2521}
2585 2522
2586/* 2523/*
2587 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> 2524 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2588 */ 2525 */
2589/* EXTPROTO */
2590void 2526void
2591rxvt_selection_property(pR_ Window win, Atom prop) 2527rxvt_term::selection_property (Window win, Atom prop)
2592{ 2528{
2593 int reget_time = 0; 2529 int reget_time = 0;
2594 2530
2595 if (prop == None) 2531 if (prop == None)
2596 return; 2532 return;
2597 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop)); 2533 D_SELECT((stderr, "rxvt_selection_property(%08lx, %lu)", win, (unsigned long)prop));
2598 if (R->selection_wait == Sel_normal) { 2534 if (selection_wait == Sel_normal) {
2599 int a, afmt; 2535 int a, afmt;
2600 Atom atype; 2536 Atom atype;
2601 unsigned long bytes_after, nitems; 2537 unsigned long bytes_after, nitems;
2602 unsigned char *s = NULL; 2538 unsigned char *s = NULL;
2603 2539
2604 a = XGetWindowProperty(R->Xdisplay, win, prop, 0L, 1L, False, 2540 a = XGetWindowProperty(Xdisplay, win, prop, 0L, 1L, False,
2605 R->xa[XA_INCR], &atype, &afmt, &nitems, 2541 xa[XA_INCR], &atype, &afmt, &nitems,
2606 &bytes_after, &s); 2542 &bytes_after, &s);
2607 if (s) 2543 if (s)
2608 XFree(s); 2544 XFree(s);
2609 if (a != Success) 2545 if (a != Success)
2610 return; 2546 return;
2611#ifndef __CYGWIN32__ 2547#ifndef __CYGWIN32__
2612 if (atype == R->xa[XA_INCR]) { /* start an INCR transfer */ 2548 if (atype == xa[XA_INCR]) { /* start an INCR transfer */
2613 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer")); 2549 D_SELECT((stderr, "rxvt_selection_property: INCR: starting transfer"));
2614 XDeleteProperty(R->Xdisplay, win, prop); 2550 XDeleteProperty(Xdisplay, win, prop);
2615 XFlush(R->Xdisplay); 2551 XFlush(Xdisplay);
2616 reget_time = 1; 2552 reget_time = 1;
2617 R->selection_wait = Sel_incr; 2553 selection_wait = Sel_incr;
2618 } 2554 }
2619#endif 2555#endif
2620 } else if (R->selection_wait == Sel_incr) { 2556 } else if (selection_wait == Sel_incr) {
2621 reget_time = 1; 2557 reget_time = 1;
2622 if (rxvt_selection_paste(aR_ win, prop, True) == -1) { 2558 if (selection_paste (win, prop, True) == -1) {
2623 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end")); 2559 D_SELECT((stderr, "rxvt_selection_property: INCR: clean end"));
2624 R->selection_wait = Sel_none; 2560 selection_wait = Sel_none;
2625 R->incr_ev.stop (); 2561 incr_ev.stop ();
2626 } 2562 }
2627 } 2563 }
2628 if (reget_time) /* received more data so reget time */ 2564 if (reget_time) /* received more data so reget time */
2629 R->incr_ev.start (NOW + 10); 2565 incr_ev.start (NOW + 10);
2630} 2566}
2631/* ------------------------------------------------------------------------- */ 2567/* ------------------------------------------------------------------------- */
2632/* 2568/*
2633 * Request the current selection: 2569 * Request the current selection:
2634 * Order: > internal selection if available 2570 * Order: > internal selection if available
… …
2636 * > CUT_BUFFER0 2572 * > CUT_BUFFER0
2637 * (+) if ownership is claimed but property is empty, rxvt_selection_paste() 2573 * (+) if ownership is claimed but property is empty, rxvt_selection_paste()
2638 * will auto fallback to CUT_BUFFER0 2574 * will auto fallback to CUT_BUFFER0
2639 * EXT: button 2 release 2575 * EXT: button 2 release
2640 */ 2576 */
2641/* EXTPROTO */
2642void 2577void
2643rxvt_selection_request(pR_ Time tm, int x, int y) 2578rxvt_term::selection_request (Time tm, int x, int y)
2644{ 2579{
2645 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y)); 2580 D_SELECT((stderr, "rxvt_selection_request(%lu, %d, %d)", tm, x, y));
2646 if (x < 0 || x >= R->TermWin.width || y < 0 || y >= R->TermWin.height) 2581 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2647 return; /* outside window */ 2582 return; /* outside window */
2648 2583
2649 if (R->selection.text != NULL) { /* internal selection */ 2584 if (selection.text != NULL) { /* internal selection */
2650 D_SELECT((stderr, "rxvt_selection_request: pasting internal")); 2585 D_SELECT((stderr, "rxvt_selection_request: pasting internal"));
2651 R->paste (R->selection.text, R->selection.len); 2586 paste (selection.text, selection.len);
2652 return; 2587 return;
2653 } else { 2588 } else {
2654 int i; 2589 int i;
2655 2590
2656 R->selection_request_time = tm; 2591 selection_request_time = tm;
2657 R->selection_wait = Sel_normal; 2592 selection_wait = Sel_normal;
2658 for (i = Sel_Primary; i <= Sel_Clipboard; i++) { 2593 for (i = Sel_Primary; i <= Sel_Clipboard; i++) {
2594#if X_HAVE_UTF8_STRING
2659 R->selection_type = Sel_CompoundText; 2595 selection_type = Sel_UTF8String;
2660 if (rxvt_selection_request_other(aR_ R->xa[XA_COMPOUND_TEXT], i)) 2596 if (selection_request_other (xa[XA_UTF8_STRING], i))
2661 return; 2597 return;
2598#else
2599 selection_type = Sel_CompoundText;
2600 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2601 return;
2602#endif
2662 } 2603 }
2663 } 2604 }
2664 R->selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */ 2605 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste() */
2665 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2606 D_SELECT((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2666 rxvt_selection_paste(aR_ Xroot, XA_CUT_BUFFER0, False); 2607 selection_paste (Xroot, XA_CUT_BUFFER0, False);
2667} 2608}
2668 2609
2669/* INTPROTO */
2670int 2610int
2671rxvt_selection_request_other(pR_ Atom target, int selnum) 2611rxvt_term::selection_request_other (Atom target, int selnum)
2672{ 2612{
2673 Atom sel; 2613 Atom sel;
2674#ifdef DEBUG_SELECT 2614#ifdef DEBUG_SELECT
2675 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; 2615 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2676#endif 2616#endif
2677 2617
2678 R->selection_type |= selnum; 2618 selection_type |= selnum;
2679 if (selnum == Sel_Primary) 2619 if (selnum == Sel_Primary)
2680 sel = XA_PRIMARY; 2620 sel = XA_PRIMARY;
2681 else if (selnum == Sel_Secondary) 2621 else if (selnum == Sel_Secondary)
2682 sel = XA_SECONDARY; 2622 sel = XA_SECONDARY;
2683 else 2623 else
2684 sel = R->xa[XA_CLIPBOARD]; 2624 sel = xa[XA_CLIPBOARD];
2685 if (XGetSelectionOwner(R->Xdisplay, sel) != None) { 2625 if (XGetSelectionOwner(Xdisplay, sel) != None) {
2686 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); 2626 D_SELECT((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2687 XConvertSelection(R->Xdisplay, sel, target, R->xa[XA_VT_SELECTION], 2627 XConvertSelection(Xdisplay, sel, target, xa[XA_VT_SELECTION],
2688 R->TermWin.vt, R->selection_request_time); 2628 TermWin.vt, selection_request_time);
2689 return 1; 2629 return 1;
2690 } 2630 }
2691 return 0; 2631 return 0;
2692} 2632}
2693 2633
2694/* ------------------------------------------------------------------------- */ 2634/* ------------------------------------------------------------------------- */
2695/* 2635/*
2696 * Clear all selected text 2636 * Clear all selected text
2697 * EXT: SelectionClear 2637 * EXT: SelectionClear
2698 */ 2638 */
2699/* EXTPROTO */
2700void 2639void
2701rxvt_selection_clear(pR) 2640rxvt_term::selection_clear ()
2702{ 2641{
2703 D_SELECT((stderr, "rxvt_selection_clear()")); 2642 D_SELECT((stderr, "rxvt_selection_clear()"));
2704 2643
2705 R->want_refresh = 1; 2644 want_refresh = 1;
2706 if (R->selection.text) 2645 if (selection.text)
2707 free(R->selection.text); 2646 free(selection.text);
2708 R->selection.text = NULL; 2647 selection.text = NULL;
2709 R->selection.len = 0; 2648 selection.len = 0;
2710 CLEAR_SELECTION(R); 2649 CLEAR_SELECTION();
2711} 2650}
2712 2651
2713/* ------------------------------------------------------------------------- */ 2652/* ------------------------------------------------------------------------- */
2714/* 2653/*
2715 * Copy a selection into the cut buffer 2654 * Copy a selection into the cut buffer
2716 * EXT: button 1 or 3 release 2655 * EXT: button 1 or 3 release
2717 */ 2656 */
2718/* EXTPROTO */
2719void 2657void
2720rxvt_selection_make(pR_ Time tm) 2658rxvt_term::selection_make (Time tm)
2721{ 2659{
2722 int i, col, end_col, row, end_row; 2660 int i, col, end_col, row, end_row;
2723 unsigned char *new_selection_text; 2661 unsigned char *new_selection_text;
2724 char *str; 2662 char *str;
2725 text_t *t; 2663 text_t *t;
2726#ifdef ACS_ASCII 2664#ifdef ACS_ASCII
2727 rend_t *re; 2665 rend_t *re;
2728#endif 2666#endif
2729 2667
2730 D_SELECT((stderr, "rxvt_selection_make(): R->selection.op=%d, R->selection.clicks=%d", R->selection.op, R->selection.clicks)); 2668 D_SELECT((stderr, "rxvt_selection_make(): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2731 switch (R->selection.op) { 2669 switch (selection.op) {
2732 case SELECTION_CONT: 2670 case SELECTION_CONT:
2733 break; 2671 break;
2734 case SELECTION_INIT: 2672 case SELECTION_INIT:
2735 CLEAR_SELECTION(R); 2673 CLEAR_SELECTION();
2736 /* FALLTHROUGH */ 2674 /* FALLTHROUGH */
2737 case SELECTION_BEGIN: 2675 case SELECTION_BEGIN:
2738 R->selection.op = SELECTION_DONE; 2676 selection.op = SELECTION_DONE;
2739 /* FALLTHROUGH */ 2677 /* FALLTHROUGH */
2740 default: 2678 default:
2741 return; 2679 return;
2742 } 2680 }
2743 R->selection.op = SELECTION_DONE; 2681 selection.op = SELECTION_DONE;
2744 2682
2745 if (R->selection.clicks == 4) 2683 if (selection.clicks == 4)
2746 return; /* nothing selected, go away */ 2684 return; /* nothing selected, go away */
2747 2685
2748 i = (R->selection.end.row - R->selection.beg.row + 1) * (R->TermWin.ncol + 1) + 1; 2686 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1;
2749 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1); 2687 str = (char *)rxvt_malloc(i * MB_CUR_MAX + 1);
2750 2688
2751 new_selection_text = (unsigned char *)str; 2689 new_selection_text = (unsigned char *)str;
2752 2690
2753 col = R->selection.beg.col; 2691 col = selection.beg.col;
2754 MAX_IT(col, 0); 2692 MAX_IT(col, 0);
2755 row = R->selection.beg.row + R->TermWin.saveLines; 2693 row = selection.beg.row + TermWin.saveLines;
2756 end_row = R->selection.end.row + R->TermWin.saveLines; 2694 end_row = selection.end.row + TermWin.saveLines;
2757 2695
2758 for (; row <= end_row; row++, col = 0) 2696 for (; row <= end_row; row++, col = 0)
2759 { 2697 {
2760 t = &(R->screen.text[row][col]); 2698 t = &(screen.text[row][col]);
2761 2699
2762 end_col = R->screen.tlen[row]; 2700 end_col = screen.tlen[row];
2763 2701
2764 if (end_col == -1) 2702 if (end_col == -1)
2765 end_col = R->TermWin.ncol; 2703 end_col = TermWin.ncol;
2766 2704
2767 if (row == end_row) 2705 if (row == end_row)
2768 MIN_IT (end_col, R->selection.end.col); 2706 MIN_IT (end_col, selection.end.col);
2769 2707
2770 for (; col < end_col; col++) 2708 for (; col < end_col; col++)
2771 if (*t == NOCHAR) 2709 if (*t == NOCHAR)
2772 t++; 2710 t++;
2773 else 2711 else
… …
2775 int len = wctomb (str, *t++); 2713 int len = wctomb (str, *t++);
2776 if (len > 0) 2714 if (len > 0)
2777 str += len; 2715 str += len;
2778 } 2716 }
2779 2717
2780 if (R->screen.tlen[row] != -1 && row != end_row) 2718 if (screen.tlen[row] != -1 && row != end_row)
2781 *str++ = '\n'; 2719 *str++ = '\n';
2782 } 2720 }
2783 2721
2784#ifndef NO_OLD_SELECTION 2722#ifndef NO_OLD_SELECTION
2785 if (R->selection_style == OLD_SELECT) 2723 if (selection_style == OLD_SELECT)
2786 if (end_col == R->TermWin.ncol) 2724 if (end_col == TermWin.ncol)
2787 *str++ = '\n'; 2725 *str++ = '\n';
2788#endif 2726#endif
2789#ifndef NO_NEW_SELECTION 2727#ifndef NO_NEW_SELECTION
2790 if (R->selection_style != OLD_SELECT) 2728 if (selection_style != OLD_SELECT)
2791 if (end_col != R->selection.end.col) 2729 if (end_col != selection.end.col)
2792 *str++ = '\n'; 2730 *str++ = '\n';
2793#endif 2731#endif
2794 *str = '\0'; 2732 *str = '\0';
2795 2733
2796 i = str - (char *)new_selection_text; 2734 i = str - (char *)new_selection_text;
… …
2798 { 2736 {
2799 free (new_selection_text); 2737 free (new_selection_text);
2800 return; 2738 return;
2801 } 2739 }
2802 2740
2803 // due to MB_MAX_CUR, selection wastage is usually high 2741 // due to MB_MAX_CUR, selection wastage is usually high, so realloc
2804 if (str - (char *)new_selection_text > 1024) 2742 if (str - (char *)new_selection_text > 1024)
2805 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1); 2743 new_selection_text = (unsigned char *)rxvt_realloc (new_selection_text, i + 1);
2806 2744
2807 R->selection.len = i; 2745 selection.len = i;
2746
2808 if (R->selection.text) 2747 if (selection.text)
2809 free (R->selection.text); 2748 free (selection.text);
2810 2749
2811 R->selection.text = new_selection_text; 2750 selection.text = new_selection_text;
2812 2751
2813 XSetSelectionOwner(R->Xdisplay, XA_PRIMARY, R->TermWin.vt, tm); 2752 XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm);
2814 if (XGetSelectionOwner(R->Xdisplay, XA_PRIMARY) != R->TermWin.vt) 2753 if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt)
2815 rxvt_print_error("can't get primary selection"); 2754 rxvt_print_error("can't get primary selection");
2755
2756
2757 {
2758 XTextProperty ct;
2759 char *cl = (char *)selection.text;
2760
2761 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, XStringStyle, &ct) >= 0)
2762 {
2763 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2764 PropModeReplace, ct.value, ct.nitems);
2765 XFree (ct.value);
2766 }
2767 else
2816 XChangeProperty(R->Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, 2768 XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8,
2817 PropModeReplace, R->selection.text, (int)R->selection.len); 2769 PropModeReplace, selection.text, (int)selection.len);
2770 }
2771
2818 R->selection_time = tm; 2772 selection_time = tm;
2819 D_SELECT((stderr, "rxvt_selection_make(): R->selection.len=%d", R->selection.len)); 2773 D_SELECT((stderr, "rxvt_selection_make(): selection.len=%d", selection.len));
2820} 2774}
2821 2775
2822/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2823/* 2777/*
2824 * Mark or select text based upon number of clicks: 1, 2, or 3 2778 * Mark or select text based upon number of clicks: 1, 2, or 3
2825 * EXT: button 1 press 2779 * EXT: button 1 press
2826 */ 2780 */
2827/* EXTPROTO */
2828void 2781void
2829rxvt_selection_click(pR_ int clicks, int x, int y) 2782rxvt_term::selection_click (int clicks, int x, int y)
2830{ 2783{
2831 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y)); 2784 D_SELECT((stderr, "rxvt_selection_click(%d, %d, %d)", clicks, x, y));
2832 2785
2833 clicks = ((clicks - 1) % 3) + 1; 2786 clicks = ((clicks - 1) % 3) + 1;
2834 R->selection.clicks = clicks; /* save clicks so extend will work */ 2787 selection.clicks = clicks; /* save clicks so extend will work */
2835 2788
2836 rxvt_selection_start_colrow(aR_ Pixel2Col(x), Pixel2Row(y)); 2789 selection_start_colrow (Pixel2Col(x), Pixel2Row(y));
2790
2837 if (clicks == 2 || clicks == 3) 2791 if (clicks == 2 || clicks == 3)
2838 rxvt_selection_extend_colrow(aR_ R->selection.mark.col, 2792 selection_extend_colrow (selection.mark.col,
2839 R->selection.mark.row
2840 + R->TermWin.view_start, 2793 selection.mark.row + TermWin.view_start,
2841 0, /* button 3 */ 2794 0, /* button 3 */
2842 1, /* button press */ 2795 1, /* button press */
2843 0); /* click change */ 2796 0); /* click change */
2844} 2797}
2845 2798
2846/* ------------------------------------------------------------------------- */ 2799/* ------------------------------------------------------------------------- */
2847/* 2800/*
2848 * Mark a selection at the specified col/row 2801 * Mark a selection at the specified col/row
2849 */ 2802 */
2850/* INTPROTO */
2851void 2803void
2852rxvt_selection_start_colrow(pR_ int col, int row) 2804rxvt_term::selection_start_colrow (int col, int row)
2853{ 2805{
2854 R->want_refresh = 1; 2806 want_refresh = 1;
2855 R->selection.mark.col = col; 2807 selection.mark.col = col;
2856 R->selection.mark.row = row - R->TermWin.view_start; 2808 selection.mark.row = row - TermWin.view_start;
2857 MAX_IT(R->selection.mark.row, -(int32_t)R->TermWin.nscrolled); 2809 MAX_IT(selection.mark.row, -(int32_t)TermWin.nscrolled);
2858 MIN_IT(R->selection.mark.row, (int32_t)R->TermWin.nrow - 1); 2810 MIN_IT(selection.mark.row, (int32_t)TermWin.nrow - 1);
2859 MAX_IT(R->selection.mark.col, 0); 2811 MAX_IT(selection.mark.col, 0);
2860 MIN_IT(R->selection.mark.col, (int32_t)R->TermWin.ncol - 1); 2812 MIN_IT(selection.mark.col, (int32_t)TermWin.ncol - 1);
2861 2813
2862 if (R->selection.op) { /* clear the old selection */ 2814 if (selection.op) { /* clear the old selection */
2863 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 2815 selection.beg.row = selection.end.row = selection.mark.row;
2864 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 2816 selection.beg.col = selection.end.col = selection.mark.col;
2865 } 2817 }
2866 R->selection.op = SELECTION_INIT; 2818 selection.op = SELECTION_INIT;
2867 R->selection.screen = R->current_screen; 2819 selection.screen = current_screen;
2868} 2820}
2869 2821
2870/* ------------------------------------------------------------------------- */ 2822/* ------------------------------------------------------------------------- */
2871/* 2823/*
2872 * Word select: select text for 2 clicks 2824 * Word select: select text for 2 clicks
2873 * We now only find out the boundary in one direction 2825 * We now only find out the boundary in one direction
2874 */ 2826 */
2875 2827
2876/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 2828/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2877#define DELIMIT_TEXT(x) \ 2829#define DELIMIT_TEXT(x) \
2878 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(R->rs[Rs_cutchars], (x)) != NULL)) 2830 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR(rs[Rs_cutchars], (x)) != NULL))
2879#define DELIMIT_REND(x) 1 2831#define DELIMIT_REND(x) 1
2880 2832
2881/* INTPROTO */
2882void 2833void
2883rxvt_selection_delimit_word(pR_ enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 2834rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2884{ 2835{
2885 int col, row, dirnadd, tcol, trow, w1, w2; 2836 int col, row, dirnadd, tcol, trow, w1, w2;
2886 row_col_t bound; 2837 row_col_t bound;
2887 text_t *stp; 2838 text_t *stp;
2888 rend_t *srp; 2839 rend_t *srp;
2889 2840
2890 if (dirn == UP) { 2841 if (dirn == UP) {
2891 bound.row = R->TermWin.saveLines - R->TermWin.nscrolled - 1; 2842 bound.row = TermWin.saveLines - TermWin.nscrolled - 1;
2892 bound.col = 0; 2843 bound.col = 0;
2893 dirnadd = -1; 2844 dirnadd = -1;
2894 } else { 2845 } else {
2895 bound.row = R->TermWin.saveLines + R->TermWin.nrow; 2846 bound.row = TermWin.saveLines + TermWin.nrow;
2896 bound.col = R->TermWin.ncol - 1; 2847 bound.col = TermWin.ncol - 1;
2897 dirnadd = 1; 2848 dirnadd = 1;
2898 } 2849 }
2899 row = mark->row + R->TermWin.saveLines; 2850 row = mark->row + TermWin.saveLines;
2900 col = mark->col; 2851 col = mark->col;
2901 MAX_IT(col, 0); 2852 MAX_IT(col, 0);
2902/* find the edge of a word */ 2853/* find the edge of a word */
2903 stp = &(R->screen.text[row][col]); 2854 stp = &(screen.text[row][col]);
2904 w1 = DELIMIT_TEXT(*stp); 2855 w1 = DELIMIT_TEXT(*stp);
2905 2856
2906 if (R->selection_style != NEW_SELECT) { 2857 if (selection_style != NEW_SELECT) {
2907 if (w1 == 1) { 2858 if (w1 == 1) {
2908 stp += dirnadd; 2859 stp += dirnadd;
2909 if (DELIMIT_TEXT(*stp) == 1) 2860 if (DELIMIT_TEXT(*stp) == 1)
2910 goto Old_Word_Selection_You_Die; 2861 goto Old_Word_Selection_You_Die;
2911 col += dirnadd; 2862 col += dirnadd;
2912 } 2863 }
2913 w1 = 0; 2864 w1 = 0;
2914 } 2865 }
2915 srp = (&R->screen.rend[row][col]); 2866 srp = (&screen.rend[row][col]);
2916 w2 = DELIMIT_REND(*srp); 2867 w2 = DELIMIT_REND(*srp);
2917 2868
2918 for (;;) { 2869 for (;;) {
2919 for (; col != bound.col; col += dirnadd) { 2870 for (; col != bound.col; col += dirnadd) {
2920 stp += dirnadd; 2871 stp += dirnadd;
… …
2923 srp += dirnadd; 2874 srp += dirnadd;
2924 if (DELIMIT_REND(*srp) != w2) 2875 if (DELIMIT_REND(*srp) != w2)
2925 break; 2876 break;
2926 } 2877 }
2927 if ((col == bound.col) && (row != bound.row)) { 2878 if ((col == bound.col) && (row != bound.row)) {
2928 if (R->screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) { 2879 if (screen.tlen[(row - (dirn == UP ? 1 : 0))] == -1) {
2929 trow = row + dirnadd; 2880 trow = row + dirnadd;
2930 tcol = dirn == UP ? R->TermWin.ncol - 1 : 0; 2881 tcol = dirn == UP ? TermWin.ncol - 1 : 0;
2931 if (R->screen.text[trow] == NULL) 2882 if (screen.text[trow] == NULL)
2932 break; 2883 break;
2933 stp = &(R->screen.text[trow][tcol]); 2884 stp = &(screen.text[trow][tcol]);
2934 srp = &(R->screen.rend[trow][tcol]); 2885 srp = &(screen.rend[trow][tcol]);
2935 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2) 2886 if (DELIMIT_TEXT(*stp) != w1 || DELIMIT_REND(*srp) != w2)
2936 break; 2887 break;
2937 row = trow; 2888 row = trow;
2938 col = tcol; 2889 col = tcol;
2939 continue; 2890 continue;
2940 } 2891 }
2941 } 2892 }
2942 break; 2893 break;
2943 } 2894 }
2944 Old_Word_Selection_You_Die: 2895 Old_Word_Selection_You_Die:
2945 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - R->TermWin.saveLines, col)); 2896 D_SELECT((stderr, "rxvt_selection_delimit_word(%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
2946 2897
2947 if (dirn == DN) 2898 if (dirn == DN)
2948 col++; /* put us on one past the end */ 2899 col++; /* put us on one past the end */
2949 2900
2950/* Poke the values back in */ 2901/* Poke the values back in */
2951 ret->row = row - R->TermWin.saveLines; 2902 ret->row = row - TermWin.saveLines;
2952 ret->col = col; 2903 ret->col = col;
2953} 2904}
2954 2905
2955/* ------------------------------------------------------------------------- */ 2906/* ------------------------------------------------------------------------- */
2956/* 2907/*
… …
2958 * EXT: button 3 press; button 1 or 3 drag 2909 * EXT: button 3 press; button 1 or 3 drag
2959 * flag == 0 ==> button 1 2910 * flag == 0 ==> button 1
2960 * flag == 1 ==> button 3 press 2911 * flag == 1 ==> button 3 press
2961 * flag == 2 ==> button 3 motion 2912 * flag == 2 ==> button 3 motion
2962 */ 2913 */
2963/* EXTPROTO */
2964void 2914void
2965rxvt_selection_extend(pR_ int x, int y, int flag) 2915rxvt_term::selection_extend (int x, int y, int flag)
2966{ 2916{
2967 int col, row; 2917 int col, row;
2968 2918
2969 col = Pixel2Col(x); 2919 col = Pixel2Col(x);
2970 row = Pixel2Row(y); 2920 row = Pixel2Row(y);
2971 MAX_IT(row, 0); 2921 MAX_IT(row, 0);
2972 MIN_IT(row, (int)R->TermWin.nrow - 1); 2922 MIN_IT(row, (int)TermWin.nrow - 1);
2973 MAX_IT(col, 0); 2923 MAX_IT(col, 0);
2974 MIN_IT(col, (int)R->TermWin.ncol); 2924 MIN_IT(col, (int)TermWin.ncol);
2925
2975#ifndef NO_NEW_SELECTION 2926#ifndef NO_NEW_SELECTION
2976/* 2927 /*
2977 * If we're selecting characters (single click) then we must check first 2928 * If we're selecting characters (single click) then we must check first
2978 * if we are at the same place as the original mark. If we are then 2929 * if we are at the same place as the original mark. If we are then
2979 * select nothing. Otherwise, if we're to the right of the mark, you have to 2930 * select nothing. Otherwise, if we're to the right of the mark, you have to
2980 * be _past_ a character for it to be selected. 2931 * be _past_ a character for it to be selected.
2981 */ 2932 */
2982 if (R->selection_style != OLD_SELECT) { 2933 if (selection_style != OLD_SELECT)
2934 {
2983 if (((R->selection.clicks % 3) == 1) && !flag 2935 if (((selection.clicks % 3) == 1) && !flag
2984 && (col == R->selection.mark.col 2936 && (col == selection.mark.col
2985 && (row == R->selection.mark.row + R->TermWin.view_start))) { 2937 && (row == selection.mark.row + TermWin.view_start)))
2938 {
2986 /* select nothing */ 2939 /* select nothing */
2987 R->selection.beg.row = R->selection.end.row = 0; 2940 selection.beg.row = selection.end.row = 0;
2988 R->selection.beg.col = R->selection.end.col = 0; 2941 selection.beg.col = selection.end.col = 0;
2989 R->selection.clicks = 4; 2942 selection.clicks = 4;
2990 R->want_refresh = 1; 2943 want_refresh = 1;
2991 D_SELECT((stderr, "rxvt_selection_extend() R->selection.clicks = 4")); 2944 D_SELECT((stderr, "rxvt_selection_extend() selection.clicks = 4"));
2992 return; 2945 return;
2993 } 2946 }
2994 } 2947 }
2995#endif 2948#endif
2996 if (R->selection.clicks == 4) 2949 if (selection.clicks == 4)
2997 R->selection.clicks = 1; 2950 selection.clicks = 1;
2951
2998 rxvt_selection_extend_colrow(aR_ col, row, !!flag, /* ? button 3 */ 2952 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
2999 flag == 1 ? 1 : 0, /* ? button press */ 2953 flag == 1 ? 1 : 0, /* ? button press */
3000 0); /* no click change */ 2954 0); /* no click change */
3001} 2955}
3002 2956
3003/* ------------------------------------------------------------------------- */ 2957/* ------------------------------------------------------------------------- */
3004/* 2958/*
3005 * Extend the selection to the specified col/row 2959 * Extend the selection to the specified col/row
3006 */ 2960 */
3007/* INTPROTO */
3008void 2961void
3009rxvt_selection_extend_colrow(pR_ int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 2962rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange)
3010{ 2963{
3011 int16_t ncol = R->TermWin.ncol; 2964 int16_t ncol = TermWin.ncol;
3012 int end_col; 2965 int end_col;
3013 row_col_t pos; 2966 row_col_t pos;
3014 enum { 2967 enum {
3015 LEFT, RIGHT 2968 LEFT, RIGHT
3016 } closeto = RIGHT; 2969 } closeto = RIGHT;
3017 2970
3018 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, R->selection.clicks, R->selection.op)); 2971 D_SELECT((stderr, "rxvt_selection_extend_colrow(c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3019 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 2972 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3020 2973
3021 R->want_refresh = 1; 2974 want_refresh = 1;
3022 switch (R->selection.op) { 2975 switch (selection.op) {
3023 case SELECTION_INIT: 2976 case SELECTION_INIT:
3024 CLEAR_SELECTION(R); 2977 CLEAR_SELECTION();
3025 R->selection.op = SELECTION_BEGIN; 2978 selection.op = SELECTION_BEGIN;
3026 /* FALLTHROUGH */ 2979 /* FALLTHROUGH */
3027 case SELECTION_BEGIN: 2980 case SELECTION_BEGIN:
3028 if (row != R->selection.mark.row || col != R->selection.mark.col 2981 if (row != selection.mark.row || col != selection.mark.col
3029 || (!button3 && buttonpress)) 2982 || (!button3 && buttonpress))
3030 R->selection.op = SELECTION_CONT; 2983 selection.op = SELECTION_CONT;
3031 break; 2984 break;
3032 case SELECTION_DONE: 2985 case SELECTION_DONE:
3033 R->selection.op = SELECTION_CONT; 2986 selection.op = SELECTION_CONT;
3034 /* FALLTHROUGH */ 2987 /* FALLTHROUGH */
3035 case SELECTION_CONT: 2988 case SELECTION_CONT:
3036 break; 2989 break;
3037 case SELECTION_CLEAR: 2990 case SELECTION_CLEAR:
3038 rxvt_selection_start_colrow(aR_ col, row); 2991 selection_start_colrow (col, row);
3039 /* FALLTHROUGH */ 2992 /* FALLTHROUGH */
3040 default: 2993 default:
3041 return; 2994 return;
3042 } 2995 }
3043 if (R->selection.beg.col == R->selection.end.col 2996 if (selection.beg.col == selection.end.col
3044 && R->selection.beg.col != R->selection.mark.col 2997 && selection.beg.col != selection.mark.col
3045 && R->selection.beg.row == R->selection.end.row 2998 && selection.beg.row == selection.end.row
3046 && R->selection.beg.row != R->selection.mark.row) { 2999 && selection.beg.row != selection.mark.row) {
3047 R->selection.beg.col = R->selection.end.col = R->selection.mark.col; 3000 selection.beg.col = selection.end.col = selection.mark.col;
3048 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3001 selection.beg.row = selection.end.row = selection.mark.row;
3049 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3002 D_SELECT((stderr, "rxvt_selection_extend_colrow() ENT2 b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3050 } 3003 }
3051 3004
3052 pos.col = col; 3005 pos.col = col;
3053 pos.row = row; 3006 pos.row = row;
3054 3007
3055 pos.row -= R->TermWin.view_start; /* adjust for scroll */ 3008 pos.row -= TermWin.view_start; /* adjust for scroll */
3056 3009
3057#ifndef NO_OLD_SELECTION 3010#ifndef NO_OLD_SELECTION
3058/* 3011/*
3059 * This mimics some of the selection behaviour of version 2.20 and before. 3012 * This mimics some of the selection behaviour of version 2.20 and before.
3060 * There are no ``selection modes'', button3 is always character extension. 3013 * There are no ``selection modes'', button3 is always character extension.
3061 * Note: button3 drag is always available, c.f. v2.20 3014 * Note: button3 drag is always available, c.f. v2.20
3062 * Selection always terminates (left or right as appropriate) at the mark. 3015 * Selection always terminates (left or right as appropriate) at the mark.
3063 */ 3016 */
3064 if (R->selection_style == OLD_SELECT) { 3017 if (selection_style == OLD_SELECT) {
3065 if (R->selection.clicks == 1 || button3) { 3018 if (selection.clicks == 1 || button3) {
3066 if (R->hate_those_clicks) { 3019 if (hate_those_clicks) {
3067 R->hate_those_clicks = 0; 3020 hate_those_clicks = 0;
3068 if (R->selection.clicks == 1) { 3021 if (selection.clicks == 1) {
3069 R->selection.beg.row = R->selection.mark.row; 3022 selection.beg.row = selection.mark.row;
3070 R->selection.beg.col = R->selection.mark.col; 3023 selection.beg.col = selection.mark.col;
3071 } else { 3024 } else {
3072 R->selection.mark.row = R->selection.beg.row; 3025 selection.mark.row = selection.beg.row;
3073 R->selection.mark.col = R->selection.beg.col; 3026 selection.mark.col = selection.beg.col;
3074 } 3027 }
3075 } 3028 }
3076 if (ROWCOL_IS_BEFORE(pos, R->selection.mark)) { 3029 if (ROWCOL_IS_BEFORE(pos, selection.mark)) {
3077 R->selection.end.row = R->selection.mark.row; 3030 selection.end.row = selection.mark.row;
3078 R->selection.end.col = R->selection.mark.col + 1; 3031 selection.end.col = selection.mark.col + 1;
3079 R->selection.beg.row = pos.row; 3032 selection.beg.row = pos.row;
3080 R->selection.beg.col = pos.col; 3033 selection.beg.col = pos.col;
3081 } else { 3034 } else {
3082 R->selection.beg.row = R->selection.mark.row; 3035 selection.beg.row = selection.mark.row;
3083 R->selection.beg.col = R->selection.mark.col; 3036 selection.beg.col = selection.mark.col;
3084 R->selection.end.row = pos.row; 3037 selection.end.row = pos.row;
3085 R->selection.end.col = pos.col + 1; 3038 selection.end.col = pos.col + 1;
3086 } 3039 }
3087 } else if (R->selection.clicks == 2) { 3040 } else if (selection.clicks == 2) {
3088 rxvt_selection_delimit_word(aR_ UP, &(R->selection.mark), 3041 selection_delimit_word (UP, &(selection.mark),
3089 &(R->selection.beg)); 3042 &(selection.beg));
3090 rxvt_selection_delimit_word(aR_ DN, &(R->selection.mark), 3043 selection_delimit_word (DN, &(selection.mark),
3091 &(R->selection.end)); 3044 &(selection.end));
3092 R->hate_those_clicks = 1; 3045 hate_those_clicks = 1;
3093 } else if (R->selection.clicks == 3) { 3046 } else if (selection.clicks == 3) {
3094 R->selection.beg.row = R->selection.end.row = R->selection.mark.row; 3047 selection.beg.row = selection.end.row = selection.mark.row;
3095 R->selection.beg.col = 0; 3048 selection.beg.col = 0;
3096 R->selection.end.col = ncol; 3049 selection.end.col = ncol;
3097 R->hate_those_clicks = 1; 3050 hate_those_clicks = 1;
3098 } 3051 }
3099 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3052 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3100 return; 3053 return;
3101 } 3054 }
3102#endif /* ! NO_OLD_SELECTION */ 3055#endif /* ! NO_OLD_SELECTION */
3103#ifndef NO_NEW_SELECTION 3056#ifndef NO_NEW_SELECTION
3104/* selection_style must not be OLD_SELECT to get here */ 3057/* selection_style must not be OLD_SELECT to get here */
3105/* 3058/*
3106 * This is mainly xterm style selection with a couple of differences, mainly 3059 * This is mainly xterm style selection with a couple of differences, mainly
3107 * in the way button3 drag extension works. 3060 * in the way button3 drag extension works.
3108 * We're either doing: button1 drag; button3 press; or button3 drag 3061 * We're either doing: button1 drag; button3 press; or button3 drag
3109 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3062 * a) button1 drag : select around a midpoint/word/line - that point/word/line
3110 * is always at the left/right edge of the R->selection. 3063 * is always at the left/right edge of the selection.
3111 * b) button3 press: extend/contract character/word/line at whichever edge of 3064 * b) button3 press: extend/contract character/word/line at whichever edge of
3112 * the selection we are closest to. 3065 * the selection we are closest to.
3113 * c) button3 drag : extend/contract character/word/line - we select around 3066 * c) button3 drag : extend/contract character/word/line - we select around
3114 * a point/word/line which is either the start or end of the selection 3067 * a point/word/line which is either the start or end of the selection
3115 * and it was decided by whichever point/word/line was `fixed' at the 3068 * and it was decided by whichever point/word/line was `fixed' at the
… …
3117 */ 3070 */
3118 if (button3 && buttonpress) { /* button3 press */ 3071 if (button3 && buttonpress) { /* button3 press */
3119 /* 3072 /*
3120 * first determine which edge of the selection we are closest to 3073 * first determine which edge of the selection we are closest to
3121 */ 3074 */
3122 if (ROWCOL_IS_BEFORE(pos, R->selection.beg) 3075 if (ROWCOL_IS_BEFORE(pos, selection.beg)
3123 || (!ROWCOL_IS_AFTER(pos, R->selection.end) 3076 || (!ROWCOL_IS_AFTER(pos, selection.end)
3124 && (((pos.col - R->selection.beg.col) 3077 && (((pos.col - selection.beg.col)
3125 + ((pos.row - R->selection.beg.row) * ncol)) 3078 + ((pos.row - selection.beg.row) * ncol))
3126 < ((R->selection.end.col - pos.col) 3079 < ((selection.end.col - pos.col)
3127 + ((R->selection.end.row - pos.row) * ncol))))) 3080 + ((selection.end.row - pos.row) * ncol)))))
3128 closeto = LEFT; 3081 closeto = LEFT;
3129 if (closeto == LEFT) { 3082 if (closeto == LEFT) {
3130 R->selection.beg.row = pos.row; 3083 selection.beg.row = pos.row;
3131 R->selection.beg.col = pos.col; 3084 selection.beg.col = pos.col;
3132 R->selection.mark.row = R->selection.end.row; 3085 selection.mark.row = selection.end.row;
3133 R->selection.mark.col = R->selection.end.col 3086 selection.mark.col = selection.end.col
3134 - (R->selection.clicks == 2); 3087 - (selection.clicks == 2);
3135 } else { 3088 } else {
3136 R->selection.end.row = pos.row; 3089 selection.end.row = pos.row;
3137 R->selection.end.col = pos.col; 3090 selection.end.col = pos.col;
3138 R->selection.mark.row = R->selection.beg.row; 3091 selection.mark.row = selection.beg.row;
3139 R->selection.mark.col = R->selection.beg.col; 3092 selection.mark.col = selection.beg.col;
3140 } 3093 }
3141 } else { /* button1 drag or button3 drag */ 3094 } else { /* button1 drag or button3 drag */
3142 if (ROWCOL_IS_AFTER(R->selection.mark, pos)) { 3095 if (ROWCOL_IS_AFTER(selection.mark, pos)) {
3143 if ((R->selection.mark.row == R->selection.end.row) 3096 if ((selection.mark.row == selection.end.row)
3144 && (R->selection.mark.col == R->selection.end.col) 3097 && (selection.mark.col == selection.end.col)
3145 && clickchange && R->selection.clicks == 2) 3098 && clickchange && selection.clicks == 2)
3146 R->selection.mark.col--; 3099 selection.mark.col--;
3147 R->selection.beg.row = pos.row; 3100 selection.beg.row = pos.row;
3148 R->selection.beg.col = pos.col; 3101 selection.beg.col = pos.col;
3149 R->selection.end.row = R->selection.mark.row; 3102 selection.end.row = selection.mark.row;
3150 R->selection.end.col = R->selection.mark.col 3103 selection.end.col = selection.mark.col
3151 + (R->selection.clicks == 2); 3104 + (selection.clicks == 2);
3152 } else { 3105 } else {
3153 R->selection.beg.row = R->selection.mark.row; 3106 selection.beg.row = selection.mark.row;
3154 R->selection.beg.col = R->selection.mark.col; 3107 selection.beg.col = selection.mark.col;
3155 R->selection.end.row = pos.row; 3108 selection.end.row = pos.row;
3156 R->selection.end.col = pos.col; 3109 selection.end.col = pos.col;
3157 } 3110 }
3158 } 3111 }
3159 3112
3160 if (R->selection.clicks == 1) { 3113 if (selection.clicks == 1) {
3161 end_col = R->screen.tlen[R->selection.beg.row + R->TermWin.saveLines]; 3114 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3162 if (end_col != -1 && R->selection.beg.col > end_col) { 3115 if (end_col != -1 && selection.beg.col > end_col) {
3163#if 1 3116#if 1
3164 R->selection.beg.col = ncol; 3117 selection.beg.col = ncol;
3165#else 3118#else
3166 if (R->selection.beg.row != R->selection.end.row) 3119 if (selection.beg.row != selection.end.row)
3167 R->selection.beg.col = ncol; 3120 selection.beg.col = ncol;
3168 else 3121 else
3169 R->selection.beg.col = R->selection.mark.col; 3122 selection.beg.col = selection.mark.col;
3170#endif 3123#endif
3171 } 3124 }
3172 end_col = R->screen.tlen[R->selection.end.row + R->TermWin.saveLines]; 3125 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3173 if (end_col != -1 && R->selection.end.col > end_col) 3126 if (end_col != -1 && selection.end.col > end_col)
3174 R->selection.end.col = ncol; 3127 selection.end.col = ncol;
3175 3128
3176 } else if (R->selection.clicks == 2) { 3129 } else if (selection.clicks == 2) {
3177 if (ROWCOL_IS_AFTER(R->selection.end, R->selection.beg)) 3130 if (ROWCOL_IS_AFTER(selection.end, selection.beg))
3178 R->selection.end.col--; 3131 selection.end.col--;
3179 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3132 selection_delimit_word (UP, &(selection.beg),
3180 &(R->selection.beg)); 3133 &(selection.beg));
3181 rxvt_selection_delimit_word(aR_ DN, &(R->selection.end), 3134 selection_delimit_word (DN, &(selection.end),
3182 &(R->selection.end)); 3135 &(selection.end));
3183 } else if (R->selection.clicks == 3) { 3136 } else if (selection.clicks == 3) {
3184#ifndef NO_FRILLS 3137#ifndef NO_FRILLS
3185 if ((R->Options & Opt_tripleclickwords)) { 3138 if ((Options & Opt_tripleclickwords)) {
3186 int end_row; 3139 int end_row;
3187 3140
3188 rxvt_selection_delimit_word(aR_ UP, &(R->selection.beg), 3141 selection_delimit_word (UP, &(selection.beg),
3189 &(R->selection.beg)); 3142 &(selection.beg));
3190 end_row = R->screen.tlen[R->selection.mark.row 3143 end_row = screen.tlen[selection.mark.row
3191 + R->TermWin.saveLines]; 3144 + TermWin.saveLines];
3192 for (end_row = R->selection.mark.row; end_row < R->TermWin.nrow; 3145 for (end_row = selection.mark.row; end_row < TermWin.nrow;
3193 end_row++) { 3146 end_row++) {
3194 end_col = R->screen.tlen[end_row + R->TermWin.saveLines]; 3147 end_col = screen.tlen[end_row + TermWin.saveLines];
3195 if (end_col != -1) { 3148 if (end_col != -1) {
3196 R->selection.end.row = end_row; 3149 selection.end.row = end_row;
3197 R->selection.end.col = end_col; 3150 selection.end.col = end_col;
3198 rxvt_selection_remove_trailing_spaces(aR); 3151 selection_remove_trailing_spaces ();
3199 break; 3152 break;
3200 } 3153 }
3201 } 3154 }
3202 } else 3155 } else
3203#endif 3156#endif
3204 { 3157 {
3205 if (ROWCOL_IS_AFTER(R->selection.mark, R->selection.beg)) 3158 if (ROWCOL_IS_AFTER(selection.mark, selection.beg))
3206 R->selection.mark.col++; 3159 selection.mark.col++;
3207 R->selection.beg.col = 0; 3160 selection.beg.col = 0;
3208 R->selection.end.col = ncol; 3161 selection.end.col = ncol;
3209 } 3162 }
3210 } 3163 }
3211 if (button3 && buttonpress) { /* mark may need to be changed */ 3164 if (button3 && buttonpress) { /* mark may need to be changed */
3212 if (closeto == LEFT) { 3165 if (closeto == LEFT) {
3213 R->selection.mark.row = R->selection.end.row; 3166 selection.mark.row = selection.end.row;
3214 R->selection.mark.col = R->selection.end.col 3167 selection.mark.col = selection.end.col
3215 - (R->selection.clicks == 2); 3168 - (selection.clicks == 2);
3216 } else { 3169 } else {
3217 R->selection.mark.row = R->selection.beg.row; 3170 selection.mark.row = selection.beg.row;
3218 R->selection.mark.col = R->selection.beg.col; 3171 selection.mark.col = selection.beg.col;
3219 } 3172 }
3220 } 3173 }
3221 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", R->selection.beg.row, R->selection.beg.col, R->selection.mark.row, R->selection.mark.col, R->selection.end.row, R->selection.end.col)); 3174 D_SELECT((stderr, "rxvt_selection_extend_colrow() EXIT b:(r:%d,c:%d) m:(r:%d,c:%d), e:(r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3222#endif /* ! NO_NEW_SELECTION */ 3175#endif /* ! NO_NEW_SELECTION */
3223} 3176}
3224 3177
3225#ifndef NO_FRILLS 3178#ifndef NO_FRILLS
3226/* INTPROTO */
3227void 3179void
3228rxvt_selection_remove_trailing_spaces(pR) 3180rxvt_term::selection_remove_trailing_spaces ()
3229{ 3181{
3230 int32_t end_col, end_row; 3182 int32_t end_col, end_row;
3231 text_t *stp; 3183 text_t *stp;
3232 3184
3233 end_col = R->selection.end.col; 3185 end_col = selection.end.col;
3234 end_row = R->selection.end.row; 3186 end_row = selection.end.row;
3235 for ( ; end_row >= R->selection.beg.row; ) { 3187 for ( ; end_row >= selection.beg.row; ) {
3236 stp = R->screen.text[end_row + R->TermWin.saveLines]; 3188 stp = screen.text[end_row + TermWin.saveLines];
3237 while (--end_col >= 0) { 3189 while (--end_col >= 0) {
3238 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3190 if (stp[end_col] != ' ' && stp[end_col] != '\t')
3239 break; 3191 break;
3240 } 3192 }
3241 if (end_col >= 0 3193 if (end_col >= 0
3242 || R->screen.tlen[end_row - 1 + R->TermWin.saveLines] != -1) { 3194 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) {
3243 R->selection.end.col = end_col + 1; 3195 selection.end.col = end_col + 1;
3244 R->selection.end.row = end_row; 3196 selection.end.row = end_row;
3245 break; 3197 break;
3246 } 3198 }
3247 end_row--; 3199 end_row--;
3248 end_col = R->TermWin.ncol; 3200 end_col = TermWin.ncol;
3249 } 3201 }
3250 if (R->selection.mark.row > R->selection.end.row) { 3202 if (selection.mark.row > selection.end.row) {
3251 R->selection.mark.row = R->selection.end.row; 3203 selection.mark.row = selection.end.row;
3252 R->selection.mark.col = R->selection.end.col; 3204 selection.mark.col = selection.end.col;
3253 } else if (R->selection.mark.row == R->selection.end.row 3205 } else if (selection.mark.row == selection.end.row
3254 && R->selection.mark.col > R->selection.end.col) 3206 && selection.mark.col > selection.end.col)
3255 R->selection.mark.col = R->selection.end.col; 3207 selection.mark.col = selection.end.col;
3256} 3208}
3257#endif 3209#endif
3258 3210
3259/* ------------------------------------------------------------------------- */ 3211/* ------------------------------------------------------------------------- */
3260/* 3212/*
3261 * Double click on button 3 when already selected 3213 * Double click on button 3 when already selected
3262 * EXT: button 3 double click 3214 * EXT: button 3 double click
3263 */ 3215 */
3264/* EXTPROTO */
3265void 3216void
3266rxvt_selection_rotate(pR_ int x, int y) 3217rxvt_term::selection_rotate (int x, int y)
3267{ 3218{
3268 R->selection.clicks = R->selection.clicks % 3 + 1; 3219 selection.clicks = selection.clicks % 3 + 1;
3269 rxvt_selection_extend_colrow(aR_ Pixel2Col(x), Pixel2Row(y), 1, 0, 1); 3220 selection_extend_colrow (Pixel2Col(x), Pixel2Row(y), 1, 0, 1);
3270} 3221}
3271 3222
3272/* ------------------------------------------------------------------------- */ 3223/* ------------------------------------------------------------------------- */
3273/* 3224/*
3274 * On some systems, the Atom typedef is 64 bits wide. We need to have a type 3225 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3275 * that is exactly 32 bits wide, because a format of 64 is not allowed by 3226 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3276 * the X11 protocol. 3227 * the X11 protocol.
3277 */ 3228 */
3278typedef CARD32 Atom32; 3229typedef CARD32 Atom32;
3279 3230
3280/* ------------------------------------------------------------------------- */ 3231/* ------------------------------------------------------------------------- */
3281/* 3232/*
3282 * Respond to a request for our current selection 3233 * Respond to a request for our current selection
3283 * EXT: SelectionRequest 3234 * EXT: SelectionRequest
3284 */ 3235 */
3285/* EXTPROTO */
3286void 3236void
3287rxvt_selection_send(pR_ const XSelectionRequestEvent *rq) 3237rxvt_term::selection_send (const XSelectionRequestEvent *rq)
3288{ 3238{
3289 XSelectionEvent ev; 3239 XSelectionEvent ev;
3290#ifdef USE_XIM
3291 Atom32 target_list[4];
3292#else
3293 Atom32 target_list[3];
3294#endif
3295 Atom target;
3296 XTextProperty ct; 3240 XTextProperty ct;
3297 XICCEncodingStyle style; 3241 XICCEncodingStyle style;
3298 char *cl[2], dummy[1]; 3242 Atom target;
3299 3243
3300 ev.type = SelectionNotify; 3244 ev.type = SelectionNotify;
3301 ev.property = None; 3245 ev.property = None;
3302 ev.display = rq->display; 3246 ev.display = rq->display;
3303 ev.requestor = rq->requestor; 3247 ev.requestor = rq->requestor;
3304 ev.selection = rq->selection; 3248 ev.selection = rq->selection;
3305 ev.target = rq->target; 3249 ev.target = rq->target;
3306 ev.time = rq->time; 3250 ev.time = rq->time;
3307 3251
3308 if (rq->target == R->xa[XA_TARGETS]) { 3252 if (rq->target == xa[XA_TARGETS]) {
3253 Atom32 target_list[5];
3254 Atom32 *target = target_list;
3255
3309 target_list[0] = (Atom32) R->xa[XA_TARGETS]; 3256 *target++ = (Atom32) xa[XA_TARGETS];
3310 target_list[1] = (Atom32) XA_STRING; 3257 *target++ = (Atom32) XA_STRING;
3311 target_list[2] = (Atom32) R->xa[XA_TEXT]; 3258 *target++ = (Atom32) xa[XA_TEXT];
3312#ifdef USE_XIM
3313 target_list[3] = (Atom32) R->xa[XA_COMPOUND_TEXT]; 3259 *target++ = (Atom32) xa[XA_COMPOUND_TEXT];
3260#if X_HAVE_UTF8_STRING
3261 *target++ = (Atom32) xa[XA_UTF8_STRING];
3314#endif 3262#endif
3315 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_ATOM, 3263 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_ATOM,
3316 (8 * sizeof(target_list[0])), PropModeReplace, 3264 (8 * sizeof(target_list[0])), PropModeReplace,
3317 (unsigned char *)target_list, 3265 (unsigned char *)target_list,
3318 (sizeof(target_list) / sizeof(target_list[0]))); 3266 target - target_list);
3319 ev.property = rq->property; 3267 ev.property = rq->property;
3320 } else if (rq->target == R->xa[XA_MULTIPLE]) { 3268 } else if (rq->target == xa[XA_MULTIPLE]) {
3321 /* TODO: Handle MULTIPLE */ 3269 /* TODO: Handle MULTIPLE */
3322 } else if (rq->target == R->xa[XA_TIMESTAMP] && R->selection.text) { 3270 } else if (rq->target == xa[XA_TIMESTAMP] && selection.text) {
3323 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, XA_INTEGER, 3271 XChangeProperty(Xdisplay, rq->requestor, rq->property, XA_INTEGER,
3324 (8 * sizeof(Time)), PropModeReplace, 3272 (8 * sizeof(Time)), PropModeReplace,
3325 (unsigned char *)&R->selection_time, 1); 3273 (unsigned char *)&selection_time, 1);
3326 ev.property = rq->property; 3274 ev.property = rq->property;
3327 } else if (rq->target == XA_STRING 3275 } else if (rq->target == XA_STRING
3276 || rq->target == xa[XA_TEXT]
3328 || rq->target == R->xa[XA_COMPOUND_TEXT] 3277 || rq->target == xa[XA_COMPOUND_TEXT]
3329 || rq->target == R->xa[XA_TEXT]) { 3278 || rq->target == xa[XA_UTF8_STRING]
3330#ifdef USE_XIM 3279 ) {
3331 short freect = 0; 3280 short freect = 0;
3332#endif
3333 int selectlen; 3281 int selectlen;
3282 char *cl;
3334 3283
3335#ifdef USE_XIM 3284 target = rq->target;
3285
3336 if (rq->target != XA_STRING) { 3286 if (target == XA_STRING)
3337 target = R->xa[XA_COMPOUND_TEXT]; 3287 // we actually don't do XA_STRING, but who cares, as i18n clients
3338 style = (rq->target == R->xa[XA_COMPOUND_TEXT]) 3288 // will ask for another format anyways.
3339 ? XCompoundTextStyle : XStdICCTextStyle;
3340 } else
3341#endif
3342 {
3343 target = XA_STRING;
3344 style = XStringStyle; 3289 style = XStringStyle;
3290 else if (target == xa[XA_TEXT])
3291 style = XTextStyle;
3292 else if (target == xa[XA_COMPOUND_TEXT])
3293 style = XCompoundTextStyle;
3294#if X_HAVE_UTF8_STRING
3295 else if (target == xa[XA_UTF8_STRING])
3296 style = XUTF8StringStyle;
3297#endif
3298 else
3299 {
3300 target = xa[XA_COMPOUND_TEXT];
3301 style = XCompoundTextStyle;
3345 } 3302 }
3303
3346 if (R->selection.text) { 3304 if (selection.text) {
3347 cl[0] = (char *)R->selection.text; 3305 cl = (char *)selection.text;
3348 selectlen = R->selection.len; 3306 selectlen = selection.len;
3349 } else { 3307 } else {
3350 cl[0] = dummy; 3308 cl = "";
3351 *dummy = '\0';
3352 selectlen = 0; 3309 selectlen = 0;
3353 } 3310 }
3354#ifdef USE_XIM 3311
3355 if (XmbTextListToTextProperty(R->Xdisplay, cl, 1, style, &ct) 3312 if (XmbTextListToTextProperty(Xdisplay, &cl, 1, style, &ct) >= 0)
3356 == Success) /* if we failed to convert then send it raw */
3357 freect = 1; 3313 freect = 1;
3358 else 3314 else
3359#endif
3360 { 3315 {
3316 /* if we failed to convert then send it raw */
3361 ct.value = (unsigned char *)cl[0]; 3317 ct.value = (unsigned char *)cl;
3362 ct.nitems = selectlen; 3318 ct.nitems = selectlen;
3363 } 3319 }
3320
3364 XChangeProperty(R->Xdisplay, rq->requestor, rq->property, 3321 XChangeProperty(Xdisplay, rq->requestor, rq->property,
3365 target, 8, PropModeReplace, 3322 target, 8, PropModeReplace,
3366 ct.value, (int)ct.nitems); 3323 ct.value, (int)ct.nitems);
3367 ev.property = rq->property; 3324 ev.property = rq->property;
3368#ifdef USE_XIM 3325
3369 if (freect) 3326 if (freect)
3370 XFree(ct.value); 3327 XFree (ct.value);
3371#endif
3372 } 3328 }
3373 XSendEvent(R->Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev); 3329 XSendEvent(Xdisplay, rq->requestor, False, 0L, (XEvent *)&ev);
3374} 3330}
3375 3331
3376/* ------------------------------------------------------------------------- * 3332/* ------------------------------------------------------------------------- *
3377 * MOUSE ROUTINES * 3333 * MOUSE ROUTINES *
3378 * ------------------------------------------------------------------------- */ 3334 * ------------------------------------------------------------------------- */
3379 3335
3380/* 3336/*
3381 * return col/row values corresponding to x/y pixel values 3337 * return col/row values corresponding to x/y pixel values
3382 */ 3338 */
3383/* EXTPROTO */
3384void 3339void
3385rxvt_pixel_position(pR_ int *x, int *y) 3340rxvt_term::pixel_position (int *x, int *y)
3386{ 3341{
3387 *x = Pixel2Col(*x); 3342 *x = Pixel2Col(*x);
3388/* MAX_IT(*x, 0); MIN_IT(*x, (int)R->TermWin.ncol - 1); */ 3343 /* MAX_IT(*x, 0); MIN_IT(*x, (int)TermWin.ncol - 1); */
3389 *y = Pixel2Row(*y); 3344 *y = Pixel2Row(*y);
3390/* MAX_IT(*y, 0); MIN_IT(*y, (int)R->TermWin.nrow - 1); */ 3345 /* MAX_IT(*y, 0); MIN_IT(*y, (int)TermWin.nrow - 1); */
3391} 3346}
3347
3392/* ------------------------------------------------------------------------- */ 3348/* ------------------------------------------------------------------------- */
3393#ifdef USE_XIM 3349#ifdef USE_XIM
3394/* EXTPROTO */
3395void 3350void
3396rxvt_setPosition(pR_ XPoint *pos) 3351rxvt_term::set_position (XPoint *pos)
3397{ 3352{
3398 XWindowAttributes xwa; 3353 XWindowAttributes xwa;
3399 3354
3400 XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &xwa); 3355 XGetWindowAttributes (Xdisplay, TermWin.vt, &xwa);
3401 pos->x = Col2Pixel(R->screen.cur.col) + xwa.x; 3356 pos->x = Col2Pixel (screen.cur.col) + xwa.x;
3402 pos->y = Height2Pixel((R->screen.cur.row + 1)) + xwa.y 3357 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace;
3403 - R->TermWin.lineSpace;
3404} 3358}
3359
3405#endif 3360#endif
3406/* ------------------------------------------------------------------------- */ 3361/* ------------------------------------------------------------------------- */
3407 3362
3408/* ------------------------------------------------------------------------- * 3363/* ------------------------------------------------------------------------- *
3409 * DEBUG ROUTINES * 3364 * DEBUG ROUTINES *
3410 * ------------------------------------------------------------------------- */ 3365 * ------------------------------------------------------------------------- */
3411#if 0 3366#if 0
3412/* INTPROTO */
3413void 3367void
3414rxvt_debug_colors(void) 3368rxvt_debug_colors(void)
3415{ 3369{
3416 int color; 3370 int color;
3417 const char *name[] = { 3371 const char *name[] = {
3418 "fg", "bg", 3372 "fg", "bg",
3419 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" 3373 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3420 }; 3374 };
3421 3375
3422 fprintf(stderr, "Color ( "); 3376 fprintf(stderr, "Color ( ");
3423 if (R->rstyle & RS_RVid) 3377 if (rstyle & RS_RVid)
3424 fprintf(stderr, "rvid "); 3378 fprintf(stderr, "rvid ");
3425 if (R->rstyle & RS_Bold) 3379 if (rstyle & RS_Bold)
3426 fprintf(stderr, "bold "); 3380 fprintf(stderr, "bold ");
3427 if (R->rstyle & RS_Blink) 3381 if (rstyle & RS_Blink)
3428 fprintf(stderr, "blink "); 3382 fprintf(stderr, "blink ");
3429 if (R->rstyle & RS_Uline) 3383 if (rstyle & RS_Uline)
3430 fprintf(stderr, "uline "); 3384 fprintf(stderr, "uline ");
3431 fprintf(stderr, "): "); 3385 fprintf(stderr, "): ");
3432 3386
3433 color = GET_FGCOLOR(R->rstyle); 3387 color = GET_FGCOLOR(rstyle);
3434#ifndef NO_BRIGHTCOLOR 3388#ifndef NO_BRIGHTCOLOR
3435 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3389 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3436 color -= (minBrightCOLOR - minCOLOR); 3390 color -= (minBrightCOLOR - minCOLOR);
3437 fprintf(stderr, "bright "); 3391 fprintf(stderr, "bright ");
3438 } 3392 }
3439#endif 3393#endif
3440 fprintf(stderr, "%s on ", name[color]); 3394 fprintf(stderr, "%s on ", name[color]);
3441 3395
3442 color = GET_BGCOLOR(R->rstyle); 3396 color = GET_BGCOLOR(rstyle);
3443#ifndef NO_BRIGHTCOLOR 3397#ifndef NO_BRIGHTCOLOR
3444 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) { 3398 if (color >= minBrightCOLOR && color <= maxBrightCOLOR) {
3445 color -= (minBrightCOLOR - minCOLOR); 3399 color -= (minBrightCOLOR - minCOLOR);
3446 fprintf(stderr, "bright "); 3400 fprintf(stderr, "bright ");
3447 } 3401 }

Diff Legend

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