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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.161 by root, Tue Feb 22 21:41:50 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 29
31#include <X11/Xmd.h> /* get the typedef for CARD32 */ 30#include <X11/Xmd.h> /* get the typedef for CARD32 */
32 31
33#include <inttypes.h> 32#include <inttypes.h>
34#include <wchar.h>
35 33
36#include "salloc.C" // HACK, should be a seperate compile! 34#include "salloc.C" // HACK, should be a seperate compile!
37 35
38inline void fill_text (text_t *start, text_t value, int len) 36inline void fill_text (text_t *start, text_t value, int len)
39{ 37{
40 while (len--) 38 while (len--)
41 *start++ = value; 39 *start++ = value;
42} 40}
43 41
44/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
45#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
47 46
48/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
… …
112 (unsigned int)Height2Pixel (num)) 111 (unsigned int)Height2Pixel (num))
113 112
114/* ------------------------------------------------------------------------- * 113/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 114 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 115 * ------------------------------------------------------------------------- */
116
117/* Fill part/all of a line with blanks. */ 117/* Fill part/all of a line with blanks. */
118void 118void
119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 119rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs)
120{ 120{
121 efs &= ~RS_baseattrMask; 121 efs &= ~RS_baseattrMask;
122 efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); 122 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
123 123
124 while (width--) 124 while (width--)
125 { 125 {
126 *et++ = ' '; 126 *et++ = ' ';
127 *er++ = efs; 127 *er++ = efs;
… …
202 /* 202 /*
203 * first time called so just malloc everything: don't rely on realloc 203 * first time called so just malloc everything: don't rely on realloc
204 * Note: this is still needed so that all the scrollback lines are NULL 204 * Note: this is still needed so that all the scrollback lines are NULL
205 */ 205 */
206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 206 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); 207 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 208 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); 209 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
210 210
211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 211 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); 212 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
213 213
214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 214 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); 215 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 216 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); 217 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
218 218
219 for (p = 0; p < nrow; p++) 219 for (p = 0; p < nrow; p++)
220 { 220 {
221 q = p + TermWin.saveLines; 221 q = p + TermWin.saveLines;
222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); 222 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
… …
293 ralloc->free (drawn_rend[p]); 293 ralloc->free (drawn_rend[p]);
294 } 294 }
295 295
296 /* we have fewer rows so fix up cursor position */ 296 /* we have fewer rows so fix up cursor position */
297 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 297 MIN_IT (screen.cur.row, (int32_t)nrow - 1);
298 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
299 298
300 scr_reset_realloc (); /* realloc _last_ */ 299 scr_reset_realloc (); /* realloc _last_ */
301 } 300 }
302 else if (nrow > prev_nrow) 301 else if (nrow > prev_nrow)
303 { 302 {
… …
334 scr_scroll_text (0, (int)nrow - 1, -k, 1); 333 scr_scroll_text (0, (int)nrow - 1, -k, 1);
335 screen.cur.row += k; 334 screen.cur.row += k;
336 screen.s_cur.row += k; 335 screen.s_cur.row += k;
337 TermWin.nscrolled -= k; 336 TermWin.nscrolled -= k;
338 } 337 }
338
339#ifdef DEBUG_STRICT 339#ifdef DEBUG_STRICT
340 assert (screen.cur.row < TermWin.nrow); 340 assert (screen.cur.row < TermWin.nrow);
341 assert (swap.cur.row < TermWin.nrow);
342#else /* drive with your eyes closed */ 341#else /* drive with your eyes closed */
343
344 MIN_IT (screen.cur.row, nrow - 1); 342 MIN_IT (screen.cur.row, nrow - 1);
345 MIN_IT (swap.cur.row, nrow - 1);
346#endif 343#endif
347 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this 344 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
348 } 345 }
349 346
350 /* resize columns */ 347 /* resize columns */
… …
393 } 390 }
394 391
395 } 392 }
396 393
397 MIN_IT (screen.cur.col, (int16_t)ncol - 1); 394 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
398 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
399 395
400 delete talloc; talloc = ta; 396 delete talloc; talloc = ta;
401 delete ralloc; ralloc = ra; 397 delete ralloc; ralloc = ra;
402 } 398 }
403 399
… …
417} 413}
418 414
419void 415void
420rxvt_term::scr_reset_realloc () 416rxvt_term::scr_reset_realloc ()
421{ 417{
422 uint16_t total_rows, nrow; 418 unsigned int total_rows, nrow;
423 419
424 nrow = TermWin.nrow; 420 nrow = TermWin.nrow;
425 total_rows = nrow + TermWin.saveLines; 421 total_rows = nrow + TermWin.saveLines;
426 /* *INDENT-OFF* */ 422 /* *INDENT-OFF* */
427 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); 423 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
… …
444 * Free everything. That way malloc debugging can find leakage. 440 * Free everything. That way malloc debugging can find leakage.
445 */ 441 */
446void 442void
447rxvt_term::scr_release () 443rxvt_term::scr_release ()
448{ 444{
449 uint16_t total_rows; 445 unsigned int total_rows;
450 int i; 446 int i;
451 447
452 total_rows = TermWin.nrow + TermWin.saveLines; 448 total_rows = TermWin.nrow + TermWin.saveLines;
453 449
454 delete talloc; talloc = 0; 450 delete talloc; talloc = 0;
… …
511 s = &screen; 507 s = &screen;
512 508
513 switch (mode) 509 switch (mode)
514 { 510 {
515 case SAVE: 511 case SAVE:
516 s->s_cur.row = s->cur.row; 512 s->s_cur.row = screen.cur.row;
517 s->s_cur.col = s->cur.col; 513 s->s_cur.col = screen.cur.col;
518 s->s_rstyle = rstyle; 514 s->s_rstyle = rstyle;
519 s->s_charset = s->charset; 515 s->s_charset = screen.charset;
520 s->s_charset_char = charsets[s->charset]; 516 s->s_charset_char = charsets[screen.charset];
521 break; 517 break;
522 518
523 case RESTORE: 519 case RESTORE:
524 want_refresh = 1; 520 want_refresh = 1;
525 s->cur.row = s->s_cur.row; 521 screen.cur.row = s->s_cur.row;
526 s->cur.col = s->s_cur.col; 522 screen.cur.col = s->s_cur.col;
527 s->flags &= ~Screen_WrapNext; 523 screen.flags &= ~Screen_WrapNext;
528 rstyle = s->s_rstyle; 524 rstyle = s->s_rstyle;
529 s->charset = s->s_charset; 525 screen.charset = s->s_charset;
530 charsets[s->charset] = s->s_charset_char; 526 charsets[screen.charset] = s->s_charset_char;
531 set_font_style (); 527 set_font_style ();
532 break; 528 break;
533 } 529 }
534 530
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
… …
565 if (current_screen == scrn) 561 if (current_screen == scrn)
566 return scrn; 562 return scrn;
567 563
568 selection_check (2); /* check for boundary cross */ 564 selection_check (2); /* check for boundary cross */
569 565
570 SWAP_IT (current_screen, scrn, int); 566 i = current_screen; current_screen = scrn; scrn = i;
567
568 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
569 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
570 MAX_IT (screen.cur.row, 0);
571 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
572 MAX_IT (screen.cur.col, 0);
573 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
574
571#if NSCREENS 575#if NSCREENS
572 if (options & Opt_secondaryScreen) 576 if (options & Opt_secondaryScreen)
573 { 577 {
574 num_scr = 0; 578 num_scr = 0;
575 offset = TermWin.saveLines; 579 offset = TermWin.saveLines;
580
576 for (i = prev_nrow; i--;) 581 for (i = prev_nrow; i--;)
577 { 582 {
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 583 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 584 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); 585 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 } 586 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t); 587
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t); 588 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int); 589 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 590 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 591 swap.flags |= Screen_VisibleCursor;
597 } 592 }
598 else 593 else
599#endif 594#endif
600 if (options & Opt_secondaryScroll) 595 if (options & Opt_secondaryScroll)
601 //if (current_screen == PRIMARY)
602 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 596 scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0);
597
603 return scrn; 598 return scrn;
604} 599}
605 600
606// clear WrapNext indicator, solidifying position on next line 601// clear WrapNext indicator, solidifying position on next line
607void 602void
… …
625 * Change the colour for following text 620 * Change the colour for following text
626 */ 621 */
627void 622void
628rxvt_term::scr_color (unsigned int color, int fgbg) 623rxvt_term::scr_color (unsigned int color, int fgbg)
629{ 624{
630 color &= RS_fgMask; 625 if (color > maxTermCOLOR)
626 color = fgbg;
627
631 if (fgbg == Color_fg) 628 if (fgbg == Color_fg)
632 rstyle = SET_FGCOLOR (rstyle, color); 629 rstyle = SET_FGCOLOR (rstyle, color);
633 else 630 else
634 rstyle = SET_BGCOLOR (rstyle, color); 631 rstyle = SET_BGCOLOR (rstyle, color);
635} 632}
… …
673 nscrolled = (long)TermWin.nscrolled + (long)count; 670 nscrolled = (long)TermWin.nscrolled + (long)count;
674 671
675 if (nscrolled > (long)TermWin.saveLines) 672 if (nscrolled > (long)TermWin.saveLines)
676 TermWin.nscrolled = TermWin.saveLines; 673 TermWin.nscrolled = TermWin.saveLines;
677 else 674 else
678 TermWin.nscrolled = (uint16_t)nscrolled; 675 TermWin.nscrolled = (unsigned int)nscrolled;
679 676
680 if ((options & Opt_scrollWithBuffer) 677 if ((options & Opt_scrollWithBuffer)
681 && TermWin.view_start != 0 678 && TermWin.view_start != 0
682 && TermWin.view_start != TermWin.saveLines) 679 && TermWin.view_start != TermWin.saveLines)
683 scr_page (UP, count); 680 scr_page (UP, count);
… …
702 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 699 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */
703 } 700 }
704 else if (j >= row1 && j <= row2) 701 else if (j >= row1 && j <= row2)
705 { 702 {
706 /* move selected region too */ 703 /* move selected region too */
707 selection.beg.row -= count; 704 selection.beg.row -= count;
708 selection.end.row -= count; 705 selection.end.row -= count;
709 selection.mark.row -= count; 706 selection.mark.row -= count;
710 } 707 }
711 } 708 }
712 709
713 selection_check (0); /* _after_ TermWin.nscrolled update */ 710 selection_check (0); /* _after_ TermWin.nscrolled update */
… …
721 i = row2 - row1 + 1; 718 i = row2 - row1 + 1;
722 MIN_IT (count, i); 719 MIN_IT (count, i);
723 720
724 if (j > 0) 721 if (j > 0)
725 { 722 {
726 /* A: scroll up */ 723 /* scroll up */
727 724
728 /* A1: Copy lines that will get clobbered by the rotation */ 725 /* Copy lines that will get clobbered by the rotation */
729 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); 726 memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
730 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); 727 memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
731 728
732 /* A2: Rotate lines */ 729 /* Rotate lines */
733 i = row2 - row1 - count + 1; 730 i = row2 - row1 - count + 1;
734 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); 731 memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
735 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); 732 memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
736 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); 733 memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
737 734
738 j = row2 - count + 1, i = count; 735 j = row2 - count + 1, i = count;
739 } 736 }
740 else /* if (j < 0) */ 737 else /* if (j < 0) */
741 { 738 {
742 /* B: scroll down */ 739 /* scroll down */
743 740
744 /* B1: Copy lines that will get clobbered by the rotation */ 741 /* Copy lines that will get clobbered by the rotation */
745 for (i = 0, j = row2; i < count; i++, j--) 742 for (i = 0, j = row2; i < count; i++, j--)
746 { 743 {
747 buf_text[i] = screen.text[j]; 744 buf_text[i] = screen.text[j];
748 buf_rend[i] = screen.rend[j]; 745 buf_rend[i] = screen.rend[j];
749 } 746 }
750 747
751 /* B2: Rotate lines */ 748 /* Rotate lines */
752 for (j = row2, i = j - count; i >= row1; i--, j--) 749 for (j = row2, i = j - count; i >= row1; i--, j--)
753 { 750 {
754 screen.tlen[j] = screen.tlen[i]; 751 screen.tlen[j] = screen.tlen[i];
755 screen.text[j] = screen.text[i]; 752 screen.text[j] = screen.text[i];
756 screen.rend[j] = screen.rend[i]; 753 screen.rend[j] = screen.rend[i];
… …
758 755
759 j = row1, i = count; 756 j = row1, i = count;
760 count = -count; 757 count = -count;
761 } 758 }
762 759
763 /* C: Resurrect lines */ 760 /* Resurrect lines */
764 memset (screen.tlen + j, 0, i * sizeof (int16_t)); 761 memset (screen.tlen + j, 0, i * sizeof (int16_t));
765 memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); 762 memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
766 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); 763 memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
767 if (!spec) /* line length may not equal TermWin.ncol */ 764 if (!spec) /* line length may not equal TermWin.ncol */
768 for (; i--; j++) 765 for (; i--; j++)
… …
826 823
827 if (c < 0x20) 824 if (c < 0x20)
828 switch (c) 825 switch (c)
829 { 826 {
830 case C0_HT: 827 case C0_HT:
831 scr_tab (1); 828 scr_tab (1, true);
832 continue; 829 continue;
833 830
834 case C0_LF: 831 case C0_LF:
835 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
836 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
… …
876 873
877 stp = screen.text[row]; /* _must_ refresh */ 874 stp = screen.text[row]; /* _must_ refresh */
878 srp = screen.rend[row]; /* _must_ refresh */ 875 srp = screen.rend[row]; /* _must_ refresh */
879 } 876 }
880 877
881 if (screen.flags & Screen_Insert)
882 scr_insdel_chars (1, INSERT);
883
884 // rely on wcwidth to tell us the character width, at least for non-latin1 878 // rely on wcwidth to tell us the character width, at least for non-latin1
885 // do wcwidth before further replacements, as wcwidth says that line-drawing 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
886 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
887 int width = c < 0x100 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
888 882
889 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
890 { 884 {
891 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars
892 static uint16_t vt100_0[32] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
893 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
894 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
895 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
896 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
897 }; 897 };
898 898
899 if (c >= 0x5f && c <= 0x7e) 899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
900 { 900 {
901 c = vt100_0[c - 0x5f]; 901 c = vt100_0[c - 0x40];
902 width = 1; 902 width = 1;
903 } 903 }
904 } 904 }
905 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
906 if (width != 0) 909 if (width != 0)
907 { 910 {
911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
908#if !UNICODE_3 915#if !UNICODE_3
909 // trim characters we can't store directly :( 916 // trim characters we can't store directly :(
910 if (c >= 0x10000) 917 if (c >= 0x10000)
911# if ENABLE_COMBINING 918# if ENABLE_COMBINING
912 c = rxvt_composite.compose (c); // map to lower 16 bits 919 c = rxvt_composite.compose (c); // map to lower 16 bits
913# else 920# else
914 c = 0xfffd; 921 c = 0xfffd;
915# endif 922# endif
916#endif 923#endif
917 bool bold = (options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 924
918 rend_t rend = SET_FONT (rstyle, 925 // nuke the character at this position, if required
919 c > 0x7f || bold || c < 0x20 926 if (stp[screen.cur.col] == NOCHAR
920 ? TermWin.fontset->find_font (c, bold) 927 || (screen.cur.col < TermWin.ncol - 1
921 : TermWin.ascii_map [c - 0x20]); 928 && stp[screen.cur.col + 1] == NOCHAR))
929 {
930 int col = screen.cur.col;
931
932 // find begin
933 while (col > 0 && stp[col] == NOCHAR)
934 col--;
935
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
937
938 // found begin, nuke
939 do {
940 stp[col] = ' ';
941 srp[col] = rend;
942 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR);
944 }
945
946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922 947
923 do 948 do
924 { 949 {
925 stp[screen.cur.col] = c; 950 stp[screen.cur.col] = c;
926 srp[screen.cur.col] = rend; 951 srp[screen.cur.col] = rend;
… …
938 c = NOCHAR; 963 c = NOCHAR;
939 } 964 }
940 while (--width > 0); 965 while (--width > 0);
941 966
942 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
943 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
944 { 970 {
945 stp[c] = ' '; 971 stp[c] = ' ';
946 srp[c] = rend; 972 srp[c] = rend;
947 } 973 }
948 } 974 }
949 else if (width == 0) 975 else if (width == 0)
950 { 976 {
951#if ENABLE_COMBINING 977#if ENABLE_COMBINING
952 // handle combining characters 978 // handle combining characters
… …
959 985
960 if (screen.cur.col > 0) 986 if (screen.cur.col > 0)
961 { 987 {
962 tp = stp + screen.cur.col - 1; 988 tp = stp + screen.cur.col - 1;
963 rp = srp + screen.cur.col - 1; 989 rp = srp + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
964 } 993 }
965 else if (screen.cur.row > 0 994 else if (screen.cur.row > 0
966 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
967 { 996 {
968 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 997 int line = screen.cur.row - 1 + TermWin.saveLines;
969 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 998
999 tp = screen.text[line] + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
970 } 1004 }
971 else 1005 else
972 continue; 1006 continue;
973
974 // handle double-width-chars by making them look extremely ugly
975 if (*tp == NOCHAR)
976 *tp = ' '; // hack //D //TODO //--tp, --rp;
977 1007
978 // first try to find a precomposed character 1008 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c); 1009 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR) 1010 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c); 1011 n = rxvt_composite.compose (*tp, c);
982 1012
983 *tp = n; 1013 *tp = n;
984 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif 1015#endif
986 } 1016 }
987 } 1017 }
988 1018
989 if (screen.tlen[row] != -1) /* XXX: think about this */ 1019 if (screen.tlen[row] != -1) /* XXX: think about this */
… …
1028 * Process Horizontal Tab 1058 * Process Horizontal Tab
1029 * count: +ve = forward; -ve = backwards 1059 * count: +ve = forward; -ve = backwards
1030 * XTERM_SEQ: CTRL-I 1060 * XTERM_SEQ: CTRL-I
1031 */ 1061 */
1032void 1062void
1033rxvt_term::scr_tab (int count) 1063rxvt_term::scr_tab (int count, bool ht)
1034{ 1064{
1035 int i, x; 1065 int i, x;
1036 1066
1037 want_refresh = 1; 1067 want_refresh = 1;
1038 i = x = screen.cur.col; 1068 i = x = screen.cur.col;
1039 1069
1040 if (count == 0) 1070 if (count == 0)
1041 return; 1071 return;
1042 else if (count > 0) 1072 else if (count > 0)
1043 { 1073 {
1074 int row = TermWin.saveLines + screen.cur.row;
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i];
1078 ht &= tp[i] == ' ';
1079
1044 for (; ++i < TermWin.ncol; ) 1080 for (; ++i < TermWin.ncol; )
1045 if (tabs[i]) 1081 if (tabs[i])
1046 { 1082 {
1047 x = i; 1083 x = i;
1048 if (!--count) 1084 if (!--count)
1049 break; 1085 break;
1050 } 1086 }
1087 else
1088 ht &= tp[i] == ' '
1089 && RS_SAME (rp[i], base_rend);
1051 1090
1052 if (count) 1091 if (count)
1053 x = TermWin.ncol - 1; 1092 x = TermWin.ncol - 1;
1093
1094 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs)
1097 {
1098 base_rend = SET_FONT (base_rend, 0);
1099
1100 if (screen.tlen[row] != -1) /* XXX: think about this */
1101 MAX_IT (screen.tlen[row], x);
1102
1103 i = screen.cur.col;
1104
1105 tp[i] = '\t';
1106 rp[i] = base_rend;
1107
1108 while (++i < x)
1109 {
1110 tp[i] = NOCHAR;
1111 rp[i] = base_rend;
1112 }
1113 }
1054 } 1114 }
1055 else /* if (count < 0) */ 1115 else /* if (count < 0) */
1056 { 1116 {
1057 for (; --i >= 0; ) 1117 for (; --i >= 0; )
1058 if (tabs[i]) 1118 if (tabs[i])
… …
1101 */ 1161 */
1102#if ENABLE_FRILLS 1162#if ENABLE_FRILLS
1103void 1163void
1104rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1105{ 1165{
1106 int row; 1166 int row;
1107 1167
1108 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1109 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1110 else 1170 else
1111 { 1171 {
… …
1314 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1315 CLEAR_ROWS (row, num); 1375 CLEAR_ROWS (row, num);
1316 } 1376 }
1317 else 1377 else
1318 { 1378 {
1319 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1320 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322 ERASE_ROWS (row, num); 1382 ERASE_ROWS (row, num);
1323 gcvalue.foreground = pix_colors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1324 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1325 } 1385 }
1326 1386
1327 for (; num--; row++) 1387 for (; num--; row++)
1328 { 1388 {
1329 scr_blank_screen_mem (screen.text, screen.rend, 1389 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; 1390 screen.tlen[row + row_offset] = 0;
1332 scr_blank_line (drawn_text[row], drawn_rend[row], 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1333 (unsigned int)TermWin.ncol, ren);
1334 } 1392 }
1335} 1393}
1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1336 1405
1337/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1338/* 1407/*
1339 * Fill the screen with `E's 1408 * Fill the screen with `E's
1340 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1341 */ 1410 */
1342void 1411void
1343rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1344{ 1413{
1345 int i, j, k; 1414 int i, j, k;
1346 rend_t *r1, fs; 1415 rend_t *r1, fs;
1347 1416
1348 want_refresh = 1; 1417 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
1350 1419
1351 num_scr_allow = 0; 1420 num_scr_allow = 0;
1352 selection_check (3); 1421 selection_check (3);
1353 1422
1354 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1355 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1424 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1356 { 1425 {
1357 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1426 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1358 fill_text (screen.text[k], 'E', TermWin.ncol); 1427 fill_text (screen.text[k], 'E', TermWin.ncol);
1359 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1428 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1422 slp = &screen.tlen[row]; 1491 slp = &screen.tlen[row];
1423 1492
1424 switch (insdel) 1493 switch (insdel)
1425 { 1494 {
1426 case INSERT: 1495 case INSERT:
1427 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1428 col--)
1429 { 1497 {
1430 stp[col] = stp[col - count]; 1498 stp[col] = stp[col - count];
1431 srp[col] = srp[col - count]; 1499 srp[col] = srp[col - count];
1432 } 1500 }
1433 1501
… …
1443 if (selection.end.row != screen.cur.row 1511 if (selection.end.row != screen.cur.row
1444 || (selection.end.col + count >= TermWin.ncol)) 1512 || (selection.end.col + count >= TermWin.ncol))
1445 CLEAR_SELECTION (); 1513 CLEAR_SELECTION ();
1446 else 1514 else
1447 { /* shift selection */ 1515 { /* shift selection */
1448 selection.beg.col += count; 1516 selection.beg.col += count;
1449 selection.mark.col += count; /* XXX: yes? */ 1517 selection.mark.col += count; /* XXX: yes? */
1450 selection.end.col += count; 1518 selection.end.col += count;
1451 } 1519 }
1452 } 1520 }
1453 1521
1454 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1455 (unsigned int)count, rstyle); 1523 (unsigned int)count, rstyle);
1456 break; 1524 break;
1457 1525
1458 case ERASE: 1526 case ERASE:
1459 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1460 selection_check (1); 1528 selection_check (1);
1461 screen.cur.col -= count; 1529 screen.cur.col -= count;
1462 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1463 (unsigned int)count, rstyle); 1531 (unsigned int)count, rstyle);
1464 break; 1532 break;
1465 1533
1466 case DELETE: 1534 case DELETE:
1467 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1470 { 1538 {
1471 stp[col] = stp[col + count]; 1539 stp[col] = stp[col + count];
1472 srp[col] = srp[col + count]; 1540 srp[col] = srp[col + count];
1473 } 1541 }
1474 1542
1475 scr_blank_line (& (stp[TermWin.ncol - count]), 1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1476 & (srp[TermWin.ncol - count]),
1477 (unsigned int)count, tr); 1544 (unsigned int)count, tr);
1478 1545
1479 if (*slp == -1) /* break line continuation */ 1546 if (*slp == -1) /* break line continuation */
1480 *slp = TermWin.ncol; 1547 *slp = TermWin.ncol;
1481 1548
… …
1490 || selection.end.col >= TermWin.ncol) 1557 || selection.end.col >= TermWin.ncol)
1491 CLEAR_SELECTION (); 1558 CLEAR_SELECTION ();
1492 else 1559 else
1493 { 1560 {
1494 /* shift selection */ 1561 /* shift selection */
1495 selection.beg.col -= count; 1562 selection.beg.col -= count;
1496 selection.mark.col -= count; /* XXX: yes? */ 1563 selection.mark.col -= count; /* XXX: yes? */
1497 selection.end.col -= count; 1564 selection.end.col -= count;
1498 } 1565 }
1499 } 1566 }
1500 1567
1501 break; 1568 break;
1502 } 1569 }
… …
1568{ 1635{
1569 if (mode) 1636 if (mode)
1570 screen.flags |= Screen_Relative; 1637 screen.flags |= Screen_Relative;
1571 else 1638 else
1572 screen.flags &= ~Screen_Relative; 1639 screen.flags &= ~Screen_Relative;
1640
1573 scr_gotorc (0, 0, 0); 1641 scr_gotorc (0, 0, 0);
1574} 1642}
1575 1643
1576/* ------------------------------------------------------------------------- */ 1644/* ------------------------------------------------------------------------- */
1577/* 1645/*
… …
1617 1685
1618 if (rvideo != mode) 1686 if (rvideo != mode)
1619 { 1687 {
1620 rvideo = mode; 1688 rvideo = mode;
1621 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); 1689 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1622#if defined(XPM_BACKGROUND) 1690#if XPM_BACKGROUND
1623 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1624#endif 1692#endif
1625#if defined(TRANSPARENT) 1693#if TRANSPARENT
1626 if (! (options & Opt_transparent) || am_transparent == 0) 1694 if (! (options & Opt_transparent) || am_transparent == 0)
1627#endif 1695#endif
1628 XSetWindowBackground (display->display, TermWin.vt, 1696 XSetWindowBackground (display->display, TermWin.vt,
1629 pix_colors[Color_bg]); 1697 pix_colors[Color_bg]);
1630 1698
… …
1685 * XTERM_SEQ: Invoke G2 character set: ESC N 1753 * XTERM_SEQ: Invoke G2 character set: ESC N
1686 * XTERM_SEQ: Invoke G3 character set: ESC O 1754 * XTERM_SEQ: Invoke G3 character set: ESC O
1687 */ 1755 */
1688void 1756void
1689rxvt_term::scr_charset_choose (int set) 1757rxvt_term::scr_charset_choose (int set)
1690 { 1758{
1691 screen.charset = set; 1759 screen.charset = set;
1692 set_font_style (); 1760 set_font_style ();
1693 } 1761}
1694 1762
1695/* ------------------------------------------------------------------------- */ 1763/* ------------------------------------------------------------------------- */
1696/* 1764/*
1697 * Set a font 1765 * Set a font
1698 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1766 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1701 * XTERM_SEQ: Set G3 character set: ESC + <C> 1769 * XTERM_SEQ: Set G3 character set: ESC + <C>
1702 * See set_font_style for possible values for <C> 1770 * See set_font_style for possible values for <C>
1703 */ 1771 */
1704void 1772void
1705rxvt_term::scr_charset_set (int set, unsigned int ch) 1773rxvt_term::scr_charset_set (int set, unsigned int ch)
1706 { 1774{
1707 charsets[set] = (unsigned char)ch; 1775 charsets[set] = (unsigned char)ch;
1708 set_font_style (); 1776 set_font_style ();
1709 } 1777}
1710 1778
1711 1779
1712/* ------------------------------------------------------------------------- * 1780/* ------------------------------------------------------------------------- *
1713 * MAJOR SCREEN MANIPULATION * 1781 * MAJOR SCREEN MANIPULATION *
1714 * ------------------------------------------------------------------------- */ 1782 * ------------------------------------------------------------------------- */
… …
1808 */ 1876 */
1809int 1877int
1810rxvt_term::scr_move_to (int y, int len) 1878rxvt_term::scr_move_to (int y, int len)
1811{ 1879{
1812 long p = 0; 1880 long p = 0;
1813 uint16_t oldviewstart; 1881 unsigned int oldviewstart;
1814 1882
1815 oldviewstart = TermWin.view_start; 1883 oldviewstart = TermWin.view_start;
1816 1884
1817 if (y < len) 1885 if (y < len)
1818 { 1886 {
1819 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1887 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1820 p -= (long) (TermWin.nrow - 1); 1888 p -= (long) (TermWin.nrow - 1);
1821 p = max (p, 0); 1889 p = max (p, 0);
1822 } 1890 }
1823 1891
1824 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1892 TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled);
1825 1893
1826 return scr_changeview (oldviewstart); 1894 return scr_changeview (oldviewstart);
1827} 1895}
1828 1896
1829/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
… …
1833 */ 1901 */
1834int 1902int
1835rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1836{ 1904{
1837 int n; 1905 int n;
1838 uint16_t oldviewstart; 1906 unsigned int oldviewstart;
1839 1907
1840#ifdef DEBUG_STRICT
1841 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1842#endif
1843 oldviewstart = TermWin.view_start; 1908 oldviewstart = TermWin.view_start;
1909
1844 if (direction == UP) 1910 if (direction == UP)
1845 { 1911 {
1846 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1847 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1848 } 1914 }
1849 else 1915 else
1850 { 1916 {
1851 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1852 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1853 } 1919 }
1920
1854 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1855} 1922}
1856 1923
1857int 1924int
1858rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1859{ 1926{
1860 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1861 { 1928 {
1862 want_refresh = 1; 1929 want_refresh = 1;
1863 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
… …
1960 2027
1961void 2028void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 2029rxvt_term::scr_refresh (unsigned char refresh_type)
1963{ 2030{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */ 2031 unsigned char must_clear, /* use draw_string not draw_image_string */
1965 rvid, /* reverse video this position */
1966 showcursor; /* show the cursor */ 2032 showcursor; /* show the cursor */
1967 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
1968 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
1969 int i, /* tmp */ 2035 int i, /* tmp */
1970 row_offset; /* basic offset in screen structure */ 2036 row_offset; /* basic offset in screen structure */
1971#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
1972 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
1973#endif 2039#endif
1974 rend_t *crp; // cursor rendition pointer 2040 rend_t *crp; // cursor rendition pointer
1975 2041
2042 want_refresh = 0; /* screen is current */
2043
1976 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2044 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1977 return; 2045 return;
1978 2046
1979 /* 2047 /*
1980 * A: set up vars 2048 * A: set up vars
… …
1982 must_clear = 0; 2050 must_clear = 0;
1983 refresh_count = 0; 2051 refresh_count = 0;
1984 2052
1985 row_offset = TermWin.saveLines - TermWin.view_start; 2053 row_offset = TermWin.saveLines - TermWin.view_start;
1986 2054
1987#ifdef XPM_BACKGROUND 2055#if XPM_BACKGROUND
1988 must_clear |= (bgPixmap.pixmap != None); 2056 must_clear |= (bgPixmap.pixmap != None);
1989#endif 2057#endif
1990#ifdef TRANSPARENT 2058#if TRANSPARENT
1991 must_clear |= ((options & Opt_transparent) && am_transparent); 2059 must_clear |= ((options & Opt_transparent) && am_transparent);
1992#endif 2060#endif
1993 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2061 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1994 2062
1995 /* 2063 /*
1996 * B: reverse any characters which are selected 2064 * B: reverse any characters which are selected
1997 */ 2065 */
1998 scr_reverse_selection (); 2066 scr_reverse_selection ();
1999#if ENABLE_OVERLAY
2000 scr_swap_overlay ();
2001#endif
2002 2067
2003 /* 2068 /*
2004 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2005 */ 2070 */
2006 { 2071 {
… …
2080 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2081 } 2146 }
2082 } 2147 }
2083 } 2148 }
2084 2149
2150#if ENABLE_OVERLAY
2151 scr_swap_overlay ();
2152#endif
2153
2085 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2154 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2086 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2155 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2156
2087#ifndef NO_SLOW_LINK_SUPPORT 2157#ifndef NO_SLOW_LINK_SUPPORT
2088 /* 2158 /*
2089 * D: CopyArea pass - very useful for slower links 2159 * D: CopyArea pass - very useful for slower links
2090 * This has been deliberately kept simple. 2160 * This has been deliberately kept simple.
2091 */ 2161 */
… …
2168 2238
2169 for (col = 0; col < TermWin.ncol; col++) 2239 for (col = 0; col < TermWin.ncol; col++)
2170 { 2240 {
2171 /* compare new text with old - if exactly the same then continue */ 2241 /* compare new text with old - if exactly the same then continue */
2172 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2242 if (stp[col] == dtp[col] /* Must match characters to skip. */
2173 && (srp[col] == drp[col] /* Either rendition the same or */ 2243 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2174 || (stp[col] == ' ' /* space w/ no background change */ 2244 || (stp[col] == ' ' /* space w/ no background change */
2175 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2245 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2176 continue; 2246 continue;
2177 2247
2178 // redraw one or more characters 2248 // redraw one or more characters
2179 2249
2180 // seek to the beginning if wide characters 2250 // seek to the beginning of wide characters
2181 while (stp[col] == NOCHAR && col > 0) 2251 while (stp[col] == NOCHAR && col > 0)
2182 --col; 2252 --col;
2183 2253
2184 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2254 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2185 text_t *text = stp + col; 2255 text_t *text = stp + col;
… …
2188 dtp[col] = stp[col]; 2258 dtp[col] = stp[col];
2189 drp[col] = rend; 2259 drp[col] = rend;
2190 2260
2191 int xpixel = Col2Pixel (col); 2261 int xpixel = Col2Pixel (col);
2192 2262
2193 // this loop looks very messy, it can probably be optimized
2194 // and cleaned a bit by you?
2195 for (i = 0; ++col < TermWin.ncol; ) 2263 for (i = 0; ++col < TermWin.ncol; )
2196 { 2264 {
2197 if (stp[col] == NOCHAR) 2265 if (stp[col] == NOCHAR)
2198 { 2266 {
2199 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
… …
2202 i++; 2270 i++;
2203 2271
2204 continue; 2272 continue;
2205 } 2273 }
2206 2274
2207 if (rend != srp[col]) 2275 if (!RS_SAME (rend, srp[col]))
2208 break; 2276 break;
2209 2277
2210 count++; 2278 count++;
2211 2279
2212 if (stp[col] != dtp[col] 2280 if (stp[col] != dtp[col]
2213 || srp[col] != drp[col]) 2281 || !RS_SAME (srp[col], drp[col]))
2214 { 2282 {
2215 if (must_clear && (i++ > count / 2)) 2283 if (must_clear && (i++ > count / 2))
2216 break; 2284 break;
2217 2285
2218 dtp[col] = stp[col]; 2286 dtp[col] = stp[col];
… …
2228 2296
2229 // sometimes we optimize away the trailing NOCHAR's, add them back 2297 // sometimes we optimize away the trailing NOCHAR's, add them back
2230 while (i && text[count] == NOCHAR) 2298 while (i && text[count] == NOCHAR)
2231 count++, i--; 2299 count++, i--;
2232 2300
2301#if ENABLE_STYLES
2302 // force redraw after "careful" characters to avoid pixel droppings
2303 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2304 drp[col + 1] = ~srp[col + 1];
2305
2306 // include previous careful character(s) if possible, looks nicer (best effort...)
2307 while (text > stp
2308 && srp[text - stp - 1] & RS_Careful
2309 && RS_SAME (rend, srp[text - stp - 1]))
2310 text--, count++, xpixel -= TermWin.fwidth;
2311#endif
2312
2233 /* 2313 /*
2234 * Determine the attributes for the string 2314 * Determine the attributes for the string
2235 */ 2315 */
2236 int fid = GET_FONT (rend);
2237 int fore = GET_FGCOLOR (rend); // desired foreground 2316 int fore = GET_FGCOLOR (rend); // desired foreground
2238 int back = GET_BGCOLOR (rend); // desired background 2317 int back = GET_BGCOLOR (rend); // desired background
2239 2318
2240 rend = GET_ATTR (rend); 2319 // only do special processing if ana attributes are set, which is rare
2241 2320 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2242 rvid = !!(rend & RS_RVid); 2321 {
2322 bool invert = rend & RS_RVid;
2243 2323
2244#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2245 if (rend & RS_Bold && fore == Color_fg && !(options & Opt_realBold)) 2325 if (rend & RS_Bold
2326 && fore == Color_fg)
2246 { 2327 {
2247 if (ISSET_PIXCOLOR (Color_BD)) 2328 if (ISSET_PIXCOLOR (Color_BD))
2248 fore = Color_BD; 2329 fore = Color_BD;
2330# if !ENABLE_STYLES
2249 else 2331 else
2250 rvid = !rvid; 2332 invert = !invert;
2333# endif
2334 }
2335
2336 if (rend & RS_Italic
2337 && fore == Color_fg)
2338 {
2339 if (ISSET_PIXCOLOR (Color_IT))
2340 fore = Color_IT;
2341# if !ENABLE_STYLES
2342 else
2343 invert = !invert;
2344# endif
2345 }
2346
2347 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2348 fore = Color_UL;
2349#endif
2350
2351 if (invert)
2352 {
2353 SWAP_IT (fore, back, int);
2354
2355#ifndef NO_BOLD_UNDERLINE_REVERSE
2356 if (ISSET_PIXCOLOR (Color_RV))
2357 back = Color_RV;
2358#endif
2359 }
2360
2361#ifdef TEXT_BLINK
2362 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2363 {
2364 if (!text_blink_ev.active)
2365 {
2366 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2367 hidden_text = 0;
2368 }
2369 else if (hidden_text)
2370 fore = back;
2371 }
2372#endif
2251 } 2373 }
2252
2253 if (rend & RS_Uline)
2254 if (ISSET_PIXCOLOR (Color_UL))
2255 fore = Color_UL;
2256#endif
2257
2258 if (rvid)
2259 {
2260 SWAP_IT (fore, back, int);
2261
2262#ifndef NO_BOLD_UNDERLINE_REVERSE
2263 if (ISSET_PIXCOLOR (Color_RV)
2264# ifndef NO_CURSORCOLOR
2265 && !ISSET_PIXCOLOR (Color_cursor)
2266# endif
2267 )
2268 back = Color_RV;
2269#endif
2270 }
2271
2272#ifdef TEXT_BLINK
2273 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2274 {
2275 if (!text_blink_ev.active)
2276 {
2277 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2278 hidden_text = 0;
2279 }
2280 else if (hidden_text)
2281 fore = back;
2282 }
2283#endif
2284 2374
2285 /* 2375 /*
2286 * Actually do the drawing of the string here 2376 * Actually do the drawing of the string here
2287 */ 2377 */
2288 rxvt_font *font = (*TermWin.fontset)[fid]; 2378 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2289 2379
2290 if (back == fore) 2380 if (back == fore)
2291 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2381 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2292 TermWin.fwidth * count, TermWin.fheight, 2382 TermWin.fwidth * count, TermWin.fheight,
2293 back); 2383 back);
… …
2309 } 2399 }
2310 else 2400 else
2311 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2401 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2312 2402
2313 if (rend & RS_Uline && font->descent > 1 && fore != back) 2403 if (rend & RS_Uline && font->descent > 1 && fore != back)
2404 {
2405#if ENABLE_FRILLS
2406 if (ISSET_PIXCOLOR (Color_underline))
2407 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2408 else
2409#endif
2410 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2411
2314 XDrawLine (display->display, drawBuffer, TermWin.gc, 2412 XDrawLine (display->display, drawBuffer, TermWin.gc,
2315 xpixel, ypixel + font->ascent + 1, 2413 xpixel, ypixel + font->ascent + 1,
2316 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2414 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2415 }
2317 } /* for (col....) */ 2416 } /* for (col....) */
2318 } /* for (row....) */ 2417 } /* for (row....) */
2418
2419#if ENABLE_OVERLAY
2420 scr_swap_overlay ();
2421#endif
2319 2422
2320 /* 2423 /*
2321 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2322 */ 2425 */
2323 if (showcursor) 2426 if (showcursor)
… …
2349 } 2452 }
2350 2453
2351 /* 2454 /*
2352 * H: cleanup selection 2455 * H: cleanup selection
2353 */ 2456 */
2354#if ENABLE_OVERLAY
2355 scr_swap_overlay ();
2356#endif
2357 scr_reverse_selection (); 2457 scr_reverse_selection ();
2358 2458
2359 if (refresh_type & SMOOTH_REFRESH) 2459 if (refresh_type & SMOOTH_REFRESH)
2360 XFlush (display->display); 2460 XFlush (display->display);
2361 2461
2362 num_scr = 0; 2462 num_scr = 0;
2363 num_scr_allow = 1; 2463 num_scr_allow = 1;
2364 want_refresh = 0; /* screen is current */
2365} 2464}
2366 2465
2367void 2466void
2368rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2467rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2369{ 2468{
2370 if (!rp || !tp) 2469 if (!rp || !tp)
2371 return; 2470 return;
2372 2471
2373 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2472 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2374 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2473 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2375} 2474}
2376 2475
2377void 2476void
2378rxvt_term::scr_remap_chars () 2477rxvt_term::scr_remap_chars ()
2379{ 2478{
… …
2385 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2484 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2386 scr_remap_chars (swap.text[i], swap.rend[i]); 2485 scr_remap_chars (swap.text[i], swap.rend[i]);
2387 } 2486 }
2388} 2487}
2389 2488
2489void
2490rxvt_term::scr_recolour ()
2491{
2492 if (1
2493#if TRANSPARENT
2494 && !am_transparent
2495#endif
2496#if XPM_BACKGROUND
2497 && !bgPixmap.pixmap
2498#endif
2499 )
2500 {
2501 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2502 XClearWindow (display->display, TermWin.parent[0]);
2503 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2504#if HAVE_SCROLLBARS
2505 if (scrollBar.win)
2506 {
2507 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2508 scrollBar.setIdle ();
2509 scrollbar_show (0);
2510 }
2511#endif
2512 }
2513
2514 scr_clear ();
2515 scr_touch (true);
2516 want_refresh = 1;
2517}
2518
2390/* ------------------------------------------------------------------------- */ 2519/* ------------------------------------------------------------------------- */
2391void 2520void
2392rxvt_term::scr_clear (bool really) 2521rxvt_term::scr_clear (bool really)
2393{ 2522{
2394 if (!TermWin.mapped) 2523 if (!TermWin.mapped)
2395 return; 2524 return;
2396 2525
2397 num_scr_allow = 0; 2526 num_scr_allow = 0;
2398 want_refresh = 1; 2527 want_refresh = 1;
2399 2528
2400#ifdef TRANSPARENT 2529#if TRANSPARENT
2401 if ((options & Opt_transparent) && (am_pixmap_trans == 0)) 2530 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2402 { 2531 {
2403 int i; 2532 int i;
2404 2533
2405 if (! (options & Opt_transparent_all)) 2534 if (!(options & Opt_transparent_all))
2406 i = 0; 2535 i = 0;
2407 else 2536 else
2408 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2537 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2409 2538
2410 while (i--) 2539 while (i--)
… …
2426 int end_row = TermWin.saveLines - TermWin.view_start; 2555 int end_row = TermWin.saveLines - TermWin.view_start;
2427 int i = selection.beg.row + TermWin.saveLines; 2556 int i = selection.beg.row + TermWin.saveLines;
2428 int col, row = selection.end.row + TermWin.saveLines; 2557 int col, row = selection.end.row + TermWin.saveLines;
2429 rend_t *srp; 2558 rend_t *srp;
2430 2559
2431 if (i >= end_row) 2560#if ENABLE_FRILLS
2432 col = selection.beg.col; 2561 if (selection.rect)
2562 {
2563 end_row += TermWin.nrow;
2564
2565 for (; i <= row && i <= end_row; i++)
2566 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2567 srp[col] ^= RS_RVid;
2568 }
2433 else 2569 else
2570#endif
2571 {
2572 if (i >= end_row)
2573 col = selection.beg.col;
2574 else
2434 { 2575 {
2435 col = 0; 2576 col = 0;
2436 i = end_row; 2577 i = end_row;
2437 } 2578 }
2438 2579
2439 end_row += TermWin.nrow; 2580 end_row += TermWin.nrow;
2581
2440 for (; i < row && i < end_row; i++, col = 0) 2582 for (; i < row && i < end_row; i++, col = 0)
2441 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2583 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2442 srp[col] ^= RS_RVid; 2584 srp[col] ^= RS_RVid;
2443 2585
2444 if (i == row && i < end_row) 2586 if (i == row && i < end_row)
2445 for (srp = screen.rend[i]; col < selection.end.col; col++) 2587 for (srp = screen.rend[i]; col < selection.end.col; col++)
2446 srp[col] ^= RS_RVid; 2588 srp[col] ^= RS_RVid;
2589 }
2447 } 2590 }
2448} 2591}
2449 2592
2450/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2451/* 2594/*
… …
2519/* ------------------------------------------------------------------------- */ 2662/* ------------------------------------------------------------------------- */
2520/* 2663/*
2521 * Paste a selection direct to the command fd 2664 * Paste a selection direct to the command fd
2522 */ 2665 */
2523void 2666void
2524rxvt_term::paste (const unsigned char *data, unsigned int len) 2667rxvt_term::paste (unsigned char *data, unsigned int len)
2525{ 2668{
2526 unsigned int i, j, n;
2527 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2528
2529 /* convert normal newline chars into common keyboard Return key sequence */ 2669 /* convert normal newline chars into common keyboard Return key sequence */
2530 for (i = 0; i < len; i += PROP_SIZE) 2670 for (unsigned int i = 0; i < len; i++)
2531 {
2532 n = min (len - i, PROP_SIZE);
2533 memcpy (ds, data + i, n);
2534
2535 for (j = 0; j < n; j++)
2536 if (ds[j] == C0_LF) 2671 if (data[i] == C0_LF)
2537 ds[j] = C0_CR; 2672 data[i] = C0_CR;
2538 2673
2539 tt_write (ds, (int)n); 2674 tt_write (data, len);
2540 }
2541
2542 free (ds);
2543} 2675}
2544 2676
2545/* ------------------------------------------------------------------------- */ 2677/* ------------------------------------------------------------------------- */
2546/* 2678/*
2547 * Respond to a notification that a primary selection has been sent 2679 * Respond to a notification that a primary selection has been sent
2548 * EXT: SelectionNotify 2680 * EXT: SelectionNotify
2549 */ 2681 */
2550int 2682void
2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2683rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2552{ 2684{
2553 long nread = 0;
2554 unsigned long bytes_after;
2555 XTextProperty ct;
2556
2557 if (prop == None) /* check for failed XConvertSelection */ 2685 if (prop == None) /* check for failed XConvertSelection */
2558 { 2686 {
2559 if ((selection_type & Sel_CompoundText)) 2687 if ((selection_type & Sel_CompoundText))
2560 { 2688 {
2561 int selnum = selection_type & Sel_whereMask; 2689 int selnum = selection_type & Sel_whereMask;
… …
2574 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2702 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2575 else 2703 else
2576 selection_type = 0; 2704 selection_type = 0;
2577 } 2705 }
2578 2706
2579 return 0; 2707 return;
2580 }
2581
2582 for (;;)
2583 { 2708 }
2709
2710 unsigned long bytes_after;
2711 XTextProperty ct;
2712
2713 if (XGetWindowProperty (display->display, win, prop,
2714 0, PROP_SIZE / 4,
2715 delete_prop, AnyPropertyType,
2716 &ct.encoding, &ct.format,
2717 &ct.nitems, &bytes_after,
2718 &ct.value) != Success)
2719 {
2720 ct.value = 0;
2721 goto bailout;
2722 }
2723
2724 if (ct.encoding == None)
2725 goto bailout;
2726
2727 if (bytes_after)
2728 {
2729 // fetch and append remaining data
2730 XTextProperty ct2;
2731
2584 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2732 if (XGetWindowProperty (display->display, win, prop,
2585 (long) (PROP_SIZE / 4), delete_prop, 2733 ct.nitems / 4, (bytes_after + 3) / 4,
2734 delete_prop, AnyPropertyType,
2586 AnyPropertyType, &ct.encoding, &ct.format, 2735 &ct2.encoding, &ct2.format,
2587 &ct.nitems, &bytes_after, 2736 &ct2.nitems, &bytes_after,
2588 &ct.value) != Success) 2737 &ct2.value) != Success)
2589 break; 2738 goto bailout;
2590 2739
2591 if (ct.encoding == 0) 2740 // realloc should be compatible to XFree, here, and elsewhere, too
2592 break; 2741 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2742 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2743 ct.nitems += ct2.nitems;
2593 2744
2745 XFree (ct2.value);
2746 }
2747
2748 if (ct.value == 0)
2749 goto bailout;
2750
2594 if (ct.encoding == xa[XA_INCR]) 2751 if (ct.encoding == xa[XA_INCR])
2595 { 2752 {
2596 // INCR selection, start handshake 2753 // INCR selection, start handshake
2754 if (!delete_prop)
2597 XDeleteProperty (display->display, win, prop); 2755 XDeleteProperty (display->display, win, prop);
2756
2598 selection_wait = Sel_incr; 2757 selection_wait = Sel_incr;
2758 incr_buf_fill = 0;
2599 incr_ev.start (NOW + 10); 2759 incr_ev.start (NOW + 10);
2600 break;
2601 }
2602 2760
2603 if (ct.value == NULL) 2761 goto bailout;
2604 continue; 2762 }
2605 2763
2606 if (ct.nitems == 0) 2764 if (ct.nitems == 0)
2765 {
2766 if (selection_wait == Sel_incr)
2767 {
2768 XFree (ct.value);
2769
2770 // finally complete, now paste the whole thing
2771 selection_wait = Sel_normal;
2772 ct.value = (unsigned char *)incr_buf;
2773 ct.nitems = incr_buf_fill;
2774 incr_buf = 0;
2775 incr_buf_size = 0;
2776 incr_ev.stop ();
2607 { 2777 }
2778 else
2779 {
2608 if (selection_wait == Sel_normal && nread == 0 2780 if (selection_wait == Sel_normal
2609 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2781 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2610 { 2782 {
2611 /* 2783 /*
2612 * pass through again trying CUT_BUFFER0 if we've come from 2784 * pass through again trying CUT_BUFFER0 if we've come from
2613 * XConvertSelection () but nothing was presented 2785 * XConvertSelection () but nothing was presented
2614 */ 2786 */
2615 selection_paste (display->root, XA_CUT_BUFFER0, False); 2787 selection_paste (display->root, XA_CUT_BUFFER0, False);
2616 } 2788 }
2617 2789
2618 nread = -1; /* discount any previous stuff */ 2790 goto bailout;
2619 break; 2791 }
2792 }
2793 else if (selection_wait == Sel_incr)
2794 {
2795 incr_ev.start (NOW + 10);
2796
2797 while (incr_buf_fill + ct.nitems > incr_buf_size)
2620 } 2798 {
2799 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2800 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2801 }
2621 2802
2803 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2622 nread += ct.nitems; 2804 incr_buf_fill += ct.nitems;
2623 2805
2806 goto bailout;
2807 }
2808
2624 char **cl; 2809 char **cl;
2625 int cr; 2810 int cr;
2811
2812#if ENABLE_FRILLS
2813 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2814 // so recode it manually
2815 if (ct.encoding == xa[XA_UTF8_STRING])
2816 {
2817 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2818 char *s = rxvt_wcstombs (w);
2819 free (w);
2820 // TODO: strlen == only the first element will be converted. well...
2821 paste ((unsigned char *)s, strlen (s));
2822 free (s);
2823 }
2824 else
2825#endif
2626 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2826 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2627 { 2827 && cl)
2828 {
2628 for (int i = 0; i < cr; i++) 2829 for (int i = 0; i < cr; i++)
2629 paste ((unsigned char *)cl[i], strlen (cl[i])); 2830 paste ((unsigned char *)cl[i], strlen (cl[i]));
2630 2831
2631 XFreeStringList (cl); 2832 XFreeStringList (cl);
2632 } 2833 }
2633 else 2834 else
2634 paste (ct.value, ct.nitems); 2835 paste (ct.value, ct.nitems); // paste raw
2635 2836
2636 if (bytes_after == 0) 2837bailout:
2637 break;
2638
2639 XFree (ct.value);
2640 }
2641
2642 if (ct.value)
2643 XFree (ct.value); 2838 XFree (ct.value);
2644 2839
2645 if (selection_wait == Sel_normal) 2840 if (selection_wait == Sel_normal)
2646 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2647
2648 return (int)nread;
2649} 2842}
2650 2843
2651void 2844void
2652rxvt_term::incr_cb (time_watcher &w) 2845rxvt_term::incr_cb (time_watcher &w)
2653{ 2846{
2654 selection_wait = Sel_none; 2847 selection_wait = Sel_none;
2655 2848
2849 incr_buf_size = 0;
2850 free (incr_buf);
2851
2656 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2852 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2657} 2853}
2658 2854
2659/*
2660 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2661 */
2662void 2855void
2663rxvt_term::selection_property (Window win, Atom prop) 2856rxvt_term::selection_property (Window win, Atom prop)
2664{ 2857{
2665 if (prop == None || selection_wait != Sel_incr) 2858 if (prop == None || selection_wait != Sel_incr)
2666 return; 2859 return;
2667 2860
2668 if (selection_paste (win, prop, 1) > 0) 2861 selection_paste (win, prop, true);
2669 incr_ev.start (NOW + 10);
2670 else
2671 {
2672 selection_wait = Sel_none;
2673 incr_ev.stop ();
2674 }
2675} 2862}
2676 2863
2677/* ------------------------------------------------------------------------- */ 2864/* ------------------------------------------------------------------------- */
2678/* 2865/*
2679 * Request the current selection: 2866 * Request the current selection:
… …
2713#else 2900#else
2714 selection_type = Sel_CompoundText; 2901 selection_type = Sel_CompoundText;
2715 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2902 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2716 return; 2903 return;
2717#endif 2904#endif
2718
2719 } 2905 }
2720 } 2906 }
2721 2907
2722 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2908 selection_wait = Sel_none; /* don't loop in selection_paste () */
2723 selection_paste (display->root, XA_CUT_BUFFER0, False); 2909 selection_paste (display->root, XA_CUT_BUFFER0, false);
2724} 2910}
2725 2911
2726int 2912int
2727rxvt_term::selection_request_other (Atom target, int selnum) 2913rxvt_term::selection_request_other (Atom target, int selnum)
2728{ 2914{
2729 Atom sel; 2915 Atom sel;
2730#ifdef DEBUG_SELECT
2731 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2732#endif
2733 2916
2734 selection_type |= selnum; 2917 selection_type |= selnum;
2735 2918
2736 if (selnum == Sel_Primary) 2919 if (selnum == Sel_Primary)
2737 sel = XA_PRIMARY; 2920 sel = XA_PRIMARY;
… …
2801 2984
2802 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2985 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2803 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2986 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2804 2987
2805 col = selection.beg.col; 2988 col = selection.beg.col;
2806 MAX_IT (col, 0);
2807 row = selection.beg.row + TermWin.saveLines; 2989 row = selection.beg.row + TermWin.saveLines;
2808 end_row = selection.end.row + TermWin.saveLines; 2990 end_row = selection.end.row + TermWin.saveLines;
2809 int ofs = 0; 2991 int ofs = 0;
2810 int extra = 0; 2992 int extra = 0;
2811 2993
2812 for (; row <= end_row; row++, col = 0) 2994 for (; row <= end_row; row++, col = 0)
2813 { 2995 {
2814 t = &screen.text[row][col];
2815
2816 end_col = screen.tlen[row]; 2996 end_col = screen.tlen[row];
2997
2998#if ENABLE_FRILLS
2999 if (selection.rect)
3000 {
3001 col = selection.beg.col;
3002 end_col = TermWin.ncol + 1;
3003 }
3004#endif
3005
3006 MAX_IT (col, 0);
2817 3007
2818 if (end_col == -1) 3008 if (end_col == -1)
2819 end_col = TermWin.ncol; 3009 end_col = TermWin.ncol;
2820 3010
2821 if (row == end_row) 3011 if (row == end_row || selection.rect)
2822 MIN_IT (end_col, selection.end.col); 3012 MIN_IT (end_col, selection.end.col);
2823 3013
3014 t = &screen.text[row][col];
2824 for (; col < end_col; col++) 3015 for (; col < end_col; col++)
2825 { 3016 {
2826 if (*t == NOCHAR) 3017 if (*t == NOCHAR)
2827 t++; 3018 t++;
2828#if ENABLE_COMBINING 3019#if ENABLE_COMBINING
… …
2876#if 0 3067#if 0
2877 XTextProperty ct; 3068 XTextProperty ct;
2878 3069
2879 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3070 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2880 { 3071 {
2881 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3072 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2882 PropModeReplace, ct.value, ct.nitems);
2883 XFree (ct.value); 3073 XFree (ct.value);
2884 } 3074 }
2885#endif 3075#endif
2886 3076
2887 selection_time = tm; 3077 selection_time = tm;
… …
3088 enum { 3278 enum {
3089 LEFT, RIGHT 3279 LEFT, RIGHT
3090 } closeto = RIGHT; 3280 } closeto = RIGHT;
3091 3281
3092 want_refresh = 1; 3282 want_refresh = 1;
3283
3093 switch (selection.op) 3284 switch (selection.op)
3094 { 3285 {
3095 case SELECTION_INIT: 3286 case SELECTION_INIT:
3096 CLEAR_SELECTION (); 3287 CLEAR_SELECTION ();
3097 selection.op = SELECTION_BEGIN; 3288 selection.op = SELECTION_BEGIN;
… …
3110 selection_start_colrow (col, row); 3301 selection_start_colrow (col, row);
3111 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
3112 default: 3303 default:
3113 return; 3304 return;
3114 } 3305 }
3306
3115 if (selection.beg.col == selection.end.col 3307 if (selection.beg.col == selection.end.col
3116 && selection.beg.col != selection.mark.col 3308 && selection.beg.col != selection.mark.col
3117 && selection.beg.row == selection.end.row 3309 && selection.beg.row == selection.end.row
3118 && selection.beg.row != selection.mark.row) 3310 && selection.beg.row != selection.mark.row)
3119 { 3311 {
… …
3169 } 3361 }
3170 else 3362 else
3171 { /* button1 drag or button3 drag */ 3363 { /* button1 drag or button3 drag */
3172 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3364 if (ROWCOL_IS_AFTER (selection.mark, pos))
3173 { 3365 {
3174 if ((selection.mark.row == selection.end.row) 3366 if (selection.mark.row == selection.end.row
3175 && (selection.mark.col == selection.end.col) 3367 && selection.mark.col == selection.end.col
3368 && clickchange
3176 && clickchange && selection.clicks == 2) 3369 && selection.clicks == 2)
3177 selection.mark.col--; 3370 selection.mark.col--;
3178 3371
3179 selection.beg.row = pos.row; 3372 selection.beg.row = pos.row;
3180 selection.beg.col = pos.col; 3373 selection.beg.col = pos.col;
3181 selection.end.row = selection.mark.row; 3374 selection.end.row = selection.mark.row;
… …
3192 3385
3193 if (selection.clicks == 1) 3386 if (selection.clicks == 1)
3194 { 3387 {
3195 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3388 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3196 3389
3197 if (end_col != -1 && selection.beg.col > end_col) 3390 if (selection.beg.col > end_col
3391 && end_col != -1
3392#if ENABLE_FRILLS
3393 && !selection.rect
3394#endif
3198 { 3395 )
3199#if 1
3200 selection.beg.col = ncol; 3396 selection.beg.col = ncol;
3201#else
3202 if (selection.beg.row != selection.end.row)
3203 selection.beg.col = ncol;
3204 else
3205 selection.beg.col = selection.mark.col;
3206#endif
3207 }
3208 3397
3209 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3398 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3210 3399
3211 if (end_col != -1 && selection.end.col > end_col) 3400 if (
3401 selection.end.col > end_col
3402 && end_col != -1
3403#if ENABLE_FRILLS
3404 && !selection.rect
3405#endif
3406 )
3212 selection.end.col = ncol; 3407 selection.end.col = ncol;
3213 } 3408 }
3214 else if (selection.clicks == 2) 3409 else if (selection.clicks == 2)
3215 { 3410 {
3216 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3411 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3217 selection.end.col--; 3412 selection.end.col--;
3218 3413
3219 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3220 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3414 selection_delimit_word (UP, &selection.beg, &selection.beg);
3415 selection_delimit_word (DN, &selection.end, &selection.end);
3221 } 3416 }
3222 else if (selection.clicks == 3) 3417 else if (selection.clicks == 3)
3223 { 3418 {
3224#if ENABLE_FRILLS 3419#if ENABLE_FRILLS
3225 if ((options & Opt_tripleclickwords)) 3420 if (options & Opt_tripleclickwords)
3226 { 3421 {
3227 int end_row; 3422 int end_row;
3228 3423
3229 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3230 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3425 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3231 3426
3232 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3427 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3233 { 3428 {
3234 end_col = screen.tlen[end_row + TermWin.saveLines]; 3429 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3245 else 3440 else
3246#endif 3441#endif
3247 { 3442 {
3248 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3443 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3249 selection.mark.col++; 3444 selection.mark.col++;
3445
3250 selection.beg.col = 0; 3446 selection.beg.col = 0;
3251 selection.end.col = ncol; 3447 selection.end.col = ncol;
3448
3449 // select a complete logical line
3450 while (selection.beg.row > -TermWin.saveLines
3451 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3452 selection.beg.row--;
3453
3454 while (selection.end.row < TermWin.nrow
3455 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3456 selection.end.row++;
3252 } 3457 }
3253 } 3458 }
3254 3459
3255 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3256 { /* mark may need to be changed */ 3461 { /* mark may need to be changed */
… …
3263 { 3468 {
3264 selection.mark.row = selection.beg.row; 3469 selection.mark.row = selection.beg.row;
3265 selection.mark.col = selection.beg.col; 3470 selection.mark.col = selection.beg.col;
3266 } 3471 }
3267 } 3472 }
3268}
3269 3473
3270#if ENABLE_FRILLS 3474#if ENABLE_FRILLS
3475 if (selection.rect && selection.beg.col > selection.end.col)
3476 SWAP_IT (selection.beg.col, selection.end.col, int);
3477#endif
3478}
3479
3480#if ENABLE_FRILLS
3271void 3481void
3272rxvt_term::selection_remove_trailing_spaces () 3482rxvt_term::selection_remove_trailing_spaces ()
3273{ 3483{
3274 int32_t end_col, end_row; 3484 int32_t end_col, end_row;
3275 text_t *stp; 3485 text_t *stp;
3276 3486
3277 end_col = selection.end.col; 3487 end_col = selection.end.col;
3278 end_row = selection.end.row; 3488 end_row = selection.end.row;
3489
3279 for ( ; end_row >= selection.beg.row; ) 3490 for ( ; end_row >= selection.beg.row; )
3280 { 3491 {
3281 stp = screen.text[end_row + TermWin.saveLines]; 3492 stp = screen.text[end_row + TermWin.saveLines];
3493
3282 while (--end_col >= 0) 3494 while (--end_col >= 0)
3283 { 3495 {
3284 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3496 if (stp[end_col] != ' '
3497 && stp[end_col] != '\t'
3498 && stp[end_col] != NOCHAR)
3285 break; 3499 break;
3286 } 3500 }
3501
3287 if (end_col >= 0 3502 if (end_col >= 0
3288 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3503 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3289 { 3504 {
3290 selection.end.col = end_col + 1; 3505 selection.end.col = end_col + 1;
3291 selection.end.row = end_row; 3506 selection.end.row = end_row;
3292 break; 3507 break;
3293 } 3508 }
3509
3294 end_row--; 3510 end_row--;
3295 end_col = TermWin.ncol; 3511 end_col = TermWin.ncol;
3296 } 3512 }
3513
3297 if (selection.mark.row > selection.end.row) 3514 if (selection.mark.row > selection.end.row)
3298 { 3515 {
3299 selection.mark.row = selection.end.row; 3516 selection.mark.row = selection.end.row;
3300 selection.mark.col = selection.end.col; 3517 selection.mark.col = selection.end.col;
3301 } 3518 }
… …
3317 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3318} 3535}
3319 3536
3320/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3321/* 3538/*
3322 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3323 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3324 * the X11 protocol.
3325 */
3326typedef CARD32 Atom32;
3327
3328/* ------------------------------------------------------------------------- */
3329/*
3330 * Respond to a request for our current selection 3539 * Respond to a request for our current selection
3331 * EXT: SelectionRequest 3540 * EXT: SelectionRequest
3332 */ 3541 */
3333void 3542void
3334rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3335{ 3544{
3336 XSelectionEvent ev; 3545 XSelectionEvent ev;
3337 XTextProperty ct; 3546 dDisp;
3338 XICCEncodingStyle style;
3339 Atom target;
3340 3547
3341 ev.type = SelectionNotify; 3548 ev.type = SelectionNotify;
3342 ev.property = None; 3549 ev.property = None;
3343 ev.display = rq.display; 3550 ev.display = rq.display;
3344 ev.requestor = rq.requestor; 3551 ev.requestor = rq.requestor;
… …
3346 ev.target = rq.target; 3553 ev.target = rq.target;
3347 ev.time = rq.time; 3554 ev.time = rq.time;
3348 3555
3349 if (rq.target == xa[XA_TARGETS]) 3556 if (rq.target == xa[XA_TARGETS])
3350 { 3557 {
3351 Atom32 target_list[6]; 3558 Atom target_list[6];
3352 Atom32 *target = target_list; 3559 Atom *target = target_list;
3353 3560
3354 *target++ = (Atom32) xa[XA_TARGETS]; 3561 *target++ = xa[XA_TARGETS];
3355 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3562 *target++ = xa[XA_TIMESTAMP];
3356 *target++ = (Atom32) XA_STRING; 3563 *target++ = XA_STRING;
3357 *target++ = (Atom32) xa[XA_TEXT]; 3564 *target++ = xa[XA_TEXT];
3358 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3565 *target++ = xa[XA_COMPOUND_TEXT];
3359#if X_HAVE_UTF8_STRING 3566#if X_HAVE_UTF8_STRING
3360 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3567 *target++ = xa[XA_UTF8_STRING];
3361#endif 3568#endif
3362 3569
3363 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3570 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3364 (8 * sizeof (target_list[0])), PropModeReplace, 3571 32, PropModeReplace,
3365 (unsigned char *)target_list, 3572 (unsigned char *)target_list, target - target_list);
3366 target - target_list);
3367 ev.property = rq.property; 3573 ev.property = rq.property;
3368 } 3574 }
3369#if TODO // TODO 3575#if TODO // TODO
3370 else if (rq.target == xa[XA_MULTIPLE]) 3576 else if (rq.target == xa[XA_MULTIPLE])
3371 { 3577 {
3372 /* TODO: Handle MULTIPLE */ 3578 /* TODO: Handle MULTIPLE */
3373 } 3579 }
3374#endif 3580#endif
3375 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3581 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3376 { 3582 {
3377 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3583 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3378 (8 * sizeof (Time)), PropModeReplace,
3379 (unsigned char *)&selection_time, 1); 3584 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3380 ev.property = rq.property; 3585 ev.property = rq.property;
3381 } 3586 }
3382 else if (rq.target == XA_STRING 3587 else if (rq.target == XA_STRING
3383 || rq.target == xa[XA_TEXT] 3588 || rq.target == xa[XA_TEXT]
3384 || rq.target == xa[XA_COMPOUND_TEXT] 3589 || rq.target == xa[XA_COMPOUND_TEXT]
3385 || rq.target == xa[XA_UTF8_STRING] 3590 || rq.target == xa[XA_UTF8_STRING]
3386 ) 3591 )
3387 { 3592 {
3593 XTextProperty ct;
3594 Atom target = rq.target;
3388 short freect = 0; 3595 short freect = 0;
3389 int selectlen; 3596 int selectlen;
3390 wchar_t *cl; 3597 wchar_t *cl;
3391 3598 enum {
3392 target = rq.target; 3599 enc_string = XStringStyle,
3600 enc_text = XStdICCTextStyle,
3601 enc_compound_text = XCompoundTextStyle,
3602#ifdef X_HAVE_UTF8_STRING
3603 enc_utf8 = XUTF8StringStyle,
3604#else
3605 enc_utf8 = -1,
3606#endif
3607 } style;
3393 3608
3394 if (target == XA_STRING) 3609 if (target == XA_STRING)
3395 // we actually don't do XA_STRING, but who cares, as i18n clients 3610 // we actually don't do XA_STRING, but who cares, as i18n clients
3396 // will ask for another format anyways. 3611 // will ask for another format anyways.
3397 style = XStringStyle; 3612 style = enc_string;
3398 else if (target == xa[XA_TEXT]) 3613 else if (target == xa[XA_TEXT])
3399 style = XStdICCTextStyle; 3614 style = enc_text;
3400 else if (target == xa[XA_COMPOUND_TEXT]) 3615 else if (target == xa[XA_COMPOUND_TEXT])
3401 style = XCompoundTextStyle; 3616 style = enc_compound_text;
3402#if X_HAVE_UTF8_STRING 3617#if ENABLE_FRILLS
3403 else if (target == xa[XA_UTF8_STRING]) 3618 else if (target == xa[XA_UTF8_STRING])
3404 style = XUTF8StringStyle; 3619 style = enc_utf8;
3405#endif 3620#endif
3406 else 3621 else
3407 { 3622 {
3408 target = xa[XA_COMPOUND_TEXT]; 3623 target = xa[XA_COMPOUND_TEXT];
3409 style = XCompoundTextStyle; 3624 style = enc_compound_text;
3410 } 3625 }
3411 3626
3412 if (selection.text) 3627 if (selection.text)
3413 { 3628 {
3414 cl = selection.text; 3629 cl = selection.text;
… …
3418 { 3633 {
3419 cl = L""; 3634 cl = L"";
3420 selectlen = 0; 3635 selectlen = 0;
3421 } 3636 }
3422 3637
3423 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3638#if ENABLE_FRILLS
3424 // manually for XUTF8StringStyle. 3639 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3640 // so recode it manually
3641 if (style == enc_utf8)
3642 {
3643 freect = 1;
3644 ct.encoding = target;
3645 ct.format = 8;
3646 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3647 ct.nitems = strlen ((char *)ct.value);
3648 }
3649 else
3650#endif
3425 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3651 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3426 freect = 1; 3652 freect = 1;
3427 else 3653 else
3428 { 3654 {
3429 /* if we failed to convert then send it raw */ 3655 /* if we failed to convert then send it raw */
3430 ct.value = (unsigned char *)cl; 3656 ct.value = (unsigned char *)cl;
3431 ct.nitems = selectlen; 3657 ct.nitems = selectlen;
3658 ct.encoding = target;
3432 } 3659 }
3433 3660
3434 XChangeProperty (display->display, rq.requestor, rq.property, 3661 XChangeProperty (disp, rq.requestor, rq.property,
3435 target, 8, PropModeReplace, 3662 ct.encoding, 8, PropModeReplace,
3436 ct.value, (int)ct.nitems); 3663 ct.value, (int)ct.nitems);
3437 ev.property = rq.property; 3664 ev.property = rq.property;
3438 3665
3439 if (freect) 3666 if (freect)
3440 XFree (ct.value); 3667 XFree (ct.value);
3441 } 3668 }
3442 3669
3443 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3670 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3444} 3671}
3445 3672
3446/* ------------------------------------------------------------------------- * 3673/* ------------------------------------------------------------------------- *
3447 * MOUSE ROUTINES * 3674 * MOUSE ROUTINES *
3448 * ------------------------------------------------------------------------- */ 3675 * ------------------------------------------------------------------------- */
… …
3507 { 3734 {
3508 text_t *tp = ov_text[y] = new text_t[w]; 3735 text_t *tp = ov_text[y] = new text_t[w];
3509 rend_t *rp = ov_rend[y] = new rend_t[w]; 3736 rend_t *rp = ov_rend[y] = new rend_t[w];
3510 3737
3511 text_t t0, t1, t2; 3738 text_t t0, t1, t2;
3512 rend_t r = SET_BGCOLOR (SET_FGCOLOR (RS_None, Color_bg), Color_fg); 3739 rend_t r = OVERLAY_RSTYLE;
3513 3740
3514 if (y == 0) 3741 if (y == 0)
3515 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; 3742 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3516 else if (y < h - 1) 3743 else if (y < h - 1)
3517 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; 3744 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
… …
3551} 3778}
3552 3779
3553void 3780void
3554rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3781rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3555{ 3782{
3556 if (!ov_text || x >= ov_w - 2 || y >= ov_h) 3783 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3557 return; 3784 return;
3558 3785
3559 x++, y++; 3786 x++, y++;
3560 3787
3561 ov_text[y][x] = text; 3788 ov_text[y][x] = text;
… …
3587 rend_t *r2 = screen.rend[y + row_offset] + ov_x; 3814 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3588 3815
3589 for (int x = ov_w; x--; ) 3816 for (int x = ov_w; x--; )
3590 { 3817 {
3591 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3818 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3592 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, TermWin.fontset->find_font (t, false)); 3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3593 } 3820 }
3594 } 3821 }
3595} 3822}
3596 3823
3597#endif 3824#endif

Diff Legend

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