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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.230 by root, Sun Jan 15 16:47:29 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 * ------------------------------------------------------------------------- */
… …
173 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
174 { 180 {
175 //TODO//FIXME 181 //TODO//FIXME
176 saveLines++; 182 saveLines++;
177 prev_nrow--; 183 prev_nrow--;
178 nsaved++; 184 top_row--;
179 } 185 }
180 186
181 want_refresh = 1; 187 want_refresh = 1;
182 188
183 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
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 top_row = 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 + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
279 283
280 if (nsaved) 284 if (top_row)
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 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
289 { 293 {
290 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 297#endif
294
295 int plines = 1; 298 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 299 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 300
298 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 ())
299 { 302 {
… …
317 // re-assemble the full line by destination lines 320 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
319 { 322 {
320 qline = row_buf + qrow; 323 qline = row_buf + qrow;
321 lalloc (*qline); 324 lalloc (*qline);
325 qline->l = ncol;
322 qline->set_is_longer (); 326 qline->is_longer (1);
323 327
324 int qcol = 0; 328 int qcol = 0;
325 329
326 // fill a single destination line 330 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
… …
351 lofs += len; 355 lofs += len;
352 qcol += len; 356 qcol += len;
353 } 357 }
354 } 358 }
355 359
356 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);
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 363 }
359 while (p != pend && q > 0); 364 while (p != pend && q > 0);
360 365
361 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
362 nsaved = term_start - q; 367 top_row = q - term_start;
363 368
364 // make sure all terminal lines exist 369 // make sure all terminal lines exist
365 while (nsaved < 0) 370 while (top_row > 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
367
368 } 372 }
369 else 373 else
370 { 374 {
371 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
372 376
… …
386 390
387 term_start = 0; 391 term_start = 0;
388 } 392 }
389 393
390#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
392 assert (ROW (i).t); 396 assert (ROW (i).t);
393#endif 397#endif
394 398
395 free (old_buf); 399 free (old_buf);
396 delete old_ta; 400 delete old_ta;
… …
410 414
411 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
412 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
413 417
414 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415} 421}
416 422
417/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
418/* 424/*
419 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
425 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
426 432
427 free (row_buf); 433 free (row_buf);
428 free (swap_buf); 434 free (swap_buf);
429 free (drawn_buf); 435 free (drawn_buf);
430 free (temp_buf);
431 free (tabs); 436 free (tabs);
432 437
433 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
434} 439}
435 440
… …
523 528
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526 531
527#if NSCREENS 532#if NSCREENS
528 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
529 { 534 {
530 num_scr = 0; 535 num_scr = 0;
531 536
532 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
533 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
537 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
539 } 544 }
540 else 545 else
541#endif 546#endif
542 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544 549
545 return scrn; 550 return scrn;
546} 551}
547 552
… …
567 * Change the colour for following text 572 * Change the colour for following text
568 */ 573 */
569void 574void
570rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
571{ 576{
572 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
573 color = fgbg; 578 color = fgbg;
574 579
575 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
576 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
577 else 582 else
… …
608 want_refresh = 1; 613 want_refresh = 1;
609 num_scr += count; 614 num_scr += count;
610 615
611 if (count > 0 616 if (count > 0
612 && row1 == 0 617 && row1 == 0
613 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 619 {
616 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines
617 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
618 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
619 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
620 { 661 {
621 selection.beg.row -= count; 662 selection.beg.row -= count;
622 selection.end.row -= count; 663 selection.end.row -= count;
623 selection.mark.row -= count; 664 selection.mark.row -= count;
624 665
625 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
626 || selection.end.row < -nsaved 667 || selection.end.row < top_row
627 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
628 { 669 {
629 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
630 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
631 } 672 }
632 } 673 }
633 674
634 for (int i = count; i--; ) 675 // finally move the view window, if desired
635 scr_blank_screen_mem (ROW(row2 - i), rstyle);
636
637 if ((options & Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
638 && view_start != 0 677 && view_start != 0
639 && view_start != saveLines) 678 && view_start != -saveLines)
640 scr_page (UP, count); 679 scr_page (UP, count);
641 } 680 }
642 else 681 else
643 { 682 {
644 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
669 708
670 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
671 710
672 min_it (count, rows); 711 min_it (count, rows);
673 712
713 line_t *temp_buf = row_buf + total_rows;
714
674 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
675 { 716 {
676 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
677 718
678 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
689/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
690/* 731/*
691 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
692 */ 733 */
693void 734void
694rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
695{ 736{
696 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
697 return; 738 return;
698 739
699 unsigned char checksel; 740 unsigned char checksel;
700 unicode_t c; 741 unicode_t c;
701 int last_col; 742 int ncol = this->ncol;
702 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
703 744
704 want_refresh = 1; 745 want_refresh = 1;
705 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
706 last_col = ncol;
707 747
708 if (nlines > 0) 748 if (minlines > 0)
709 { 749 {
710 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
711 if (nlines > 0 752 if (minlines > 0
712 && screen.tscroll == 0 753 && screen.tscroll == 0
713 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
714 { 755 {
715 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
716 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
717 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
718 } 759 }
719 } 760 }
720 761
721#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
722 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
723 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
724 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
725#endif 766#endif
726 int row = screen.cur.row; 767 int row = screen.cur.row;
727 768
728 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
729 770
730 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
731 772
732 while (str < strend) 773 while (str < strend)
733 { 774 {
734 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
735 776
736 if (c < 0x20) 777 if (c < 0x20)
737 if (c == C0_LF) 778 if (c == C0_LF)
738 { 779 {
739 if (!line->is_longer ()) /* XXX: think about this */
740 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
741 781
742 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
743 783
744 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
745 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
749 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
750 continue; 790 continue;
751 } 791 }
752 else if (c == C0_CR) 792 else if (c == C0_CR)
753 { 793 {
754 if (!line->is_longer ()) /* XXX: think about this */
755 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
756 795
757 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
758 screen.cur.col = 0; 797 screen.cur.col = 0;
759 continue; 798 continue;
760 } 799 }
… …
777 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
778 } 817 }
779 818
780 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
781 { 820 {
821 max_it (line->l, ncol);
782 line->set_is_longer (); 822 line->is_longer (1);
783 823
784 scr_do_wrap (); 824 scr_do_wrap ();
785 825
786 row = screen.cur.row; 826 row = screen.cur.row;
787 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
795 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
796 // for the line drawing characters below as they might be invalid in the current 836 // for the line drawing characters below as they might be invalid in the current
797 // locale. 837 // locale.
798 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
799 839
800 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
801 { 841 {
802 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
803 // 5f-7e standard vt100 843 // 5f-7e standard vt100
804 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
805 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 } 897 }
858 898
859 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
860 900
861 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
862 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
863 { 903 {
864 // ...output spaces 904 // ...output spaces
865 c = ' '; 905 c = ' ';
866 // and try the same character next loop iteration 906 // and try the same character next loop iteration
867 --str; 907 --str;
868 } 908 }
869 909
910 line->touch ();
911
870 do 912 do
871 { 913 {
872 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
873 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
874 916
875 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
876 screen.cur.col++; 918 screen.cur.col++;
877 else 919 else
878 { 920 {
879 line->l = last_col; 921 line->l = ncol;
880 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
881 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
882 break; 924 break;
883 } 925 }
884 926
… …
886 } 928 }
887 while (--width > 0); 929 while (--width > 0);
888 930
889 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
890 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
891 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
892 { 937 {
893 line->t[c] = ' '; 938 line->t[c] = ' ';
894 line->r[c] = rend; 939 line->r[c] = rend;
895 } 940 }
941 }
896 } 942 }
897 else // width == 0 943 else // width == 0
898 { 944 {
899#if ENABLE_COMBINING 945#if ENABLE_COMBINING
900 // handle combining characters 946 // handle combining characters
901 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
902 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
903 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
904 text_t *tp; 951 text_t *tp;
905 rend_t *rp; 952 rend_t *rp;
906 953
907 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
908 { 955 {
956 linep = line;
909 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
910 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
911
912 while (*tp == NOCHAR && tp > line->t)
913 tp--, rp--;
914 } 959 }
915 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
916 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
917 { 962 {
918 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
919
920 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
921 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
922
923 while (*tp == NOCHAR && tp > line->t)
924 tp--, rp--;
925 } 966 }
926 else 967 else
927 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
928 974
929 // first try to find a precomposed character 975 // first try to find a precomposed character
930 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
931 if (n == NOCHAR) 977 if (n == NOCHAR)
932 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
935 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
936#endif 982#endif
937 } 983 }
938 } 984 }
939 985
940 if (!line->is_longer ()) /* XXX: think about this */
941 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
942 987
943#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
944 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
945#endif 990#endif
946} 991}
… …
996 1041
997 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
998 if (tabs[i]) 1043 if (tabs[i])
999 { 1044 {
1000 x = i; 1045 x = i;
1046
1001 if (!--count) 1047 if (!--count)
1002 break; 1048 break;
1003 } 1049 }
1004 else 1050 else
1005 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1008 if (count) 1054 if (count)
1009 x = ncol - 1; 1055 x = ncol - 1;
1010 1056
1011 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1012 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1013 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1014 { 1060 {
1015 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1016 1062
1017 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1018 max_it (l.l, x);
1019 1064
1020 i = screen.cur.col; 1065 i = screen.cur.col;
1021 1066
1022 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1023 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1077{ 1122{
1078 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1125 else
1081 { 1126 {
1082 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1127 line_t &l = ROW(screen.cur.row);
1083 ROW(screen.cur.row).l = ncol; 1128
1129 l.touch ();
1130 l.is_longer (0);
1084 1131
1085 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1086 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1087 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1088 } 1135 }
… …
1179 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1180 1227
1181 selection_check (1); 1228 selection_check (1);
1182 1229
1183 line_t &line = ROW(screen.cur.row); 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1184 1234
1185 switch (mode) 1235 switch (mode)
1186 { 1236 {
1187 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1188 col = screen.cur.col; 1238 col = screen.cur.col;
… …
1274 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1275 } 1325 }
1276 else 1326 else
1277 { 1327 {
1278 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1279 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1282 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1284 } 1334 }
1285 1335
1286 for (; num--; row++) 1336 for (; num--; row++)
1287 { 1337 {
1288 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1289 ROW (row).l = 0;
1290 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1291 } 1340 }
1292} 1341}
1293 1342
1294#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1296rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1297{ 1346{
1298 want_refresh = 1; 1347 want_refresh = 1;
1299 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1300 1349
1301 nsaved = 0; 1350 top_row = 0;
1302} 1351}
1303#endif 1352#endif
1304 1353
1305/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1306/* 1355/*
… …
1327 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1328 1377
1329 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1330 *r1++ = fs; 1379 *r1++ = fs;
1331 1380
1332 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1333 } 1383 }
1334} 1384}
1335 1385
1336/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1337/* 1387/*
… …
1385 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1386 1436
1387 row = screen.cur.row; 1437 row = screen.cur.row;
1388 1438
1389 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1390 1443
1391 switch (insdel) 1444 switch (insdel)
1392 { 1445 {
1393 case INSERT: 1446 case INSERT:
1394 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1395 { 1448 {
1396 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1397 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1398 } 1451 }
1399 1452
1400 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1401 {
1402 line->l += count;
1403 min_it (line->l, ncol);
1404 }
1405 1454
1406 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1457 {
1409 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1422 1471
1423 case ERASE: 1472 case ERASE:
1424 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1425 selection_check (1); 1474 selection_check (1);
1426 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1427 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1428 break; 1479 break;
1429 1480
1430 case DELETE: 1481 case DELETE:
1431 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1434 { 1485 {
1435 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1436 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1437 } 1488 }
1438 1489
1490 line->l = max (line->l - count, 0);
1439 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1440
1441 if (line->is_longer ()) /* break line continuation */
1442 line->l = ncol;
1443
1444 line->l = max (line->l - count, 0);
1445 1492
1446 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1495 {
1449 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1561rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1562{ 1609{
1563 if (mode < 0) 1610 if (mode < 0)
1564 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1565 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1566 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1567} 1614}
1568 1615
1569/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1570/* 1617/*
1571 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1583 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1584#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1585 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1586#endif 1633#endif
1587#if TRANSPARENT 1634#if TRANSPARENT
1588 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1589#endif 1636#endif
1590 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1591 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1592 1639
1593 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1618 * Set font style 1665 * Set font style
1619 */ 1666 */
1620void 1667void
1621rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1622{ 1669{
1670#if 0
1623 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1624 { 1672 {
1625 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1626 break; 1674 break;
1627 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1628 break; 1676 break;
… …
1635 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1636 break; 1684 break;
1637 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1638 break; 1686 break;
1639 } 1687 }
1688#endif
1640} 1689}
1641 1690
1642/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1643/* 1692/*
1644 * Choose a font 1693 * Choose a font
… …
1759/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1760/* 1809/*
1761 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1762 * the top of the screen 1811 * the top of the screen
1763 */ 1812 */
1764int 1813void
1765rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1766{ 1815{
1767 long p = 0; 1816 int p = len
1768 unsigned int oldviewstart; 1817 ? (top_row - nrow) * (len - y) / len + (nrow - 1)
1818 : 0;
1769 1819
1770 oldviewstart = view_start; 1820 scr_changeview (p);
1771
1772 if (y < len)
1773 {
1774 p = (nrow + nsaved) * (len - y) / len;
1775 p -= (long) (nrow - 1);
1776 p = max (p, 0);
1777 }
1778
1779 view_start = (unsigned int)min (p, nsaved);
1780
1781 return scr_changeview (oldviewstart);
1782} 1821}
1783 1822
1784/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1785/* 1824/*
1786 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1787 * direction should be UP or DN 1826 * direction should be UP or DN
1788 */ 1827 */
1789int 1828bool
1790rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1791{ 1830{
1792 int n; 1831 int new_view_start =
1793 unsigned int oldviewstart;
1794
1795 oldviewstart = view_start;
1796
1797 if (direction == UP)
1798 {
1799 n = view_start + nlines;
1800 view_start = min (n, nsaved);
1801 }
1802 else
1803 {
1804 n = view_start - nlines; 1832 direction == UP ? view_start - nlines
1805 view_start = max (n, 0); 1833 : view_start + nlines;
1806 }
1807 1834
1808 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1809} 1836}
1810 1837
1811int 1838bool
1812rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1813{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1814 if (view_start != oldviewstart) 1843 if (new_view_start == view_start)
1815 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1816 want_refresh = 1; 1849 want_refresh = 1;
1817 num_scr -= (view_start - oldviewstart);
1818 }
1819 1850
1820 return (int) (view_start - oldviewstart); 1851 return true;
1821} 1852}
1822 1853
1823/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1824void 1855void
1825rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
1826{ 1857{
1827#ifndef NO_BELL 1858#ifndef NO_BELL
1828 1859
1829# ifndef NO_MAPALERT 1860# ifndef NO_MAPALERT
1830# ifdef MAPALERT_OPTION 1861# ifdef MAPALERT_OPTION
1831 if (options & Opt_mapAlert) 1862 if (OPTION (Opt_mapAlert))
1832# endif 1863# endif
1833 XMapWindow (display->display, parent[0]); 1864 XMapWindow (display->display, parent[0]);
1834# endif 1865# endif
1835 1866
1836 if (options & Opt_visualBell) 1867 if (OPTION (Opt_visualBell))
1837 { 1868 {
1838 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1839 rxvt_usleep (VISUAL_BELL_DURATION); 1871 rxvt_usleep (VISUAL_BELL_DURATION);
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1841 } 1873 }
1842 else 1874 else
1843 XBell (display->display, 0); 1875 XBell (display->display, 0);
… …
1857 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1858 return; 1890 return;
1859 1891
1860 if (fullhist) 1892 if (fullhist)
1861 { 1893 {
1862 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1863 row_start = -nsaved; 1895 row_start = top_row;
1864 } 1896 }
1865 else 1897 else
1866 { 1898 {
1867 nrows = nrow; 1899 nrows = nrow;
1868 row_start = -view_start; 1900 row_start = view_start;
1869 } 1901 }
1870 1902
1871 wctomb (0, 0); 1903 wctomb (0, 0);
1872 1904
1873 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1932 1964
1933#if XPM_BACKGROUND 1965#if XPM_BACKGROUND
1934 must_clear |= bgPixmap.pixmap != None; 1966 must_clear |= bgPixmap.pixmap != None;
1935#endif 1967#endif
1936#if TRANSPARENT 1968#if TRANSPARENT
1937 must_clear |= (options & Opt_transparent) && am_transparent; 1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1938#endif 1970#endif
1939 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1940 1972
1941 /* 1973 /*
1942 * B: reverse any characters which are selected 1974 * B: reverse any characters which are selected
… …
1966 1998
1967 crp = &ROW(screen.cur.row).r[col]; 1999 crp = &ROW(screen.cur.row).r[col];
1968 2000
1969 if (showcursor && focus) 2001 if (showcursor && focus)
1970 { 2002 {
1971 if (options & Opt_cursorUnderline) 2003 if (OPTION (Opt_cursorUnderline))
1972 *crp ^= RS_Uline; 2004 *crp ^= RS_Uline;
1973 else 2005 else
1974 { 2006 {
1975 *crp ^= RS_RVid; 2007 *crp ^= RS_RVid;
1976 2008
… …
1978 cc1 = *crp & (RS_fgMask | RS_bgMask); 2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
1979 if (ISSET_PIXCOLOR (Color_cursor)) 2011 if (ISSET_PIXCOLOR (Color_cursor))
1980 ccol1 = Color_cursor; 2012 ccol1 = Color_cursor;
1981 else 2013 else
1982#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1983 ccol1 = GET_FGCOLOR (rstyle); 2015 ccol1 = fgcolor_of (rstyle);
1984#else 2016#else
1985 ccol1 = Color_fg; 2017 ccol1 = Color_fg;
1986#endif 2018#endif
1987 if (ISSET_PIXCOLOR (Color_cursor2)) 2019 if (ISSET_PIXCOLOR (Color_cursor2))
1988 ccol2 = Color_cursor2; 2020 ccol2 = Color_cursor2;
1989 else 2021 else
1990#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1991 ccol2 = GET_BGCOLOR (rstyle); 2023 ccol2 = bgcolor_of (rstyle);
1992#else 2024#else
1993 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
1994#endif 2026#endif
1995 *crp = SET_FGCOLOR (*crp, ccol1); 2027 *crp = SET_FGCOLOR (*crp, ccol1);
1996 *crp = SET_BGCOLOR (*crp, ccol2); 2028 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2001 2033
2002 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 2035 setoldcursor = 0;
2004 if (ocrow != -1) 2036 if (ocrow != -1)
2005 { 2037 {
2006 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2007 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2008 { 2040 {
2009 if (ocrow < nrow 2041 if (ocrow < nrow
2010 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2011 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2019 else if (!focus) 2051 else if (!focus)
2020 setoldcursor = 1; 2052 setoldcursor = 1;
2021 2053
2022 if (setoldcursor) 2054 if (setoldcursor)
2023 { 2055 {
2024 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2025 oldcursor.row = -1; 2057 oldcursor.row = -1;
2026 else 2058 else
2027 { 2059 {
2028 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2029 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2030 } 2062 }
2031 } 2063 }
2032 } 2064 }
2033 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2034#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2035 scr_swap_overlay (); 2068 scr_swap_overlay ();
2036#endif 2069#endif
2037 2070
2038#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
… …
2054 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2055 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2056 { 2089 {
2057 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2058 { 2091 {
2059 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2060 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2061 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2062 2095
2063 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2064 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2088 if (wlen < len) 2121 if (wlen < len)
2089 ::swap (wlen, len); 2122 ::swap (wlen, len);
2090 2123
2091 XCopyArea (display->display, vt, vt, 2124 XCopyArea (display->display, vt, vt,
2092 gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2093 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2094 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2095 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2096 len = -1; 2129 len = -1;
2097 } 2130 }
2098 } 2131 }
… …
2102 /* 2135 /*
2103 * E: main pass across every character 2136 * E: main pass across every character
2104 */ 2137 */
2105 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2106 { 2139 {
2107 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2108 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2109 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2110 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2111 2144
2112 /* 2145 /*
2113 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2177 count++, i--; 2210 count++, i--;
2178 2211
2179 /* 2212 /*
2180 * Determine the attributes for the string 2213 * Determine the attributes for the string
2181 */ 2214 */
2182 int fore = GET_FGCOLOR (rend); // desired foreground 2215 int fore = fgcolor_of (rend); // desired foreground
2183 int back = GET_BGCOLOR (rend); // desired background 2216 int back = bgcolor_of (rend); // desired background
2184 2217
2185 // only do special processing if any attributes are set, which is rare 2218 // only do special processing if any attributes are set, which is unlikely
2186 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2187 { 2220 {
2188#if ENABLE_STYLES 2221#if ENABLE_STYLES
2189 // force redraw after "careful" characters to avoid pixel droppings 2222 // force redraw after "careful" characters to avoid pixel droppings
2190 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2301 } /* for (row....) */ 2334 } /* for (row....) */
2302 2335
2303#if ENABLE_OVERLAY 2336#if ENABLE_OVERLAY
2304 scr_swap_overlay (); 2337 scr_swap_overlay ();
2305#endif 2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2306 2340
2307 /* 2341 /*
2308 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2309 */ 2343 */
2310 if (showcursor) 2344 if (showcursor)
2311 { 2345 {
2312 if (focus) 2346 if (focus)
2313 { 2347 {
2314 if (options & Opt_cursorUnderline) 2348 if (OPTION (Opt_cursorUnderline))
2315 *crp ^= RS_Uline; 2349 *crp ^= RS_Uline;
2316 else 2350 else
2317 { 2351 {
2318 *crp ^= RS_RVid; 2352 *crp ^= RS_RVid;
2319#ifndef NO_CURSORCOLOR 2353#ifndef NO_CURSORCOLOR
… …
2349 /* 2383 /*
2350 * H: cleanup selection 2384 * H: cleanup selection
2351 */ 2385 */
2352 scr_reverse_selection (); 2386 scr_reverse_selection ();
2353 2387
2354 if (refresh_type & SMOOTH_REFRESH)
2355 XFlush (display->display);
2356
2357 num_scr = 0; 2388 num_scr = 0;
2358 num_scr_allow = 1; 2389 num_scr_allow = 1;
2359} 2390}
2360 2391
2361void 2392void
2362rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2363{ 2394{
2364 if (!l.t) 2395 if (!l.t)
2365 return; 2396 return;
2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2366 2399
2367 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2368 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]));
2369} 2402}
2370 2403
… …
2423 2456
2424 if (really) 2457 if (really)
2425 XClearWindow (display->display, vt); 2458 XClearWindow (display->display, vt);
2426} 2459}
2427 2460
2461void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2463{
2464 int view_end = view_start + nrow;
2465 int row, col;
2466
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = beg_col; col < end_col; col++)
2473 srp[col] ^= rstyle1;
2474
2475 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= rstyle2;
2477
2478 if (++col < end_col)
2479 srp[col] ^= rstyle2;
2480 }
2481}
2482
2483void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2485{
2486 int view_end = view_start + nrow;
2487 int row, col;
2488
2489 if (beg_row >= view_start)
2490 {
2491 col = beg_col;
2492 row = beg_row;
2493 }
2494 else
2495 {
2496 col = 0;
2497 row = view_start;
2498 }
2499
2500 for (; row < min (end_row, view_end); row++, col = 0)
2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2502 srp[col] ^= rstyle;
2503
2504 if (row == end_row)
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle;
2507}
2508
2428/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2429void 2510void
2430rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2431{ 2512{
2432 if (selection.op 2513 if (selection.op
2433 && current_screen == selection.screen 2514 && current_screen == selection.screen
2434 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2435 { 2516 {
2436 int view_end = -view_start + nrow;
2437 int row, col;
2438
2439#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2440 if (selection.rect) 2518 if (selection.rect)
2441 { 2519 scr_xor_rect (selection.beg.row, selection.beg.col,
2442 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2520 selection.end.row, selection.end.col,
2443 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2521 RS_RVid, RS_RVid | RS_Uline);
2444 srp[col] ^= RS_RVid;
2445 }
2446 else 2522 else
2447#endif 2523#endif
2448 { 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2449 if (selection.beg.row >= -view_start) 2525 selection.end.row, selection.end.col,
2450 { 2526 RS_RVid);
2451 col = selection.beg.col;
2452 row = selection.beg.row;
2453 }
2454 else
2455 {
2456 col = 0;
2457 row = view_start;
2458 }
2459
2460 for (; row < min (selection.end.row, view_end); row++, col = 0)
2461 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2462 srp[col] ^= RS_RVid;
2463
2464 if (row == selection.end.row)
2465 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2466 srp[col] ^= RS_RVid;
2467 }
2468 } 2527 }
2469} 2528}
2470 2529
2471/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2472/* 2531/*
… …
2510 2569
2511 if (!selection.op) 2570 if (!selection.op)
2512 return; 2571 return;
2513 2572
2514 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2515 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2516 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2517 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2518 || (check_more == 1 2577 || (check_more == 1
2519 && current_screen == selection.screen 2578 && current_screen == selection.screen
2520 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2521 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2522 || (check_more == 2 2581 || (check_more == 2
… …
2533/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2534/* 2593/*
2535 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2536 */ 2595 */
2537void 2596void
2538rxvt_term::paste (unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2539{ 2598{
2540 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2541 for (unsigned int i = 0; i < len; i++) 2600 for (unsigned int i = 0; i < len; i++)
2542 if (data[i] == C0_LF) 2601 if (data[i] == C0_LF)
2543 data[i] = C0_CR; 2602 data[i] = C0_CR;
… …
2687 { 2746 {
2688 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2689 char *s = rxvt_wcstombs (w); 2748 char *s = rxvt_wcstombs (w);
2690 free (w); 2749 free (w);
2691 // TODO: strlen == only the first element will be converted. well... 2750 // TODO: strlen == only the first element will be converted. well...
2692 paste ((unsigned char *)s, strlen (s)); 2751 paste (s, strlen (s));
2693 free (s); 2752 free (s);
2694 } 2753 }
2695 else 2754 else
2696#endif 2755#endif
2697 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2698 && cl) 2757 && cl)
2699 { 2758 {
2700 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2701 paste ((unsigned char *)cl[i], strlen (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2702 2761
2703 XFreeStringList (cl); 2762 XFreeStringList (cl);
2704 } 2763 }
2705 else 2764 else
2706 paste (ct.value, ct.nitems); // paste raw 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2707 2766
2708bailout: 2767bailout:
2709 XFree (ct.value); 2768 XFree (ct.value);
2710 2769
2711 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
… …
2749 return; /* outside window */ 2808 return; /* outside window */
2750 2809
2751 if (selection.text) 2810 if (selection.text)
2752 { /* internal selection */ 2811 { /* internal selection */
2753 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2754 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2755 free (str); 2814 free (str);
2756 return; 2815 return;
2757 } 2816 }
2758 else 2817 else
2759 { 2818 {
… …
2851 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2852 2911
2853 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2855 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2856 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2858 2920
2859 int ofs = 0; 2921 int ofs = 0;
2860 int extra = 0; 2922 int extra = 0;
… …
2872 col = selection.beg.col; 2934 col = selection.beg.col;
2873 end_col = ncol + 1; 2935 end_col = ncol + 1;
2874 } 2936 }
2875 else 2937 else
2876#endif 2938#endif
2877 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2878 2940
2879 col = max (col, 0); 2941 col = max (col, 0);
2880 2942
2881 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2882 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2883 2949
2884 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2885 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2886 { 2953 {
2887 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2888 t++; 2955 t++;
2889#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2905#endif 2972#endif
2906 else 2973 else
2907 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2908 } 2975 }
2909 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2910 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2911 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2912 } 2991 }
2913 2992
2914 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2915 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
2916 2995
… …
2926 3005
2927 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2928 selection.len = ofs; 3007 selection.len = ofs;
2929 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2930 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2931 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2932 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2933 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2934 else 3027 else
2935 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2936 3032
2937#if 0 3033#if 0
2938 XTextProperty ct; 3034 XTextProperty ct;
2939 3035
2940 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2941 { 3037 {
2942 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2943 XFree (ct.value); 3039 XFree (ct.value);
2944 } 3040 }
2945#endif 3041#endif
2946
2947 selection_time = tm;
2948} 3042}
2949 3043
2950/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2951/* 3045/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2956rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2957{ 3051{
2958 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2959 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2960 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
2961 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2962 3065
2963 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2964 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2965 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
2966 0, /* button 3 */ 3069 0, /* button 3 */
2967 1, /* button press */ 3070 1, /* button press */
2968 0); /* click change */ 3071 0); /* click change */
2969} 3072}
2970 3073
… …
2975void 3078void
2976rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2977{ 3080{
2978 want_refresh = 1; 3081 want_refresh = 1;
2979 3082
2980 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
2981 selection.mark.col = col; 3084 selection.mark.col = col;
2982 3085
2983 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2984 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2985 3088
2986 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
2987 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2988 --selection.mark.col; 3091 --selection.mark.col;
… …
3016 text_t *stp; 3119 text_t *stp;
3017 rend_t *srp; 3120 rend_t *srp;
3018 3121
3019 if (dirn == UP) 3122 if (dirn == UP)
3020 { 3123 {
3021 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3022 bound.col = 0; 3125 bound.col = 0;
3023 dirnadd = -1; 3126 dirnadd = -1;
3024 } 3127 }
3025 else 3128 else
3026 { 3129 {
… …
3074 } 3177 }
3075 } 3178 }
3076 break; 3179 break;
3077 } 3180 }
3078 3181
3079Old_Word_Selection_You_Die:
3080 if (dirn == DN) 3182 if (dirn == DN)
3081 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3082 3184
3083 /* Poke the values back in */ 3185 /* Poke the values back in */
3084 ret->row = row; 3186 ret->row = row;
… …
3105 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3106 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3107 */ 3209 */
3108 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3109 && (col == selection.mark.col 3211 && (col == selection.mark.col
3110 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3111 { 3213 {
3112 /* select nothing */ 3214 /* select nothing */
3113 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3114 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3115 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3170 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3171 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3172 } 3274 }
3173 3275
3174 pos.col = col; 3276 pos.col = col;
3175 pos.row = row - view_start; 3277 pos.row = view_start + row;
3176 3278
3177 /* 3279 /*
3178 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3179 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3180 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3267 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3268 } 3370 }
3269 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3270 { 3372 {
3271#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3272 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3273 { 3375 {
3274 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3275 3377
3276 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3277 { 3379 {
… …
3338 { 3440 {
3339 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3340 3442
3341 while (--end_col >= 0) 3443 while (--end_col >= 0)
3342 { 3444 {
3343 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3344 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3345 && stp[end_col] != NOCHAR)
3346 break; 3447 break;
3347 } 3448 }
3348 3449
3349 if (end_col >= 0 3450 if (end_col >= 0
3350 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3549 3650
3550#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3551void 3652void
3552rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3553{ 3654{
3554 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3555 return; 3656 return;
3556 3657
3557 want_refresh = 1; 3658 want_refresh = 1;
3558 3659
3559 scr_overlay_off (); 3660 scr_overlay_off ();
… …
3666 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3667 { 3768 {
3668 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3669 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3670 3771
3671 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3672 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3673 3774
3674 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3675 { 3776 {
3676 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 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