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.186 by root, Wed Dec 21 19:50:17 2005 UTC vs.
Revision 1.216 by root, Mon Jan 9 18:51:19 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() \
… …
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;
… …
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)
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 * ------------------------------------------------------------------------- */
… …
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
242 */ 248 */
243 249
244 printf ("resize %d:%d => %d:%d\n", prev_nrow, prev_ncol, nrow, ncol);//D
245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 252
249#if 0 253#if 0
250 if (nrow < prev_nrow) 254 if (nrow < prev_nrow)
… …
255 lfree (drawn_buf[row]); 259 lfree (drawn_buf[row]);
256 } 260 }
257 } 261 }
258#endif 262#endif
259 263
260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 temp_buf = (line_t *) rxvt_realloc (temp_buf , nrow * sizeof (line_t)); 265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
262 swap_buf = (line_t *) rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263 267
264 for (int row = min (nrow, prev_nrow); row--; ) 268 for (int row = min (nrow, prev_nrow); row--; )
265 { 269 {
266 lresize (drawn_buf[row]); 270 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 271 lresize (swap_buf [row]);
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 278 }
275 279
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
277 281
278 // re-wrap lines, this is rather ugly, possibly because I am too dumb
279 // to come up with a lean and mean algorithm.
280
281 int p = MOD (term_start + nrow , prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 283 int pend = MOD (term_start - nsaved , prev_total_rows);
283 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
284 285
285 while (p != pend && q > 0) 286 if (nsaved)
287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm.
290
291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293
286 { 294 do
287 p = MOD (p - 1, prev_total_rows);
288
289 assert (old_buf [MOD (p, prev_total_rows)].t);
290 assert (!old_buf [MOD (p, prev_total_rows)].is_longer ());
291
292 int llen = old_buf [MOD (p, prev_total_rows)].l;
293
294 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
295 { 295 {
296 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
297 297#ifdef DEBUG_STRICT
298 llen += prev_ncol; 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299 } 299#endif
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 300 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 302
304 q -= qlines; 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305
306 int qrow = q;
307
308 for (; qlines--; qrow++)
309 {
310 if (qrow >= 0)
311 { 304 {
305 p = MOD (p - 1, prev_total_rows);
306
307 plines++;
308 llen += prev_ncol;
309 }
310
311 int qlines = max (0, (llen - 1) / ncol) + 1;
312
313 // drop partial lines completely
314 if (q < qlines)
315 break;
316
317 q -= qlines;
318
319 int lofs = 0;
320 line_t *qline;
321
322 // re-assemble the full line by destination lines
323 for (int qrow = q; qlines--; qrow++)
324 {
312 line_t &qline = row_buf [qrow]; 325 qline = row_buf + qrow;
313
314 lalloc (qline); 326 lalloc (*qline);
327 qline->l = ncol;
315 qline.set_is_longer (); 328 qline->is_longer (1);
316 329
317 int qcol = 0; 330 int qcol = 0;
318 331
319 for (;;) 332 // fill a single destination line
333 while (lofs < llen && qcol < ncol)
320 { 334 {
321 int prow = lofs / prev_ncol + p; 335 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
323 337
338 prow = MOD (p + prow, prev_total_rows);
339
340 // we only adjust the cursor _row_ and put it into
341 // the topmost line of "long line" it was in, as
342 // this seems to upset applications/shells/readline
343 // least.
344 if (prow == ocur.row)
345 screen.cur.row = q - (total_rows - nrow);
346
324 line_t &pline = old_buf [p]; 347 line_t &pline = old_buf [prow];
325 348
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 350
328 printf ("q %d lofs %d>%d len %d pq %d:%d p %d:%d q :%d\n", q, llen, lofs, len, prev_ncol, ncol, prow, pcol, qcol);
329
330 if (len <= 0)
331 {
332 qline.l = qcol;
333 scr_blank_line (qline, qcol, ncol - qcol, DEFAULT_RSTYLE);
334 break;
335 }
336
337 assert (lofs < 1000); 351 assert (len);
352 assert (pline.t);
338 353
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 356
342 lofs += len; 357 lofs += len;
343 qcol += len; 358 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 359 }
348 } 360 }
349 else 361
350 lofs += ncol; 362 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
363 qline->is_longer (0);
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 365 }
366 while (p != pend && q > 0);
367
368 term_start = total_rows - nrow;
369 nsaved = term_start - q;
370
371 // make sure all terminal lines exist
372 while (nsaved < 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
374 }
375 else
352 } 376 {
377 // if no scrollback exists (yet), wing, instead of wrap
378
379 for (int row = min (nrow, prev_nrow); row--; )
380 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row];
383
384 qline = pline;
385 lresize (qline);
386 }
387
388 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392
393 term_start = 0;
394 }
395
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
399#endif
353 400
354 free (old_buf); 401 free (old_buf);
355 delete old_ta; 402 delete old_ta;
356 delete old_ra; 403 delete old_ra;
357 404
358 min_it (screen.cur.row, nrow - 1); 405 clamp_it (screen.cur.row, 0, nrow - 1);
359 min_it (screen.cur.col, ncol - 1); 406 clamp_it (screen.cur.col, 0, ncol - 1);
360 407
361 if (tabs) 408 if (tabs)
362 free (tabs); 409 free (tabs);
363 } 410 }
364 411
… …
369 416
370 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
371 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
372 419
373 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374} 423}
375 424
376/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
377/* 426/*
378 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
386 free (row_buf); 435 free (row_buf);
387 free (swap_buf); 436 free (swap_buf);
388 free (drawn_buf); 437 free (drawn_buf);
389 free (temp_buf); 438 free (temp_buf);
390 free (tabs); 439 free (tabs);
440
441 row_buf = 0; // signal that we freed all the arrays
391} 442}
392 443
393/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
394/* 445/*
395 * Hard reset 446 * Hard reset
… …
451 min_it (s->cur.row, nrow - 1); 502 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 503 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 504#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
456#else /* drive with your eyes closed */
457 max_it (s->cur.row, 0);
458 max_it (s->cur.col, 0);
459#endif 507#endif
460} 508}
461 509
462/* ------------------------------------------------------------------------- */ 510/* ------------------------------------------------------------------------- */
463/* 511/*
… …
483 531
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 534
487#if NSCREENS 535#if NSCREENS
488 if (options & Opt_secondaryScreen) 536 if (OPTION (Opt_secondaryScreen))
489 { 537 {
490 num_scr = 0; 538 num_scr = 0;
491 539
492 for (int i = nrow; i--; ) 540 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 541 ::swap (ROW(i), swap_buf [i]);
494 542
495 ::swap (screen.charset, swap.charset); 543 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 544 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 545 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 546 swap.flags |= Screen_VisibleCursor;
499 } 547 }
500 else 548 else
501#endif 549#endif
502 if (options & Opt_secondaryScroll) 550 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 551 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 552
505 return scrn; 553 return scrn;
506} 554}
507 555
… …
569 num_scr += count; 617 num_scr += count;
570 618
571 if (count > 0 619 if (count > 0
572 && row1 == 0 620 && row1 == 0
573 && row2 == nrow - 1 621 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 623 {
576 nsaved = min (nsaved + count, saveLines); 624 nsaved = min (nsaved + count, saveLines);
625
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
627
577 term_start = (term_start + count) % total_rows; 628 term_start = (term_start + count) % total_rows;
578 629
579 if (selection.op && current_screen == selection.screen) 630 if (selection.op && current_screen == selection.screen)
580 { 631 {
581 selection.beg.row -= count; 632 selection.beg.row -= count;
582 selection.end.row -= count; 633 selection.end.row -= count;
583 selection.mark.row -= count; 634 selection.mark.row -= count;
584 635
585 selection_check (0); 636 if (selection.beg.row < -nsaved
637 || selection.end.row < -nsaved
638 || selection.mark.row < -nsaved)
639 {
640 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR;
642 }
586 } 643 }
587 644
588 for (int i = count; i--; ) 645 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle); 646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
590 656
591 if ((options & Opt_scrollWithBuffer) 657 if (OPTION (Opt_scrollWithBuffer)
592 && view_start != 0 658 && view_start != 0
593 && view_start != saveLines) 659 && view_start != saveLines)
594 scr_page (UP, count); 660 scr_page (UP, count);
595 } 661 }
596 else 662 else
597 { 663 {
598 if (selection.op && current_screen == selection.screen) 664 if (selection.op && current_screen == selection.screen)
599 { 665 {
600 int i = selection.beg.row; 666 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 667 || (selection.beg.row < row2 && selection.end.row > row2)
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1) 668 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 669 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 670 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 671 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 672 {
610 CLEAR_ALL_SELECTION (); 673 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 674 selection.op = SELECTION_CLEAR;
612 } 675 }
613 else if (j >= row1 && j <= row2) 676 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 677 {
615 /* move selected region too */ 678 /* move selected region too */
616 selection.beg.row -= count; 679 selection.beg.row -= count;
617 selection.end.row -= count; 680 selection.end.row -= count;
618 selection.mark.row -= count; 681 selection.mark.row -= count;
… …
646/* ------------------------------------------------------------------------- */ 709/* ------------------------------------------------------------------------- */
647/* 710/*
648 * Add text given in <str> of length <len> to screen struct 711 * Add text given in <str> of length <len> to screen struct
649 */ 712 */
650void 713void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 715{
653 if (len <= 0) /* sanity */ 716 if (len <= 0) /* sanity */
654 return; 717 return;
655 718
656 unsigned char checksel; 719 unsigned char checksel;
657 unicode_t c; 720 unicode_t c;
658 int row, last_col; 721 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 722 const wchar_t *strend = str + len;
660 723
661 want_refresh = 1; 724 want_refresh = 1;
662 ZERO_SCROLLBACK (); 725 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 726
665 if (nlines > 0) 727 if (minlines > 0)
666 { 728 {
667 nlines += screen.cur.row - screen.bscroll; 729 minlines += screen.cur.row - screen.bscroll;
730
668 if (nlines > 0 731 if (minlines > 0
669 && screen.tscroll == 0 732 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 733 && screen.bscroll == nrow - 1)
671 { 734 {
672 /* _at least_ this many lines need to be scrolled */ 735 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 736 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 737 screen.cur.row -= minlines;
675 } 738 }
676 } 739 }
677 740
678#ifdef DEBUG_STRICT 741#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 742 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 743 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 744 && screen.cur.row >= -nsaved);
682#else /* drive with your eyes closed */
683 min_it (screen.cur.col, last_col - 1);
684 clamp_it (screen.cur.row, -nsaved, nrow - 1);
685#endif 745#endif
686 row = screen.cur.row; 746 int row = screen.cur.row;
687 747
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 748 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 749
690 line_t *line = &ROW(row); 750 line_t *line = &ROW(row);
691 751
692 while (str < strend) 752 while (str < strend)
693 { 753 {
694 c = *str++; 754 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 755
696 if (c < 0x20) 756 if (c < 0x20)
697 if (c == C0_LF) 757 if (c == C0_LF)
698 { 758 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 759 max_it (line->l, screen.cur.col);
701 760
702 screen.flags &= ~Screen_WrapNext; 761 screen.flags &= ~Screen_WrapNext;
703 762
704 if (screen.cur.row == screen.bscroll) 763 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 764 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 768 line = &ROW(row); /* _must_ refresh */
710 continue; 769 continue;
711 } 770 }
712 else if (c == C0_CR) 771 else if (c == C0_CR)
713 { 772 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 773 max_it (line->l, screen.cur.col);
716 774
717 screen.flags &= ~Screen_WrapNext; 775 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 776 screen.cur.col = 0;
719 continue; 777 continue;
720 } 778 }
… …
737 CLEAR_SELECTION (); 795 CLEAR_SELECTION ();
738 } 796 }
739 797
740 if (screen.flags & Screen_WrapNext) 798 if (screen.flags & Screen_WrapNext)
741 { 799 {
800 max_it (line->l, ncol);
742 line->set_is_longer (); 801 line->is_longer (1);
743 802
744 scr_do_wrap (); 803 scr_do_wrap ();
745 804
746 row = screen.cur.row; 805 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
… …
755 // do wcwidth before further replacements, as wcwidth might return -1 814 // do wcwidth before further replacements, as wcwidth might return -1
756 // for the line drawing characters below as they might be invalid in the current 815 // for the line drawing characters below as they might be invalid in the current
757 // locale. 816 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 817 int width = c < 0x100 ? 1 : wcwidth (c);
759 818
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 819 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 820 {
762 // vt100 special graphics and line drawing 821 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 822 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 823 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 824 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 876 }
818 877
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 878 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 879
821 // if the character doesn't fit into the remaining columns... 880 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 881 if (screen.cur.col > ncol - width && ncol >= width)
823 { 882 {
824 // ...output spaces 883 // ...output spaces
825 c = ' '; 884 c = ' ';
826 // and try the same character next loop iteration 885 // and try the same character next loop iteration
827 --str; 886 --str;
828 } 887 }
829 888
889 line->touch ();
890
830 do 891 do
831 { 892 {
832 line->t[screen.cur.col] = c; 893 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 894 line->r[screen.cur.col] = rend;
834 895
835 if (screen.cur.col < last_col - 1) 896 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 897 screen.cur.col++;
837 else 898 else
838 { 899 {
839 line->l = last_col; 900 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 901 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 902 screen.flags |= Screen_WrapNext;
842 break; 903 break;
843 } 904 }
844 905
… …
846 } 907 }
847 while (--width > 0); 908 while (--width > 0);
848 909
849 // pad with spaces when overwriting wide character with smaller one 910 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 911 if (!width)
912 {
913 line->touch ();
914
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 915 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 916 {
853 line->t[c] = ' '; 917 line->t[c] = ' ';
854 line->r[c] = rend; 918 line->r[c] = rend;
855 } 919 }
920 }
856 } 921 }
857 else // width == 0 922 else // width == 0
858 { 923 {
859#if ENABLE_COMBINING 924#if ENABLE_COMBINING
860 // handle combining characters 925 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 926 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 927 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 928 // we don't handle double-width characters nicely yet.
929 line_t *linep;
864 text_t *tp; 930 text_t *tp;
865 rend_t *rp; 931 rend_t *rp;
866 932
867 if (screen.cur.col > 0) 933 if (screen.cur.col > 0)
868 { 934 {
935 linep = line;
869 tp = line->t + screen.cur.col - 1; 936 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 937 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 938 }
875 else if (screen.cur.row > 0 939 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 940 && ROW(screen.cur.row - 1).is_longer ())
877 { 941 {
878 line_t *line = &ROW(screen.cur.row - 1); 942 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 943 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 944 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 945 }
886 else 946 else
887 continue; 947 continue;
948
949 linep->touch ();
950
951 while (*tp == NOCHAR && tp > linep->t)
952 tp--, rp--;
888 953
889 // first try to find a precomposed character 954 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 955 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 956 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 957 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 960 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 961#endif
897 } 962 }
898 } 963 }
899 964
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 965 max_it (line->l, screen.cur.col);
902 966
903#ifdef DEBUG_STRICT 967#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 968 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 969#endif
908} 970}
909 971
910/* ------------------------------------------------------------------------- */ 972/* ------------------------------------------------------------------------- */
911/* 973/*
… …
950 1012
951 if (count == 0) 1013 if (count == 0)
952 return; 1014 return;
953 else if (count > 0) 1015 else if (count > 0)
954 { 1016 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1017 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1018 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1019 ht &= l.t[i] == ' ';
960 1020
961 for (; ++i < ncol; ) 1021 for (; ++i < ncol; )
962 if (tabs[i]) 1022 if (tabs[i])
963 { 1023 {
964 x = i; 1024 x = i;
1025
965 if (!--count) 1026 if (!--count)
966 break; 1027 break;
967 } 1028 }
968 else 1029 else
969 ht &= l.t[i] == ' ' 1030 ht &= l.t[i] == ' '
… …
972 if (count) 1033 if (count)
973 x = ncol - 1; 1034 x = ncol - 1;
974 1035
975 // store horizontal tab commands as characters inside the text 1036 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1037 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1038 if (ht && OPTION (Opt_pastableTabs))
978 { 1039 {
979 base_rend = SET_FONT (base_rend, 0); 1040 base_rend = SET_FONT (base_rend, 0);
980 1041
981 if (!l.is_longer ()) /* XXX: think about this */ 1042 l.touch (x);
982 max_it (l.l, x);
983 1043
984 i = screen.cur.col; 1044 i = screen.cur.col;
985 1045
986 l.t[i] = '\t'; 1046 l.t[i] = '\t';
987 l.r[i] = base_rend; 1047 l.r[i] = base_rend;
… …
1037 */ 1097 */
1038#if ENABLE_FRILLS 1098#if ENABLE_FRILLS
1039void 1099void
1040rxvt_term::scr_forwardindex () 1100rxvt_term::scr_forwardindex ()
1041{ 1101{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1102 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1104 else
1047 { 1105 {
1048 row = screen.cur.row; 1106 line_t &l = ROW(screen.cur.row);
1049 1107
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1108 l.touch ();
1051 ROW(row).l = ncol; 1109 l.is_longer (0);
1052 1110
1053 scr_gotorc (0, 0, R_RELATIVE); 1111 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1112 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1113 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1114 }
… …
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1198 */
1141void 1199void
1142rxvt_term::scr_erase_line (int mode) 1200rxvt_term::scr_erase_line (int mode)
1143{ 1201{
1144 unsigned int row, col, num; 1202 unsigned int col, num;
1145 1203
1146 want_refresh = 1; 1204 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1205 ZERO_SCROLLBACK ();
1148 1206
1149 selection_check (1); 1207 selection_check (1);
1150 1208
1151 row = screen.cur.row; 1209 line_t &line = ROW(screen.cur.row);
1210
1211 line.touch ();
1212 line.is_longer (0);
1152 1213
1153 switch (mode) 1214 switch (mode)
1154 { 1215 {
1155 case 0: /* erase to end of line */ 1216 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1217 col = screen.cur.col;
1157 num = ncol - col; 1218 num = ncol - col;
1158 min_it (ROW(row).l, col); 1219 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1220 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1221 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1222 CLEAR_SELECTION ();
1162 break; 1223 break;
1163 case 1: /* erase to beginning of line */ 1224 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1229 CLEAR_SELECTION ();
1169 break; 1230 break;
1170 case 2: /* erase whole line */ 1231 case 2: /* erase whole line */
1171 col = 0; 1232 col = 0;
1172 num = ncol; 1233 num = ncol;
1173 ROW(row).l = 0; 1234 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1235 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1236 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1237 CLEAR_SELECTION ();
1177 break; 1238 break;
1178 default: 1239 default:
1179 return; 1240 return;
1180 } 1241 }
1181 1242
1182 scr_blank_line (ROW(row), col, num, rstyle); 1243 scr_blank_line (line, col, num, rstyle);
1183} 1244}
1184 1245
1185/* ------------------------------------------------------------------------- */ 1246/* ------------------------------------------------------------------------- */
1186/* 1247/*
1187 * Erase part of whole of the screen 1248 * Erase part of whole of the screen
… …
1242 CLEAR_ROWS (row, num); 1303 CLEAR_ROWS (row, num);
1243 } 1304 }
1244 else 1305 else
1245 { 1306 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1307 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1308 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1309 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1310 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1311 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1312 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1313 }
1253 1314
1254 for (; num--; row++) 1315 for (; num--; row++)
1255 { 1316 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1317 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1318 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1319 }
1260} 1320}
1261 1321
1262#if ENABLE_FRILLS 1322#if ENABLE_FRILLS
… …
1295 rend_t *r1 = line.r; 1355 rend_t *r1 = line.r;
1296 1356
1297 for (int j = ncol; j--; ) 1357 for (int j = ncol; j--; )
1298 *r1++ = fs; 1358 *r1++ = fs;
1299 1359
1300 line.l = ncol; /* make the `E's selectable */ 1360 line.is_longer (0);
1361 line.touch (ncol);
1301 } 1362 }
1302} 1363}
1303 1364
1304/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1305/* 1366/*
… …
1353 min_it (count, ncol - screen.cur.col); 1414 min_it (count, ncol - screen.cur.col);
1354 1415
1355 row = screen.cur.row; 1416 row = screen.cur.row;
1356 1417
1357 line_t *line = &ROW(row); 1418 line_t *line = &ROW(row);
1419
1420 line->touch ();
1421 line->is_longer (0);
1358 1422
1359 switch (insdel) 1423 switch (insdel)
1360 { 1424 {
1361 case INSERT: 1425 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1426 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1427 {
1364 line->t[col] = line->t[col - count]; 1428 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1429 line->r[col] = line->r[col - count];
1366 } 1430 }
1367 1431
1368 if (!line->is_longer ()) 1432 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1433
1374 if (selection.op && current_screen == selection.screen 1434 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1435 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1436 {
1377 if (selection.end.row != screen.cur.row 1437 if (selection.end.row != screen.cur.row
… …
1390 1450
1391 case ERASE: 1451 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1452 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1453 selection_check (1);
1394 screen.cur.col -= count; 1454 screen.cur.col -= count;
1455
1456 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1457 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1458 break;
1397 1459
1398 case DELETE: 1460 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1461 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1464 {
1403 line->t[col] = line->t[col + count]; 1465 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1466 line->r[col] = line->r[col + count];
1405 } 1467 }
1406 1468
1469 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1470 scr_blank_line (*line, ncol - count, count, tr);
1408
1409 if (line->is_longer ()) /* break line continuation */
1410 line->l = ncol;
1411
1412 line->l = max (line->l - count, 0);
1413 1471
1414 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1474 {
1417 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1529rxvt_term::scr_set_tab (int mode) 1587rxvt_term::scr_set_tab (int mode)
1530{ 1588{
1531 if (mode < 0) 1589 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1590 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1591 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1592 tabs [screen.cur.col] = !!mode;
1535} 1593}
1536 1594
1537/* ------------------------------------------------------------------------- */ 1595/* ------------------------------------------------------------------------- */
1538/* 1596/*
1539 * Set reverse/normal video 1597 * Set reverse/normal video
… …
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1610#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1611 if (bgPixmap.pixmap == None)
1554#endif 1612#endif
1555#if TRANSPARENT 1613#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1614 if (! OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1615#endif
1558 XSetWindowBackground (display->display, vt, 1616 XSetWindowBackground (display->display, vt,
1559 pix_colors[Color_bg]); 1617 pix_colors[Color_bg]);
1560 1618
1561 gcvalue.foreground = pix_colors[Color_fg]; 1619 gcvalue.foreground = pix_colors[Color_fg];
… …
1586 * Set font style 1644 * Set font style
1587 */ 1645 */
1588void 1646void
1589rxvt_term::set_font_style () 1647rxvt_term::set_font_style ()
1590{ 1648{
1649#if 0
1591 switch (charsets[screen.charset]) 1650 switch (charsets [screen.charset])
1592 { 1651 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1652 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1653 break;
1595 case 'A': /* United Kingdom (UK) */ 1654 case 'A': /* United Kingdom (UK) */
1596 break; 1655 break;
… …
1603 case 'C': /* Finnish character set */ 1662 case 'C': /* Finnish character set */
1604 break; 1663 break;
1605 case 'K': /* German character set */ 1664 case 'K': /* German character set */
1606 break; 1665 break;
1607 } 1666 }
1667#endif
1608} 1668}
1609 1669
1610/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
1611/* 1671/*
1612 * Choose a font 1672 * Choose a font
… …
1691 y = 0; 1751 y = 0;
1692 eheight = height; 1752 eheight = height;
1693 } 1753 }
1694#endif 1754#endif
1695 1755
1696#ifdef DEBUG_STRICT
1697#if 0
1698 // that's not debugging //TODO //FIXME
1699 clamp_it (x, 0, width);
1700 clamp_it (y, 0, height);
1701#endif
1702#endif
1703
1704 /* round down */ 1756 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1757 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1758 rc[PART_BEG].row = Pixel2Row (y);
1707 /* round up */ 1759 /* round up */
1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); 1760 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
… …
1787int 1839int
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (unsigned int oldviewstart)
1789{ 1841{
1790 if (view_start != oldviewstart) 1842 if (view_start != oldviewstart)
1791 { 1843 {
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845
1792 want_refresh = 1; 1846 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart); 1847 num_scr -= (view_start - oldviewstart);
1794 } 1848 }
1795 1849
1796 return (int) (view_start - oldviewstart); 1850 return (int)view_start - (int)oldviewstart;
1797} 1851}
1798 1852
1799/* ------------------------------------------------------------------------- */ 1853/* ------------------------------------------------------------------------- */
1800void 1854void
1801rxvt_term::scr_bell () 1855rxvt_term::scr_bell ()
1802{ 1856{
1803#ifndef NO_BELL 1857#ifndef NO_BELL
1804 1858
1805# ifndef NO_MAPALERT 1859# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1860# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1861 if (OPTION (Opt_mapAlert))
1808# endif 1862# endif
1809 XMapWindow (display->display, parent[0]); 1863 XMapWindow (display->display, parent[0]);
1810# endif 1864# endif
1811 1865
1812 if (options & Opt_visualBell) 1866 if (OPTION (Opt_visualBell))
1813 { 1867 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1868 scr_rvideo_mode (!rvideo); /* refresh also done */
1815 rxvt_usleep (VISUAL_BELL_DURATION); 1869 rxvt_usleep (VISUAL_BELL_DURATION);
1816 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1817 } 1871 }
… …
1908 1962
1909#if XPM_BACKGROUND 1963#if XPM_BACKGROUND
1910 must_clear |= bgPixmap.pixmap != None; 1964 must_clear |= bgPixmap.pixmap != None;
1911#endif 1965#endif
1912#if TRANSPARENT 1966#if TRANSPARENT
1913 must_clear |= (options & Opt_transparent) && am_transparent; 1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1914#endif 1968#endif
1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916 1970
1917 /* 1971 /*
1918 * B: reverse any characters which are selected 1972 * B: reverse any characters which are selected
… …
1942 1996
1943 crp = &ROW(screen.cur.row).r[col]; 1997 crp = &ROW(screen.cur.row).r[col];
1944 1998
1945 if (showcursor && focus) 1999 if (showcursor && focus)
1946 { 2000 {
1947 if (options & Opt_cursorUnderline) 2001 if (OPTION (Opt_cursorUnderline))
1948 *crp ^= RS_Uline; 2002 *crp ^= RS_Uline;
1949 else 2003 else
1950 { 2004 {
1951 *crp ^= RS_RVid; 2005 *crp ^= RS_RVid;
1952 2006
… …
1954 cc1 = *crp & (RS_fgMask | RS_bgMask); 2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
1955 if (ISSET_PIXCOLOR (Color_cursor)) 2009 if (ISSET_PIXCOLOR (Color_cursor))
1956 ccol1 = Color_cursor; 2010 ccol1 = Color_cursor;
1957 else 2011 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol1 = GET_FGCOLOR (rstyle); 2013 ccol1 = fgcolor_of (rstyle);
1960#else 2014#else
1961 ccol1 = Color_fg; 2015 ccol1 = Color_fg;
1962#endif 2016#endif
1963 if (ISSET_PIXCOLOR (Color_cursor2)) 2017 if (ISSET_PIXCOLOR (Color_cursor2))
1964 ccol2 = Color_cursor2; 2018 ccol2 = Color_cursor2;
1965 else 2019 else
1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967 ccol2 = GET_BGCOLOR (rstyle); 2021 ccol2 = bgcolor_of (rstyle);
1968#else 2022#else
1969 ccol2 = Color_bg; 2023 ccol2 = Color_bg;
1970#endif 2024#endif
1971 *crp = SET_FGCOLOR (*crp, ccol1); 2025 *crp = SET_FGCOLOR (*crp, ccol1);
1972 *crp = SET_BGCOLOR (*crp, ccol2); 2026 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2005 oldcursor.col = screen.cur.col; 2059 oldcursor.col = screen.cur.col;
2006 } 2060 }
2007 } 2061 }
2008 } 2062 }
2009 2063
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010#if ENABLE_OVERLAY 2065#if ENABLE_OVERLAY
2011 scr_swap_overlay (); 2066 scr_swap_overlay ();
2012#endif 2067#endif
2013 2068
2014#ifndef NO_SLOW_LINK_SUPPORT 2069#ifndef NO_SLOW_LINK_SUPPORT
… …
2064 if (wlen < len) 2119 if (wlen < len)
2065 ::swap (wlen, len); 2120 ::swap (wlen, len);
2066 2121
2067 XCopyArea (display->display, vt, vt, 2122 XCopyArea (display->display, vt, vt,
2068 gc, 0, Row2Pixel (len + i), 2123 gc, 0, Row2Pixel (len + i),
2069 (unsigned int)TermWin_TotalWidth (), 2124 (unsigned int)this->width,
2070 (unsigned int)Height2Pixel (wlen - len + 1), 2125 (unsigned int)Height2Pixel (wlen - len + 1),
2071 0, Row2Pixel (len)); 2126 0, Row2Pixel (len));
2072 len = -1; 2127 len = -1;
2073 } 2128 }
2074 } 2129 }
… …
2153 count++, i--; 2208 count++, i--;
2154 2209
2155 /* 2210 /*
2156 * Determine the attributes for the string 2211 * Determine the attributes for the string
2157 */ 2212 */
2158 int fore = GET_FGCOLOR (rend); // desired foreground 2213 int fore = fgcolor_of (rend); // desired foreground
2159 int back = GET_BGCOLOR (rend); // desired background 2214 int back = bgcolor_of (rend); // desired background
2160 2215
2161 // only do special processing if any attributes are set, which is rare 2216 // only do special processing if any attributes are set, which is unlikely
2162 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163 { 2218 {
2164#if ENABLE_STYLES 2219#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings 2220 // force redraw after "careful" characters to avoid pixel droppings
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 } /* for (row....) */ 2332 } /* for (row....) */
2278 2333
2279#if ENABLE_OVERLAY 2334#if ENABLE_OVERLAY
2280 scr_swap_overlay (); 2335 scr_swap_overlay ();
2281#endif 2336#endif
2337 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282 2338
2283 /* 2339 /*
2284 * G: cleanup cursor and display outline cursor if necessary 2340 * G: cleanup cursor and display outline cursor if necessary
2285 */ 2341 */
2286 if (showcursor) 2342 if (showcursor)
2287 { 2343 {
2288 if (focus) 2344 if (focus)
2289 { 2345 {
2290 if (options & Opt_cursorUnderline) 2346 if (OPTION (Opt_cursorUnderline))
2291 *crp ^= RS_Uline; 2347 *crp ^= RS_Uline;
2292 else 2348 else
2293 { 2349 {
2294 *crp ^= RS_RVid; 2350 *crp ^= RS_RVid;
2295#ifndef NO_CURSORCOLOR 2351#ifndef NO_CURSORCOLOR
… …
2333 num_scr = 0; 2389 num_scr = 0;
2334 num_scr_allow = 1; 2390 num_scr_allow = 1;
2335} 2391}
2336 2392
2337void 2393void
2338rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2339{ 2395{
2340 if (!l.t) 2396 if (!l.t)
2341 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2342 2400
2343 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2403}
2346 2404
… …
2414 2472
2415#if ENABLE_FRILLS 2473#if ENABLE_FRILLS
2416 if (selection.rect) 2474 if (selection.rect)
2417 { 2475 {
2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2477 {
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2481 for (col = selection.beg.col; col < selection.end.col; col++)
2420 srp[col] ^= RS_RVid; 2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2421 } 2490 }
2422 else 2491 else
2423#endif 2492#endif
2424 { 2493 {
2425 if (selection.beg.row >= -view_start) 2494 if (selection.beg.row >= -view_start)
… …
2428 row = selection.beg.row; 2497 row = selection.beg.row;
2429 } 2498 }
2430 else 2499 else
2431 { 2500 {
2432 col = 0; 2501 col = 0;
2433 row = view_start; 2502 row = -view_start;
2434 } 2503 }
2435 2504
2436 for (; row < min (selection.end.row, view_end); row++, col = 0) 2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid; 2507 srp[col] ^= RS_RVid;
… …
2509/* ------------------------------------------------------------------------- */ 2578/* ------------------------------------------------------------------------- */
2510/* 2579/*
2511 * Paste a selection direct to the command fd 2580 * Paste a selection direct to the command fd
2512 */ 2581 */
2513void 2582void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2583rxvt_term::paste (char *data, unsigned int len)
2515{ 2584{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2585 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2586 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2587 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2588 data[i] = C0_CR;
… …
2663 { 2732 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2733 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2734 char *s = rxvt_wcstombs (w);
2666 free (w); 2735 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2736 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2737 paste (s, strlen (s));
2669 free (s); 2738 free (s);
2670 } 2739 }
2671 else 2740 else
2672#endif 2741#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2742 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2743 && cl)
2675 { 2744 {
2676 for (int i = 0; i < cr; i++) 2745 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2746 paste (cl[i], strlen (cl[i]));
2678 2747
2679 XFreeStringList (cl); 2748 XFreeStringList (cl);
2680 } 2749 }
2681 else 2750 else
2682 paste (ct.value, ct.nitems); // paste raw 2751 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2752
2684bailout: 2753bailout:
2685 XFree (ct.value); 2754 XFree (ct.value);
2686 2755
2687 if (selection_wait == Sel_normal) 2756 if (selection_wait == Sel_normal)
… …
2725 return; /* outside window */ 2794 return; /* outside window */
2726 2795
2727 if (selection.text) 2796 if (selection.text)
2728 { /* internal selection */ 2797 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2798 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2799 paste (str, strlen (str));
2731 free (str); 2800 free (str);
2732 return; 2801 return;
2733 } 2802 }
2734 else 2803 else
2735 { 2804 {
… …
2827 selection.op = SELECTION_DONE; 2896 selection.op = SELECTION_DONE;
2828 2897
2829 if (selection.clicks == 4) 2898 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2899 return; /* nothing selected, go away */
2831 2900
2901 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2902 return;
2903
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2904 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2905 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2906
2835 int ofs = 0; 2907 int ofs = 0;
2836 int extra = 0; 2908 int extra = 0;
… …
2848 col = selection.beg.col; 2920 col = selection.beg.col;
2849 end_col = ncol + 1; 2921 end_col = ncol + 1;
2850 } 2922 }
2851 else 2923 else
2852#endif 2924#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2925 end_col = ROW(row).l;
2854 2926
2855 col = max (col, 0); 2927 col = max (col, 0);
2856 2928
2857 if (row == selection.end.row || selection.rect) 2929 if (row == selection.end.row
2930#if ENABLE_FRILLS
2931 || selection.rect
2932#endif
2933 )
2858 end_col = min (end_col, selection.end.col); 2934 min_it (end_col, selection.end.col);
2859 2935
2860 t = ROW(row).t + col; 2936 t = ROW(row).t + col;
2937
2861 for (; col < end_col; col++) 2938 for (; col < end_col; col++)
2862 { 2939 {
2863 if (*t == NOCHAR) 2940 if (*t == NOCHAR)
2864 t++; 2941 t++;
2865#if ENABLE_COMBINING 2942#if ENABLE_COMBINING
… …
2881#endif 2958#endif
2882 else 2959 else
2883 new_selection_text[ofs++] = *t++; 2960 new_selection_text[ofs++] = *t++;
2884 } 2961 }
2885 2962
2963#if ENABLE_FRILLS
2964 if (selection.rect)
2965 {
2966 while (ofs
2967 && new_selection_text[ofs - 1] != C0_LF
2968 && unicode::is_space (new_selection_text[ofs - 1]))
2969 --ofs;
2970
2971 new_selection_text[ofs++] = C0_LF;
2972 }
2973 else
2974#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 2975 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 2976 new_selection_text[ofs++] = C0_LF;
2888 } 2977 }
2889 2978
2890 if (end_col != selection.end.col) 2979 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 2980 new_selection_text[ofs++] = C0_LF;
2892 2981
… …
2902 2991
2903 // we usually allocate much more than necessary, so realloc it smaller again 2992 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 2993 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2994 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 2995
2996 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2997 return;
2998
2999 selection_grab (tm);
3000}
3001
3002bool
3003rxvt_term::selection_grab (Time tm)
3004{
3005 selection_time = tm;
3006
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 {
2909 display->set_selection_owner (this); 3010 display->set_selection_owner (this);
3011 return true;
3012 }
2910 else 3013 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3014 return false;
2912 3015
2913#if 0 3016#if 0
2914 XTextProperty ct; 3017 XTextProperty ct;
2915 3018
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3020 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3021 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3022 XFree (ct.value);
2920 } 3023 }
2921#endif 3024#endif
2922
2923 selection_time = tm;
2924} 3025}
2925 3026
2926/* ------------------------------------------------------------------------- */ 3027/* ------------------------------------------------------------------------- */
2927/* 3028/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3029 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3050 } 3151 }
3051 } 3152 }
3052 break; 3153 break;
3053 } 3154 }
3054 3155
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3156 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3157 col++; /* put us on one past the end */
3058 3158
3059 /* Poke the values back in */ 3159 /* Poke the values back in */
3060 ret->row = row; 3160 ret->row = row;
… …
3237 else if (selection.clicks == 2) 3337 else if (selection.clicks == 2)
3238 { 3338 {
3239 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3240 selection.end.col--; 3340 selection.end.col--;
3241 3341
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3242 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3345 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3244 } 3347 }
3245 else if (selection.clicks == 3) 3348 else if (selection.clicks == 3)
3246 { 3349 {
3247#if ENABLE_FRILLS 3350#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3351 if (OPTION (Opt_tripleclickwords))
3249 { 3352 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3353 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3354
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3355 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3356 {
… …
3314 { 3417 {
3315 stp = ROW(end_row).t; 3418 stp = ROW(end_row).t;
3316 3419
3317 while (--end_col >= 0) 3420 while (--end_col >= 0)
3318 { 3421 {
3319 if (stp[end_col] != ' ' 3422 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3423 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3424 break;
3323 } 3425 }
3324 3426
3325 if (end_col >= 0 3427 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3428 || !ROW(end_row - 1).is_longer ())
… …
3525 3627
3526#if ENABLE_OVERLAY 3628#if ENABLE_OVERLAY
3527void 3629void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3630rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3529{ 3631{
3530 if (nrow < 3 || ncol < 3) 3632 if (nrow < 1 || ncol < 1)
3531 return; 3633 return;
3532 3634
3533 want_refresh = 1; 3635 want_refresh = 1;
3534 3636
3535 scr_overlay_off (); 3637 scr_overlay_off ();
… …
3642 for (int y = ov_h; y--; ) 3744 for (int y = ov_h; y--; )
3643 { 3745 {
3644 text_t *t1 = ov_text[y]; 3746 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3747 rend_t *r1 = ov_rend[y];
3646 3748
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3649 3751
3650 for (int x = ov_w; x--; ) 3752 for (int x = ov_w; x--; )
3651 { 3753 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3754 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3755 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