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.165 by root, Sun Jun 26 19:59:29 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);
… …
1869rxvt_term::scr_bell () 1950rxvt_term::scr_bell ()
1870{ 1951{
1871#ifndef NO_BELL 1952#ifndef NO_BELL
1872# ifndef NO_MAPALERT 1953# ifndef NO_MAPALERT
1873# ifdef MAPALERT_OPTION 1954# ifdef MAPALERT_OPTION
1874 if (Options & Opt_mapAlert) 1955 if (options & Opt_mapAlert)
1875# endif 1956# endif
1876 XMapWindow (display->display, TermWin.parent[0]); 1957 XMapWindow (display->display, TermWin.parent[0]);
1877# endif 1958# endif
1878 if (Options & Opt_visualBell) 1959 if (options & Opt_visualBell)
1879 { 1960 {
1880 scr_rvideo_mode (!rvideo); /* refresh also done */ 1961 scr_rvideo_mode (!rvideo); /* refresh also done */
1881 scr_rvideo_mode (!rvideo); /* refresh also done */ 1962 scr_rvideo_mode (!rvideo); /* refresh also done */
1882 } 1963 }
1883 else 1964 else
… …
1889/* ARGSUSED */ 1970/* ARGSUSED */
1890void 1971void
1891rxvt_term::scr_printscreen (int fullhist) 1972rxvt_term::scr_printscreen (int fullhist)
1892{ 1973{
1893#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1894 int i, r1, nrows, row_offset; 1975 int i, r1, nrows, row_offset;
1895 text_t *t; 1976 FILE *fd;
1896 FILE *fd;
1897 1977
1898 if ((fd = popen_printer ()) == NULL) 1978 if ((fd = popen_printer ()) == NULL)
1899 return; 1979 return;
1980
1900 nrows = TermWin.nrow; 1981 nrows = TermWin.nrow;
1901 row_offset = TermWin.saveLines; 1982 row_offset = TermWin.saveLines;
1983
1902 if (!fullhist) 1984 if (!fullhist)
1903 row_offset -= TermWin.view_start; 1985 row_offset -= TermWin.view_start;
1904 else 1986 else
1905 { 1987 {
1906 nrows += TermWin.nscrolled; 1988 nrows += TermWin.nscrolled;
1907 row_offset -= TermWin.nscrolled; 1989 row_offset -= TermWin.nscrolled;
1908 } 1990 }
1909 1991
1992 wctomb (0, 0);
1993
1910 for (r1 = 0; r1 < nrows; r1++) 1994 for (r1 = 0; r1 < nrows; r1++)
1911 { 1995 {
1912 t = screen.text[r1 + row_offset]; 1996 text_t *tp = screen.text[r1 + row_offset];
1913 for (i = TermWin.ncol - 1; i >= 0; i--) 1997 int len = screen.tlen[r1 + row_offset];
1914 if (!isspace (t[i])) 1998
1915 break; 1999 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1916 fprintf (fd, "%.*s\n", (i + 1), t); 2000 {
2001 char mb[MB_LEN_MAX];
2002 text_t t = *tp++;
2003 if (t == NOCHAR)
2004 continue;
2005
2006 len = wctomb (mb, t);
2007
2008 if (len <= 0)
2009 {
2010 mb[0] = ' ';
2011 len = 1;
2012 }
2013
2014 fwrite (mb, 1, len, fd);
2015 }
2016
2017 fputc ('\n', fd);
1917 } 2018 }
2019
1918 pclose_printer (fd); 2020 pclose_printer (fd);
1919#endif 2021#endif
1920} 2022}
1921 2023
1922/* ------------------------------------------------------------------------- */ 2024/* ------------------------------------------------------------------------- */
1923/* 2025/*
1924 * Refresh the screen 2026 * Refresh the screen
1925 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
1926 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
1927 */ 2029 */
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 2030void
1939rxvt_term::scr_refresh (unsigned char refresh_type) 2031rxvt_term::scr_refresh (unsigned char refresh_type)
1940{ 2032{
1941 unsigned char must_clear, /* use draw_string not draw_image_string */ 2033 unsigned char must_clear, /* use draw_string not draw_image_string */
1942 rvid, /* reverse video this position */
1943 showcursor; /* show the cursor */ 2034 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
1946 int i, /* tmp */ 2037 int i, /* tmp */
1947 row_offset; /* basic offset in screen structure */ 2038 row_offset; /* basic offset in screen structure */
1948#ifndef NO_CURSORCOLOR 2039#ifndef NO_CURSORCOLOR
1949 rend_t cc1; /* store colours at cursor position (s) */ 2040 rend_t cc1; /* store colours at cursor position (s) */
1950#endif 2041#endif
1951 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2042 rend_t *crp; // cursor rendition pointer
1952 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2043
2044 want_refresh = 0; /* screen is current */
1953 2045
1954 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2046 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1955 return; 2047 return;
1956 2048
1957 /* 2049 /*
1958 * A: set up vars 2050 * A: set up vars
1959 */ 2051 */
1960 must_clear = 0; 2052 must_clear = 0;
1961
1962 refresh_count = 0; 2053 refresh_count = 0;
1963 2054
1964 row_offset = TermWin.saveLines - TermWin.view_start; 2055 row_offset = TermWin.saveLines - TermWin.view_start;
1965 2056
1966#ifdef XPM_BACKGROUND 2057#if XPM_BACKGROUND
1967 must_clear |= (bgPixmap.pixmap != None); 2058 must_clear |= bgPixmap.pixmap != None;
1968#endif 2059#endif
1969#ifdef TRANSPARENT 2060#if TRANSPARENT
1970 must_clear |= ((Options & Opt_transparent) && am_transparent); 2061 must_clear |= (options & Opt_transparent) && am_transparent;
1971#endif 2062#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2064
1974 /* 2065 /*
1975 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
1990 showcursor = 0; 2081 showcursor = 0;
1991#endif 2082#endif
1992 2083
1993 if (showcursor) 2084 if (showcursor)
1994 { 2085 {
2086 int col = screen.cur.col;
2087
2088 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2089 col--;
2090
1995 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2091 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1996 2092
1997 if (showcursor && TermWin.focus) 2093 if (showcursor && TermWin.focus)
1998 { 2094 {
2095 if (options & Opt_cursorUnderline)
2096 *crp ^= RS_Uline;
2097 else
2098 {
1999 *srp ^= RS_RVid; 2099 *crp ^= RS_RVid;
2100
2000#ifndef NO_CURSORCOLOR 2101#ifndef NO_CURSORCOLOR
2001 cc1 = *srp & (RS_fgMask | RS_bgMask); 2102 cc1 = *crp & (RS_fgMask | RS_bgMask);
2002 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2003 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2004 else 2105 else
2005#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2106#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2006 ccol1 = GET_FGCOLOR (rstyle); 2107 ccol1 = GET_FGCOLOR (rstyle);
2007#else 2108#else
2008 ccol1 = Color_fg; 2109 ccol1 = Color_fg;
2009#endif 2110#endif
2010 if (ISSET_PIXCOLOR (Color_cursor2)) 2111 if (ISSET_PIXCOLOR (Color_cursor2))
2011 ccol2 = Color_cursor2; 2112 ccol2 = Color_cursor2;
2012 else 2113 else
2013#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2114#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2014 ccol2 = GET_BGCOLOR (rstyle); 2115 ccol2 = GET_BGCOLOR (rstyle);
2015#else 2116#else
2016 ccol2 = Color_bg; 2117 ccol2 = Color_bg;
2017#endif 2118#endif
2018 *srp = SET_FGCOLOR (*srp, ccol1); 2119 *crp = SET_FGCOLOR (*crp, ccol1);
2019 *srp = SET_BGCOLOR (*srp, ccol2); 2120 *crp = SET_BGCOLOR (*crp, ccol2);
2020#endif 2121#endif
2122 }
2021 } 2123 }
2022 } 2124 }
2023 2125
2024 /* make sure no outline cursor is left around */ 2126 /* make sure no outline cursor is left around */
2025 setoldcursor = 0; 2127 setoldcursor = 0;
… …
2051 oldcursor.col = screen.cur.col; 2153 oldcursor.col = screen.cur.col;
2052 } 2154 }
2053 } 2155 }
2054 } 2156 }
2055 2157
2158#if ENABLE_OVERLAY
2159 scr_swap_overlay ();
2160#endif
2161
2162 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2163 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2164
2056#ifndef NO_SLOW_LINK_SUPPORT 2165#ifndef NO_SLOW_LINK_SUPPORT
2057 /* 2166 /*
2058 * D: CopyArea pass - very useful for slower links 2167 * D: CopyArea pass - very useful for slower links
2059 * This has been deliberately kept simple. 2168 * This has been deliberately kept simple.
2060 */ 2169 */
… …
2063 && refresh_type == FAST_REFRESH && num_scr_allow && i 2172 && refresh_type == FAST_REFRESH && num_scr_allow && i
2064 && abs (i) < TermWin.nrow && !must_clear) 2173 && abs (i) < TermWin.nrow && !must_clear)
2065 { 2174 {
2066 int16_t nits; 2175 int16_t nits;
2067 int j; 2176 int j;
2068 rend_t *drp2;
2069 text_t *dtp2;
2070 int len, wlen; 2177 int len, wlen;
2071 2178
2072 j = TermWin.nrow; 2179 j = TermWin.nrow;
2073 wlen = len = -1; 2180 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2182 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2183 {
2077 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2184 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2078 { 2185 {
2079 stp = screen.text[row + row_offset]; 2186 text_t *stp = screen.text[row + row_offset];
2080 srp = screen.rend[row + row_offset]; 2187 rend_t *srp = screen.rend[row + row_offset];
2081 dtp = drawn_text[row]; 2188 text_t *dtp = drawn_text[row];
2082 dtp2 = drawn_text[row + i]; 2189 text_t *dtp2 = drawn_text[row + i];
2083 drp = drawn_rend[row]; 2190 rend_t *drp = drawn_rend[row];
2084 drp2 = drawn_rend[row + i]; 2191 rend_t *drp2 = drawn_rend[row + i];
2085 2192
2086 for (nits = 0, col = TermWin.ncol; col--; ) 2193 for (nits = 0, col = TermWin.ncol; col--; )
2087 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2194 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2088 nits--; 2195 nits--;
2089 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2196 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2109 { 2216 {
2110 /* also comes here at end if needed because of >= above */ 2217 /* also comes here at end if needed because of >= above */
2111 if (wlen < len) 2218 if (wlen < len)
2112 SWAP_IT (wlen, len, int); 2219 SWAP_IT (wlen, len, int);
2113 2220
2114 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1));
2115 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2221 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2116 TermWin.gc, 0, Row2Pixel (len + i), 2222 TermWin.gc, 0, Row2Pixel (len + i),
2117 (unsigned int)TermWin_TotalWidth (), 2223 (unsigned int)TermWin_TotalWidth (),
2118 (unsigned int)Height2Pixel (wlen - len + 1), 2224 (unsigned int)Height2Pixel (wlen - len + 1),
2119 0, Row2Pixel (len)); 2225 0, Row2Pixel (len));
… …
2126 /* 2232 /*
2127 * E: main pass across every character 2233 * E: main pass across every character
2128 */ 2234 */
2129 for (row = 0; row < TermWin.nrow; row++) 2235 for (row = 0; row < TermWin.nrow; row++)
2130 { 2236 {
2131 stp = screen.text[row + row_offset]; 2237 text_t *stp = screen.text[row + row_offset];
2132 srp = screen.rend[row + row_offset]; 2238 rend_t *srp = screen.rend[row + row_offset];
2133 dtp = drawn_text[row]; 2239 text_t *dtp = drawn_text[row];
2134 drp = drawn_rend[row]; 2240 rend_t *drp = drawn_rend[row];
2135 2241
2136 /* 2242 /*
2137 * E2: OK, now the real pass 2243 * E2: OK, now the real pass
2138 */ 2244 */
2139 int ypixel = (int)Row2Pixel (row); 2245 int ypixel = (int)Row2Pixel (row);
2140 2246
2141 for (col = 0; col < TermWin.ncol; col++) 2247 for (col = 0; col < TermWin.ncol; col++)
2142 { 2248 {
2143 /* compare new text with old - if exactly the same then continue */ 2249 /* compare new text with old - if exactly the same then continue */
2144 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2250 if (stp[col] == dtp[col] /* Must match characters to skip. */
2145 && (srp[col] == drp[col] /* Either rendition the same or */ 2251 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2146 || (stp[col] == ' ' /* space w/ no background change */ 2252 || (stp[col] == ' ' /* space w/ no background change */
2147 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2253 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2148 continue; 2254 continue;
2149 2255
2150 // redraw one or more characters 2256 // redraw one or more characters
2151 2257
2152 // seek to the beginning if wide characters 2258 // seek to the beginning of wide characters
2153 while (stp[col] == NOCHAR && col > 0) 2259 while (stp[col] == NOCHAR && col > 0)
2154 --col; 2260 --col;
2155 2261
2156 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2157 text_t *text = stp + col; 2263 text_t *text = stp + col;
… …
2160 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2161 drp[col] = rend; 2267 drp[col] = rend;
2162 2268
2163 int xpixel = Col2Pixel (col); 2269 int xpixel = Col2Pixel (col);
2164 2270
2165 // this loop looks very messy, it can probably be optimized
2166 // and cleaned a bit by you?
2167 for (i = 0; ++col < TermWin.ncol; ) 2271 for (i = 0; ++col < TermWin.ncol; )
2168 { 2272 {
2169 if (stp[col] == NOCHAR) 2273 if (stp[col] == NOCHAR)
2170 { 2274 {
2171 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2172 drp[col] = rend; 2276 drp[col] = rend;
2173 count++; 2277 count++;
2174
2175 if (i) // only possible skip if char unchanged
2176 i++; 2278 i++;
2177 2279
2178 continue; 2280 continue;
2179 } 2281 }
2180 2282
2181 if (rend != srp[col]) 2283 if (!RS_SAME (rend, srp[col]))
2182 break; 2284 break;
2183 2285
2184 count++; 2286 count++;
2185 2287
2186 if (stp[col] != dtp[col] 2288 if (stp[col] != dtp[col]
2187 || srp[col] != drp[col]) 2289 || !RS_SAME (srp[col], drp[col]))
2188 { 2290 {
2189 if (must_clear && (i++ > (count / 2))) 2291 if (must_clear && (i++ > count / 2))
2190 break; 2292 break;
2191 2293
2192 dtp[col] = stp[col]; 2294 dtp[col] = stp[col];
2193 drp[col] = rend; 2295 drp[col] = rend;
2194 i = 0; 2296 i = 0;
2195 } 2297 }
2196 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2298 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2197 break; 2299 break;
2198 } 2300 }
2199 2301
2200 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2201 count -= i; /* dump any matching trailing chars */ 2303 count -= i; /* dump any matching trailing chars */
2304
2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2306 while (i && text[count] == NOCHAR)
2307 count++, i--;
2308
2309#if ENABLE_STYLES
2310 // force redraw after "careful" characters to avoid pixel droppings
2311 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2312 drp[col + 1] = ~srp[col + 1];
2313
2314 // include previous careful character(s) if possible, looks nicer (best effort...)
2315 while (text > stp
2316 && srp[text - stp - 1] & RS_Careful
2317 && RS_SAME (rend, srp[text - stp - 1]))
2318 text--, count++, xpixel -= TermWin.fwidth;
2319#endif
2202 2320
2203 /* 2321 /*
2204 * Determine the attributes for the string 2322 * Determine the attributes for the string
2205 */ 2323 */
2206 int fid = GET_FONT (rend);
2207 int fore = GET_FGCOLOR (rend); // desired foreground 2324 int fore = GET_FGCOLOR (rend); // desired foreground
2208 int back = GET_BGCOLOR (rend); // desired background 2325 int back = GET_BGCOLOR (rend); // desired background
2209 2326
2210 rend = GET_ATTR (rend); 2327 // only do special processing if ana attributes are set, which is rare
2211 2328 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2212 rvid = !!(rend & RS_RVid); 2329 {
2330 bool invert = rend & RS_RVid;
2213 2331
2214#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2215 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2333 if (rend & RS_Bold
2334 && fore == Color_fg)
2216 { 2335 {
2217 if (ISSET_PIXCOLOR (Color_BD)) 2336 if (ISSET_PIXCOLOR (Color_BD))
2218 fore = Color_BD; 2337 fore = Color_BD;
2338# if !ENABLE_STYLES
2219 else 2339 else
2220 rvid = !rvid; 2340 invert = !invert;
2341# endif
2342 }
2343
2344 if (rend & RS_Italic
2345 && fore == Color_fg)
2346 {
2347 if (ISSET_PIXCOLOR (Color_IT))
2348 fore = Color_IT;
2349# if !ENABLE_STYLES
2350 else
2351 invert = !invert;
2352# endif
2353 }
2354
2355 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2356 fore = Color_UL;
2357#endif
2358
2359 if (invert)
2360 {
2361 SWAP_IT (fore, back, int);
2362
2363#ifndef NO_BOLD_UNDERLINE_REVERSE
2364 if (ISSET_PIXCOLOR (Color_RV))
2365 back = Color_RV;
2366#endif
2367 }
2368
2369#ifdef TEXT_BLINK
2370 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2371 {
2372 if (!text_blink_ev.active)
2373 {
2374 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2375 hidden_text = 0;
2376 }
2377 else if (hidden_text)
2378 fore = back;
2379 }
2380#endif
2221 } 2381 }
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 2382
2255 /* 2383 /*
2256 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2257 */ 2385 */
2258 rxvt_font *font = (*TermWin.fontset)[fid]; 2386 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2259 2387
2260 if (back == fore) 2388 if (back == fore)
2261 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2389 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2262 TermWin.fwidth * count, TermWin.fheight, 2390 TermWin.fwidth * count, TermWin.fheight,
2263 back); 2391 back);
… …
2279 } 2407 }
2280 else 2408 else
2281 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2409 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2282 2410
2283 if (rend & RS_Uline && font->descent > 1 && fore != back) 2411 if (rend & RS_Uline && font->descent > 1 && fore != back)
2412 {
2413#if ENABLE_FRILLS
2414 if (ISSET_PIXCOLOR (Color_underline))
2415 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2416 else
2417#endif
2418 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2419
2284 XDrawLine (display->display, drawBuffer, TermWin.gc, 2420 XDrawLine (display->display, drawBuffer, TermWin.gc,
2285 xpixel, ypixel + font->ascent + 1, 2421 xpixel, ypixel + font->ascent + 1,
2286 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2422 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2423 }
2287 } /* for (col....) */ 2424 } /* for (col....) */
2288 } /* for (row....) */ 2425 } /* for (row....) */
2426
2427#if ENABLE_OVERLAY
2428 scr_swap_overlay ();
2429#endif
2289 2430
2290 /* 2431 /*
2291 * G: cleanup cursor and display outline cursor if necessary 2432 * G: cleanup cursor and display outline cursor if necessary
2292 */ 2433 */
2293 if (showcursor) 2434 if (showcursor)
2294 { 2435 {
2295 if (TermWin.focus) 2436 if (TermWin.focus)
2296 { 2437 {
2297 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2438 if (options & Opt_cursorUnderline)
2298 [screen.cur.col]); 2439 *crp ^= RS_Uline;
2440 else
2441 {
2299 *srp ^= RS_RVid; 2442 *crp ^= RS_RVid;
2300#ifndef NO_CURSORCOLOR 2443#ifndef NO_CURSORCOLOR
2301 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2444 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2302#endif 2445#endif
2446 }
2303 } 2447 }
2304 else if (oldcursor.row >= 0) 2448 else if (oldcursor.row >= 0)
2305 { 2449 {
2450 int cursorwidth = 1;
2451 int col = oldcursor.col;
2452
2453 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2454 col--;
2455
2456 while (col + cursorwidth < TermWin.ncol
2457 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2458 cursorwidth++;
2459
2306#ifndef NO_CURSORCOLOR 2460#ifndef NO_CURSORCOLOR
2307 if (ISSET_PIXCOLOR (Color_cursor)) 2461 if (ISSET_PIXCOLOR (Color_cursor))
2308 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2462 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2309#endif 2463#endif
2310 int cursorwidth = 1;
2311 while (oldcursor.col + cursorwidth < TermWin.ncol
2312 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2313 cursorwidth++;
2314 2464
2315 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2465 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2316 Col2Pixel (oldcursor.col), 2466 Col2Pixel (col),
2317 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2318 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2319 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2320 } 2470 }
2321 } 2471 }
… …
2328 if (refresh_type & SMOOTH_REFRESH) 2478 if (refresh_type & SMOOTH_REFRESH)
2329 XFlush (display->display); 2479 XFlush (display->display);
2330 2480
2331 num_scr = 0; 2481 num_scr = 0;
2332 num_scr_allow = 1; 2482 num_scr_allow = 1;
2333 want_refresh = 0; /* screen is current */
2334} 2483}
2335 2484
2336void 2485void
2337rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2486rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2338{ 2487{
2339 if (!rp || !tp) 2488 if (!rp || !tp)
2340 return; 2489 return;
2341 2490
2342 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2491 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2343 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2492 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2344} 2493}
2345 2494
2346void 2495void
2347rxvt_term::scr_remap_chars () 2496rxvt_term::scr_remap_chars ()
2348{ 2497{
… …
2354 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2503 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2355 scr_remap_chars (swap.text[i], swap.rend[i]); 2504 scr_remap_chars (swap.text[i], swap.rend[i]);
2356 } 2505 }
2357} 2506}
2358 2507
2508void
2509rxvt_term::scr_recolour ()
2510{
2511 if (1
2512#if TRANSPARENT
2513 && !am_transparent
2514#endif
2515#if XPM_BACKGROUND
2516 && !bgPixmap.pixmap
2517#endif
2518 )
2519 {
2520 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2521 XClearWindow (display->display, TermWin.parent[0]);
2522 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2523#if HAVE_SCROLLBARS
2524 if (scrollBar.win)
2525 {
2526 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2527 scrollBar.setIdle ();
2528 scrollbar_show (0);
2529 }
2530#endif
2531 }
2532
2533 scr_clear ();
2534 scr_touch (true);
2535 want_refresh = 1;
2536}
2537
2359/* ------------------------------------------------------------------------- */ 2538/* ------------------------------------------------------------------------- */
2360void 2539void
2361rxvt_term::scr_clear (bool really) 2540rxvt_term::scr_clear (bool really)
2362{ 2541{
2363 if (!TermWin.mapped) 2542 if (!TermWin.mapped)
2364 return; 2543 return;
2365 2544
2366 num_scr_allow = 0; 2545 num_scr_allow = 0;
2367 want_refresh = 1; 2546 want_refresh = 1;
2368 2547
2369#ifdef TRANSPARENT 2548#if TRANSPARENT
2370 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2549 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2371 { 2550 {
2372 int i; 2551 int i;
2373 2552
2374 if (! (Options & Opt_transparent_all)) 2553 if (!(options & Opt_transparent_all))
2375 i = 0; 2554 i = 0;
2376 else 2555 else
2377 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2556 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2378 2557
2379 while (i--) 2558 while (i--)
… …
2395 int end_row = TermWin.saveLines - TermWin.view_start; 2574 int end_row = TermWin.saveLines - TermWin.view_start;
2396 int i = selection.beg.row + TermWin.saveLines; 2575 int i = selection.beg.row + TermWin.saveLines;
2397 int col, row = selection.end.row + TermWin.saveLines; 2576 int col, row = selection.end.row + TermWin.saveLines;
2398 rend_t *srp; 2577 rend_t *srp;
2399 2578
2400 if (i >= end_row) 2579#if ENABLE_FRILLS
2401 col = selection.beg.col; 2580 if (selection.rect)
2581 {
2582 end_row += TermWin.nrow;
2583
2584 for (; i <= row && i <= end_row; i++)
2585 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2586 srp[col] ^= RS_RVid;
2587 }
2402 else 2588 else
2589#endif
2590 {
2591 if (i >= end_row)
2592 col = selection.beg.col;
2593 else
2403 { 2594 {
2404 col = 0; 2595 col = 0;
2405 i = end_row; 2596 i = end_row;
2406 } 2597 }
2407 2598
2408 end_row += TermWin.nrow; 2599 end_row += TermWin.nrow;
2600
2409 for (; i < row && i < end_row; i++, col = 0) 2601 for (; i < row && i < end_row; i++, col = 0)
2410 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2602 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2411 srp[col] ^= RS_RVid; 2603 srp[col] ^= RS_RVid;
2412 2604
2413 if (i == row && i < end_row) 2605 if (i == row && i < end_row)
2414 for (srp = screen.rend[i]; col < selection.end.col; col++) 2606 for (srp = screen.rend[i]; col < selection.end.col; col++)
2415 srp[col] ^= RS_RVid; 2607 srp[col] ^= RS_RVid;
2608 }
2416 } 2609 }
2417} 2610}
2418 2611
2419/* ------------------------------------------------------------------------- */ 2612/* ------------------------------------------------------------------------- */
2420/* 2613/*
… …
2456 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2649 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2457 */ 2650 */
2458void 2651void
2459rxvt_term::selection_check (int check_more) 2652rxvt_term::selection_check (int check_more)
2460{ 2653{
2461 row_col_t pos; 2654 row_col_t pos;
2462 2655
2463 if (!selection.op) 2656 if (!selection.op)
2464 return; 2657 return;
2465 2658
2466 pos.row = pos.col = 0; 2659 pos.row = pos.col = 0;
… …
2488/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2489/* 2682/*
2490 * Paste a selection direct to the command fd 2683 * Paste a selection direct to the command fd
2491 */ 2684 */
2492void 2685void
2493rxvt_term::paste (const unsigned char *data, unsigned int len) 2686rxvt_term::paste (unsigned char *data, unsigned int len)
2494{ 2687{
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 */ 2688 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (i = 0; i < len; i += PROP_SIZE) 2689 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) 2690 if (data[i] == C0_LF)
2511 ds[j] = C0_CR; 2691 data[i] = C0_CR;
2512 2692
2513 tt_write (ds, (int)n); 2693 tt_write (data, len);
2514 }
2515
2516 free (ds);
2517} 2694}
2518 2695
2519/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2520/* 2697/*
2521 * Respond to a notification that a primary selection has been sent 2698 * Respond to a notification that a primary selection has been sent
2522 * EXT: SelectionNotify 2699 * EXT: SelectionNotify
2523 */ 2700 */
2524int 2701void
2525rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2526{ 2703{
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 */ 2704 if (prop == None) /* check for failed XConvertSelection */
2534 { 2705 {
2535 if ((selection_type & Sel_CompoundText)) 2706 if ((selection_type & Sel_CompoundText))
2536 { 2707 {
2537 int selnum = selection_type & Sel_whereMask; 2708 int selnum = selection_type & Sel_whereMask;
… …
2550 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2551 else 2722 else
2552 selection_type = 0; 2723 selection_type = 0;
2553 } 2724 }
2554 2725
2555 return 0; 2726 return;
2556 }
2557
2558 for (;;)
2559 { 2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (display->display, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2560 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2751 if (XGetWindowProperty (display->display, win, prop,
2561 (long) (PROP_SIZE / 4), delete_prop, 2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2562 AnyPropertyType, &ct.encoding, &ct.format, 2754 &ct2.encoding, &ct2.format,
2563 &ct.nitems, &bytes_after, 2755 &ct2.nitems, &bytes_after,
2564 &ct.value) != Success) 2756 &ct2.value) != Success)
2565 break; 2757 goto bailout;
2566 2758
2567 if (ct.encoding == 0) 2759 // realloc should be compatible to XFree, here, and elsewhere, too
2568 { 2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2569 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2570 break; 2762 ct.nitems += ct2.nitems;
2571 } 2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2572 else if (ct.encoding == xa[XA_INCR]) 2770 if (ct.encoding == xa[XA_INCR])
2573 { 2771 {
2574 // INCR selection, start handshake 2772 // INCR selection, start handshake
2773 if (!delete_prop)
2575 XDeleteProperty (display->display, win, prop); 2774 XDeleteProperty (display->display, win, prop);
2775
2576 selection_wait = Sel_incr; 2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2577 incr_ev.start (NOW + 10); 2778 incr_ev.start (NOW + 10);
2578 break;
2579 }
2580 2779
2581 if (ct.value == NULL) 2780 goto bailout;
2582 { 2781 }
2583 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2584 continue;
2585 }
2586 2782
2587 if (ct.nitems == 0) 2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2588 { 2796 }
2589 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2797 else
2590 2798 {
2591 if (selection_wait == Sel_normal && nread == 0 2799 if (selection_wait == Sel_normal
2592 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2593 { 2801 {
2594 /* 2802 /*
2595 * pass through again trying CUT_BUFFER0 if we've come from 2803 * pass through again trying CUT_BUFFER0 if we've come from
2596 * XConvertSelection () but nothing was presented 2804 * XConvertSelection () but nothing was presented
2597 */ 2805 */
2598 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2599 selection_paste (display->root, XA_CUT_BUFFER0, False); 2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2600 } 2807 }
2601 2808
2602 nread = -1; /* discount any previous stuff */ 2809 goto bailout;
2603 break; 2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (NOW + 10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2604 } 2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2605 2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2606 nread += ct.nitems; 2823 incr_buf_fill += ct.nitems;
2607 2824
2825 goto bailout;
2826 }
2827
2608 char **cl; 2828 char **cl;
2609 int cr; 2829 int cr;
2830
2831#if ENABLE_FRILLS
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste ((unsigned char *)s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2610 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2845 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2611 { 2846 && cl)
2847 {
2612 for (int i = 0; i < cr; i++) 2848 for (int i = 0; i < cr; i++)
2613 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2849 paste ((unsigned char *)cl[i], strlen (cl[i]));
2614 2850
2615 XFreeStringList (cl); 2851 XFreeStringList (cl);
2616 } 2852 }
2617 else 2853 else
2618 paste (ct.value, ct.nitems); 2854 paste (ct.value, ct.nitems); // paste raw
2619 2855
2620 if (bytes_after == 0) 2856bailout:
2621 break;
2622
2623 XFree (ct.value);
2624 }
2625
2626 if (ct.value)
2627 XFree (ct.value); 2857 XFree (ct.value);
2628 2858
2629 if (selection_wait == Sel_normal) 2859 if (selection_wait == Sel_normal)
2630 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2631
2632 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2633 return (int)nread;
2634} 2861}
2635 2862
2636void 2863void
2637rxvt_term::incr_cb (time_watcher &w) 2864rxvt_term::incr_cb (time_watcher &w)
2638{ 2865{
2639 selection_wait = Sel_none; 2866 selection_wait = Sel_none;
2640 2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2641 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2642} 2872}
2643 2873
2644/*
2645 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2646 */
2647void 2874void
2648rxvt_term::selection_property (Window win, Atom prop) 2875rxvt_term::selection_property (Window win, Atom prop)
2649{ 2876{
2650 if (prop == None || selection_wait != Sel_incr) 2877 if (prop == None || selection_wait != Sel_incr)
2651 return; 2878 return;
2652 2879
2653 if (selection_paste (win, prop, 1) > 0) 2880 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} 2881}
2661 2882
2662/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2663/* 2884/*
2664 * Request the current selection: 2885 * Request the current selection:
… …
2670 * EXT: button 2 release 2891 * EXT: button 2 release
2671 */ 2892 */
2672void 2893void
2673rxvt_term::selection_request (Time tm, int x, int y) 2894rxvt_term::selection_request (Time tm, int x, int y)
2674{ 2895{
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) 2896 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2678 return; /* outside window */ 2897 return; /* outside window */
2679 2898
2680 if (selection.text) 2899 if (selection.text)
2681 { /* internal selection */ 2900 { /* internal selection */
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2683 char *str = rxvt_wcstombs (selection.text, selection.len); 2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2684 paste ((unsigned char *)str, strlen (str)); 2902 paste ((unsigned char *)str, strlen (str));
2685 free (str); 2903 free (str);
2686 return; 2904 return;
2687 } 2905 }
… …
2701#else 2919#else
2702 selection_type = Sel_CompoundText; 2920 selection_type = Sel_CompoundText;
2703 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2921 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2704 return; 2922 return;
2705#endif 2923#endif
2706
2707 } 2924 }
2708 } 2925 }
2709 2926
2710 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2927 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); 2928 selection_paste (display->root, XA_CUT_BUFFER0, false);
2713} 2929}
2714 2930
2715int 2931int
2716rxvt_term::selection_request_other (Atom target, int selnum) 2932rxvt_term::selection_request_other (Atom target, int selnum)
2717{ 2933{
2718 Atom sel; 2934 Atom sel;
2719#ifdef DEBUG_SELECT
2720 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2721#endif
2722 2935
2723 selection_type |= selnum; 2936 selection_type |= selnum;
2724 2937
2725 if (selnum == Sel_Primary) 2938 if (selnum == Sel_Primary)
2726 sel = XA_PRIMARY; 2939 sel = XA_PRIMARY;
… …
2729 else 2942 else
2730 sel = xa[XA_CLIPBOARD]; 2943 sel = xa[XA_CLIPBOARD];
2731 2944
2732 if (XGetSelectionOwner (display->display, sel) != None) 2945 if (XGetSelectionOwner (display->display, sel) != None)
2733 { 2946 {
2734 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2735 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2947 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2736 TermWin.vt, selection_request_time); 2948 TermWin.vt, selection_request_time);
2737 return 1; 2949 return 1;
2738 } 2950 }
2739 2951
… …
2746 * EXT: SelectionClear 2958 * EXT: SelectionClear
2747 */ 2959 */
2748void 2960void
2749rxvt_term::selection_clear () 2961rxvt_term::selection_clear ()
2750{ 2962{
2751 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2752
2753 want_refresh = 1; 2963 want_refresh = 1;
2754 free (selection.text); 2964 free (selection.text);
2755 selection.text = NULL; 2965 selection.text = NULL;
2756 selection.len = 0; 2966 selection.len = 0;
2757 CLEAR_SELECTION (); 2967 CLEAR_SELECTION ();
… …
2770{ 2980{
2771 int i, col, end_col, row, end_row; 2981 int i, col, end_col, row, end_row;
2772 wchar_t *new_selection_text; 2982 wchar_t *new_selection_text;
2773 text_t *t; 2983 text_t *t;
2774 2984
2775 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2776 switch (selection.op) 2985 switch (selection.op)
2777 { 2986 {
2778 case SELECTION_CONT: 2987 case SELECTION_CONT:
2779 break; 2988 break;
2780 case SELECTION_INIT: 2989 case SELECTION_INIT:
… …
2794 3003
2795 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3004 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2796 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3005 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2797 3006
2798 col = selection.beg.col; 3007 col = selection.beg.col;
2799 MAX_IT (col, 0);
2800 row = selection.beg.row + TermWin.saveLines; 3008 row = selection.beg.row + TermWin.saveLines;
2801 end_row = selection.end.row + TermWin.saveLines; 3009 end_row = selection.end.row + TermWin.saveLines;
2802 int ofs = 0; 3010 int ofs = 0;
2803 int extra = 0; 3011 int extra = 0;
2804 3012
2805 for (; row <= end_row; row++, col = 0) 3013 for (; row <= end_row; row++, col = 0)
2806 { 3014 {
2807 t = &(screen.text[row][col]);
2808
2809 end_col = screen.tlen[row]; 3015 end_col = screen.tlen[row];
3016
3017#if ENABLE_FRILLS
3018 if (selection.rect)
3019 {
3020 col = selection.beg.col;
3021 end_col = TermWin.ncol + 1;
3022 }
3023#endif
3024
3025 MAX_IT (col, 0);
2810 3026
2811 if (end_col == -1) 3027 if (end_col == -1)
2812 end_col = TermWin.ncol; 3028 end_col = TermWin.ncol;
2813 3029
2814 if (row == end_row) 3030 if (row == end_row || selection.rect)
2815 MIN_IT (end_col, selection.end.col); 3031 MIN_IT (end_col, selection.end.col);
2816 3032
3033 t = &screen.text[row][col];
2817 for (; col < end_col; col++) 3034 for (; col < end_col; col++)
2818 { 3035 {
2819 if (*t == NOCHAR) 3036 if (*t == NOCHAR)
2820 t++; 3037 t++;
2821#if ENABLE_COMBINING 3038#if ENABLE_COMBINING
… …
2869#if 0 3086#if 0
2870 XTextProperty ct; 3087 XTextProperty ct;
2871 3088
2872 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3089 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2873 { 3090 {
2874 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3091 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2875 PropModeReplace, ct.value, ct.nitems);
2876 XFree (ct.value); 3092 XFree (ct.value);
2877 } 3093 }
2878#endif 3094#endif
2879 3095
2880 selection_time = tm; 3096 selection_time = tm;
2881 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2882} 3097}
2883 3098
2884/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
2885/* 3100/*
2886 * Mark or select text based upon number of clicks: 1, 2, or 3 3101 * Mark or select text based upon number of clicks: 1, 2, or 3
2887 * EXT: button 1 press 3102 * EXT: button 1 press
2888 */ 3103 */
2889void 3104void
2890rxvt_term::selection_click (int clicks, int x, int y) 3105rxvt_term::selection_click (int clicks, int x, int y)
2891{ 3106{
2892 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2893
2894 clicks = ((clicks - 1) % 3) + 1; 3107 clicks = ((clicks - 1) % 3) + 1;
2895 selection.clicks = clicks; /* save clicks so extend will work */ 3108 selection.clicks = clicks; /* save clicks so extend will work */
2896 3109
2897 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3110 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2898 3111
… …
2940 * We now only find out the boundary in one direction 3153 * We now only find out the boundary in one direction
2941 */ 3154 */
2942 3155
2943/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3156/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2944#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
2945 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2946#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
2947 3160
2948void 3161void
2949rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2950{ 3163{
… …
2968 3181
2969 row = mark->row + TermWin.saveLines; 3182 row = mark->row + TermWin.saveLines;
2970 col = mark->col; 3183 col = mark->col;
2971 MAX_IT (col, 0); 3184 MAX_IT (col, 0);
2972 /* find the edge of a word */ 3185 /* find the edge of a word */
2973 stp = & (screen.text[row][col]); 3186 stp = &screen.text[row][col];
2974 w1 = DELIMIT_TEXT (*stp); 3187 w1 = DELIMIT_TEXT (*stp);
2975 3188
2976 srp = (&screen.rend[row][col]); 3189 srp = &screen.rend[row][col];
2977 w2 = DELIMIT_REND (*srp); 3190 w2 = DELIMIT_REND (*srp);
2978 3191
2979 for (;;) 3192 for (;;)
2980 { 3193 {
2981 for (; col != bound.col; col += dirnadd) 3194 for (; col != bound.col; col += dirnadd)
… …
3015 } 3228 }
3016 break; 3229 break;
3017 } 3230 }
3018 3231
3019Old_Word_Selection_You_Die: 3232Old_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) 3233 if (dirn == DN)
3023 col++; /* put us on one past the end */ 3234 col++; /* put us on one past the end */
3024 3235
3025 /* Poke the values back in */ 3236 /* Poke the values back in */
3026 ret->row = row - TermWin.saveLines; 3237 ret->row = row - TermWin.saveLines;
… …
3060 /* select nothing */ 3271 /* select nothing */
3061 selection.beg.row = selection.end.row = 0; 3272 selection.beg.row = selection.end.row = 0;
3062 selection.beg.col = selection.end.col = 0; 3273 selection.beg.col = selection.end.col = 0;
3063 selection.clicks = 4; 3274 selection.clicks = 4;
3064 want_refresh = 1; 3275 want_refresh = 1;
3065 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3066 return; 3276 return;
3067 } 3277 }
3068 3278
3069 if (selection.clicks == 4) 3279 if (selection.clicks == 4)
3070 selection.clicks = 1; 3280 selection.clicks = 1;
… …
3086 row_col_t pos; 3296 row_col_t pos;
3087 enum { 3297 enum {
3088 LEFT, RIGHT 3298 LEFT, RIGHT
3089 } closeto = RIGHT; 3299 } closeto = RIGHT;
3090 3300
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; 3301 want_refresh = 1;
3302
3095 switch (selection.op) 3303 switch (selection.op)
3096 { 3304 {
3097 case SELECTION_INIT: 3305 case SELECTION_INIT:
3098 CLEAR_SELECTION (); 3306 CLEAR_SELECTION ();
3099 selection.op = SELECTION_BEGIN; 3307 selection.op = SELECTION_BEGIN;
… …
3112 selection_start_colrow (col, row); 3320 selection_start_colrow (col, row);
3113 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
3114 default: 3322 default:
3115 return; 3323 return;
3116 } 3324 }
3325
3117 if (selection.beg.col == selection.end.col 3326 if (selection.beg.col == selection.end.col
3118 && selection.beg.col != selection.mark.col 3327 && selection.beg.col != selection.mark.col
3119 && selection.beg.row == selection.end.row 3328 && selection.beg.row == selection.end.row
3120 && selection.beg.row != selection.mark.row) 3329 && selection.beg.row != selection.mark.row)
3121 { 3330 {
3122 selection.beg.col = selection.end.col = selection.mark.col; 3331 selection.beg.col = selection.end.col = selection.mark.col;
3123 selection.beg.row = selection.end.row = selection.mark.row; 3332 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 } 3333 }
3126 3334
3127 pos.col = col; 3335 pos.col = col;
3128 pos.row = row; 3336 pos.row = row;
3129 3337
… …
3172 } 3380 }
3173 else 3381 else
3174 { /* button1 drag or button3 drag */ 3382 { /* button1 drag or button3 drag */
3175 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3383 if (ROWCOL_IS_AFTER (selection.mark, pos))
3176 { 3384 {
3177 if ((selection.mark.row == selection.end.row) 3385 if (selection.mark.row == selection.end.row
3178 && (selection.mark.col == selection.end.col) 3386 && selection.mark.col == selection.end.col
3387 && clickchange
3179 && clickchange && selection.clicks == 2) 3388 && selection.clicks == 2)
3180 selection.mark.col--; 3389 selection.mark.col--;
3181 3390
3182 selection.beg.row = pos.row; 3391 selection.beg.row = pos.row;
3183 selection.beg.col = pos.col; 3392 selection.beg.col = pos.col;
3184 selection.end.row = selection.mark.row; 3393 selection.end.row = selection.mark.row;
… …
3195 3404
3196 if (selection.clicks == 1) 3405 if (selection.clicks == 1)
3197 { 3406 {
3198 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3407 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3199 3408
3200 if (end_col != -1 && selection.beg.col > end_col) 3409 if (selection.beg.col > end_col
3410 && end_col != -1
3411#if ENABLE_FRILLS
3412 && !selection.rect
3413#endif
3201 { 3414 )
3202#if 1
3203 selection.beg.col = ncol; 3415 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 3416
3212 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3417 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3213 3418
3214 if (end_col != -1 && selection.end.col > end_col) 3419 if (
3420 selection.end.col > end_col
3421 && end_col != -1
3422#if ENABLE_FRILLS
3423 && !selection.rect
3424#endif
3425 )
3215 selection.end.col = ncol; 3426 selection.end.col = ncol;
3216 } 3427 }
3217 else if (selection.clicks == 2) 3428 else if (selection.clicks == 2)
3218 { 3429 {
3219 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3430 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3220 selection.end.col--; 3431 selection.end.col--;
3221 3432
3222 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3223 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3433 selection_delimit_word (UP, &selection.beg, &selection.beg);
3434 selection_delimit_word (DN, &selection.end, &selection.end);
3224 } 3435 }
3225 else if (selection.clicks == 3) 3436 else if (selection.clicks == 3)
3226 { 3437 {
3227#ifndef NO_FRILLS 3438#if ENABLE_FRILLS
3228 if ((Options & Opt_tripleclickwords)) 3439 if (options & Opt_tripleclickwords)
3229 { 3440 {
3230 int end_row; 3441 int end_row;
3231 3442
3232 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3443 selection_delimit_word (UP, &selection.beg, &selection.beg);
3233 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3444 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3234 3445
3235 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3446 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3236 { 3447 {
3237 end_col = screen.tlen[end_row + TermWin.saveLines]; 3448 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3248 else 3459 else
3249#endif 3460#endif
3250 { 3461 {
3251 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3462 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3252 selection.mark.col++; 3463 selection.mark.col++;
3464
3253 selection.beg.col = 0; 3465 selection.beg.col = 0;
3254 selection.end.col = ncol; 3466 selection.end.col = ncol;
3467
3468 // select a complete logical line
3469 while (selection.beg.row > -TermWin.saveLines
3470 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3471 selection.beg.row--;
3472
3473 while (selection.end.row < TermWin.nrow
3474 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3475 selection.end.row++;
3255 } 3476 }
3256 } 3477 }
3257 3478
3258 if (button3 && buttonpress) 3479 if (button3 && buttonpress)
3259 { /* mark may need to be changed */ 3480 { /* mark may need to be changed */
3260 if (closeto == LEFT) 3481 if (closeto == LEFT)
3261 { 3482 {
3262 selection.mark.row = selection.end.row; 3483 selection.mark.row = selection.end.row;
3263 selection.mark.col = selection.end.col 3484 selection.mark.col = selection.end.col - (selection.clicks == 2);
3264 - (selection.clicks == 2);
3265 } 3485 }
3266 else 3486 else
3267 { 3487 {
3268 selection.mark.row = selection.beg.row; 3488 selection.mark.row = selection.beg.row;
3269 selection.mark.col = selection.beg.col; 3489 selection.mark.col = selection.beg.col;
3270 } 3490 }
3271 } 3491 }
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 3492
3275#ifndef NO_FRILLS 3493#if ENABLE_FRILLS
3494 if (selection.rect && selection.beg.col > selection.end.col)
3495 SWAP_IT (selection.beg.col, selection.end.col, int);
3496#endif
3497}
3498
3499#if ENABLE_FRILLS
3276void 3500void
3277rxvt_term::selection_remove_trailing_spaces () 3501rxvt_term::selection_remove_trailing_spaces ()
3278{ 3502{
3279 int32_t end_col, end_row; 3503 int32_t end_col, end_row;
3280 text_t *stp; 3504 text_t *stp;
3281 3505
3282 end_col = selection.end.col; 3506 end_col = selection.end.col;
3283 end_row = selection.end.row; 3507 end_row = selection.end.row;
3508
3284 for ( ; end_row >= selection.beg.row; ) 3509 for ( ; end_row >= selection.beg.row; )
3285 { 3510 {
3286 stp = screen.text[end_row + TermWin.saveLines]; 3511 stp = screen.text[end_row + TermWin.saveLines];
3512
3287 while (--end_col >= 0) 3513 while (--end_col >= 0)
3288 { 3514 {
3289 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3515 if (stp[end_col] != ' '
3516 && stp[end_col] != '\t'
3517 && stp[end_col] != NOCHAR)
3290 break; 3518 break;
3291 } 3519 }
3520
3292 if (end_col >= 0 3521 if (end_col >= 0
3293 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3522 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3294 { 3523 {
3295 selection.end.col = end_col + 1; 3524 selection.end.col = end_col + 1;
3296 selection.end.row = end_row; 3525 selection.end.row = end_row;
3297 break; 3526 break;
3298 } 3527 }
3528
3299 end_row--; 3529 end_row--;
3300 end_col = TermWin.ncol; 3530 end_col = TermWin.ncol;
3301 } 3531 }
3532
3302 if (selection.mark.row > selection.end.row) 3533 if (selection.mark.row > selection.end.row)
3303 { 3534 {
3304 selection.mark.row = selection.end.row; 3535 selection.mark.row = selection.end.row;
3305 selection.mark.col = selection.end.col; 3536 selection.mark.col = selection.end.col;
3306 } 3537 }
… …
3322 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3553 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3323} 3554}
3324 3555
3325/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3326/* 3557/*
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 3558 * Respond to a request for our current selection
3336 * EXT: SelectionRequest 3559 * EXT: SelectionRequest
3337 */ 3560 */
3338void 3561void
3339rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3562rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3340{ 3563{
3341 XSelectionEvent ev; 3564 XSelectionEvent ev;
3342 XTextProperty ct; 3565 dDisp;
3343 XICCEncodingStyle style;
3344 Atom target;
3345 3566
3346 ev.type = SelectionNotify; 3567 ev.type = SelectionNotify;
3347 ev.property = None; 3568 ev.property = None;
3348 ev.display = rq.display; 3569 ev.display = rq.display;
3349 ev.requestor = rq.requestor; 3570 ev.requestor = rq.requestor;
… …
3351 ev.target = rq.target; 3572 ev.target = rq.target;
3352 ev.time = rq.time; 3573 ev.time = rq.time;
3353 3574
3354 if (rq.target == xa[XA_TARGETS]) 3575 if (rq.target == xa[XA_TARGETS])
3355 { 3576 {
3356 Atom32 target_list[6]; 3577 Atom target_list[6];
3357 Atom32 *target = target_list; 3578 Atom *target = target_list;
3358 3579
3359 *target++ = (Atom32) xa[XA_TARGETS]; 3580 *target++ = xa[XA_TARGETS];
3360 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3581 *target++ = xa[XA_TIMESTAMP];
3361 *target++ = (Atom32) XA_STRING; 3582 *target++ = XA_STRING;
3362 *target++ = (Atom32) xa[XA_TEXT]; 3583 *target++ = xa[XA_TEXT];
3363 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3584 *target++ = xa[XA_COMPOUND_TEXT];
3364#if X_HAVE_UTF8_STRING 3585#if X_HAVE_UTF8_STRING
3365 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3586 *target++ = xa[XA_UTF8_STRING];
3366#endif 3587#endif
3367 3588
3368 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3589 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3369 (8 * sizeof (target_list[0])), PropModeReplace, 3590 32, PropModeReplace,
3370 (unsigned char *)target_list, 3591 (unsigned char *)target_list, target - target_list);
3371 target - target_list);
3372 ev.property = rq.property; 3592 ev.property = rq.property;
3373 } 3593 }
3374#if TODO // TODO 3594#if TODO // TODO
3375 else if (rq.target == xa[XA_MULTIPLE]) 3595 else if (rq.target == xa[XA_MULTIPLE])
3376 { 3596 {
3377 /* TODO: Handle MULTIPLE */ 3597 /* TODO: Handle MULTIPLE */
3378 } 3598 }
3379#endif 3599#endif
3380 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3600 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3381 { 3601 {
3382 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3602 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3383 (8 * sizeof (Time)), PropModeReplace,
3384 (unsigned char *)&selection_time, 1); 3603 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3385 ev.property = rq.property; 3604 ev.property = rq.property;
3386 } 3605 }
3387 else if (rq.target == XA_STRING 3606 else if (rq.target == XA_STRING
3388 || rq.target == xa[XA_TEXT] 3607 || rq.target == xa[XA_TEXT]
3389 || rq.target == xa[XA_COMPOUND_TEXT] 3608 || rq.target == xa[XA_COMPOUND_TEXT]
3390 || rq.target == xa[XA_UTF8_STRING] 3609 || rq.target == xa[XA_UTF8_STRING]
3391 ) 3610 )
3392 { 3611 {
3612 XTextProperty ct;
3613 Atom target = rq.target;
3393 short freect = 0; 3614 short freect = 0;
3394 int selectlen; 3615 int selectlen;
3395 wchar_t *cl; 3616 wchar_t *cl;
3396 3617 enum {
3397 target = rq.target; 3618 enc_string = XStringStyle,
3619 enc_text = XStdICCTextStyle,
3620 enc_compound_text = XCompoundTextStyle,
3621#ifdef X_HAVE_UTF8_STRING
3622 enc_utf8 = XUTF8StringStyle,
3623#else
3624 enc_utf8 = -1,
3625#endif
3626 } style;
3398 3627
3399 if (target == XA_STRING) 3628 if (target == XA_STRING)
3400 // we actually don't do XA_STRING, but who cares, as i18n clients 3629 // we actually don't do XA_STRING, but who cares, as i18n clients
3401 // will ask for another format anyways. 3630 // will ask for another format anyways.
3402 style = XStringStyle; 3631 style = enc_string;
3403 else if (target == xa[XA_TEXT]) 3632 else if (target == xa[XA_TEXT])
3404 style = XStdICCTextStyle; 3633 style = enc_text;
3405 else if (target == xa[XA_COMPOUND_TEXT]) 3634 else if (target == xa[XA_COMPOUND_TEXT])
3406 style = XCompoundTextStyle; 3635 style = enc_compound_text;
3407#if X_HAVE_UTF8_STRING 3636#if ENABLE_FRILLS
3408 else if (target == xa[XA_UTF8_STRING]) 3637 else if (target == xa[XA_UTF8_STRING])
3409 style = XUTF8StringStyle; 3638 style = enc_utf8;
3410#endif 3639#endif
3411 else 3640 else
3412 { 3641 {
3413 target = xa[XA_COMPOUND_TEXT]; 3642 target = xa[XA_COMPOUND_TEXT];
3414 style = XCompoundTextStyle; 3643 style = enc_compound_text;
3415 } 3644 }
3416 3645
3417 if (selection.text) 3646 if (selection.text)
3418 { 3647 {
3419 cl = selection.text; 3648 cl = selection.text;
… …
3423 { 3652 {
3424 cl = L""; 3653 cl = L"";
3425 selectlen = 0; 3654 selectlen = 0;
3426 } 3655 }
3427 3656
3428 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3657#if ENABLE_FRILLS
3429 // manually for XUTF8StringStyle. 3658 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3659 // so recode it manually
3660 if (style == enc_utf8)
3661 {
3662 freect = 1;
3663 ct.encoding = target;
3664 ct.format = 8;
3665 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3666 ct.nitems = strlen ((char *)ct.value);
3667 }
3668 else
3669#endif
3430 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3670 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3431 freect = 1; 3671 freect = 1;
3432 else 3672 else
3433 { 3673 {
3434 /* if we failed to convert then send it raw */ 3674 /* if we failed to convert then send it raw */
3435 ct.value = (unsigned char *)cl; 3675 ct.value = (unsigned char *)cl;
3436 ct.nitems = selectlen; 3676 ct.nitems = selectlen;
3677 ct.encoding = target;
3437 } 3678 }
3438 3679
3439 XChangeProperty (display->display, rq.requestor, rq.property, 3680 XChangeProperty (disp, rq.requestor, rq.property,
3440 target, 8, PropModeReplace, 3681 ct.encoding, 8, PropModeReplace,
3441 ct.value, (int)ct.nitems); 3682 ct.value, (int)ct.nitems);
3442 ev.property = rq.property; 3683 ev.property = rq.property;
3443 3684
3444 if (freect) 3685 if (freect)
3445 XFree (ct.value); 3686 XFree (ct.value);
3446 } 3687 }
3447 3688
3448 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3689 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3449} 3690}
3450 3691
3451/* ------------------------------------------------------------------------- * 3692/* ------------------------------------------------------------------------- *
3452 * MOUSE ROUTINES * 3693 * MOUSE ROUTINES *
3453 * ------------------------------------------------------------------------- */ 3694 * ------------------------------------------------------------------------- */
… …
3465} 3706}
3466 3707
3467/* ------------------------------------------------------------------------- */ 3708/* ------------------------------------------------------------------------- */
3468#ifdef USE_XIM 3709#ifdef USE_XIM
3469void 3710void
3470rxvt_term::im_set_position (XPoint *pos) 3711rxvt_term::im_set_position (XPoint &pos)
3471{ 3712{
3472 XWindowAttributes xwa; 3713 XWindowAttributes xwa;
3473 3714
3474 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3715 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3716
3475 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3717 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3476 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3718 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3477} 3719}
3478
3479#endif 3720#endif
3721
3722#if ENABLE_OVERLAY
3723void
3724rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3725{
3726 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3727 return;
3728
3729 want_refresh = 1;
3730
3731 scr_overlay_off ();
3732
3733 if (x < 0) x = TermWin.ncol - w;
3734 if (y < 0) y = TermWin.nrow - h;
3735
3736 // make space for border
3737 w += 2; MIN_IT (w, TermWin.ncol);
3738 h += 2; MIN_IT (h, TermWin.nrow);
3739
3740 x -= 1; MAX_IT (x, 0);
3741 y -= 1; MAX_IT (y, 0);
3742
3743 MIN_IT (x, TermWin.ncol - w);
3744 MIN_IT (y, TermWin.nrow - h);
3745
3746 ov_x = x; ov_y = y;
3747 ov_w = w; ov_h = h;
3748
3749 ov_text = new text_t *[h];
3750 ov_rend = new rend_t *[h];
3751
3752 for (y = 0; y < h; y++)
3753 {
3754 text_t *tp = ov_text[y] = new text_t[w];
3755 rend_t *rp = ov_rend[y] = new rend_t[w];
3756
3757 text_t t0, t1, t2;
3758 rend_t r = OVERLAY_RSTYLE;
3759
3760 if (y == 0)
3761 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3762 else if (y < h - 1)
3763 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3764 else
3765 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3766
3767 *tp++ = t0;
3768 *rp++ = r;
3769
3770 for (x = w - 2; x > 0; --x)
3771 {
3772 *tp++ = t1;
3773 *rp++ = r;
3774 }
3775
3776 *tp = t2;
3777 *rp = r;
3778 }
3779}
3780
3781void
3782rxvt_term::scr_overlay_off ()
3783{
3784 if (!ov_text)
3785 return;
3786
3787 want_refresh = 1;
3788
3789 for (int y = 0; y < ov_h; y++)
3790 {
3791 delete [] ov_text[y];
3792 delete [] ov_rend[y];
3793 }
3794
3795 delete [] ov_text; ov_text = 0;
3796 delete [] ov_rend; ov_rend = 0;
3797}
3798
3799void
3800rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3801{
3802 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3803 return;
3804
3805 x++, y++;
3806
3807 ov_text[y][x] = text;
3808 ov_rend[y][x] = rend;
3809}
3810
3811void
3812rxvt_term::scr_overlay_set (int x, int y, const char *s)
3813{
3814 while (*s)
3815 scr_overlay_set (x++, y, *s++);
3816}
3817
3818void
3819rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3820{
3821 while (*s)
3822 {
3823 text_t t = *s++;
3824 int width = wcwidth (t);
3825
3826 while (width--)
3827 {
3828 scr_overlay_set (x++, y, t);
3829 t = NOCHAR;
3830 }
3831 }
3832}
3833
3834void
3835rxvt_term::scr_swap_overlay ()
3836{
3837 if (!ov_text)
3838 return;
3839
3840 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3841
3842 // swap screen mem with overlay
3843 for (int y = ov_h; y--; )
3844 {
3845 text_t *t1 = ov_text[y];
3846 rend_t *r1 = ov_rend[y];
3847
3848 text_t *t2 = screen.text[y + row_offset] + ov_x;
3849 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3850
3851 for (int x = ov_w; x--; )
3852 {
3853 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3854 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3855 }
3856 }
3857}
3858
3859#endif
3480/* ------------------------------------------------------------------------- */ 3860/* ------------------------------------------------------------------------- */

Diff Legend

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