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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.170 by root, Mon Nov 28 19:35:04 2005 UTC

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

Diff Legend

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