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

Diff Legend

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