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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.239 by root, Thu Jan 19 17:14:46 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.
… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_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
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch ();
130
129 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
140} 142}
141 143
142/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
143/* 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 */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
174 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
175 { 180 {
176 //TODO//FIXME 181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 top_row--;
180 } 185 }
181 186
182 want_refresh = 1; 187 want_refresh = 1;
183 188
184 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
189 194
190 if (!row_buf) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * 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
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
255 } 258 }
256 } 259 }
257#endif 260#endif
258 261
259 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));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 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));
262 264
263 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
264 { 266 {
265 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
270 { 272 {
271 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);
272 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);
273 } 275 }
274 276
277 line_t *old_buf = row_buf;
275 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));
276 279
277 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
278 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
280 283
281 if (nsaved) 284 if (top_row)
282 { 285 {
283 // 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
284 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
285 288
286 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
… …
290 { 293 {
291 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 295#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 297#endif
295
296 int plines = 1; 298 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 299 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 300
299 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 ())
300 { 302 {
… …
318 // re-assemble the full line by destination lines 320 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 321 for (int qrow = q; qlines--; qrow++)
320 { 322 {
321 qline = row_buf + qrow; 323 qline = row_buf + qrow;
322 lalloc (*qline); 324 lalloc (*qline);
325 qline->l = ncol;
323 qline->set_is_longer (); 326 qline->is_longer (1);
324 327
325 int qcol = 0; 328 int qcol = 0;
326 329
330 // see below for cursor adjustment rationale
331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow);
333
327 // fill a single destination line 334 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
329 { 336 {
330 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
353 qcol += len; 360 qcol += len;
354 } 361 }
355 } 362 }
356 363
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 364 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 365 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 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
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 366 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 367 }
367 while (p != pend && q > 0); 368 while (p != pend && q > 0);
368 369
369 term_start = total_rows - nrow; 370 term_start = total_rows - nrow;
370 nsaved = term_start - q; 371 top_row = q - term_start;
371 372
372 // make sure all terminal lines exist 373 // make sure all terminal lines exist
373 while (nsaved < 0) 374 while (top_row > 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 375 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376 } 376 }
377 else 377 else
378 { 378 {
379 // if no scrollback exists (yet), wing, instead of wrap 379 // if no scrollback exists (yet), wing, instead of wrap
380 380
… …
393 } 393 }
394 394
395 term_start = 0; 395 term_start = 0;
396 } 396 }
397 397
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
401#endif
402
403 free (old_buf); 398 free (old_buf);
404 delete old_ta; 399 delete old_ta;
405 delete old_ra; 400 delete old_ra;
406 401
407 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
… …
419 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
421 416
422 tt_winch (); 417 tt_winch ();
423 418
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 419 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 420}
426 421
427/* ------------------------------------------------------------------------- */ 422/* ------------------------------------------------------------------------- */
428/* 423/*
429 * Free everything. That way malloc debugging can find leakage. 424 * Free everything. That way malloc debugging can find leakage.
… …
435 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
436 431
437 free (row_buf); 432 free (row_buf);
438 free (swap_buf); 433 free (swap_buf);
439 free (drawn_buf); 434 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 435 free (tabs);
442 436
443 row_buf = 0; // signal that we freed all the arrays 437 row_buf = 0; // signal that we freed all the arrays
444} 438}
445 439
… …
453 scr_release (); 447 scr_release ();
454 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
455 scr_reset (); 449 scr_reset ();
456 450
457 scr_clear (true); 451 scr_clear (true);
458 scr_refresh (SLOW_REFRESH); 452 scr_refresh ();
459} 453}
460 454
461/* ------------------------------------------------------------------------- * 455/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 456 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 457 * ------------------------------------------------------------------------- */
… …
577 * Change the colour for following text 571 * Change the colour for following text
578 */ 572 */
579void 573void
580rxvt_term::scr_color (unsigned int color, int fgbg) 574rxvt_term::scr_color (unsigned int color, int fgbg)
581{ 575{
582 if (color > maxTermCOLOR) 576 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 577 color = fgbg;
584 578
585 if (fgbg == Color_fg) 579 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 580 rstyle = SET_FGCOLOR (rstyle, color);
587 else 581 else
… …
618 want_refresh = 1; 612 want_refresh = 1;
619 num_scr += count; 613 num_scr += count;
620 614
621 if (count > 0 615 if (count > 0
622 && row1 == 0 616 && row1 == 0
623 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 617 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 618 {
626 nsaved = min (nsaved + count, saveLines); 619 top_row = max (top_row - count, -saveLines);
627 620
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 621 // scroll everything up 'count' lines
622 term_start = (term_start + count) % total_rows;
623
624 // sever bottommost line
625 {
626 line_t &l = ROW(row2 - count);
627 l.is_longer (0);
628 l.touch ();
629 }
630
631 // erase newly scrolled-in lines
632 for (int i = count; i--; )
633 {
634 // basically this is a slightly optimized scr_blank_screen_mem
635 // it is worth the effort on slower machines
636 line_t &l = ROW(nrow - 1 - i);
637
638 scr_blank_line (l, 0, l.l, rstyle);
639
640 l.l = 0;
641 l.f = 0;
642 }
643
644 // now copy lines below the scroll region bottom to the
645 // bottom of the screen again, so they look as if they
646 // hadn't moved.
647 for (int i = nrow; --i > row2; )
648 {
649 line_t &l1 = ROW(i - count);
650 line_t &l2 = ROW(i);
651
652 ::swap (l1, l2);
653 l2.touch ();
654 }
629 655
630 term_start = (term_start + count) % total_rows; 656 // move and/or clear selection, if any
631
632 if (selection.op && current_screen == selection.screen) 657 if (selection.op && current_screen == selection.screen)
633 { 658 {
634 selection.beg.row -= count; 659 selection.beg.row -= count;
635 selection.end.row -= count; 660 selection.end.row -= count;
636 selection.mark.row -= count; 661 selection.mark.row -= count;
637 662
638 if (selection.beg.row < -nsaved 663 if (selection.beg.row < top_row
639 || selection.end.row < -nsaved 664 || selection.end.row < top_row
640 || selection.mark.row < -nsaved) 665 || selection.mark.row < top_row)
641 { 666 {
642 CLEAR_ALL_SELECTION (); 667 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR; 668 selection.op = SELECTION_CLEAR;
644 } 669 }
645 } 670 }
646 671
647 for (int i = count; i--; ) 672 // finally move the view window, if desired
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
653 if (OPTION (Opt_scrollWithBuffer) 673 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 674 && view_start != 0
655 && view_start != saveLines) 675 && view_start != -saveLines)
656 scr_page (UP, count); 676 scr_page (UP, count);
677
678 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
679 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
657 } 680 }
658 else 681 else
659 { 682 {
660 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
661 { 684 {
… …
685 708
686 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
687 710
688 min_it (count, rows); 711 min_it (count, rows);
689 712
713 line_t *temp_buf = row_buf + total_rows;
714
690 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
691 { 716 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 718
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
706/* 731/*
707 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
708 */ 733 */
709void 734void
710rxvt_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)
711{ 736{
712 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
713 return; 738 return;
714 739
715 unsigned char checksel; 740 unsigned char checksel;
716 unicode_t c; 741 unicode_t c;
717 int last_col; 742 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
719 744
720 want_refresh = 1; 745 want_refresh = 1;
721 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 747
724 if (nlines > 0) 748 if (minlines > 0)
725 { 749 {
726 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
727 if (nlines > 0 752 if (minlines > 0
728 && screen.tscroll == 0 753 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
730 { 755 {
731 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
734 } 759 }
735 } 760 }
736 761
737#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
741#endif 766#endif
742 int row = screen.cur.row; 767 int row = screen.cur.row;
743 768
744 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745 770
746 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
747 772
748 while (str < strend) 773 while (str < strend)
749 { 774 {
750 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 776
752 if (c < 0x20) 777 if (c < 0x20)
753 if (c == C0_LF) 778 if (c == C0_LF)
754 { 779 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
757 781
758 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
759 783
760 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
766 continue; 790 continue;
767 } 791 }
768 else if (c == C0_CR) 792 else if (c == C0_CR)
769 { 793 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
772 795
773 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 797 screen.cur.col = 0;
775 continue; 798 continue;
776 } 799 }
… …
793 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
794 } 817 }
795 818
796 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
797 { 820 {
798 line->set_is_longer ();
799
800 scr_do_wrap (); 821 scr_do_wrap ();
801 822
823 line->l = ncol;
824 line->is_longer (1);
825
802 row = screen.cur.row; 826 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
804 } 828 }
805 829
806 // some utf-8 decoders "decode" surrogate characters: let's fix this. 830 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
812 // 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
813 // locale. 837 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
815 839
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 841 {
818 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 843 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 897 }
874 898
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 900
877 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
879 { 903 {
880 // ...output spaces 904 // ...output spaces
881 c = ' '; 905 c = ' ';
882 // and try the same character next loop iteration 906 // and try the same character next loop iteration
883 --str; 907 --str;
884 } 908 }
885 909
910 line->touch ();
911
886 do 912 do
887 { 913 {
888 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
890 916
891 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 918 screen.cur.col++;
893 else 919 else
894 { 920 {
895 line->l = last_col; 921 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
898 break; 924 break;
899 } 925 }
900 926
… …
902 } 928 }
903 while (--width > 0); 929 while (--width > 0);
904 930
905 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
907 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++)
908 { 937 {
909 line->t[c] = ' '; 938 line->t[c] = ' ';
910 line->r[c] = rend; 939 line->r[c] = rend;
911 } 940 }
941 }
912 } 942 }
913 else // width == 0 943 else // width == 0
914 { 944 {
915#if ENABLE_COMBINING 945#if ENABLE_COMBINING
916 // handle combining characters 946 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
920 text_t *tp; 951 text_t *tp;
921 rend_t *rp; 952 rend_t *rp;
922 953
923 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
924 { 955 {
956 linep = line;
925 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 959 }
931 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
933 { 962 {
934 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 966 }
942 else 967 else
943 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
944 974
945 // first try to find a precomposed character 975 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 977 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 982#endif
953 } 983 }
954 } 984 }
955 985
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
958 987
959#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
961#endif 990#endif
962} 991}
… …
1012 1041
1013 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
1014 if (tabs[i]) 1043 if (tabs[i])
1015 { 1044 {
1016 x = i; 1045 x = i;
1046
1017 if (!--count) 1047 if (!--count)
1018 break; 1048 break;
1019 } 1049 }
1020 else 1050 else
1021 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1059 if (ht && OPTION (Opt_pastableTabs))
1030 { 1060 {
1031 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1032 1062
1033 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1034 max_it (l.l, x);
1035 1064
1036 i = screen.cur.col; 1065 i = screen.cur.col;
1037 1066
1038 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1093{ 1122{
1094 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1125 else
1097 { 1126 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1127 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1128
1129 l.touch ();
1130 l.is_longer (0);
1100 1131
1101 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1135 }
… …
1195 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1196 1227
1197 selection_check (1); 1228 selection_check (1);
1198 1229
1199 line_t &line = ROW(screen.cur.row); 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1200 1234
1201 switch (mode) 1235 switch (mode)
1202 { 1236 {
1203 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1238 col = screen.cur.col;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1334 }
1301 1335
1302 for (; num--; row++) 1336 for (; num--; row++)
1303 { 1337 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1340 }
1308} 1341}
1309 1342
1310#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1312rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1313{ 1346{
1314 want_refresh = 1; 1347 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1316 1349
1317 nsaved = 0; 1350 top_row = 0;
1318} 1351}
1319#endif 1352#endif
1320 1353
1321/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1322/* 1355/*
… …
1343 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1344 1377
1345 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1346 *r1++ = fs; 1379 *r1++ = fs;
1347 1380
1348 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1349 } 1383 }
1350} 1384}
1351 1385
1352/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1353/* 1387/*
… …
1401 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1402 1436
1403 row = screen.cur.row; 1437 row = screen.cur.row;
1404 1438
1405 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1406 1443
1407 switch (insdel) 1444 switch (insdel)
1408 { 1445 {
1409 case INSERT: 1446 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1448 {
1412 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1414 } 1451 }
1415 1452
1416 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1454
1422 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1457 {
1425 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1438 1471
1439 case ERASE: 1472 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1474 selection_check (1);
1442 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1479 break;
1445 1480
1446 case DELETE: 1481 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1485 {
1451 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1453 } 1488 }
1454 1489
1490 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1492
1462 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1495 {
1465 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1577rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1578{ 1609{
1579 if (mode < 0) 1610 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1583} 1614}
1584 1615
1585/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1586/* 1617/*
1587 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1634 * Set font style 1665 * Set font style
1635 */ 1666 */
1636void 1667void
1637rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1638{ 1669{
1670#if 0
1639 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1640 { 1672 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1674 break;
1643 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1644 break; 1676 break;
… …
1651 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1652 break; 1684 break;
1653 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1654 break; 1686 break;
1655 } 1687 }
1688#endif
1656} 1689}
1657 1690
1658/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1659/* 1692/*
1660 * Choose a font 1693 * Choose a font
… …
1756 } 1789 }
1757 1790
1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1760 1793
1794 num_scr_allow = 0;
1795
1761 if (refresh) 1796 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1797 scr_refresh ();
1763} 1798}
1764 1799
1765/* ------------------------------------------------------------------------- */ 1800/* ------------------------------------------------------------------------- */
1766/* 1801/*
1767 * Refresh the entire screen 1802 * Refresh the entire screen
… …
1775/* ------------------------------------------------------------------------- */ 1810/* ------------------------------------------------------------------------- */
1776/* 1811/*
1777 * Move the display so that the line represented by scrollbar value Y is at 1812 * Move the display so that the line represented by scrollbar value Y is at
1778 * the top of the screen 1813 * the top of the screen
1779 */ 1814 */
1780int 1815void
1781rxvt_term::scr_move_to (int y, int len) 1816rxvt_term::scr_move_to (int y, int len)
1782{ 1817{
1783 long p = 0; 1818 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784 unsigned int oldviewstart;
1785
1786 oldviewstart = view_start;
1787
1788 if (y < len)
1789 {
1790 p = (nrow + nsaved) * (len - y) / len;
1791 p -= (long) (nrow - 1);
1792 p = max (p, 0);
1793 }
1794
1795 view_start = (unsigned int)min (p, nsaved);
1796
1797 return scr_changeview (oldviewstart);
1798} 1819}
1799 1820
1800/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1801/* 1822/*
1802 * Page the screen up/down nlines 1823 * Page the screen up/down nlines
1803 * direction should be UP or DN 1824 * direction should be UP or DN
1804 */ 1825 */
1805int 1826bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1827rxvt_term::scr_page (enum page_dirn direction, int nlines)
1807{ 1828{
1808 int n; 1829 int new_view_start =
1809 unsigned int oldviewstart;
1810
1811 oldviewstart = view_start;
1812
1813 if (direction == UP)
1814 {
1815 n = view_start + nlines;
1816 view_start = min (n, nsaved);
1817 }
1818 else
1819 {
1820 n = view_start - nlines; 1830 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1831 : view_start + nlines;
1822 }
1823 1832
1824 return scr_changeview (oldviewstart); 1833 return scr_changeview (new_view_start);
1825} 1834}
1826 1835
1827int 1836bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1837rxvt_term::scr_changeview (int new_view_start)
1829{ 1838{
1839 clamp_it (new_view_start, top_row, 0);
1840
1841 if (new_view_start == view_start)
1842 return false;
1843
1844 num_scr += new_view_start - view_start;
1845 view_start = new_view_start;
1846 want_refresh = 1;
1847
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831 1849
1832 if (view_start != oldviewstart) 1850 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1851}
1840 1852
1841/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1842void 1854void
1843rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
… …
1852# endif 1864# endif
1853 1865
1854 if (OPTION (Opt_visualBell)) 1866 if (OPTION (Opt_visualBell))
1855 { 1867 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1869 display->flush ();
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1870 rxvt_usleep (VISUAL_BELL_DURATION);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1859 } 1872 }
1860 else 1873 else
1861 XBell (display->display, 0); 1874 XBell (display->display, 0);
… …
1875 if ((fd = popen_printer ()) == NULL) 1888 if ((fd = popen_printer ()) == NULL)
1876 return; 1889 return;
1877 1890
1878 if (fullhist) 1891 if (fullhist)
1879 { 1892 {
1880 nrows = nrow + nsaved; 1893 nrows = nrow - top_row;
1881 row_start = -nsaved; 1894 row_start = top_row;
1882 } 1895 }
1883 else 1896 else
1884 { 1897 {
1885 nrows = nrow; 1898 nrows = nrow;
1886 row_start = -view_start; 1899 row_start = view_start;
1887 } 1900 }
1888 1901
1889 wctomb (0, 0); 1902 wctomb (0, 0);
1890 1903
1891 for (int r1 = 0; r1 < nrows; r1++) 1904 for (int r1 = 0; r1 < nrows; r1++)
… …
1923 * Refresh the screen 1936 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 1937 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 1938 * screen.text/screen.rend contain what the screen will change to.
1926 */ 1939 */
1927void 1940void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1941rxvt_term::scr_refresh ()
1929{ 1942{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */ 1943 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 showcursor; /* show the cursor */ 1944 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 1945 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 1946 ocrow; /* old cursor row */
… …
2019 2032
2020 /* make sure no outline cursor is left around */ 2033 /* make sure no outline cursor is left around */
2021 setoldcursor = 0; 2034 setoldcursor = 0;
2022 if (ocrow != -1) 2035 if (ocrow != -1)
2023 { 2036 {
2024 if (screen.cur.row + view_start != ocrow 2037 if (screen.cur.row - view_start != ocrow
2025 || screen.cur.col != oldcursor.col) 2038 || screen.cur.col != oldcursor.col)
2026 { 2039 {
2027 if (ocrow < nrow 2040 if (ocrow < nrow
2028 && oldcursor.col < ncol) 2041 && oldcursor.col < ncol)
2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2042 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2037 else if (!focus) 2050 else if (!focus)
2038 setoldcursor = 1; 2051 setoldcursor = 1;
2039 2052
2040 if (setoldcursor) 2053 if (setoldcursor)
2041 { 2054 {
2042 if (screen.cur.row + view_start >= nrow) 2055 if (screen.cur.row - view_start >= nrow)
2043 oldcursor.row = -1; 2056 oldcursor.row = -1;
2044 else 2057 else
2045 { 2058 {
2046 oldcursor.row = screen.cur.row + view_start; 2059 oldcursor.row = screen.cur.row - view_start;
2047 oldcursor.col = screen.cur.col; 2060 oldcursor.col = screen.cur.col;
2048 } 2061 }
2049 } 2062 }
2050 } 2063 }
2051 2064
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2066#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2067 scr_swap_overlay ();
2055#endif 2068#endif
2056 2069
2057#ifndef NO_SLOW_LINK_SUPPORT 2070#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2071 /*
2059 * D: CopyArea pass - very useful for slower links 2072 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2073 * This has been deliberately kept simple.
2061 */ 2074 */
2062 i = num_scr;
2063 if (!display->is_local 2075 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2077 && abs (num_scr) < nrow && !must_clear)
2066 { 2078 {
2067 int16_t nits; 2079 int16_t nits;
2068 int j; 2080 int j;
2069 int len, wlen; 2081 int len, wlen;
2082 dLocal (int, num_scr);
2070 2083
2071 j = nrow; 2084 j = nrow;
2072 wlen = len = -1; 2085 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2086 row = i > 0 ? 0 : j - 1;
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2087 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2088 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2089 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2090 {
2078 line_t s = ROW(row - view_start); 2091 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2092 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2093 line_t d2 = drawn_buf[row + i];
2081 2094
2082 for (nits = 0, col = ncol; col--; ) 2095 for (nits = 0, col = ncol; col--; )
2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2096 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2107 if (wlen < len) 2120 if (wlen < len)
2108 ::swap (wlen, len); 2121 ::swap (wlen, len);
2109 2122
2110 XCopyArea (display->display, vt, vt, 2123 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2124 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2125 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2126 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2127 0, Row2Pixel (len));
2115 len = -1; 2128 len = -1;
2116 } 2129 }
2117 } 2130 }
… …
2121 /* 2134 /*
2122 * E: main pass across every character 2135 * E: main pass across every character
2123 */ 2136 */
2124 for (row = 0; row < nrow; row++) 2137 for (row = 0; row < nrow; row++)
2125 { 2138 {
2126 text_t *stp = ROW(row - view_start).t; 2139 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2140 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2141 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2142 rend_t *drp = drawn_buf[row].r;
2130 2143
2131 /* 2144 /*
2132 * E2: OK, now the real pass 2145 * E2: OK, now the real pass
… …
2320 } /* for (row....) */ 2333 } /* for (row....) */
2321 2334
2322#if ENABLE_OVERLAY 2335#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2336 scr_swap_overlay ();
2324#endif 2337#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2338 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2339
2327 /* 2340 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2341 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2342 */
2330 if (showcursor) 2343 if (showcursor)
… …
2369 /* 2382 /*
2370 * H: cleanup selection 2383 * H: cleanup selection
2371 */ 2384 */
2372 scr_reverse_selection (); 2385 scr_reverse_selection ();
2373 2386
2374 if (refresh_type & SMOOTH_REFRESH)
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2387 num_scr = 0;
2378 num_scr_allow = 1; 2388 num_scr_allow = 1;
2379} 2389}
2380 2390
2381void 2391void
2382rxvt_term::scr_remap_chars (const line_t &l) 2392rxvt_term::scr_remap_chars (line_t &l)
2383{ 2393{
2384 if (!l.t) 2394 if (!l.t)
2385 return; 2395 return;
2396
2397 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2386 2398
2387 for (int i = ncol; i--; ) 2399 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2400 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2401}
2390 2402
… …
2443 2455
2444 if (really) 2456 if (really)
2445 XClearWindow (display->display, vt); 2457 XClearWindow (display->display, vt);
2446} 2458}
2447 2459
2460void
2461rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2462{
2463 int view_end = view_start + nrow;
2464 int row, col;
2465
2466 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2467 {
2468 text_t *stp = ROW(row).t;
2469 rend_t *srp = ROW(row).r;
2470
2471 for (col = beg_col; col < end_col; col++)
2472 srp[col] ^= rstyle1;
2473
2474 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2475 srp[col] ^= rstyle2;
2476
2477 if (++col < end_col)
2478 srp[col] ^= rstyle2;
2479 }
2480}
2481
2482void
2483rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2484{
2485 int view_end = view_start + nrow;
2486 int row, col;
2487
2488 if (beg_row >= view_start)
2489 {
2490 col = beg_col;
2491 row = beg_row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = view_start;
2497 }
2498
2499 for (; row < min (end_row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= rstyle;
2502
2503 if (row == end_row)
2504 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2505 srp[col] ^= rstyle;
2506}
2507
2448/* ------------------------------------------------------------------------- */ 2508/* ------------------------------------------------------------------------- */
2449void 2509void
2450rxvt_term::scr_reverse_selection () 2510rxvt_term::scr_reverse_selection ()
2451{ 2511{
2452 if (selection.op 2512 if (selection.op
2453 && current_screen == selection.screen 2513 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2514 && selection.end.row >= view_start)
2455 { 2515 {
2456 int view_end = -view_start + nrow;
2457 int row, col;
2458
2459#if ENABLE_FRILLS 2516#if ENABLE_FRILLS
2460 if (selection.rect) 2517 if (selection.rect)
2461 { 2518 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2519 selection.end.row, selection.end.col,
2463 { 2520 RS_RVid, RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2521 else
2478#endif 2522#endif
2479 { 2523 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2524 selection.end.row, selection.end.col,
2481 { 2525 RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2526 }
2500} 2527}
2501 2528
2502/* ------------------------------------------------------------------------- */ 2529/* ------------------------------------------------------------------------- */
2503/* 2530/*
… …
2541 2568
2542 if (!selection.op) 2569 if (!selection.op)
2543 return; 2570 return;
2544 2571
2545 pos.row = pos.col = 0; 2572 pos.row = pos.col = 0;
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2573 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2574 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2576 || (check_more == 1
2550 && current_screen == selection.screen 2577 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2578 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2579 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553 || (check_more == 2 2580 || (check_more == 2
… …
2564/* ------------------------------------------------------------------------- */ 2591/* ------------------------------------------------------------------------- */
2565/* 2592/*
2566 * Paste a selection direct to the command fd 2593 * Paste a selection direct to the command fd
2567 */ 2594 */
2568void 2595void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2596rxvt_term::paste (char *data, unsigned int len)
2570{ 2597{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2598 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2599 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2600 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2601 data[i] = C0_CR;
… …
2718 { 2745 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2746 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2747 char *s = rxvt_wcstombs (w);
2721 free (w); 2748 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2749 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2750 paste (s, strlen (s));
2724 free (s); 2751 free (s);
2725 } 2752 }
2726 else 2753 else
2727#endif 2754#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2755 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2756 && cl)
2730 { 2757 {
2731 for (int i = 0; i < cr; i++) 2758 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2759 paste (cl[i], strlen (cl[i]));
2733 2760
2734 XFreeStringList (cl); 2761 XFreeStringList (cl);
2735 } 2762 }
2736 else 2763 else
2737 paste (ct.value, ct.nitems); // paste raw 2764 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2765
2739bailout: 2766bailout:
2740 XFree (ct.value); 2767 XFree (ct.value);
2741 2768
2742 if (selection_wait == Sel_normal) 2769 if (selection_wait == Sel_normal)
… …
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2799 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0 2800 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2801 * EXT: button 2 release
2775 */ 2802 */
2776void 2803void
2777rxvt_term::selection_request (Time tm, int x, int y) 2804rxvt_term::selection_request (Time tm)
2778{ 2805{
2779 if (x < 0 || x >= width || y < 0 || y >= height)
2780 return; /* outside window */
2781
2782 if (selection.text) 2806 if (selection.text)
2783 { /* internal selection */ 2807 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2808 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2809 paste (str, strlen (str));
2786 free (str); 2810 free (str);
2787 return; 2811 return;
2788 } 2812 }
2789 else 2813 else
2790 { 2814 {
… …
2882 selection.op = SELECTION_DONE; 2906 selection.op = SELECTION_DONE;
2883 2907
2884 if (selection.clicks == 4) 2908 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2909 return; /* nothing selected, go away */
2886 2910
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2911 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2912 return;
2889 2913
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2914 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 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));
2892 2916
… …
2906 col = selection.beg.col; 2930 col = selection.beg.col;
2907 end_col = ncol + 1; 2931 end_col = ncol + 1;
2908 } 2932 }
2909 else 2933 else
2910#endif 2934#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2935 end_col = ROW(row).l;
2912 2936
2913 col = max (col, 0); 2937 col = max (col, 0);
2914 2938
2915 if (row == selection.end.row 2939 if (row == selection.end.row
2916#if ENABLE_FRILLS 2940#if ENABLE_FRILLS
… …
2918#endif 2942#endif
2919 ) 2943 )
2920 min_it (end_col, selection.end.col); 2944 min_it (end_col, selection.end.col);
2921 2945
2922 t = ROW(row).t + col; 2946 t = ROW(row).t + col;
2947
2923 for (; col < end_col; col++) 2948 for (; col < end_col; col++)
2924 { 2949 {
2925 if (*t == NOCHAR) 2950 if (*t == NOCHAR)
2926 t++; 2951 t++;
2927#if ENABLE_COMBINING 2952#if ENABLE_COMBINING
… …
2976 3001
2977 // 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
2978 selection.len = ofs; 3003 selection.len = ofs;
2979 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));
2980 3005
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3006 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 3007 return;
2983 3008
2984 selection_grab (tm); 3009 selection_grab (tm);
2985} 3010}
2986 3011
… …
2994 { 3019 {
2995 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
2996 return true; 3021 return true;
2997 } 3022 }
2998 else 3023 else
3024 {
3025 selection_clear ();
2999 return false; 3026 return false;
3027 }
3000 3028
3001#if 0 3029#if 0
3002 XTextProperty ct; 3030 XTextProperty ct;
3003 3031
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3018rxvt_term::selection_click (int clicks, int x, int y) 3046rxvt_term::selection_click (int clicks, int x, int y)
3019{ 3047{
3020 clicks = ((clicks - 1) % 3) + 1; 3048 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 3049 selection.clicks = clicks; /* save clicks so extend will work */
3022 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
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 3061
3025 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
3028 0, /* button 3 */ 3065 0, /* button 3 */
3029 1, /* button press */ 3066 1, /* button press */
3030 0); /* click change */ 3067 0); /* click change */
3031} 3068}
3032 3069
… …
3037void 3074void
3038rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
3039{ 3076{
3040 want_refresh = 1; 3077 want_refresh = 1;
3041 3078
3042 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 3080 selection.mark.col = col;
3044 3081
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3084
3048 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3087 --selection.mark.col;
… …
3078 text_t *stp; 3115 text_t *stp;
3079 rend_t *srp; 3116 rend_t *srp;
3080 3117
3081 if (dirn == UP) 3118 if (dirn == UP)
3082 { 3119 {
3083 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3084 bound.col = 0; 3121 bound.col = 0;
3085 dirnadd = -1; 3122 dirnadd = -1;
3086 } 3123 }
3087 else 3124 else
3088 { 3125 {
… …
3136 } 3173 }
3137 } 3174 }
3138 break; 3175 break;
3139 } 3176 }
3140 3177
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3178 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3179 col++; /* put us on one past the end */
3144 3180
3145 /* Poke the values back in */ 3181 /* Poke the values back in */
3146 ret->row = row; 3182 ret->row = row;
… …
3167 * 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
3168 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3169 */ 3205 */
3170 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3207 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3173 { 3209 {
3174 /* select nothing */ 3210 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3270 }
3235 3271
3236 pos.col = col; 3272 pos.col = col;
3237 pos.row = row - view_start; 3273 pos.row = view_start + row;
3238 3274
3239 /* 3275 /*
3240 * 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
3241 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3323 else if (selection.clicks == 2) 3359 else if (selection.clicks == 2)
3324 { 3360 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3361 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3362 selection.end.col--;
3327 3363
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3364 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3365 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3366 }
3334 else if (selection.clicks == 3) 3367 else if (selection.clicks == 3)
3335 { 3368 {
3336#if ENABLE_FRILLS 3369#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3370 if (OPTION (Opt_tripleclickwords))
… …
3730 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3731 { 3764 {
3732 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3734 3767
3735 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;
3736 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;
3737 3770
3738 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3739 { 3772 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 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