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.203 by root, Sat Dec 31 19:30:25 2005 UTC vs.
Revision 1.235 by root, Tue Jan 17 05:47:42 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
… …
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
… …
450 scr_release (); 448 scr_release ();
451 prev_nrow = prev_ncol = 0; 449 prev_nrow = prev_ncol = 0;
452 scr_reset (); 450 scr_reset ();
453 451
454 scr_clear (true); 452 scr_clear (true);
455 scr_refresh (SLOW_REFRESH); 453 scr_refresh ();
456} 454}
457 455
458/* ------------------------------------------------------------------------- * 456/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 457 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 458 * ------------------------------------------------------------------------- */
… …
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 || OPTION (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 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 623 term_start = (term_start + count) % total_rows;
625 624
625 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count);
628 l.touch ();
629 l.is_longer (0);
630 }
631
632 // erase newly scorlled-in lines
633 for (int i = count; i; --i )
634 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i);
638
639 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0;
642 l.f = 0;
643 }
644
645 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they
647 // hadn't moved.
648 for (int i = nrow; --i > row2; )
649 {
650 line_t &l1 = ROW(i - count);
651 line_t &l2 = ROW(i);
652
653 ::swap (l1, l2);
654 l2.touch ();
655 }
656
657 // move and/or clear selection, if any
626 if (selection.op && current_screen == selection.screen) 658 if (selection.op && current_screen == selection.screen)
627 { 659 {
628 selection.beg.row -= count; 660 selection.beg.row -= count;
629 selection.end.row -= count; 661 selection.end.row -= count;
630 selection.mark.row -= count; 662 selection.mark.row -= count;
631 663
632 if (selection.beg.row < -nsaved 664 if (selection.beg.row < top_row
633 || selection.end.row < -nsaved 665 || selection.end.row < top_row
634 || selection.mark.row < -nsaved) 666 || selection.mark.row < top_row)
635 { 667 {
636 CLEAR_ALL_SELECTION (); 668 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR; 669 selection.op = SELECTION_CLEAR;
638 } 670 }
639 } 671 }
640 672
641 for (int i = count; i--; ) 673 // 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 (OPTION (Opt_scrollWithBuffer) 674 if (OPTION (Opt_scrollWithBuffer)
648 && view_start != 0 675 && view_start != 0
649 && view_start != saveLines) 676 && view_start != -saveLines)
650 scr_page (UP, count); 677 scr_page (UP, count);
678
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
680 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
651 } 681 }
652 else 682 else
653 { 683 {
654 if (selection.op && current_screen == selection.screen) 684 if (selection.op && current_screen == selection.screen)
655 { 685 {
… …
679 709
680 int rows = row2 - row1 + 1; 710 int rows = row2 - row1 + 1;
681 711
682 min_it (count, rows); 712 min_it (count, rows);
683 713
714 line_t *temp_buf = row_buf + total_rows;
715
684 for (int row = 0; row < rows; row++) 716 for (int row = 0; row < rows; row++)
685 { 717 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 718 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687 719
688 if (!IN_RANGE_EXC (row + count, 0, rows)) 720 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
699/* ------------------------------------------------------------------------- */ 731/* ------------------------------------------------------------------------- */
700/* 732/*
701 * Add text given in <str> of length <len> to screen struct 733 * Add text given in <str> of length <len> to screen struct
702 */ 734 */
703void 735void
704rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
705{ 737{
706 if (len <= 0) /* sanity */ 738 if (len <= 0) /* sanity */
707 return; 739 return;
708 740
709 unsigned char checksel; 741 unsigned char checksel;
710 unicode_t c; 742 unicode_t c;
711 int last_col; 743 int ncol = this->ncol;
712 const unicode_t *strend = str + len; 744 const wchar_t *strend = str + len;
713 745
714 want_refresh = 1; 746 want_refresh = 1;
715 ZERO_SCROLLBACK (); 747 ZERO_SCROLLBACK ();
716 last_col = ncol;
717 748
718 if (nlines > 0) 749 if (minlines > 0)
719 { 750 {
720 nlines += screen.cur.row - screen.bscroll; 751 minlines += screen.cur.row - screen.bscroll;
752
721 if (nlines > 0 753 if (minlines > 0
722 && screen.tscroll == 0 754 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 755 && screen.bscroll == nrow - 1)
724 { 756 {
725 /* _at least_ this many lines need to be scrolled */ 757 /* _at least_ this many lines need to be scrolled */
726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 758 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
727 screen.cur.row -= nlines; 759 screen.cur.row -= minlines;
728 } 760 }
729 } 761 }
730 762
731#ifdef DEBUG_STRICT 763#ifdef DEBUG_STRICT
732 assert (screen.cur.col < last_col); 764 assert (screen.cur.col < ncol);
733 assert (screen.cur.row < nrow 765 assert (screen.cur.row < nrow
734 && screen.cur.row >= -nsaved); 766 && screen.cur.row >= top_row);
735#endif 767#endif
736 int row = screen.cur.row; 768 int row = screen.cur.row;
737 769
738 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 770 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
739 771
740 line_t *line = &ROW(row); 772 line_t *line = &ROW(row);
741 773
742 while (str < strend) 774 while (str < strend)
743 { 775 {
744 c = *str++; 776 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
745 777
746 if (c < 0x20) 778 if (c < 0x20)
747 if (c == C0_LF) 779 if (c == C0_LF)
748 { 780 {
749 if (!line->is_longer ()) /* XXX: think about this */
750 max_it (line->l, screen.cur.col); 781 max_it (line->l, screen.cur.col);
751 782
752 screen.flags &= ~Screen_WrapNext; 783 screen.flags &= ~Screen_WrapNext;
753 784
754 if (screen.cur.row == screen.bscroll) 785 if (screen.cur.row == screen.bscroll)
755 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 786 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
759 line = &ROW(row); /* _must_ refresh */ 790 line = &ROW(row); /* _must_ refresh */
760 continue; 791 continue;
761 } 792 }
762 else if (c == C0_CR) 793 else if (c == C0_CR)
763 { 794 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col); 795 max_it (line->l, screen.cur.col);
766 796
767 screen.flags &= ~Screen_WrapNext; 797 screen.flags &= ~Screen_WrapNext;
768 screen.cur.col = 0; 798 screen.cur.col = 0;
769 continue; 799 continue;
770 } 800 }
… …
787 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
788 } 818 }
789 819
790 if (screen.flags & Screen_WrapNext) 820 if (screen.flags & Screen_WrapNext)
791 { 821 {
822 max_it (line->l, ncol);
792 line->set_is_longer (); 823 line->is_longer (1);
793 824
794 scr_do_wrap (); 825 scr_do_wrap ();
795 826
796 row = screen.cur.row; 827 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
… …
805 // do wcwidth before further replacements, as wcwidth might return -1 836 // 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 837 // for the line drawing characters below as they might be invalid in the current
807 // locale. 838 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 839 int width = c < 0x100 ? 1 : wcwidth (c);
809 840
810 if (charsets[screen.charset] == '0') // DEC SPECIAL 841 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 842 {
812 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 844 // 5f-7e standard vt100
814 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
815 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
867 } 898 }
868 899
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 900 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870 901
871 // if the character doesn't fit into the remaining columns... 902 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width) 903 if (screen.cur.col > ncol - width && ncol >= width)
873 { 904 {
874 // ...output spaces 905 // ...output spaces
875 c = ' '; 906 c = ' ';
876 // and try the same character next loop iteration 907 // and try the same character next loop iteration
877 --str; 908 --str;
878 } 909 }
879 910
911 line->touch ();
912
880 do 913 do
881 { 914 {
882 line->t[screen.cur.col] = c; 915 line->t[screen.cur.col] = c;
883 line->r[screen.cur.col] = rend; 916 line->r[screen.cur.col] = rend;
884 917
885 if (screen.cur.col < last_col - 1) 918 if (screen.cur.col < ncol - 1)
886 screen.cur.col++; 919 screen.cur.col++;
887 else 920 else
888 { 921 {
889 line->l = last_col; 922 line->l = ncol;
890 if (screen.flags & Screen_Autowrap) 923 if (screen.flags & Screen_Autowrap)
891 screen.flags |= Screen_WrapNext; 924 screen.flags |= Screen_WrapNext;
892 break; 925 break;
893 } 926 }
894 927
… …
896 } 929 }
897 while (--width > 0); 930 while (--width > 0);
898 931
899 // pad with spaces when overwriting wide character with smaller one 932 // pad with spaces when overwriting wide character with smaller one
900 if (!width) 933 if (!width)
934 {
935 line->touch ();
936
901 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 937 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
902 { 938 {
903 line->t[c] = ' '; 939 line->t[c] = ' ';
904 line->r[c] = rend; 940 line->r[c] = rend;
905 } 941 }
942 }
906 } 943 }
907 else // width == 0 944 else // width == 0
908 { 945 {
909#if ENABLE_COMBINING 946#if ENABLE_COMBINING
910 // handle combining characters 947 // handle combining characters
911 // we just tag the accent on the previous on-screen character. 948 // we just tag the accent on the previous on-screen character.
912 // this is arguably not correct, but also arguably not wrong. 949 // this is arguably not correct, but also arguably not wrong.
913 // we don't handle double-width characters nicely yet. 950 // we don't handle double-width characters nicely yet.
951 line_t *linep;
914 text_t *tp; 952 text_t *tp;
915 rend_t *rp; 953 rend_t *rp;
916 954
917 if (screen.cur.col > 0) 955 if (screen.cur.col > 0)
918 { 956 {
957 linep = line;
919 tp = line->t + screen.cur.col - 1; 958 tp = line->t + screen.cur.col - 1;
920 rp = line->r + screen.cur.col - 1; 959 rp = line->r + screen.cur.col - 1;
921
922 while (*tp == NOCHAR && tp > line->t)
923 tp--, rp--;
924 } 960 }
925 else if (screen.cur.row > 0 961 else if (screen.cur.row > 0
926 && ROW(screen.cur.row - 1).is_longer ()) 962 && ROW(screen.cur.row - 1).is_longer ())
927 { 963 {
928 line_t *line = &ROW(screen.cur.row - 1); 964 linep = &ROW(screen.cur.row - 1);
929
930 tp = line->t + last_col - 1; 965 tp = line->t + ncol - 1;
931 rp = line->r + last_col - 1; 966 rp = line->r + ncol - 1;
932
933 while (*tp == NOCHAR && tp > line->t)
934 tp--, rp--;
935 } 967 }
936 else 968 else
937 continue; 969 continue;
970
971 linep->touch ();
972
973 while (*tp == NOCHAR && tp > linep->t)
974 tp--, rp--;
938 975
939 // first try to find a precomposed character 976 // first try to find a precomposed character
940 unicode_t n = rxvt_compose (*tp, c); 977 unicode_t n = rxvt_compose (*tp, c);
941 if (n == NOCHAR) 978 if (n == NOCHAR)
942 n = rxvt_composite.compose (*tp, c); 979 n = rxvt_composite.compose (*tp, c);
… …
945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 982 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
946#endif 983#endif
947 } 984 }
948 } 985 }
949 986
950 if (!line->is_longer ()) /* XXX: think about this */
951 max_it (line->l, screen.cur.col); 987 max_it (line->l, screen.cur.col);
952 988
953#ifdef DEBUG_STRICT 989#ifdef DEBUG_STRICT
954 assert (screen.cur.row >= 0); 990 assert (screen.cur.row >= 0);
955#endif 991#endif
956} 992}
… …
1006 1042
1007 for (; ++i < ncol; ) 1043 for (; ++i < ncol; )
1008 if (tabs[i]) 1044 if (tabs[i])
1009 { 1045 {
1010 x = i; 1046 x = i;
1047
1011 if (!--count) 1048 if (!--count)
1012 break; 1049 break;
1013 } 1050 }
1014 else 1051 else
1015 ht &= l.t[i] == ' ' 1052 ht &= l.t[i] == ' '
… …
1022 // buffer so they can be selected and pasted. 1059 // buffer so they can be selected and pasted.
1023 if (ht && OPTION (Opt_pastableTabs)) 1060 if (ht && OPTION (Opt_pastableTabs))
1024 { 1061 {
1025 base_rend = SET_FONT (base_rend, 0); 1062 base_rend = SET_FONT (base_rend, 0);
1026 1063
1027 if (!l.is_longer ()) /* XXX: think about this */ 1064 l.touch (x);
1028 max_it (l.l, x);
1029 1065
1030 i = screen.cur.col; 1066 i = screen.cur.col;
1031 1067
1032 l.t[i] = '\t'; 1068 l.t[i] = '\t';
1033 l.r[i] = base_rend; 1069 l.r[i] = base_rend;
… …
1087{ 1123{
1088 if (screen.cur.col < ncol - 1) 1124 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1126 else
1091 { 1127 {
1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1128 line_t &l = ROW(screen.cur.row);
1093 ROW(screen.cur.row).l = ncol; 1129
1130 l.touch ();
1131 l.is_longer (0);
1094 1132
1095 scr_gotorc (0, 0, R_RELATIVE); 1133 scr_gotorc (0, 0, R_RELATIVE);
1096 scr_insdel_chars (1, DELETE); 1134 scr_insdel_chars (1, DELETE);
1097 scr_gotorc (0, ncol - 1, R_RELATIVE); 1135 scr_gotorc (0, ncol - 1, R_RELATIVE);
1098 } 1136 }
… …
1189 ZERO_SCROLLBACK (); 1227 ZERO_SCROLLBACK ();
1190 1228
1191 selection_check (1); 1229 selection_check (1);
1192 1230
1193 line_t &line = ROW(screen.cur.row); 1231 line_t &line = ROW(screen.cur.row);
1232
1233 line.touch ();
1234 line.is_longer (0);
1194 1235
1195 switch (mode) 1236 switch (mode)
1196 { 1237 {
1197 case 0: /* erase to end of line */ 1238 case 0: /* erase to end of line */
1198 col = screen.cur.col; 1239 col = screen.cur.col;
… …
1293 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1294 } 1335 }
1295 1336
1296 for (; num--; row++) 1337 for (; num--; row++)
1297 { 1338 {
1298 ROW (row).l = 0;
1299 scr_blank_screen_mem (ROW (row), rstyle); 1339 scr_blank_screen_mem (ROW(row), rstyle);
1300 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1340 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1301 } 1341 }
1302} 1342}
1303 1343
1304#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
… …
1306rxvt_term::scr_erase_savelines () 1346rxvt_term::scr_erase_savelines ()
1307{ 1347{
1308 want_refresh = 1; 1348 want_refresh = 1;
1309 ZERO_SCROLLBACK (); 1349 ZERO_SCROLLBACK ();
1310 1350
1311 nsaved = 0; 1351 top_row = 0;
1312} 1352}
1313#endif 1353#endif
1314 1354
1315/* ------------------------------------------------------------------------- */ 1355/* ------------------------------------------------------------------------- */
1316/* 1356/*
… …
1337 rend_t *r1 = line.r; 1377 rend_t *r1 = line.r;
1338 1378
1339 for (int j = ncol; j--; ) 1379 for (int j = ncol; j--; )
1340 *r1++ = fs; 1380 *r1++ = fs;
1341 1381
1342 line.l = ncol; /* make the `E's selectable */ 1382 line.is_longer (0);
1383 line.touch (ncol);
1343 } 1384 }
1344} 1385}
1345 1386
1346/* ------------------------------------------------------------------------- */ 1387/* ------------------------------------------------------------------------- */
1347/* 1388/*
… …
1395 min_it (count, ncol - screen.cur.col); 1436 min_it (count, ncol - screen.cur.col);
1396 1437
1397 row = screen.cur.row; 1438 row = screen.cur.row;
1398 1439
1399 line_t *line = &ROW(row); 1440 line_t *line = &ROW(row);
1441
1442 line->touch ();
1443 line->is_longer (0);
1400 1444
1401 switch (insdel) 1445 switch (insdel)
1402 { 1446 {
1403 case INSERT: 1447 case INSERT:
1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1448 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1405 { 1449 {
1406 line->t[col] = line->t[col - count]; 1450 line->t[col] = line->t[col - count];
1407 line->r[col] = line->r[col - count]; 1451 line->r[col] = line->r[col - count];
1408 } 1452 }
1409 1453
1410 if (!line->is_longer ()) 1454 line->l = min (line->l + count, ncol);
1411 {
1412 line->l += count;
1413 min_it (line->l, ncol);
1414 }
1415 1455
1416 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1458 {
1419 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
… …
1432 1472
1433 case ERASE: 1473 case ERASE:
1434 screen.cur.col += count; /* don't worry if > ncol */ 1474 screen.cur.col += count; /* don't worry if > ncol */
1435 selection_check (1); 1475 selection_check (1);
1436 screen.cur.col -= count; 1476 screen.cur.col -= count;
1477
1478 line->l = max (line->l - count, 0);
1437 scr_blank_line (*line, screen.cur.col, count, rstyle); 1479 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1480 break;
1439 1481
1440 case DELETE: 1482 case DELETE:
1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1483 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1444 { 1486 {
1445 line->t[col] = line->t[col + count]; 1487 line->t[col] = line->t[col + count];
1446 line->r[col] = line->r[col + count]; 1488 line->r[col] = line->r[col + count];
1447 } 1489 }
1448 1490
1491 line->l = max (line->l - count, 0);
1449 scr_blank_line (*line, ncol - count, count, tr); 1492 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 1493
1456 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1496 {
1459 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1571rxvt_term::scr_set_tab (int mode) 1609rxvt_term::scr_set_tab (int mode)
1572{ 1610{
1573 if (mode < 0) 1611 if (mode < 0)
1574 memset (tabs, 0, ncol * sizeof (char)); 1612 memset (tabs, 0, ncol * sizeof (char));
1575 else if (screen.cur.col < ncol) 1613 else if (screen.cur.col < ncol)
1576 tabs[screen.cur.col] = (mode ? 1 : 0); 1614 tabs [screen.cur.col] = !!mode;
1577} 1615}
1578 1616
1579/* ------------------------------------------------------------------------- */ 1617/* ------------------------------------------------------------------------- */
1580/* 1618/*
1581 * Set reverse/normal video 1619 * Set reverse/normal video
… …
1628 * Set font style 1666 * Set font style
1629 */ 1667 */
1630void 1668void
1631rxvt_term::set_font_style () 1669rxvt_term::set_font_style ()
1632{ 1670{
1671#if 0
1633 switch (charsets[screen.charset]) 1672 switch (charsets [screen.charset])
1634 { 1673 {
1635 case '0': /* DEC Special Character & Line Drawing Set */ 1674 case '0': /* DEC Special Character & Line Drawing Set */
1636 break; 1675 break;
1637 case 'A': /* United Kingdom (UK) */ 1676 case 'A': /* United Kingdom (UK) */
1638 break; 1677 break;
… …
1645 case 'C': /* Finnish character set */ 1684 case 'C': /* Finnish character set */
1646 break; 1685 break;
1647 case 'K': /* German character set */ 1686 case 'K': /* German character set */
1648 break; 1687 break;
1649 } 1688 }
1689#endif
1650} 1690}
1651 1691
1652/* ------------------------------------------------------------------------- */ 1692/* ------------------------------------------------------------------------- */
1653/* 1693/*
1654 * Choose a font 1694 * Choose a font
… …
1750 } 1790 }
1751 1791
1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1792 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1793 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1754 1794
1795 num_scr_allow = 0;
1796
1755 if (refresh) 1797 if (refresh)
1756 scr_refresh (SLOW_REFRESH); 1798 scr_refresh ();
1757} 1799}
1758 1800
1759/* ------------------------------------------------------------------------- */ 1801/* ------------------------------------------------------------------------- */
1760/* 1802/*
1761 * Refresh the entire screen 1803 * Refresh the entire screen
… …
1769/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
1770/* 1812/*
1771 * Move the display so that the line represented by scrollbar value Y is at 1813 * Move the display so that the line represented by scrollbar value Y is at
1772 * the top of the screen 1814 * the top of the screen
1773 */ 1815 */
1774int 1816void
1775rxvt_term::scr_move_to (int y, int len) 1817rxvt_term::scr_move_to (int y, int len)
1776{ 1818{
1777 long p = 0; 1819 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} 1820}
1793 1821
1794/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1795/* 1823/*
1796 * Page the screen up/down nlines 1824 * Page the screen up/down nlines
1797 * direction should be UP or DN 1825 * direction should be UP or DN
1798 */ 1826 */
1799int 1827bool
1800rxvt_term::scr_page (enum page_dirn direction, int nlines) 1828rxvt_term::scr_page (enum page_dirn direction, int nlines)
1801{ 1829{
1802 int n; 1830 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; 1831 direction == UP ? view_start - nlines
1815 view_start = max (n, 0); 1832 : view_start + nlines;
1816 }
1817 1833
1818 return scr_changeview (oldviewstart); 1834 return scr_changeview (new_view_start);
1819} 1835}
1820 1836
1821int 1837bool
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1838rxvt_term::scr_changeview (int new_view_start)
1823{ 1839{
1840 clamp_it (new_view_start, top_row, 0);
1841
1824 if (view_start != oldviewstart) 1842 if (new_view_start == view_start)
1825 { 1843 return false;
1844
1845 num_scr += new_view_start - view_start;
1846 view_start = new_view_start;
1826 want_refresh = 1; 1847 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart);
1828 }
1829 1848
1830 return (int) (view_start - oldviewstart); 1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1850
1851 return true;
1831} 1852}
1832 1853
1833/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1834void 1855void
1835rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
… …
1844# endif 1865# endif
1845 1866
1846 if (OPTION (Opt_visualBell)) 1867 if (OPTION (Opt_visualBell))
1847 { 1868 {
1848 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1849 rxvt_usleep (VISUAL_BELL_DURATION); 1871 rxvt_usleep (VISUAL_BELL_DURATION);
1850 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1851 } 1873 }
1852 else 1874 else
1853 XBell (display->display, 0); 1875 XBell (display->display, 0);
… …
1867 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1868 return; 1890 return;
1869 1891
1870 if (fullhist) 1892 if (fullhist)
1871 { 1893 {
1872 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1873 row_start = -nsaved; 1895 row_start = top_row;
1874 } 1896 }
1875 else 1897 else
1876 { 1898 {
1877 nrows = nrow; 1899 nrows = nrow;
1878 row_start = -view_start; 1900 row_start = view_start;
1879 } 1901 }
1880 1902
1881 wctomb (0, 0); 1903 wctomb (0, 0);
1882 1904
1883 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1915 * Refresh the screen 1937 * Refresh the screen
1916 * drawn_text/drawn_rend contain the screen information before the update. 1938 * drawn_text/drawn_rend contain the screen information before the update.
1917 * screen.text/screen.rend contain what the screen will change to. 1939 * screen.text/screen.rend contain what the screen will change to.
1918 */ 1940 */
1919void 1941void
1920rxvt_term::scr_refresh (unsigned char refresh_type) 1942rxvt_term::scr_refresh ()
1921{ 1943{
1922 unsigned char must_clear, /* use draw_string not draw_image_string */ 1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1923 showcursor; /* show the cursor */ 1945 showcursor; /* show the cursor */
1924 int16_t col, row, /* column/row we're processing */ 1946 int16_t col, row, /* column/row we're processing */
1925 ocrow; /* old cursor row */ 1947 ocrow; /* old cursor row */
… …
2011 2033
2012 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2035 setoldcursor = 0;
2014 if (ocrow != -1) 2036 if (ocrow != -1)
2015 { 2037 {
2016 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2018 { 2040 {
2019 if (ocrow < nrow 2041 if (ocrow < nrow
2020 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2029 else if (!focus) 2051 else if (!focus)
2030 setoldcursor = 1; 2052 setoldcursor = 1;
2031 2053
2032 if (setoldcursor) 2054 if (setoldcursor)
2033 { 2055 {
2034 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2035 oldcursor.row = -1; 2057 oldcursor.row = -1;
2036 else 2058 else
2037 { 2059 {
2038 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2039 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2040 } 2062 }
2041 } 2063 }
2042 } 2064 }
2043 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2068 scr_swap_overlay ();
2046#endif 2069#endif
2047 2070
2048#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
2049 /* 2072 /*
2050 * D: CopyArea pass - very useful for slower links 2073 * D: CopyArea pass - very useful for slower links
2051 * This has been deliberately kept simple. 2074 * This has been deliberately kept simple.
2052 */ 2075 */
2053 i = num_scr;
2054 if (!display->is_local 2076 if (!display->is_local
2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2056 && abs (num_scr) < nrow && !must_clear) 2078 && abs (num_scr) < nrow && !must_clear)
2057 { 2079 {
2058 int16_t nits; 2080 int16_t nits;
2059 int j; 2081 int j;
2060 int len, wlen; 2082 int len, wlen;
2083 dLocal (int, num_scr);
2061 2084
2062 j = nrow; 2085 j = nrow;
2063 wlen = len = -1; 2086 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2089 {
2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2091 {
2069 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2070 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2071 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2072 2095
2073 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2097 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2098 if (wlen < len) 2121 if (wlen < len)
2099 ::swap (wlen, len); 2122 ::swap (wlen, len);
2100 2123
2101 XCopyArea (display->display, vt, vt, 2124 XCopyArea (display->display, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2106 len = -1; 2129 len = -1;
2107 } 2130 }
2108 } 2131 }
… …
2112 /* 2135 /*
2113 * E: main pass across every character 2136 * E: main pass across every character
2114 */ 2137 */
2115 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2116 { 2139 {
2117 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2118 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2119 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2120 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2121 2144
2122 /* 2145 /*
2123 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2311 } /* for (row....) */ 2334 } /* for (row....) */
2312 2335
2313#if ENABLE_OVERLAY 2336#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2337 scr_swap_overlay ();
2315#endif 2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2340
2317 /* 2341 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2343 */
2320 if (showcursor) 2344 if (showcursor)
… …
2359 /* 2383 /*
2360 * H: cleanup selection 2384 * H: cleanup selection
2361 */ 2385 */
2362 scr_reverse_selection (); 2386 scr_reverse_selection ();
2363 2387
2364 if (refresh_type & SMOOTH_REFRESH)
2365 XFlush (display->display);
2366
2367 num_scr = 0; 2388 num_scr = 0;
2368 num_scr_allow = 1; 2389 num_scr_allow = 1;
2369} 2390}
2370 2391
2371void 2392void
2372rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2373{ 2394{
2374 if (!l.t) 2395 if (!l.t)
2375 return; 2396 return;
2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2376 2399
2377 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2379} 2402}
2380 2403
… …
2433 2456
2434 if (really) 2457 if (really)
2435 XClearWindow (display->display, vt); 2458 XClearWindow (display->display, vt);
2436} 2459}
2437 2460
2461void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2463{
2464 int view_end = view_start + nrow;
2465 int row, col;
2466
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = beg_col; col < end_col; col++)
2473 srp[col] ^= rstyle1;
2474
2475 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= rstyle2;
2477
2478 if (++col < end_col)
2479 srp[col] ^= rstyle2;
2480 }
2481}
2482
2483void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2485{
2486 int view_end = view_start + nrow;
2487 int row, col;
2488
2489 if (beg_row >= view_start)
2490 {
2491 col = beg_col;
2492 row = beg_row;
2493 }
2494 else
2495 {
2496 col = 0;
2497 row = view_start;
2498 }
2499
2500 for (; row < min (end_row, view_end); row++, col = 0)
2501 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2502 srp[col] ^= rstyle;
2503
2504 if (row == end_row)
2505 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2506 srp[col] ^= rstyle;
2507}
2508
2438/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2439void 2510void
2440rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2441{ 2512{
2442 if (selection.op 2513 if (selection.op
2443 && current_screen == selection.screen 2514 && current_screen == selection.screen
2444 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2445 { 2516 {
2446 int view_end = -view_start + nrow;
2447 int row, col;
2448
2449#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2450 if (selection.rect) 2518 if (selection.rect)
2451 { 2519 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++) 2520 selection.end.row, selection.end.col,
2453 { 2521 RS_RVid, RS_RVid | RS_Uline);
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2456
2457 for (col = selection.beg.col; col < selection.end.col; col++)
2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462
2463 if (++col < selection.end.col)
2464 srp[col] ^= RS_RVid | RS_Uline;
2465 }
2466 }
2467 else 2522 else
2468#endif 2523#endif
2469 { 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2470 if (selection.beg.row >= -view_start) 2525 selection.end.row, selection.end.col,
2471 { 2526 RS_RVid);
2472 col = selection.beg.col;
2473 row = selection.beg.row;
2474 }
2475 else
2476 {
2477 col = 0;
2478 row = -view_start;
2479 }
2480
2481 for (; row < min (selection.end.row, view_end); row++, col = 0)
2482 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2483 srp[col] ^= RS_RVid;
2484
2485 if (row == selection.end.row)
2486 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2487 srp[col] ^= RS_RVid;
2488 }
2489 } 2527 }
2490} 2528}
2491 2529
2492/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2493/* 2531/*
… …
2531 2569
2532 if (!selection.op) 2570 if (!selection.op)
2533 return; 2571 return;
2534 2572
2535 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2536 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2537 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2538 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2539 || (check_more == 1 2577 || (check_more == 1
2540 && current_screen == selection.screen 2578 && current_screen == selection.screen
2541 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2542 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2543 || (check_more == 2 2581 || (check_more == 2
… …
2554/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2555/* 2593/*
2556 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2557 */ 2595 */
2558void 2596void
2559rxvt_term::paste (unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2560{ 2598{
2561 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2562 for (unsigned int i = 0; i < len; i++) 2600 for (unsigned int i = 0; i < len; i++)
2563 if (data[i] == C0_LF) 2601 if (data[i] == C0_LF)
2564 data[i] = C0_CR; 2602 data[i] = C0_CR;
… …
2708 { 2746 {
2709 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2710 char *s = rxvt_wcstombs (w); 2748 char *s = rxvt_wcstombs (w);
2711 free (w); 2749 free (w);
2712 // TODO: strlen == only the first element will be converted. well... 2750 // TODO: strlen == only the first element will be converted. well...
2713 paste ((unsigned char *)s, strlen (s)); 2751 paste (s, strlen (s));
2714 free (s); 2752 free (s);
2715 } 2753 }
2716 else 2754 else
2717#endif 2755#endif
2718 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2719 && cl) 2757 && cl)
2720 { 2758 {
2721 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2722 paste ((unsigned char *)cl[i], strlen (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2723 2761
2724 XFreeStringList (cl); 2762 XFreeStringList (cl);
2725 } 2763 }
2726 else 2764 else
2727 paste (ct.value, ct.nitems); // paste raw 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2728 2766
2729bailout: 2767bailout:
2730 XFree (ct.value); 2768 XFree (ct.value);
2731 2769
2732 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
… …
2770 return; /* outside window */ 2808 return; /* outside window */
2771 2809
2772 if (selection.text) 2810 if (selection.text)
2773 { /* internal selection */ 2811 { /* internal selection */
2774 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2775 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2776 free (str); 2814 free (str);
2777 return; 2815 return;
2778 } 2816 }
2779 else 2817 else
2780 { 2818 {
… …
2872 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2873 2911
2874 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2875 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2876 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2877 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2878 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2879 2920
2880 int ofs = 0; 2921 int ofs = 0;
2881 int extra = 0; 2922 int extra = 0;
… …
2893 col = selection.beg.col; 2934 col = selection.beg.col;
2894 end_col = ncol + 1; 2935 end_col = ncol + 1;
2895 } 2936 }
2896 else 2937 else
2897#endif 2938#endif
2898 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2899 2940
2900 col = max (col, 0); 2941 col = max (col, 0);
2901 2942
2902 if (row == selection.end.row 2943 if (row == selection.end.row
2903#if ENABLE_FRILLS 2944#if ENABLE_FRILLS
… …
2905#endif 2946#endif
2906 ) 2947 )
2907 min_it (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2908 2949
2909 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2910 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2911 { 2953 {
2912 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2913 t++; 2955 t++;
2914#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2963 3005
2964 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2965 selection.len = ofs; 3007 selection.len = ofs;
2966 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2967 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2968 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2969 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2970 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2971 else 3027 else
2972 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2973 3032
2974#if 0 3033#if 0
2975 XTextProperty ct; 3034 XTextProperty ct;
2976 3035
2977 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2978 { 3037 {
2979 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2980 XFree (ct.value); 3039 XFree (ct.value);
2981 } 3040 }
2982#endif 3041#endif
2983
2984 selection_time = tm;
2985} 3042}
2986 3043
2987/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2988/* 3045/*
2989 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2993rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2994{ 3051{
2995 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2996 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2997 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
2998 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2999 3065
3000 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
3001 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
3002 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
3003 0, /* button 3 */ 3069 0, /* button 3 */
3004 1, /* button press */ 3070 1, /* button press */
3005 0); /* click change */ 3071 0); /* click change */
3006} 3072}
3007 3073
… …
3012void 3078void
3013rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
3014{ 3080{
3015 want_refresh = 1; 3081 want_refresh = 1;
3016 3082
3017 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
3018 selection.mark.col = col; 3084 selection.mark.col = col;
3019 3085
3020 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3021 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3022 3088
3023 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
3024 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3025 --selection.mark.col; 3091 --selection.mark.col;
… …
3053 text_t *stp; 3119 text_t *stp;
3054 rend_t *srp; 3120 rend_t *srp;
3055 3121
3056 if (dirn == UP) 3122 if (dirn == UP)
3057 { 3123 {
3058 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3059 bound.col = 0; 3125 bound.col = 0;
3060 dirnadd = -1; 3126 dirnadd = -1;
3061 } 3127 }
3062 else 3128 else
3063 { 3129 {
… …
3111 } 3177 }
3112 } 3178 }
3113 break; 3179 break;
3114 } 3180 }
3115 3181
3116Old_Word_Selection_You_Die:
3117 if (dirn == DN) 3182 if (dirn == DN)
3118 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3119 3184
3120 /* Poke the values back in */ 3185 /* Poke the values back in */
3121 ret->row = row; 3186 ret->row = row;
… …
3142 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3143 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3144 */ 3209 */
3145 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3146 && (col == selection.mark.col 3211 && (col == selection.mark.col
3147 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3148 { 3213 {
3149 /* select nothing */ 3214 /* select nothing */
3150 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3151 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3152 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3207 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3208 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3209 } 3274 }
3210 3275
3211 pos.col = col; 3276 pos.col = col;
3212 pos.row = row - view_start; 3277 pos.row = view_start + row;
3213 3278
3214 /* 3279 /*
3215 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3216 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3217 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3585 3650
3586#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3587void 3652void
3588rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3589{ 3654{
3590 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3591 return; 3656 return;
3592 3657
3593 want_refresh = 1; 3658 want_refresh = 1;
3594 3659
3595 scr_overlay_off (); 3660 scr_overlay_off ();
… …
3702 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3703 { 3768 {
3704 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3705 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3706 3771
3707 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3708 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3709 3774
3710 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3711 { 3776 {
3712 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3713 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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