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.78 by root, Fri Jul 30 18:35:11 2004 UTC vs.
Revision 1.168 by root, Thu Aug 11 13:23:06 2005 UTC

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

Diff Legend

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