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.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
… …
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
… …
442 scr_release (); 448 scr_release ();
443 prev_nrow = prev_ncol = 0; 449 prev_nrow = prev_ncol = 0;
444 scr_reset (); 450 scr_reset ();
445 451
446 scr_clear (true); 452 scr_clear (true);
447 scr_refresh (SLOW_REFRESH); 453 scr_refresh ();
448} 454}
449 455
450/* ------------------------------------------------------------------------- * 456/* ------------------------------------------------------------------------- *
451 * PROCESS SCREEN COMMANDS * 457 * PROCESS SCREEN COMMANDS *
452 * ------------------------------------------------------------------------- */ 458 * ------------------------------------------------------------------------- */
… …
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 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows; 623 term_start = (term_start + count) % total_rows;
617 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
618 if (selection.op && current_screen == selection.screen) 658 if (selection.op && current_screen == selection.screen)
619 { 659 {
620 selection.beg.row -= count; 660 selection.beg.row -= count;
621 selection.end.row -= count; 661 selection.end.row -= count;
622 selection.mark.row -= count; 662 selection.mark.row -= count;
623 663
624 selection_check (0); 664 if (selection.beg.row < top_row
625 } 665 || selection.end.row < top_row
626 666 || 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 { 667 {
649 CLEAR_ALL_SELECTION (); 668 CLEAR_ALL_SELECTION ();
650 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 669 selection.op = SELECTION_CLEAR;
651 } 670 }
652 else if (j >= row1 && j <= row2) 671 }
672
673 // finally move the view window, if desired
674 if (OPTION (Opt_scrollWithBuffer)
675 && view_start != 0
676 && view_start != -saveLines)
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));
681 }
682 else
683 {
684 if (selection.op && current_screen == selection.screen)
685 {
686 if ((selection.beg.row < row1 && selection.end.row > row1)
687 || (selection.beg.row < row2 && selection.end.row > row2)
688 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
689 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
690 || (selection.end.row - count < row1 && selection.end.row >= row1)
691 || (selection.end.row - count > row2 && selection.end.row <= row2))
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 else if (selection.end.row >= row1 && selection.end.row <= row2)
653 { 697 {
654 /* move selected region too */ 698 /* move selected region too */
655 selection.beg.row -= count; 699 selection.beg.row -= count;
656 selection.end.row -= count; 700 selection.end.row -= count;
657 selection.mark.row -= count; 701 selection.mark.row -= count;
… …
665 709
666 int rows = row2 - row1 + 1; 710 int rows = row2 - row1 + 1;
667 711
668 min_it (count, rows); 712 min_it (count, rows);
669 713
714 line_t *temp_buf = row_buf + total_rows;
715
670 for (int row = 0; row < rows; row++) 716 for (int row = 0; row < rows; row++)
671 { 717 {
672 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 718 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
673 719
674 if (!IN_RANGE_EXC (row + count, 0, rows)) 720 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
685/* ------------------------------------------------------------------------- */ 731/* ------------------------------------------------------------------------- */
686/* 732/*
687 * Add text given in <str> of length <len> to screen struct 733 * Add text given in <str> of length <len> to screen struct
688 */ 734 */
689void 735void
690rxvt_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)
691{ 737{
692 if (len <= 0) /* sanity */ 738 if (len <= 0) /* sanity */
693 return; 739 return;
694 740
695 unsigned char checksel; 741 unsigned char checksel;
696 unicode_t c; 742 unicode_t c;
697 int row, last_col; 743 int ncol = this->ncol;
698 const unicode_t *strend = str + len; 744 const wchar_t *strend = str + len;
699 745
700 want_refresh = 1; 746 want_refresh = 1;
701 ZERO_SCROLLBACK (); 747 ZERO_SCROLLBACK ();
702 last_col = ncol;
703 748
704 if (nlines > 0) 749 if (minlines > 0)
705 { 750 {
706 nlines += screen.cur.row - screen.bscroll; 751 minlines += screen.cur.row - screen.bscroll;
752
707 if (nlines > 0 753 if (minlines > 0
708 && screen.tscroll == 0 754 && screen.tscroll == 0
709 && screen.bscroll == (nrow - 1)) 755 && screen.bscroll == nrow - 1)
710 { 756 {
711 /* _at least_ this many lines need to be scrolled */ 757 /* _at least_ this many lines need to be scrolled */
712 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 758 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
713 screen.cur.row -= nlines; 759 screen.cur.row -= minlines;
714 } 760 }
715 } 761 }
716 762
717#ifdef DEBUG_STRICT 763#ifdef DEBUG_STRICT
718 assert (screen.cur.col < last_col); 764 assert (screen.cur.col < ncol);
719 assert (screen.cur.row < nrow 765 assert (screen.cur.row < nrow
720 && screen.cur.row >= -nsaved); 766 && screen.cur.row >= top_row);
721#endif 767#endif
722 row = screen.cur.row; 768 int row = screen.cur.row;
723 769
724 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 770 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
725 771
726 line_t *line = &ROW(row); 772 line_t *line = &ROW(row);
727 773
728 while (str < strend) 774 while (str < strend)
729 { 775 {
730 c = *str++; 776 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
731 777
732 if (c < 0x20) 778 if (c < 0x20)
733 if (c == C0_LF) 779 if (c == C0_LF)
734 { 780 {
735 if (!line->is_longer ()) /* XXX: think about this */
736 max_it (line->l, screen.cur.col); 781 max_it (line->l, screen.cur.col);
737 782
738 screen.flags &= ~Screen_WrapNext; 783 screen.flags &= ~Screen_WrapNext;
739 784
740 if (screen.cur.row == screen.bscroll) 785 if (screen.cur.row == screen.bscroll)
741 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 786 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
745 line = &ROW(row); /* _must_ refresh */ 790 line = &ROW(row); /* _must_ refresh */
746 continue; 791 continue;
747 } 792 }
748 else if (c == C0_CR) 793 else if (c == C0_CR)
749 { 794 {
750 if (!line->is_longer ()) /* XXX: think about this */
751 max_it (line->l, screen.cur.col); 795 max_it (line->l, screen.cur.col);
752 796
753 screen.flags &= ~Screen_WrapNext; 797 screen.flags &= ~Screen_WrapNext;
754 screen.cur.col = 0; 798 screen.cur.col = 0;
755 continue; 799 continue;
756 } 800 }
… …
773 CLEAR_SELECTION (); 817 CLEAR_SELECTION ();
774 } 818 }
775 819
776 if (screen.flags & Screen_WrapNext) 820 if (screen.flags & Screen_WrapNext)
777 { 821 {
822 max_it (line->l, ncol);
778 line->set_is_longer (); 823 line->is_longer (1);
779 824
780 scr_do_wrap (); 825 scr_do_wrap ();
781 826
782 row = screen.cur.row; 827 row = screen.cur.row;
783 line = &ROW(row); /* _must_ refresh */ 828 line = &ROW(row); /* _must_ refresh */
… …
791 // do wcwidth before further replacements, as wcwidth might return -1 836 // 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 837 // for the line drawing characters below as they might be invalid in the current
793 // locale. 838 // locale.
794 int width = c < 0x100 ? 1 : wcwidth (c); 839 int width = c < 0x100 ? 1 : wcwidth (c);
795 840
796 if (charsets[screen.charset] == '0') // DEC SPECIAL 841 if (charsets [screen.charset] == '0') // DEC SPECIAL
797 { 842 {
798 // vt100 special graphics and line drawing 843 // vt100 special graphics and line drawing
799 // 5f-7e standard vt100 844 // 5f-7e standard vt100
800 // 40-5e rxvt extension for extra curses acs chars 845 // 40-5e rxvt extension for extra curses acs chars
801 static uint16_t vt100_0[62] = { // 41 .. 7e 846 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
853 } 898 }
854 899
855 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 900 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
856 901
857 // if the character doesn't fit into the remaining columns... 902 // if the character doesn't fit into the remaining columns...
858 if (screen.cur.col > last_col - width && last_col >= width) 903 if (screen.cur.col > ncol - width && ncol >= width)
859 { 904 {
860 // ...output spaces 905 // ...output spaces
861 c = ' '; 906 c = ' ';
862 // and try the same character next loop iteration 907 // and try the same character next loop iteration
863 --str; 908 --str;
864 } 909 }
865 910
911 line->touch ();
912
866 do 913 do
867 { 914 {
868 line->t[screen.cur.col] = c; 915 line->t[screen.cur.col] = c;
869 line->r[screen.cur.col] = rend; 916 line->r[screen.cur.col] = rend;
870 917
871 if (screen.cur.col < last_col - 1) 918 if (screen.cur.col < ncol - 1)
872 screen.cur.col++; 919 screen.cur.col++;
873 else 920 else
874 { 921 {
875 line->l = last_col; 922 line->l = ncol;
876 if (screen.flags & Screen_Autowrap) 923 if (screen.flags & Screen_Autowrap)
877 screen.flags |= Screen_WrapNext; 924 screen.flags |= Screen_WrapNext;
878 break; 925 break;
879 } 926 }
880 927
… …
882 } 929 }
883 while (--width > 0); 930 while (--width > 0);
884 931
885 // pad with spaces when overwriting wide character with smaller one 932 // pad with spaces when overwriting wide character with smaller one
886 if (!width) 933 if (!width)
934 {
935 line->touch ();
936
887 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++)
888 { 938 {
889 line->t[c] = ' '; 939 line->t[c] = ' ';
890 line->r[c] = rend; 940 line->r[c] = rend;
891 } 941 }
942 }
892 } 943 }
893 else // width == 0 944 else // width == 0
894 { 945 {
895#if ENABLE_COMBINING 946#if ENABLE_COMBINING
896 // handle combining characters 947 // handle combining characters
897 // we just tag the accent on the previous on-screen character. 948 // we just tag the accent on the previous on-screen character.
898 // this is arguably not correct, but also arguably not wrong. 949 // this is arguably not correct, but also arguably not wrong.
899 // we don't handle double-width characters nicely yet. 950 // we don't handle double-width characters nicely yet.
951 line_t *linep;
900 text_t *tp; 952 text_t *tp;
901 rend_t *rp; 953 rend_t *rp;
902 954
903 if (screen.cur.col > 0) 955 if (screen.cur.col > 0)
904 { 956 {
957 linep = line;
905 tp = line->t + screen.cur.col - 1; 958 tp = line->t + screen.cur.col - 1;
906 rp = line->r + screen.cur.col - 1; 959 rp = line->r + screen.cur.col - 1;
907
908 while (*tp == NOCHAR && tp > line->t)
909 tp--, rp--;
910 } 960 }
911 else if (screen.cur.row > 0 961 else if (screen.cur.row > 0
912 && ROW(screen.cur.row - 1).is_longer ()) 962 && ROW(screen.cur.row - 1).is_longer ())
913 { 963 {
914 line_t *line = &ROW(screen.cur.row - 1); 964 linep = &ROW(screen.cur.row - 1);
915
916 tp = line->t + last_col - 1; 965 tp = line->t + ncol - 1;
917 rp = line->r + last_col - 1; 966 rp = line->r + ncol - 1;
918
919 while (*tp == NOCHAR && tp > line->t)
920 tp--, rp--;
921 } 967 }
922 else 968 else
923 continue; 969 continue;
970
971 linep->touch ();
972
973 while (*tp == NOCHAR && tp > linep->t)
974 tp--, rp--;
924 975
925 // first try to find a precomposed character 976 // first try to find a precomposed character
926 unicode_t n = rxvt_compose (*tp, c); 977 unicode_t n = rxvt_compose (*tp, c);
927 if (n == NOCHAR) 978 if (n == NOCHAR)
928 n = rxvt_composite.compose (*tp, c); 979 n = rxvt_composite.compose (*tp, c);
… …
931 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 982 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
932#endif 983#endif
933 } 984 }
934 } 985 }
935 986
936 if (!line->is_longer ()) /* XXX: think about this */
937 max_it (line->l, screen.cur.col); 987 max_it (line->l, screen.cur.col);
938 988
939#ifdef DEBUG_STRICT 989#ifdef DEBUG_STRICT
940 assert (screen.cur.row >= 0); 990 assert (screen.cur.row >= 0);
941#endif 991#endif
942} 992}
… …
984 1034
985 if (count == 0) 1035 if (count == 0)
986 return; 1036 return;
987 else if (count > 0) 1037 else if (count > 0)
988 { 1038 {
989 int row = screen.cur.row;
990
991 line_t &l = ROW(row); 1039 line_t &l = ROW(screen.cur.row);
992 rend_t base_rend = l.r[i]; 1040 rend_t base_rend = l.r[i];
993 ht &= l.t[i] == ' '; 1041 ht &= l.t[i] == ' ';
994 1042
995 for (; ++i < ncol; ) 1043 for (; ++i < ncol; )
996 if (tabs[i]) 1044 if (tabs[i])
997 { 1045 {
998 x = i; 1046 x = i;
1047
999 if (!--count) 1048 if (!--count)
1000 break; 1049 break;
1001 } 1050 }
1002 else 1051 else
1003 ht &= l.t[i] == ' ' 1052 ht &= l.t[i] == ' '
… …
1006 if (count) 1055 if (count)
1007 x = ncol - 1; 1056 x = ncol - 1;
1008 1057
1009 // store horizontal tab commands as characters inside the text 1058 // store horizontal tab commands as characters inside the text
1010 // buffer so they can be selected and pasted. 1059 // buffer so they can be selected and pasted.
1011 if (ht && options & Opt_pastableTabs) 1060 if (ht && OPTION (Opt_pastableTabs))
1012 { 1061 {
1013 base_rend = SET_FONT (base_rend, 0); 1062 base_rend = SET_FONT (base_rend, 0);
1014 1063
1015 if (!l.is_longer ()) /* XXX: think about this */ 1064 l.touch (x);
1016 max_it (l.l, x);
1017 1065
1018 i = screen.cur.col; 1066 i = screen.cur.col;
1019 1067
1020 l.t[i] = '\t'; 1068 l.t[i] = '\t';
1021 l.r[i] = base_rend; 1069 l.r[i] = base_rend;
… …
1071 */ 1119 */
1072#if ENABLE_FRILLS 1120#if ENABLE_FRILLS
1073void 1121void
1074rxvt_term::scr_forwardindex () 1122rxvt_term::scr_forwardindex ()
1075{ 1123{
1076 int row;
1077
1078 if (screen.cur.col < ncol - 1) 1124 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1126 else
1081 { 1127 {
1082 row = screen.cur.row; 1128 line_t &l = ROW(screen.cur.row);
1083 1129
1084 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1130 l.touch ();
1085 ROW(row).l = ncol; 1131 l.is_longer (0);
1086 1132
1087 scr_gotorc (0, 0, R_RELATIVE); 1133 scr_gotorc (0, 0, R_RELATIVE);
1088 scr_insdel_chars (1, DELETE); 1134 scr_insdel_chars (1, DELETE);
1089 scr_gotorc (0, ncol - 1, R_RELATIVE); 1135 scr_gotorc (0, ncol - 1, R_RELATIVE);
1090 } 1136 }
… …
1173 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1174 */ 1220 */
1175void 1221void
1176rxvt_term::scr_erase_line (int mode) 1222rxvt_term::scr_erase_line (int mode)
1177{ 1223{
1178 unsigned int row, col, num; 1224 unsigned int col, num;
1179 1225
1180 want_refresh = 1; 1226 want_refresh = 1;
1181 ZERO_SCROLLBACK (); 1227 ZERO_SCROLLBACK ();
1182 1228
1183 selection_check (1); 1229 selection_check (1);
1184 1230
1185 row = screen.cur.row; 1231 line_t &line = ROW(screen.cur.row);
1232
1233 line.touch ();
1234 line.is_longer (0);
1186 1235
1187 switch (mode) 1236 switch (mode)
1188 { 1237 {
1189 case 0: /* erase to end of line */ 1238 case 0: /* erase to end of line */
1190 col = screen.cur.col; 1239 col = screen.cur.col;
1191 num = ncol - col; 1240 num = ncol - col;
1192 min_it (ROW(row).l, col); 1241 min_it (line.l, col);
1193 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1242 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1194 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1243 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1195 CLEAR_SELECTION (); 1244 CLEAR_SELECTION ();
1196 break; 1245 break;
1197 case 1: /* erase to beginning of line */ 1246 case 1: /* erase to beginning of line */
… …
1202 CLEAR_SELECTION (); 1251 CLEAR_SELECTION ();
1203 break; 1252 break;
1204 case 2: /* erase whole line */ 1253 case 2: /* erase whole line */
1205 col = 0; 1254 col = 0;
1206 num = ncol; 1255 num = ncol;
1207 ROW(row).l = 0; 1256 line.l = 0;
1208 if (selection.beg.row <= screen.cur.row 1257 if (selection.beg.row <= screen.cur.row
1209 && selection.end.row >= screen.cur.row) 1258 && selection.end.row >= screen.cur.row)
1210 CLEAR_SELECTION (); 1259 CLEAR_SELECTION ();
1211 break; 1260 break;
1212 default: 1261 default:
1213 return; 1262 return;
1214 } 1263 }
1215 1264
1216 scr_blank_line (ROW(row), col, num, rstyle); 1265 scr_blank_line (line, col, num, rstyle);
1217} 1266}
1218 1267
1219/* ------------------------------------------------------------------------- */ 1268/* ------------------------------------------------------------------------- */
1220/* 1269/*
1221 * Erase part of whole of the screen 1270 * Erase part of whole of the screen
… …
1276 CLEAR_ROWS (row, num); 1325 CLEAR_ROWS (row, num);
1277 } 1326 }
1278 else 1327 else
1279 { 1328 {
1280 ren = rstyle & (RS_fgMask | RS_bgMask); 1329 ren = rstyle & (RS_fgMask | RS_bgMask);
1281 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1282 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1331 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1283 ERASE_ROWS (row, num); 1332 ERASE_ROWS (row, num);
1284 gcvalue.foreground = pix_colors[Color_fg]; 1333 gcvalue.foreground = pix_colors[Color_fg];
1285 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1334 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1286 } 1335 }
1287 1336
1288 for (; num--; row++) 1337 for (; num--; row++)
1289 { 1338 {
1290 scr_blank_screen_mem (ROW (row), rstyle); 1339 scr_blank_screen_mem (ROW(row), rstyle);
1291 ROW (row).l = 0;
1292 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1340 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1293 } 1341 }
1294} 1342}
1295 1343
1296#if ENABLE_FRILLS 1344#if ENABLE_FRILLS
… …
1298rxvt_term::scr_erase_savelines () 1346rxvt_term::scr_erase_savelines ()
1299{ 1347{
1300 want_refresh = 1; 1348 want_refresh = 1;
1301 ZERO_SCROLLBACK (); 1349 ZERO_SCROLLBACK ();
1302 1350
1303 nsaved = 0; 1351 top_row = 0;
1304} 1352}
1305#endif 1353#endif
1306 1354
1307/* ------------------------------------------------------------------------- */ 1355/* ------------------------------------------------------------------------- */
1308/* 1356/*
… …
1329 rend_t *r1 = line.r; 1377 rend_t *r1 = line.r;
1330 1378
1331 for (int j = ncol; j--; ) 1379 for (int j = ncol; j--; )
1332 *r1++ = fs; 1380 *r1++ = fs;
1333 1381
1334 line.l = ncol; /* make the `E's selectable */ 1382 line.is_longer (0);
1383 line.touch (ncol);
1335 } 1384 }
1336} 1385}
1337 1386
1338/* ------------------------------------------------------------------------- */ 1387/* ------------------------------------------------------------------------- */
1339/* 1388/*
… …
1387 min_it (count, ncol - screen.cur.col); 1436 min_it (count, ncol - screen.cur.col);
1388 1437
1389 row = screen.cur.row; 1438 row = screen.cur.row;
1390 1439
1391 line_t *line = &ROW(row); 1440 line_t *line = &ROW(row);
1441
1442 line->touch ();
1443 line->is_longer (0);
1392 1444
1393 switch (insdel) 1445 switch (insdel)
1394 { 1446 {
1395 case INSERT: 1447 case INSERT:
1396 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1448 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1397 { 1449 {
1398 line->t[col] = line->t[col - count]; 1450 line->t[col] = line->t[col - count];
1399 line->r[col] = line->r[col - count]; 1451 line->r[col] = line->r[col - count];
1400 } 1452 }
1401 1453
1402 if (!line->is_longer ()) 1454 line->l = min (line->l + count, ncol);
1403 {
1404 line->l += count;
1405 min_it (line->l, ncol);
1406 }
1407 1455
1408 if (selection.op && current_screen == selection.screen 1456 if (selection.op && current_screen == selection.screen
1409 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1410 { 1458 {
1411 if (selection.end.row != screen.cur.row 1459 if (selection.end.row != screen.cur.row
… …
1424 1472
1425 case ERASE: 1473 case ERASE:
1426 screen.cur.col += count; /* don't worry if > ncol */ 1474 screen.cur.col += count; /* don't worry if > ncol */
1427 selection_check (1); 1475 selection_check (1);
1428 screen.cur.col -= count; 1476 screen.cur.col -= count;
1477
1478 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, screen.cur.col, count, rstyle); 1479 scr_blank_line (*line, screen.cur.col, count, rstyle);
1430 break; 1480 break;
1431 1481
1432 case DELETE: 1482 case DELETE:
1433 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1483 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1436 { 1486 {
1437 line->t[col] = line->t[col + count]; 1487 line->t[col] = line->t[col + count];
1438 line->r[col] = line->r[col + count]; 1488 line->r[col] = line->r[col + count];
1439 } 1489 }
1440 1490
1491 line->l = max (line->l - count, 0);
1441 scr_blank_line (*line, ncol - count, count, tr); 1492 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 1493
1448 if (selection.op && current_screen == selection.screen 1494 if (selection.op && current_screen == selection.screen
1449 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1495 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1450 { 1496 {
1451 if (selection.end.row != screen.cur.row 1497 if (selection.end.row != screen.cur.row
… …
1563rxvt_term::scr_set_tab (int mode) 1609rxvt_term::scr_set_tab (int mode)
1564{ 1610{
1565 if (mode < 0) 1611 if (mode < 0)
1566 memset (tabs, 0, ncol * sizeof (char)); 1612 memset (tabs, 0, ncol * sizeof (char));
1567 else if (screen.cur.col < ncol) 1613 else if (screen.cur.col < ncol)
1568 tabs[screen.cur.col] = (mode ? 1 : 0); 1614 tabs [screen.cur.col] = !!mode;
1569} 1615}
1570 1616
1571/* ------------------------------------------------------------------------- */ 1617/* ------------------------------------------------------------------------- */
1572/* 1618/*
1573 * Set reverse/normal video 1619 * Set reverse/normal video
… …
1585 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1586#if XPM_BACKGROUND 1632#if XPM_BACKGROUND
1587 if (bgPixmap.pixmap == None) 1633 if (bgPixmap.pixmap == None)
1588#endif 1634#endif
1589#if TRANSPARENT 1635#if TRANSPARENT
1590 if (! (options & Opt_transparent) || am_transparent == 0) 1636 if (! OPTION (Opt_transparent) || am_transparent == 0)
1591#endif 1637#endif
1592 XSetWindowBackground (display->display, vt, 1638 XSetWindowBackground (display->display, vt,
1593 pix_colors[Color_bg]); 1639 pix_colors[Color_bg]);
1594 1640
1595 gcvalue.foreground = pix_colors[Color_fg]; 1641 gcvalue.foreground = pix_colors[Color_fg];
… …
1620 * Set font style 1666 * Set font style
1621 */ 1667 */
1622void 1668void
1623rxvt_term::set_font_style () 1669rxvt_term::set_font_style ()
1624{ 1670{
1671#if 0
1625 switch (charsets[screen.charset]) 1672 switch (charsets [screen.charset])
1626 { 1673 {
1627 case '0': /* DEC Special Character & Line Drawing Set */ 1674 case '0': /* DEC Special Character & Line Drawing Set */
1628 break; 1675 break;
1629 case 'A': /* United Kingdom (UK) */ 1676 case 'A': /* United Kingdom (UK) */
1630 break; 1677 break;
… …
1637 case 'C': /* Finnish character set */ 1684 case 'C': /* Finnish character set */
1638 break; 1685 break;
1639 case 'K': /* German character set */ 1686 case 'K': /* German character set */
1640 break; 1687 break;
1641 } 1688 }
1689#endif
1642} 1690}
1643 1691
1644/* ------------------------------------------------------------------------- */ 1692/* ------------------------------------------------------------------------- */
1645/* 1693/*
1646 * Choose a font 1694 * Choose a font
… …
1742 } 1790 }
1743 1791
1744 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++)
1745 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);
1746 1794
1795 num_scr_allow = 0;
1796
1747 if (refresh) 1797 if (refresh)
1748 scr_refresh (SLOW_REFRESH); 1798 scr_refresh ();
1749} 1799}
1750 1800
1751/* ------------------------------------------------------------------------- */ 1801/* ------------------------------------------------------------------------- */
1752/* 1802/*
1753 * Refresh the entire screen 1803 * Refresh the entire screen
… …
1761/* ------------------------------------------------------------------------- */ 1811/* ------------------------------------------------------------------------- */
1762/* 1812/*
1763 * 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
1764 * the top of the screen 1814 * the top of the screen
1765 */ 1815 */
1766int 1816void
1767rxvt_term::scr_move_to (int y, int len) 1817rxvt_term::scr_move_to (int y, int len)
1768{ 1818{
1769 long p = 0; 1819 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} 1820}
1785 1821
1786/* ------------------------------------------------------------------------- */ 1822/* ------------------------------------------------------------------------- */
1787/* 1823/*
1788 * Page the screen up/down nlines 1824 * Page the screen up/down nlines
1789 * direction should be UP or DN 1825 * direction should be UP or DN
1790 */ 1826 */
1791int 1827bool
1792rxvt_term::scr_page (enum page_dirn direction, int nlines) 1828rxvt_term::scr_page (enum page_dirn direction, int nlines)
1793{ 1829{
1794 int n; 1830 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; 1831 direction == UP ? view_start - nlines
1807 view_start = max (n, 0); 1832 : view_start + nlines;
1808 }
1809 1833
1810 return scr_changeview (oldviewstart); 1834 return scr_changeview (new_view_start);
1811} 1835}
1812 1836
1813int 1837bool
1814rxvt_term::scr_changeview (unsigned int oldviewstart) 1838rxvt_term::scr_changeview (int new_view_start)
1815{ 1839{
1840 clamp_it (new_view_start, top_row, 0);
1841
1816 if (view_start != oldviewstart) 1842 if (new_view_start == view_start)
1817 { 1843 return false;
1844
1845 num_scr += new_view_start - view_start;
1846 view_start = new_view_start;
1818 want_refresh = 1; 1847 want_refresh = 1;
1819 num_scr -= (view_start - oldviewstart);
1820 }
1821 1848
1822 return (int) (view_start - oldviewstart); 1849 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1850
1851 return true;
1823} 1852}
1824 1853
1825/* ------------------------------------------------------------------------- */ 1854/* ------------------------------------------------------------------------- */
1826void 1855void
1827rxvt_term::scr_bell () 1856rxvt_term::scr_bell ()
1828{ 1857{
1829#ifndef NO_BELL 1858#ifndef NO_BELL
1830 1859
1831# ifndef NO_MAPALERT 1860# ifndef NO_MAPALERT
1832# ifdef MAPALERT_OPTION 1861# ifdef MAPALERT_OPTION
1833 if (options & Opt_mapAlert) 1862 if (OPTION (Opt_mapAlert))
1834# endif 1863# endif
1835 XMapWindow (display->display, parent[0]); 1864 XMapWindow (display->display, parent[0]);
1836# endif 1865# endif
1837 1866
1838 if (options & Opt_visualBell) 1867 if (OPTION (Opt_visualBell))
1839 { 1868 {
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1869 scr_rvideo_mode (!rvideo); /* refresh also done */
1870 display->flush ();
1841 rxvt_usleep (VISUAL_BELL_DURATION); 1871 rxvt_usleep (VISUAL_BELL_DURATION);
1842 scr_rvideo_mode (!rvideo); /* refresh also done */ 1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1843 } 1873 }
1844 else 1874 else
1845 XBell (display->display, 0); 1875 XBell (display->display, 0);
… …
1859 if ((fd = popen_printer ()) == NULL) 1889 if ((fd = popen_printer ()) == NULL)
1860 return; 1890 return;
1861 1891
1862 if (fullhist) 1892 if (fullhist)
1863 { 1893 {
1864 nrows = nrow + nsaved; 1894 nrows = nrow - top_row;
1865 row_start = -nsaved; 1895 row_start = top_row;
1866 } 1896 }
1867 else 1897 else
1868 { 1898 {
1869 nrows = nrow; 1899 nrows = nrow;
1870 row_start = -view_start; 1900 row_start = view_start;
1871 } 1901 }
1872 1902
1873 wctomb (0, 0); 1903 wctomb (0, 0);
1874 1904
1875 for (int r1 = 0; r1 < nrows; r1++) 1905 for (int r1 = 0; r1 < nrows; r1++)
… …
1907 * Refresh the screen 1937 * Refresh the screen
1908 * drawn_text/drawn_rend contain the screen information before the update. 1938 * drawn_text/drawn_rend contain the screen information before the update.
1909 * screen.text/screen.rend contain what the screen will change to. 1939 * screen.text/screen.rend contain what the screen will change to.
1910 */ 1940 */
1911void 1941void
1912rxvt_term::scr_refresh (unsigned char refresh_type) 1942rxvt_term::scr_refresh ()
1913{ 1943{
1914 unsigned char must_clear, /* use draw_string not draw_image_string */ 1944 unsigned char must_clear, /* use draw_string not draw_image_string */
1915 showcursor; /* show the cursor */ 1945 showcursor; /* show the cursor */
1916 int16_t col, row, /* column/row we're processing */ 1946 int16_t col, row, /* column/row we're processing */
1917 ocrow; /* old cursor row */ 1947 ocrow; /* old cursor row */
… …
1934 1964
1935#if XPM_BACKGROUND 1965#if XPM_BACKGROUND
1936 must_clear |= bgPixmap.pixmap != None; 1966 must_clear |= bgPixmap.pixmap != None;
1937#endif 1967#endif
1938#if TRANSPARENT 1968#if TRANSPARENT
1939 must_clear |= (options & Opt_transparent) && am_transparent; 1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1940#endif 1970#endif
1941 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1942 1972
1943 /* 1973 /*
1944 * B: reverse any characters which are selected 1974 * B: reverse any characters which are selected
… …
1968 1998
1969 crp = &ROW(screen.cur.row).r[col]; 1999 crp = &ROW(screen.cur.row).r[col];
1970 2000
1971 if (showcursor && focus) 2001 if (showcursor && focus)
1972 { 2002 {
1973 if (options & Opt_cursorUnderline) 2003 if (OPTION (Opt_cursorUnderline))
1974 *crp ^= RS_Uline; 2004 *crp ^= RS_Uline;
1975 else 2005 else
1976 { 2006 {
1977 *crp ^= RS_RVid; 2007 *crp ^= RS_RVid;
1978 2008
… …
1980 cc1 = *crp & (RS_fgMask | RS_bgMask); 2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
1981 if (ISSET_PIXCOLOR (Color_cursor)) 2011 if (ISSET_PIXCOLOR (Color_cursor))
1982 ccol1 = Color_cursor; 2012 ccol1 = Color_cursor;
1983 else 2013 else
1984#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1985 ccol1 = GET_FGCOLOR (rstyle); 2015 ccol1 = fgcolor_of (rstyle);
1986#else 2016#else
1987 ccol1 = Color_fg; 2017 ccol1 = Color_fg;
1988#endif 2018#endif
1989 if (ISSET_PIXCOLOR (Color_cursor2)) 2019 if (ISSET_PIXCOLOR (Color_cursor2))
1990 ccol2 = Color_cursor2; 2020 ccol2 = Color_cursor2;
1991 else 2021 else
1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1993 ccol2 = GET_BGCOLOR (rstyle); 2023 ccol2 = bgcolor_of (rstyle);
1994#else 2024#else
1995 ccol2 = Color_bg; 2025 ccol2 = Color_bg;
1996#endif 2026#endif
1997 *crp = SET_FGCOLOR (*crp, ccol1); 2027 *crp = SET_FGCOLOR (*crp, ccol1);
1998 *crp = SET_BGCOLOR (*crp, ccol2); 2028 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2003 2033
2004 /* make sure no outline cursor is left around */ 2034 /* make sure no outline cursor is left around */
2005 setoldcursor = 0; 2035 setoldcursor = 0;
2006 if (ocrow != -1) 2036 if (ocrow != -1)
2007 { 2037 {
2008 if (screen.cur.row + view_start != ocrow 2038 if (screen.cur.row - view_start != ocrow
2009 || screen.cur.col != oldcursor.col) 2039 || screen.cur.col != oldcursor.col)
2010 { 2040 {
2011 if (ocrow < nrow 2041 if (ocrow < nrow
2012 && oldcursor.col < ncol) 2042 && oldcursor.col < ncol)
2013 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2043 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2021 else if (!focus) 2051 else if (!focus)
2022 setoldcursor = 1; 2052 setoldcursor = 1;
2023 2053
2024 if (setoldcursor) 2054 if (setoldcursor)
2025 { 2055 {
2026 if (screen.cur.row + view_start >= nrow) 2056 if (screen.cur.row - view_start >= nrow)
2027 oldcursor.row = -1; 2057 oldcursor.row = -1;
2028 else 2058 else
2029 { 2059 {
2030 oldcursor.row = screen.cur.row + view_start; 2060 oldcursor.row = screen.cur.row - view_start;
2031 oldcursor.col = screen.cur.col; 2061 oldcursor.col = screen.cur.col;
2032 } 2062 }
2033 } 2063 }
2034 } 2064 }
2035 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2036#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2037 scr_swap_overlay (); 2068 scr_swap_overlay ();
2038#endif 2069#endif
2039 2070
2040#ifndef NO_SLOW_LINK_SUPPORT 2071#ifndef NO_SLOW_LINK_SUPPORT
2041 /* 2072 /*
2042 * D: CopyArea pass - very useful for slower links 2073 * D: CopyArea pass - very useful for slower links
2043 * This has been deliberately kept simple. 2074 * This has been deliberately kept simple.
2044 */ 2075 */
2045 i = num_scr;
2046 if (!display->is_local 2076 if (!display->is_local
2047 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2048 && abs (num_scr) < nrow && !must_clear) 2078 && abs (num_scr) < nrow && !must_clear)
2049 { 2079 {
2050 int16_t nits; 2080 int16_t nits;
2051 int j; 2081 int j;
2052 int len, wlen; 2082 int len, wlen;
2083 dLocal (int, num_scr);
2053 2084
2054 j = nrow; 2085 j = nrow;
2055 wlen = len = -1; 2086 wlen = len = -1;
2056 row = i > 0 ? 0 : j - 1; 2087 row = i > 0 ? 0 : j - 1;
2057 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2058 { 2089 {
2059 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2060 { 2091 {
2061 line_t s = ROW(row - view_start); 2092 line_t s = ROW(view_start + row);
2062 line_t d = drawn_buf[row]; 2093 line_t d = drawn_buf[row];
2063 line_t d2 = drawn_buf[row + i]; 2094 line_t d2 = drawn_buf[row + i];
2064 2095
2065 for (nits = 0, col = ncol; col--; ) 2096 for (nits = 0, col = ncol; col--; )
2066 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])
… …
2090 if (wlen < len) 2121 if (wlen < len)
2091 ::swap (wlen, len); 2122 ::swap (wlen, len);
2092 2123
2093 XCopyArea (display->display, vt, vt, 2124 XCopyArea (display->display, vt, vt,
2094 gc, 0, Row2Pixel (len + i), 2125 gc, 0, Row2Pixel (len + i),
2095 (unsigned int)TermWin_TotalWidth (), 2126 (unsigned int)this->width,
2096 (unsigned int)Height2Pixel (wlen - len + 1), 2127 (unsigned int)Height2Pixel (wlen - len + 1),
2097 0, Row2Pixel (len)); 2128 0, Row2Pixel (len));
2098 len = -1; 2129 len = -1;
2099 } 2130 }
2100 } 2131 }
… …
2104 /* 2135 /*
2105 * E: main pass across every character 2136 * E: main pass across every character
2106 */ 2137 */
2107 for (row = 0; row < nrow; row++) 2138 for (row = 0; row < nrow; row++)
2108 { 2139 {
2109 text_t *stp = ROW(row - view_start).t; 2140 text_t *stp = ROW(view_start + row).t;
2110 rend_t *srp = ROW(row - view_start).r; 2141 rend_t *srp = ROW(view_start + row).r;
2111 text_t *dtp = drawn_buf[row].t; 2142 text_t *dtp = drawn_buf[row].t;
2112 rend_t *drp = drawn_buf[row].r; 2143 rend_t *drp = drawn_buf[row].r;
2113 2144
2114 /* 2145 /*
2115 * E2: OK, now the real pass 2146 * E2: OK, now the real pass
… …
2179 count++, i--; 2210 count++, i--;
2180 2211
2181 /* 2212 /*
2182 * Determine the attributes for the string 2213 * Determine the attributes for the string
2183 */ 2214 */
2184 int fore = GET_FGCOLOR (rend); // desired foreground 2215 int fore = fgcolor_of (rend); // desired foreground
2185 int back = GET_BGCOLOR (rend); // desired background 2216 int back = bgcolor_of (rend); // desired background
2186 2217
2187 // only do special processing if any attributes are set, which is rare 2218 // 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)) 2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2189 { 2220 {
2190#if ENABLE_STYLES 2221#if ENABLE_STYLES
2191 // force redraw after "careful" characters to avoid pixel droppings 2222 // force redraw after "careful" characters to avoid pixel droppings
2192 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2303 } /* for (row....) */ 2334 } /* for (row....) */
2304 2335
2305#if ENABLE_OVERLAY 2336#if ENABLE_OVERLAY
2306 scr_swap_overlay (); 2337 scr_swap_overlay ();
2307#endif 2338#endif
2339 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2308 2340
2309 /* 2341 /*
2310 * G: cleanup cursor and display outline cursor if necessary 2342 * G: cleanup cursor and display outline cursor if necessary
2311 */ 2343 */
2312 if (showcursor) 2344 if (showcursor)
2313 { 2345 {
2314 if (focus) 2346 if (focus)
2315 { 2347 {
2316 if (options & Opt_cursorUnderline) 2348 if (OPTION (Opt_cursorUnderline))
2317 *crp ^= RS_Uline; 2349 *crp ^= RS_Uline;
2318 else 2350 else
2319 { 2351 {
2320 *crp ^= RS_RVid; 2352 *crp ^= RS_RVid;
2321#ifndef NO_CURSORCOLOR 2353#ifndef NO_CURSORCOLOR
… …
2351 /* 2383 /*
2352 * H: cleanup selection 2384 * H: cleanup selection
2353 */ 2385 */
2354 scr_reverse_selection (); 2386 scr_reverse_selection ();
2355 2387
2356 if (refresh_type & SMOOTH_REFRESH)
2357 XFlush (display->display);
2358
2359 num_scr = 0; 2388 num_scr = 0;
2360 num_scr_allow = 1; 2389 num_scr_allow = 1;
2361} 2390}
2362 2391
2363void 2392void
2364rxvt_term::scr_remap_chars (const line_t &l) 2393rxvt_term::scr_remap_chars (line_t &l)
2365{ 2394{
2366 if (!l.t) 2395 if (!l.t)
2367 return; 2396 return;
2397
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2368 2399
2369 for (int i = ncol; i--; ) 2400 for (int i = ncol; i--; )
2370 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]));
2371} 2402}
2372 2403
… …
2425 2456
2426 if (really) 2457 if (really)
2427 XClearWindow (display->display, vt); 2458 XClearWindow (display->display, vt);
2428} 2459}
2429 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
2430/* ------------------------------------------------------------------------- */ 2509/* ------------------------------------------------------------------------- */
2431void 2510void
2432rxvt_term::scr_reverse_selection () 2511rxvt_term::scr_reverse_selection ()
2433{ 2512{
2434 if (selection.op 2513 if (selection.op
2435 && current_screen == selection.screen 2514 && current_screen == selection.screen
2436 && selection.end.row >= -view_start) 2515 && selection.end.row >= view_start)
2437 { 2516 {
2438 int view_end = -view_start + nrow;
2439 int row, col;
2440
2441#if ENABLE_FRILLS 2517#if ENABLE_FRILLS
2442 if (selection.rect) 2518 if (selection.rect)
2443 { 2519 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++) 2520 selection.end.row, selection.end.col,
2445 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2521 RS_RVid, RS_RVid | RS_Uline);
2446 srp[col] ^= RS_RVid;
2447 }
2448 else 2522 else
2449#endif 2523#endif
2450 { 2524 scr_xor_span (selection.beg.row, selection.beg.col,
2451 if (selection.beg.row >= -view_start) 2525 selection.end.row, selection.end.col,
2452 { 2526 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 } 2527 }
2471} 2528}
2472 2529
2473/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2474/* 2531/*
… …
2512 2569
2513 if (!selection.op) 2570 if (!selection.op)
2514 return; 2571 return;
2515 2572
2516 pos.row = pos.col = 0; 2573 pos.row = pos.col = 0;
2517 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2574 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2518 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2575 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2519 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2520 || (check_more == 1 2577 || (check_more == 1
2521 && current_screen == selection.screen 2578 && current_screen == selection.screen
2522 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2579 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2523 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2580 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2524 || (check_more == 2 2581 || (check_more == 2
… …
2535/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2536/* 2593/*
2537 * Paste a selection direct to the command fd 2594 * Paste a selection direct to the command fd
2538 */ 2595 */
2539void 2596void
2540rxvt_term::paste (unsigned char *data, unsigned int len) 2597rxvt_term::paste (char *data, unsigned int len)
2541{ 2598{
2542 /* convert normal newline chars into common keyboard Return key sequence */ 2599 /* convert normal newline chars into common keyboard Return key sequence */
2543 for (unsigned int i = 0; i < len; i++) 2600 for (unsigned int i = 0; i < len; i++)
2544 if (data[i] == C0_LF) 2601 if (data[i] == C0_LF)
2545 data[i] = C0_CR; 2602 data[i] = C0_CR;
… …
2689 { 2746 {
2690 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2691 char *s = rxvt_wcstombs (w); 2748 char *s = rxvt_wcstombs (w);
2692 free (w); 2749 free (w);
2693 // TODO: strlen == only the first element will be converted. well... 2750 // TODO: strlen == only the first element will be converted. well...
2694 paste ((unsigned char *)s, strlen (s)); 2751 paste (s, strlen (s));
2695 free (s); 2752 free (s);
2696 } 2753 }
2697 else 2754 else
2698#endif 2755#endif
2699 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2700 && cl) 2757 && cl)
2701 { 2758 {
2702 for (int i = 0; i < cr; i++) 2759 for (int i = 0; i < cr; i++)
2703 paste ((unsigned char *)cl[i], strlen (cl[i])); 2760 paste (cl[i], strlen (cl[i]));
2704 2761
2705 XFreeStringList (cl); 2762 XFreeStringList (cl);
2706 } 2763 }
2707 else 2764 else
2708 paste (ct.value, ct.nitems); // paste raw 2765 paste ((char *)ct.value, ct.nitems); // paste raw
2709 2766
2710bailout: 2767bailout:
2711 XFree (ct.value); 2768 XFree (ct.value);
2712 2769
2713 if (selection_wait == Sel_normal) 2770 if (selection_wait == Sel_normal)
… …
2751 return; /* outside window */ 2808 return; /* outside window */
2752 2809
2753 if (selection.text) 2810 if (selection.text)
2754 { /* internal selection */ 2811 { /* internal selection */
2755 char *str = rxvt_wcstombs (selection.text, selection.len); 2812 char *str = rxvt_wcstombs (selection.text, selection.len);
2756 paste ((unsigned char *)str, strlen (str)); 2813 paste (str, strlen (str));
2757 free (str); 2814 free (str);
2758 return; 2815 return;
2759 } 2816 }
2760 else 2817 else
2761 { 2818 {
… …
2853 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2854 2911
2855 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2856 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2857 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2858 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2859 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));
2860 2920
2861 int ofs = 0; 2921 int ofs = 0;
2862 int extra = 0; 2922 int extra = 0;
… …
2874 col = selection.beg.col; 2934 col = selection.beg.col;
2875 end_col = ncol + 1; 2935 end_col = ncol + 1;
2876 } 2936 }
2877 else 2937 else
2878#endif 2938#endif
2879 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2880 2940
2881 col = max (col, 0); 2941 col = max (col, 0);
2882 2942
2883 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2884 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2885 2949
2886 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2887 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2888 { 2953 {
2889 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2890 t++; 2955 t++;
2891#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2907#endif 2972#endif
2908 else 2973 else
2909 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2910 } 2975 }
2911 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2912 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2913 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2914 } 2991 }
2915 2992
2916 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2917 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
2918 2995
… …
2928 3005
2929 // 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
2930 selection.len = ofs; 3007 selection.len = ofs;
2931 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));
2932 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
2933 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2934 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2935 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2936 else 3027 else
2937 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2938 3032
2939#if 0 3033#if 0
2940 XTextProperty ct; 3034 XTextProperty ct;
2941 3035
2942 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2943 { 3037 {
2944 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2945 XFree (ct.value); 3039 XFree (ct.value);
2946 } 3040 }
2947#endif 3041#endif
2948
2949 selection_time = tm;
2950} 3042}
2951 3043
2952/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2953/* 3045/*
2954 * 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
… …
2958rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2959{ 3051{
2960 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2961 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2962 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
2963 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2964 3065
2965 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2966 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2967 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
2968 0, /* button 3 */ 3069 0, /* button 3 */
2969 1, /* button press */ 3070 1, /* button press */
2970 0); /* click change */ 3071 0); /* click change */
2971} 3072}
2972 3073
… …
2977void 3078void
2978rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2979{ 3080{
2980 want_refresh = 1; 3081 want_refresh = 1;
2981 3082
2982 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
2983 selection.mark.col = col; 3084 selection.mark.col = col;
2984 3085
2985 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2986 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2987 3088
2988 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
2989 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2990 --selection.mark.col; 3091 --selection.mark.col;
… …
3018 text_t *stp; 3119 text_t *stp;
3019 rend_t *srp; 3120 rend_t *srp;
3020 3121
3021 if (dirn == UP) 3122 if (dirn == UP)
3022 { 3123 {
3023 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
3024 bound.col = 0; 3125 bound.col = 0;
3025 dirnadd = -1; 3126 dirnadd = -1;
3026 } 3127 }
3027 else 3128 else
3028 { 3129 {
… …
3076 } 3177 }
3077 } 3178 }
3078 break; 3179 break;
3079 } 3180 }
3080 3181
3081Old_Word_Selection_You_Die:
3082 if (dirn == DN) 3182 if (dirn == DN)
3083 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3084 3184
3085 /* Poke the values back in */ 3185 /* Poke the values back in */
3086 ret->row = row; 3186 ret->row = row;
… …
3107 * 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
3108 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3109 */ 3209 */
3110 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3111 && (col == selection.mark.col 3211 && (col == selection.mark.col
3112 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3113 { 3213 {
3114 /* select nothing */ 3214 /* select nothing */
3115 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3116 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3117 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3172 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3173 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3174 } 3274 }
3175 3275
3176 pos.col = col; 3276 pos.col = col;
3177 pos.row = row - view_start; 3277 pos.row = view_start + row;
3178 3278
3179 /* 3279 /*
3180 * 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
3181 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3182 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3269 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3270 } 3370 }
3271 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3272 { 3372 {
3273#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3274 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3275 { 3375 {
3276 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3277 3377
3278 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3279 { 3379 {
… …
3340 { 3440 {
3341 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3342 3442
3343 while (--end_col >= 0) 3443 while (--end_col >= 0)
3344 { 3444 {
3345 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3346 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3347 && stp[end_col] != NOCHAR)
3348 break; 3447 break;
3349 } 3448 }
3350 3449
3351 if (end_col >= 0 3450 if (end_col >= 0
3352 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3551 3650
3552#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3553void 3652void
3554rxvt_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)
3555{ 3654{
3556 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3557 return; 3656 return;
3558 3657
3559 want_refresh = 1; 3658 want_refresh = 1;
3560 3659
3561 scr_overlay_off (); 3660 scr_overlay_off ();
… …
3668 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3669 { 3768 {
3670 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3671 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3672 3771
3673 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3674 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3675 3774
3676 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3677 { 3776 {
3678 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3679 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