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.8 by pcg, Wed Dec 17 09:00:35 2003 UTC vs.
Revision 1.29 by pcg, Wed Feb 11 08:13:45 2004 UTC

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

Diff Legend

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