ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

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

Diff Legend

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