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

Diff Legend

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