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.189 by root, Thu Dec 22 15:28:15 2005 UTC vs.
Revision 1.217 by root, Mon Jan 9 19:01:56 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs)
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
254 } 258 }
255 } 259 }
256#endif 260#endif
257 261
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 264
262 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
263 { 266 {
264 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
269 { 272 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 275 }
273 276
277 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 279
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start - nsaved , prev_total_rows);
278 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
279 283
280 if (nsaved) 284 if (nsaved)
281 { 285 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
284 288
285 while (p != pend && q > 0) 289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
292 do
286 { 293 {
287 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
288#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
289 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
290#endif 297#endif
291 298 int plines = 1;
292 int llen = old_buf [MOD (p, prev_total_rows)].l; 299 int llen = old_buf [MOD (p, prev_total_rows)].l;
293 300
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 302 {
296 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
297 304
305 plines++;
298 llen += prev_ncol; 306 llen += prev_ncol;
299 } 307 }
300 308
301 int qlines = max (0, (llen - 1) / ncol) + 1; 309 int qlines = max (0, (llen - 1) / ncol) + 1;
302 310
… …
312 // re-assemble the full line by destination lines 320 // re-assemble the full line by destination lines
313 for (int qrow = q; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
314 { 322 {
315 qline = row_buf + qrow; 323 qline = row_buf + qrow;
316 lalloc (*qline); 324 lalloc (*qline);
325 qline->l = ncol;
317 qline->set_is_longer (); 326 qline->is_longer (1);
318 327
319 int qcol = 0; 328 int qcol = 0;
320 329
321 // fill a single destination line 330 // fill a single destination line
322 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
323 { 332 {
324 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
325 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
326 335
327 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
345 line_t &pline = old_buf [prow];
328 346
329 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
330 348
331 assert (len); 349 assert (len);
332 assert (pline.t); 350 assert (pline.t);
… …
337 lofs += len; 355 lofs += len;
338 qcol += len; 356 qcol += len;
339 } 357 }
340 } 358 }
341 359
342 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
343 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
344 } 363 }
364 while (p != pend && q > 0);
345 365
346 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
347 view_start = 0;
348 nsaved = term_start - q; 367 nsaved = term_start - q;
349 368
350 // make sure all terminal lines exist 369 // make sure all terminal lines exist
351 while (nsaved < 0) 370 while (nsaved < 0)
352 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
353
354 } 372 }
355 else 373 else
356 { 374 {
357 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
358 376
… …
369 { 387 {
370 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
371 } 389 }
372 390
373 term_start = 0; 391 term_start = 0;
374 view_start = 0;
375 } 392 }
376 393
377#ifdef DEBUG_STRICT 394#ifdef DEBUG_STRICT //TODO: remove
378 for (int i = -nsaved; i < nrow; i++) 395 for (int i = -nsaved; i < nrow; i++)
379 assert (ROW (i).t); 396 assert (ROW (i).t);
380#endif 397#endif
381 398
382 free (old_buf); 399 free (old_buf);
… …
397 414
398 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
399 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
400 417
401 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
402} 421}
403 422
404/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
405/* 424/*
406 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
412 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
413 432
414 free (row_buf); 433 free (row_buf);
415 free (swap_buf); 434 free (swap_buf);
416 free (drawn_buf); 435 free (drawn_buf);
417 free (temp_buf);
418 free (tabs); 436 free (tabs);
419 437
420 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
421} 439}
422 440
… …
510 528
511 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
512 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
513 531
514#if NSCREENS 532#if NSCREENS
515 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
516 { 534 {
517 num_scr = 0; 535 num_scr = 0;
518 536
519 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
520 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
524 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
525 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
526 } 544 }
527 else 545 else
528#endif 546#endif
529 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
530 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
531 549
532 return scrn; 550 return scrn;
533} 551}
534 552
… …
596 num_scr += count; 614 num_scr += count;
597 615
598 if (count > 0 616 if (count > 0
599 && row1 == 0 617 && row1 == 0
600 && row2 == nrow - 1 618 && row2 == nrow - 1
601 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
602 { 620 {
603 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
604 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
605 626
606 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
607 { 628 {
608 selection.beg.row -= count; 629 selection.beg.row -= count;
609 selection.end.row -= count; 630 selection.end.row -= count;
610 selection.mark.row -= count; 631 selection.mark.row -= count;
611 632
612 selection_check (0); 633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
613 } 640 }
614 641
615 for (int i = count; i--; ) 642 for (int i = count; i--; )
616 scr_blank_screen_mem (ROW(row2 - i), rstyle); 643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
617 653
618 if ((options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
619 && view_start != 0 655 && view_start != 0
620 && view_start != saveLines) 656 && view_start != saveLines)
621 scr_page (UP, count); 657 scr_page (UP, count);
622 } 658 }
623 else 659 else
624 { 660 {
625 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
626 { 662 {
627 int i = selection.beg.row; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
628 int j = selection.end.row; 664 || (selection.beg.row < row2 && selection.end.row > row2)
629
630 if ((i < row1 && j > row1)
631 || (i < row2 && j > row2)
632 || (i - count < row1 && i >= row1) 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
633 || (i - count > row2 && i <= row2) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
634 || (j - count < row1 && j >= row1) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
635 || (j - count > row2 && j <= row2)) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
636 { 669 {
637 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
639 } 672 }
640 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
641 { 674 {
642 /* move selected region too */ 675 /* move selected region too */
643 selection.beg.row -= count; 676 selection.beg.row -= count;
644 selection.end.row -= count; 677 selection.end.row -= count;
645 selection.mark.row -= count; 678 selection.mark.row -= count;
… …
653 686
654 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
655 688
656 min_it (count, rows); 689 min_it (count, rows);
657 690
691 line_t *temp_buf = row_buf + total_rows;
692
658 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
659 { 694 {
660 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
661 696
662 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
673/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
674/* 709/*
675 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
676 */ 711 */
677void 712void
678rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
679{ 714{
680 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
681 return; 716 return;
682 717
683 unsigned char checksel; 718 unsigned char checksel;
684 unicode_t c; 719 unicode_t c;
685 int row, last_col; 720 int ncol = this->ncol;
686 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
687 722
688 want_refresh = 1; 723 want_refresh = 1;
689 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
690 last_col = ncol;
691 725
692 if (nlines > 0) 726 if (minlines > 0)
693 { 727 {
694 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
729
695 if (nlines > 0 730 if (minlines > 0
696 && screen.tscroll == 0 731 && screen.tscroll == 0
697 && screen.bscroll == (nrow - 1)) 732 && screen.bscroll == nrow - 1)
698 { 733 {
699 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
700 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
701 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
702 } 737 }
703 } 738 }
704 739
705#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
706 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
707 assert (screen.cur.row < nrow 742 assert (screen.cur.row < nrow
708 && screen.cur.row >= -nsaved); 743 && screen.cur.row >= -nsaved);
709#endif 744#endif
710 row = screen.cur.row; 745 int row = screen.cur.row;
711 746
712 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 747 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
713 748
714 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
715 750
716 while (str < strend) 751 while (str < strend)
717 { 752 {
718 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
719 754
720 if (c < 0x20) 755 if (c < 0x20)
721 if (c == C0_LF) 756 if (c == C0_LF)
722 { 757 {
723 if (!line->is_longer ()) /* XXX: think about this */
724 max_it (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
725 759
726 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
727 761
728 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
729 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
733 line = &ROW(row); /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
734 continue; 768 continue;
735 } 769 }
736 else if (c == C0_CR) 770 else if (c == C0_CR)
737 { 771 {
738 if (!line->is_longer ()) /* XXX: think about this */
739 max_it (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
740 773
741 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
742 screen.cur.col = 0; 775 screen.cur.col = 0;
743 continue; 776 continue;
744 } 777 }
… …
761 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
762 } 795 }
763 796
764 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
765 { 798 {
799 max_it (line->l, ncol);
766 line->set_is_longer (); 800 line->is_longer (1);
767 801
768 scr_do_wrap (); 802 scr_do_wrap ();
769 803
770 row = screen.cur.row; 804 row = screen.cur.row;
771 line = &ROW(row); /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
… …
779 // do wcwidth before further replacements, as wcwidth might return -1 813 // do wcwidth before further replacements, as wcwidth might return -1
780 // for the line drawing characters below as they might be invalid in the current 814 // for the line drawing characters below as they might be invalid in the current
781 // locale. 815 // locale.
782 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
783 817
784 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
785 { 819 {
786 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
787 // 5f-7e standard vt100 821 // 5f-7e standard vt100
788 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
789 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
841 } 875 }
842 876
843 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
844 878
845 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
846 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
847 { 881 {
848 // ...output spaces 882 // ...output spaces
849 c = ' '; 883 c = ' ';
850 // and try the same character next loop iteration 884 // and try the same character next loop iteration
851 --str; 885 --str;
852 } 886 }
853 887
888 line->touch ();
889
854 do 890 do
855 { 891 {
856 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
857 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
858 894
859 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
860 screen.cur.col++; 896 screen.cur.col++;
861 else 897 else
862 { 898 {
863 line->l = last_col; 899 line->l = ncol;
864 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
865 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
866 break; 902 break;
867 } 903 }
868 904
… …
870 } 906 }
871 while (--width > 0); 907 while (--width > 0);
872 908
873 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
874 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
875 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
876 { 915 {
877 line->t[c] = ' '; 916 line->t[c] = ' ';
878 line->r[c] = rend; 917 line->r[c] = rend;
879 } 918 }
919 }
880 } 920 }
881 else // width == 0 921 else // width == 0
882 { 922 {
883#if ENABLE_COMBINING 923#if ENABLE_COMBINING
884 // handle combining characters 924 // handle combining characters
885 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
886 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
887 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
888 text_t *tp; 929 text_t *tp;
889 rend_t *rp; 930 rend_t *rp;
890 931
891 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
892 { 933 {
934 linep = line;
893 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
894 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
895
896 while (*tp == NOCHAR && tp > line->t)
897 tp--, rp--;
898 } 937 }
899 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
900 && ROW(screen.cur.row - 1).is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
901 { 940 {
902 line_t *line = &ROW(screen.cur.row - 1); 941 linep = &ROW(screen.cur.row - 1);
903
904 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
905 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
906
907 while (*tp == NOCHAR && tp > line->t)
908 tp--, rp--;
909 } 944 }
910 else 945 else
911 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
912 952
913 // first try to find a precomposed character 953 // first try to find a precomposed character
914 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
915 if (n == NOCHAR) 955 if (n == NOCHAR)
916 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
919 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
920#endif 960#endif
921 } 961 }
922 } 962 }
923 963
924 if (!line->is_longer ()) /* XXX: think about this */
925 max_it (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
926 965
927#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
928 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
929#endif 968#endif
930} 969}
… …
972 1011
973 if (count == 0) 1012 if (count == 0)
974 return; 1013 return;
975 else if (count > 0) 1014 else if (count > 0)
976 { 1015 {
977 int row = screen.cur.row;
978
979 line_t &l = ROW(row); 1016 line_t &l = ROW(screen.cur.row);
980 rend_t base_rend = l.r[i]; 1017 rend_t base_rend = l.r[i];
981 ht &= l.t[i] == ' '; 1018 ht &= l.t[i] == ' ';
982 1019
983 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
984 if (tabs[i]) 1021 if (tabs[i])
985 { 1022 {
986 x = i; 1023 x = i;
1024
987 if (!--count) 1025 if (!--count)
988 break; 1026 break;
989 } 1027 }
990 else 1028 else
991 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
994 if (count) 1032 if (count)
995 x = ncol - 1; 1033 x = ncol - 1;
996 1034
997 // store horizontal tab commands as characters inside the text 1035 // store horizontal tab commands as characters inside the text
998 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
999 if (ht && options & Opt_pastableTabs) 1037 if (ht && OPTION (Opt_pastableTabs))
1000 { 1038 {
1001 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
1002 1040
1003 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
1004 max_it (l.l, x);
1005 1042
1006 i = screen.cur.col; 1043 i = screen.cur.col;
1007 1044
1008 l.t[i] = '\t'; 1045 l.t[i] = '\t';
1009 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1059 */ 1096 */
1060#if ENABLE_FRILLS 1097#if ENABLE_FRILLS
1061void 1098void
1062rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1063{ 1100{
1064 int row;
1065
1066 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1067 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1068 else 1103 else
1069 { 1104 {
1070 row = screen.cur.row; 1105 line_t &l = ROW(screen.cur.row);
1071 1106
1072 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1107 l.touch ();
1073 ROW(row).l = ncol; 1108 l.is_longer (0);
1074 1109
1075 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1076 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1077 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1078 } 1113 }
… …
1161 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1162 */ 1197 */
1163void 1198void
1164rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1165{ 1200{
1166 unsigned int row, col, num; 1201 unsigned int col, num;
1167 1202
1168 want_refresh = 1; 1203 want_refresh = 1;
1169 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1170 1205
1171 selection_check (1); 1206 selection_check (1);
1172 1207
1173 row = screen.cur.row; 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1174 1212
1175 switch (mode) 1213 switch (mode)
1176 { 1214 {
1177 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1178 col = screen.cur.col; 1216 col = screen.cur.col;
1179 num = ncol - col; 1217 num = ncol - col;
1180 min_it (ROW(row).l, col); 1218 min_it (line.l, col);
1181 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1182 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1183 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1184 break; 1222 break;
1185 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1190 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1191 break; 1229 break;
1192 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1193 col = 0; 1231 col = 0;
1194 num = ncol; 1232 num = ncol;
1195 ROW(row).l = 0; 1233 line.l = 0;
1196 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1197 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1198 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1199 break; 1237 break;
1200 default: 1238 default:
1201 return; 1239 return;
1202 } 1240 }
1203 1241
1204 scr_blank_line (ROW(row), col, num, rstyle); 1242 scr_blank_line (line, col, num, rstyle);
1205} 1243}
1206 1244
1207/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1208/* 1246/*
1209 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1264 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1265 } 1303 }
1266 else 1304 else
1267 { 1305 {
1268 ren = rstyle & (RS_fgMask | RS_bgMask); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1269 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1270 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1271 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1272 gcvalue.foreground = pix_colors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1273 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1274 } 1312 }
1275 1313
1276 for (; num--; row++) 1314 for (; num--; row++)
1277 { 1315 {
1278 scr_blank_screen_mem (ROW (row), rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1279 ROW (row).l = 0;
1280 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1281 } 1318 }
1282} 1319}
1283 1320
1284#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
… …
1317 rend_t *r1 = line.r; 1354 rend_t *r1 = line.r;
1318 1355
1319 for (int j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1320 *r1++ = fs; 1357 *r1++ = fs;
1321 1358
1322 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1323 } 1361 }
1324} 1362}
1325 1363
1326/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1327/* 1365/*
… …
1375 min_it (count, ncol - screen.cur.col); 1413 min_it (count, ncol - screen.cur.col);
1376 1414
1377 row = screen.cur.row; 1415 row = screen.cur.row;
1378 1416
1379 line_t *line = &ROW(row); 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1380 1421
1381 switch (insdel) 1422 switch (insdel)
1382 { 1423 {
1383 case INSERT: 1424 case INSERT:
1384 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1385 { 1426 {
1386 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1387 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1388 } 1429 }
1389 1430
1390 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1391 {
1392 line->l += count;
1393 min_it (line->l, ncol);
1394 }
1395 1432
1396 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1397 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1398 { 1435 {
1399 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1412 1449
1413 case ERASE: 1450 case ERASE:
1414 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1415 selection_check (1); 1452 selection_check (1);
1416 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1417 scr_blank_line (*line, screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1418 break; 1457 break;
1419 1458
1420 case DELETE: 1459 case DELETE:
1421 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1424 { 1463 {
1425 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1426 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1427 } 1466 }
1428 1467
1468 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, ncol - count, count, tr); 1469 scr_blank_line (*line, ncol - count, count, tr);
1430
1431 if (line->is_longer ()) /* break line continuation */
1432 line->l = ncol;
1433
1434 line->l = max (line->l - count, 0);
1435 1470
1436 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1437 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1438 { 1473 {
1439 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1551rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1552{ 1587{
1553 if (mode < 0) 1588 if (mode < 0)
1554 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1555 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1556 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1557} 1592}
1558 1593
1559/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1560/* 1595/*
1561 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1573 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1574#if XPM_BACKGROUND 1609#if XPM_BACKGROUND
1575 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1576#endif 1611#endif
1577#if TRANSPARENT 1612#if TRANSPARENT
1578 if (! (options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1579#endif 1614#endif
1580 XSetWindowBackground (display->display, vt, 1615 XSetWindowBackground (display->display, vt,
1581 pix_colors[Color_bg]); 1616 pix_colors[Color_bg]);
1582 1617
1583 gcvalue.foreground = pix_colors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
… …
1608 * Set font style 1643 * Set font style
1609 */ 1644 */
1610void 1645void
1611rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1612{ 1647{
1648#if 0
1613 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1614 { 1650 {
1615 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1616 break; 1652 break;
1617 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1618 break; 1654 break;
… …
1625 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1626 break; 1662 break;
1627 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1628 break; 1664 break;
1629 } 1665 }
1666#endif
1630} 1667}
1631 1668
1632/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1633/* 1670/*
1634 * Choose a font 1671 * Choose a font
… …
1801int 1838int
1802rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1803{ 1840{
1804 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1805 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1806 want_refresh = 1; 1845 want_refresh = 1;
1807 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1808 } 1847 }
1809 1848
1810 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1811} 1850}
1812 1851
1813/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1814void 1853void
1815rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1816{ 1855{
1817#ifndef NO_BELL 1856#ifndef NO_BELL
1818 1857
1819# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1820# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1821 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1822# endif 1861# endif
1823 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1824# endif 1863# endif
1825 1864
1826 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1827 { 1866 {
1828 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1829 rxvt_usleep (VISUAL_BELL_DURATION); 1868 rxvt_usleep (VISUAL_BELL_DURATION);
1830 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1831 } 1870 }
… …
1922 1961
1923#if XPM_BACKGROUND 1962#if XPM_BACKGROUND
1924 must_clear |= bgPixmap.pixmap != None; 1963 must_clear |= bgPixmap.pixmap != None;
1925#endif 1964#endif
1926#if TRANSPARENT 1965#if TRANSPARENT
1927 must_clear |= (options & Opt_transparent) && am_transparent; 1966 must_clear |= OPTION (Opt_transparent) && am_transparent;
1928#endif 1967#endif
1929 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1968 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1930 1969
1931 /* 1970 /*
1932 * B: reverse any characters which are selected 1971 * B: reverse any characters which are selected
… …
1956 1995
1957 crp = &ROW(screen.cur.row).r[col]; 1996 crp = &ROW(screen.cur.row).r[col];
1958 1997
1959 if (showcursor && focus) 1998 if (showcursor && focus)
1960 { 1999 {
1961 if (options & Opt_cursorUnderline) 2000 if (OPTION (Opt_cursorUnderline))
1962 *crp ^= RS_Uline; 2001 *crp ^= RS_Uline;
1963 else 2002 else
1964 { 2003 {
1965 *crp ^= RS_RVid; 2004 *crp ^= RS_RVid;
1966 2005
… …
1968 cc1 = *crp & (RS_fgMask | RS_bgMask); 2007 cc1 = *crp & (RS_fgMask | RS_bgMask);
1969 if (ISSET_PIXCOLOR (Color_cursor)) 2008 if (ISSET_PIXCOLOR (Color_cursor))
1970 ccol1 = Color_cursor; 2009 ccol1 = Color_cursor;
1971 else 2010 else
1972#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1973 ccol1 = GET_FGCOLOR (rstyle); 2012 ccol1 = fgcolor_of (rstyle);
1974#else 2013#else
1975 ccol1 = Color_fg; 2014 ccol1 = Color_fg;
1976#endif 2015#endif
1977 if (ISSET_PIXCOLOR (Color_cursor2)) 2016 if (ISSET_PIXCOLOR (Color_cursor2))
1978 ccol2 = Color_cursor2; 2017 ccol2 = Color_cursor2;
1979 else 2018 else
1980#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2019#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1981 ccol2 = GET_BGCOLOR (rstyle); 2020 ccol2 = bgcolor_of (rstyle);
1982#else 2021#else
1983 ccol2 = Color_bg; 2022 ccol2 = Color_bg;
1984#endif 2023#endif
1985 *crp = SET_FGCOLOR (*crp, ccol1); 2024 *crp = SET_FGCOLOR (*crp, ccol1);
1986 *crp = SET_BGCOLOR (*crp, ccol2); 2025 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2019 oldcursor.col = screen.cur.col; 2058 oldcursor.col = screen.cur.col;
2020 } 2059 }
2021 } 2060 }
2022 } 2061 }
2023 2062
2063 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2024#if ENABLE_OVERLAY 2064#if ENABLE_OVERLAY
2025 scr_swap_overlay (); 2065 scr_swap_overlay ();
2026#endif 2066#endif
2027 2067
2028#ifndef NO_SLOW_LINK_SUPPORT 2068#ifndef NO_SLOW_LINK_SUPPORT
… …
2078 if (wlen < len) 2118 if (wlen < len)
2079 ::swap (wlen, len); 2119 ::swap (wlen, len);
2080 2120
2081 XCopyArea (display->display, vt, vt, 2121 XCopyArea (display->display, vt, vt,
2082 gc, 0, Row2Pixel (len + i), 2122 gc, 0, Row2Pixel (len + i),
2083 (unsigned int)TermWin_TotalWidth (), 2123 (unsigned int)this->width,
2084 (unsigned int)Height2Pixel (wlen - len + 1), 2124 (unsigned int)Height2Pixel (wlen - len + 1),
2085 0, Row2Pixel (len)); 2125 0, Row2Pixel (len));
2086 len = -1; 2126 len = -1;
2087 } 2127 }
2088 } 2128 }
… …
2167 count++, i--; 2207 count++, i--;
2168 2208
2169 /* 2209 /*
2170 * Determine the attributes for the string 2210 * Determine the attributes for the string
2171 */ 2211 */
2172 int fore = GET_FGCOLOR (rend); // desired foreground 2212 int fore = fgcolor_of (rend); // desired foreground
2173 int back = GET_BGCOLOR (rend); // desired background 2213 int back = bgcolor_of (rend); // desired background
2174 2214
2175 // only do special processing if any attributes are set, which is rare 2215 // only do special processing if any attributes are set, which is unlikely
2176 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2216 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2177 { 2217 {
2178#if ENABLE_STYLES 2218#if ENABLE_STYLES
2179 // force redraw after "careful" characters to avoid pixel droppings 2219 // force redraw after "careful" characters to avoid pixel droppings
2180 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2220 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2291 } /* for (row....) */ 2331 } /* for (row....) */
2292 2332
2293#if ENABLE_OVERLAY 2333#if ENABLE_OVERLAY
2294 scr_swap_overlay (); 2334 scr_swap_overlay ();
2295#endif 2335#endif
2336 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2296 2337
2297 /* 2338 /*
2298 * G: cleanup cursor and display outline cursor if necessary 2339 * G: cleanup cursor and display outline cursor if necessary
2299 */ 2340 */
2300 if (showcursor) 2341 if (showcursor)
2301 { 2342 {
2302 if (focus) 2343 if (focus)
2303 { 2344 {
2304 if (options & Opt_cursorUnderline) 2345 if (OPTION (Opt_cursorUnderline))
2305 *crp ^= RS_Uline; 2346 *crp ^= RS_Uline;
2306 else 2347 else
2307 { 2348 {
2308 *crp ^= RS_RVid; 2349 *crp ^= RS_RVid;
2309#ifndef NO_CURSORCOLOR 2350#ifndef NO_CURSORCOLOR
… …
2347 num_scr = 0; 2388 num_scr = 0;
2348 num_scr_allow = 1; 2389 num_scr_allow = 1;
2349} 2390}
2350 2391
2351void 2392void
2352rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2353{ 2394{
2354 if (!l.t) 2395 if (!l.t)
2355 return; 2396 return;
2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2356 2399
2357 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2358 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2359} 2402}
2360 2403
… …
2428 2471
2429#if ENABLE_FRILLS 2472#if ENABLE_FRILLS
2430 if (selection.rect) 2473 if (selection.rect)
2431 { 2474 {
2432 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2475 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2476 {
2477 text_t *stp = ROW(row).t;
2478 rend_t *srp = ROW(row).r;
2479
2433 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2480 for (col = selection.beg.col; col < selection.end.col; col++)
2434 srp[col] ^= RS_RVid; 2481 srp[col] ^= RS_RVid;
2482
2483 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2484 srp[col] ^= RS_RVid | RS_Uline;
2485
2486 if (++col < selection.end.col)
2487 srp[col] ^= RS_RVid | RS_Uline;
2488 }
2435 } 2489 }
2436 else 2490 else
2437#endif 2491#endif
2438 { 2492 {
2439 if (selection.beg.row >= -view_start) 2493 if (selection.beg.row >= -view_start)
… …
2442 row = selection.beg.row; 2496 row = selection.beg.row;
2443 } 2497 }
2444 else 2498 else
2445 { 2499 {
2446 col = 0; 2500 col = 0;
2447 row = view_start; 2501 row = -view_start;
2448 } 2502 }
2449 2503
2450 for (; row < min (selection.end.row, view_end); row++, col = 0) 2504 for (; row < min (selection.end.row, view_end); row++, col = 0)
2451 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2505 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2452 srp[col] ^= RS_RVid; 2506 srp[col] ^= RS_RVid;
… …
2523/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2524/* 2578/*
2525 * Paste a selection direct to the command fd 2579 * Paste a selection direct to the command fd
2526 */ 2580 */
2527void 2581void
2528rxvt_term::paste (unsigned char *data, unsigned int len) 2582rxvt_term::paste (char *data, unsigned int len)
2529{ 2583{
2530 /* convert normal newline chars into common keyboard Return key sequence */ 2584 /* convert normal newline chars into common keyboard Return key sequence */
2531 for (unsigned int i = 0; i < len; i++) 2585 for (unsigned int i = 0; i < len; i++)
2532 if (data[i] == C0_LF) 2586 if (data[i] == C0_LF)
2533 data[i] = C0_CR; 2587 data[i] = C0_CR;
… …
2677 { 2731 {
2678 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2732 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2679 char *s = rxvt_wcstombs (w); 2733 char *s = rxvt_wcstombs (w);
2680 free (w); 2734 free (w);
2681 // TODO: strlen == only the first element will be converted. well... 2735 // TODO: strlen == only the first element will be converted. well...
2682 paste ((unsigned char *)s, strlen (s)); 2736 paste (s, strlen (s));
2683 free (s); 2737 free (s);
2684 } 2738 }
2685 else 2739 else
2686#endif 2740#endif
2687 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2741 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2688 && cl) 2742 && cl)
2689 { 2743 {
2690 for (int i = 0; i < cr; i++) 2744 for (int i = 0; i < cr; i++)
2691 paste ((unsigned char *)cl[i], strlen (cl[i])); 2745 paste (cl[i], strlen (cl[i]));
2692 2746
2693 XFreeStringList (cl); 2747 XFreeStringList (cl);
2694 } 2748 }
2695 else 2749 else
2696 paste (ct.value, ct.nitems); // paste raw 2750 paste ((char *)ct.value, ct.nitems); // paste raw
2697 2751
2698bailout: 2752bailout:
2699 XFree (ct.value); 2753 XFree (ct.value);
2700 2754
2701 if (selection_wait == Sel_normal) 2755 if (selection_wait == Sel_normal)
… …
2739 return; /* outside window */ 2793 return; /* outside window */
2740 2794
2741 if (selection.text) 2795 if (selection.text)
2742 { /* internal selection */ 2796 { /* internal selection */
2743 char *str = rxvt_wcstombs (selection.text, selection.len); 2797 char *str = rxvt_wcstombs (selection.text, selection.len);
2744 paste ((unsigned char *)str, strlen (str)); 2798 paste (str, strlen (str));
2745 free (str); 2799 free (str);
2746 return; 2800 return;
2747 } 2801 }
2748 else 2802 else
2749 { 2803 {
… …
2841 selection.op = SELECTION_DONE; 2895 selection.op = SELECTION_DONE;
2842 2896
2843 if (selection.clicks == 4) 2897 if (selection.clicks == 4)
2844 return; /* nothing selected, go away */ 2898 return; /* nothing selected, go away */
2845 2899
2900 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2901 return;
2902
2846 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2903 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2847 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2904 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2848 2905
2849 int ofs = 0; 2906 int ofs = 0;
2850 int extra = 0; 2907 int extra = 0;
… …
2862 col = selection.beg.col; 2919 col = selection.beg.col;
2863 end_col = ncol + 1; 2920 end_col = ncol + 1;
2864 } 2921 }
2865 else 2922 else
2866#endif 2923#endif
2867 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2924 end_col = ROW(row).l;
2868 2925
2869 col = max (col, 0); 2926 col = max (col, 0);
2870 2927
2871 if (row == selection.end.row || selection.rect) 2928 if (row == selection.end.row
2929#if ENABLE_FRILLS
2930 || selection.rect
2931#endif
2932 )
2872 end_col = min (end_col, selection.end.col); 2933 min_it (end_col, selection.end.col);
2873 2934
2874 t = ROW(row).t + col; 2935 t = ROW(row).t + col;
2936
2875 for (; col < end_col; col++) 2937 for (; col < end_col; col++)
2876 { 2938 {
2877 if (*t == NOCHAR) 2939 if (*t == NOCHAR)
2878 t++; 2940 t++;
2879#if ENABLE_COMBINING 2941#if ENABLE_COMBINING
… …
2895#endif 2957#endif
2896 else 2958 else
2897 new_selection_text[ofs++] = *t++; 2959 new_selection_text[ofs++] = *t++;
2898 } 2960 }
2899 2961
2962#if ENABLE_FRILLS
2963 if (selection.rect)
2964 {
2965 while (ofs
2966 && new_selection_text[ofs - 1] != C0_LF
2967 && unicode::is_space (new_selection_text[ofs - 1]))
2968 --ofs;
2969
2970 new_selection_text[ofs++] = C0_LF;
2971 }
2972 else
2973#endif
2900 if (!ROW(row).is_longer () && row != selection.end.row) 2974 if (!ROW(row).is_longer () && row != selection.end.row)
2901 new_selection_text[ofs++] = C0_LF; 2975 new_selection_text[ofs++] = C0_LF;
2902 } 2976 }
2903 2977
2904 if (end_col != selection.end.col) 2978 if (end_col != selection.end.col)
2905 new_selection_text[ofs++] = C0_LF; 2979 new_selection_text[ofs++] = C0_LF;
2906 2980
… …
2916 2990
2917 // we usually allocate much more than necessary, so realloc it smaller again 2991 // we usually allocate much more than necessary, so realloc it smaller again
2918 selection.len = ofs; 2992 selection.len = ofs;
2919 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2993 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2920 2994
2995 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2996 return;
2997
2998 selection_grab (tm);
2999}
3000
3001bool
3002rxvt_term::selection_grab (Time tm)
3003{
3004 selection_time = tm;
3005
2921 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3006 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2922 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3007 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3008 {
2923 display->set_selection_owner (this); 3009 display->set_selection_owner (this);
3010 return true;
3011 }
2924 else 3012 else
2925 rxvt_warn ("can't get primary selection, ignoring.\n"); 3013 return false;
2926 3014
2927#if 0 3015#if 0
2928 XTextProperty ct; 3016 XTextProperty ct;
2929 3017
2930 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3018 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2931 { 3019 {
2932 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3020 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2933 XFree (ct.value); 3021 XFree (ct.value);
2934 } 3022 }
2935#endif 3023#endif
2936
2937 selection_time = tm;
2938} 3024}
2939 3025
2940/* ------------------------------------------------------------------------- */ 3026/* ------------------------------------------------------------------------- */
2941/* 3027/*
2942 * Mark or select text based upon number of clicks: 1, 2, or 3 3028 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3064 } 3150 }
3065 } 3151 }
3066 break; 3152 break;
3067 } 3153 }
3068 3154
3069Old_Word_Selection_You_Die:
3070 if (dirn == DN) 3155 if (dirn == DN)
3071 col++; /* put us on one past the end */ 3156 col++; /* put us on one past the end */
3072 3157
3073 /* Poke the values back in */ 3158 /* Poke the values back in */
3074 ret->row = row; 3159 ret->row = row;
… …
3251 else if (selection.clicks == 2) 3336 else if (selection.clicks == 2)
3252 { 3337 {
3253 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3338 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3254 selection.end.col--; 3339 selection.end.col--;
3255 3340
3341 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3342 {
3256 selection_delimit_word (UP, &selection.beg, &selection.beg); 3343 selection_delimit_word (UP, &selection.beg, &selection.beg);
3257 selection_delimit_word (DN, &selection.end, &selection.end); 3344 selection_delimit_word (DN, &selection.end, &selection.end);
3345 }
3258 } 3346 }
3259 else if (selection.clicks == 3) 3347 else if (selection.clicks == 3)
3260 { 3348 {
3261#if ENABLE_FRILLS 3349#if ENABLE_FRILLS
3262 if (options & Opt_tripleclickwords) 3350 if (OPTION (Opt_tripleclickwords))
3263 { 3351 {
3264 selection_delimit_word (UP, &selection.beg, &selection.beg); 3352 selection_delimit_word (UP, &selection.beg, &selection.beg);
3265 3353
3266 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3354 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3267 { 3355 {
… …
3328 { 3416 {
3329 stp = ROW(end_row).t; 3417 stp = ROW(end_row).t;
3330 3418
3331 while (--end_col >= 0) 3419 while (--end_col >= 0)
3332 { 3420 {
3333 if (stp[end_col] != ' ' 3421 if (stp[end_col] != NOCHAR
3334 && stp[end_col] != '\t' 3422 && !unicode::is_space (stp[end_col]))
3335 && stp[end_col] != NOCHAR)
3336 break; 3423 break;
3337 } 3424 }
3338 3425
3339 if (end_col >= 0 3426 if (end_col >= 0
3340 || !ROW(end_row - 1).is_longer ()) 3427 || !ROW(end_row - 1).is_longer ())
… …
3539 3626
3540#if ENABLE_OVERLAY 3627#if ENABLE_OVERLAY
3541void 3628void
3542rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3629rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3543{ 3630{
3544 if (nrow < 3 || ncol < 3) 3631 if (nrow < 1 || ncol < 1)
3545 return; 3632 return;
3546 3633
3547 want_refresh = 1; 3634 want_refresh = 1;
3548 3635
3549 scr_overlay_off (); 3636 scr_overlay_off ();
… …
3656 for (int y = ov_h; y--; ) 3743 for (int y = ov_h; y--; )
3657 { 3744 {
3658 text_t *t1 = ov_text[y]; 3745 text_t *t1 = ov_text[y];
3659 rend_t *r1 = ov_rend[y]; 3746 rend_t *r1 = ov_rend[y];
3660 3747
3661 text_t *t2 = ROW(y - view_start).t + ov_x; 3748 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3662 rend_t *r2 = ROW(y - view_start).r + ov_x; 3749 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3663 3750
3664 for (int x = ov_w; x--; ) 3751 for (int x = ov_w; x--; )
3665 { 3752 {
3666 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3753 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3667 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3754 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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