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.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.229 by root, Sun Jan 15 06:39:19 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 selection_check (0); 666 if (selection.beg.row < top_row
626 } 667 || selection.end.row < top_row
627 668 || selection.mark.row < top_row)
628 for (int i = count; i--; )
629 scr_blank_screen_mem (ROW(row2 - i), rstyle);
630
631 if ((options & Opt_scrollWithBuffer)
632 && view_start != 0
633 && view_start != saveLines)
634 scr_page (UP, count);
635 }
636 else
637 {
638 if (selection.op && current_screen == selection.screen)
639 {
640 int i = selection.beg.row;
641 int j = selection.end.row;
642
643 if ((i < row1 && j > row1)
644 || (i < row2 && j > row2)
645 || (i - count < row1 && i >= row1)
646 || (i - count > row2 && i <= row2)
647 || (j - count < row1 && j >= row1)
648 || (j - count > row2 && j <= row2))
649 { 669 {
650 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
652 } 672 }
653 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680 }
681 else
682 {
683 if (selection.op && current_screen == selection.screen)
684 {
685 if ((selection.beg.row < row1 && selection.end.row > row1)
686 || (selection.beg.row < row2 && selection.end.row > row2)
687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
689 || (selection.end.row - count < row1 && selection.end.row >= row1)
690 || (selection.end.row - count > row2 && selection.end.row <= row2))
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 else if (selection.end.row >= row1 && selection.end.row <= row2)
654 { 696 {
655 /* move selected region too */ 697 /* move selected region too */
656 selection.beg.row -= count; 698 selection.beg.row -= count;
657 selection.end.row -= count; 699 selection.end.row -= count;
658 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
666 708
667 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
668 710
669 min_it (count, rows); 711 min_it (count, rows);
670 712
713 line_t *temp_buf = row_buf + total_rows;
714
671 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
672 { 716 {
673 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
674 718
675 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
686/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
687/* 731/*
688 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
689 */ 733 */
690void 734void
691rxvt_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)
692{ 736{
693 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
694 return; 738 return;
695 739
696 unsigned char checksel; 740 unsigned char checksel;
697 unicode_t c; 741 unicode_t c;
698 int last_col; 742 int ncol = this->ncol;
699 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
700 744
701 want_refresh = 1; 745 want_refresh = 1;
702 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
703 last_col = ncol;
704 747
705 if (nlines > 0) 748 if (minlines > 0)
706 { 749 {
707 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
708 if (nlines > 0 752 if (minlines > 0
709 && screen.tscroll == 0 753 && screen.tscroll == 0
710 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
711 { 755 {
712 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
714 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
715 } 759 }
716 } 760 }
717 761
718#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
719 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
720 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
721 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
722#endif 766#endif
723 int row = screen.cur.row; 767 int row = screen.cur.row;
724 768
725 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
726 770
727 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
728 772
729 while (str < strend) 773 while (str < strend)
730 { 774 {
731 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
732 776
733 if (c < 0x20) 777 if (c < 0x20)
734 if (c == C0_LF) 778 if (c == C0_LF)
735 { 779 {
736 if (!line->is_longer ()) /* XXX: think about this */
737 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
738 781
739 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
740 783
741 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
742 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
746 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
747 continue; 790 continue;
748 } 791 }
749 else if (c == C0_CR) 792 else if (c == C0_CR)
750 { 793 {
751 if (!line->is_longer ()) /* XXX: think about this */
752 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
753 795
754 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
755 screen.cur.col = 0; 797 screen.cur.col = 0;
756 continue; 798 continue;
757 } 799 }
… …
774 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
775 } 817 }
776 818
777 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
778 { 820 {
821 max_it (line->l, ncol);
779 line->set_is_longer (); 822 line->is_longer (1);
780 823
781 scr_do_wrap (); 824 scr_do_wrap ();
782 825
783 row = screen.cur.row; 826 row = screen.cur.row;
784 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
792 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
793 // 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
794 // locale. 837 // locale.
795 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
796 839
797 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
798 { 841 {
799 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
800 // 5f-7e standard vt100 843 // 5f-7e standard vt100
801 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
802 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
854 } 897 }
855 898
856 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
857 900
858 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
859 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
860 { 903 {
861 // ...output spaces 904 // ...output spaces
862 c = ' '; 905 c = ' ';
863 // and try the same character next loop iteration 906 // and try the same character next loop iteration
864 --str; 907 --str;
865 } 908 }
866 909
910 line->touch ();
911
867 do 912 do
868 { 913 {
869 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
870 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
871 916
872 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
873 screen.cur.col++; 918 screen.cur.col++;
874 else 919 else
875 { 920 {
876 line->l = last_col; 921 line->l = ncol;
877 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
878 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
879 break; 924 break;
880 } 925 }
881 926
… …
883 } 928 }
884 while (--width > 0); 929 while (--width > 0);
885 930
886 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
887 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
888 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++)
889 { 937 {
890 line->t[c] = ' '; 938 line->t[c] = ' ';
891 line->r[c] = rend; 939 line->r[c] = rend;
892 } 940 }
941 }
893 } 942 }
894 else // width == 0 943 else // width == 0
895 { 944 {
896#if ENABLE_COMBINING 945#if ENABLE_COMBINING
897 // handle combining characters 946 // handle combining characters
898 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
899 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
900 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
901 text_t *tp; 951 text_t *tp;
902 rend_t *rp; 952 rend_t *rp;
903 953
904 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
905 { 955 {
956 linep = line;
906 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
907 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
908
909 while (*tp == NOCHAR && tp > line->t)
910 tp--, rp--;
911 } 959 }
912 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
913 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
914 { 962 {
915 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
916
917 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
918 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
919
920 while (*tp == NOCHAR && tp > line->t)
921 tp--, rp--;
922 } 966 }
923 else 967 else
924 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
925 974
926 // first try to find a precomposed character 975 // first try to find a precomposed character
927 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
928 if (n == NOCHAR) 977 if (n == NOCHAR)
929 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
932 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
933#endif 982#endif
934 } 983 }
935 } 984 }
936 985
937 if (!line->is_longer ()) /* XXX: think about this */
938 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
939 987
940#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
941 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
942#endif 990#endif
943} 991}
… …
993 1041
994 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
995 if (tabs[i]) 1043 if (tabs[i])
996 { 1044 {
997 x = i; 1045 x = i;
1046
998 if (!--count) 1047 if (!--count)
999 break; 1048 break;
1000 } 1049 }
1001 else 1050 else
1002 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1005 if (count) 1054 if (count)
1006 x = ncol - 1; 1055 x = ncol - 1;
1007 1056
1008 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1009 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1010 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1011 { 1060 {
1012 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1013 1062
1014 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1015 max_it (l.l, x);
1016 1064
1017 i = screen.cur.col; 1065 i = screen.cur.col;
1018 1066
1019 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1020 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1074{ 1122{
1075 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1076 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1077 else 1125 else
1078 { 1126 {
1079 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1127 line_t &l = ROW(screen.cur.row);
1080 ROW(screen.cur.row).l = ncol; 1128
1129 l.touch ();
1130 l.is_longer (0);
1081 1131
1082 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1083 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1084 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1085 } 1135 }
… …
1176 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1177 1227
1178 selection_check (1); 1228 selection_check (1);
1179 1229
1180 line_t &line = ROW(screen.cur.row); 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1181 1234
1182 switch (mode) 1235 switch (mode)
1183 { 1236 {
1184 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1185 col = screen.cur.col; 1238 col = screen.cur.col;
… …
1271 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1272 } 1325 }
1273 else 1326 else
1274 { 1327 {
1275 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1276 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1277 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1278 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1279 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 } 1334 }
1282 1335
1283 for (; num--; row++) 1336 for (; num--; row++)
1284 { 1337 {
1285 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1286 ROW (row).l = 0;
1287 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1288 } 1340 }
1289} 1341}
1290 1342
1291#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1293rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1294{ 1346{
1295 want_refresh = 1; 1347 want_refresh = 1;
1296 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1297 1349
1298 nsaved = 0; 1350 top_row = 0;
1299} 1351}
1300#endif 1352#endif
1301 1353
1302/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1303/* 1355/*
… …
1324 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1325 1377
1326 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1327 *r1++ = fs; 1379 *r1++ = fs;
1328 1380
1329 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1330 } 1383 }
1331} 1384}
1332 1385
1333/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1334/* 1387/*
… …
1382 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1383 1436
1384 row = screen.cur.row; 1437 row = screen.cur.row;
1385 1438
1386 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1387 1443
1388 switch (insdel) 1444 switch (insdel)
1389 { 1445 {
1390 case INSERT: 1446 case INSERT:
1391 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1392 { 1448 {
1393 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1394 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1395 } 1451 }
1396 1452
1397 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1398 {
1399 line->l += count;
1400 min_it (line->l, ncol);
1401 }
1402 1454
1403 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1404 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1405 { 1457 {
1406 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1419 1471
1420 case ERASE: 1472 case ERASE:
1421 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1422 selection_check (1); 1474 selection_check (1);
1423 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1424 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1425 break; 1479 break;
1426 1480
1427 case DELETE: 1481 case DELETE:
1428 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1431 { 1485 {
1432 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1433 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1434 } 1488 }
1435 1489
1490 line->l = max (line->l - count, 0);
1436 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1437
1438 if (line->is_longer ()) /* break line continuation */
1439 line->l = ncol;
1440
1441 line->l = max (line->l - count, 0);
1442 1492
1443 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1444 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1445 { 1495 {
1446 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1558rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1559{ 1609{
1560 if (mode < 0) 1610 if (mode < 0)
1561 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1562 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1563 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1564} 1614}
1565 1615
1566/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1567/* 1617/*
1568 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1580 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1581#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1582 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1583#endif 1633#endif
1584#if TRANSPARENT 1634#if TRANSPARENT
1585 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1586#endif 1636#endif
1587 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1588 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1589 1639
1590 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1615 * Set font style 1665 * Set font style
1616 */ 1666 */
1617void 1667void
1618rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1619{ 1669{
1670#if 0
1620 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1621 { 1672 {
1622 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1623 break; 1674 break;
1624 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1625 break; 1676 break;
… …
1632 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1633 break; 1684 break;
1634 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1635 break; 1686 break;
1636 } 1687 }
1688#endif
1637} 1689}
1638 1690
1639/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1640/* 1692/*
1641 * Choose a font 1693 * Choose a font
… …
1756/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1757/* 1809/*
1758 * 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
1759 * the top of the screen 1811 * the top of the screen
1760 */ 1812 */
1761int 1813void
1762rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1763{ 1815{
1764 long p = 0; 1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1);
1765 unsigned int oldviewstart;
1766 1817
1767 oldviewstart = view_start; 1818 scr_changeview (p);
1768
1769 if (y < len)
1770 {
1771 p = (nrow + nsaved) * (len - y) / len;
1772 p -= (long) (nrow - 1);
1773 p = max (p, 0);
1774 }
1775
1776 view_start = (unsigned int)min (p, nsaved);
1777
1778 return scr_changeview (oldviewstart);
1779} 1819}
1780 1820
1781/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1782/* 1822/*
1783 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1784 * direction should be UP or DN 1824 * direction should be UP or DN
1785 */ 1825 */
1786int 1826bool
1787rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1788{ 1828{
1789 int n; 1829 int new_view_start =
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (direction == UP)
1795 {
1796 n = view_start + nlines;
1797 view_start = min (n, nsaved);
1798 }
1799 else
1800 {
1801 n = view_start - nlines; 1830 direction == UP ? view_start - nlines
1802 view_start = max (n, 0); 1831 : view_start + nlines;
1803 }
1804 1832
1805 return scr_changeview (oldviewstart); 1833 return scr_changeview (new_view_start);
1806} 1834}
1807 1835
1808int 1836bool
1809rxvt_term::scr_changeview (unsigned int oldviewstart) 1837rxvt_term::scr_changeview (int new_view_start)
1810{ 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1811 if (view_start != oldviewstart) 1841 if (new_view_start == view_start)
1812 { 1842 return false;
1843
1844 num_scr += new_view_start - view_start;
1845 view_start = new_view_start;
1846 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1813 want_refresh = 1; 1847 want_refresh = 1;
1814 num_scr -= (view_start - oldviewstart);
1815 }
1816 1848
1817 return (int) (view_start - oldviewstart); 1849 return true;
1818} 1850}
1819 1851
1820/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1821void 1853void
1822rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1823{ 1855{
1824#ifndef NO_BELL 1856#ifndef NO_BELL
1825 1857
1826# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1827# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1828 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1829# endif 1861# endif
1830 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1831# endif 1863# endif
1832 1864
1833 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1834 { 1866 {
1835 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
1836 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1837 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1838 } 1871 }
1839 else 1872 else
1840 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
1854 if ((fd = popen_printer ()) == NULL) 1887 if ((fd = popen_printer ()) == NULL)
1855 return; 1888 return;
1856 1889
1857 if (fullhist) 1890 if (fullhist)
1858 { 1891 {
1859 nrows = nrow + nsaved; 1892 nrows = nrow - top_row;
1860 row_start = -nsaved; 1893 row_start = top_row;
1861 } 1894 }
1862 else 1895 else
1863 { 1896 {
1864 nrows = nrow; 1897 nrows = nrow;
1865 row_start = -view_start; 1898 row_start = view_start;
1866 } 1899 }
1867 1900
1868 wctomb (0, 0); 1901 wctomb (0, 0);
1869 1902
1870 for (int r1 = 0; r1 < nrows; r1++) 1903 for (int r1 = 0; r1 < nrows; r1++)
… …
1929 1962
1930#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1931 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1932#endif 1965#endif
1933#if TRANSPARENT 1966#if TRANSPARENT
1934 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1935#endif 1968#endif
1936 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1937 1970
1938 /* 1971 /*
1939 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1963 1996
1964 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
1965 1998
1966 if (showcursor && focus) 1999 if (showcursor && focus)
1967 { 2000 {
1968 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
1969 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
1970 else 2003 else
1971 { 2004 {
1972 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
1973 2006
… …
1975 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1976 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1977 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1978 else 2011 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1981#else 2014#else
1982 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
1983#endif 2016#endif
1984 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
1985 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
1986 else 2019 else
1987#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1988 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
1989#else 2022#else
1990 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
1991#endif 2024#endif
1992 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
1993 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1998 2031
1999 /* make sure no outline cursor is left around */ 2032 /* make sure no outline cursor is left around */
2000 setoldcursor = 0; 2033 setoldcursor = 0;
2001 if (ocrow != -1) 2034 if (ocrow != -1)
2002 { 2035 {
2003 if (screen.cur.row + view_start != ocrow 2036 if (screen.cur.row - view_start != ocrow
2004 || screen.cur.col != oldcursor.col) 2037 || screen.cur.col != oldcursor.col)
2005 { 2038 {
2006 if (ocrow < nrow 2039 if (ocrow < nrow
2007 && oldcursor.col < ncol) 2040 && oldcursor.col < ncol)
2008 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2016 else if (!focus) 2049 else if (!focus)
2017 setoldcursor = 1; 2050 setoldcursor = 1;
2018 2051
2019 if (setoldcursor) 2052 if (setoldcursor)
2020 { 2053 {
2021 if (screen.cur.row + view_start >= nrow) 2054 if (screen.cur.row - view_start >= nrow)
2022 oldcursor.row = -1; 2055 oldcursor.row = -1;
2023 else 2056 else
2024 { 2057 {
2025 oldcursor.row = screen.cur.row + view_start; 2058 oldcursor.row = screen.cur.row - view_start;
2026 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2027 } 2060 }
2028 } 2061 }
2029 } 2062 }
2030 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2031#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2032 scr_swap_overlay (); 2066 scr_swap_overlay ();
2033#endif 2067#endif
2034 2068
2035#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2051 row = i > 0 ? 0 : j - 1; 2085 row = i > 0 ? 0 : j - 1;
2052 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2053 { 2087 {
2054 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2055 { 2089 {
2056 line_t s = ROW(row - view_start); 2090 line_t s = ROW(view_start + row);
2057 line_t d = drawn_buf[row]; 2091 line_t d = drawn_buf[row];
2058 line_t d2 = drawn_buf[row + i]; 2092 line_t d2 = drawn_buf[row + i];
2059 2093
2060 for (nits = 0, col = ncol; col--; ) 2094 for (nits = 0, col = ncol; col--; )
2061 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2085 if (wlen < len) 2119 if (wlen < len)
2086 ::swap (wlen, len); 2120 ::swap (wlen, len);
2087 2121
2088 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2089 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2090 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2091 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2092 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2093 len = -1; 2127 len = -1;
2094 } 2128 }
2095 } 2129 }
… …
2099 /* 2133 /*
2100 * E: main pass across every character 2134 * E: main pass across every character
2101 */ 2135 */
2102 for (row = 0; row < nrow; row++) 2136 for (row = 0; row < nrow; row++)
2103 { 2137 {
2104 text_t *stp = ROW(row - view_start).t; 2138 text_t *stp = ROW(view_start + row).t;
2105 rend_t *srp = ROW(row - view_start).r; 2139 rend_t *srp = ROW(view_start + row).r;
2106 text_t *dtp = drawn_buf[row].t; 2140 text_t *dtp = drawn_buf[row].t;
2107 rend_t *drp = drawn_buf[row].r; 2141 rend_t *drp = drawn_buf[row].r;
2108 2142
2109 /* 2143 /*
2110 * E2: OK, now the real pass 2144 * E2: OK, now the real pass
… …
2174 count++, i--; 2208 count++, i--;
2175 2209
2176 /* 2210 /*
2177 * Determine the attributes for the string 2211 * Determine the attributes for the string
2178 */ 2212 */
2179 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2180 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2181 2215
2182 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2183 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2184 { 2218 {
2185#if ENABLE_STYLES 2219#if ENABLE_STYLES
2186 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2187 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2298 } /* for (row....) */ 2332 } /* for (row....) */
2299 2333
2300#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2301 scr_swap_overlay (); 2335 scr_swap_overlay ();
2302#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2303 2338
2304 /* 2339 /*
2305 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2306 */ 2341 */
2307 if (showcursor) 2342 if (showcursor)
2308 { 2343 {
2309 if (focus) 2344 if (focus)
2310 { 2345 {
2311 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2312 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2313 else 2348 else
2314 { 2349 {
2315 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2316#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2346 /* 2381 /*
2347 * H: cleanup selection 2382 * H: cleanup selection
2348 */ 2383 */
2349 scr_reverse_selection (); 2384 scr_reverse_selection ();
2350 2385
2351 if (refresh_type & SMOOTH_REFRESH)
2352 XFlush (display->display);
2353
2354 num_scr = 0; 2386 num_scr = 0;
2355 num_scr_allow = 1; 2387 num_scr_allow = 1;
2356} 2388}
2357 2389
2358void 2390void
2359rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2360{ 2392{
2361 if (!l.t) 2393 if (!l.t)
2362 return; 2394 return;
2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2363 2397
2364 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2365 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2366} 2400}
2367 2401
… …
2420 2454
2421 if (really) 2455 if (really)
2422 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2423} 2457}
2424 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2425/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2426void 2508void
2427rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2428{ 2510{
2429 if (selection.op 2511 if (selection.op
2430 && current_screen == selection.screen 2512 && current_screen == selection.screen
2431 && selection.end.row >= -view_start) 2513 && selection.end.row >= view_start)
2432 { 2514 {
2433 int view_end = -view_start + nrow;
2434 int row, col;
2435
2436#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2437 if (selection.rect) 2516 if (selection.rect)
2438 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2439 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2440 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2519 RS_RVid, RS_RVid | RS_Uline);
2441 srp[col] ^= RS_RVid;
2442 }
2443 else 2520 else
2444#endif 2521#endif
2445 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2446 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2447 { 2524 RS_RVid);
2448 col = selection.beg.col;
2449 row = selection.beg.row;
2450 }
2451 else
2452 {
2453 col = 0;
2454 row = view_start;
2455 }
2456
2457 for (; row < min (selection.end.row, view_end); row++, col = 0)
2458 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2459 srp[col] ^= RS_RVid;
2460
2461 if (row == selection.end.row)
2462 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2463 srp[col] ^= RS_RVid;
2464 }
2465 } 2525 }
2466} 2526}
2467 2527
2468/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2469/* 2529/*
… …
2507 2567
2508 if (!selection.op) 2568 if (!selection.op)
2509 return; 2569 return;
2510 2570
2511 pos.row = pos.col = 0; 2571 pos.row = pos.col = 0;
2512 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2572 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2513 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2573 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2514 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2515 || (check_more == 1 2575 || (check_more == 1
2516 && current_screen == selection.screen 2576 && current_screen == selection.screen
2517 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2518 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2519 || (check_more == 2 2579 || (check_more == 2
… …
2530/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2531/* 2591/*
2532 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2533 */ 2593 */
2534void 2594void
2535rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2536{ 2596{
2537 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2538 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2539 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2540 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2684 { 2744 {
2685 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2686 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2687 free (w); 2747 free (w);
2688 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2689 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2690 free (s); 2750 free (s);
2691 } 2751 }
2692 else 2752 else
2693#endif 2753#endif
2694 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2695 && cl) 2755 && cl)
2696 { 2756 {
2697 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2698 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2699 2759
2700 XFreeStringList (cl); 2760 XFreeStringList (cl);
2701 } 2761 }
2702 else 2762 else
2703 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2704 2764
2705bailout: 2765bailout:
2706 XFree (ct.value); 2766 XFree (ct.value);
2707 2767
2708 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2746 return; /* outside window */ 2806 return; /* outside window */
2747 2807
2748 if (selection.text) 2808 if (selection.text)
2749 { /* internal selection */ 2809 { /* internal selection */
2750 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2751 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2752 free (str); 2812 free (str);
2753 return; 2813 return;
2754 } 2814 }
2755 else 2815 else
2756 { 2816 {
… …
2848 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2849 2909
2850 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2851 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2852 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2853 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2854 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2855 2918
2856 int ofs = 0; 2919 int ofs = 0;
2857 int extra = 0; 2920 int extra = 0;
… …
2869 col = selection.beg.col; 2932 col = selection.beg.col;
2870 end_col = ncol + 1; 2933 end_col = ncol + 1;
2871 } 2934 }
2872 else 2935 else
2873#endif 2936#endif
2874 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2875 2938
2876 col = max (col, 0); 2939 col = max (col, 0);
2877 2940
2878 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2879 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2880 2947
2881 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2882 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2883 { 2951 {
2884 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2885 t++; 2953 t++;
2886#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2902#endif 2970#endif
2903 else 2971 else
2904 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2905 } 2973 }
2906 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2907 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
2908 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2909 } 2989 }
2910 2990
2911 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2912 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
2913 2993
… …
2923 3003
2924 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2925 selection.len = ofs; 3005 selection.len = ofs;
2926 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2927 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
2928 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2929 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2930 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2931 else 3025 else
2932 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
2933 3030
2934#if 0 3031#if 0
2935 XTextProperty ct; 3032 XTextProperty ct;
2936 3033
2937 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2938 { 3035 {
2939 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2940 XFree (ct.value); 3037 XFree (ct.value);
2941 } 3038 }
2942#endif 3039#endif
2943
2944 selection_time = tm;
2945} 3040}
2946 3041
2947/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
2948/* 3043/*
2949 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2953rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
2954{ 3049{
2955 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
2957 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
2958 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2959 3063
2960 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
2961 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
2962 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
2963 0, /* button 3 */ 3067 0, /* button 3 */
2964 1, /* button press */ 3068 1, /* button press */
2965 0); /* click change */ 3069 0); /* click change */
2966} 3070}
2967 3071
… …
2972void 3076void
2973rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
2974{ 3078{
2975 want_refresh = 1; 3079 want_refresh = 1;
2976 3080
2977 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
2978 selection.mark.col = col; 3082 selection.mark.col = col;
2979 3083
2980 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2981 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2982 3086
2983 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
2984 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2985 --selection.mark.col; 3089 --selection.mark.col;
… …
3013 text_t *stp; 3117 text_t *stp;
3014 rend_t *srp; 3118 rend_t *srp;
3015 3119
3016 if (dirn == UP) 3120 if (dirn == UP)
3017 { 3121 {
3018 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3019 bound.col = 0; 3123 bound.col = 0;
3020 dirnadd = -1; 3124 dirnadd = -1;
3021 } 3125 }
3022 else 3126 else
3023 { 3127 {
… …
3071 } 3175 }
3072 } 3176 }
3073 break; 3177 break;
3074 } 3178 }
3075 3179
3076Old_Word_Selection_You_Die:
3077 if (dirn == DN) 3180 if (dirn == DN)
3078 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3079 3182
3080 /* Poke the values back in */ 3183 /* Poke the values back in */
3081 ret->row = row; 3184 ret->row = row;
… …
3102 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3103 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3104 */ 3207 */
3105 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3106 && (col == selection.mark.col 3209 && (col == selection.mark.col
3107 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3108 { 3211 {
3109 /* select nothing */ 3212 /* select nothing */
3110 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3111 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3112 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3167 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3168 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3169 } 3272 }
3170 3273
3171 pos.col = col; 3274 pos.col = col;
3172 pos.row = row - view_start; 3275 pos.row = view_start + row;
3173 3276
3174 /* 3277 /*
3175 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3176 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3177 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3264 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3265 } 3368 }
3266 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3267 { 3370 {
3268#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3269 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3270 { 3373 {
3271 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3272 3375
3273 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3274 { 3377 {
… …
3335 { 3438 {
3336 stp = ROW(end_row).t; 3439 stp = ROW(end_row).t;
3337 3440
3338 while (--end_col >= 0) 3441 while (--end_col >= 0)
3339 { 3442 {
3340 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3341 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3342 && stp[end_col] != NOCHAR)
3343 break; 3445 break;
3344 } 3446 }
3345 3447
3346 if (end_col >= 0 3448 if (end_col >= 0
3347 || !ROW(end_row - 1).is_longer ()) 3449 || !ROW(end_row - 1).is_longer ())
… …
3546 3648
3547#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3548void 3650void
3549rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3550{ 3652{
3551 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3552 return; 3654 return;
3553 3655
3554 want_refresh = 1; 3656 want_refresh = 1;
3555 3657
3556 scr_overlay_off (); 3658 scr_overlay_off ();
… …
3663 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3664 { 3766 {
3665 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3666 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3667 3769
3668 text_t *t2 = ROW(y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3669 rend_t *r2 = ROW(y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3670 3772
3671 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3672 { 3774 {
3673 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3674 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 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