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.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.164 by root, Wed Jun 22 14:33:23 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 <stdint.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{
770 unsigned char checksel, clearsel; 778 unsigned char checksel;
771 unicode_t c; 779 unicode_t c;
772 int i, row, last_col; 780 int i, row, last_col;
773 text_t *stp; 781 text_t *stp;
774 rend_t *srp; 782 rend_t *srp;
775 783
776 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
777 return; 785 return;
778 786
779 want_refresh = 1; 787 want_refresh = 1;
788 ZERO_SCROLLBACK ();
780 last_col = TermWin.ncol; 789 last_col = TermWin.ncol;
781 790
782 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
783 ZERO_SCROLLBACK ();
784 if (nlines > 0) 791 if (nlines > 0)
785 { 792 {
786 nlines += (screen.cur.row - screen.bscroll); 793 nlines += screen.cur.row - screen.bscroll;
787 if ((nlines > 0) 794 if ((nlines > 0)
788 && (screen.tscroll == 0) 795 && (screen.tscroll == 0)
789 && (screen.bscroll == (TermWin.nrow - 1))) 796 && (screen.bscroll == (TermWin.nrow - 1)))
790 { 797 {
791 /* _at least_ this many lines need to be scrolled */ 798 /* _at least_ this many lines need to be scrolled */
792 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 799 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
793 screen.cur.row -= nlines; 800 screen.cur.row -= nlines;
794 } 801 }
795 } 802 }
803
796#ifdef DEBUG_STRICT 804#ifdef DEBUG_STRICT
797 assert (screen.cur.col < last_col); 805 assert (screen.cur.col < last_col);
798 assert ((screen.cur.row < TermWin.nrow) 806 assert ((screen.cur.row < TermWin.nrow)
799 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 807 && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
800#else /* drive with your eyes closed */ 808#else /* drive with your eyes closed */
801 MIN_IT (screen.cur.col, last_col - 1); 809 MIN_IT (screen.cur.col, last_col - 1);
802 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 810 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
803 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); 811 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
804#endif 812#endif
805 row = screen.cur.row + TermWin.saveLines; 813 row = screen.cur.row + TermWin.saveLines;
806 814
807 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 815 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
808 clearsel = 0;
809 816
810 stp = screen.text[row]; 817 stp = screen.text[row];
811 srp = screen.rend[row]; 818 srp = screen.rend[row];
812 819
813 while (len--) 820 while (len--)
… …
816 823
817 if (c < 0x20) 824 if (c < 0x20)
818 switch (c) 825 switch (c)
819 { 826 {
820 case C0_HT: 827 case C0_HT:
821 scr_tab (1); 828 scr_tab (1, true);
822 continue; 829 continue;
823 830
824 case C0_LF: 831 case C0_LF:
825 if (screen.tlen[row] != -1) /* XXX: think about this */ 832 if (screen.tlen[row] != -1) /* XXX: think about this */
826 MAX_IT (screen.tlen[row], screen.cur.col); 833 MAX_IT (screen.tlen[row], screen.cur.col);
… …
848 if (checksel /* see if we're writing within selection */ 855 if (checksel /* see if we're writing within selection */
849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 856 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 857 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
851 { 858 {
852 checksel = 0; 859 checksel = 0;
853 clearsel = 1; 860 /*
861 * If we wrote anywhere in the selected area, kill the selection
862 * XXX: should we kill the mark too? Possibly, but maybe that
863 * should be a similar check.
864 */
865 CLEAR_SELECTION ();
854 } 866 }
855 867
856 if (screen.flags & Screen_WrapNext) 868 if (screen.flags & Screen_WrapNext)
857 { 869 {
858 screen.tlen[row] = -1; 870 screen.tlen[row] = -1;
859 if (screen.cur.row == screen.bscroll) 871
860 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
861 else if (screen.cur.row < (TermWin.nrow - 1))
862 row = (++screen.cur.row) + TermWin.saveLines; 872 scr_do_wrap (); row = screen.cur.row + TermWin.saveLines;
863 873
864 stp = screen.text[row]; /* _must_ refresh */ 874 stp = screen.text[row]; /* _must_ refresh */
865 srp = screen.rend[row]; /* _must_ refresh */ 875 srp = screen.rend[row]; /* _must_ refresh */
866 screen.cur.col = 0;
867 screen.flags &= ~Screen_WrapNext;
868 } 876 }
869
870 if (screen.flags & Screen_Insert)
871 scr_insdel_chars (1, INSERT);
872 877
873 // rely on wcwidth to tell us the character width, at least for non-latin1 878 // 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 879 // do wcwidth before further replacements, as wcwidth says that line-drawing
875 // characters have width -1 (DOH!) on GNU/Linux sometimes. 880 // characters have width -1 (DOH!) on GNU/Linux sometimes.
876 int width = c < 256 ? 1 : wcwidth (c); 881 int width = c < 0x100 ? 1 : wcwidth (c);
877 882
878 if (charsets[screen.charset] == '0') // DEC SPECIAL 883 if (charsets[screen.charset] == '0') // DEC SPECIAL
879 { 884 {
880 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
886 // 5f-7e standard vt100
887 // 40-5e rxvt extension for extra curses acs chars
881 static uint16_t vt100_0[32] = { // 5f .. 7e 888 static uint16_t vt100_0[63] = { // 40 .. 7e
889 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman!
890 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f
891 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57
892 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f
882 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 893 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
883 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 894 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
884 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 895 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
885 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, 896 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
886 }; 897 };
887 898
888 if (c >= 0x5f && c <= 0x7e) 899 if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40])
889 { 900 {
890 c = vt100_0[c - 0x5f]; 901 c = vt100_0[c - 0x40];
891 width = 1; 902 width = 1;
892 } 903 }
893 } 904 }
894 905
906 if (screen.flags & Screen_Insert)
907 scr_insdel_chars (width, INSERT);
908
895 if (width != 0) 909 if (width != 0)
896 { 910 {
897#if !UNICODE_3 && ENABLE_COMBINING 911 // some utf-8 decoders decode surrogate characters.
912 if (0xd800 <= c && c <= 0xdfff)
913 c = 0xfffd;
914
915#if !UNICODE_3
898 // trim characters we can't store directly :( 916 // trim characters we can't store directly :(
899 if (c >= 0x10000) 917 if (c >= 0x10000)
918# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 919 c = rxvt_composite.compose (c); // map to lower 16 bits
920# else
921 c = 0xfffd;
901#endif 922# endif
902 bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); 923#endif
924
925 // nuke the character at this position, if required
926 if (stp[screen.cur.col] == NOCHAR
927 || (screen.cur.col < TermWin.ncol - 1
928 && stp[screen.cur.col + 1] == NOCHAR))
929 {
930 int col = screen.cur.col;
931
932 // find begin
933 while (col > 0 && stp[col] == NOCHAR)
934 col--;
935
936 rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' '));
937
938 // found begin, nuke
939 do {
940 stp[col] = ' ';
941 srp[col] = rend;
942 col++;
943 } while (col < TermWin.ncol && stp[col] == NOCHAR);
944 }
945
903 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c, bold)); 946 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 947
905 do 948 do
906 { 949 {
907 stp[screen.cur.col] = c; 950 stp[screen.cur.col] = c;
908 srp[screen.cur.col] = rend; 951 srp[screen.cur.col] = rend;
… …
920 c = NOCHAR; 963 c = NOCHAR;
921 } 964 }
922 while (--width > 0); 965 while (--width > 0);
923 966
924 // pad with spaces when overwriting wide character with smaller one 967 // pad with spaces when overwriting wide character with smaller one
968 if (!width)
925 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 969 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++)
926 { 970 {
927 stp[c] = ' '; 971 stp[c] = ' ';
928 srp[c] = rend; 972 srp[c] = rend;
929 } 973 }
930 } 974 }
931 else if (width == 0) 975 else if (width == 0)
932 { 976 {
933#if ENABLE_COMBINING 977#if ENABLE_COMBINING
934 // handle combining characters 978 // handle combining characters
… …
941 985
942 if (screen.cur.col > 0) 986 if (screen.cur.col > 0)
943 { 987 {
944 tp = stp + screen.cur.col - 1; 988 tp = stp + screen.cur.col - 1;
945 rp = srp + screen.cur.col - 1; 989 rp = srp + screen.cur.col - 1;
990
991 while (*tp == NOCHAR && tp > stp)
992 tp--, rp--;
946 } 993 }
947 else if (screen.cur.row > 0 994 else if (screen.cur.row > 0
948 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) 995 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
949 { 996 {
950 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 997 int line = screen.cur.row - 1 + TermWin.saveLines;
951 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; 998
999 tp = screen.text[line] + last_col - 1;
1000 rp = screen.rend[line] + last_col - 1;
1001
1002 while (*tp == NOCHAR && tp > screen.text[line])
1003 tp--, rp--;
952 } 1004 }
953 else 1005 else
954 continue; 1006 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 1007
960 // first try to find a precomposed character 1008 // first try to find a precomposed character
961 unicode_t n = rxvt_compose (*tp, c); 1009 unicode_t n = rxvt_compose (*tp, c);
962 if (n == NOCHAR) 1010 if (n == NOCHAR)
963 n = rxvt_composite.compose (*tp, c); 1011 n = rxvt_composite.compose (*tp, c);
964 1012
965 *tp = n; 1013 *tp = n;
966 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
967#endif 1015#endif
968 } 1016 }
969 } 1017 }
970 1018
971 if (screen.tlen[row] != -1) /* XXX: think about this */ 1019 if (screen.tlen[row] != -1) /* XXX: think about this */
972 MAX_IT (screen.tlen[row], screen.cur.col); 1020 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 1021
982#ifdef DEBUG_STRICT 1022#ifdef DEBUG_STRICT
983 assert (screen.cur.row >= 0); 1023 assert (screen.cur.row >= 0);
984#else /* drive with your eyes closed */ 1024#else /* drive with your eyes closed */
985 MAX_IT (screen.cur.row, 0); 1025 MAX_IT (screen.cur.row, 0);
… …
1003#ifdef TERMCAP_HAS_BW 1043#ifdef TERMCAP_HAS_BW
1004 screen.cur.col = TermWin.ncol - 1; 1044 screen.cur.col = TermWin.ncol - 1;
1005 screen.cur.row--; 1045 screen.cur.row--;
1006 return; 1046 return;
1007#endif 1047#endif
1008
1009 } 1048 }
1010 } 1049 }
1011 else if ((screen.flags & Screen_WrapNext) == 0) 1050 else if (!(screen.flags & Screen_WrapNext))
1012 scr_gotorc (0, -1, RELATIVE); 1051 scr_gotorc (0, -1, RELATIVE);
1013 1052
1014 screen.flags &= ~Screen_WrapNext; 1053 screen.flags &= ~Screen_WrapNext;
1015} 1054}
1016 1055
… …
1019 * Process Horizontal Tab 1058 * Process Horizontal Tab
1020 * count: +ve = forward; -ve = backwards 1059 * count: +ve = forward; -ve = backwards
1021 * XTERM_SEQ: CTRL-I 1060 * XTERM_SEQ: CTRL-I
1022 */ 1061 */
1023void 1062void
1024rxvt_term::scr_tab (int count) 1063rxvt_term::scr_tab (int count, bool ht)
1025{ 1064{
1026 int i, x; 1065 int i, x;
1027 1066
1028 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1029 want_refresh = 1; 1067 want_refresh = 1;
1030 i = x = screen.cur.col; 1068 i = x = screen.cur.col;
1031 1069
1032 if (count == 0) 1070 if (count == 0)
1033 return; 1071 return;
1034 else if (count > 0) 1072 else if (count > 0)
1035 { 1073 {
1074 int row = TermWin.saveLines + screen.cur.row;
1075 text_t *tp = screen.text[row];
1076 rend_t *rp = screen.rend[row];
1077 rend_t base_rend = rp[i];
1078 ht &= tp[i] == ' ';
1079
1036 for (; ++i < TermWin.ncol; ) 1080 for (; ++i < TermWin.ncol; )
1037 if (tabs[i]) 1081 if (tabs[i])
1038 { 1082 {
1039 x = i; 1083 x = i;
1040 if (!--count) 1084 if (!--count)
1041 break; 1085 break;
1042 } 1086 }
1087 else
1088 ht &= tp[i] == ' '
1089 && RS_SAME (rp[i], base_rend);
1043 1090
1044 if (count) 1091 if (count)
1045 x = TermWin.ncol - 1; 1092 x = TermWin.ncol - 1;
1093
1094 // store horizontal tab commands as characters inside the text
1095 // buffer so they can be selected and pasted.
1096 if (ht && options & Opt_pastableTabs)
1097 {
1098 base_rend = SET_FONT (base_rend, 0);
1099
1100 if (screen.tlen[row] != -1) /* XXX: think about this */
1101 MAX_IT (screen.tlen[row], x);
1102
1103 i = screen.cur.col;
1104
1105 tp[i] = '\t';
1106 rp[i] = base_rend;
1107
1108 while (++i < x)
1109 {
1110 tp[i] = NOCHAR;
1111 rp[i] = base_rend;
1112 }
1113 }
1046 } 1114 }
1047 else /* if (count < 0) */ 1115 else /* if (count < 0) */
1048 { 1116 {
1049 for (; --i >= 0; ) 1117 for (; --i >= 0; )
1050 if (tabs[i]) 1118 if (tabs[i])
… …
1067 * Process DEC Back Index 1135 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1071 */ 1139 */
1072#ifndef NO_FRILLS 1140#if ENABLE_FRILLS
1073void 1141void
1074rxvt_term::scr_backindex () 1142rxvt_term::scr_backindex ()
1075{ 1143{
1076 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1146 else
1079 { 1147 {
1080 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) 1148 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1081 return; /* um, yeah? */ 1149 return; /* um, yeah? */
1150
1082 scr_insdel_chars (1, INSERT); 1151 scr_insdel_chars (1, INSERT);
1083 } 1152 }
1084} 1153}
1085#endif 1154#endif
1086/* ------------------------------------------------------------------------- */ 1155/* ------------------------------------------------------------------------- */
… …
1088 * Process DEC Forward Index 1157 * Process DEC Forward Index
1089 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1090 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1091 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1092 */ 1161 */
1093#ifndef NO_FRILLS 1162#if ENABLE_FRILLS
1094void 1163void
1095rxvt_term::scr_forwardindex () 1164rxvt_term::scr_forwardindex ()
1096{ 1165{
1097 int row; 1166 int row;
1098 1167
1099 if (screen.cur.col < TermWin.ncol - 1) 1168 if (screen.cur.col < TermWin.ncol - 1)
1100 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1169 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1101 else 1170 else
1102 { 1171 {
1103 row = screen.cur.row + TermWin.saveLines; 1172 row = screen.cur.row + TermWin.saveLines;
1173
1104 if (screen.tlen[row] == 0) 1174 if (screen.tlen[row] == 0)
1105 return; /* um, yeah? */ 1175 return; /* um, yeah? */
1106 else if (screen.tlen[row] == -1) 1176 else if (screen.tlen[row] == -1)
1107 screen.tlen[row] = TermWin.ncol; 1177 screen.tlen[row] = TermWin.ncol;
1178
1108 scr_gotorc (0, 0, R_RELATIVE); 1179 scr_gotorc (0, 0, R_RELATIVE);
1109 scr_insdel_chars (1, DELETE); 1180 scr_insdel_chars (1, DELETE);
1110 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1181 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE);
1111 } 1182 }
1112} 1183}
… …
1120rxvt_term::scr_gotorc (int row, int col, int relative) 1191rxvt_term::scr_gotorc (int row, int col, int relative)
1121{ 1192{
1122 want_refresh = 1; 1193 want_refresh = 1;
1123 ZERO_SCROLLBACK (); 1194 ZERO_SCROLLBACK ();
1124 1195
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; 1196 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1128 MAX_IT (screen.cur.col, 0); 1197 MAX_IT (screen.cur.col, 0);
1129 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); 1198 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1130 1199
1131 screen.flags &= ~Screen_WrapNext; 1200 screen.flags &= ~Screen_WrapNext;
1201
1132 if (relative & R_RELATIVE) 1202 if (relative & R_RELATIVE)
1133 { 1203 {
1134 if (row > 0) 1204 if (row > 0)
1135 { 1205 {
1136 if (screen.cur.row <= screen.bscroll 1206 if (screen.cur.row <= screen.bscroll
… …
1156 MIN_IT (screen.cur.row, screen.bscroll); 1226 MIN_IT (screen.cur.row, screen.bscroll);
1157 } 1227 }
1158 else 1228 else
1159 screen.cur.row = row; 1229 screen.cur.row = row;
1160 } 1230 }
1231
1161 MAX_IT (screen.cur.row, 0); 1232 MAX_IT (screen.cur.row, 0);
1162 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1233 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} 1234}
1168 1235
1169/* ------------------------------------------------------------------------- */ 1236/* ------------------------------------------------------------------------- */
1170/* 1237/*
1171 * direction should be UP or DN 1238 * direction should be UP or DN
1172 */ 1239 */
1173void 1240void
1174rxvt_term::scr_index (enum page_dirn direction) 1241rxvt_term::scr_index (enum page_dirn direction)
1175{ 1242{
1176 int dirn; 1243 int dirn;
1177 1244
1178 want_refresh = 1; 1245 want_refresh = 1;
1246 ZERO_SCROLLBACK ();
1247
1179 dirn = ((direction == UP) ? 1 : -1); 1248 dirn = ((direction == UP) ? 1 : -1);
1180 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1181
1182 ZERO_SCROLLBACK ();
1183 1249
1184 screen.flags &= ~Screen_WrapNext; 1250 screen.flags &= ~Screen_WrapNext;
1251
1185 if ((screen.cur.row == screen.bscroll && direction == UP) 1252 if ((screen.cur.row == screen.bscroll && direction == UP)
1186 || (screen.cur.row == screen.tscroll && direction == DN)) 1253 || (screen.cur.row == screen.tscroll && direction == DN))
1187 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1254 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0);
1188 else 1255 else
1189 screen.cur.row += dirn; 1256 screen.cur.row += dirn;
1257
1190 MAX_IT (screen.cur.row, 0); 1258 MAX_IT (screen.cur.row, 0);
1191 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1259 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1192 selection_check (0); 1260 selection_check (0);
1193} 1261}
1194 1262
… …
1203rxvt_term::scr_erase_line (int mode) 1271rxvt_term::scr_erase_line (int mode)
1204{ 1272{
1205 unsigned int row, col, num; 1273 unsigned int row, col, num;
1206 1274
1207 want_refresh = 1; 1275 want_refresh = 1;
1208 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1209 ZERO_SCROLLBACK (); 1276 ZERO_SCROLLBACK ();
1210 1277
1211 selection_check (1); 1278 selection_check (1);
1212
1213 screen.flags &= ~Screen_WrapNext;
1214 1279
1215 row = TermWin.saveLines + screen.cur.row; 1280 row = TermWin.saveLines + screen.cur.row;
1216 switch (mode) 1281 switch (mode)
1217 { 1282 {
1218 case 0: /* erase to end of line */ 1283 case 0: /* erase to end of line */
… …
1262 int32_t row, row_offset; 1327 int32_t row, row_offset;
1263 rend_t ren; 1328 rend_t ren;
1264 XGCValues gcvalue; 1329 XGCValues gcvalue;
1265 1330
1266 want_refresh = 1; 1331 want_refresh = 1;
1267 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1268 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1333
1269 row_offset = (int32_t)TermWin.saveLines; 1334 row_offset = (int32_t)TermWin.saveLines;
1270 1335
1271 switch (mode) 1336 switch (mode)
1272 { 1337 {
1273 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
… …
1289 break; 1354 break;
1290 default: 1355 default:
1291 return; 1356 return;
1292 } 1357 }
1293 1358
1294 refresh_type |= REFRESH_BOUNDS;
1295
1296 if (selection.op && current_screen == selection.screen 1359 if (selection.op && current_screen == selection.screen
1297 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1360 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1298 || (selection.end.row >= row 1361 || (selection.end.row >= row
1299 && selection.end.row <= row + num))) 1362 && selection.end.row <= row + num)))
1300 CLEAR_SELECTION (); 1363 CLEAR_SELECTION ();
… …
1311 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1312 CLEAR_ROWS (row, num); 1375 CLEAR_ROWS (row, num);
1313 } 1376 }
1314 else 1377 else
1315 { 1378 {
1316 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1317 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1380 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
1318 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1381 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1319 ERASE_ROWS (row, num); 1382 ERASE_ROWS (row, num);
1320 gcvalue.foreground = PixColors[Color_fg]; 1383 gcvalue.foreground = pix_colors[Color_fg];
1321 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1384 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue);
1322 } 1385 }
1323 1386
1324 for (; num--; row++) 1387 for (; num--; row++)
1325 { 1388 {
1326 scr_blank_screen_mem (screen.text, screen.rend, 1389 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; 1390 screen.tlen[row + row_offset] = 0;
1329 scr_blank_line (drawn_text[row], drawn_rend[row], 1391 scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
1330 (unsigned int)TermWin.ncol, ren);
1331 } 1392 }
1332} 1393}
1394
1395#if ENABLE_FRILLS
1396void
1397rxvt_term::scr_erase_savelines ()
1398{
1399 want_refresh = 1;
1400 ZERO_SCROLLBACK ();
1401
1402 TermWin.nscrolled = 0;
1403}
1404#endif
1333 1405
1334/* ------------------------------------------------------------------------- */ 1406/* ------------------------------------------------------------------------- */
1335/* 1407/*
1336 * Fill the screen with `E's 1408 * Fill the screen with `E's
1337 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1409 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1338 */ 1410 */
1339void 1411void
1340rxvt_term::scr_E () 1412rxvt_term::scr_E ()
1341{ 1413{
1342 int i, j, k; 1414 int i, j, k;
1343 rend_t *r1, fs; 1415 rend_t *r1, fs;
1344 1416
1345 want_refresh = 1; 1417 want_refresh = 1;
1418 ZERO_SCROLLBACK ();
1419
1346 num_scr_allow = 0; 1420 num_scr_allow = 0;
1347 ZERO_SCROLLBACK ();
1348 selection_check (3); 1421 selection_check (3);
1349 1422
1350 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1423 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1351 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1424 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++)
1352 { 1425 {
1353 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1426 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */
1354 fill_text (screen.text[k], 'E', TermWin.ncol); 1427 fill_text (screen.text[k], 'E', TermWin.ncol);
1355 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1428 for (r1 = screen.rend[k], j = TermWin.ncol; j--; )
… …
1379 if (insdel == DELETE) 1452 if (insdel == DELETE)
1380 return; 1453 return;
1381 else if (insdel == INSERT) 1454 else if (insdel == INSERT)
1382 count = end; 1455 count = end;
1383 } 1456 }
1384 screen.flags &= ~Screen_WrapNext; 1457
1458 scr_do_wrap ();
1385 1459
1386 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1460 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0);
1387} 1461}
1388 1462
1389/* ------------------------------------------------------------------------- */ 1463/* ------------------------------------------------------------------------- */
… …
1403 ZERO_SCROLLBACK (); 1477 ZERO_SCROLLBACK ();
1404 1478
1405 if (count <= 0) 1479 if (count <= 0)
1406 return; 1480 return;
1407 1481
1482 scr_do_wrap ();
1483
1408 selection_check (1); 1484 selection_check (1);
1409 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1485 MIN_IT (count, (TermWin.ncol - screen.cur.col));
1410 1486
1411 row = screen.cur.row + TermWin.saveLines; 1487 row = screen.cur.row + TermWin.saveLines;
1412 screen.flags &= ~Screen_WrapNext;
1413 1488
1414 stp = screen.text[row]; 1489 stp = screen.text[row];
1415 srp = screen.rend[row]; 1490 srp = screen.rend[row];
1416 slp = & (screen.tlen[row]); 1491 slp = &screen.tlen[row];
1417 1492
1418 switch (insdel) 1493 switch (insdel)
1419 { 1494 {
1420 case INSERT: 1495 case INSERT:
1421 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1496 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--)
1422 col--)
1423 { 1497 {
1424 stp[col] = stp[col - count]; 1498 stp[col] = stp[col - count];
1425 srp[col] = srp[col - count]; 1499 srp[col] = srp[col - count];
1426 } 1500 }
1427 1501
… …
1437 if (selection.end.row != screen.cur.row 1511 if (selection.end.row != screen.cur.row
1438 || (selection.end.col + count >= TermWin.ncol)) 1512 || (selection.end.col + count >= TermWin.ncol))
1439 CLEAR_SELECTION (); 1513 CLEAR_SELECTION ();
1440 else 1514 else
1441 { /* shift selection */ 1515 { /* shift selection */
1442 selection.beg.col += count; 1516 selection.beg.col += count;
1443 selection.mark.col += count; /* XXX: yes? */ 1517 selection.mark.col += count; /* XXX: yes? */
1444 selection.end.col += count; 1518 selection.end.col += count;
1445 } 1519 }
1446 } 1520 }
1447 1521
1448 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1522 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1449 (unsigned int)count, rstyle); 1523 (unsigned int)count, rstyle);
1450 break; 1524 break;
1451 1525
1452 case ERASE: 1526 case ERASE:
1453 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1527 screen.cur.col += count; /* don't worry if > TermWin.ncol */
1454 selection_check (1); 1528 selection_check (1);
1455 screen.cur.col -= count; 1529 screen.cur.col -= count;
1456 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1530 scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col],
1457 (unsigned int)count, rstyle); 1531 (unsigned int)count, rstyle);
1458 break; 1532 break;
1459 1533
1460 case DELETE: 1534 case DELETE:
1461 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1464 { 1538 {
1465 stp[col] = stp[col + count]; 1539 stp[col] = stp[col + count];
1466 srp[col] = srp[col + count]; 1540 srp[col] = srp[col + count];
1467 } 1541 }
1468 1542
1469 scr_blank_line (& (stp[TermWin.ncol - count]), 1543 scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count],
1470 & (srp[TermWin.ncol - count]),
1471 (unsigned int)count, tr); 1544 (unsigned int)count, tr);
1472 1545
1473 if (*slp == -1) /* break line continuation */ 1546 if (*slp == -1) /* break line continuation */
1474 *slp = TermWin.ncol; 1547 *slp = TermWin.ncol;
1475 1548
… …
1484 || selection.end.col >= TermWin.ncol) 1557 || selection.end.col >= TermWin.ncol)
1485 CLEAR_SELECTION (); 1558 CLEAR_SELECTION ();
1486 else 1559 else
1487 { 1560 {
1488 /* shift selection */ 1561 /* shift selection */
1489 selection.beg.col -= count; 1562 selection.beg.col -= count;
1490 selection.mark.col -= count; /* XXX: yes? */ 1563 selection.mark.col -= count; /* XXX: yes? */
1491 selection.end.col -= count; 1564 selection.end.col -= count;
1492 } 1565 }
1493 } 1566 }
1494 1567
1495 break; 1568 break;
1496 } 1569 }
… …
1542rxvt_term::scr_autowrap (int mode) 1615rxvt_term::scr_autowrap (int mode)
1543{ 1616{
1544 if (mode) 1617 if (mode)
1545 screen.flags |= Screen_Autowrap; 1618 screen.flags |= Screen_Autowrap;
1546 else 1619 else
1547 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1620 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1548} 1621}
1549 1622
1550/* ------------------------------------------------------------------------- */ 1623/* ------------------------------------------------------------------------- */
1551/* 1624/*
1552 * Set/unset margin origin mode 1625 * Set/unset margin origin mode
… …
1562{ 1635{
1563 if (mode) 1636 if (mode)
1564 screen.flags |= Screen_Relative; 1637 screen.flags |= Screen_Relative;
1565 else 1638 else
1566 screen.flags &= ~Screen_Relative; 1639 screen.flags &= ~Screen_Relative;
1640
1567 scr_gotorc (0, 0, 0); 1641 scr_gotorc (0, 0, 0);
1568} 1642}
1569 1643
1570/* ------------------------------------------------------------------------- */ 1644/* ------------------------------------------------------------------------- */
1571/* 1645/*
… …
1591 */ 1665 */
1592void 1666void
1593rxvt_term::scr_set_tab (int mode) 1667rxvt_term::scr_set_tab (int mode)
1594{ 1668{
1595 if (mode < 0) 1669 if (mode < 0)
1596 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1670 memset (tabs, 0, TermWin.ncol * sizeof (char));
1597 else if (screen.cur.col < TermWin.ncol) 1671 else if (screen.cur.col < TermWin.ncol)
1598 tabs[screen.cur.col] = (mode ? 1 : 0); 1672 tabs[screen.cur.col] = (mode ? 1 : 0);
1599} 1673}
1600 1674
1601/* ------------------------------------------------------------------------- */ 1675/* ------------------------------------------------------------------------- */
… …
1605 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1679 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1606 */ 1680 */
1607void 1681void
1608rxvt_term::scr_rvideo_mode (int mode) 1682rxvt_term::scr_rvideo_mode (int mode)
1609{ 1683{
1610 XGCValues gcvalue; 1684 XGCValues gcvalue;
1611 1685
1612 if (rvideo != mode) 1686 if (rvideo != mode)
1613 { 1687 {
1614 rvideo = mode; 1688 rvideo = mode;
1615 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1689 SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color);
1616#if defined(XPM_BACKGROUND) 1690#if XPM_BACKGROUND
1617 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1618#endif 1692#endif
1619#if defined(TRANSPARENT) 1693#if TRANSPARENT
1620 if (! (Options & Opt_transparent) || am_transparent == 0) 1694 if (! (options & Opt_transparent) || am_transparent == 0)
1621#endif 1695#endif
1622 XSetWindowBackground (display->display, TermWin.vt, 1696 XSetWindowBackground (display->display, TermWin.vt,
1623 PixColors[Color_bg]); 1697 pix_colors[Color_bg]);
1624 1698
1625 gcvalue.foreground = PixColors[Color_fg]; 1699 gcvalue.foreground = pix_colors[Color_fg];
1626 gcvalue.background = PixColors[Color_bg]; 1700 gcvalue.background = pix_colors[Color_bg];
1627 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1701 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground,
1628 &gcvalue); 1702 &gcvalue);
1629 scr_clear (); 1703 scr_clear ();
1630 scr_touch (true); 1704 scr_touch (true);
1631 } 1705 }
… …
1679 * XTERM_SEQ: Invoke G2 character set: ESC N 1753 * XTERM_SEQ: Invoke G2 character set: ESC N
1680 * XTERM_SEQ: Invoke G3 character set: ESC O 1754 * XTERM_SEQ: Invoke G3 character set: ESC O
1681 */ 1755 */
1682void 1756void
1683rxvt_term::scr_charset_choose (int set) 1757rxvt_term::scr_charset_choose (int set)
1684 { 1758{
1685 screen.charset = set; 1759 screen.charset = set;
1686 set_font_style (); 1760 set_font_style ();
1687 } 1761}
1688 1762
1689/* ------------------------------------------------------------------------- */ 1763/* ------------------------------------------------------------------------- */
1690/* 1764/*
1691 * Set a font 1765 * Set a font
1692 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1766 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1695 * XTERM_SEQ: Set G3 character set: ESC + <C> 1769 * XTERM_SEQ: Set G3 character set: ESC + <C>
1696 * See set_font_style for possible values for <C> 1770 * See set_font_style for possible values for <C>
1697 */ 1771 */
1698void 1772void
1699rxvt_term::scr_charset_set (int set, unsigned int ch) 1773rxvt_term::scr_charset_set (int set, unsigned int ch)
1700 { 1774{
1701 charsets[set] = (unsigned char)ch; 1775 charsets[set] = (unsigned char)ch;
1702 set_font_style (); 1776 set_font_style ();
1703 } 1777}
1704 1778
1705 1779
1706/* ------------------------------------------------------------------------- * 1780/* ------------------------------------------------------------------------- *
1707 * MAJOR SCREEN MANIPULATION * 1781 * MAJOR SCREEN MANIPULATION *
1708 * ------------------------------------------------------------------------- */ 1782 * ------------------------------------------------------------------------- */
… …
1747 row_col_t rc[RC_COUNT]; 1821 row_col_t rc[RC_COUNT];
1748 1822
1749 if (drawn_text == NULL) /* sanity check */ 1823 if (drawn_text == NULL) /* sanity check */
1750 return; 1824 return;
1751 1825
1826#ifndef NO_SLOW_LINK_SUPPORT
1827 if (refresh_type == FAST_REFRESH && !display->is_local)
1828 {
1829 y = 0;
1830 height = TermWin.height;
1831 }
1832#endif
1833
1752#ifdef DEBUG_STRICT 1834#ifdef DEBUG_STRICT
1753 x = max (x, 0); 1835 x = max (x, 0);
1754 x = min (x, (int)TermWin.width); 1836 x = min (x, (int)TermWin.width);
1755 y = max (y, 0); 1837 y = max (y, 0);
1756 y = min (y, (int)TermWin.height); 1838 y = min (y, (int)TermWin.height);
… …
1768 { 1850 {
1769 MIN_IT (rc[i].col, TermWin.ncol - 1); 1851 MIN_IT (rc[i].col, TermWin.ncol - 1);
1770 MIN_IT (rc[i].row, TermWin.nrow - 1); 1852 MIN_IT (rc[i].row, TermWin.nrow - 1);
1771 } 1853 }
1772 1854
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++) 1855 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); 1856 fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1777 1857
1778 if (refresh) 1858 if (refresh)
1779 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1859 scr_refresh (SLOW_REFRESH);
1780} 1860}
1781 1861
1782/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1783/* 1863/*
1784 * Refresh the entire screen 1864 * Refresh the entire screen
… …
1796 */ 1876 */
1797int 1877int
1798rxvt_term::scr_move_to (int y, int len) 1878rxvt_term::scr_move_to (int y, int len)
1799{ 1879{
1800 long p = 0; 1880 long p = 0;
1801 uint16_t oldviewstart; 1881 unsigned int oldviewstart;
1802 1882
1803 oldviewstart = TermWin.view_start; 1883 oldviewstart = TermWin.view_start;
1884
1804 if (y < len) 1885 if (y < len)
1805 { 1886 {
1806 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; 1887 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1807 p -= (long) (TermWin.nrow - 1); 1888 p -= (long) (TermWin.nrow - 1);
1808 p = max (p, 0); 1889 p = max (p, 0);
1809 } 1890 }
1891
1810 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); 1892 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 1893
1813 return scr_changeview (oldviewstart); 1894 return scr_changeview (oldviewstart);
1814} 1895}
1815 1896
1816/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
… …
1819 * direction should be UP or DN 1900 * direction should be UP or DN
1820 */ 1901 */
1821int 1902int
1822rxvt_term::scr_page (enum page_dirn direction, int nlines) 1903rxvt_term::scr_page (enum page_dirn direction, int nlines)
1823{ 1904{
1824 int n; 1905 int n;
1825 uint16_t oldviewstart; 1906 unsigned int oldviewstart;
1826 1907
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; 1908 oldviewstart = TermWin.view_start;
1909
1832 if (direction == UP) 1910 if (direction == UP)
1833 { 1911 {
1834 n = TermWin.view_start + nlines; 1912 n = TermWin.view_start + nlines;
1835 TermWin.view_start = min (n, TermWin.nscrolled); 1913 TermWin.view_start = min (n, TermWin.nscrolled);
1836 } 1914 }
1837 else 1915 else
1838 { 1916 {
1839 n = TermWin.view_start - nlines; 1917 n = TermWin.view_start - nlines;
1840 TermWin.view_start = max (n, 0); 1918 TermWin.view_start = max (n, 0);
1841 } 1919 }
1920
1842 return scr_changeview (oldviewstart); 1921 return scr_changeview (oldviewstart);
1843} 1922}
1844 1923
1845int 1924int
1846rxvt_term::scr_changeview (uint16_t oldviewstart) 1925rxvt_term::scr_changeview (unsigned int oldviewstart)
1847{ 1926{
1848 if (TermWin.view_start != oldviewstart) 1927 if (TermWin.view_start != oldviewstart)
1849 { 1928 {
1850 want_refresh = 1; 1929 want_refresh = 1;
1851 num_scr -= (TermWin.view_start - oldviewstart); 1930 num_scr -= (TermWin.view_start - oldviewstart);
… …
1859rxvt_term::scr_bell () 1938rxvt_term::scr_bell ()
1860{ 1939{
1861#ifndef NO_BELL 1940#ifndef NO_BELL
1862# ifndef NO_MAPALERT 1941# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1942# ifdef MAPALERT_OPTION
1864 if (Options & Opt_mapAlert) 1943 if (options & Opt_mapAlert)
1865# endif 1944# endif
1866 XMapWindow (display->display, TermWin.parent[0]); 1945 XMapWindow (display->display, TermWin.parent[0]);
1867# endif 1946# endif
1868 if (Options & Opt_visualBell) 1947 if (options & Opt_visualBell)
1869 { 1948 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1949 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1950 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 } 1951 }
1873 else 1952 else
… …
1879/* ARGSUSED */ 1958/* ARGSUSED */
1880void 1959void
1881rxvt_term::scr_printscreen (int fullhist) 1960rxvt_term::scr_printscreen (int fullhist)
1882{ 1961{
1883#ifdef PRINTPIPE 1962#ifdef PRINTPIPE
1884 int i, r1, nrows, row_offset; 1963 int i, r1, nrows, row_offset;
1885 text_t *t; 1964 FILE *fd;
1886 FILE *fd;
1887 1965
1888 if ((fd = popen_printer ()) == NULL) 1966 if ((fd = popen_printer ()) == NULL)
1889 return; 1967 return;
1968
1890 nrows = TermWin.nrow; 1969 nrows = TermWin.nrow;
1891 row_offset = TermWin.saveLines; 1970 row_offset = TermWin.saveLines;
1971
1892 if (!fullhist) 1972 if (!fullhist)
1893 row_offset -= TermWin.view_start; 1973 row_offset -= TermWin.view_start;
1894 else 1974 else
1895 { 1975 {
1896 nrows += TermWin.nscrolled; 1976 nrows += TermWin.nscrolled;
1897 row_offset -= TermWin.nscrolled; 1977 row_offset -= TermWin.nscrolled;
1898 } 1978 }
1899 1979
1980 wctomb (0, 0);
1981
1900 for (r1 = 0; r1 < nrows; r1++) 1982 for (r1 = 0; r1 < nrows; r1++)
1901 { 1983 {
1902 t = screen.text[r1 + row_offset]; 1984 text_t *tp = screen.text[r1 + row_offset];
1903 for (i = TermWin.ncol - 1; i >= 0; i--) 1985 int len = screen.tlen[r1 + row_offset];
1904 if (!isspace (t[i])) 1986
1905 break; 1987 for (i = len >= 0 ? len : TermWin.ncol - 1; i--; )
1906 fprintf (fd, "%.*s\n", (i + 1), t); 1988 {
1989 char mb[MB_LEN_MAX];
1990 text_t t = *tp++;
1991 if (t == NOCHAR)
1992 continue;
1993
1994 len = wctomb (mb, t);
1995
1996 if (len <= 0)
1997 {
1998 mb[0] = ' ';
1999 len = 1;
2000 }
2001
2002 fwrite (mb, 1, len, fd);
2003 }
2004
2005 fputc ('\n', fd);
1907 } 2006 }
2007
1908 pclose_printer (fd); 2008 pclose_printer (fd);
1909#endif 2009#endif
1910} 2010}
1911 2011
1912/* ------------------------------------------------------------------------- */ 2012/* ------------------------------------------------------------------------- */
1913/* 2013/*
1914 * Refresh the screen 2014 * Refresh the screen
1915 * drawn_text/drawn_rend contain the screen information before the update. 2015 * drawn_text/drawn_rend contain the screen information before the update.
1916 * screen.text/screen.rend contain what the screen will change to. 2016 * screen.text/screen.rend contain what the screen will change to.
1917 */ 2017 */
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 2018void
1929rxvt_term::scr_refresh (unsigned char refresh_type) 2019rxvt_term::scr_refresh (unsigned char refresh_type)
1930{ 2020{
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 */ 2021 unsigned char must_clear, /* use draw_string not draw_image_string */
1934 rvid, /* reverse video this position */
1935 showcursor; /* show the cursor */ 2022 showcursor; /* show the cursor */
1936 int16_t col, row, /* column/row we're processing */ 2023 int16_t col, row, /* column/row we're processing */
1937 ocrow; /* old cursor row */ 2024 ocrow; /* old cursor row */
1938 int i, /* tmp */ 2025 int i, /* tmp */
1939 row_offset; /* basic offset in screen structure */ 2026 row_offset; /* basic offset in screen structure */
1940#ifndef NO_CURSORCOLOR 2027#ifndef NO_CURSORCOLOR
1941 rend_t cc1; /* store colours at cursor position (s) */ 2028 rend_t cc1; /* store colours at cursor position (s) */
1942#endif 2029#endif
1943 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2030 rend_t *crp; // cursor rendition pointer
1944 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2031
2032 want_refresh = 0; /* screen is current */
1945 2033
1946 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2034 if (refresh_type == NO_REFRESH || !TermWin.mapped)
1947 return; 2035 return;
1948 2036
1949 /* 2037 /*
1950 * A: set up vars 2038 * A: set up vars
1951 */ 2039 */
1952 clearfirst = clearlast = must_clear = 0; 2040 must_clear = 0;
1953
1954 refresh_count = 0; 2041 refresh_count = 0;
1955 2042
1956 row_offset = TermWin.saveLines - TermWin.view_start; 2043 row_offset = TermWin.saveLines - TermWin.view_start;
1957 2044
1958 if ((refresh_type & REFRESH_BOUNDS))
1959 {
1960 clearfirst = clearlast = 1;
1961 refresh_type &= ~REFRESH_BOUNDS;
1962 }
1963
1964#ifdef XPM_BACKGROUND 2045#if XPM_BACKGROUND
1965 must_clear |= (bgPixmap.pixmap != None); 2046 must_clear |= bgPixmap.pixmap != None;
1966#endif 2047#endif
1967#ifdef TRANSPARENT 2048#if TRANSPARENT
1968 must_clear |= ((Options & Opt_transparent) && am_transparent); 2049 must_clear |= (options & Opt_transparent) && am_transparent;
1969#endif 2050#endif
1970 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2051 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1971 2052
1972 /* 2053 /*
1973 * B: reverse any characters which are selected 2054 * B: reverse any characters which are selected
… …
1988 showcursor = 0; 2069 showcursor = 0;
1989#endif 2070#endif
1990 2071
1991 if (showcursor) 2072 if (showcursor)
1992 { 2073 {
2074 int col = screen.cur.col;
2075
2076 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2077 col--;
2078
1993 srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); 2079 crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
1994 2080
1995 if (showcursor && TermWin.focus) 2081 if (showcursor && TermWin.focus)
1996 { 2082 {
2083 if (options & Opt_cursorUnderline)
2084 *crp ^= RS_Uline;
2085 else
2086 {
1997 *srp ^= RS_RVid; 2087 *crp ^= RS_RVid;
2088
1998#ifndef NO_CURSORCOLOR 2089#ifndef NO_CURSORCOLOR
1999 cc1 = *srp & (RS_fgMask | RS_bgMask); 2090 cc1 = *crp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor)) 2091 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor; 2092 ccol1 = Color_cursor;
2002 else 2093 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2094#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = GET_FGCOLOR (rstyle); 2095 ccol1 = GET_FGCOLOR (rstyle);
2005#else 2096#else
2006 ccol1 = Color_fg; 2097 ccol1 = Color_fg;
2007#endif 2098#endif
2008 if (ISSET_PIXCOLOR (Color_cursor2)) 2099 if (ISSET_PIXCOLOR (Color_cursor2))
2009 ccol2 = Color_cursor2; 2100 ccol2 = Color_cursor2;
2010 else 2101 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2102#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = GET_BGCOLOR (rstyle); 2103 ccol2 = GET_BGCOLOR (rstyle);
2013#else 2104#else
2014 ccol2 = Color_bg; 2105 ccol2 = Color_bg;
2015#endif 2106#endif
2016 *srp = SET_FGCOLOR (*srp, ccol1); 2107 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *srp = SET_BGCOLOR (*srp, ccol2); 2108 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif 2109#endif
2110 }
2019 } 2111 }
2020 } 2112 }
2021 2113
2022 /* make sure no outline cursor is left around */ 2114 /* make sure no outline cursor is left around */
2023 setoldcursor = 0; 2115 setoldcursor = 0;
… …
2049 oldcursor.col = screen.cur.col; 2141 oldcursor.col = screen.cur.col;
2050 } 2142 }
2051 } 2143 }
2052 } 2144 }
2053 2145
2146#if ENABLE_OVERLAY
2147 scr_swap_overlay ();
2148#endif
2149
2150 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */
2151 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */
2152
2054#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2055 /* 2154 /*
2056 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2057 * This has been deliberately kept simple. 2156 * This has been deliberately kept simple.
2058 */ 2157 */
2059 i = num_scr; 2158 i = num_scr;
2159 if (!display->is_local
2060 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2160 && refresh_type == FAST_REFRESH && num_scr_allow && i
2061 && abs (i) < TermWin.nrow && !must_clear) 2161 && abs (i) < TermWin.nrow && !must_clear)
2062 { 2162 {
2063 int16_t nits; 2163 int16_t nits;
2064 int j; 2164 int j;
2065 rend_t *drp2;
2066 text_t *dtp2;
2067 int len, wlen; 2165 int len, wlen;
2068 2166
2069 j = TermWin.nrow; 2167 j = TermWin.nrow;
2070 wlen = len = -1; 2168 wlen = len = -1;
2071 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2072 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2170 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2073 { 2171 {
2074 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2172 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow)
2075 { 2173 {
2076 stp = screen.text[row + row_offset]; 2174 text_t *stp = screen.text[row + row_offset];
2077 srp = screen.rend[row + row_offset]; 2175 rend_t *srp = screen.rend[row + row_offset];
2078 dtp = drawn_text[row]; 2176 text_t *dtp = drawn_text[row];
2079 dtp2 = drawn_text[row + i]; 2177 text_t *dtp2 = drawn_text[row + i];
2080 drp = drawn_rend[row]; 2178 rend_t *drp = drawn_rend[row];
2081 drp2 = drawn_rend[row + i]; 2179 rend_t *drp2 = drawn_rend[row + i];
2082 2180
2083 for (nits = 0, col = TermWin.ncol; col--; ) 2181 for (nits = 0, col = TermWin.ncol; col--; )
2084 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2182 if (stp[col] != dtp2[col] || srp[col] != drp2[col])
2085 nits--; 2183 nits--;
2086 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2184 else if (stp[col] != dtp[col] || srp[col] != drp[col])
… …
2106 { 2204 {
2107 /* also comes here at end if needed because of >= above */ 2205 /* also comes here at end if needed because of >= above */
2108 if (wlen < len) 2206 if (wlen < len)
2109 SWAP_IT (wlen, len, int); 2207 SWAP_IT (wlen, len, int);
2110 2208
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, 2209 XCopyArea (display->display, TermWin.vt, TermWin.vt,
2113 TermWin.gc, 0, Row2Pixel (len + i), 2210 TermWin.gc, 0, Row2Pixel (len + i),
2114 (unsigned int)TermWin_TotalWidth (), 2211 (unsigned int)TermWin_TotalWidth (),
2115 (unsigned int)Height2Pixel (wlen - len + 1), 2212 (unsigned int)Height2Pixel (wlen - len + 1),
2116 0, Row2Pixel (len)); 2213 0, Row2Pixel (len));
… …
2123 /* 2220 /*
2124 * E: main pass across every character 2221 * E: main pass across every character
2125 */ 2222 */
2126 for (row = 0; row < TermWin.nrow; row++) 2223 for (row = 0; row < TermWin.nrow; row++)
2127 { 2224 {
2128 stp = screen.text[row + row_offset]; 2225 text_t *stp = screen.text[row + row_offset];
2129 srp = screen.rend[row + row_offset]; 2226 rend_t *srp = screen.rend[row + row_offset];
2130 dtp = drawn_text[row]; 2227 text_t *dtp = drawn_text[row];
2131 drp = drawn_rend[row]; 2228 rend_t *drp = drawn_rend[row];
2132 2229
2133 /* 2230 /*
2134 * E2: OK, now the real pass 2231 * E2: OK, now the real pass
2135 */ 2232 */
2136 int ypixel = (int)Row2Pixel (row); 2233 int ypixel = (int)Row2Pixel (row);
2137 2234
2138 for (col = 0; col < TermWin.ncol; col++) 2235 for (col = 0; col < TermWin.ncol; col++)
2139 { 2236 {
2140 /* compare new text with old - if exactly the same then continue */ 2237 /* compare new text with old - if exactly the same then continue */
2141 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2238 if (stp[col] == dtp[col] /* Must match characters to skip. */
2142 && (srp[col] == drp[col] /* Either rendition the same or */ 2239 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2143 || (stp[col] == ' ' /* space w/ no background change */ 2240 || (stp[col] == ' ' /* space w/ no background change */
2144 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2241 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2145 continue; 2242 continue;
2146 2243
2147 // redraw one or more characters 2244 // redraw one or more characters
2148 2245
2149 // seek to the beginning if wide characters 2246 // seek to the beginning of wide characters
2150 while (stp[col] == NOCHAR && col > 0) 2247 while (stp[col] == NOCHAR && col > 0)
2151 --col; 2248 --col;
2152 2249
2153 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2154 text_t *text = stp + col; 2251 text_t *text = stp + col;
… …
2157 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2158 drp[col] = rend; 2255 drp[col] = rend;
2159 2256
2160 int xpixel = Col2Pixel (col); 2257 int xpixel = Col2Pixel (col);
2161 2258
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; ) 2259 for (i = 0; ++col < TermWin.ncol; )
2165 { 2260 {
2166 if (stp[col] == NOCHAR) 2261 if (stp[col] == NOCHAR)
2167 { 2262 {
2168 dtp[col] = stp[col]; 2263 dtp[col] = stp[col];
2169 drp[col] = rend; 2264 drp[col] = rend;
2170 count++; 2265 count++;
2171
2172 if (i) // only possible skip if char unchanged
2173 i++; 2266 i++;
2174 2267
2175 continue; 2268 continue;
2176 } 2269 }
2177 2270
2178 if (rend != srp[col]) 2271 if (!RS_SAME (rend, srp[col]))
2179 break; 2272 break;
2180 2273
2181 count++; 2274 count++;
2182 2275
2183 if (stp[col] != dtp[col] 2276 if (stp[col] != dtp[col]
2184 || srp[col] != drp[col]) 2277 || !RS_SAME (srp[col], drp[col]))
2185 { 2278 {
2186 if (must_clear && (i++ > (count / 2))) 2279 if (must_clear && (i++ > count / 2))
2187 break; 2280 break;
2188 2281
2189 dtp[col] = stp[col]; 2282 dtp[col] = stp[col];
2190 drp[col] = rend; 2283 drp[col] = rend;
2191 i = 0; 2284 i = 0;
2192 } 2285 }
2193 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2286 else if (must_clear || (stp[col] != ' ' && ++i >= 16))
2194 break; 2287 break;
2195 } 2288 }
2196 2289
2197 col--; /* went one too far. move back */ 2290 col--; /* went one too far. move back */
2198 count -= i; /* dump any matching trailing chars */ 2291 count -= i; /* dump any matching trailing chars */
2292
2293 // sometimes we optimize away the trailing NOCHAR's, add them back
2294 while (i && text[count] == NOCHAR)
2295 count++, i--;
2296
2297#if ENABLE_STYLES
2298 // force redraw after "careful" characters to avoid pixel droppings
2299 if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0)
2300 drp[col + 1] = ~srp[col + 1];
2301
2302 // include previous careful character(s) if possible, looks nicer (best effort...)
2303 while (text > stp
2304 && srp[text - stp - 1] & RS_Careful
2305 && RS_SAME (rend, srp[text - stp - 1]))
2306 text--, count++, xpixel -= TermWin.fwidth;
2307#endif
2199 2308
2200 /* 2309 /*
2201 * Determine the attributes for the string 2310 * Determine the attributes for the string
2202 */ 2311 */
2203 int fid = GET_FONT (rend);
2204 int fore = GET_FGCOLOR (rend); // desired foreground 2312 int fore = GET_FGCOLOR (rend); // desired foreground
2205 int back = GET_BGCOLOR (rend); // desired background 2313 int back = GET_BGCOLOR (rend); // desired background
2206 2314
2207 rend = GET_ATTR (rend); 2315 // only do special processing if ana attributes are set, which is rare
2208 2316 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink))
2209 rvid = !!(rend & RS_RVid); 2317 {
2318 bool invert = rend & RS_RVid;
2210 2319
2211#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2212 if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) 2321 if (rend & RS_Bold
2322 && fore == Color_fg)
2213 { 2323 {
2214 if (ISSET_PIXCOLOR (Color_BD)) 2324 if (ISSET_PIXCOLOR (Color_BD))
2215 fore = Color_BD; 2325 fore = Color_BD;
2326# if !ENABLE_STYLES
2216 else 2327 else
2217 rvid = !rvid; 2328 invert = !invert;
2329# endif
2330 }
2331
2332 if (rend & RS_Italic
2333 && fore == Color_fg)
2334 {
2335 if (ISSET_PIXCOLOR (Color_IT))
2336 fore = Color_IT;
2337# if !ENABLE_STYLES
2338 else
2339 invert = !invert;
2340# endif
2341 }
2342
2343 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL))
2344 fore = Color_UL;
2345#endif
2346
2347 if (invert)
2348 {
2349 SWAP_IT (fore, back, int);
2350
2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2352 if (ISSET_PIXCOLOR (Color_RV))
2353 back = Color_RV;
2354#endif
2355 }
2356
2357#ifdef TEXT_BLINK
2358 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2359 {
2360 if (!text_blink_ev.active)
2361 {
2362 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2363 hidden_text = 0;
2364 }
2365 else if (hidden_text)
2366 fore = back;
2367 }
2368#endif
2218 } 2369 }
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 2370
2252 /* 2371 /*
2253 * Actually do the drawing of the string here 2372 * Actually do the drawing of the string here
2254 */ 2373 */
2255 rxvt_font *font = (*TermWin.fontset)[fid]; 2374 rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2256 2375
2257 if (back == fore) 2376 if (back == fore)
2258 font->clear_rect (*TermWin.drawable, xpixel, ypixel, 2377 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2259 TermWin.fwidth * count, TermWin.fheight, 2378 TermWin.fwidth * count, TermWin.fheight,
2260 back); 2379 back);
… …
2275 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2394 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg);
2276 } 2395 }
2277 else 2396 else
2278 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2397 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
2279 2398
2280 if ((rend & RS_Uline) && (font->descent > 1)) 2399 if (rend & RS_Uline && font->descent > 1 && fore != back)
2400 {
2401#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
2404 else
2405#endif
2406 XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
2407
2281 XDrawLine (display->display, drawBuffer, TermWin.gc, 2408 XDrawLine (display->display, drawBuffer, TermWin.gc,
2282 xpixel, ypixel + font->ascent + 1, 2409 xpixel, ypixel + font->ascent + 1,
2283 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 }
2284 } /* for (col....) */ 2412 } /* for (col....) */
2285 } /* for (row....) */ 2413 } /* for (row....) */
2414
2415#if ENABLE_OVERLAY
2416 scr_swap_overlay ();
2417#endif
2286 2418
2287 /* 2419 /*
2288 * G: cleanup cursor and display outline cursor if necessary 2420 * G: cleanup cursor and display outline cursor if necessary
2289 */ 2421 */
2290 if (showcursor) 2422 if (showcursor)
2291 { 2423 {
2292 if (TermWin.focus) 2424 if (TermWin.focus)
2293 { 2425 {
2294 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2426 if (options & Opt_cursorUnderline)
2295 [screen.cur.col]); 2427 *crp ^= RS_Uline;
2428 else
2429 {
2296 *srp ^= RS_RVid; 2430 *crp ^= RS_RVid;
2297#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2298 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2432 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2299#endif 2433#endif
2434 }
2300 } 2435 }
2301 else if (oldcursor.row >= 0) 2436 else if (oldcursor.row >= 0)
2302 { 2437 {
2438 int cursorwidth = 1;
2439 int col = oldcursor.col;
2440
2441 while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
2442 col--;
2443
2444 while (col + cursorwidth < TermWin.ncol
2445 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
2446 cursorwidth++;
2447
2303#ifndef NO_CURSORCOLOR 2448#ifndef NO_CURSORCOLOR
2304 if (ISSET_PIXCOLOR (Color_cursor)) 2449 if (ISSET_PIXCOLOR (Color_cursor))
2305 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2450 XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
2306#endif 2451#endif
2307 int cursorwidth = 1;
2308 while (oldcursor.col + cursorwidth < TermWin.ncol
2309 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2310 cursorwidth++;
2311 2452
2312 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2453 XDrawRectangle (display->display, drawBuffer, TermWin.gc,
2313 Col2Pixel (oldcursor.col), 2454 Col2Pixel (col),
2314 Row2Pixel (oldcursor.row), 2455 Row2Pixel (oldcursor.row),
2315 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2456 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2316 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2457 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
2317 } 2458 }
2318 } 2459 }
… …
2320 /* 2461 /*
2321 * H: cleanup selection 2462 * H: cleanup selection
2322 */ 2463 */
2323 scr_reverse_selection (); 2464 scr_reverse_selection ();
2324 2465
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) 2466 if (refresh_type & SMOOTH_REFRESH)
2350 XSync (display->display, False); 2467 XFlush (display->display);
2351 2468
2352 num_scr = 0; 2469 num_scr = 0;
2353 num_scr_allow = 1; 2470 num_scr_allow = 1;
2354 want_refresh = 0; /* screen is current */
2355} 2471}
2356 2472
2357void 2473void
2358rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2474rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp)
2359{ 2475{
2360 if (!rp || !tp) 2476 if (!rp || !tp)
2361 return; 2477 return;
2362 2478
2363 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2479 for (int i = TermWin.ncol; i; i--, rp++, tp++)
2364 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); 2480 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
2365} 2481}
2366 2482
2367void 2483void
2368rxvt_term::scr_remap_chars () 2484rxvt_term::scr_remap_chars ()
2369{ 2485{
… …
2375 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2491 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2376 scr_remap_chars (swap.text[i], swap.rend[i]); 2492 scr_remap_chars (swap.text[i], swap.rend[i]);
2377 } 2493 }
2378} 2494}
2379 2495
2496void
2497rxvt_term::scr_recolour ()
2498{
2499 if (1
2500#if TRANSPARENT
2501 && !am_transparent
2502#endif
2503#if XPM_BACKGROUND
2504 && !bgPixmap.pixmap
2505#endif
2506 )
2507 {
2508 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]);
2509 XClearWindow (display->display, TermWin.parent[0]);
2510 XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]);
2511#if HAVE_SCROLLBARS
2512 if (scrollBar.win)
2513 {
2514 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.setIdle ();
2516 scrollbar_show (0);
2517 }
2518#endif
2519 }
2520
2521 scr_clear ();
2522 scr_touch (true);
2523 want_refresh = 1;
2524}
2525
2380/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2381void 2527void
2382rxvt_term::scr_clear (bool really) 2528rxvt_term::scr_clear (bool really)
2383{ 2529{
2384 if (!TermWin.mapped) 2530 if (!TermWin.mapped)
2385 return; 2531 return;
2386 2532
2387 num_scr_allow = 0; 2533 num_scr_allow = 0;
2388 want_refresh = 1; 2534 want_refresh = 1;
2389 2535
2390#ifdef TRANSPARENT 2536#if TRANSPARENT
2391 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2537 if ((options & Opt_transparent) && (am_pixmap_trans == 0))
2392 { 2538 {
2393 int i; 2539 int i;
2394 2540
2395 if (! (Options & Opt_transparent_all)) 2541 if (!(options & Opt_transparent_all))
2396 i = 0; 2542 i = 0;
2397 else 2543 else
2398 i = (int) (sizeof (TermWin.parent) / sizeof (Window)); 2544 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2399 2545
2400 while (i--) 2546 while (i--)
… …
2416 int end_row = TermWin.saveLines - TermWin.view_start; 2562 int end_row = TermWin.saveLines - TermWin.view_start;
2417 int i = selection.beg.row + TermWin.saveLines; 2563 int i = selection.beg.row + TermWin.saveLines;
2418 int col, row = selection.end.row + TermWin.saveLines; 2564 int col, row = selection.end.row + TermWin.saveLines;
2419 rend_t *srp; 2565 rend_t *srp;
2420 2566
2421 if (i >= end_row) 2567#if ENABLE_FRILLS
2422 col = selection.beg.col; 2568 if (selection.rect)
2569 {
2570 end_row += TermWin.nrow;
2571
2572 for (; i <= row && i <= end_row; i++)
2573 for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++)
2574 srp[col] ^= RS_RVid;
2575 }
2423 else 2576 else
2577#endif
2578 {
2579 if (i >= end_row)
2580 col = selection.beg.col;
2581 else
2424 { 2582 {
2425 col = 0; 2583 col = 0;
2426 i = end_row; 2584 i = end_row;
2427 } 2585 }
2428 2586
2429 end_row += TermWin.nrow; 2587 end_row += TermWin.nrow;
2588
2430 for (; i < row && i < end_row; i++, col = 0) 2589 for (; i < row && i < end_row; i++, col = 0)
2431 for (srp = screen.rend[i]; col < TermWin.ncol; col++) 2590 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2432 srp[col] ^= RS_RVid; 2591 srp[col] ^= RS_RVid;
2433 2592
2434 if (i == row && i < end_row) 2593 if (i == row && i < end_row)
2435 for (srp = screen.rend[i]; col < selection.end.col; col++) 2594 for (srp = screen.rend[i]; col < selection.end.col; col++)
2436 srp[col] ^= RS_RVid; 2595 srp[col] ^= RS_RVid;
2596 }
2437 } 2597 }
2438} 2598}
2439 2599
2440/* ------------------------------------------------------------------------- */ 2600/* ------------------------------------------------------------------------- */
2441/* 2601/*
… …
2477 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 2637 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2478 */ 2638 */
2479void 2639void
2480rxvt_term::selection_check (int check_more) 2640rxvt_term::selection_check (int check_more)
2481{ 2641{
2482 row_col_t pos; 2642 row_col_t pos;
2483 2643
2484 if (!selection.op) 2644 if (!selection.op)
2485 return; 2645 return;
2486 2646
2487 pos.row = pos.col = 0; 2647 pos.row = pos.col = 0;
… …
2509/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2510/* 2670/*
2511 * Paste a selection direct to the command fd 2671 * Paste a selection direct to the command fd
2512 */ 2672 */
2513void 2673void
2514rxvt_term::paste (const unsigned char *data, unsigned int len) 2674rxvt_term::paste (unsigned char *data, unsigned int len)
2515{ 2675{
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 */ 2676 /* convert normal newline chars into common keyboard Return key sequence */
2525 for (i = 0; i < len; i += PROP_SIZE) 2677 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) 2678 if (data[i] == C0_LF)
2532 ds[j] = C0_CR; 2679 data[i] = C0_CR;
2533 2680
2534 tt_write (ds, (int)n); 2681 tt_write (data, len);
2535 }
2536
2537 free (ds);
2538} 2682}
2539 2683
2540/* ------------------------------------------------------------------------- */ 2684/* ------------------------------------------------------------------------- */
2541/* 2685/*
2542 * Respond to a notification that a primary selection has been sent 2686 * Respond to a notification that a primary selection has been sent
2543 * EXT: SelectionNotify 2687 * EXT: SelectionNotify
2544 */ 2688 */
2545int 2689void
2546rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2690rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2547{ 2691{
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 */ 2692 if (prop == None) /* check for failed XConvertSelection */
2555 { 2693 {
2556 if ((selection_type & Sel_CompoundText)) 2694 if ((selection_type & Sel_CompoundText))
2557 { 2695 {
2558 int selnum = selection_type & Sel_whereMask; 2696 int selnum = selection_type & Sel_whereMask;
… …
2571 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2709 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2572 else 2710 else
2573 selection_type = 0; 2711 selection_type = 0;
2574 } 2712 }
2575 2713
2576 return 0; 2714 return;
2577 }
2578
2579 for (;;)
2580 { 2715 }
2716
2717 unsigned long bytes_after;
2718 XTextProperty ct;
2719
2720 if (XGetWindowProperty (display->display, win, prop,
2721 0, PROP_SIZE / 4,
2722 delete_prop, AnyPropertyType,
2723 &ct.encoding, &ct.format,
2724 &ct.nitems, &bytes_after,
2725 &ct.value) != Success)
2726 {
2727 ct.value = 0;
2728 goto bailout;
2729 }
2730
2731 if (ct.encoding == None)
2732 goto bailout;
2733
2734 if (bytes_after)
2735 {
2736 // fetch and append remaining data
2737 XTextProperty ct2;
2738
2581 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2739 if (XGetWindowProperty (display->display, win, prop,
2582 (long) (PROP_SIZE / 4), delete_prop, 2740 ct.nitems / 4, (bytes_after + 3) / 4,
2741 delete_prop, AnyPropertyType,
2583 AnyPropertyType, &ct.encoding, &ct.format, 2742 &ct2.encoding, &ct2.format,
2584 &ct.nitems, &bytes_after, 2743 &ct2.nitems, &bytes_after,
2585 &ct.value) != Success) 2744 &ct2.value) != Success)
2586 break; 2745 goto bailout;
2587 2746
2588 if (ct.encoding == 0) 2747 // realloc should be compatible to XFree, here, and elsewhere, too
2589 { 2748 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2590 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2749 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2591 break; 2750 ct.nitems += ct2.nitems;
2592 }
2593 2751
2752 XFree (ct2.value);
2753 }
2754
2594 if (ct.value == NULL) 2755 if (ct.value == 0)
2595 { 2756 goto bailout;
2596 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2597 continue;
2598 }
2599 2757
2758 if (ct.encoding == xa[XA_INCR])
2759 {
2760 // INCR selection, start handshake
2761 if (!delete_prop)
2762 XDeleteProperty (display->display, win, prop);
2763
2764 selection_wait = Sel_incr;
2765 incr_buf_fill = 0;
2766 incr_ev.start (NOW + 10);
2767
2768 goto bailout;
2769 }
2770
2600 if (ct.nitems == 0) 2771 if (ct.nitems == 0)
2772 {
2773 if (selection_wait == Sel_incr)
2774 {
2775 XFree (ct.value);
2776
2777 // finally complete, now paste the whole thing
2778 selection_wait = Sel_normal;
2779 ct.value = (unsigned char *)incr_buf;
2780 ct.nitems = incr_buf_fill;
2781 incr_buf = 0;
2782 incr_buf_size = 0;
2783 incr_ev.stop ();
2601 { 2784 }
2602 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2785 else
2603 2786 {
2604 if (selection_wait == Sel_normal && nread == 0 2787 if (selection_wait == Sel_normal
2605 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2788 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2606 { 2789 {
2607 /* 2790 /*
2608 * pass through again trying CUT_BUFFER0 if we've come from 2791 * pass through again trying CUT_BUFFER0 if we've come from
2609 * XConvertSelection () but nothing was presented 2792 * XConvertSelection () but nothing was presented
2610 */ 2793 */
2611 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2612 selection_paste (display->root, XA_CUT_BUFFER0, False); 2794 selection_paste (display->root, XA_CUT_BUFFER0, False);
2613 } 2795 }
2614 2796
2615 nread = -1; /* discount any previous stuff */ 2797 goto bailout;
2616 break; 2798 }
2799 }
2800 else if (selection_wait == Sel_incr)
2801 {
2802 incr_ev.start (NOW + 10);
2803
2804 while (incr_buf_fill + ct.nitems > incr_buf_size)
2617 } 2805 {
2806 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2807 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2808 }
2618 2809
2810 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2619 nread += ct.nitems; 2811 incr_buf_fill += ct.nitems;
2620 2812
2813 goto bailout;
2814 }
2815
2621 char **cl; 2816 char **cl;
2622 int cr; 2817 int cr;
2818
2819#if ENABLE_FRILLS
2820 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2821 // so recode it manually
2822 if (ct.encoding == xa[XA_UTF8_STRING])
2823 {
2824 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2825 char *s = rxvt_wcstombs (w);
2826 free (w);
2827 // TODO: strlen == only the first element will be converted. well...
2828 paste ((unsigned char *)s, strlen (s));
2829 free (s);
2830 }
2831 else
2832#endif
2623 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) 2833 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2624 { 2834 && cl)
2835 {
2625 for (int i = 0; i < cr; i++) 2836 for (int i = 0; i < cr; i++)
2626 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2837 paste ((unsigned char *)cl[i], strlen (cl[i]));
2627 2838
2628 XFreeStringList (cl); 2839 XFreeStringList (cl);
2629 } 2840 }
2630 else 2841 else
2631 paste (ct.value, ct.nitems); 2842 paste (ct.value, ct.nitems); // paste raw
2632 2843
2633 if (bytes_after == 0) 2844bailout:
2634 break;
2635
2636 XFree (ct.value);
2637 }
2638
2639 if (ct.value)
2640 XFree (ct.value); 2845 XFree (ct.value);
2641 2846
2642 if (selection_wait == Sel_normal) 2847 if (selection_wait == Sel_normal)
2643 selection_wait = Sel_none; 2848 selection_wait = Sel_none;
2644
2645 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2646 return (int)nread;
2647} 2849}
2648 2850
2649void 2851void
2650rxvt_term::incr_cb (time_watcher &w) 2852rxvt_term::incr_cb (time_watcher &w)
2651{ 2853{
2652 selection_wait = Sel_none; 2854 selection_wait = Sel_none;
2653 2855
2856 incr_buf_size = 0;
2857 free (incr_buf);
2858
2654 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2859 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2655} 2860}
2656 2861
2657/*
2658 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2659 */
2660void 2862void
2661rxvt_term::selection_property (Window win, Atom prop) 2863rxvt_term::selection_property (Window win, Atom prop)
2662{ 2864{
2663 int reget_time = 0; 2865 if (prop == None || selection_wait != Sel_incr)
2664
2665 if (prop == None)
2666 return; 2866 return;
2667 2867
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) 2868 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} 2869}
2710 2870
2711/* ------------------------------------------------------------------------- */ 2871/* ------------------------------------------------------------------------- */
2712/* 2872/*
2713 * Request the current selection: 2873 * Request the current selection:
… …
2719 * EXT: button 2 release 2879 * EXT: button 2 release
2720 */ 2880 */
2721void 2881void
2722rxvt_term::selection_request (Time tm, int x, int y) 2882rxvt_term::selection_request (Time tm, int x, int y)
2723{ 2883{
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) 2884 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2727 return; /* outside window */ 2885 return; /* outside window */
2728 2886
2729 if (selection.text) 2887 if (selection.text)
2730 { /* internal selection */ 2888 { /* internal selection */
2731 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2732 char *str = rxvt_wcstombs (selection.text, selection.len); 2889 char *str = rxvt_wcstombs (selection.text, selection.len);
2733 paste ((unsigned char *)str, strlen (str)); 2890 paste ((unsigned char *)str, strlen (str));
2734 free (str); 2891 free (str);
2735 return; 2892 return;
2736 } 2893 }
… …
2750#else 2907#else
2751 selection_type = Sel_CompoundText; 2908 selection_type = Sel_CompoundText;
2752 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2753 return; 2910 return;
2754#endif 2911#endif
2755
2756 } 2912 }
2757 } 2913 }
2758 2914
2759 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2915 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); 2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2762} 2917}
2763 2918
2764int 2919int
2765rxvt_term::selection_request_other (Atom target, int selnum) 2920rxvt_term::selection_request_other (Atom target, int selnum)
2766{ 2921{
2767 Atom sel; 2922 Atom sel;
2768#ifdef DEBUG_SELECT
2769 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2770#endif
2771 2923
2772 selection_type |= selnum; 2924 selection_type |= selnum;
2773 2925
2774 if (selnum == Sel_Primary) 2926 if (selnum == Sel_Primary)
2775 sel = XA_PRIMARY; 2927 sel = XA_PRIMARY;
… …
2778 else 2930 else
2779 sel = xa[XA_CLIPBOARD]; 2931 sel = xa[XA_CLIPBOARD];
2780 2932
2781 if (XGetSelectionOwner (display->display, sel) != None) 2933 if (XGetSelectionOwner (display->display, sel) != None)
2782 { 2934 {
2783 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2784 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2935 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2785 TermWin.vt, selection_request_time); 2936 TermWin.vt, selection_request_time);
2786 return 1; 2937 return 1;
2787 } 2938 }
2788 2939
… …
2795 * EXT: SelectionClear 2946 * EXT: SelectionClear
2796 */ 2947 */
2797void 2948void
2798rxvt_term::selection_clear () 2949rxvt_term::selection_clear ()
2799{ 2950{
2800 D_SELECT ((stderr, "rxvt_selection_clear ()"));
2801
2802 want_refresh = 1; 2951 want_refresh = 1;
2803 free (selection.text); 2952 free (selection.text);
2804 selection.text = NULL; 2953 selection.text = NULL;
2805 selection.len = 0; 2954 selection.len = 0;
2806 CLEAR_SELECTION (); 2955 CLEAR_SELECTION ();
… …
2819{ 2968{
2820 int i, col, end_col, row, end_row; 2969 int i, col, end_col, row, end_row;
2821 wchar_t *new_selection_text; 2970 wchar_t *new_selection_text;
2822 text_t *t; 2971 text_t *t;
2823 2972
2824 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2825 switch (selection.op) 2973 switch (selection.op)
2826 { 2974 {
2827 case SELECTION_CONT: 2975 case SELECTION_CONT:
2828 break; 2976 break;
2829 case SELECTION_INIT: 2977 case SELECTION_INIT:
… …
2843 2991
2844 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 2992 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1);
2845 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2993 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2846 2994
2847 col = selection.beg.col; 2995 col = selection.beg.col;
2848 MAX_IT (col, 0);
2849 row = selection.beg.row + TermWin.saveLines; 2996 row = selection.beg.row + TermWin.saveLines;
2850 end_row = selection.end.row + TermWin.saveLines; 2997 end_row = selection.end.row + TermWin.saveLines;
2851 int ofs = 0; 2998 int ofs = 0;
2852 int extra = 0; 2999 int extra = 0;
2853 3000
2854 for (; row <= end_row; row++, col = 0) 3001 for (; row <= end_row; row++, col = 0)
2855 { 3002 {
2856 t = &(screen.text[row][col]);
2857
2858 end_col = screen.tlen[row]; 3003 end_col = screen.tlen[row];
3004
3005#if ENABLE_FRILLS
3006 if (selection.rect)
3007 {
3008 col = selection.beg.col;
3009 end_col = TermWin.ncol + 1;
3010 }
3011#endif
3012
3013 MAX_IT (col, 0);
2859 3014
2860 if (end_col == -1) 3015 if (end_col == -1)
2861 end_col = TermWin.ncol; 3016 end_col = TermWin.ncol;
2862 3017
2863 if (row == end_row) 3018 if (row == end_row || selection.rect)
2864 MIN_IT (end_col, selection.end.col); 3019 MIN_IT (end_col, selection.end.col);
2865 3020
3021 t = &screen.text[row][col];
2866 for (; col < end_col; col++) 3022 for (; col < end_col; col++)
2867 { 3023 {
2868 if (*t == NOCHAR) 3024 if (*t == NOCHAR)
2869 t++; 3025 t++;
2870#if ENABLE_COMBINING 3026#if ENABLE_COMBINING
… …
2918#if 0 3074#if 0
2919 XTextProperty ct; 3075 XTextProperty ct;
2920 3076
2921 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3077 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2922 { 3078 {
2923 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3079 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2924 PropModeReplace, ct.value, ct.nitems);
2925 XFree (ct.value); 3080 XFree (ct.value);
2926 } 3081 }
2927#endif 3082#endif
2928 3083
2929 selection_time = tm; 3084 selection_time = tm;
2930 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2931} 3085}
2932 3086
2933/* ------------------------------------------------------------------------- */ 3087/* ------------------------------------------------------------------------- */
2934/* 3088/*
2935 * Mark or select text based upon number of clicks: 1, 2, or 3 3089 * Mark or select text based upon number of clicks: 1, 2, or 3
2936 * EXT: button 1 press 3090 * EXT: button 1 press
2937 */ 3091 */
2938void 3092void
2939rxvt_term::selection_click (int clicks, int x, int y) 3093rxvt_term::selection_click (int clicks, int x, int y)
2940{ 3094{
2941 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2942
2943 clicks = ((clicks - 1) % 3) + 1; 3095 clicks = ((clicks - 1) % 3) + 1;
2944 selection.clicks = clicks; /* save clicks so extend will work */ 3096 selection.clicks = clicks; /* save clicks so extend will work */
2945 3097
2946 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3098 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2947 3099
… …
2989 * We now only find out the boundary in one direction 3141 * We now only find out the boundary in one direction
2990 */ 3142 */
2991 3143
2992/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3144/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2993#define DELIMIT_TEXT(x) \ 3145#define DELIMIT_TEXT(x) \
2994 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) 3146 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2995#define DELIMIT_REND(x) 1 3147#define DELIMIT_REND(x) 1
2996 3148
2997void 3149void
2998rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3150rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret)
2999{ 3151{
… …
3017 3169
3018 row = mark->row + TermWin.saveLines; 3170 row = mark->row + TermWin.saveLines;
3019 col = mark->col; 3171 col = mark->col;
3020 MAX_IT (col, 0); 3172 MAX_IT (col, 0);
3021 /* find the edge of a word */ 3173 /* find the edge of a word */
3022 stp = & (screen.text[row][col]); 3174 stp = &screen.text[row][col];
3023 w1 = DELIMIT_TEXT (*stp); 3175 w1 = DELIMIT_TEXT (*stp);
3024 3176
3025 srp = (&screen.rend[row][col]); 3177 srp = &screen.rend[row][col];
3026 w2 = DELIMIT_REND (*srp); 3178 w2 = DELIMIT_REND (*srp);
3027 3179
3028 for (;;) 3180 for (;;)
3029 { 3181 {
3030 for (; col != bound.col; col += dirnadd) 3182 for (; col != bound.col; col += dirnadd)
… …
3064 } 3216 }
3065 break; 3217 break;
3066 } 3218 }
3067 3219
3068Old_Word_Selection_You_Die: 3220Old_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) 3221 if (dirn == DN)
3072 col++; /* put us on one past the end */ 3222 col++; /* put us on one past the end */
3073 3223
3074 /* Poke the values back in */ 3224 /* Poke the values back in */
3075 ret->row = row - TermWin.saveLines; 3225 ret->row = row - TermWin.saveLines;
… …
3109 /* select nothing */ 3259 /* select nothing */
3110 selection.beg.row = selection.end.row = 0; 3260 selection.beg.row = selection.end.row = 0;
3111 selection.beg.col = selection.end.col = 0; 3261 selection.beg.col = selection.end.col = 0;
3112 selection.clicks = 4; 3262 selection.clicks = 4;
3113 want_refresh = 1; 3263 want_refresh = 1;
3114 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3115 return; 3264 return;
3116 } 3265 }
3117 3266
3118 if (selection.clicks == 4) 3267 if (selection.clicks == 4)
3119 selection.clicks = 1; 3268 selection.clicks = 1;
… …
3135 row_col_t pos; 3284 row_col_t pos;
3136 enum { 3285 enum {
3137 LEFT, RIGHT 3286 LEFT, RIGHT
3138 } closeto = RIGHT; 3287 } closeto = RIGHT;
3139 3288
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; 3289 want_refresh = 1;
3290
3144 switch (selection.op) 3291 switch (selection.op)
3145 { 3292 {
3146 case SELECTION_INIT: 3293 case SELECTION_INIT:
3147 CLEAR_SELECTION (); 3294 CLEAR_SELECTION ();
3148 selection.op = SELECTION_BEGIN; 3295 selection.op = SELECTION_BEGIN;
… …
3161 selection_start_colrow (col, row); 3308 selection_start_colrow (col, row);
3162 /* FALLTHROUGH */ 3309 /* FALLTHROUGH */
3163 default: 3310 default:
3164 return; 3311 return;
3165 } 3312 }
3313
3166 if (selection.beg.col == selection.end.col 3314 if (selection.beg.col == selection.end.col
3167 && selection.beg.col != selection.mark.col 3315 && selection.beg.col != selection.mark.col
3168 && selection.beg.row == selection.end.row 3316 && selection.beg.row == selection.end.row
3169 && selection.beg.row != selection.mark.row) 3317 && selection.beg.row != selection.mark.row)
3170 { 3318 {
3171 selection.beg.col = selection.end.col = selection.mark.col; 3319 selection.beg.col = selection.end.col = selection.mark.col;
3172 selection.beg.row = selection.end.row = selection.mark.row; 3320 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 } 3321 }
3175 3322
3176 pos.col = col; 3323 pos.col = col;
3177 pos.row = row; 3324 pos.row = row;
3178 3325
… …
3221 } 3368 }
3222 else 3369 else
3223 { /* button1 drag or button3 drag */ 3370 { /* button1 drag or button3 drag */
3224 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3225 { 3372 {
3226 if ((selection.mark.row == selection.end.row) 3373 if (selection.mark.row == selection.end.row
3227 && (selection.mark.col == selection.end.col) 3374 && selection.mark.col == selection.end.col
3375 && clickchange
3228 && clickchange && selection.clicks == 2) 3376 && selection.clicks == 2)
3229 selection.mark.col--; 3377 selection.mark.col--;
3230 3378
3231 selection.beg.row = pos.row; 3379 selection.beg.row = pos.row;
3232 selection.beg.col = pos.col; 3380 selection.beg.col = pos.col;
3233 selection.end.row = selection.mark.row; 3381 selection.end.row = selection.mark.row;
… …
3244 3392
3245 if (selection.clicks == 1) 3393 if (selection.clicks == 1)
3246 { 3394 {
3247 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3395 end_col = screen.tlen[selection.beg.row + TermWin.saveLines];
3248 3396
3249 if (end_col != -1 && selection.beg.col > end_col) 3397 if (selection.beg.col > end_col
3398 && end_col != -1
3399#if ENABLE_FRILLS
3400 && !selection.rect
3401#endif
3250 { 3402 )
3251#if 1
3252 selection.beg.col = ncol; 3403 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 3404
3261 end_col = screen.tlen[selection.end.row + TermWin.saveLines]; 3405 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3262 3406
3263 if (end_col != -1 && selection.end.col > end_col) 3407 if (
3408 selection.end.col > end_col
3409 && end_col != -1
3410#if ENABLE_FRILLS
3411 && !selection.rect
3412#endif
3413 )
3264 selection.end.col = ncol; 3414 selection.end.col = ncol;
3265 } 3415 }
3266 else if (selection.clicks == 2) 3416 else if (selection.clicks == 2)
3267 { 3417 {
3268 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3418 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3269 selection.end.col--; 3419 selection.end.col--;
3270 3420
3271 selection_delimit_word (UP, & (selection.beg), & (selection.beg));
3272 selection_delimit_word (DN, & (selection.end), & (selection.end)); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 selection_delimit_word (DN, &selection.end, &selection.end);
3273 } 3423 }
3274 else if (selection.clicks == 3) 3424 else if (selection.clicks == 3)
3275 { 3425 {
3276#ifndef NO_FRILLS 3426#if ENABLE_FRILLS
3277 if ((Options & Opt_tripleclickwords)) 3427 if (options & Opt_tripleclickwords)
3278 { 3428 {
3279 int end_row; 3429 int end_row;
3280 3430
3281 selection_delimit_word (UP, & (selection.beg), & (selection.beg)); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3282 end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; 3432 end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
3283 3433
3284 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) 3434 for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++)
3285 { 3435 {
3286 end_col = screen.tlen[end_row + TermWin.saveLines]; 3436 end_col = screen.tlen[end_row + TermWin.saveLines];
… …
3297 else 3447 else
3298#endif 3448#endif
3299 { 3449 {
3300 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3450 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3301 selection.mark.col++; 3451 selection.mark.col++;
3452
3302 selection.beg.col = 0; 3453 selection.beg.col = 0;
3303 selection.end.col = ncol; 3454 selection.end.col = ncol;
3455
3456 // select a complete logical line
3457 while (selection.beg.row > -TermWin.saveLines
3458 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
3459 selection.beg.row--;
3460
3461 while (selection.end.row < TermWin.nrow
3462 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
3463 selection.end.row++;
3304 } 3464 }
3305 } 3465 }
3306 3466
3307 if (button3 && buttonpress) 3467 if (button3 && buttonpress)
3308 { /* mark may need to be changed */ 3468 { /* mark may need to be changed */
3309 if (closeto == LEFT) 3469 if (closeto == LEFT)
3310 { 3470 {
3311 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3312 selection.mark.col = selection.end.col 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3313 - (selection.clicks == 2);
3314 } 3473 }
3315 else 3474 else
3316 { 3475 {
3317 selection.mark.row = selection.beg.row; 3476 selection.mark.row = selection.beg.row;
3318 selection.mark.col = selection.beg.col; 3477 selection.mark.col = selection.beg.col;
3319 } 3478 }
3320 } 3479 }
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 3480
3324#ifndef NO_FRILLS 3481#if ENABLE_FRILLS
3482 if (selection.rect && selection.beg.col > selection.end.col)
3483 SWAP_IT (selection.beg.col, selection.end.col, int);
3484#endif
3485}
3486
3487#if ENABLE_FRILLS
3325void 3488void
3326rxvt_term::selection_remove_trailing_spaces () 3489rxvt_term::selection_remove_trailing_spaces ()
3327{ 3490{
3328 int32_t end_col, end_row; 3491 int32_t end_col, end_row;
3329 text_t *stp; 3492 text_t *stp;
3330 3493
3331 end_col = selection.end.col; 3494 end_col = selection.end.col;
3332 end_row = selection.end.row; 3495 end_row = selection.end.row;
3496
3333 for ( ; end_row >= selection.beg.row; ) 3497 for ( ; end_row >= selection.beg.row; )
3334 { 3498 {
3335 stp = screen.text[end_row + TermWin.saveLines]; 3499 stp = screen.text[end_row + TermWin.saveLines];
3500
3336 while (--end_col >= 0) 3501 while (--end_col >= 0)
3337 { 3502 {
3338 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3503 if (stp[end_col] != ' '
3504 && stp[end_col] != '\t'
3505 && stp[end_col] != NOCHAR)
3339 break; 3506 break;
3340 } 3507 }
3508
3341 if (end_col >= 0 3509 if (end_col >= 0
3342 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3510 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1)
3343 { 3511 {
3344 selection.end.col = end_col + 1; 3512 selection.end.col = end_col + 1;
3345 selection.end.row = end_row; 3513 selection.end.row = end_row;
3346 break; 3514 break;
3347 } 3515 }
3516
3348 end_row--; 3517 end_row--;
3349 end_col = TermWin.ncol; 3518 end_col = TermWin.ncol;
3350 } 3519 }
3520
3351 if (selection.mark.row > selection.end.row) 3521 if (selection.mark.row > selection.end.row)
3352 { 3522 {
3353 selection.mark.row = selection.end.row; 3523 selection.mark.row = selection.end.row;
3354 selection.mark.col = selection.end.col; 3524 selection.mark.col = selection.end.col;
3355 } 3525 }
… …
3371 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3541 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3372} 3542}
3373 3543
3374/* ------------------------------------------------------------------------- */ 3544/* ------------------------------------------------------------------------- */
3375/* 3545/*
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 3546 * Respond to a request for our current selection
3385 * EXT: SelectionRequest 3547 * EXT: SelectionRequest
3386 */ 3548 */
3387void 3549void
3388rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3550rxvt_term::selection_send (const XSelectionRequestEvent &rq)
3389{ 3551{
3390 XSelectionEvent ev; 3552 XSelectionEvent ev;
3391 XTextProperty ct; 3553 dDisp;
3392 XICCEncodingStyle style;
3393 Atom target;
3394 3554
3395 ev.type = SelectionNotify; 3555 ev.type = SelectionNotify;
3396 ev.property = None; 3556 ev.property = None;
3397 ev.display = rq.display; 3557 ev.display = rq.display;
3398 ev.requestor = rq.requestor; 3558 ev.requestor = rq.requestor;
… …
3400 ev.target = rq.target; 3560 ev.target = rq.target;
3401 ev.time = rq.time; 3561 ev.time = rq.time;
3402 3562
3403 if (rq.target == xa[XA_TARGETS]) 3563 if (rq.target == xa[XA_TARGETS])
3404 { 3564 {
3405 Atom32 target_list[6]; 3565 Atom target_list[6];
3406 Atom32 *target = target_list; 3566 Atom *target = target_list;
3407 3567
3408 *target++ = (Atom32) xa[XA_TARGETS]; 3568 *target++ = xa[XA_TARGETS];
3409 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3569 *target++ = xa[XA_TIMESTAMP];
3410 *target++ = (Atom32) XA_STRING; 3570 *target++ = XA_STRING;
3411 *target++ = (Atom32) xa[XA_TEXT]; 3571 *target++ = xa[XA_TEXT];
3412 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3572 *target++ = xa[XA_COMPOUND_TEXT];
3413#if X_HAVE_UTF8_STRING 3573#if X_HAVE_UTF8_STRING
3414 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3574 *target++ = xa[XA_UTF8_STRING];
3415#endif 3575#endif
3416 3576
3417 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3577 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
3418 (8 * sizeof (target_list[0])), PropModeReplace, 3578 32, PropModeReplace,
3419 (unsigned char *)target_list, 3579 (unsigned char *)target_list, target - target_list);
3420 target - target_list);
3421 ev.property = rq.property; 3580 ev.property = rq.property;
3422 } 3581 }
3582#if TODO // TODO
3423 else if (rq.target == xa[XA_MULTIPLE]) 3583 else if (rq.target == xa[XA_MULTIPLE])
3424 { 3584 {
3425 /* TODO: Handle MULTIPLE */ 3585 /* TODO: Handle MULTIPLE */
3426 } 3586 }
3587#endif
3427 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3588 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3428 { 3589 {
3429 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3590 XChangeProperty (disp, rq.requestor, rq.property, rq.target,
3430 (8 * sizeof (Time)), PropModeReplace,
3431 (unsigned char *)&selection_time, 1); 3591 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3432 ev.property = rq.property; 3592 ev.property = rq.property;
3433 } 3593 }
3434 else if (rq.target == XA_STRING 3594 else if (rq.target == XA_STRING
3435 || rq.target == xa[XA_TEXT] 3595 || rq.target == xa[XA_TEXT]
3436 || rq.target == xa[XA_COMPOUND_TEXT] 3596 || rq.target == xa[XA_COMPOUND_TEXT]
3437 || rq.target == xa[XA_UTF8_STRING] 3597 || rq.target == xa[XA_UTF8_STRING]
3438 ) 3598 )
3439 { 3599 {
3600 XTextProperty ct;
3601 Atom target = rq.target;
3440 short freect = 0; 3602 short freect = 0;
3441 int selectlen; 3603 int selectlen;
3442 wchar_t *cl; 3604 wchar_t *cl;
3443 3605 enum {
3444 target = rq.target; 3606 enc_string = XStringStyle,
3607 enc_text = XStdICCTextStyle,
3608 enc_compound_text = XCompoundTextStyle,
3609#ifdef X_HAVE_UTF8_STRING
3610 enc_utf8 = XUTF8StringStyle,
3611#else
3612 enc_utf8 = -1,
3613#endif
3614 } style;
3445 3615
3446 if (target == XA_STRING) 3616 if (target == XA_STRING)
3447 // we actually don't do XA_STRING, but who cares, as i18n clients 3617 // we actually don't do XA_STRING, but who cares, as i18n clients
3448 // will ask for another format anyways. 3618 // will ask for another format anyways.
3449 style = XStringStyle; 3619 style = enc_string;
3450 else if (target == xa[XA_TEXT]) 3620 else if (target == xa[XA_TEXT])
3451 style = XStdICCTextStyle; 3621 style = enc_text;
3452 else if (target == xa[XA_COMPOUND_TEXT]) 3622 else if (target == xa[XA_COMPOUND_TEXT])
3453 style = XCompoundTextStyle; 3623 style = enc_compound_text;
3454#if X_HAVE_UTF8_STRING 3624#if ENABLE_FRILLS
3455 else if (target == xa[XA_UTF8_STRING]) 3625 else if (target == xa[XA_UTF8_STRING])
3456 style = XUTF8StringStyle; 3626 style = enc_utf8;
3457#endif 3627#endif
3458 else 3628 else
3459 { 3629 {
3460 target = xa[XA_COMPOUND_TEXT]; 3630 target = xa[XA_COMPOUND_TEXT];
3461 style = XCompoundTextStyle; 3631 style = enc_compound_text;
3462 } 3632 }
3463 3633
3464 if (selection.text) 3634 if (selection.text)
3465 { 3635 {
3466 cl = selection.text; 3636 cl = selection.text;
… …
3470 { 3640 {
3471 cl = L""; 3641 cl = L"";
3472 selectlen = 0; 3642 selectlen = 0;
3473 } 3643 }
3474 3644
3475 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3645#if ENABLE_FRILLS
3476 // manually for XUTF8StringStyle. 3646 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3647 // so recode it manually
3648 if (style == enc_utf8)
3649 {
3650 freect = 1;
3651 ct.encoding = target;
3652 ct.format = 8;
3653 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3654 ct.nitems = strlen ((char *)ct.value);
3655 }
3656 else
3657#endif
3477 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3658 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3478 freect = 1; 3659 freect = 1;
3479 else 3660 else
3480 { 3661 {
3481 /* if we failed to convert then send it raw */ 3662 /* if we failed to convert then send it raw */
3482 ct.value = (unsigned char *)cl; 3663 ct.value = (unsigned char *)cl;
3483 ct.nitems = selectlen; 3664 ct.nitems = selectlen;
3665 ct.encoding = target;
3484 } 3666 }
3485 3667
3486 XChangeProperty (display->display, rq.requestor, rq.property, 3668 XChangeProperty (disp, rq.requestor, rq.property,
3487 target, 8, PropModeReplace, 3669 ct.encoding, 8, PropModeReplace,
3488 ct.value, (int)ct.nitems); 3670 ct.value, (int)ct.nitems);
3489 ev.property = rq.property; 3671 ev.property = rq.property;
3490 3672
3491 if (freect) 3673 if (freect)
3492 XFree (ct.value); 3674 XFree (ct.value);
3493 } 3675 }
3494 3676
3495 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3677 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
3496} 3678}
3497 3679
3498/* ------------------------------------------------------------------------- * 3680/* ------------------------------------------------------------------------- *
3499 * MOUSE ROUTINES * 3681 * MOUSE ROUTINES *
3500 * ------------------------------------------------------------------------- */ 3682 * ------------------------------------------------------------------------- */
… …
3512} 3694}
3513 3695
3514/* ------------------------------------------------------------------------- */ 3696/* ------------------------------------------------------------------------- */
3515#ifdef USE_XIM 3697#ifdef USE_XIM
3516void 3698void
3517rxvt_term::im_set_position (XPoint *pos) 3699rxvt_term::im_set_position (XPoint &pos)
3518{ 3700{
3519 XWindowAttributes xwa; 3701 XWindowAttributes xwa;
3520 3702
3521 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3703 XGetWindowAttributes (display->display, TermWin.vt, &xwa);
3704
3522 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3705 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3523 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3706 pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase;
3524} 3707}
3525
3526#endif 3708#endif
3709
3710#if ENABLE_OVERLAY
3711void
3712rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3713{
3714 if (TermWin.nrow < 3 || TermWin.ncol < 3)
3715 return;
3716
3717 want_refresh = 1;
3718
3719 scr_overlay_off ();
3720
3721 if (x < 0) x = TermWin.ncol - w;
3722 if (y < 0) y = TermWin.nrow - h;
3723
3724 // make space for border
3725 w += 2; MIN_IT (w, TermWin.ncol);
3726 h += 2; MIN_IT (h, TermWin.nrow);
3727
3728 x -= 1; MAX_IT (x, 0);
3729 y -= 1; MAX_IT (y, 0);
3730
3731 MIN_IT (x, TermWin.ncol - w);
3732 MIN_IT (y, TermWin.nrow - h);
3733
3734 ov_x = x; ov_y = y;
3735 ov_w = w; ov_h = h;
3736
3737 ov_text = new text_t *[h];
3738 ov_rend = new rend_t *[h];
3739
3740 for (y = 0; y < h; y++)
3741 {
3742 text_t *tp = ov_text[y] = new text_t[w];
3743 rend_t *rp = ov_rend[y] = new rend_t[w];
3744
3745 text_t t0, t1, t2;
3746 rend_t r = OVERLAY_RSTYLE;
3747
3748 if (y == 0)
3749 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3750 else if (y < h - 1)
3751 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3752 else
3753 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3754
3755 *tp++ = t0;
3756 *rp++ = r;
3757
3758 for (x = w - 2; x > 0; --x)
3759 {
3760 *tp++ = t1;
3761 *rp++ = r;
3762 }
3763
3764 *tp = t2;
3765 *rp = r;
3766 }
3767}
3768
3769void
3770rxvt_term::scr_overlay_off ()
3771{
3772 if (!ov_text)
3773 return;
3774
3775 want_refresh = 1;
3776
3777 for (int y = 0; y < ov_h; y++)
3778 {
3779 delete [] ov_text[y];
3780 delete [] ov_rend[y];
3781 }
3782
3783 delete [] ov_text; ov_text = 0;
3784 delete [] ov_rend; ov_rend = 0;
3785}
3786
3787void
3788rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend)
3789{
3790 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3791 return;
3792
3793 x++, y++;
3794
3795 ov_text[y][x] = text;
3796 ov_rend[y][x] = rend;
3797}
3798
3799void
3800rxvt_term::scr_overlay_set (int x, int y, const char *s)
3801{
3802 while (*s)
3803 scr_overlay_set (x++, y, *s++);
3804}
3805
3806void
3807rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
3808{
3809 while (*s)
3810 {
3811 text_t t = *s++;
3812 int width = wcwidth (t);
3813
3814 while (width--)
3815 {
3816 scr_overlay_set (x++, y, t);
3817 t = NOCHAR;
3818 }
3819 }
3820}
3821
3822void
3823rxvt_term::scr_swap_overlay ()
3824{
3825 if (!ov_text)
3826 return;
3827
3828 int row_offset = ov_y + TermWin.saveLines - TermWin.view_start;
3829
3830 // swap screen mem with overlay
3831 for (int y = ov_h; y--; )
3832 {
3833 text_t *t1 = ov_text[y];
3834 rend_t *r1 = ov_rend[y];
3835
3836 text_t *t2 = screen.text[y + row_offset] + ov_x;
3837 rend_t *r2 = screen.rend[y + row_offset] + ov_x;
3838
3839 for (int x = ov_w; x--; )
3840 {
3841 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3842 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3843 }
3844 }
3845}
3846
3847#endif
3527/* ------------------------------------------------------------------------- */ 3848/* ------------------------------------------------------------------------- */

Diff Legend

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