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.198 by root, Tue Dec 27 01:25:42 2005 UTC vs.
Revision 1.233 by root, Mon Jan 16 06:37:52 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() \
… …
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
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;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
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) const
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)
… …
352 qcol += len; 356 qcol += len;
353 } 357 }
354 } 358 }
355 359
356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 361 qline->is_longer (0);
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 363 }
366 while (p != pend && q > 0); 364 while (p != pend && q > 0);
367 365
368 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
369 nsaved = term_start - q; 367 top_row = q - term_start;
370 368
371 // make sure all terminal lines exist 369 // make sure all terminal lines exist
372 while (nsaved < 0) 370 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374
375 } 372 }
376 else 373 else
377 { 374 {
378 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
379 376
… …
393 390
394 term_start = 0; 391 term_start = 0;
395 } 392 }
396 393
397#ifdef DEBUG_STRICT //TODO: remove 394#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
399 assert (ROW (i).t); 396 assert (ROW (i).t);
400#endif 397#endif
401 398
402 free (old_buf); 399 free (old_buf);
403 delete old_ta; 400 delete old_ta;
… …
417 414
418 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
420 417
421 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 421}
423 422
424/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
425/* 424/*
426 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
432 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
433 432
434 free (row_buf); 433 free (row_buf);
435 free (swap_buf); 434 free (swap_buf);
436 free (drawn_buf); 435 free (drawn_buf);
437 free (temp_buf);
438 free (tabs); 436 free (tabs);
439 437
440 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
441} 439}
442 440
… …
530 528
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 531
534#if NSCREENS 532#if NSCREENS
535 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
536 { 534 {
537 num_scr = 0; 535 num_scr = 0;
538 536
539 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
540 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
544 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
546 } 544 }
547 else 545 else
548#endif 546#endif
549 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551 549
552 return scrn; 550 return scrn;
553} 551}
554 552
… …
574 * Change the colour for following text 572 * Change the colour for following text
575 */ 573 */
576void 574void
577rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
578{ 576{
579 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
580 color = fgbg; 578 color = fgbg;
581 579
582 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
583 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
584 else 582 else
… …
615 want_refresh = 1; 613 want_refresh = 1;
616 num_scr += count; 614 num_scr += count;
617 615
618 if (count > 0 616 if (count > 0
619 && row1 == 0 617 && row1 == 0
620 && row2 == nrow - 1
621 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
622 { 619 {
623 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
624 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
625 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
626 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
627 { 661 {
628 selection.beg.row -= count; 662 selection.beg.row -= count;
629 selection.end.row -= count; 663 selection.end.row -= count;
630 selection.mark.row -= count; 664 selection.mark.row -= count;
631 665
632 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
633 || selection.end.row < -nsaved 667 || selection.end.row < top_row
634 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
635 { 669 {
636 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
638 } 672 }
639 } 673 }
640 674
641 for (int i = count; i--; ) 675 // finally move the view window, if desired
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
646
647 if ((options & Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
648 && view_start != 0 677 && view_start != 0
649 && view_start != saveLines) 678 && view_start != -saveLines)
650 scr_page (UP, count); 679 scr_page (UP, count);
651 } 680 }
652 else 681 else
653 { 682 {
654 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
… …
679 708
680 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
681 710
682 min_it (count, rows); 711 min_it (count, rows);
683 712
713 line_t *temp_buf = row_buf + total_rows;
714
684 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
685 { 716 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687 718
688 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
699/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
700/* 731/*
701 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
702 */ 733 */
703void 734void
704rxvt_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)
705{ 736{
706 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
707 return; 738 return;
708 739
709 unsigned char checksel; 740 unsigned char checksel;
710 unicode_t c; 741 unicode_t c;
711 int last_col; 742 int ncol = this->ncol;
712 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
713 744
714 want_refresh = 1; 745 want_refresh = 1;
715 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
716 last_col = ncol;
717 747
718 if (nlines > 0) 748 if (minlines > 0)
719 { 749 {
720 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
721 if (nlines > 0 752 if (minlines > 0
722 && screen.tscroll == 0 753 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
724 { 755 {
725 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
727 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
728 } 759 }
729 } 760 }
730 761
731#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
732 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
733 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
734 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
735#endif 766#endif
736 int row = screen.cur.row; 767 int row = screen.cur.row;
737 768
738 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
739 770
740 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
741 772
742 while (str < strend) 773 while (str < strend)
743 { 774 {
744 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
745 776
746 if (c < 0x20) 777 if (c < 0x20)
747 if (c == C0_LF) 778 if (c == C0_LF)
748 { 779 {
749 if (!line->is_longer ()) /* XXX: think about this */
750 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
751 781
752 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
753 783
754 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
755 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
759 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
760 continue; 790 continue;
761 } 791 }
762 else if (c == C0_CR) 792 else if (c == C0_CR)
763 { 793 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
766 795
767 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
768 screen.cur.col = 0; 797 screen.cur.col = 0;
769 continue; 798 continue;
770 } 799 }
… …
787 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
788 } 817 }
789 818
790 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
791 { 820 {
821 max_it (line->l, ncol);
792 line->set_is_longer (); 822 line->is_longer (1);
793 823
794 scr_do_wrap (); 824 scr_do_wrap ();
795 825
796 row = screen.cur.row; 826 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
805 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
806 // 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
807 // locale. 837 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
809 839
810 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 841 {
812 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 843 // 5f-7e standard vt100
814 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
815 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
867 } 897 }
868 898
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870 900
871 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
873 { 903 {
874 // ...output spaces 904 // ...output spaces
875 c = ' '; 905 c = ' ';
876 // and try the same character next loop iteration 906 // and try the same character next loop iteration
877 --str; 907 --str;
878 } 908 }
879 909
910 line->touch ();
911
880 do 912 do
881 { 913 {
882 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
883 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
884 916
885 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
886 screen.cur.col++; 918 screen.cur.col++;
887 else 919 else
888 { 920 {
889 line->l = last_col; 921 line->l = ncol;
890 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
891 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
892 break; 924 break;
893 } 925 }
894 926
… …
896 } 928 }
897 while (--width > 0); 929 while (--width > 0);
898 930
899 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
900 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
901 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++)
902 { 937 {
903 line->t[c] = ' '; 938 line->t[c] = ' ';
904 line->r[c] = rend; 939 line->r[c] = rend;
905 } 940 }
941 }
906 } 942 }
907 else // width == 0 943 else // width == 0
908 { 944 {
909#if ENABLE_COMBINING 945#if ENABLE_COMBINING
910 // handle combining characters 946 // handle combining characters
911 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
912 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
913 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
914 text_t *tp; 951 text_t *tp;
915 rend_t *rp; 952 rend_t *rp;
916 953
917 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
918 { 955 {
956 linep = line;
919 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
920 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
921
922 while (*tp == NOCHAR && tp > line->t)
923 tp--, rp--;
924 } 959 }
925 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
926 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
927 { 962 {
928 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
929
930 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
931 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
932
933 while (*tp == NOCHAR && tp > line->t)
934 tp--, rp--;
935 } 966 }
936 else 967 else
937 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
938 974
939 // first try to find a precomposed character 975 // first try to find a precomposed character
940 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
941 if (n == NOCHAR) 977 if (n == NOCHAR)
942 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
946#endif 982#endif
947 } 983 }
948 } 984 }
949 985
950 if (!line->is_longer ()) /* XXX: think about this */
951 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
952 987
953#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
954 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
955#endif 990#endif
956} 991}
… …
1006 1041
1007 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1008 if (tabs[i]) 1043 if (tabs[i])
1009 { 1044 {
1010 x = i; 1045 x = i;
1046
1011 if (!--count) 1047 if (!--count)
1012 break; 1048 break;
1013 } 1049 }
1014 else 1050 else
1015 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1018 if (count) 1054 if (count)
1019 x = ncol - 1; 1055 x = ncol - 1;
1020 1056
1021 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1022 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1023 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1024 { 1060 {
1025 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1026 1062
1027 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1028 max_it (l.l, x);
1029 1064
1030 i = screen.cur.col; 1065 i = screen.cur.col;
1031 1066
1032 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1033 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1087{ 1122{
1088 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1125 else
1091 { 1126 {
1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1127 line_t &l = ROW(screen.cur.row);
1093 ROW(screen.cur.row).l = ncol; 1128
1129 l.touch ();
1130 l.is_longer (0);
1094 1131
1095 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1096 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1097 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1098 } 1135 }
… …
1189 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1190 1227
1191 selection_check (1); 1228 selection_check (1);
1192 1229
1193 line_t &line = ROW(screen.cur.row); 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1194 1234
1195 switch (mode) 1235 switch (mode)
1196 { 1236 {
1197 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1198 col = screen.cur.col; 1238 col = screen.cur.col;
… …
1284 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1285 } 1325 }
1286 else 1326 else
1287 { 1327 {
1288 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1289 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1290 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1291 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1292 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1293 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1294 } 1334 }
1295 1335
1296 for (; num--; row++) 1336 for (; num--; row++)
1297 { 1337 {
1298 ROW (row).l = 0;
1299 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1300 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1301 } 1340 }
1302} 1341}
1303 1342
1304#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1306rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1307{ 1346{
1308 want_refresh = 1; 1347 want_refresh = 1;
1309 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1310 1349
1311 nsaved = 0; 1350 top_row = 0;
1312} 1351}
1313#endif 1352#endif
1314 1353
1315/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1316/* 1355/*
… …
1337 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1338 1377
1339 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1340 *r1++ = fs; 1379 *r1++ = fs;
1341 1380
1342 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1343 } 1383 }
1344} 1384}
1345 1385
1346/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1347/* 1387/*
… …
1395 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1396 1436
1397 row = screen.cur.row; 1437 row = screen.cur.row;
1398 1438
1399 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1400 1443
1401 switch (insdel) 1444 switch (insdel)
1402 { 1445 {
1403 case INSERT: 1446 case INSERT:
1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1405 { 1448 {
1406 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1407 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1408 } 1451 }
1409 1452
1410 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1411 {
1412 line->l += count;
1413 min_it (line->l, ncol);
1414 }
1415 1454
1416 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1457 {
1419 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1432 1471
1433 case ERASE: 1472 case ERASE:
1434 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1435 selection_check (1); 1474 selection_check (1);
1436 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1437 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1479 break;
1439 1480
1440 case DELETE: 1481 case DELETE:
1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1444 { 1485 {
1445 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1446 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1447 } 1488 }
1448 1489
1490 line->l = max (line->l - count, 0);
1449 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1450
1451 if (line->is_longer ()) /* break line continuation */
1452 line->l = ncol;
1453
1454 line->l = max (line->l - count, 0);
1455 1492
1456 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1495 {
1459 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1571rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1572{ 1609{
1573 if (mode < 0) 1610 if (mode < 0)
1574 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1575 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1576 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1577} 1614}
1578 1615
1579/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1580/* 1617/*
1581 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1594#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1595 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1596#endif 1633#endif
1597#if TRANSPARENT 1634#if TRANSPARENT
1598 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1599#endif 1636#endif
1600 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1601 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1602 1639
1603 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1628 * Set font style 1665 * Set font style
1629 */ 1666 */
1630void 1667void
1631rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1632{ 1669{
1670#if 0
1633 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1634 { 1672 {
1635 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1636 break; 1674 break;
1637 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1638 break; 1676 break;
… …
1645 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1646 break; 1684 break;
1647 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1648 break; 1686 break;
1649 } 1687 }
1688#endif
1650} 1689}
1651 1690
1652/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1653/* 1692/*
1654 * Choose a font 1693 * Choose a font
… …
1769/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1770/* 1809/*
1771 * 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
1772 * the top of the screen 1811 * the top of the screen
1773 */ 1812 */
1774int 1813void
1775rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1776{ 1815{
1777 long p = 0; 1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1778 unsigned int oldviewstart;
1779
1780 oldviewstart = view_start;
1781
1782 if (y < len)
1783 {
1784 p = (nrow + nsaved) * (len - y) / len;
1785 p -= (long) (nrow - 1);
1786 p = max (p, 0);
1787 }
1788
1789 view_start = (unsigned int)min (p, nsaved);
1790
1791 return scr_changeview (oldviewstart);
1792} 1817}
1793 1818
1794/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1795/* 1820/*
1796 * Page the screen up/down nlines 1821 * Page the screen up/down nlines
1797 * direction should be UP or DN 1822 * direction should be UP or DN
1798 */ 1823 */
1799int 1824bool
1800rxvt_term::scr_page (enum page_dirn direction, int nlines) 1825rxvt_term::scr_page (enum page_dirn direction, int nlines)
1801{ 1826{
1802 int n; 1827 int new_view_start =
1803 unsigned int oldviewstart;
1804
1805 oldviewstart = view_start;
1806
1807 if (direction == UP)
1808 {
1809 n = view_start + nlines;
1810 view_start = min (n, nsaved);
1811 }
1812 else
1813 {
1814 n = view_start - nlines; 1828 direction == UP ? view_start - nlines
1815 view_start = max (n, 0); 1829 : view_start + nlines;
1816 }
1817 1830
1818 return scr_changeview (oldviewstart); 1831 return scr_changeview (new_view_start);
1819} 1832}
1820 1833
1821int 1834bool
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1835rxvt_term::scr_changeview (int new_view_start)
1823{ 1836{
1837 clamp_it (new_view_start, top_row, 0);
1838
1824 if (view_start != oldviewstart) 1839 if (new_view_start == view_start)
1825 { 1840 return false;
1841
1842 num_scr += new_view_start - view_start;
1843 view_start = new_view_start;
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1826 want_refresh = 1; 1845 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart);
1828 }
1829 1846
1830 return (int) (view_start - oldviewstart); 1847 return true;
1831} 1848}
1832 1849
1833/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1834void 1851void
1835rxvt_term::scr_bell () 1852rxvt_term::scr_bell ()
1836{ 1853{
1837#ifndef NO_BELL 1854#ifndef NO_BELL
1838 1855
1839# ifndef NO_MAPALERT 1856# ifndef NO_MAPALERT
1840# ifdef MAPALERT_OPTION 1857# ifdef MAPALERT_OPTION
1841 if (options & Opt_mapAlert) 1858 if (OPTION (Opt_mapAlert))
1842# endif 1859# endif
1843 XMapWindow (display->display, parent[0]); 1860 XMapWindow (display->display, parent[0]);
1844# endif 1861# endif
1845 1862
1846 if (options & Opt_visualBell) 1863 if (OPTION (Opt_visualBell))
1847 { 1864 {
1848 scr_rvideo_mode (!rvideo); /* refresh also done */ 1865 scr_rvideo_mode (!rvideo); /* refresh also done */
1866 display->flush ();
1849 rxvt_usleep (VISUAL_BELL_DURATION); 1867 rxvt_usleep (VISUAL_BELL_DURATION);
1850 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1851 } 1869 }
1852 else 1870 else
1853 XBell (display->display, 0); 1871 XBell (display->display, 0);
… …
1867 if ((fd = popen_printer ()) == NULL) 1885 if ((fd = popen_printer ()) == NULL)
1868 return; 1886 return;
1869 1887
1870 if (fullhist) 1888 if (fullhist)
1871 { 1889 {
1872 nrows = nrow + nsaved; 1890 nrows = nrow - top_row;
1873 row_start = -nsaved; 1891 row_start = top_row;
1874 } 1892 }
1875 else 1893 else
1876 { 1894 {
1877 nrows = nrow; 1895 nrows = nrow;
1878 row_start = -view_start; 1896 row_start = view_start;
1879 } 1897 }
1880 1898
1881 wctomb (0, 0); 1899 wctomb (0, 0);
1882 1900
1883 for (int r1 = 0; r1 < nrows; r1++) 1901 for (int r1 = 0; r1 < nrows; r1++)
… …
1942 1960
1943#if XPM_BACKGROUND 1961#if XPM_BACKGROUND
1944 must_clear |= bgPixmap.pixmap != None; 1962 must_clear |= bgPixmap.pixmap != None;
1945#endif 1963#endif
1946#if TRANSPARENT 1964#if TRANSPARENT
1947 must_clear |= (options & Opt_transparent) && am_transparent; 1965 must_clear |= OPTION (Opt_transparent) && am_transparent;
1948#endif 1966#endif
1949 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1950 1968
1951 /* 1969 /*
1952 * B: reverse any characters which are selected 1970 * B: reverse any characters which are selected
… …
1976 1994
1977 crp = &ROW(screen.cur.row).r[col]; 1995 crp = &ROW(screen.cur.row).r[col];
1978 1996
1979 if (showcursor && focus) 1997 if (showcursor && focus)
1980 { 1998 {
1981 if (options & Opt_cursorUnderline) 1999 if (OPTION (Opt_cursorUnderline))
1982 *crp ^= RS_Uline; 2000 *crp ^= RS_Uline;
1983 else 2001 else
1984 { 2002 {
1985 *crp ^= RS_RVid; 2003 *crp ^= RS_RVid;
1986 2004
… …
1988 cc1 = *crp & (RS_fgMask | RS_bgMask); 2006 cc1 = *crp & (RS_fgMask | RS_bgMask);
1989 if (ISSET_PIXCOLOR (Color_cursor)) 2007 if (ISSET_PIXCOLOR (Color_cursor))
1990 ccol1 = Color_cursor; 2008 ccol1 = Color_cursor;
1991 else 2009 else
1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2010#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1993 ccol1 = GET_FGCOLOR (rstyle); 2011 ccol1 = fgcolor_of (rstyle);
1994#else 2012#else
1995 ccol1 = Color_fg; 2013 ccol1 = Color_fg;
1996#endif 2014#endif
1997 if (ISSET_PIXCOLOR (Color_cursor2)) 2015 if (ISSET_PIXCOLOR (Color_cursor2))
1998 ccol2 = Color_cursor2; 2016 ccol2 = Color_cursor2;
1999 else 2017 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2018#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol2 = GET_BGCOLOR (rstyle); 2019 ccol2 = bgcolor_of (rstyle);
2002#else 2020#else
2003 ccol2 = Color_bg; 2021 ccol2 = Color_bg;
2004#endif 2022#endif
2005 *crp = SET_FGCOLOR (*crp, ccol1); 2023 *crp = SET_FGCOLOR (*crp, ccol1);
2006 *crp = SET_BGCOLOR (*crp, ccol2); 2024 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2011 2029
2012 /* make sure no outline cursor is left around */ 2030 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2031 setoldcursor = 0;
2014 if (ocrow != -1) 2032 if (ocrow != -1)
2015 { 2033 {
2016 if (screen.cur.row + view_start != ocrow 2034 if (screen.cur.row - view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2035 || screen.cur.col != oldcursor.col)
2018 { 2036 {
2019 if (ocrow < nrow 2037 if (ocrow < nrow
2020 && oldcursor.col < ncol) 2038 && oldcursor.col < ncol)
2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2039 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2029 else if (!focus) 2047 else if (!focus)
2030 setoldcursor = 1; 2048 setoldcursor = 1;
2031 2049
2032 if (setoldcursor) 2050 if (setoldcursor)
2033 { 2051 {
2034 if (screen.cur.row + view_start >= nrow) 2052 if (screen.cur.row - view_start >= nrow)
2035 oldcursor.row = -1; 2053 oldcursor.row = -1;
2036 else 2054 else
2037 { 2055 {
2038 oldcursor.row = screen.cur.row + view_start; 2056 oldcursor.row = screen.cur.row - view_start;
2039 oldcursor.col = screen.cur.col; 2057 oldcursor.col = screen.cur.col;
2040 } 2058 }
2041 } 2059 }
2042 } 2060 }
2043 2061
2062 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2063#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2064 scr_swap_overlay ();
2046#endif 2065#endif
2047 2066
2048#ifndef NO_SLOW_LINK_SUPPORT 2067#ifndef NO_SLOW_LINK_SUPPORT
… …
2064 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2085 {
2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2087 {
2069 line_t s = ROW(row - view_start); 2088 line_t s = ROW(view_start + row);
2070 line_t d = drawn_buf[row]; 2089 line_t d = drawn_buf[row];
2071 line_t d2 = drawn_buf[row + i]; 2090 line_t d2 = drawn_buf[row + i];
2072 2091
2073 for (nits = 0, col = ncol; col--; ) 2092 for (nits = 0, col = ncol; col--; )
2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2093 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2098 if (wlen < len) 2117 if (wlen < len)
2099 ::swap (wlen, len); 2118 ::swap (wlen, len);
2100 2119
2101 XCopyArea (display->display, vt, vt, 2120 XCopyArea (display->display, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2121 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2122 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2123 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2124 0, Row2Pixel (len));
2106 len = -1; 2125 len = -1;
2107 } 2126 }
2108 } 2127 }
… …
2112 /* 2131 /*
2113 * E: main pass across every character 2132 * E: main pass across every character
2114 */ 2133 */
2115 for (row = 0; row < nrow; row++) 2134 for (row = 0; row < nrow; row++)
2116 { 2135 {
2117 text_t *stp = ROW(row - view_start).t; 2136 text_t *stp = ROW(view_start + row).t;
2118 rend_t *srp = ROW(row - view_start).r; 2137 rend_t *srp = ROW(view_start + row).r;
2119 text_t *dtp = drawn_buf[row].t; 2138 text_t *dtp = drawn_buf[row].t;
2120 rend_t *drp = drawn_buf[row].r; 2139 rend_t *drp = drawn_buf[row].r;
2121 2140
2122 /* 2141 /*
2123 * E2: OK, now the real pass 2142 * E2: OK, now the real pass
… …
2187 count++, i--; 2206 count++, i--;
2188 2207
2189 /* 2208 /*
2190 * Determine the attributes for the string 2209 * Determine the attributes for the string
2191 */ 2210 */
2192 int fore = GET_FGCOLOR (rend); // desired foreground 2211 int fore = fgcolor_of (rend); // desired foreground
2193 int back = GET_BGCOLOR (rend); // desired background 2212 int back = bgcolor_of (rend); // desired background
2194 2213
2195 // only do special processing if any attributes are set, which is unlikely 2214 // only do special processing if any attributes are set, which is unlikely
2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2215 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2197 { 2216 {
2198#if ENABLE_STYLES 2217#if ENABLE_STYLES
… …
2311 } /* for (row....) */ 2330 } /* for (row....) */
2312 2331
2313#if ENABLE_OVERLAY 2332#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2333 scr_swap_overlay ();
2315#endif 2334#endif
2335 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2336
2317 /* 2337 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2338 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2339 */
2320 if (showcursor) 2340 if (showcursor)
2321 { 2341 {
2322 if (focus) 2342 if (focus)
2323 { 2343 {
2324 if (options & Opt_cursorUnderline) 2344 if (OPTION (Opt_cursorUnderline))
2325 *crp ^= RS_Uline; 2345 *crp ^= RS_Uline;
2326 else 2346 else
2327 { 2347 {
2328 *crp ^= RS_RVid; 2348 *crp ^= RS_RVid;
2329#ifndef NO_CURSORCOLOR 2349#ifndef NO_CURSORCOLOR
… …
2359 /* 2379 /*
2360 * H: cleanup selection 2380 * H: cleanup selection
2361 */ 2381 */
2362 scr_reverse_selection (); 2382 scr_reverse_selection ();
2363 2383
2364 if (refresh_type & SMOOTH_REFRESH)
2365 XFlush (display->display);
2366
2367 num_scr = 0; 2384 num_scr = 0;
2368 num_scr_allow = 1; 2385 num_scr_allow = 1;
2369} 2386}
2370 2387
2371void 2388void
2372rxvt_term::scr_remap_chars (const line_t &l) 2389rxvt_term::scr_remap_chars (line_t &l)
2373{ 2390{
2374 if (!l.t) 2391 if (!l.t)
2375 return; 2392 return;
2393
2394 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2376 2395
2377 for (int i = ncol; i--; ) 2396 for (int i = ncol; i--; )
2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2397 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2379} 2398}
2380 2399
… …
2433 2452
2434 if (really) 2453 if (really)
2435 XClearWindow (display->display, vt); 2454 XClearWindow (display->display, vt);
2436} 2455}
2437 2456
2457void
2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2459{
2460 int view_end = view_start + nrow;
2461 int row, col;
2462
2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = beg_col; col < end_col; col++)
2469 srp[col] ^= rstyle1;
2470
2471 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= rstyle2;
2473
2474 if (++col < end_col)
2475 srp[col] ^= rstyle2;
2476 }
2477}
2478
2479void
2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2481{
2482 int view_end = view_start + nrow;
2483 int row, col;
2484
2485 if (beg_row >= view_start)
2486 {
2487 col = beg_col;
2488 row = beg_row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = view_start;
2494 }
2495
2496 for (; row < min (end_row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= rstyle;
2499
2500 if (row == end_row)
2501 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2502 srp[col] ^= rstyle;
2503}
2504
2438/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2439void 2506void
2440rxvt_term::scr_reverse_selection () 2507rxvt_term::scr_reverse_selection ()
2441{ 2508{
2442 if (selection.op 2509 if (selection.op
2443 && current_screen == selection.screen 2510 && current_screen == selection.screen
2444 && selection.end.row >= -view_start) 2511 && selection.end.row >= view_start)
2445 { 2512 {
2446 int view_end = -view_start + nrow;
2447 int row, col;
2448
2449#if ENABLE_FRILLS 2513#if ENABLE_FRILLS
2450 if (selection.rect) 2514 if (selection.rect)
2451 { 2515 scr_xor_rect (selection.beg.row, selection.beg.col,
2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2516 selection.end.row, selection.end.col,
2453 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2517 RS_RVid, RS_RVid | RS_Uline);
2454 srp[col] ^= RS_RVid;
2455 }
2456 else 2518 else
2457#endif 2519#endif
2458 { 2520 scr_xor_span (selection.beg.row, selection.beg.col,
2459 if (selection.beg.row >= -view_start) 2521 selection.end.row, selection.end.col,
2460 { 2522 RS_RVid);
2461 col = selection.beg.col;
2462 row = selection.beg.row;
2463 }
2464 else
2465 {
2466 col = 0;
2467 row = -view_start;
2468 }
2469
2470 for (; row < min (selection.end.row, view_end); row++, col = 0)
2471 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2472 srp[col] ^= RS_RVid;
2473
2474 if (row == selection.end.row)
2475 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477 }
2478 } 2523 }
2479} 2524}
2480 2525
2481/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2482/* 2527/*
… …
2520 2565
2521 if (!selection.op) 2566 if (!selection.op)
2522 return; 2567 return;
2523 2568
2524 pos.row = pos.col = 0; 2569 pos.row = pos.col = 0;
2525 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2570 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2526 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2571 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2527 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2572 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2528 || (check_more == 1 2573 || (check_more == 1
2529 && current_screen == selection.screen 2574 && current_screen == selection.screen
2530 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2575 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2531 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2576 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2532 || (check_more == 2 2577 || (check_more == 2
… …
2543/* ------------------------------------------------------------------------- */ 2588/* ------------------------------------------------------------------------- */
2544/* 2589/*
2545 * Paste a selection direct to the command fd 2590 * Paste a selection direct to the command fd
2546 */ 2591 */
2547void 2592void
2548rxvt_term::paste (unsigned char *data, unsigned int len) 2593rxvt_term::paste (char *data, unsigned int len)
2549{ 2594{
2550 /* convert normal newline chars into common keyboard Return key sequence */ 2595 /* convert normal newline chars into common keyboard Return key sequence */
2551 for (unsigned int i = 0; i < len; i++) 2596 for (unsigned int i = 0; i < len; i++)
2552 if (data[i] == C0_LF) 2597 if (data[i] == C0_LF)
2553 data[i] = C0_CR; 2598 data[i] = C0_CR;
… …
2697 { 2742 {
2698 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2743 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2699 char *s = rxvt_wcstombs (w); 2744 char *s = rxvt_wcstombs (w);
2700 free (w); 2745 free (w);
2701 // TODO: strlen == only the first element will be converted. well... 2746 // TODO: strlen == only the first element will be converted. well...
2702 paste ((unsigned char *)s, strlen (s)); 2747 paste (s, strlen (s));
2703 free (s); 2748 free (s);
2704 } 2749 }
2705 else 2750 else
2706#endif 2751#endif
2707 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2752 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2708 && cl) 2753 && cl)
2709 { 2754 {
2710 for (int i = 0; i < cr; i++) 2755 for (int i = 0; i < cr; i++)
2711 paste ((unsigned char *)cl[i], strlen (cl[i])); 2756 paste (cl[i], strlen (cl[i]));
2712 2757
2713 XFreeStringList (cl); 2758 XFreeStringList (cl);
2714 } 2759 }
2715 else 2760 else
2716 paste (ct.value, ct.nitems); // paste raw 2761 paste ((char *)ct.value, ct.nitems); // paste raw
2717 2762
2718bailout: 2763bailout:
2719 XFree (ct.value); 2764 XFree (ct.value);
2720 2765
2721 if (selection_wait == Sel_normal) 2766 if (selection_wait == Sel_normal)
… …
2759 return; /* outside window */ 2804 return; /* outside window */
2760 2805
2761 if (selection.text) 2806 if (selection.text)
2762 { /* internal selection */ 2807 { /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len); 2808 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste ((unsigned char *)str, strlen (str)); 2809 paste (str, strlen (str));
2765 free (str); 2810 free (str);
2766 return; 2811 return;
2767 } 2812 }
2768 else 2813 else
2769 { 2814 {
… …
2861 selection.op = SELECTION_DONE; 2906 selection.op = SELECTION_DONE;
2862 2907
2863 if (selection.clicks == 4) 2908 if (selection.clicks == 4)
2864 return; /* nothing selected, go away */ 2909 return; /* nothing selected, go away */
2865 2910
2911 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2912 return;
2913
2866 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2914 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2867 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2915 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2868 2916
2869 int ofs = 0; 2917 int ofs = 0;
2870 int extra = 0; 2918 int extra = 0;
… …
2882 col = selection.beg.col; 2930 col = selection.beg.col;
2883 end_col = ncol + 1; 2931 end_col = ncol + 1;
2884 } 2932 }
2885 else 2933 else
2886#endif 2934#endif
2887 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2935 end_col = ROW(row).l;
2888 2936
2889 col = max (col, 0); 2937 col = max (col, 0);
2890 2938
2891 if (row == selection.end.row || selection.rect) 2939 if (row == selection.end.row
2940#if ENABLE_FRILLS
2941 || selection.rect
2942#endif
2943 )
2892 end_col = min (end_col, selection.end.col); 2944 min_it (end_col, selection.end.col);
2893 2945
2894 t = ROW(row).t + col; 2946 t = ROW(row).t + col;
2947
2895 for (; col < end_col; col++) 2948 for (; col < end_col; col++)
2896 { 2949 {
2897 if (*t == NOCHAR) 2950 if (*t == NOCHAR)
2898 t++; 2951 t++;
2899#if ENABLE_COMBINING 2952#if ENABLE_COMBINING
… …
2915#endif 2968#endif
2916 else 2969 else
2917 new_selection_text[ofs++] = *t++; 2970 new_selection_text[ofs++] = *t++;
2918 } 2971 }
2919 2972
2973#if ENABLE_FRILLS
2974 if (selection.rect)
2975 {
2976 while (ofs
2977 && new_selection_text[ofs - 1] != C0_LF
2978 && unicode::is_space (new_selection_text[ofs - 1]))
2979 --ofs;
2980
2981 new_selection_text[ofs++] = C0_LF;
2982 }
2983 else
2984#endif
2920 if (!ROW(row).is_longer () && row != selection.end.row) 2985 if (!ROW(row).is_longer () && row != selection.end.row)
2921 new_selection_text[ofs++] = C0_LF; 2986 new_selection_text[ofs++] = C0_LF;
2922 } 2987 }
2923 2988
2924 if (end_col != selection.end.col) 2989 if (end_col != selection.end.col)
2925 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2926 2991
… …
2936 3001
2937 // we usually allocate much more than necessary, so realloc it smaller again 3002 // we usually allocate much more than necessary, so realloc it smaller again
2938 selection.len = ofs; 3003 selection.len = ofs;
2939 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3004 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2940 3005
3006 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3007 return;
3008
3009 selection_grab (tm);
3010}
3011
3012bool
3013rxvt_term::selection_grab (Time tm)
3014{
3015 selection_time = tm;
3016
2941 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3017 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2942 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3018 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3019 {
2943 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
3021 return true;
3022 }
2944 else 3023 else
2945 rxvt_warn ("can't get primary selection, ignoring.\n"); 3024 {
3025 selection_clear ();
3026 return false;
3027 }
2946 3028
2947#if 0 3029#if 0
2948 XTextProperty ct; 3030 XTextProperty ct;
2949 3031
2950 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2951 { 3033 {
2952 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3034 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2953 XFree (ct.value); 3035 XFree (ct.value);
2954 } 3036 }
2955#endif 3037#endif
2956
2957 selection_time = tm;
2958} 3038}
2959 3039
2960/* ------------------------------------------------------------------------- */ 3040/* ------------------------------------------------------------------------- */
2961/* 3041/*
2962 * Mark or select text based upon number of clicks: 1, 2, or 3 3042 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2966rxvt_term::selection_click (int clicks, int x, int y) 3046rxvt_term::selection_click (int clicks, int x, int y)
2967{ 3047{
2968 clicks = ((clicks - 1) % 3) + 1; 3048 clicks = ((clicks - 1) % 3) + 1;
2969 selection.clicks = clicks; /* save clicks so extend will work */ 3049 selection.clicks = clicks; /* save clicks so extend will work */
2970 3050
3051 if (clicks == 2 && !selection.rect
3052 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3053 {
3054 MEvent.clicks = 1; // what a mess
3055 selection.screen = current_screen;
3056 selection.op = SELECTION_CONT;
3057 return;
3058 }
3059
2971 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2972 3061
2973 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
2974 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
2975 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
2976 0, /* button 3 */ 3065 0, /* button 3 */
2977 1, /* button press */ 3066 1, /* button press */
2978 0); /* click change */ 3067 0); /* click change */
2979} 3068}
2980 3069
… …
2985void 3074void
2986rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
2987{ 3076{
2988 want_refresh = 1; 3077 want_refresh = 1;
2989 3078
2990 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
2991 selection.mark.col = col; 3080 selection.mark.col = col;
2992 3081
2993 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2994 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2995 3084
2996 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
2997 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2998 --selection.mark.col; 3087 --selection.mark.col;
… …
3026 text_t *stp; 3115 text_t *stp;
3027 rend_t *srp; 3116 rend_t *srp;
3028 3117
3029 if (dirn == UP) 3118 if (dirn == UP)
3030 { 3119 {
3031 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3032 bound.col = 0; 3121 bound.col = 0;
3033 dirnadd = -1; 3122 dirnadd = -1;
3034 } 3123 }
3035 else 3124 else
3036 { 3125 {
… …
3084 } 3173 }
3085 } 3174 }
3086 break; 3175 break;
3087 } 3176 }
3088 3177
3089Old_Word_Selection_You_Die:
3090 if (dirn == DN) 3178 if (dirn == DN)
3091 col++; /* put us on one past the end */ 3179 col++; /* put us on one past the end */
3092 3180
3093 /* Poke the values back in */ 3181 /* Poke the values back in */
3094 ret->row = row; 3182 ret->row = row;
… …
3115 * select nothing. Otherwise, if we're to the right of the mark, you have to 3203 * select nothing. Otherwise, if we're to the right of the mark, you have to
3116 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3117 */ 3205 */
3118 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3119 && (col == selection.mark.col 3207 && (col == selection.mark.col
3120 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3121 { 3209 {
3122 /* select nothing */ 3210 /* select nothing */
3123 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3124 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3125 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3180 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3181 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3182 } 3270 }
3183 3271
3184 pos.col = col; 3272 pos.col = col;
3185 pos.row = row - view_start; 3273 pos.row = view_start + row;
3186 3274
3187 /* 3275 /*
3188 * This is mainly xterm style selection with a couple of differences, mainly 3276 * This is mainly xterm style selection with a couple of differences, mainly
3189 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3190 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3277 selection_delimit_word (DN, &selection.end, &selection.end); 3365 selection_delimit_word (DN, &selection.end, &selection.end);
3278 } 3366 }
3279 else if (selection.clicks == 3) 3367 else if (selection.clicks == 3)
3280 { 3368 {
3281#if ENABLE_FRILLS 3369#if ENABLE_FRILLS
3282 if (options & Opt_tripleclickwords) 3370 if (OPTION (Opt_tripleclickwords))
3283 { 3371 {
3284 selection_delimit_word (UP, &selection.beg, &selection.beg); 3372 selection_delimit_word (UP, &selection.beg, &selection.beg);
3285 3373
3286 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3374 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3287 { 3375 {
… …
3348 { 3436 {
3349 stp = ROW(end_row).t; 3437 stp = ROW(end_row).t;
3350 3438
3351 while (--end_col >= 0) 3439 while (--end_col >= 0)
3352 { 3440 {
3353 if (stp[end_col] != ' ' 3441 if (stp[end_col] != NOCHAR
3354 && stp[end_col] != '\t' 3442 && !unicode::is_space (stp[end_col]))
3355 && stp[end_col] != NOCHAR)
3356 break; 3443 break;
3357 } 3444 }
3358 3445
3359 if (end_col >= 0 3446 if (end_col >= 0
3360 || !ROW(end_row - 1).is_longer ()) 3447 || !ROW(end_row - 1).is_longer ())
… …
3559 3646
3560#if ENABLE_OVERLAY 3647#if ENABLE_OVERLAY
3561void 3648void
3562rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3649rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3563{ 3650{
3564 if (nrow < 3 || ncol < 3) 3651 if (nrow < 1 || ncol < 1)
3565 return; 3652 return;
3566 3653
3567 want_refresh = 1; 3654 want_refresh = 1;
3568 3655
3569 scr_overlay_off (); 3656 scr_overlay_off ();
… …
3676 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3677 { 3764 {
3678 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3679 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3680 3767
3681 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3682 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3683 3770
3684 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3685 { 3772 {
3686 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3687 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3774 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