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

Diff Legend

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