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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.158 by root, Sat Feb 19 19:37:34 2005 UTC

… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */
31 29
32#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
33 31
34#include <inttypes.h> 32#include <inttypes.h>
35#include <wchar.h>
36 33
37#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
38 35
39inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
40{ 37{
41 while (len--) 38 while (len--)
42 *start++ = value; 39 *start++ = value;
43} 40}
44 41
45/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if (Options & Opt_scrollTtyOutput) \ 51 if (options & Opt_scrollTtyOutput) \
54 TermWin.view_start = 0 52 TermWin.view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
113 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
114 112
115/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
118/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
119void 118void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
121{ 120{
122 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
123 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
124 123
125 while (width--) 124 while (width--)
126 { 125 {
127 *et++ = ' '; 126 *et++ = ' ';
128 *er++ = efs; 127 *er++ = efs;
… …
155 unsigned int ncol, nrow, total_rows, prev_total_rows; 154 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q; 155 unsigned int p, q;
157 int k; 156 int k;
158 rend_t setrstyle; 157 rend_t setrstyle;
159 158
160 D_SCREEN ((stderr, "rxvt_scr_reset ()")); 159#if ENABLE_OVERLAY
160 scr_overlay_off ();
161#endif
161 162
162 TermWin.view_start = 0; 163 TermWin.view_start = 0;
163 num_scr = 0; 164 num_scr = 0;
164 165
165 if (TermWin.ncol == 0) 166 if (TermWin.ncol == 0)
… …
222 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); 223 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
223 screen.tlen[q] = swap.tlen[p] = 0; 224 screen.tlen[q] = swap.tlen[p] = 0;
224 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); 225 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
225 } 226 }
226 227
227 MEMSET (charsets, 'B', sizeof (charsets)); 228 memset (charsets, 'B', sizeof (charsets));
228 TermWin.nscrolled = 0; /* no saved lines */ 229 TermWin.nscrolled = 0; /* no saved lines */
229 rstyle = DEFAULT_RSTYLE; 230 rstyle = DEFAULT_RSTYLE;
230 screen.flags = Screen_DefaultFlags; 231 screen.flags = Screen_DefaultFlags;
231 screen.cur.row = screen.cur.col = 0; 232 screen.cur.row = screen.cur.col = 0;
232 screen.charset = 0; 233 screen.charset = 0;
… …
292 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
293 } 294 }
294 295
295 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
296 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
297 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
298 298
299 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
300 } 300 }
301 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
302 { 302 {
… …
333 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
334 screen.cur.row += k; 334 screen.cur.row += k;
335 screen.s_cur.row += k; 335 screen.s_cur.row += k;
336 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
337 } 337 }
338
338#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
339 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
340 assert (swap.cur.row < TermWin.nrow);
341#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
342
343 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
344 MIN_IT (swap.cur.row, nrow - 1);
345#endif 343#endif
346 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
347 } 345 }
348 346
349 /* resize columns */ 347 /* resize columns */
… …
392 } 390 }
393 391
394 } 392 }
395 393
396 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
397 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
398 395
399 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
400 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
401 } 398 }
402 399
… …
416} 413}
417 414
418void 415void
419rxvt_term::scr_reset_realloc () 416rxvt_term::scr_reset_realloc ()
420{ 417{
421 uint16_t total_rows, nrow; 418 unsigned int total_rows, nrow;
422 419
423 nrow = TermWin.nrow; 420 nrow = TermWin.nrow;
424 total_rows = nrow + TermWin.saveLines; 421 total_rows = nrow + TermWin.saveLines;
425 /* *INDENT-OFF* */ 422 /* *INDENT-OFF* */
426 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
443 * Free everything. That way malloc debugging can find leakage. 440 * Free everything. That way malloc debugging can find leakage.
444 */ 441 */
445void 442void
446rxvt_term::scr_release () 443rxvt_term::scr_release ()
447{ 444{
448 uint16_t total_rows; 445 unsigned int total_rows;
449 int i; 446 int i;
450 447
451 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
452 449
453 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
… …
479 * Hard reset 476 * Hard reset
480 */ 477 */
481void 478void
482rxvt_term::scr_poweron () 479rxvt_term::scr_poweron ()
483{ 480{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 481 scr_release ();
487 prev_nrow = prev_ncol = 0; 482 prev_nrow = prev_ncol = 0;
488 scr_reset (); 483 scr_reset ();
489 484
490 scr_clear (true); 485 scr_clear (true);
… …
501 */ 496 */
502void 497void
503rxvt_term::scr_cursor (int mode) 498rxvt_term::scr_cursor (int mode)
504{ 499{
505 screen_t *s; 500 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 501
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 502#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 503 if (current_screen == SECONDARY)
511 s = &swap; 504 s = &swap;
512 else 505 else
… …
514 s = &screen; 507 s = &screen;
515 508
516 switch (mode) 509 switch (mode)
517 { 510 {
518 case SAVE: 511 case SAVE:
519 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
520 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
521 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
522 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
523 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
524 break; 517 break;
525 518
526 case RESTORE: 519 case RESTORE:
527 want_refresh = 1; 520 want_refresh = 1;
528 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
529 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
530 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
531 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
532 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
533 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
534 set_font_style (); 527 set_font_style ();
535 break; 528 break;
536 } 529 }
537 530
538 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
561 int offset; 554 int offset;
562#endif 555#endif
563 556
564 want_refresh = 1; 557 want_refresh = 1;
565 558
566 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
567
568 TermWin.view_start = 0; 559 TermWin.view_start = 0;
569 560
570 if (current_screen == scrn) 561 if (current_screen == scrn)
571 return scrn; 562 return scrn;
572 563
573 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
574 565
575 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
576#if NSCREENS 575#if NSCREENS
577 if (Options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
578 { 577 {
579 num_scr = 0; 578 num_scr = 0;
580 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
581 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
582 { 582 {
583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
586 } 586 }
587 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
588 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
589# ifdef DEBUG_STRICT
590 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
591 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
592# else /* drive with your eyes closed */
593 MAX_IT (screen.cur.row, 0);
594 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
595 MAX_IT (screen.cur.col, 0);
596 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
597# endif
598 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
599 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
600 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
601 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
602 } 592 }
603 else 593 else
604#endif 594#endif
605 if (Options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
606 //if (current_screen == PRIMARY)
607 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
608 return scrn; 598 return scrn;
609} 599}
610 600
601// clear WrapNext indicator, solidifying position on next line
602void
603rxvt_term::scr_do_wrap ()
604{
605 if (!(screen.flags & Screen_WrapNext))
606 return;
607
608 screen.flags &= ~Screen_WrapNext;
609
610 screen.cur.col = 0;
611
612 if (screen.cur.row == screen.bscroll)
613 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
614 else if (screen.cur.row < TermWin.nrow - 1)
615 screen.cur.row++;
616}
617
611/* ------------------------------------------------------------------------- */ 618/* ------------------------------------------------------------------------- */
612/* 619/*
613 * Change the colour for following text 620 * Change the colour for following text
614 */ 621 */
615void 622void
616rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
617{ 624{
618 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
619 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
620 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
621 else 630 else
622 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
623} 632}
… …
652 661
653 if (count == 0 || (row1 > row2)) 662 if (count == 0 || (row1 > row2))
654 return 0; 663 return 0;
655 664
656 want_refresh = 1; 665 want_refresh = 1;
657 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary"));
658 666
659 if (row1 == 0 && count > 0 667 if (row1 == 0 && count > 0
660 && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) 668 && (current_screen == PRIMARY || options & Opt_secondaryScroll))
661 { 669 {
662 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
663 671
664 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
665 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
666 else 674 else
667 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
668 676
669 if ((Options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
670 && TermWin.view_start != 0 678 && TermWin.view_start != 0
671 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
672 scr_page (UP, count); 680 scr_page (UP, count);
673 } 681 }
674 else if (!spec) 682 else if (!spec)
… …
765 * Add text given in <str> of length <len> to screen struct 773 * Add text given in <str> of length <len> to screen struct
766 */ 774 */
767void 775void
768rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 776rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len)
769{ 777{
770 unsigned char checksel, clearsel; 778 unsigned char checksel;
771 unicode_t c; 779 unicode_t c;
772 int i, row, last_col; 780 int i, row, last_col;
773 text_t *stp; 781 text_t *stp;
774 rend_t *srp; 782 rend_t *srp;
775 783
776 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
777 return; 785 return;
778 786
779 want_refresh = 1; 787 want_refresh = 1;
788 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 789 last_col = TermWin.ncol;
781 790
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 791 if (nlines > 0)
785 { 792 {
786 nlines += screen.cur.row - screen.bscroll; 793 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 794 if ((nlines > 0)
788 && (screen.tscroll == 0) 795 && (screen.tscroll == 0)
… …
804 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
805#endif 812#endif
806 row = screen.cur.row + TermWin.saveLines; 813 row = screen.cur.row + TermWin.saveLines;
807 814
808 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 815 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
809 clearsel = 0;
810 816
811 stp = screen.text[row]; 817 stp = screen.text[row];
812 srp = screen.rend[row]; 818 srp = screen.rend[row];
813 819
814 while (len--) 820 while (len--)
… …
817 823
818 if (c < 0x20) 824 if (c < 0x20)
819 switch (c) 825 switch (c)
820 { 826 {
821 case C0_HT: 827 case C0_HT:
822 scr_tab (1); 828 scr_tab (1, true);
823 continue; 829 continue;
824 830
825 case C0_LF: 831 case C0_LF:
826 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
827 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
… …
849 if (checksel /* see if we're writing within selection */ 855 if (checksel /* see if we're writing within selection */
850 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
851 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 857 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
852 { 858 {
853 checksel = 0; 859 checksel = 0;
854 clearsel = 1; 860 /*
861 * If we wrote anywhere in the selected area, kill the selection
862 * XXX: should we kill the mark too? Possibly, but maybe that
863 * should be a similar check.
864 */
865 CLEAR_SELECTION ();
855 } 866 }
856 867
857 if (screen.flags & Screen_WrapNext) 868 if (screen.flags & Screen_WrapNext)
858 { 869 {
859 screen.tlen[row] = -1; 870 screen.tlen[row] = -1;
860 if (screen.cur.row == screen.bscroll) 871
861 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
862 else if (screen.cur.row < (TermWin.nrow - 1))
863 row = (++screen.cur.row) + TermWin.saveLines; 872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
864 873
865 stp = screen.text[row]; /* _must_ refresh */ 874 stp = screen.text[row]; /* _must_ refresh */
866 srp = screen.rend[row]; /* _must_ refresh */ 875 srp = screen.rend[row]; /* _must_ refresh */
867 screen.cur.col = 0;
868 screen.flags &= ~Screen_WrapNext;
869 } 876 }
870
871 if (screen.flags & Screen_Insert)
872 scr_insdel_chars (1, INSERT);
873 877
874 // rely on wcwidth to tell us the character width, at least for non-latin1 878 // rely on wcwidth to tell us the character width, at least for non-latin1
875 // do wcwidth before further replacements, as wcwidth says that line-drawing 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
876 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
877 int width = c < 0x100 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
878 882
879 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
880 { 884 {
881 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars
882 static uint16_t vt100_0[32] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
883 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
884 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
885 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
886 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
887 }; 897 };
888 898
889 if (c >= 0x5f && c <= 0x7e) 899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
890 { 900 {
891 c = vt100_0[c - 0x5f]; 901 c = vt100_0[c - 0x40];
892 width = 1; 902 width = 1;
893 } 903 }
894 } 904 }
895 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
896 if (width != 0) 909 if (width != 0)
897 { 910 {
898#if !UNICODE_3 && ENABLE_COMBINING 911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3
899 // trim characters we can't store directly :( 916 // trim characters we can't store directly :(
900 if (c >= 0x10000) 917 if (c >= 0x10000)
918# if ENABLE_COMBINING
901 c = rxvt_composite.compose (c); // map to lower 16 bits 919 c = rxvt_composite.compose (c); // map to lower 16 bits
920# else
921 c = 0xfffd;
902#endif 922# endif
903 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 923#endif
904 rend_t rend = SET_FONT (rstyle, 924
905 c > 0x7f || bold || c < 0x20 925 // nuke the character at this position, if required
906 ? TermWin.fontset->find_font (c, bold) 926 if (stp[screen.cur.col] == NOCHAR
907 : TermWin.ascii_map [c - 0x20]); 927 || (screen.cur.col < TermWin.ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR))
929 {
930 int col = screen.cur.col;
931
932 // find begin
933 while (col > 0 && stp[col] == NOCHAR)
934 col--;
935
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
937
938 // found begin, nuke
939 do {
940 stp[col] = ' ';
941 srp[col] = rend;
942 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR);
944 }
945
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 947
909 do 948 do
910 { 949 {
911 stp[screen.cur.col] = c; 950 stp[screen.cur.col] = c;
912 srp[screen.cur.col] = rend; 951 srp[screen.cur.col] = rend;
… …
924 c = NOCHAR; 963 c = NOCHAR;
925 } 964 }
926 while (--width > 0); 965 while (--width > 0);
927 966
928 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
929 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
930 { 970 {
931 stp[c] = ' '; 971 stp[c] = ' ';
932 srp[c] = rend; 972 srp[c] = rend;
933 } 973 }
934 } 974 }
935 else if (width == 0) 975 else if (width == 0)
936 { 976 {
937#if ENABLE_COMBINING 977#if ENABLE_COMBINING
938 // handle combining characters 978 // handle combining characters
… …
945 985
946 if (screen.cur.col > 0) 986 if (screen.cur.col > 0)
947 { 987 {
948 tp = stp + screen.cur.col - 1; 988 tp = stp + screen.cur.col - 1;
949 rp = srp + screen.cur.col - 1; 989 rp = srp + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
950 } 993 }
951 else if (screen.cur.row > 0 994 else if (screen.cur.row > 0
952 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
953 { 996 {
954 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 997 int line = screen.cur.row - 1 + TermWin.saveLines;
955 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 998
999 tp = screen.text[line] + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
956 } 1004 }
957 else 1005 else
958 continue; 1006 continue;
959
960 // handle double-width-chars by making them look extremely ugly
961 if (*tp == NOCHAR)
962 *tp = ' '; // hack //D //TODO //--tp, --rp;
963 1007
964 // first try to find a precomposed character 1008 // first try to find a precomposed character
965 unicode_t n = rxvt_compose (*tp, c); 1009 unicode_t n = rxvt_compose (*tp, c);
966 if (n == NOCHAR) 1010 if (n == NOCHAR)
967 n = rxvt_composite.compose (*tp, c); 1011 n = rxvt_composite.compose (*tp, c);
968 1012
969 *tp = n; 1013 *tp = n;
970 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
971#endif 1015#endif
972 } 1016 }
973 } 1017 }
974 1018
975 if (screen.tlen[row] != -1) /* XXX: think about this */ 1019 if (screen.tlen[row] != -1) /* XXX: think about this */
976 MAX_IT (screen.tlen[row], screen.cur.col); 1020 MAX_IT (screen.tlen[row], screen.cur.col);
977
978 /*
979 * If we wrote anywhere in the selected area, kill the selection
980 * XXX: should we kill the mark too? Possibly, but maybe that
981 * should be a similar check.
982 */
983 if (clearsel)
984 CLEAR_SELECTION ();
985 1021
986#ifdef DEBUG_STRICT 1022#ifdef DEBUG_STRICT
987 assert (screen.cur.row >= 0); 1023 assert (screen.cur.row >= 0);
988#else /* drive with your eyes closed */ 1024#else /* drive with your eyes closed */
989 MAX_IT (screen.cur.row, 0); 1025 MAX_IT (screen.cur.row, 0);
… …
1007#ifdef TERMCAP_HAS_BW 1043#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = TermWin.ncol - 1; 1044 screen.cur.col = TermWin.ncol - 1;
1009 screen.cur.row--; 1045 screen.cur.row--;
1010 return; 1046 return;
1011#endif 1047#endif
1012
1013 } 1048 }
1014 } 1049 }
1015 else if ((screen.flags & Screen_WrapNext) == 0) 1050 else if (!(screen.flags & Screen_WrapNext))
1016 scr_gotorc (0, -1, RELATIVE); 1051 scr_gotorc (0, -1, RELATIVE);
1017 1052
1018 screen.flags &= ~Screen_WrapNext; 1053 screen.flags &= ~Screen_WrapNext;
1019} 1054}
1020 1055
… …
1023 * Process Horizontal Tab 1058 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1059 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1060 * XTERM_SEQ: CTRL-I
1026 */ 1061 */
1027void 1062void
1028rxvt_term::scr_tab (int count) 1063rxvt_term::scr_tab (int count, bool ht)
1029{ 1064{
1030 int i, x; 1065 int i, x;
1031 1066
1032 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1033 want_refresh = 1; 1067 want_refresh = 1;
1034 i = x = screen.cur.col; 1068 i = x = screen.cur.col;
1035 1069
1036 if (count == 0) 1070 if (count == 0)
1037 return; 1071 return;
1038 else if (count > 0) 1072 else if (count > 0)
1039 { 1073 {
1074 int row = TermWin.saveLines + screen.cur.row;
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i];
1078 ht &= tp[i] == ' ';
1079
1040 for (; ++i < TermWin.ncol; ) 1080 for (; ++i < TermWin.ncol; )
1041 if (tabs[i]) 1081 if (tabs[i])
1042 { 1082 {
1043 x = i; 1083 x = i;
1044 if (!--count) 1084 if (!--count)
1045 break; 1085 break;
1046 } 1086 }
1087 else
1088 ht &= tp[i] == ' '
1089 && RS_SAME (rp[i], base_rend);
1047 1090
1048 if (count) 1091 if (count)
1049 x = TermWin.ncol - 1; 1092 x = TermWin.ncol - 1;
1093
1094 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs)
1097 {
1098 base_rend = SET_FONT (base_rend, 0);
1099
1100 if (screen.tlen[row] != -1) /* XXX: think about this */
1101 MAX_IT (screen.tlen[row], x);
1102
1103 i = screen.cur.col;
1104
1105 tp[i] = '\t';
1106 rp[i] = base_rend;
1107
1108 while (++i < x)
1109 {
1110 tp[i] = NOCHAR;
1111 rp[i] = base_rend;
1112 }
1113 }
1050 } 1114 }
1051 else /* if (count < 0) */ 1115 else /* if (count < 0) */
1052 { 1116 {
1053 for (; --i >= 0; ) 1117 for (; --i >= 0; )
1054 if (tabs[i]) 1118 if (tabs[i])
… …
1071 * Process DEC Back Index 1135 * Process DEC Back Index
1072 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1073 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1074 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1075 */ 1139 */
1076#ifndef NO_FRILLS 1140#if ENABLE_FRILLS
1077void 1141void
1078rxvt_term::scr_backindex () 1142rxvt_term::scr_backindex ()
1079{ 1143{
1080 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1081 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1082 else 1146 else
1083 { 1147 {
1084 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1085 return; /* um, yeah? */ 1149 return; /* um, yeah? */
1150
1086 scr_insdel_chars (1, INSERT); 1151 scr_insdel_chars (1, INSERT);
1087 } 1152 }
1088} 1153}
1089#endif 1154#endif
1090/* ------------------------------------------------------------------------- */ 1155/* ------------------------------------------------------------------------- */
… …
1092 * Process DEC Forward Index 1157 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1096 */ 1161 */
1097#ifndef NO_FRILLS 1162#if ENABLE_FRILLS
1098void 1163void
1099rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1100{ 1165{
1101 int row; 1166 int row;
1102 1167
1103 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1104 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1105 else 1170 else
1106 { 1171 {
1107 row = screen.cur.row + TermWin.saveLines; 1172 row = screen.cur.row + TermWin.saveLines;
1173
1108 if (screen.tlen[row] == 0) 1174 if (screen.tlen[row] == 0)
1109 return; /* um, yeah? */ 1175 return; /* um, yeah? */
1110 else if (screen.tlen[row] == -1) 1176 else if (screen.tlen[row] == -1)
1111 screen.tlen[row] = TermWin.ncol; 1177 screen.tlen[row] = TermWin.ncol;
1178
1112 scr_gotorc (0, 0, R_RELATIVE); 1179 scr_gotorc (0, 0, R_RELATIVE);
1113 scr_insdel_chars (1, DELETE); 1180 scr_insdel_chars (1, DELETE);
1114 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1115 } 1182 }
1116} 1183}
… …
1124rxvt_term::scr_gotorc (int row, int col, int relative) 1191rxvt_term::scr_gotorc (int row, int col, int relative)
1125{ 1192{
1126 want_refresh = 1; 1193 want_refresh = 1;
1127 ZERO_SCROLLBACK (); 1194 ZERO_SCROLLBACK ();
1128 1195
1129 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));
1130
1131 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1132 MAX_IT (screen.cur.col, 0); 1197 MAX_IT (screen.cur.col, 0);
1133 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1134 1199
1135 screen.flags &= ~Screen_WrapNext; 1200 screen.flags &= ~Screen_WrapNext;
1201
1136 if (relative & R_RELATIVE) 1202 if (relative & R_RELATIVE)
1137 { 1203 {
1138 if (row > 0) 1204 if (row > 0)
1139 { 1205 {
1140 if (screen.cur.row <= screen.bscroll 1206 if (screen.cur.row <= screen.bscroll
… …
1160 MIN_IT (screen.cur.row, screen.bscroll); 1226 MIN_IT (screen.cur.row, screen.bscroll);
1161 } 1227 }
1162 else 1228 else
1163 screen.cur.row = row; 1229 screen.cur.row = row;
1164 } 1230 }
1231
1165 MAX_IT (screen.cur.row, 0); 1232 MAX_IT (screen.cur.row, 0);
1166 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1233 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1167
1168 while (screen.cur.col > 0
1169 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1170 screen.cur.col--;
1171} 1234}
1172 1235
1173/* ------------------------------------------------------------------------- */ 1236/* ------------------------------------------------------------------------- */
1174/* 1237/*
1175 * direction should be UP or DN 1238 * direction should be UP or DN
1176 */ 1239 */
1177void 1240void
1178rxvt_term::scr_index (enum page_dirn direction) 1241rxvt_term::scr_index (enum page_dirn direction)
1179{ 1242{
1180 int dirn; 1243 int dirn;
1181 1244
1182 want_refresh = 1; 1245 want_refresh = 1;
1246 ZERO_SCROLLBACK ();
1247
1183 dirn = ((direction == UP) ? 1 : -1); 1248 dirn = ((direction == UP) ? 1 : -1);
1184 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1185
1186 ZERO_SCROLLBACK ();
1187 1249
1188 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
1251
1189 if ((screen.cur.row == screen.bscroll && direction == UP) 1252 if ((screen.cur.row == screen.bscroll && direction == UP)
1190 || (screen.cur.row == screen.tscroll && direction == DN)) 1253 || (screen.cur.row == screen.tscroll && direction == DN))
1191 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1192 else 1255 else
1193 screen.cur.row += dirn; 1256 screen.cur.row += dirn;
1257
1194 MAX_IT (screen.cur.row, 0); 1258 MAX_IT (screen.cur.row, 0);
1195 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1196 selection_check (0); 1260 selection_check (0);
1197} 1261}
1198 1262
… …
1207rxvt_term::scr_erase_line (int mode) 1271rxvt_term::scr_erase_line (int mode)
1208{ 1272{
1209 unsigned int row, col, num; 1273 unsigned int row, col, num;
1210 1274
1211 want_refresh = 1; 1275 want_refresh = 1;
1212 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1213 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
1214 1277
1215 selection_check (1); 1278 selection_check (1);
1216
1217 screen.flags &= ~Screen_WrapNext;
1218 1279
1219 row = TermWin.saveLines + screen.cur.row; 1280 row = TermWin.saveLines + screen.cur.row;
1220 switch (mode) 1281 switch (mode)
1221 { 1282 {
1222 case 0: /* erase to end of line */ 1283 case 0: /* erase to end of line */
… …
1266 int32_t row, row_offset; 1327 int32_t row, row_offset;
1267 rend_t ren; 1328 rend_t ren;
1268 XGCValues gcvalue; 1329 XGCValues gcvalue;
1269 1330
1270 want_refresh = 1; 1331 want_refresh = 1;
1271 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1272 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1333
1273 row_offset = (int32_t)TermWin.saveLines; 1334 row_offset = (int32_t)TermWin.saveLines;
1274 1335
1275 switch (mode) 1336 switch (mode)
1276 { 1337 {
1277 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
… …
1313 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1314 CLEAR_ROWS (row, num); 1375 CLEAR_ROWS (row, num);
1315 } 1376 }
1316 else 1377 else
1317 { 1378 {
1318 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1319 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1320 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1321 ERASE_ROWS (row, num); 1382 ERASE_ROWS (row, num);
1322 gcvalue.foreground = PixColors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1323 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1324 } 1385 }
1325 1386
1326 for (; num--; row++) 1387 for (; num--; row++)
1327 { 1388 {
1328 scr_blank_screen_mem (screen.text, screen.rend, 1389 scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle);
1329 (unsigned int) (row + row_offset), rstyle);
1330 screen.tlen[row + row_offset] = 0; 1390 screen.tlen[row + row_offset] = 0;
1331 scr_blank_line (drawn_text[row], drawn_rend[row], 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1332 (unsigned int)TermWin.ncol, ren);
1333 } 1392 }
1334} 1393}
1335 1394
1336/* ------------------------------------------------------------------------- */ 1395/* ------------------------------------------------------------------------- */
1337/* 1396/*
… …
1343{ 1402{
1344 int i, j, k; 1403 int i, j, k;
1345 rend_t *r1, fs; 1404 rend_t *r1, fs;
1346 1405
1347 want_refresh = 1; 1406 want_refresh = 1;
1407 ZERO_SCROLLBACK ();
1408
1348 num_scr_allow = 0; 1409 num_scr_allow = 0;
1349 ZERO_SCROLLBACK ();
1350 selection_check (3); 1410 selection_check (3);
1351 1411
1352 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1353 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1413 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1354 { 1414 {
1355 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1415 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1356 fill_text (screen.text[k], 'E', TermWin.ncol); 1416 fill_text (screen.text[k], 'E', TermWin.ncol);
1357 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1417 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1381 if (insdel == DELETE) 1441 if (insdel == DELETE)
1382 return; 1442 return;
1383 else if (insdel == INSERT) 1443 else if (insdel == INSERT)
1384 count = end; 1444 count = end;
1385 } 1445 }
1386 screen.flags &= ~Screen_WrapNext; 1446
1447 scr_do_wrap ();
1387 1448
1388 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1449 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1389} 1450}
1390 1451
1391/* ------------------------------------------------------------------------- */ 1452/* ------------------------------------------------------------------------- */
… …
1405 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1406 1467
1407 if (count <= 0) 1468 if (count <= 0)
1408 return; 1469 return;
1409 1470
1471 scr_do_wrap ();
1472
1410 selection_check (1); 1473 selection_check (1);
1411 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1474 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1412 1475
1413 row = screen.cur.row + TermWin.saveLines; 1476 row = screen.cur.row + TermWin.saveLines;
1414 screen.flags &= ~Screen_WrapNext;
1415 1477
1416 stp = screen.text[row]; 1478 stp = screen.text[row];
1417 srp = screen.rend[row]; 1479 srp = screen.rend[row];
1418 slp = & (screen.tlen[row]); 1480 slp = &screen.tlen[row];
1419 1481
1420 switch (insdel) 1482 switch (insdel)
1421 { 1483 {
1422 case INSERT: 1484 case INSERT:
1423 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1485 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1424 col--)
1425 { 1486 {
1426 stp[col] = stp[col - count]; 1487 stp[col] = stp[col - count];
1427 srp[col] = srp[col - count]; 1488 srp[col] = srp[col - count];
1428 } 1489 }
1429 1490
… …
1439 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1440 || (selection.end.col + count >= TermWin.ncol)) 1501 || (selection.end.col + count >= TermWin.ncol))
1441 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1442 else 1503 else
1443 { /* shift selection */ 1504 { /* shift selection */
1444 selection.beg.col += count; 1505 selection.beg.col += count;
1445 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1446 selection.end.col += count; 1507 selection.end.col += count;
1447 } 1508 }
1448 } 1509 }
1449 1510
1450 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1511 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1451 (unsigned int)count, rstyle); 1512 (unsigned int)count, rstyle);
1452 break; 1513 break;
1453 1514
1454 case ERASE: 1515 case ERASE:
1455 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1516 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1456 selection_check (1); 1517 selection_check (1);
1457 screen.cur.col -= count; 1518 screen.cur.col -= count;
1458 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1519 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1459 (unsigned int)count, rstyle); 1520 (unsigned int)count, rstyle);
1460 break; 1521 break;
1461 1522
1462 case DELETE: 1523 case DELETE:
1463 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1524 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1466 { 1527 {
1467 stp[col] = stp[col + count]; 1528 stp[col] = stp[col + count];
1468 srp[col] = srp[col + count]; 1529 srp[col] = srp[col + count];
1469 } 1530 }
1470 1531
1471 scr_blank_line (& (stp[TermWin.ncol - count]), 1532 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1472 & (srp[TermWin.ncol - count]),
1473 (unsigned int)count, tr); 1533 (unsigned int)count, tr);
1474 1534
1475 if (*slp == -1) /* break line continuation */ 1535 if (*slp == -1) /* break line continuation */
1476 *slp = TermWin.ncol; 1536 *slp = TermWin.ncol;
1477 1537
… …
1486 || selection.end.col >= TermWin.ncol) 1546 || selection.end.col >= TermWin.ncol)
1487 CLEAR_SELECTION (); 1547 CLEAR_SELECTION ();
1488 else 1548 else
1489 { 1549 {
1490 /* shift selection */ 1550 /* shift selection */
1491 selection.beg.col -= count; 1551 selection.beg.col -= count;
1492 selection.mark.col -= count; /* XXX: yes? */ 1552 selection.mark.col -= count; /* XXX: yes? */
1493 selection.end.col -= count; 1553 selection.end.col -= count;
1494 } 1554 }
1495 } 1555 }
1496 1556
1497 break; 1557 break;
1498 } 1558 }
… …
1544rxvt_term::scr_autowrap (int mode) 1604rxvt_term::scr_autowrap (int mode)
1545{ 1605{
1546 if (mode) 1606 if (mode)
1547 screen.flags |= Screen_Autowrap; 1607 screen.flags |= Screen_Autowrap;
1548 else 1608 else
1549 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1609 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1550} 1610}
1551 1611
1552/* ------------------------------------------------------------------------- */ 1612/* ------------------------------------------------------------------------- */
1553/* 1613/*
1554 * Set/unset margin origin mode 1614 * Set/unset margin origin mode
… …
1564{ 1624{
1565 if (mode) 1625 if (mode)
1566 screen.flags |= Screen_Relative; 1626 screen.flags |= Screen_Relative;
1567 else 1627 else
1568 screen.flags &= ~Screen_Relative; 1628 screen.flags &= ~Screen_Relative;
1629
1569 scr_gotorc (0, 0, 0); 1630 scr_gotorc (0, 0, 0);
1570} 1631}
1571 1632
1572/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1573/* 1634/*
… …
1593 */ 1654 */
1594void 1655void
1595rxvt_term::scr_set_tab (int mode) 1656rxvt_term::scr_set_tab (int mode)
1596{ 1657{
1597 if (mode < 0) 1658 if (mode < 0)
1598 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1659 memset (tabs, 0, TermWin.ncol * sizeof (char));
1599 else if (screen.cur.col < TermWin.ncol) 1660 else if (screen.cur.col < TermWin.ncol)
1600 tabs[screen.cur.col] = (mode ? 1 : 0); 1661 tabs[screen.cur.col] = (mode ? 1 : 0);
1601} 1662}
1602 1663
1603/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1607 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1668 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1608 */ 1669 */
1609void 1670void
1610rxvt_term::scr_rvideo_mode (int mode) 1671rxvt_term::scr_rvideo_mode (int mode)
1611{ 1672{
1612 XGCValues gcvalue; 1673 XGCValues gcvalue;
1613 1674
1614 if (rvideo != mode) 1675 if (rvideo != mode)
1615 { 1676 {
1616 rvideo = mode; 1677 rvideo = mode;
1617 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1678 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1618#if defined(XPM_BACKGROUND) 1679#if XPM_BACKGROUND
1619 if (bgPixmap.pixmap == None) 1680 if (bgPixmap.pixmap == None)
1620#endif 1681#endif
1621#if defined(TRANSPARENT) 1682#if TRANSPARENT
1622 if (! (Options & Opt_transparent) || am_transparent == 0) 1683 if (! (options & Opt_transparent) || am_transparent == 0)
1623#endif 1684#endif
1624 XSetWindowBackground (display->display, TermWin.vt, 1685 XSetWindowBackground (display->display, TermWin.vt,
1625 PixColors[Color_bg]); 1686 pix_colors[Color_bg]);
1626 1687
1627 gcvalue.foreground = PixColors[Color_fg]; 1688 gcvalue.foreground = pix_colors[Color_fg];
1628 gcvalue.background = PixColors[Color_bg]; 1689 gcvalue.background = pix_colors[Color_bg];
1629 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1690 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1630 &gcvalue); 1691 &gcvalue);
1631 scr_clear (); 1692 scr_clear ();
1632 scr_touch (true); 1693 scr_touch (true);
1633 } 1694 }
… …
1681 * XTERM_SEQ: Invoke G2 character set: ESC N 1742 * XTERM_SEQ: Invoke G2 character set: ESC N
1682 * XTERM_SEQ: Invoke G3 character set: ESC O 1743 * XTERM_SEQ: Invoke G3 character set: ESC O
1683 */ 1744 */
1684void 1745void
1685rxvt_term::scr_charset_choose (int set) 1746rxvt_term::scr_charset_choose (int set)
1686 { 1747{
1687 screen.charset = set; 1748 screen.charset = set;
1688 set_font_style (); 1749 set_font_style ();
1689 } 1750}
1690 1751
1691/* ------------------------------------------------------------------------- */ 1752/* ------------------------------------------------------------------------- */
1692/* 1753/*
1693 * Set a font 1754 * Set a font
1694 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1755 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1697 * XTERM_SEQ: Set G3 character set: ESC + <C> 1758 * XTERM_SEQ: Set G3 character set: ESC + <C>
1698 * See set_font_style for possible values for <C> 1759 * See set_font_style for possible values for <C>
1699 */ 1760 */
1700void 1761void
1701rxvt_term::scr_charset_set (int set, unsigned int ch) 1762rxvt_term::scr_charset_set (int set, unsigned int ch)
1702 { 1763{
1703 charsets[set] = (unsigned char)ch; 1764 charsets[set] = (unsigned char)ch;
1704 set_font_style (); 1765 set_font_style ();
1705 } 1766}
1706 1767
1707 1768
1708/* ------------------------------------------------------------------------- * 1769/* ------------------------------------------------------------------------- *
1709 * MAJOR SCREEN MANIPULATION * 1770 * MAJOR SCREEN MANIPULATION *
1710 * ------------------------------------------------------------------------- */ 1771 * ------------------------------------------------------------------------- */
… …
1778 { 1839 {
1779 MIN_IT (rc[i].col, TermWin.ncol - 1); 1840 MIN_IT (rc[i].col, TermWin.ncol - 1);
1780 MIN_IT (rc[i].row, TermWin.nrow - 1); 1841 MIN_IT (rc[i].row, TermWin.nrow - 1);
1781 } 1842 }
1782 1843
1783 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));
1784
1785 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1844 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1786 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1845 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1787 1846
1788 if (refresh) 1847 if (refresh)
1789 scr_refresh (SLOW_REFRESH); 1848 scr_refresh (SLOW_REFRESH);
… …
1806 */ 1865 */
1807int 1866int
1808rxvt_term::scr_move_to (int y, int len) 1867rxvt_term::scr_move_to (int y, int len)
1809{ 1868{
1810 long p = 0; 1869 long p = 0;
1811 uint16_t oldviewstart; 1870 unsigned int oldviewstart;
1812 1871
1813 oldviewstart = TermWin.view_start; 1872 oldviewstart = TermWin.view_start;
1873
1814 if (y < len) 1874 if (y < len)
1815 { 1875 {
1816 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1876 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1817 p -= (long) (TermWin.nrow - 1); 1877 p -= (long) (TermWin.nrow - 1);
1818 p = max (p, 0); 1878 p = max (p, 0);
1819 } 1879 }
1880
1820 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1881 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1821 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1822 1882
1823 return scr_changeview (oldviewstart); 1883 return scr_changeview (oldviewstart);
1824} 1884}
1825 1885
1826/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
… …
1830 */ 1890 */
1831int 1891int
1832rxvt_term::scr_page (enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines)
1833{ 1893{
1834 int n; 1894 int n;
1835 uint16_t oldviewstart; 1895 unsigned int oldviewstart;
1836 1896
1837 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1838#ifdef DEBUG_STRICT
1839 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1840#endif
1841 oldviewstart = TermWin.view_start; 1897 oldviewstart = TermWin.view_start;
1898
1842 if (direction == UP) 1899 if (direction == UP)
1843 { 1900 {
1844 n = TermWin.view_start + nlines; 1901 n = TermWin.view_start + nlines;
1845 TermWin.view_start = min (n, TermWin.nscrolled); 1902 TermWin.view_start = min (n, TermWin.nscrolled);
1846 } 1903 }
1847 else 1904 else
1848 { 1905 {
1849 n = TermWin.view_start - nlines; 1906 n = TermWin.view_start - nlines;
1850 TermWin.view_start = max (n, 0); 1907 TermWin.view_start = max (n, 0);
1851 } 1908 }
1909
1852 return scr_changeview (oldviewstart); 1910 return scr_changeview (oldviewstart);
1853} 1911}
1854 1912
1855int 1913int
1856rxvt_term::scr_changeview (uint16_t oldviewstart) 1914rxvt_term::scr_changeview (unsigned int oldviewstart)
1857{ 1915{
1858 if (TermWin.view_start != oldviewstart) 1916 if (TermWin.view_start != oldviewstart)
1859 { 1917 {
1860 want_refresh = 1; 1918 want_refresh = 1;
1861 num_scr -= (TermWin.view_start - oldviewstart); 1919 num_scr -= (TermWin.view_start - oldviewstart);
… …
1869rxvt_term::scr_bell () 1927rxvt_term::scr_bell ()
1870{ 1928{
1871#ifndef NO_BELL 1929#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1930# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1931# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1932 if (options & Opt_mapAlert)
1875# endif 1933# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1934 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1935# endif
1878 if (Options & Opt_visualBell) 1936 if (options & Opt_visualBell)
1879 { 1937 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1938 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1939 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1940 }
1883 else 1941 else
… …
1889/* ARGSUSED */ 1947/* ARGSUSED */
1890void 1948void
1891rxvt_term::scr_printscreen (int fullhist) 1949rxvt_term::scr_printscreen (int fullhist)
1892{ 1950{
1893#ifdef PRINTPIPE 1951#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1952 int i, r1, nrows, row_offset;
1895 text_t *t; 1953 FILE *fd;
1896 FILE *fd;
1897 1954
1898 if ((fd = popen_printer ()) == NULL) 1955 if ((fd = popen_printer ()) == NULL)
1899 return; 1956 return;
1957
1900 nrows = TermWin.nrow; 1958 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1959 row_offset = TermWin.saveLines;
1960
1902 if (!fullhist) 1961 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1962 row_offset -= TermWin.view_start;
1904 else 1963 else
1905 { 1964 {
1906 nrows += TermWin.nscrolled; 1965 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1966 row_offset -= TermWin.nscrolled;
1908 } 1967 }
1909 1968
1969 wctomb (0, 0);
1970
1910 for (r1 = 0; r1 < nrows; r1++) 1971 for (r1 = 0; r1 < nrows; r1++)
1911 { 1972 {
1912 t = screen.text[r1 + row_offset]; 1973 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1974 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1975
1915 break; 1976 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 1977 {
1978 char mb[MB_LEN_MAX];
1979 text_t t = *tp++;
1980 if (t == NOCHAR)
1981 continue;
1982
1983 len = wctomb (mb, t);
1984
1985 if (len <= 0)
1986 {
1987 mb[0] = ' ';
1988 len = 1;
1989 }
1990
1991 fwrite (mb, 1, len, fd);
1992 }
1993
1994 fputc ('\n', fd);
1917 } 1995 }
1996
1918 pclose_printer (fd); 1997 pclose_printer (fd);
1919#endif 1998#endif
1920} 1999}
1921 2000
1922/* ------------------------------------------------------------------------- */ 2001/* ------------------------------------------------------------------------- */
… …
1937 2016
1938void 2017void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2018rxvt_term::scr_refresh (unsigned char refresh_type)
1940{ 2019{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2020 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */ 2021 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2022 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2023 ocrow; /* old cursor row */
1946 int i, /* tmp */ 2024 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 2025 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 2026#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 2027 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 2028#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2029 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2030
2031 want_refresh = 0; /* screen is current */
1953 2032
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2033 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 2034 return;
1956 2035
1957 /* 2036 /*
1958 * A: set up vars 2037 * A: set up vars
1959 */ 2038 */
1960 must_clear = 0; 2039 must_clear = 0;
1961
1962 refresh_count = 0; 2040 refresh_count = 0;
1963 2041
1964 row_offset = TermWin.saveLines - TermWin.view_start; 2042 row_offset = TermWin.saveLines - TermWin.view_start;
1965 2043
1966#ifdef XPM_BACKGROUND 2044#if XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 2045 must_clear |= (bgPixmap.pixmap != None);
1968#endif 2046#endif
1969#ifdef TRANSPARENT 2047#if TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 2048 must_clear |= ((options & Opt_transparent) && am_transparent);
1971#endif 2049#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2050 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2051
1974 /* 2052 /*
1975 * B: reverse any characters which are selected 2053 * B: reverse any characters which are selected
… …
1990 showcursor = 0; 2068 showcursor = 0;
1991#endif 2069#endif
1992 2070
1993 if (showcursor) 2071 if (showcursor)
1994 { 2072 {
2073 int col = screen.cur.col;
2074
2075 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2076 col--;
2077
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2078 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2079
1997 if (showcursor && TermWin.focus) 2080 if (showcursor && TermWin.focus)
1998 { 2081 {
1999 *srp ^= RS_RVid; 2082 *crp ^= RS_RVid;
2000#ifndef NO_CURSORCOLOR 2083#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2084 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2085 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2086 ccol1 = Color_cursor;
2004 else 2087 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2088#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2089 ccol1 = GET_FGCOLOR (rstyle);
… …
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2096#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2097 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2098#else
2016 ccol2 = Color_bg; 2099 ccol2 = Color_bg;
2017#endif 2100#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2101 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2102 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2103#endif
2021 } 2104 }
2022 } 2105 }
2023 2106
2024 /* make sure no outline cursor is left around */ 2107 /* make sure no outline cursor is left around */
… …
2051 oldcursor.col = screen.cur.col; 2134 oldcursor.col = screen.cur.col;
2052 } 2135 }
2053 } 2136 }
2054 } 2137 }
2055 2138
2139#if ENABLE_OVERLAY
2140 scr_swap_overlay ();
2141#endif
2142
2143 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2144 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2145
2056#ifndef NO_SLOW_LINK_SUPPORT 2146#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2147 /*
2058 * D: CopyArea pass - very useful for slower links 2148 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2149 * This has been deliberately kept simple.
2060 */ 2150 */
… …
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2153 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2154 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2155 {
2066 int16_t nits; 2156 int16_t nits;
2067 int j; 2157 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2158 int len, wlen;
2071 2159
2072 j = TermWin.nrow; 2160 j = TermWin.nrow;
2073 wlen = len = -1; 2161 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2162 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2163 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2164 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2165 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2166 {
2079 stp = screen.text[row + row_offset]; 2167 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2168 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2169 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2170 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2171 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2172 rend_t *drp2 = drawn_rend[row + i];
2085 2173
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2174 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2175 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2176 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2177 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2109 { 2197 {
2110 /* also comes here at end if needed because of >= above */ 2198 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2199 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2200 SWAP_IT (wlen, len, int);
2113 2201
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2202 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2203 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2204 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2205 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2206 0, Row2Pixel (len));
… …
2126 /* 2213 /*
2127 * E: main pass across every character 2214 * E: main pass across every character
2128 */ 2215 */
2129 for (row = 0; row < TermWin.nrow; row++) 2216 for (row = 0; row < TermWin.nrow; row++)
2130 { 2217 {
2131 stp = screen.text[row + row_offset]; 2218 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2219 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2220 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2221 rend_t *drp = drawn_rend[row];
2135 2222
2136 /* 2223 /*
2137 * E2: OK, now the real pass 2224 * E2: OK, now the real pass
2138 */ 2225 */
2139 int ypixel = (int)Row2Pixel (row); 2226 int ypixel = (int)Row2Pixel (row);
2140 2227
2141 for (col = 0; col < TermWin.ncol; col++) 2228 for (col = 0; col < TermWin.ncol; col++)
2142 { 2229 {
2143 /* compare new text with old - if exactly the same then continue */ 2230 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2231 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */ 2232 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */ 2233 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2234 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue; 2235 continue;
2149 2236
2150 // redraw one or more characters 2237 // redraw one or more characters
2151 2238
2152 // seek to the beginning if wide characters 2239 // seek to the beginning of wide characters
2153 while (stp[col] == NOCHAR && col > 0) 2240 while (stp[col] == NOCHAR && col > 0)
2154 --col; 2241 --col;
2155 2242
2156 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2157 text_t *text = stp + col; 2244 text_t *text = stp + col;
… …
2160 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2161 drp[col] = rend; 2248 drp[col] = rend;
2162 2249
2163 int xpixel = Col2Pixel (col); 2250 int xpixel = Col2Pixel (col);
2164 2251
2165 // this loop looks very messy, it can probably be optimized
2166 // and cleaned a bit by you?
2167 for (i = 0; ++col < TermWin.ncol; ) 2252 for (i = 0; ++col < TermWin.ncol; )
2168 { 2253 {
2169 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2170 { 2255 {
2171 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2172 drp[col] = rend; 2257 drp[col] = rend;
2173 count++; 2258 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2259 i++;
2177 2260
2178 continue; 2261 continue;
2179 } 2262 }
2180 2263
2181 if (rend != srp[col]) 2264 if (!RS_SAME (rend, srp[col]))
2182 break; 2265 break;
2183 2266
2184 count++; 2267 count++;
2185 2268
2186 if (stp[col] != dtp[col] 2269 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2270 || !RS_SAME (srp[col], drp[col]))
2188 { 2271 {
2189 if (must_clear && (i++ > (count / 2))) 2272 if (must_clear && (i++ > count / 2))
2190 break; 2273 break;
2191 2274
2192 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2193 drp[col] = rend; 2276 drp[col] = rend;
2194 i = 0; 2277 i = 0;
2195 } 2278 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2279 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2280 break;
2198 } 2281 }
2199 2282
2200 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2285
2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2287 while (i && text[count] == NOCHAR)
2288 count++, i--;
2289
2290#if ENABLE_STYLES
2291 // force redraw after "careful" characters to avoid pixel droppings
2292 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2293 drp[col + 1] = ~srp[col + 1];
2294
2295 // include previous careful character(s) if possible, looks nicer (best effort...)
2296 while (text > stp
2297 && srp[text - stp - 1] & RS_Careful
2298 && RS_SAME (rend, srp[text - stp - 1]))
2299 text--, count++, xpixel -= TermWin.fwidth;
2300#endif
2202 2301
2203 /* 2302 /*
2204 * Determine the attributes for the string 2303 * Determine the attributes for the string
2205 */ 2304 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground 2305 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background 2306 int back = GET_BGCOLOR (rend); // desired background
2209 2307
2210 rend = GET_ATTR (rend); 2308 // only do special processing if ana attributes are set, which is rare
2211 2309 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2212 rvid = !!(rend & RS_RVid); 2310 {
2311 bool invert = rend & RS_RVid;
2213 2312
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2314 if (rend & RS_Bold
2315 && fore == Color_fg)
2216 { 2316 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2317 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2318 fore = Color_BD;
2319# if !ENABLE_STYLES
2219 else 2320 else
2220 rvid = !rvid; 2321 invert = !invert;
2322# endif
2323 }
2324
2325 if (rend & RS_Italic
2326 && fore == Color_fg)
2327 {
2328 if (ISSET_PIXCOLOR (Color_IT))
2329 fore = Color_IT;
2330# if !ENABLE_STYLES
2331 else
2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2337 fore = Color_UL;
2338#endif
2339
2340 if (invert)
2341 {
2342 SWAP_IT (fore, back, int);
2343
2344#ifndef NO_BOLD_UNDERLINE_REVERSE
2345 if (ISSET_PIXCOLOR (Color_RV))
2346 back = Color_RV;
2347#endif
2348 }
2349
2350#ifdef TEXT_BLINK
2351 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2352 {
2353 if (!text_blink_ev.active)
2354 {
2355 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2356 hidden_text = 0;
2357 }
2358 else if (hidden_text)
2359 fore = back;
2360 }
2361#endif
2221 } 2362 }
2222
2223 if (rend & RS_Uline)
2224 if (ISSET_PIXCOLOR (Color_UL))
2225 fore = Color_UL;
2226#endif
2227
2228 if (rvid)
2229 {
2230 SWAP_IT (fore, back, int);
2231
2232#ifndef NO_BOLD_UNDERLINE_REVERSE
2233 if (ISSET_PIXCOLOR (Color_RV)
2234# ifndef NO_CURSORCOLOR
2235 && !ISSET_PIXCOLOR (Color_cursor)
2236# endif
2237 )
2238 back = Color_RV;
2239#endif
2240 }
2241
2242#ifdef TEXT_BLINK
2243 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2244 {
2245 if (!text_blink_ev.active)
2246 {
2247 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2248 hidden_text = 0;
2249 }
2250 else if (hidden_text)
2251 fore = back;
2252 }
2253#endif
2254 2363
2255 /* 2364 /*
2256 * Actually do the drawing of the string here 2365 * Actually do the drawing of the string here
2257 */ 2366 */
2258 rxvt_font *font = (*TermWin.fontset)[fid]; 2367 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2259 2368
2260 if (back == fore) 2369 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2370 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight, 2371 TermWin.fwidth * count, TermWin.fheight,
2263 back); 2372 back);
… …
2279 } 2388 }
2280 else 2389 else
2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2390 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2282 2391
2283 if (rend & RS_Uline && font->descent > 1 && fore != back) 2392 if (rend & RS_Uline && font->descent > 1 && fore != back)
2393 {
2394#if ENABLE_FRILLS
2395 if (ISSET_PIXCOLOR (Color_underline))
2396 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2397 else
2398#endif
2399 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2400
2284 XDrawLine (display->display, drawBuffer, TermWin.gc, 2401 XDrawLine (display->display, drawBuffer, TermWin.gc,
2285 xpixel, ypixel + font->ascent + 1, 2402 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2403 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2404 }
2287 } /* for (col....) */ 2405 } /* for (col....) */
2288 } /* for (row....) */ 2406 } /* for (row....) */
2407
2408#if ENABLE_OVERLAY
2409 scr_swap_overlay ();
2410#endif
2289 2411
2290 /* 2412 /*
2291 * G: cleanup cursor and display outline cursor if necessary 2413 * G: cleanup cursor and display outline cursor if necessary
2292 */ 2414 */
2293 if (showcursor) 2415 if (showcursor)
2294 { 2416 {
2295 if (TermWin.focus) 2417 if (TermWin.focus)
2296 { 2418 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2298 [screen.cur.col]);
2299 *srp ^= RS_RVid; 2419 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2421 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2422#endif
2303 } 2423 }
2304 else if (oldcursor.row >= 0) 2424 else if (oldcursor.row >= 0)
2305 { 2425 {
2306#ifndef NO_CURSORCOLOR 2426#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2427 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2428 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2429#endif
2310 int cursorwidth = 1; 2430 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol 2431 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) 2432 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++; 2433 cursorwidth++;
… …
2328 if (refresh_type & SMOOTH_REFRESH) 2448 if (refresh_type & SMOOTH_REFRESH)
2329 XFlush (display->display); 2449 XFlush (display->display);
2330 2450
2331 num_scr = 0; 2451 num_scr = 0;
2332 num_scr_allow = 1; 2452 num_scr_allow = 1;
2333 want_refresh = 0; /* screen is current */
2334} 2453}
2335 2454
2336void 2455void
2337rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2456rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2338{ 2457{
2339 if (!rp || !tp) 2458 if (!rp || !tp)
2340 return; 2459 return;
2341 2460
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2461 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2462 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2344} 2463}
2345 2464
2346void 2465void
2347rxvt_term::scr_remap_chars () 2466rxvt_term::scr_remap_chars ()
2348{ 2467{
… …
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2473 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]); 2474 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 } 2475 }
2357} 2476}
2358 2477
2478void
2479rxvt_term::scr_recolour ()
2480{
2481 if (1
2482#if TRANSPARENT
2483 && !am_transparent
2484#endif
2485#if XPM_BACKGROUND
2486 && !bgPixmap.pixmap
2487#endif
2488 )
2489 {
2490 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2491 XClearWindow (display->display, TermWin.parent[0]);
2492 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2493#if HAVE_SCROLLBARS
2494 if (scrollBar.win)
2495 {
2496 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2497 scrollBar.setIdle ();
2498 scrollbar_show (0);
2499 }
2500#endif
2501 }
2502
2503 scr_clear ();
2504 scr_touch (true);
2505 want_refresh = 1;
2506}
2507
2359/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2360void 2509void
2361rxvt_term::scr_clear (bool really) 2510rxvt_term::scr_clear (bool really)
2362{ 2511{
2363 if (!TermWin.mapped) 2512 if (!TermWin.mapped)
2364 return; 2513 return;
2365 2514
2366 num_scr_allow = 0; 2515 num_scr_allow = 0;
2367 want_refresh = 1; 2516 want_refresh = 1;
2368 2517
2369#ifdef TRANSPARENT 2518#if TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2519 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2520 {
2372 int i; 2521 int i;
2373 2522
2374 if (! (Options & Opt_transparent_all)) 2523 if (!(options & Opt_transparent_all))
2375 i = 0; 2524 i = 0;
2376 else 2525 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2526 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2527
2379 while (i--) 2528 while (i--)
… …
2395 int end_row = TermWin.saveLines - TermWin.view_start; 2544 int end_row = TermWin.saveLines - TermWin.view_start;
2396 int i = selection.beg.row + TermWin.saveLines; 2545 int i = selection.beg.row + TermWin.saveLines;
2397 int col, row = selection.end.row + TermWin.saveLines; 2546 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp; 2547 rend_t *srp;
2399 2548
2400 if (i >= end_row) 2549#if ENABLE_FRILLS
2401 col = selection.beg.col; 2550 if (selection.rect)
2551 {
2552 end_row += TermWin.nrow;
2553
2554 for (; i <= row && i <= end_row; i++)
2555 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2556 srp[col] ^= RS_RVid;
2557 }
2402 else 2558 else
2559#endif
2560 {
2561 if (i >= end_row)
2562 col = selection.beg.col;
2563 else
2403 { 2564 {
2404 col = 0; 2565 col = 0;
2405 i = end_row; 2566 i = end_row;
2406 } 2567 }
2407 2568
2408 end_row += TermWin.nrow; 2569 end_row += TermWin.nrow;
2570
2409 for (; i < row && i < end_row; i++, col = 0) 2571 for (; i < row && i < end_row; i++, col = 0)
2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2572 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2411 srp[col] ^= RS_RVid; 2573 srp[col] ^= RS_RVid;
2412 2574
2413 if (i == row && i < end_row) 2575 if (i == row && i < end_row)
2414 for (srp = screen.rend[i]; col < selection.end.col; col++) 2576 for (srp = screen.rend[i]; col < selection.end.col; col++)
2415 srp[col] ^= RS_RVid; 2577 srp[col] ^= RS_RVid;
2578 }
2416 } 2579 }
2417} 2580}
2418 2581
2419/* ------------------------------------------------------------------------- */ 2582/* ------------------------------------------------------------------------- */
2420/* 2583/*
… …
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2619 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2620 */
2458void 2621void
2459rxvt_term::selection_check (int check_more) 2622rxvt_term::selection_check (int check_more)
2460{ 2623{
2461 row_col_t pos; 2624 row_col_t pos;
2462 2625
2463 if (!selection.op) 2626 if (!selection.op)
2464 return; 2627 return;
2465 2628
2466 pos.row = pos.col = 0; 2629 pos.row = pos.col = 0;
… …
2488/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2489/* 2652/*
2490 * Paste a selection direct to the command fd 2653 * Paste a selection direct to the command fd
2491 */ 2654 */
2492void 2655void
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2656rxvt_term::paste (unsigned char *data, unsigned int len)
2494{ 2657{
2495 unsigned int i, j, n;
2496 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2497
2498#if 0
2499 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2500 ZERO_SCROLLBACK (r);
2501#endif
2502
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2658 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2659 for (unsigned int i = 0; i < len; i++)
2505 {
2506 n = min (len - i, PROP_SIZE);
2507 MEMCPY (ds, data + i, n);
2508
2509 for (j = 0; j < n; j++)
2510 if (ds[j] == C0_LF) 2660 if (data[i] == C0_LF)
2511 ds[j] = C0_CR; 2661 data[i] = C0_CR;
2512 2662
2513 tt_write (ds, (int)n); 2663 tt_write (data, len);
2514 }
2515
2516 free (ds);
2517} 2664}
2518 2665
2519/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2520/* 2667/*
2521 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
2522 * EXT: SelectionNotify 2669 * EXT: SelectionNotify
2523 */ 2670 */
2524int 2671void
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2673{
2527 long nread = 0;
2528 unsigned long bytes_after;
2529 XTextProperty ct;
2530
2531 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2532
2533 if (prop == None) /* check for failed XConvertSelection */ 2674 if (prop == None) /* check for failed XConvertSelection */
2534 { 2675 {
2535 if ((selection_type & Sel_CompoundText)) 2676 if ((selection_type & Sel_CompoundText))
2536 { 2677 {
2537 int selnum = selection_type & Sel_whereMask; 2678 int selnum = selection_type & Sel_whereMask;
… …
2550 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2551 else 2692 else
2552 selection_type = 0; 2693 selection_type = 0;
2553 } 2694 }
2554 2695
2555 return 0; 2696 return;
2556 }
2557
2558 for (;;)
2559 { 2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (display->display, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2560 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2721 if (XGetWindowProperty (display->display, win, prop,
2561 (long) (PROP_SIZE / 4), delete_prop, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2562 AnyPropertyType, &ct.encoding, &ct.format, 2724 &ct2.encoding, &ct2.format,
2563 &ct.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2564 &ct.value) != Success) 2726 &ct2.value) != Success)
2565 break; 2727 goto bailout;
2566 2728
2567 if (ct.encoding == 0) 2729 // realloc should be compatible to XFree, here, and elsewhere, too
2568 { 2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2570 break; 2732 ct.nitems += ct2.nitems;
2571 } 2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2572 else if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2573 { 2741 {
2574 // INCR selection, start handshake 2742 // INCR selection, start handshake
2743 if (!delete_prop)
2575 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (display->display, win, prop);
2745
2576 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2577 incr_ev.start (NOW + 10); 2748 incr_ev.start (NOW + 10);
2578 break;
2579 }
2580 2749
2581 if (ct.value == NULL) 2750 goto bailout;
2582 { 2751 }
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue;
2585 }
2586 2752
2587 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2588 { 2766 }
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2767 else
2590 2768 {
2591 if (selection_wait == Sel_normal && nread == 0 2769 if (selection_wait == Sel_normal
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2771 {
2594 /* 2772 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2773 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2774 * XConvertSelection () but nothing was presented
2597 */ 2775 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2777 }
2601 2778
2602 nread = -1; /* discount any previous stuff */ 2779 goto bailout;
2603 break; 2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (NOW + 10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2604 } 2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2605 2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2606 nread += ct.nitems; 2793 incr_buf_fill += ct.nitems;
2607 2794
2795 goto bailout;
2796 }
2797
2608 char **cl; 2798 char **cl;
2609 int cr; 2799 int cr;
2800
2801#if ENABLE_FRILLS
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste ((unsigned char *)s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2815 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2611 { 2816 && cl)
2817 {
2612 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2819 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2820
2615 XFreeStringList (cl); 2821 XFreeStringList (cl);
2616 } 2822 }
2617 else 2823 else
2618 paste (ct.value, ct.nitems); 2824 paste (ct.value, ct.nitems); // paste raw
2619 2825
2620 if (bytes_after == 0) 2826bailout:
2621 break;
2622
2623 XFree (ct.value);
2624 }
2625
2626 if (ct.value)
2627 XFree (ct.value); 2827 XFree (ct.value);
2628 2828
2629 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2631
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread;
2634} 2831}
2635 2832
2636void 2833void
2637rxvt_term::incr_cb (time_watcher &w) 2834rxvt_term::incr_cb (time_watcher &w)
2638{ 2835{
2639 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2640 2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2642} 2842}
2643 2843
2644/*
2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2646 */
2647void 2844void
2648rxvt_term::selection_property (Window win, Atom prop) 2845rxvt_term::selection_property (Window win, Atom prop)
2649{ 2846{
2650 if (prop == None || selection_wait != Sel_incr) 2847 if (prop == None || selection_wait != Sel_incr)
2651 return; 2848 return;
2652 2849
2653 if (selection_paste (win, prop, 1) > 0) 2850 selection_paste (win, prop, true);
2654 incr_ev.start (NOW + 10);
2655 else
2656 {
2657 selection_wait = Sel_none;
2658 incr_ev.stop ();
2659 }
2660} 2851}
2661 2852
2662/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2663/* 2854/*
2664 * Request the current selection: 2855 * Request the current selection:
… …
2670 * EXT: button 2 release 2861 * EXT: button 2 release
2671 */ 2862 */
2672void 2863void
2673rxvt_term::selection_request (Time tm, int x, int y) 2864rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2865{
2675 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y));
2676
2677 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2866 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2867 return; /* outside window */
2679 2868
2680 if (selection.text) 2869 if (selection.text)
2681 { /* internal selection */ 2870 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2871 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2872 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2873 free (str);
2686 return; 2874 return;
2687 } 2875 }
… …
2701#else 2889#else
2702 selection_type = Sel_CompoundText; 2890 selection_type = Sel_CompoundText;
2703 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2891 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2704 return; 2892 return;
2705#endif 2893#endif
2706
2707 } 2894 }
2708 } 2895 }
2709 2896
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2897 selection_wait = Sel_none; /* don't loop in selection_paste () */
2711 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2712 selection_paste (display->root, XA_CUT_BUFFER0, False); 2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2713} 2899}
2714 2900
2715int 2901int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2902rxvt_term::selection_request_other (Atom target, int selnum)
2717{ 2903{
… …
2729 else 2915 else
2730 sel = xa[XA_CLIPBOARD]; 2916 sel = xa[XA_CLIPBOARD];
2731 2917
2732 if (XGetSelectionOwner (display->display, sel) != None) 2918 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2919 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2920 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2921 TermWin.vt, selection_request_time);
2737 return 1; 2922 return 1;
2738 } 2923 }
2739 2924
… …
2746 * EXT: SelectionClear 2931 * EXT: SelectionClear
2747 */ 2932 */
2748void 2933void
2749rxvt_term::selection_clear () 2934rxvt_term::selection_clear ()
2750{ 2935{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2936 want_refresh = 1;
2754 free (selection.text); 2937 free (selection.text);
2755 selection.text = NULL; 2938 selection.text = NULL;
2756 selection.len = 0; 2939 selection.len = 0;
2757 CLEAR_SELECTION (); 2940 CLEAR_SELECTION ();
… …
2770{ 2953{
2771 int i, col, end_col, row, end_row; 2954 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2955 wchar_t *new_selection_text;
2773 text_t *t; 2956 text_t *t;
2774 2957
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2958 switch (selection.op)
2777 { 2959 {
2778 case SELECTION_CONT: 2960 case SELECTION_CONT:
2779 break; 2961 break;
2780 case SELECTION_INIT: 2962 case SELECTION_INIT:
… …
2794 2976
2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2977 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2797 2979
2798 col = selection.beg.col; 2980 col = selection.beg.col;
2799 MAX_IT (col, 0);
2800 row = selection.beg.row + TermWin.saveLines; 2981 row = selection.beg.row + TermWin.saveLines;
2801 end_row = selection.end.row + TermWin.saveLines; 2982 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0; 2983 int ofs = 0;
2803 int extra = 0; 2984 int extra = 0;
2804 2985
2805 for (; row <= end_row; row++, col = 0) 2986 for (; row <= end_row; row++, col = 0)
2806 { 2987 {
2807 t = &(screen.text[row][col]);
2808
2809 end_col = screen.tlen[row]; 2988 end_col = screen.tlen[row];
2989
2990#if ENABLE_FRILLS
2991 if (selection.rect)
2992 {
2993 col = selection.beg.col;
2994 end_col = TermWin.ncol + 1;
2995 }
2996#endif
2997
2998 MAX_IT (col, 0);
2810 2999
2811 if (end_col == -1) 3000 if (end_col == -1)
2812 end_col = TermWin.ncol; 3001 end_col = TermWin.ncol;
2813 3002
2814 if (row == end_row) 3003 if (row == end_row || selection.rect)
2815 MIN_IT (end_col, selection.end.col); 3004 MIN_IT (end_col, selection.end.col);
2816 3005
3006 t = &screen.text[row][col];
2817 for (; col < end_col; col++) 3007 for (; col < end_col; col++)
2818 { 3008 {
2819 if (*t == NOCHAR) 3009 if (*t == NOCHAR)
2820 t++; 3010 t++;
2821#if ENABLE_COMBINING 3011#if ENABLE_COMBINING
… …
2869#if 0 3059#if 0
2870 XTextProperty ct; 3060 XTextProperty ct;
2871 3061
2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3062 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2873 { 3063 {
2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3064 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value); 3065 XFree (ct.value);
2877 } 3066 }
2878#endif 3067#endif
2879 3068
2880 selection_time = tm; 3069 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 3070}
2883 3071
2884/* ------------------------------------------------------------------------- */ 3072/* ------------------------------------------------------------------------- */
2885/* 3073/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 3074 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 3075 * EXT: button 1 press
2888 */ 3076 */
2889void 3077void
2890rxvt_term::selection_click (int clicks, int x, int y) 3078rxvt_term::selection_click (int clicks, int x, int y)
2891{ 3079{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 3080 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 3081 selection.clicks = clicks; /* save clicks so extend will work */
2896 3082
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3083 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 3084
… …
2940 * We now only find out the boundary in one direction 3126 * We now only find out the boundary in one direction
2941 */ 3127 */
2942 3128
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3129/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 3130#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3131 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 3132#define DELIMIT_REND(x) 1
2947 3133
2948void 3134void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3135rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 3136{
… …
2968 3154
2969 row = mark->row + TermWin.saveLines; 3155 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 3156 col = mark->col;
2971 MAX_IT (col, 0); 3157 MAX_IT (col, 0);
2972 /* find the edge of a word */ 3158 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 3159 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 3160 w1 = DELIMIT_TEXT (*stp);
2975 3161
2976 srp = (&screen.rend[row][col]); 3162 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 3163 w2 = DELIMIT_REND (*srp);
2978 3164
2979 for (;;) 3165 for (;;)
2980 { 3166 {
2981 for (; col != bound.col; col += dirnadd) 3167 for (; col != bound.col; col += dirnadd)
… …
3015 } 3201 }
3016 break; 3202 break;
3017 } 3203 }
3018 3204
3019Old_Word_Selection_You_Die: 3205Old_Word_Selection_You_Die:
3020 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));
3021
3022 if (dirn == DN) 3206 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3207 col++; /* put us on one past the end */
3024 3208
3025 /* Poke the values back in */ 3209 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3210 ret->row = row - TermWin.saveLines;
… …
3060 /* select nothing */ 3244 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3245 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3246 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3247 selection.clicks = 4;
3064 want_refresh = 1; 3248 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3249 return;
3067 } 3250 }
3068 3251
3069 if (selection.clicks == 4) 3252 if (selection.clicks == 4)
3070 selection.clicks = 1; 3253 selection.clicks = 1;
… …
3086 row_col_t pos; 3269 row_col_t pos;
3087 enum { 3270 enum {
3088 LEFT, RIGHT 3271 LEFT, RIGHT
3089 } closeto = RIGHT; 3272 } closeto = RIGHT;
3090 3273
3091 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));
3092 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));
3093
3094 want_refresh = 1; 3274 want_refresh = 1;
3275
3095 switch (selection.op) 3276 switch (selection.op)
3096 { 3277 {
3097 case SELECTION_INIT: 3278 case SELECTION_INIT:
3098 CLEAR_SELECTION (); 3279 CLEAR_SELECTION ();
3099 selection.op = SELECTION_BEGIN; 3280 selection.op = SELECTION_BEGIN;
… …
3112 selection_start_colrow (col, row); 3293 selection_start_colrow (col, row);
3113 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
3114 default: 3295 default:
3115 return; 3296 return;
3116 } 3297 }
3298
3117 if (selection.beg.col == selection.end.col 3299 if (selection.beg.col == selection.end.col
3118 && selection.beg.col != selection.mark.col 3300 && selection.beg.col != selection.mark.col
3119 && selection.beg.row == selection.end.row 3301 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3302 && selection.beg.row != selection.mark.row)
3121 { 3303 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3304 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3305 selection.beg.row = selection.end.row = selection.mark.row;
3124 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));
3125 } 3306 }
3126 3307
3127 pos.col = col; 3308 pos.col = col;
3128 pos.row = row; 3309 pos.row = row;
3129 3310
… …
3172 } 3353 }
3173 else 3354 else
3174 { /* button1 drag or button3 drag */ 3355 { /* button1 drag or button3 drag */
3175 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3356 if (ROWCOL_IS_AFTER (selection.mark, pos))
3176 { 3357 {
3177 if ((selection.mark.row == selection.end.row) 3358 if (selection.mark.row == selection.end.row
3178 && (selection.mark.col == selection.end.col) 3359 && selection.mark.col == selection.end.col
3360 && clickchange
3179 && clickchange && selection.clicks == 2) 3361 && selection.clicks == 2)
3180 selection.mark.col--; 3362 selection.mark.col--;
3181 3363
3182 selection.beg.row = pos.row; 3364 selection.beg.row = pos.row;
3183 selection.beg.col = pos.col; 3365 selection.beg.col = pos.col;
3184 selection.end.row = selection.mark.row; 3366 selection.end.row = selection.mark.row;
… …
3195 3377
3196 if (selection.clicks == 1) 3378 if (selection.clicks == 1)
3197 { 3379 {
3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3380 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199 3381
3200 if (end_col != -1 && selection.beg.col > end_col) 3382 if (selection.beg.col > end_col
3383 && end_col != -1
3384#if ENABLE_FRILLS
3385 && !selection.rect
3386#endif
3201 { 3387 )
3202#if 1
3203 selection.beg.col = ncol; 3388 selection.beg.col = ncol;
3204#else
3205 if (selection.beg.row != selection.end.row)
3206 selection.beg.col = ncol;
3207 else
3208 selection.beg.col = selection.mark.col;
3209#endif
3210 }
3211 3389
3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3390 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213 3391
3214 if (end_col != -1 && selection.end.col > end_col) 3392 if (
3393 selection.end.col > end_col
3394 && end_col != -1
3395#if ENABLE_FRILLS
3396 && !selection.rect
3397#endif
3398 )
3215 selection.end.col = ncol; 3399 selection.end.col = ncol;
3216 } 3400 }
3217 else if (selection.clicks == 2) 3401 else if (selection.clicks == 2)
3218 { 3402 {
3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3403 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3220 selection.end.col--; 3404 selection.end.col--;
3221 3405
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3406 selection_delimit_word (UP, &selection.beg, &selection.beg);
3407 selection_delimit_word (DN, &selection.end, &selection.end);
3224 } 3408 }
3225 else if (selection.clicks == 3) 3409 else if (selection.clicks == 3)
3226 { 3410 {
3227#ifndef NO_FRILLS 3411#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3412 if (options & Opt_tripleclickwords)
3229 { 3413 {
3230 int end_row; 3414 int end_row;
3231 3415
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3416 selection_delimit_word (UP, &selection.beg, &selection.beg);
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3417 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3234 3418
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3419 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3236 { 3420 {
3237 end_col = screen.tlen[end_row + TermWin.saveLines]; 3421 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3248 else 3432 else
3249#endif 3433#endif
3250 { 3434 {
3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3435 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3252 selection.mark.col++; 3436 selection.mark.col++;
3437
3253 selection.beg.col = 0; 3438 selection.beg.col = 0;
3254 selection.end.col = ncol; 3439 selection.end.col = ncol;
3440
3441 // select a complete logical line
3442 while (selection.beg.row > -TermWin.saveLines
3443 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3444 selection.beg.row--;
3445
3446 while (selection.end.row < TermWin.nrow
3447 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3448 selection.end.row++;
3255 } 3449 }
3256 } 3450 }
3257 3451
3258 if (button3 && buttonpress) 3452 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3453 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3454 if (closeto == LEFT)
3261 { 3455 {
3262 selection.mark.row = selection.end.row; 3456 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3457 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3458 }
3266 else 3459 else
3267 { 3460 {
3268 selection.mark.row = selection.beg.row; 3461 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3462 selection.mark.col = selection.beg.col;
3270 } 3463 }
3271 } 3464 }
3272 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));
3273}
3274 3465
3275#ifndef NO_FRILLS 3466#if ENABLE_FRILLS
3467 if (selection.rect && selection.beg.col > selection.end.col)
3468 SWAP_IT (selection.beg.col, selection.end.col, int);
3469#endif
3470}
3471
3472#if ENABLE_FRILLS
3276void 3473void
3277rxvt_term::selection_remove_trailing_spaces () 3474rxvt_term::selection_remove_trailing_spaces ()
3278{ 3475{
3279 int32_t end_col, end_row; 3476 int32_t end_col, end_row;
3280 text_t *stp; 3477 text_t *stp;
3281 3478
3282 end_col = selection.end.col; 3479 end_col = selection.end.col;
3283 end_row = selection.end.row; 3480 end_row = selection.end.row;
3481
3284 for ( ; end_row >= selection.beg.row; ) 3482 for ( ; end_row >= selection.beg.row; )
3285 { 3483 {
3286 stp = screen.text[end_row + TermWin.saveLines]; 3484 stp = screen.text[end_row + TermWin.saveLines];
3485
3287 while (--end_col >= 0) 3486 while (--end_col >= 0)
3288 { 3487 {
3289 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3488 if (stp[end_col] != ' '
3489 && stp[end_col] != '\t'
3490 && stp[end_col] != NOCHAR)
3290 break; 3491 break;
3291 } 3492 }
3493
3292 if (end_col >= 0 3494 if (end_col >= 0
3293 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3495 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3294 { 3496 {
3295 selection.end.col = end_col + 1; 3497 selection.end.col = end_col + 1;
3296 selection.end.row = end_row; 3498 selection.end.row = end_row;
3297 break; 3499 break;
3298 } 3500 }
3501
3299 end_row--; 3502 end_row--;
3300 end_col = TermWin.ncol; 3503 end_col = TermWin.ncol;
3301 } 3504 }
3505
3302 if (selection.mark.row > selection.end.row) 3506 if (selection.mark.row > selection.end.row)
3303 { 3507 {
3304 selection.mark.row = selection.end.row; 3508 selection.mark.row = selection.end.row;
3305 selection.mark.col = selection.end.col; 3509 selection.mark.col = selection.end.col;
3306 } 3510 }
… …
3322 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3526 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3323} 3527}
3324 3528
3325/* ------------------------------------------------------------------------- */ 3529/* ------------------------------------------------------------------------- */
3326/* 3530/*
3327 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3328 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3329 * the X11 protocol.
3330 */
3331typedef CARD32 Atom32;
3332
3333/* ------------------------------------------------------------------------- */
3334/*
3335 * Respond to a request for our current selection 3531 * Respond to a request for our current selection
3336 * EXT: SelectionRequest 3532 * EXT: SelectionRequest
3337 */ 3533 */
3338void 3534void
3339rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3535rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3340{ 3536{
3341 XSelectionEvent ev; 3537 XSelectionEvent ev;
3342 XTextProperty ct; 3538 dDisp;
3343 XICCEncodingStyle style;
3344 Atom target;
3345 3539
3346 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3347 ev.property = None; 3541 ev.property = None;
3348 ev.display = rq.display; 3542 ev.display = rq.display;
3349 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3351 ev.target = rq.target; 3545 ev.target = rq.target;
3352 ev.time = rq.time; 3546 ev.time = rq.time;
3353 3547
3354 if (rq.target == xa[XA_TARGETS]) 3548 if (rq.target == xa[XA_TARGETS])
3355 { 3549 {
3356 Atom32 target_list[6]; 3550 Atom target_list[6];
3357 Atom32 *target = target_list; 3551 Atom *target = target_list;
3358 3552
3359 *target++ = (Atom32) xa[XA_TARGETS]; 3553 *target++ = xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3554 *target++ = xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3555 *target++ = XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3556 *target++ = xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3366#endif 3560#endif
3367 3561
3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3369 (8 * sizeof (target_list[0])), PropModeReplace, 3563 32, PropModeReplace,
3370 (unsigned char *)target_list, 3564 (unsigned char *)target_list, target - target_list);
3371 target - target_list);
3372 ev.property = rq.property; 3565 ev.property = rq.property;
3373 } 3566 }
3374#if TODO // TODO 3567#if TODO // TODO
3375 else if (rq.target == xa[XA_MULTIPLE]) 3568 else if (rq.target == xa[XA_MULTIPLE])
3376 { 3569 {
3377 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3378 } 3571 }
3379#endif 3572#endif
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3574 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3575 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3383 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3577 ev.property = rq.property;
3386 } 3578 }
3387 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3581 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3582 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3583 )
3392 { 3584 {
3585 XTextProperty ct;
3586 Atom target = rq.target;
3393 short freect = 0; 3587 short freect = 0;
3394 int selectlen; 3588 int selectlen;
3395 wchar_t *cl; 3589 wchar_t *cl;
3396 3590 enum {
3397 target = rq.target; 3591 enc_string = XStringStyle,
3592 enc_text = XStdICCTextStyle,
3593 enc_compound_text = XCompoundTextStyle,
3594#ifdef X_HAVE_UTF8_STRING
3595 enc_utf8 = XUTF8StringStyle,
3596#else
3597 enc_utf8 = -1,
3598#endif
3599 } style;
3398 3600
3399 if (target == XA_STRING) 3601 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3602 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3603 // will ask for another format anyways.
3402 style = XStringStyle; 3604 style = enc_string;
3403 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3404 style = XStdICCTextStyle; 3606 style = enc_text;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3608 style = enc_compound_text;
3407#if X_HAVE_UTF8_STRING 3609#if ENABLE_FRILLS
3408 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3611 style = enc_utf8;
3410#endif 3612#endif
3411 else 3613 else
3412 { 3614 {
3413 target = xa[XA_COMPOUND_TEXT]; 3615 target = xa[XA_COMPOUND_TEXT];
3414 style = XCompoundTextStyle; 3616 style = enc_compound_text;
3415 } 3617 }
3416 3618
3417 if (selection.text) 3619 if (selection.text)
3418 { 3620 {
3419 cl = selection.text; 3621 cl = selection.text;
… …
3423 { 3625 {
3424 cl = L""; 3626 cl = L"";
3425 selectlen = 0; 3627 selectlen = 0;
3426 } 3628 }
3427 3629
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3630#if ENABLE_FRILLS
3429 // manually for XUTF8StringStyle. 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3632 // so recode it manually
3633 if (style == enc_utf8)
3634 {
3635 freect = 1;
3636 ct.encoding = target;
3637 ct.format = 8;
3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3639 ct.nitems = strlen ((char *)ct.value);
3640 }
3641 else
3642#endif
3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3431 freect = 1; 3644 freect = 1;
3432 else 3645 else
3433 { 3646 {
3434 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3435 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3436 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3650 ct.encoding = target;
3437 } 3651 }
3438 3652
3439 XChangeProperty (display->display, rq.requestor, rq.property, 3653 XChangeProperty (disp, rq.requestor, rq.property,
3440 target, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3441 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3442 ev.property = rq.property; 3656 ev.property = rq.property;
3443 3657
3444 if (freect) 3658 if (freect)
3445 XFree (ct.value); 3659 XFree (ct.value);
3446 } 3660 }
3447 3661
3448 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3449} 3663}
3450 3664
3451/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3452 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3453 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */
… …
3465} 3679}
3466 3680
3467/* ------------------------------------------------------------------------- */ 3681/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3682#ifdef USE_XIM
3469void 3683void
3470rxvt_term::im_set_position (XPoint *pos) 3684rxvt_term::im_set_position (XPoint &pos)
3471{ 3685{
3472 XWindowAttributes xwa; 3686 XWindowAttributes xwa;
3473 3687
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3688 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3689
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3690 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3692}
3478
3479#endif 3693#endif
3694
3695#if ENABLE_OVERLAY
3696void
3697rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3698{
3699 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3700 return;
3701
3702 want_refresh = 1;
3703
3704 scr_overlay_off ();
3705
3706 if (x < 0) x = TermWin.ncol - w;
3707 if (y < 0) y = TermWin.nrow - h;
3708
3709 // make space for border
3710 w += 2; MIN_IT (w, TermWin.ncol);
3711 h += 2; MIN_IT (h, TermWin.nrow);
3712
3713 x -= 1; MAX_IT (x, 0);
3714 y -= 1; MAX_IT (y, 0);
3715
3716 MIN_IT (x, TermWin.ncol - w);
3717 MIN_IT (y, TermWin.nrow - h);
3718
3719 ov_x = x; ov_y = y;
3720 ov_w = w; ov_h = h;
3721
3722 ov_text = new text_t *[h];
3723 ov_rend = new rend_t *[h];
3724
3725 for (y = 0; y < h; y++)
3726 {
3727 text_t *tp = ov_text[y] = new text_t[w];
3728 rend_t *rp = ov_rend[y] = new rend_t[w];
3729
3730 text_t t0, t1, t2;
3731 rend_t r = OVERLAY_RSTYLE;
3732
3733 if (y == 0)
3734 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3735 else if (y < h - 1)
3736 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3737 else
3738 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3739
3740 *tp++ = t0;
3741 *rp++ = r;
3742
3743 for (x = w - 2; x > 0; --x)
3744 {
3745 *tp++ = t1;
3746 *rp++ = r;
3747 }
3748
3749 *tp = t2;
3750 *rp = r;
3751 }
3752}
3753
3754void
3755rxvt_term::scr_overlay_off ()
3756{
3757 if (!ov_text)
3758 return;
3759
3760 want_refresh = 1;
3761
3762 for (int y = 0; y < ov_h; y++)
3763 {
3764 delete [] ov_text[y];
3765 delete [] ov_rend[y];
3766 }
3767
3768 delete [] ov_text; ov_text = 0;
3769 delete [] ov_rend; ov_rend = 0;
3770}
3771
3772void
3773rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3774{
3775 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3776 return;
3777
3778 x++, y++;
3779
3780 ov_text[y][x] = text;
3781 ov_rend[y][x] = rend;
3782}
3783
3784void
3785rxvt_term::scr_overlay_set (int x, int y, const char *s)
3786{
3787 while (*s)
3788 scr_overlay_set (x++, y, *s++);
3789}
3790
3791void
3792rxvt_term::scr_swap_overlay ()
3793{
3794 if (!ov_text)
3795 return;
3796
3797 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3798
3799 // swap screen mem with overlay
3800 for (int y = ov_h; y--; )
3801 {
3802 text_t *t1 = ov_text[y];
3803 rend_t *r1 = ov_rend[y];
3804
3805 text_t *t2 = screen.text[y + row_offset] + ov_x;
3806 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3807
3808 for (int x = ov_w; x--; )
3809 {
3810 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3811 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3812 }
3813 }
3814}
3815
3816#endif
3480/* ------------------------------------------------------------------------- */ 3817/* ------------------------------------------------------------------------- */

Diff Legend

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