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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.233 by root, Mon Jan 16 06:37:52 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
173 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
174 { 180 {
175 //TODO//FIXME 181 //TODO//FIXME
176 saveLines++; 182 saveLines++;
177 prev_nrow--; 183 prev_nrow--;
178 nsaved++; 184 top_row--;
179 } 185 }
180 186
181 want_refresh = 1; 187 want_refresh = 1;
182 188
183 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
254 } 258 }
255 } 259 }
256#endif 260#endif
257 261
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 264
262 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
263 { 266 {
264 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
… …
269 { 272 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 275 }
273 276
277 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 279
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
279 283
280 if (nsaved) 284 if (top_row)
281 { 285 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
284 288
285 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 291
288 while (p != pend && q > 0) 292 do
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)
… …
329 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
331 335
332 prow = MOD (p + prow, prev_total_rows); 336 prow = MOD (p + prow, prev_total_rows);
333 337
334 // we only adjust the cursor _row_, as this seems to upset 338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
335 // applications/shells/readline least. 340 // this seems to upset applications/shells/readline
341 // least.
336 if (prow == ocur.row) 342 if (prow == ocur.row)
337 screen.cur.row = qrow - (total_rows - nrow); 343 screen.cur.row = q - (total_rows - nrow);
338 344
339 line_t &pline = old_buf [prow]; 345 line_t &pline = old_buf [prow];
340 346
341 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
342 348
… …
349 lofs += len; 355 lofs += len;
350 qcol += len; 356 qcol += len;
351 } 357 }
352 } 358 }
353 359
354 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
355 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
356 } 363 }
364 while (p != pend && q > 0);
357 365
358 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
359 view_start = 0; 367 top_row = q - term_start;
360 nsaved = term_start - q;
361 368
362 // make sure all terminal lines exist 369 // make sure all terminal lines exist
363 while (nsaved < 0) 370 while (top_row > 0)
364 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
365
366 } 372 }
367 else 373 else
368 { 374 {
369 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
370 376
… …
381 { 387 {
382 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
383 } 389 }
384 390
385 term_start = 0; 391 term_start = 0;
386 view_start = 0;
387 } 392 }
388 393
389#ifdef DEBUG_STRICT 394#ifdef DEBUG_STRICT //TODO: remove
390 for (int i = -nsaved; i < nrow; i++) 395 for (int i = top_row; i < nrow; i++)
391 assert (ROW (i).t); 396 assert (ROW (i).t);
392#endif 397#endif
393 398
394 free (old_buf); 399 free (old_buf);
395 delete old_ta; 400 delete old_ta;
… …
409 414
410 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
411 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
412 417
413 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 421}
415 422
416/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
417/* 424/*
418 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
424 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
425 432
426 free (row_buf); 433 free (row_buf);
427 free (swap_buf); 434 free (swap_buf);
428 free (drawn_buf); 435 free (drawn_buf);
429 free (temp_buf);
430 free (tabs); 436 free (tabs);
431 437
432 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
433} 439}
434 440
… …
522 528
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525 531
526#if NSCREENS 532#if NSCREENS
527 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
528 { 534 {
529 num_scr = 0; 535 num_scr = 0;
530 536
531 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
532 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
… …
536 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
537 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
538 } 544 }
539 else 545 else
540#endif 546#endif
541 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
542 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
543 549
544 return scrn; 550 return scrn;
545} 551}
546 552
… …
566 * Change the colour for following text 572 * Change the colour for following text
567 */ 573 */
568void 574void
569rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
570{ 576{
571 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
572 color = fgbg; 578 color = fgbg;
573 579
574 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
575 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
576 else 582 else
… …
607 want_refresh = 1; 613 want_refresh = 1;
608 num_scr += count; 614 num_scr += count;
609 615
610 if (count > 0 616 if (count > 0
611 && row1 == 0 617 && row1 == 0
612 && row2 == nrow - 1
613 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
614 { 619 {
615 nsaved = min (nsaved + count, saveLines); 620 top_row = max (top_row - count, -saveLines);
621
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
617 626
627 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count);
630 l.touch ();
631 l.is_longer (0);
632 }
633
634 // erase newly scorlled-in lines
635 for (int i = count; i; --i )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
618 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
619 { 661 {
620 selection.beg.row -= count; 662 selection.beg.row -= count;
621 selection.end.row -= count; 663 selection.end.row -= count;
622 selection.mark.row -= count; 664 selection.mark.row -= count;
623 665
624 selection_check (0); 666 if (selection.beg.row < top_row
625 } 667 || selection.end.row < top_row
626 668 || selection.mark.row < top_row)
627 for (int i = count; i--; )
628 scr_blank_screen_mem (ROW(row2 - i), rstyle);
629
630 if ((options & Opt_scrollWithBuffer)
631 && view_start != 0
632 && view_start != saveLines)
633 scr_page (UP, count);
634 }
635 else
636 {
637 if (selection.op && current_screen == selection.screen)
638 {
639 int i = selection.beg.row;
640 int j = selection.end.row;
641
642 if ((i < row1 && j > row1)
643 || (i < row2 && j > row2)
644 || (i - count < row1 && i >= row1)
645 || (i - count > row2 && i <= row2)
646 || (j - count < row1 && j >= row1)
647 || (j - count > row2 && j <= row2))
648 { 669 {
649 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
650 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
651 } 672 }
652 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680 }
681 else
682 {
683 if (selection.op && current_screen == selection.screen)
684 {
685 if ((selection.beg.row < row1 && selection.end.row > row1)
686 || (selection.beg.row < row2 && selection.end.row > row2)
687 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
688 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
689 || (selection.end.row - count < row1 && selection.end.row >= row1)
690 || (selection.end.row - count > row2 && selection.end.row <= row2))
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 else if (selection.end.row >= row1 && selection.end.row <= row2)
653 { 696 {
654 /* move selected region too */ 697 /* move selected region too */
655 selection.beg.row -= count; 698 selection.beg.row -= count;
656 selection.end.row -= count; 699 selection.end.row -= count;
657 selection.mark.row -= count; 700 selection.mark.row -= count;
… …
665 708
666 int rows = row2 - row1 + 1; 709 int rows = row2 - row1 + 1;
667 710
668 min_it (count, rows); 711 min_it (count, rows);
669 712
713 line_t *temp_buf = row_buf + total_rows;
714
670 for (int row = 0; row < rows; row++) 715 for (int row = 0; row < rows; row++)
671 { 716 {
672 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 717 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
673 718
674 if (!IN_RANGE_EXC (row + count, 0, rows)) 719 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
685/* ------------------------------------------------------------------------- */ 730/* ------------------------------------------------------------------------- */
686/* 731/*
687 * Add text given in <str> of length <len> to screen struct 732 * Add text given in <str> of length <len> to screen struct
688 */ 733 */
689void 734void
690rxvt_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)
691{ 736{
692 if (len <= 0) /* sanity */ 737 if (len <= 0) /* sanity */
693 return; 738 return;
694 739
695 unsigned char checksel; 740 unsigned char checksel;
696 unicode_t c; 741 unicode_t c;
697 int row, last_col; 742 int ncol = this->ncol;
698 const unicode_t *strend = str + len; 743 const wchar_t *strend = str + len;
699 744
700 want_refresh = 1; 745 want_refresh = 1;
701 ZERO_SCROLLBACK (); 746 ZERO_SCROLLBACK ();
702 last_col = ncol;
703 747
704 if (nlines > 0) 748 if (minlines > 0)
705 { 749 {
706 nlines += screen.cur.row - screen.bscroll; 750 minlines += screen.cur.row - screen.bscroll;
751
707 if (nlines > 0 752 if (minlines > 0
708 && screen.tscroll == 0 753 && screen.tscroll == 0
709 && screen.bscroll == (nrow - 1)) 754 && screen.bscroll == nrow - 1)
710 { 755 {
711 /* _at least_ this many lines need to be scrolled */ 756 /* _at least_ this many lines need to be scrolled */
712 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 757 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
713 screen.cur.row -= nlines; 758 screen.cur.row -= minlines;
714 } 759 }
715 } 760 }
716 761
717#ifdef DEBUG_STRICT 762#ifdef DEBUG_STRICT
718 assert (screen.cur.col < last_col); 763 assert (screen.cur.col < ncol);
719 assert (screen.cur.row < nrow 764 assert (screen.cur.row < nrow
720 && screen.cur.row >= -nsaved); 765 && screen.cur.row >= top_row);
721#endif 766#endif
722 row = screen.cur.row; 767 int row = screen.cur.row;
723 768
724 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 769 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
725 770
726 line_t *line = &ROW(row); 771 line_t *line = &ROW(row);
727 772
728 while (str < strend) 773 while (str < strend)
729 { 774 {
730 c = *str++; 775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
731 776
732 if (c < 0x20) 777 if (c < 0x20)
733 if (c == C0_LF) 778 if (c == C0_LF)
734 { 779 {
735 if (!line->is_longer ()) /* XXX: think about this */
736 max_it (line->l, screen.cur.col); 780 max_it (line->l, screen.cur.col);
737 781
738 screen.flags &= ~Screen_WrapNext; 782 screen.flags &= ~Screen_WrapNext;
739 783
740 if (screen.cur.row == screen.bscroll) 784 if (screen.cur.row == screen.bscroll)
741 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 785 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
745 line = &ROW(row); /* _must_ refresh */ 789 line = &ROW(row); /* _must_ refresh */
746 continue; 790 continue;
747 } 791 }
748 else if (c == C0_CR) 792 else if (c == C0_CR)
749 { 793 {
750 if (!line->is_longer ()) /* XXX: think about this */
751 max_it (line->l, screen.cur.col); 794 max_it (line->l, screen.cur.col);
752 795
753 screen.flags &= ~Screen_WrapNext; 796 screen.flags &= ~Screen_WrapNext;
754 screen.cur.col = 0; 797 screen.cur.col = 0;
755 continue; 798 continue;
756 } 799 }
… …
773 CLEAR_SELECTION (); 816 CLEAR_SELECTION ();
774 } 817 }
775 818
776 if (screen.flags & Screen_WrapNext) 819 if (screen.flags & Screen_WrapNext)
777 { 820 {
821 max_it (line->l, ncol);
778 line->set_is_longer (); 822 line->is_longer (1);
779 823
780 scr_do_wrap (); 824 scr_do_wrap ();
781 825
782 row = screen.cur.row; 826 row = screen.cur.row;
783 line = &ROW(row); /* _must_ refresh */ 827 line = &ROW(row); /* _must_ refresh */
… …
791 // do wcwidth before further replacements, as wcwidth might return -1 835 // do wcwidth before further replacements, as wcwidth might return -1
792 // 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
793 // locale. 837 // locale.
794 int width = c < 0x100 ? 1 : wcwidth (c); 838 int width = c < 0x100 ? 1 : wcwidth (c);
795 839
796 if (charsets[screen.charset] == '0') // DEC SPECIAL 840 if (charsets [screen.charset] == '0') // DEC SPECIAL
797 { 841 {
798 // vt100 special graphics and line drawing 842 // vt100 special graphics and line drawing
799 // 5f-7e standard vt100 843 // 5f-7e standard vt100
800 // 40-5e rxvt extension for extra curses acs chars 844 // 40-5e rxvt extension for extra curses acs chars
801 static uint16_t vt100_0[62] = { // 41 .. 7e 845 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
853 } 897 }
854 898
855 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
856 900
857 // if the character doesn't fit into the remaining columns... 901 // if the character doesn't fit into the remaining columns...
858 if (screen.cur.col > last_col - width && last_col >= width) 902 if (screen.cur.col > ncol - width && ncol >= width)
859 { 903 {
860 // ...output spaces 904 // ...output spaces
861 c = ' '; 905 c = ' ';
862 // and try the same character next loop iteration 906 // and try the same character next loop iteration
863 --str; 907 --str;
864 } 908 }
865 909
910 line->touch ();
911
866 do 912 do
867 { 913 {
868 line->t[screen.cur.col] = c; 914 line->t[screen.cur.col] = c;
869 line->r[screen.cur.col] = rend; 915 line->r[screen.cur.col] = rend;
870 916
871 if (screen.cur.col < last_col - 1) 917 if (screen.cur.col < ncol - 1)
872 screen.cur.col++; 918 screen.cur.col++;
873 else 919 else
874 { 920 {
875 line->l = last_col; 921 line->l = ncol;
876 if (screen.flags & Screen_Autowrap) 922 if (screen.flags & Screen_Autowrap)
877 screen.flags |= Screen_WrapNext; 923 screen.flags |= Screen_WrapNext;
878 break; 924 break;
879 } 925 }
880 926
… …
882 } 928 }
883 while (--width > 0); 929 while (--width > 0);
884 930
885 // pad with spaces when overwriting wide character with smaller one 931 // pad with spaces when overwriting wide character with smaller one
886 if (!width) 932 if (!width)
933 {
934 line->touch ();
935
887 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++)
888 { 937 {
889 line->t[c] = ' '; 938 line->t[c] = ' ';
890 line->r[c] = rend; 939 line->r[c] = rend;
891 } 940 }
941 }
892 } 942 }
893 else // width == 0 943 else // width == 0
894 { 944 {
895#if ENABLE_COMBINING 945#if ENABLE_COMBINING
896 // handle combining characters 946 // handle combining characters
897 // we just tag the accent on the previous on-screen character. 947 // we just tag the accent on the previous on-screen character.
898 // this is arguably not correct, but also arguably not wrong. 948 // this is arguably not correct, but also arguably not wrong.
899 // we don't handle double-width characters nicely yet. 949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
900 text_t *tp; 951 text_t *tp;
901 rend_t *rp; 952 rend_t *rp;
902 953
903 if (screen.cur.col > 0) 954 if (screen.cur.col > 0)
904 { 955 {
956 linep = line;
905 tp = line->t + screen.cur.col - 1; 957 tp = line->t + screen.cur.col - 1;
906 rp = line->r + screen.cur.col - 1; 958 rp = line->r + screen.cur.col - 1;
907
908 while (*tp == NOCHAR && tp > line->t)
909 tp--, rp--;
910 } 959 }
911 else if (screen.cur.row > 0 960 else if (screen.cur.row > 0
912 && ROW(screen.cur.row - 1).is_longer ()) 961 && ROW(screen.cur.row - 1).is_longer ())
913 { 962 {
914 line_t *line = &ROW(screen.cur.row - 1); 963 linep = &ROW(screen.cur.row - 1);
915
916 tp = line->t + last_col - 1; 964 tp = line->t + ncol - 1;
917 rp = line->r + last_col - 1; 965 rp = line->r + ncol - 1;
918
919 while (*tp == NOCHAR && tp > line->t)
920 tp--, rp--;
921 } 966 }
922 else 967 else
923 continue; 968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
924 974
925 // first try to find a precomposed character 975 // first try to find a precomposed character
926 unicode_t n = rxvt_compose (*tp, c); 976 unicode_t n = rxvt_compose (*tp, c);
927 if (n == NOCHAR) 977 if (n == NOCHAR)
928 n = rxvt_composite.compose (*tp, c); 978 n = rxvt_composite.compose (*tp, c);
… …
931 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
932#endif 982#endif
933 } 983 }
934 } 984 }
935 985
936 if (!line->is_longer ()) /* XXX: think about this */
937 max_it (line->l, screen.cur.col); 986 max_it (line->l, screen.cur.col);
938 987
939#ifdef DEBUG_STRICT 988#ifdef DEBUG_STRICT
940 assert (screen.cur.row >= 0); 989 assert (screen.cur.row >= 0);
941#endif 990#endif
942} 991}
… …
984 1033
985 if (count == 0) 1034 if (count == 0)
986 return; 1035 return;
987 else if (count > 0) 1036 else if (count > 0)
988 { 1037 {
989 int row = screen.cur.row;
990
991 line_t &l = ROW(row); 1038 line_t &l = ROW(screen.cur.row);
992 rend_t base_rend = l.r[i]; 1039 rend_t base_rend = l.r[i];
993 ht &= l.t[i] == ' '; 1040 ht &= l.t[i] == ' ';
994 1041
995 for (; ++i < ncol; ) 1042 for (; ++i < ncol; )
996 if (tabs[i]) 1043 if (tabs[i])
997 { 1044 {
998 x = i; 1045 x = i;
1046
999 if (!--count) 1047 if (!--count)
1000 break; 1048 break;
1001 } 1049 }
1002 else 1050 else
1003 ht &= l.t[i] == ' ' 1051 ht &= l.t[i] == ' '
… …
1006 if (count) 1054 if (count)
1007 x = ncol - 1; 1055 x = ncol - 1;
1008 1056
1009 // store horizontal tab commands as characters inside the text 1057 // store horizontal tab commands as characters inside the text
1010 // buffer so they can be selected and pasted. 1058 // buffer so they can be selected and pasted.
1011 if (ht && options & Opt_pastableTabs) 1059 if (ht && OPTION (Opt_pastableTabs))
1012 { 1060 {
1013 base_rend = SET_FONT (base_rend, 0); 1061 base_rend = SET_FONT (base_rend, 0);
1014 1062
1015 if (!l.is_longer ()) /* XXX: think about this */ 1063 l.touch (x);
1016 max_it (l.l, x);
1017 1064
1018 i = screen.cur.col; 1065 i = screen.cur.col;
1019 1066
1020 l.t[i] = '\t'; 1067 l.t[i] = '\t';
1021 l.r[i] = base_rend; 1068 l.r[i] = base_rend;
… …
1071 */ 1118 */
1072#if ENABLE_FRILLS 1119#if ENABLE_FRILLS
1073void 1120void
1074rxvt_term::scr_forwardindex () 1121rxvt_term::scr_forwardindex ()
1075{ 1122{
1076 int row;
1077
1078 if (screen.cur.col < ncol - 1) 1123 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1125 else
1081 { 1126 {
1082 row = screen.cur.row; 1127 line_t &l = ROW(screen.cur.row);
1083 1128
1084 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1129 l.touch ();
1085 ROW(row).l = ncol; 1130 l.is_longer (0);
1086 1131
1087 scr_gotorc (0, 0, R_RELATIVE); 1132 scr_gotorc (0, 0, R_RELATIVE);
1088 scr_insdel_chars (1, DELETE); 1133 scr_insdel_chars (1, DELETE);
1089 scr_gotorc (0, ncol - 1, R_RELATIVE); 1134 scr_gotorc (0, ncol - 1, R_RELATIVE);
1090 } 1135 }
… …
1173 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1174 */ 1219 */
1175void 1220void
1176rxvt_term::scr_erase_line (int mode) 1221rxvt_term::scr_erase_line (int mode)
1177{ 1222{
1178 unsigned int row, col, num; 1223 unsigned int col, num;
1179 1224
1180 want_refresh = 1; 1225 want_refresh = 1;
1181 ZERO_SCROLLBACK (); 1226 ZERO_SCROLLBACK ();
1182 1227
1183 selection_check (1); 1228 selection_check (1);
1184 1229
1185 row = screen.cur.row; 1230 line_t &line = ROW(screen.cur.row);
1231
1232 line.touch ();
1233 line.is_longer (0);
1186 1234
1187 switch (mode) 1235 switch (mode)
1188 { 1236 {
1189 case 0: /* erase to end of line */ 1237 case 0: /* erase to end of line */
1190 col = screen.cur.col; 1238 col = screen.cur.col;
1191 num = ncol - col; 1239 num = ncol - col;
1192 min_it (ROW(row).l, col); 1240 min_it (line.l, col);
1193 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1194 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1195 CLEAR_SELECTION (); 1243 CLEAR_SELECTION ();
1196 break; 1244 break;
1197 case 1: /* erase to beginning of line */ 1245 case 1: /* erase to beginning of line */
… …
1202 CLEAR_SELECTION (); 1250 CLEAR_SELECTION ();
1203 break; 1251 break;
1204 case 2: /* erase whole line */ 1252 case 2: /* erase whole line */
1205 col = 0; 1253 col = 0;
1206 num = ncol; 1254 num = ncol;
1207 ROW(row).l = 0; 1255 line.l = 0;
1208 if (selection.beg.row <= screen.cur.row 1256 if (selection.beg.row <= screen.cur.row
1209 && selection.end.row >= screen.cur.row) 1257 && selection.end.row >= screen.cur.row)
1210 CLEAR_SELECTION (); 1258 CLEAR_SELECTION ();
1211 break; 1259 break;
1212 default: 1260 default:
1213 return; 1261 return;
1214 } 1262 }
1215 1263
1216 scr_blank_line (ROW(row), col, num, rstyle); 1264 scr_blank_line (line, col, num, rstyle);
1217} 1265}
1218 1266
1219/* ------------------------------------------------------------------------- */ 1267/* ------------------------------------------------------------------------- */
1220/* 1268/*
1221 * Erase part of whole of the screen 1269 * Erase part of whole of the screen
… …
1276 CLEAR_ROWS (row, num); 1324 CLEAR_ROWS (row, num);
1277 } 1325 }
1278 else 1326 else
1279 { 1327 {
1280 ren = rstyle & (RS_fgMask | RS_bgMask); 1328 ren = rstyle & (RS_fgMask | RS_bgMask);
1281 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1282 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1330 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1283 ERASE_ROWS (row, num); 1331 ERASE_ROWS (row, num);
1284 gcvalue.foreground = pix_colors[Color_fg]; 1332 gcvalue.foreground = pix_colors[Color_fg];
1285 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1286 } 1334 }
1287 1335
1288 for (; num--; row++) 1336 for (; num--; row++)
1289 { 1337 {
1290 scr_blank_screen_mem (ROW (row), rstyle); 1338 scr_blank_screen_mem (ROW(row), rstyle);
1291 ROW (row).l = 0;
1292 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1339 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1293 } 1340 }
1294} 1341}
1295 1342
1296#if ENABLE_FRILLS 1343#if ENABLE_FRILLS
… …
1298rxvt_term::scr_erase_savelines () 1345rxvt_term::scr_erase_savelines ()
1299{ 1346{
1300 want_refresh = 1; 1347 want_refresh = 1;
1301 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1302 1349
1303 nsaved = 0; 1350 top_row = 0;
1304} 1351}
1305#endif 1352#endif
1306 1353
1307/* ------------------------------------------------------------------------- */ 1354/* ------------------------------------------------------------------------- */
1308/* 1355/*
… …
1329 rend_t *r1 = line.r; 1376 rend_t *r1 = line.r;
1330 1377
1331 for (int j = ncol; j--; ) 1378 for (int j = ncol; j--; )
1332 *r1++ = fs; 1379 *r1++ = fs;
1333 1380
1334 line.l = ncol; /* make the `E's selectable */ 1381 line.is_longer (0);
1382 line.touch (ncol);
1335 } 1383 }
1336} 1384}
1337 1385
1338/* ------------------------------------------------------------------------- */ 1386/* ------------------------------------------------------------------------- */
1339/* 1387/*
… …
1387 min_it (count, ncol - screen.cur.col); 1435 min_it (count, ncol - screen.cur.col);
1388 1436
1389 row = screen.cur.row; 1437 row = screen.cur.row;
1390 1438
1391 line_t *line = &ROW(row); 1439 line_t *line = &ROW(row);
1440
1441 line->touch ();
1442 line->is_longer (0);
1392 1443
1393 switch (insdel) 1444 switch (insdel)
1394 { 1445 {
1395 case INSERT: 1446 case INSERT:
1396 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1397 { 1448 {
1398 line->t[col] = line->t[col - count]; 1449 line->t[col] = line->t[col - count];
1399 line->r[col] = line->r[col - count]; 1450 line->r[col] = line->r[col - count];
1400 } 1451 }
1401 1452
1402 if (!line->is_longer ()) 1453 line->l = min (line->l + count, ncol);
1403 {
1404 line->l += count;
1405 min_it (line->l, ncol);
1406 }
1407 1454
1408 if (selection.op && current_screen == selection.screen 1455 if (selection.op && current_screen == selection.screen
1409 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1410 { 1457 {
1411 if (selection.end.row != screen.cur.row 1458 if (selection.end.row != screen.cur.row
… …
1424 1471
1425 case ERASE: 1472 case ERASE:
1426 screen.cur.col += count; /* don't worry if > ncol */ 1473 screen.cur.col += count; /* don't worry if > ncol */
1427 selection_check (1); 1474 selection_check (1);
1428 screen.cur.col -= count; 1475 screen.cur.col -= count;
1476
1477 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, screen.cur.col, count, rstyle); 1478 scr_blank_line (*line, screen.cur.col, count, rstyle);
1430 break; 1479 break;
1431 1480
1432 case DELETE: 1481 case DELETE:
1433 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1436 { 1485 {
1437 line->t[col] = line->t[col + count]; 1486 line->t[col] = line->t[col + count];
1438 line->r[col] = line->r[col + count]; 1487 line->r[col] = line->r[col + count];
1439 } 1488 }
1440 1489
1490 line->l = max (line->l - count, 0);
1441 scr_blank_line (*line, ncol - count, count, tr); 1491 scr_blank_line (*line, ncol - count, count, tr);
1442
1443 if (line->is_longer ()) /* break line continuation */
1444 line->l = ncol;
1445
1446 line->l = max (line->l - count, 0);
1447 1492
1448 if (selection.op && current_screen == selection.screen 1493 if (selection.op && current_screen == selection.screen
1449 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1450 { 1495 {
1451 if (selection.end.row != screen.cur.row 1496 if (selection.end.row != screen.cur.row
… …
1563rxvt_term::scr_set_tab (int mode) 1608rxvt_term::scr_set_tab (int mode)
1564{ 1609{
1565 if (mode < 0) 1610 if (mode < 0)
1566 memset (tabs, 0, ncol * sizeof (char)); 1611 memset (tabs, 0, ncol * sizeof (char));
1567 else if (screen.cur.col < ncol) 1612 else if (screen.cur.col < ncol)
1568 tabs[screen.cur.col] = (mode ? 1 : 0); 1613 tabs [screen.cur.col] = !!mode;
1569} 1614}
1570 1615
1571/* ------------------------------------------------------------------------- */ 1616/* ------------------------------------------------------------------------- */
1572/* 1617/*
1573 * Set reverse/normal video 1618 * Set reverse/normal video
… …
1585 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1586#if XPM_BACKGROUND 1631#if XPM_BACKGROUND
1587 if (bgPixmap.pixmap == None) 1632 if (bgPixmap.pixmap == None)
1588#endif 1633#endif
1589#if TRANSPARENT 1634#if TRANSPARENT
1590 if (! (options & Opt_transparent) || am_transparent == 0) 1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1591#endif 1636#endif
1592 XSetWindowBackground (display->display, vt, 1637 XSetWindowBackground (display->display, vt,
1593 pix_colors[Color_bg]); 1638 pix_colors[Color_bg]);
1594 1639
1595 gcvalue.foreground = pix_colors[Color_fg]; 1640 gcvalue.foreground = pix_colors[Color_fg];
… …
1620 * Set font style 1665 * Set font style
1621 */ 1666 */
1622void 1667void
1623rxvt_term::set_font_style () 1668rxvt_term::set_font_style ()
1624{ 1669{
1670#if 0
1625 switch (charsets[screen.charset]) 1671 switch (charsets [screen.charset])
1626 { 1672 {
1627 case '0': /* DEC Special Character & Line Drawing Set */ 1673 case '0': /* DEC Special Character & Line Drawing Set */
1628 break; 1674 break;
1629 case 'A': /* United Kingdom (UK) */ 1675 case 'A': /* United Kingdom (UK) */
1630 break; 1676 break;
… …
1637 case 'C': /* Finnish character set */ 1683 case 'C': /* Finnish character set */
1638 break; 1684 break;
1639 case 'K': /* German character set */ 1685 case 'K': /* German character set */
1640 break; 1686 break;
1641 } 1687 }
1688#endif
1642} 1689}
1643 1690
1644/* ------------------------------------------------------------------------- */ 1691/* ------------------------------------------------------------------------- */
1645/* 1692/*
1646 * Choose a font 1693 * Choose a font
… …
1761/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1762/* 1809/*
1763 * Move the display so that the line represented by scrollbar value Y is at 1810 * Move the display so that the line represented by scrollbar value Y is at
1764 * the top of the screen 1811 * the top of the screen
1765 */ 1812 */
1766int 1813void
1767rxvt_term::scr_move_to (int y, int len) 1814rxvt_term::scr_move_to (int y, int len)
1768{ 1815{
1769 long p = 0; 1816 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1770 unsigned int oldviewstart;
1771
1772 oldviewstart = view_start;
1773
1774 if (y < len)
1775 {
1776 p = (nrow + nsaved) * (len - y) / len;
1777 p -= (long) (nrow - 1);
1778 p = max (p, 0);
1779 }
1780
1781 view_start = (unsigned int)min (p, nsaved);
1782
1783 return scr_changeview (oldviewstart);
1784} 1817}
1785 1818
1786/* ------------------------------------------------------------------------- */ 1819/* ------------------------------------------------------------------------- */
1787/* 1820/*
1788 * Page the screen up/down nlines 1821 * Page the screen up/down nlines
1789 * direction should be UP or DN 1822 * direction should be UP or DN
1790 */ 1823 */
1791int 1824bool
1792rxvt_term::scr_page (enum page_dirn direction, int nlines) 1825rxvt_term::scr_page (enum page_dirn direction, int nlines)
1793{ 1826{
1794 int n; 1827 int new_view_start =
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (direction == UP)
1800 {
1801 n = view_start + nlines;
1802 view_start = min (n, nsaved);
1803 }
1804 else
1805 {
1806 n = view_start - nlines; 1828 direction == UP ? view_start - nlines
1807 view_start = max (n, 0); 1829 : view_start + nlines;
1808 }
1809 1830
1810 return scr_changeview (oldviewstart); 1831 return scr_changeview (new_view_start);
1811} 1832}
1812 1833
1813int 1834bool
1814rxvt_term::scr_changeview (unsigned int oldviewstart) 1835rxvt_term::scr_changeview (int new_view_start)
1815{ 1836{
1837 clamp_it (new_view_start, top_row, 0);
1838
1816 if (view_start != oldviewstart) 1839 if (new_view_start == view_start)
1817 { 1840 return false;
1841
1842 num_scr += new_view_start - view_start;
1843 view_start = new_view_start;
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1818 want_refresh = 1; 1845 want_refresh = 1;
1819 num_scr -= (view_start - oldviewstart);
1820 }
1821 1846
1822 return (int) (view_start - oldviewstart); 1847 return true;
1823} 1848}
1824 1849
1825/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1826void 1851void
1827rxvt_term::scr_bell () 1852rxvt_term::scr_bell ()
1828{ 1853{
1829#ifndef NO_BELL 1854#ifndef NO_BELL
1830 1855
1831# ifndef NO_MAPALERT 1856# ifndef NO_MAPALERT
1832# ifdef MAPALERT_OPTION 1857# ifdef MAPALERT_OPTION
1833 if (options & Opt_mapAlert) 1858 if (OPTION (Opt_mapAlert))
1834# endif 1859# endif
1835 XMapWindow (display->display, parent[0]); 1860 XMapWindow (display->display, parent[0]);
1836# endif 1861# endif
1837 1862
1838 if (options & Opt_visualBell) 1863 if (OPTION (Opt_visualBell))
1839 { 1864 {
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1865 scr_rvideo_mode (!rvideo); /* refresh also done */
1866 display->flush ();
1841 rxvt_usleep (VISUAL_BELL_DURATION); 1867 rxvt_usleep (VISUAL_BELL_DURATION);
1842 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1843 } 1869 }
1844 else 1870 else
1845 XBell (display->display, 0); 1871 XBell (display->display, 0);
… …
1859 if ((fd = popen_printer ()) == NULL) 1885 if ((fd = popen_printer ()) == NULL)
1860 return; 1886 return;
1861 1887
1862 if (fullhist) 1888 if (fullhist)
1863 { 1889 {
1864 nrows = nrow + nsaved; 1890 nrows = nrow - top_row;
1865 row_start = -nsaved; 1891 row_start = top_row;
1866 } 1892 }
1867 else 1893 else
1868 { 1894 {
1869 nrows = nrow; 1895 nrows = nrow;
1870 row_start = -view_start; 1896 row_start = view_start;
1871 } 1897 }
1872 1898
1873 wctomb (0, 0); 1899 wctomb (0, 0);
1874 1900
1875 for (int r1 = 0; r1 < nrows; r1++) 1901 for (int r1 = 0; r1 < nrows; r1++)
… …
1934 1960
1935#if XPM_BACKGROUND 1961#if XPM_BACKGROUND
1936 must_clear |= bgPixmap.pixmap != None; 1962 must_clear |= bgPixmap.pixmap != None;
1937#endif 1963#endif
1938#if TRANSPARENT 1964#if TRANSPARENT
1939 must_clear |= (options & Opt_transparent) && am_transparent; 1965 must_clear |= OPTION (Opt_transparent) && am_transparent;
1940#endif 1966#endif
1941 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1967 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1942 1968
1943 /* 1969 /*
1944 * B: reverse any characters which are selected 1970 * B: reverse any characters which are selected
… …
1968 1994
1969 crp = &ROW(screen.cur.row).r[col]; 1995 crp = &ROW(screen.cur.row).r[col];
1970 1996
1971 if (showcursor && focus) 1997 if (showcursor && focus)
1972 { 1998 {
1973 if (options & Opt_cursorUnderline) 1999 if (OPTION (Opt_cursorUnderline))
1974 *crp ^= RS_Uline; 2000 *crp ^= RS_Uline;
1975 else 2001 else
1976 { 2002 {
1977 *crp ^= RS_RVid; 2003 *crp ^= RS_RVid;
1978 2004
… …
1980 cc1 = *crp & (RS_fgMask | RS_bgMask); 2006 cc1 = *crp & (RS_fgMask | RS_bgMask);
1981 if (ISSET_PIXCOLOR (Color_cursor)) 2007 if (ISSET_PIXCOLOR (Color_cursor))
1982 ccol1 = Color_cursor; 2008 ccol1 = Color_cursor;
1983 else 2009 else
1984#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2010#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1985 ccol1 = GET_FGCOLOR (rstyle); 2011 ccol1 = fgcolor_of (rstyle);
1986#else 2012#else
1987 ccol1 = Color_fg; 2013 ccol1 = Color_fg;
1988#endif 2014#endif
1989 if (ISSET_PIXCOLOR (Color_cursor2)) 2015 if (ISSET_PIXCOLOR (Color_cursor2))
1990 ccol2 = Color_cursor2; 2016 ccol2 = Color_cursor2;
1991 else 2017 else
1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2018#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1993 ccol2 = GET_BGCOLOR (rstyle); 2019 ccol2 = bgcolor_of (rstyle);
1994#else 2020#else
1995 ccol2 = Color_bg; 2021 ccol2 = Color_bg;
1996#endif 2022#endif
1997 *crp = SET_FGCOLOR (*crp, ccol1); 2023 *crp = SET_FGCOLOR (*crp, ccol1);
1998 *crp = SET_BGCOLOR (*crp, ccol2); 2024 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2003 2029
2004 /* make sure no outline cursor is left around */ 2030 /* make sure no outline cursor is left around */
2005 setoldcursor = 0; 2031 setoldcursor = 0;
2006 if (ocrow != -1) 2032 if (ocrow != -1)
2007 { 2033 {
2008 if (screen.cur.row + view_start != ocrow 2034 if (screen.cur.row - view_start != ocrow
2009 || screen.cur.col != oldcursor.col) 2035 || screen.cur.col != oldcursor.col)
2010 { 2036 {
2011 if (ocrow < nrow 2037 if (ocrow < nrow
2012 && oldcursor.col < ncol) 2038 && oldcursor.col < ncol)
2013 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2039 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2021 else if (!focus) 2047 else if (!focus)
2022 setoldcursor = 1; 2048 setoldcursor = 1;
2023 2049
2024 if (setoldcursor) 2050 if (setoldcursor)
2025 { 2051 {
2026 if (screen.cur.row + view_start >= nrow) 2052 if (screen.cur.row - view_start >= nrow)
2027 oldcursor.row = -1; 2053 oldcursor.row = -1;
2028 else 2054 else
2029 { 2055 {
2030 oldcursor.row = screen.cur.row + view_start; 2056 oldcursor.row = screen.cur.row - view_start;
2031 oldcursor.col = screen.cur.col; 2057 oldcursor.col = screen.cur.col;
2032 } 2058 }
2033 } 2059 }
2034 } 2060 }
2035 2061
2062 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2036#if ENABLE_OVERLAY 2063#if ENABLE_OVERLAY
2037 scr_swap_overlay (); 2064 scr_swap_overlay ();
2038#endif 2065#endif
2039 2066
2040#ifndef NO_SLOW_LINK_SUPPORT 2067#ifndef NO_SLOW_LINK_SUPPORT
… …
2056 row = i > 0 ? 0 : j - 1; 2083 row = i > 0 ? 0 : j - 1;
2057 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2084 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2058 { 2085 {
2059 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2086 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2060 { 2087 {
2061 line_t s = ROW(row - view_start); 2088 line_t s = ROW(view_start + row);
2062 line_t d = drawn_buf[row]; 2089 line_t d = drawn_buf[row];
2063 line_t d2 = drawn_buf[row + i]; 2090 line_t d2 = drawn_buf[row + i];
2064 2091
2065 for (nits = 0, col = ncol; col--; ) 2092 for (nits = 0, col = ncol; col--; )
2066 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2093 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2090 if (wlen < len) 2117 if (wlen < len)
2091 ::swap (wlen, len); 2118 ::swap (wlen, len);
2092 2119
2093 XCopyArea (display->display, vt, vt, 2120 XCopyArea (display->display, vt, vt,
2094 gc, 0, Row2Pixel (len + i), 2121 gc, 0, Row2Pixel (len + i),
2095 (unsigned int)TermWin_TotalWidth (), 2122 (unsigned int)this->width,
2096 (unsigned int)Height2Pixel (wlen - len + 1), 2123 (unsigned int)Height2Pixel (wlen - len + 1),
2097 0, Row2Pixel (len)); 2124 0, Row2Pixel (len));
2098 len = -1; 2125 len = -1;
2099 } 2126 }
2100 } 2127 }
… …
2104 /* 2131 /*
2105 * E: main pass across every character 2132 * E: main pass across every character
2106 */ 2133 */
2107 for (row = 0; row < nrow; row++) 2134 for (row = 0; row < nrow; row++)
2108 { 2135 {
2109 text_t *stp = ROW(row - view_start).t; 2136 text_t *stp = ROW(view_start + row).t;
2110 rend_t *srp = ROW(row - view_start).r; 2137 rend_t *srp = ROW(view_start + row).r;
2111 text_t *dtp = drawn_buf[row].t; 2138 text_t *dtp = drawn_buf[row].t;
2112 rend_t *drp = drawn_buf[row].r; 2139 rend_t *drp = drawn_buf[row].r;
2113 2140
2114 /* 2141 /*
2115 * E2: OK, now the real pass 2142 * E2: OK, now the real pass
… …
2179 count++, i--; 2206 count++, i--;
2180 2207
2181 /* 2208 /*
2182 * Determine the attributes for the string 2209 * Determine the attributes for the string
2183 */ 2210 */
2184 int fore = GET_FGCOLOR (rend); // desired foreground 2211 int fore = fgcolor_of (rend); // desired foreground
2185 int back = GET_BGCOLOR (rend); // desired background 2212 int back = bgcolor_of (rend); // desired background
2186 2213
2187 // only do special processing if any attributes are set, which is rare 2214 // only do special processing if any attributes are set, which is unlikely
2188 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2215 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2189 { 2216 {
2190#if ENABLE_STYLES 2217#if ENABLE_STYLES
2191 // force redraw after "careful" characters to avoid pixel droppings 2218 // force redraw after "careful" characters to avoid pixel droppings
2192 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2219 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2303 } /* for (row....) */ 2330 } /* for (row....) */
2304 2331
2305#if ENABLE_OVERLAY 2332#if ENABLE_OVERLAY
2306 scr_swap_overlay (); 2333 scr_swap_overlay ();
2307#endif 2334#endif
2335 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2308 2336
2309 /* 2337 /*
2310 * G: cleanup cursor and display outline cursor if necessary 2338 * G: cleanup cursor and display outline cursor if necessary
2311 */ 2339 */
2312 if (showcursor) 2340 if (showcursor)
2313 { 2341 {
2314 if (focus) 2342 if (focus)
2315 { 2343 {
2316 if (options & Opt_cursorUnderline) 2344 if (OPTION (Opt_cursorUnderline))
2317 *crp ^= RS_Uline; 2345 *crp ^= RS_Uline;
2318 else 2346 else
2319 { 2347 {
2320 *crp ^= RS_RVid; 2348 *crp ^= RS_RVid;
2321#ifndef NO_CURSORCOLOR 2349#ifndef NO_CURSORCOLOR
… …
2351 /* 2379 /*
2352 * H: cleanup selection 2380 * H: cleanup selection
2353 */ 2381 */
2354 scr_reverse_selection (); 2382 scr_reverse_selection ();
2355 2383
2356 if (refresh_type & SMOOTH_REFRESH)
2357 XFlush (display->display);
2358
2359 num_scr = 0; 2384 num_scr = 0;
2360 num_scr_allow = 1; 2385 num_scr_allow = 1;
2361} 2386}
2362 2387
2363void 2388void
2364rxvt_term::scr_remap_chars (const line_t &l) 2389rxvt_term::scr_remap_chars (line_t &l)
2365{ 2390{
2366 if (!l.t) 2391 if (!l.t)
2367 return; 2392 return;
2393
2394 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2368 2395
2369 for (int i = ncol; i--; ) 2396 for (int i = ncol; i--; )
2370 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2397 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2371} 2398}
2372 2399
… …
2425 2452
2426 if (really) 2453 if (really)
2427 XClearWindow (display->display, vt); 2454 XClearWindow (display->display, vt);
2428} 2455}
2429 2456
2457void
2458rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2459{
2460 int view_end = view_start + nrow;
2461 int row, col;
2462
2463 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2464 {
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = beg_col; col < end_col; col++)
2469 srp[col] ^= rstyle1;
2470
2471 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= rstyle2;
2473
2474 if (++col < end_col)
2475 srp[col] ^= rstyle2;
2476 }
2477}
2478
2479void
2480rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2481{
2482 int view_end = view_start + nrow;
2483 int row, col;
2484
2485 if (beg_row >= view_start)
2486 {
2487 col = beg_col;
2488 row = beg_row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = view_start;
2494 }
2495
2496 for (; row < min (end_row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= rstyle;
2499
2500 if (row == end_row)
2501 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2502 srp[col] ^= rstyle;
2503}
2504
2430/* ------------------------------------------------------------------------- */ 2505/* ------------------------------------------------------------------------- */
2431void 2506void
2432rxvt_term::scr_reverse_selection () 2507rxvt_term::scr_reverse_selection ()
2433{ 2508{
2434 if (selection.op 2509 if (selection.op
2435 && current_screen == selection.screen 2510 && current_screen == selection.screen
2436 && selection.end.row >= -view_start) 2511 && selection.end.row >= view_start)
2437 { 2512 {
2438 int view_end = -view_start + nrow;
2439 int row, col;
2440
2441#if ENABLE_FRILLS 2513#if ENABLE_FRILLS
2442 if (selection.rect) 2514 if (selection.rect)
2443 { 2515 scr_xor_rect (selection.beg.row, selection.beg.col,
2444 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2516 selection.end.row, selection.end.col,
2445 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2517 RS_RVid, RS_RVid | RS_Uline);
2446 srp[col] ^= RS_RVid;
2447 }
2448 else 2518 else
2449#endif 2519#endif
2450 { 2520 scr_xor_span (selection.beg.row, selection.beg.col,
2451 if (selection.beg.row >= -view_start) 2521 selection.end.row, selection.end.col,
2452 { 2522 RS_RVid);
2453 col = selection.beg.col;
2454 row = selection.beg.row;
2455 }
2456 else
2457 {
2458 col = 0;
2459 row = view_start;
2460 }
2461
2462 for (; row < min (selection.end.row, view_end); row++, col = 0)
2463 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2464 srp[col] ^= RS_RVid;
2465
2466 if (row == selection.end.row)
2467 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469 }
2470 } 2523 }
2471} 2524}
2472 2525
2473/* ------------------------------------------------------------------------- */ 2526/* ------------------------------------------------------------------------- */
2474/* 2527/*
… …
2512 2565
2513 if (!selection.op) 2566 if (!selection.op)
2514 return; 2567 return;
2515 2568
2516 pos.row = pos.col = 0; 2569 pos.row = pos.col = 0;
2517 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2570 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2518 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2571 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2519 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2572 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2520 || (check_more == 1 2573 || (check_more == 1
2521 && current_screen == selection.screen 2574 && current_screen == selection.screen
2522 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2575 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2523 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2576 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2524 || (check_more == 2 2577 || (check_more == 2
… …
2535/* ------------------------------------------------------------------------- */ 2588/* ------------------------------------------------------------------------- */
2536/* 2589/*
2537 * Paste a selection direct to the command fd 2590 * Paste a selection direct to the command fd
2538 */ 2591 */
2539void 2592void
2540rxvt_term::paste (unsigned char *data, unsigned int len) 2593rxvt_term::paste (char *data, unsigned int len)
2541{ 2594{
2542 /* convert normal newline chars into common keyboard Return key sequence */ 2595 /* convert normal newline chars into common keyboard Return key sequence */
2543 for (unsigned int i = 0; i < len; i++) 2596 for (unsigned int i = 0; i < len; i++)
2544 if (data[i] == C0_LF) 2597 if (data[i] == C0_LF)
2545 data[i] = C0_CR; 2598 data[i] = C0_CR;
… …
2689 { 2742 {
2690 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2743 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2691 char *s = rxvt_wcstombs (w); 2744 char *s = rxvt_wcstombs (w);
2692 free (w); 2745 free (w);
2693 // TODO: strlen == only the first element will be converted. well... 2746 // TODO: strlen == only the first element will be converted. well...
2694 paste ((unsigned char *)s, strlen (s)); 2747 paste (s, strlen (s));
2695 free (s); 2748 free (s);
2696 } 2749 }
2697 else 2750 else
2698#endif 2751#endif
2699 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2752 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2700 && cl) 2753 && cl)
2701 { 2754 {
2702 for (int i = 0; i < cr; i++) 2755 for (int i = 0; i < cr; i++)
2703 paste ((unsigned char *)cl[i], strlen (cl[i])); 2756 paste (cl[i], strlen (cl[i]));
2704 2757
2705 XFreeStringList (cl); 2758 XFreeStringList (cl);
2706 } 2759 }
2707 else 2760 else
2708 paste (ct.value, ct.nitems); // paste raw 2761 paste ((char *)ct.value, ct.nitems); // paste raw
2709 2762
2710bailout: 2763bailout:
2711 XFree (ct.value); 2764 XFree (ct.value);
2712 2765
2713 if (selection_wait == Sel_normal) 2766 if (selection_wait == Sel_normal)
… …
2751 return; /* outside window */ 2804 return; /* outside window */
2752 2805
2753 if (selection.text) 2806 if (selection.text)
2754 { /* internal selection */ 2807 { /* internal selection */
2755 char *str = rxvt_wcstombs (selection.text, selection.len); 2808 char *str = rxvt_wcstombs (selection.text, selection.len);
2756 paste ((unsigned char *)str, strlen (str)); 2809 paste (str, strlen (str));
2757 free (str); 2810 free (str);
2758 return; 2811 return;
2759 } 2812 }
2760 else 2813 else
2761 { 2814 {
… …
2853 selection.op = SELECTION_DONE; 2906 selection.op = SELECTION_DONE;
2854 2907
2855 if (selection.clicks == 4) 2908 if (selection.clicks == 4)
2856 return; /* nothing selected, go away */ 2909 return; /* nothing selected, go away */
2857 2910
2911 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2912 return;
2913
2858 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2914 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2859 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));
2860 2916
2861 int ofs = 0; 2917 int ofs = 0;
2862 int extra = 0; 2918 int extra = 0;
… …
2874 col = selection.beg.col; 2930 col = selection.beg.col;
2875 end_col = ncol + 1; 2931 end_col = ncol + 1;
2876 } 2932 }
2877 else 2933 else
2878#endif 2934#endif
2879 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2935 end_col = ROW(row).l;
2880 2936
2881 col = max (col, 0); 2937 col = max (col, 0);
2882 2938
2883 if (row == selection.end.row || selection.rect) 2939 if (row == selection.end.row
2940#if ENABLE_FRILLS
2941 || selection.rect
2942#endif
2943 )
2884 end_col = min (end_col, selection.end.col); 2944 min_it (end_col, selection.end.col);
2885 2945
2886 t = ROW(row).t + col; 2946 t = ROW(row).t + col;
2947
2887 for (; col < end_col; col++) 2948 for (; col < end_col; col++)
2888 { 2949 {
2889 if (*t == NOCHAR) 2950 if (*t == NOCHAR)
2890 t++; 2951 t++;
2891#if ENABLE_COMBINING 2952#if ENABLE_COMBINING
… …
2907#endif 2968#endif
2908 else 2969 else
2909 new_selection_text[ofs++] = *t++; 2970 new_selection_text[ofs++] = *t++;
2910 } 2971 }
2911 2972
2973#if ENABLE_FRILLS
2974 if (selection.rect)
2975 {
2976 while (ofs
2977 && new_selection_text[ofs - 1] != C0_LF
2978 && unicode::is_space (new_selection_text[ofs - 1]))
2979 --ofs;
2980
2981 new_selection_text[ofs++] = C0_LF;
2982 }
2983 else
2984#endif
2912 if (!ROW(row).is_longer () && row != selection.end.row) 2985 if (!ROW(row).is_longer () && row != selection.end.row)
2913 new_selection_text[ofs++] = C0_LF; 2986 new_selection_text[ofs++] = C0_LF;
2914 } 2987 }
2915 2988
2916 if (end_col != selection.end.col) 2989 if (end_col != selection.end.col)
2917 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2918 2991
… …
2928 3001
2929 // 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
2930 selection.len = ofs; 3003 selection.len = ofs;
2931 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));
2932 3005
3006 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3007 return;
3008
3009 selection_grab (tm);
3010}
3011
3012bool
3013rxvt_term::selection_grab (Time tm)
3014{
3015 selection_time = tm;
3016
2933 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3017 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2934 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3018 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3019 {
2935 display->set_selection_owner (this); 3020 display->set_selection_owner (this);
3021 return true;
3022 }
2936 else 3023 else
2937 rxvt_warn ("can't get primary selection, ignoring.\n"); 3024 {
3025 selection_clear ();
3026 return false;
3027 }
2938 3028
2939#if 0 3029#if 0
2940 XTextProperty ct; 3030 XTextProperty ct;
2941 3031
2942 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3032 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2943 { 3033 {
2944 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3034 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2945 XFree (ct.value); 3035 XFree (ct.value);
2946 } 3036 }
2947#endif 3037#endif
2948
2949 selection_time = tm;
2950} 3038}
2951 3039
2952/* ------------------------------------------------------------------------- */ 3040/* ------------------------------------------------------------------------- */
2953/* 3041/*
2954 * Mark or select text based upon number of clicks: 1, 2, or 3 3042 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2958rxvt_term::selection_click (int clicks, int x, int y) 3046rxvt_term::selection_click (int clicks, int x, int y)
2959{ 3047{
2960 clicks = ((clicks - 1) % 3) + 1; 3048 clicks = ((clicks - 1) % 3) + 1;
2961 selection.clicks = clicks; /* save clicks so extend will work */ 3049 selection.clicks = clicks; /* save clicks so extend will work */
2962 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
2963 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3060 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2964 3061
2965 if (clicks == 2 || clicks == 3) 3062 if (clicks == 2 || clicks == 3)
2966 selection_extend_colrow (selection.mark.col, 3063 selection_extend_colrow (selection.mark.col,
2967 selection.mark.row + view_start, 3064 selection.mark.row - view_start,
2968 0, /* button 3 */ 3065 0, /* button 3 */
2969 1, /* button press */ 3066 1, /* button press */
2970 0); /* click change */ 3067 0); /* click change */
2971} 3068}
2972 3069
… …
2977void 3074void
2978rxvt_term::selection_start_colrow (int col, int row) 3075rxvt_term::selection_start_colrow (int col, int row)
2979{ 3076{
2980 want_refresh = 1; 3077 want_refresh = 1;
2981 3078
2982 selection.mark.row = row - view_start; 3079 selection.mark.row = row + view_start;
2983 selection.mark.col = col; 3080 selection.mark.col = col;
2984 3081
2985 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3082 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2986 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3083 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2987 3084
2988 while (selection.mark.col > 0 3085 while (selection.mark.col > 0
2989 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3086 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2990 --selection.mark.col; 3087 --selection.mark.col;
… …
3018 text_t *stp; 3115 text_t *stp;
3019 rend_t *srp; 3116 rend_t *srp;
3020 3117
3021 if (dirn == UP) 3118 if (dirn == UP)
3022 { 3119 {
3023 bound.row = - nsaved - 1; 3120 bound.row = top_row - 1;
3024 bound.col = 0; 3121 bound.col = 0;
3025 dirnadd = -1; 3122 dirnadd = -1;
3026 } 3123 }
3027 else 3124 else
3028 { 3125 {
… …
3076 } 3173 }
3077 } 3174 }
3078 break; 3175 break;
3079 } 3176 }
3080 3177
3081Old_Word_Selection_You_Die:
3082 if (dirn == DN) 3178 if (dirn == DN)
3083 col++; /* put us on one past the end */ 3179 col++; /* put us on one past the end */
3084 3180
3085 /* Poke the values back in */ 3181 /* Poke the values back in */
3086 ret->row = row; 3182 ret->row = row;
… …
3107 * 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
3108 * be _past_ a character for it to be selected. 3204 * be _past_ a character for it to be selected.
3109 */ 3205 */
3110 if (((selection.clicks % 3) == 1) && !flag 3206 if (((selection.clicks % 3) == 1) && !flag
3111 && (col == selection.mark.col 3207 && (col == selection.mark.col
3112 && (row == selection.mark.row + view_start))) 3208 && (row == selection.mark.row - view_start)))
3113 { 3209 {
3114 /* select nothing */ 3210 /* select nothing */
3115 selection.beg.row = selection.end.row = 0; 3211 selection.beg.row = selection.end.row = 0;
3116 selection.beg.col = selection.end.col = 0; 3212 selection.beg.col = selection.end.col = 0;
3117 selection.clicks = 4; 3213 selection.clicks = 4;
… …
3172 selection.beg.col = selection.end.col = selection.mark.col; 3268 selection.beg.col = selection.end.col = selection.mark.col;
3173 selection.beg.row = selection.end.row = selection.mark.row; 3269 selection.beg.row = selection.end.row = selection.mark.row;
3174 } 3270 }
3175 3271
3176 pos.col = col; 3272 pos.col = col;
3177 pos.row = row - view_start; 3273 pos.row = view_start + row;
3178 3274
3179 /* 3275 /*
3180 * 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
3181 * in the way button3 drag extension works. 3277 * in the way button3 drag extension works.
3182 * We're either doing: button1 drag; button3 press; or button3 drag 3278 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3269 selection_delimit_word (DN, &selection.end, &selection.end); 3365 selection_delimit_word (DN, &selection.end, &selection.end);
3270 } 3366 }
3271 else if (selection.clicks == 3) 3367 else if (selection.clicks == 3)
3272 { 3368 {
3273#if ENABLE_FRILLS 3369#if ENABLE_FRILLS
3274 if (options & Opt_tripleclickwords) 3370 if (OPTION (Opt_tripleclickwords))
3275 { 3371 {
3276 selection_delimit_word (UP, &selection.beg, &selection.beg); 3372 selection_delimit_word (UP, &selection.beg, &selection.beg);
3277 3373
3278 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3374 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3279 { 3375 {
… …
3340 { 3436 {
3341 stp = ROW(end_row).t; 3437 stp = ROW(end_row).t;
3342 3438
3343 while (--end_col >= 0) 3439 while (--end_col >= 0)
3344 { 3440 {
3345 if (stp[end_col] != ' ' 3441 if (stp[end_col] != NOCHAR
3346 && stp[end_col] != '\t' 3442 && !unicode::is_space (stp[end_col]))
3347 && stp[end_col] != NOCHAR)
3348 break; 3443 break;
3349 } 3444 }
3350 3445
3351 if (end_col >= 0 3446 if (end_col >= 0
3352 || !ROW(end_row - 1).is_longer ()) 3447 || !ROW(end_row - 1).is_longer ())
… …
3551 3646
3552#if ENABLE_OVERLAY 3647#if ENABLE_OVERLAY
3553void 3648void
3554rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3649rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3555{ 3650{
3556 if (nrow < 3 || ncol < 3) 3651 if (nrow < 1 || ncol < 1)
3557 return; 3652 return;
3558 3653
3559 want_refresh = 1; 3654 want_refresh = 1;
3560 3655
3561 scr_overlay_off (); 3656 scr_overlay_off ();
… …
3668 for (int y = ov_h; y--; ) 3763 for (int y = ov_h; y--; )
3669 { 3764 {
3670 text_t *t1 = ov_text[y]; 3765 text_t *t1 = ov_text[y];
3671 rend_t *r1 = ov_rend[y]; 3766 rend_t *r1 = ov_rend[y];
3672 3767
3673 text_t *t2 = ROW(y - view_start).t + ov_x; 3768 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3674 rend_t *r2 = ROW(y - view_start).r + ov_x; 3769 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3675 3770
3676 for (int x = ov_w; x--; ) 3771 for (int x = ov_w; x--; )
3677 { 3772 {
3678 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3773 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3679 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