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.215 by root, Sun Jan 8 06:35:23 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 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590 647
591 if ((options & Opt_scrollWithBuffer) 648 if (OPTION (Opt_scrollWithBuffer)
592 && view_start != 0 649 && view_start != 0
593 && view_start != saveLines) 650 && view_start != saveLines)
594 scr_page (UP, count); 651 scr_page (UP, count);
595 } 652 }
596 else 653 else
597 { 654 {
598 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
599 { 656 {
600 int i = selection.beg.row; 657 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 658 || (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) 659 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 660 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 661 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 662 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 663 {
610 CLEAR_ALL_SELECTION (); 664 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 665 selection.op = SELECTION_CLEAR;
612 } 666 }
613 else if (j >= row1 && j <= row2) 667 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 668 {
615 /* move selected region too */ 669 /* move selected region too */
616 selection.beg.row -= count; 670 selection.beg.row -= count;
617 selection.end.row -= count; 671 selection.end.row -= count;
618 selection.mark.row -= count; 672 selection.mark.row -= count;
… …
646/* ------------------------------------------------------------------------- */ 700/* ------------------------------------------------------------------------- */
647/* 701/*
648 * Add text given in <str> of length <len> to screen struct 702 * Add text given in <str> of length <len> to screen struct
649 */ 703 */
650void 704void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 706{
653 if (len <= 0) /* sanity */ 707 if (len <= 0) /* sanity */
654 return; 708 return;
655 709
656 unsigned char checksel; 710 unsigned char checksel;
657 unicode_t c; 711 unicode_t c;
658 int row, last_col; 712 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 713 const wchar_t *strend = str + len;
660 714
661 want_refresh = 1; 715 want_refresh = 1;
662 ZERO_SCROLLBACK (); 716 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 717
665 if (nlines > 0) 718 if (minlines > 0)
666 { 719 {
667 nlines += screen.cur.row - screen.bscroll; 720 minlines += screen.cur.row - screen.bscroll;
721
668 if (nlines > 0 722 if (minlines > 0
669 && screen.tscroll == 0 723 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 724 && screen.bscroll == nrow - 1)
671 { 725 {
672 /* _at least_ this many lines need to be scrolled */ 726 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 727 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 728 screen.cur.row -= minlines;
675 } 729 }
676 } 730 }
677 731
678#ifdef DEBUG_STRICT 732#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 733 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 734 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 735 && 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 736#endif
686 row = screen.cur.row; 737 int row = screen.cur.row;
687 738
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 739 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 740
690 line_t *line = &ROW(row); 741 line_t *line = &ROW(row);
691 742
692 while (str < strend) 743 while (str < strend)
693 { 744 {
694 c = *str++; 745 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 746
696 if (c < 0x20) 747 if (c < 0x20)
697 if (c == C0_LF) 748 if (c == C0_LF)
698 { 749 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
701 751
702 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
703 753
704 if (screen.cur.row == screen.bscroll) 754 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 755 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 759 line = &ROW(row); /* _must_ refresh */
710 continue; 760 continue;
711 } 761 }
712 else if (c == C0_CR) 762 else if (c == C0_CR)
713 { 763 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 764 max_it (line->l, screen.cur.col);
716 765
717 screen.flags &= ~Screen_WrapNext; 766 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 767 screen.cur.col = 0;
719 continue; 768 continue;
720 } 769 }
… …
737 CLEAR_SELECTION (); 786 CLEAR_SELECTION ();
738 } 787 }
739 788
740 if (screen.flags & Screen_WrapNext) 789 if (screen.flags & Screen_WrapNext)
741 { 790 {
791 max_it (line->l, ncol);
742 line->set_is_longer (); 792 line->is_longer (1);
743 793
744 scr_do_wrap (); 794 scr_do_wrap ();
745 795
746 row = screen.cur.row; 796 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 797 line = &ROW(row); /* _must_ refresh */
… …
755 // do wcwidth before further replacements, as wcwidth might return -1 805 // 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 806 // for the line drawing characters below as they might be invalid in the current
757 // locale. 807 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 808 int width = c < 0x100 ? 1 : wcwidth (c);
759 809
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 810 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 811 {
762 // vt100 special graphics and line drawing 812 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 813 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 814 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 815 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 867 }
818 868
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 870
821 // if the character doesn't fit into the remaining columns... 871 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 872 if (screen.cur.col > ncol - width && ncol >= width)
823 { 873 {
824 // ...output spaces 874 // ...output spaces
825 c = ' '; 875 c = ' ';
826 // and try the same character next loop iteration 876 // and try the same character next loop iteration
827 --str; 877 --str;
828 } 878 }
829 879
880 line->touch ();
881
830 do 882 do
831 { 883 {
832 line->t[screen.cur.col] = c; 884 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 885 line->r[screen.cur.col] = rend;
834 886
835 if (screen.cur.col < last_col - 1) 887 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 888 screen.cur.col++;
837 else 889 else
838 { 890 {
839 line->l = last_col; 891 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 892 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 893 screen.flags |= Screen_WrapNext;
842 break; 894 break;
843 } 895 }
844 896
… …
846 } 898 }
847 while (--width > 0); 899 while (--width > 0);
848 900
849 // pad with spaces when overwriting wide character with smaller one 901 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 902 if (!width)
903 {
904 line->touch ();
905
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 906 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 907 {
853 line->t[c] = ' '; 908 line->t[c] = ' ';
854 line->r[c] = rend; 909 line->r[c] = rend;
855 } 910 }
911 }
856 } 912 }
857 else // width == 0 913 else // width == 0
858 { 914 {
859#if ENABLE_COMBINING 915#if ENABLE_COMBINING
860 // handle combining characters 916 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 917 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 918 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 919 // we don't handle double-width characters nicely yet.
920 line_t *linep;
864 text_t *tp; 921 text_t *tp;
865 rend_t *rp; 922 rend_t *rp;
866 923
867 if (screen.cur.col > 0) 924 if (screen.cur.col > 0)
868 { 925 {
926 linep = line;
869 tp = line->t + screen.cur.col - 1; 927 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 928 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 929 }
875 else if (screen.cur.row > 0 930 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 931 && ROW(screen.cur.row - 1).is_longer ())
877 { 932 {
878 line_t *line = &ROW(screen.cur.row - 1); 933 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 934 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 935 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 936 }
886 else 937 else
887 continue; 938 continue;
939
940 linep->touch ();
941
942 while (*tp == NOCHAR && tp > linep->t)
943 tp--, rp--;
888 944
889 // first try to find a precomposed character 945 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 946 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 947 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 948 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 952#endif
897 } 953 }
898 } 954 }
899 955
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 956 max_it (line->l, screen.cur.col);
902 957
903#ifdef DEBUG_STRICT 958#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 959 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 960#endif
908} 961}
909 962
910/* ------------------------------------------------------------------------- */ 963/* ------------------------------------------------------------------------- */
911/* 964/*
… …
950 1003
951 if (count == 0) 1004 if (count == 0)
952 return; 1005 return;
953 else if (count > 0) 1006 else if (count > 0)
954 { 1007 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1008 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1009 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1010 ht &= l.t[i] == ' ';
960 1011
961 for (; ++i < ncol; ) 1012 for (; ++i < ncol; )
962 if (tabs[i]) 1013 if (tabs[i])
963 { 1014 {
964 x = i; 1015 x = i;
1016
965 if (!--count) 1017 if (!--count)
966 break; 1018 break;
967 } 1019 }
968 else 1020 else
969 ht &= l.t[i] == ' ' 1021 ht &= l.t[i] == ' '
… …
972 if (count) 1024 if (count)
973 x = ncol - 1; 1025 x = ncol - 1;
974 1026
975 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
978 { 1030 {
979 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
980 1032
981 if (!l.is_longer ()) /* XXX: think about this */ 1033 l.touch (x);
982 max_it (l.l, x);
983 1034
984 i = screen.cur.col; 1035 i = screen.cur.col;
985 1036
986 l.t[i] = '\t'; 1037 l.t[i] = '\t';
987 l.r[i] = base_rend; 1038 l.r[i] = base_rend;
… …
1037 */ 1088 */
1038#if ENABLE_FRILLS 1089#if ENABLE_FRILLS
1039void 1090void
1040rxvt_term::scr_forwardindex () 1091rxvt_term::scr_forwardindex ()
1041{ 1092{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1093 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1095 else
1047 { 1096 {
1048 row = screen.cur.row; 1097 line_t &l = ROW(screen.cur.row);
1049 1098
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1099 l.touch ();
1051 ROW(row).l = ncol; 1100 l.is_longer (0);
1052 1101
1053 scr_gotorc (0, 0, R_RELATIVE); 1102 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1103 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1104 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1105 }
… …
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1189 */
1141void 1190void
1142rxvt_term::scr_erase_line (int mode) 1191rxvt_term::scr_erase_line (int mode)
1143{ 1192{
1144 unsigned int row, col, num; 1193 unsigned int col, num;
1145 1194
1146 want_refresh = 1; 1195 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1196 ZERO_SCROLLBACK ();
1148 1197
1149 selection_check (1); 1198 selection_check (1);
1150 1199
1151 row = screen.cur.row; 1200 line_t &line = ROW(screen.cur.row);
1201
1202 line.touch ();
1203 line.is_longer (0);
1152 1204
1153 switch (mode) 1205 switch (mode)
1154 { 1206 {
1155 case 0: /* erase to end of line */ 1207 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1208 col = screen.cur.col;
1157 num = ncol - col; 1209 num = ncol - col;
1158 min_it (ROW(row).l, col); 1210 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1211 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1212 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1213 CLEAR_SELECTION ();
1162 break; 1214 break;
1163 case 1: /* erase to beginning of line */ 1215 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1220 CLEAR_SELECTION ();
1169 break; 1221 break;
1170 case 2: /* erase whole line */ 1222 case 2: /* erase whole line */
1171 col = 0; 1223 col = 0;
1172 num = ncol; 1224 num = ncol;
1173 ROW(row).l = 0; 1225 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1226 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1227 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1177 break; 1229 break;
1178 default: 1230 default:
1179 return; 1231 return;
1180 } 1232 }
1181 1233
1182 scr_blank_line (ROW(row), col, num, rstyle); 1234 scr_blank_line (line, col, num, rstyle);
1183} 1235}
1184 1236
1185/* ------------------------------------------------------------------------- */ 1237/* ------------------------------------------------------------------------- */
1186/* 1238/*
1187 * Erase part of whole of the screen 1239 * Erase part of whole of the screen
… …
1242 CLEAR_ROWS (row, num); 1294 CLEAR_ROWS (row, num);
1243 } 1295 }
1244 else 1296 else
1245 { 1297 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1298 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1300 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1301 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1302 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1303 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1304 }
1253 1305
1254 for (; num--; row++) 1306 for (; num--; row++)
1255 { 1307 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1308 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1309 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1310 }
1260} 1311}
1261 1312
1262#if ENABLE_FRILLS 1313#if ENABLE_FRILLS
… …
1295 rend_t *r1 = line.r; 1346 rend_t *r1 = line.r;
1296 1347
1297 for (int j = ncol; j--; ) 1348 for (int j = ncol; j--; )
1298 *r1++ = fs; 1349 *r1++ = fs;
1299 1350
1300 line.l = ncol; /* make the `E's selectable */ 1351 line.is_longer (0);
1352 line.touch (ncol);
1301 } 1353 }
1302} 1354}
1303 1355
1304/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1305/* 1357/*
… …
1353 min_it (count, ncol - screen.cur.col); 1405 min_it (count, ncol - screen.cur.col);
1354 1406
1355 row = screen.cur.row; 1407 row = screen.cur.row;
1356 1408
1357 line_t *line = &ROW(row); 1409 line_t *line = &ROW(row);
1410
1411 line->touch ();
1412 line->is_longer (0);
1358 1413
1359 switch (insdel) 1414 switch (insdel)
1360 { 1415 {
1361 case INSERT: 1416 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1417 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1418 {
1364 line->t[col] = line->t[col - count]; 1419 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1420 line->r[col] = line->r[col - count];
1366 } 1421 }
1367 1422
1368 if (!line->is_longer ()) 1423 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1424
1374 if (selection.op && current_screen == selection.screen 1425 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1426 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1427 {
1377 if (selection.end.row != screen.cur.row 1428 if (selection.end.row != screen.cur.row
… …
1390 1441
1391 case ERASE: 1442 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1443 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1444 selection_check (1);
1394 screen.cur.col -= count; 1445 screen.cur.col -= count;
1446
1447 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1448 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1449 break;
1397 1450
1398 case DELETE: 1451 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1452 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1455 {
1403 line->t[col] = line->t[col + count]; 1456 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1457 line->r[col] = line->r[col + count];
1405 } 1458 }
1406 1459
1460 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1461 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 1462
1414 if (selection.op && current_screen == selection.screen 1463 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1465 {
1417 if (selection.end.row != screen.cur.row 1466 if (selection.end.row != screen.cur.row
… …
1529rxvt_term::scr_set_tab (int mode) 1578rxvt_term::scr_set_tab (int mode)
1530{ 1579{
1531 if (mode < 0) 1580 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1581 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1582 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1583 tabs [screen.cur.col] = !!mode;
1535} 1584}
1536 1585
1537/* ------------------------------------------------------------------------- */ 1586/* ------------------------------------------------------------------------- */
1538/* 1587/*
1539 * Set reverse/normal video 1588 * Set reverse/normal video
… …
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1601#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1602 if (bgPixmap.pixmap == None)
1554#endif 1603#endif
1555#if TRANSPARENT 1604#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1606#endif
1558 XSetWindowBackground (display->display, vt, 1607 XSetWindowBackground (display->display, vt,
1559 pix_colors[Color_bg]); 1608 pix_colors[Color_bg]);
1560 1609
1561 gcvalue.foreground = pix_colors[Color_fg]; 1610 gcvalue.foreground = pix_colors[Color_fg];
… …
1586 * Set font style 1635 * Set font style
1587 */ 1636 */
1588void 1637void
1589rxvt_term::set_font_style () 1638rxvt_term::set_font_style ()
1590{ 1639{
1640#if 0
1591 switch (charsets[screen.charset]) 1641 switch (charsets [screen.charset])
1592 { 1642 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1643 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1644 break;
1595 case 'A': /* United Kingdom (UK) */ 1645 case 'A': /* United Kingdom (UK) */
1596 break; 1646 break;
… …
1603 case 'C': /* Finnish character set */ 1653 case 'C': /* Finnish character set */
1604 break; 1654 break;
1605 case 'K': /* German character set */ 1655 case 'K': /* German character set */
1606 break; 1656 break;
1607 } 1657 }
1658#endif
1608} 1659}
1609 1660
1610/* ------------------------------------------------------------------------- */ 1661/* ------------------------------------------------------------------------- */
1611/* 1662/*
1612 * Choose a font 1663 * Choose a font
… …
1691 y = 0; 1742 y = 0;
1692 eheight = height; 1743 eheight = height;
1693 } 1744 }
1694#endif 1745#endif
1695 1746
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 */ 1747 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1748 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1749 rc[PART_BEG].row = Pixel2Row (y);
1707 /* round up */ 1750 /* round up */
1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); 1751 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
… …
1787int 1830int
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1831rxvt_term::scr_changeview (unsigned int oldviewstart)
1789{ 1832{
1790 if (view_start != oldviewstart) 1833 if (view_start != oldviewstart)
1791 { 1834 {
1835 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1836
1792 want_refresh = 1; 1837 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart); 1838 num_scr -= (view_start - oldviewstart);
1794 } 1839 }
1795 1840
1796 return (int) (view_start - oldviewstart); 1841 return (int)view_start - (int)oldviewstart;
1797} 1842}
1798 1843
1799/* ------------------------------------------------------------------------- */ 1844/* ------------------------------------------------------------------------- */
1800void 1845void
1801rxvt_term::scr_bell () 1846rxvt_term::scr_bell ()
1802{ 1847{
1803#ifndef NO_BELL 1848#ifndef NO_BELL
1804 1849
1805# ifndef NO_MAPALERT 1850# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1851# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1852 if (OPTION (Opt_mapAlert))
1808# endif 1853# endif
1809 XMapWindow (display->display, parent[0]); 1854 XMapWindow (display->display, parent[0]);
1810# endif 1855# endif
1811 1856
1812 if (options & Opt_visualBell) 1857 if (OPTION (Opt_visualBell))
1813 { 1858 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1859 scr_rvideo_mode (!rvideo); /* refresh also done */
1815 rxvt_usleep (VISUAL_BELL_DURATION); 1860 rxvt_usleep (VISUAL_BELL_DURATION);
1816 scr_rvideo_mode (!rvideo); /* refresh also done */ 1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1817 } 1862 }
… …
1908 1953
1909#if XPM_BACKGROUND 1954#if XPM_BACKGROUND
1910 must_clear |= bgPixmap.pixmap != None; 1955 must_clear |= bgPixmap.pixmap != None;
1911#endif 1956#endif
1912#if TRANSPARENT 1957#if TRANSPARENT
1913 must_clear |= (options & Opt_transparent) && am_transparent; 1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1914#endif 1959#endif
1915 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1916 1961
1917 /* 1962 /*
1918 * B: reverse any characters which are selected 1963 * B: reverse any characters which are selected
… …
1942 1987
1943 crp = &ROW(screen.cur.row).r[col]; 1988 crp = &ROW(screen.cur.row).r[col];
1944 1989
1945 if (showcursor && focus) 1990 if (showcursor && focus)
1946 { 1991 {
1947 if (options & Opt_cursorUnderline) 1992 if (OPTION (Opt_cursorUnderline))
1948 *crp ^= RS_Uline; 1993 *crp ^= RS_Uline;
1949 else 1994 else
1950 { 1995 {
1951 *crp ^= RS_RVid; 1996 *crp ^= RS_RVid;
1952 1997
… …
1954 cc1 = *crp & (RS_fgMask | RS_bgMask); 1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
1955 if (ISSET_PIXCOLOR (Color_cursor)) 2000 if (ISSET_PIXCOLOR (Color_cursor))
1956 ccol1 = Color_cursor; 2001 ccol1 = Color_cursor;
1957 else 2002 else
1958#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1959 ccol1 = GET_FGCOLOR (rstyle); 2004 ccol1 = fgcolor_of (rstyle);
1960#else 2005#else
1961 ccol1 = Color_fg; 2006 ccol1 = Color_fg;
1962#endif 2007#endif
1963 if (ISSET_PIXCOLOR (Color_cursor2)) 2008 if (ISSET_PIXCOLOR (Color_cursor2))
1964 ccol2 = Color_cursor2; 2009 ccol2 = Color_cursor2;
1965 else 2010 else
1966#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1967 ccol2 = GET_BGCOLOR (rstyle); 2012 ccol2 = bgcolor_of (rstyle);
1968#else 2013#else
1969 ccol2 = Color_bg; 2014 ccol2 = Color_bg;
1970#endif 2015#endif
1971 *crp = SET_FGCOLOR (*crp, ccol1); 2016 *crp = SET_FGCOLOR (*crp, ccol1);
1972 *crp = SET_BGCOLOR (*crp, ccol2); 2017 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2005 oldcursor.col = screen.cur.col; 2050 oldcursor.col = screen.cur.col;
2006 } 2051 }
2007 } 2052 }
2008 } 2053 }
2009 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2010#if ENABLE_OVERLAY 2056#if ENABLE_OVERLAY
2011 scr_swap_overlay (); 2057 scr_swap_overlay ();
2012#endif 2058#endif
2013 2059
2014#ifndef NO_SLOW_LINK_SUPPORT 2060#ifndef NO_SLOW_LINK_SUPPORT
… …
2064 if (wlen < len) 2110 if (wlen < len)
2065 ::swap (wlen, len); 2111 ::swap (wlen, len);
2066 2112
2067 XCopyArea (display->display, vt, vt, 2113 XCopyArea (display->display, vt, vt,
2068 gc, 0, Row2Pixel (len + i), 2114 gc, 0, Row2Pixel (len + i),
2069 (unsigned int)TermWin_TotalWidth (), 2115 (unsigned int)this->width,
2070 (unsigned int)Height2Pixel (wlen - len + 1), 2116 (unsigned int)Height2Pixel (wlen - len + 1),
2071 0, Row2Pixel (len)); 2117 0, Row2Pixel (len));
2072 len = -1; 2118 len = -1;
2073 } 2119 }
2074 } 2120 }
… …
2153 count++, i--; 2199 count++, i--;
2154 2200
2155 /* 2201 /*
2156 * Determine the attributes for the string 2202 * Determine the attributes for the string
2157 */ 2203 */
2158 int fore = GET_FGCOLOR (rend); // desired foreground 2204 int fore = fgcolor_of (rend); // desired foreground
2159 int back = GET_BGCOLOR (rend); // desired background 2205 int back = bgcolor_of (rend); // desired background
2160 2206
2161 // only do special processing if any attributes are set, which is rare 2207 // 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)) 2208 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2163 { 2209 {
2164#if ENABLE_STYLES 2210#if ENABLE_STYLES
2165 // force redraw after "careful" characters to avoid pixel droppings 2211 // force redraw after "careful" characters to avoid pixel droppings
2166 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2277 } /* for (row....) */ 2323 } /* for (row....) */
2278 2324
2279#if ENABLE_OVERLAY 2325#if ENABLE_OVERLAY
2280 scr_swap_overlay (); 2326 scr_swap_overlay ();
2281#endif 2327#endif
2328 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2282 2329
2283 /* 2330 /*
2284 * G: cleanup cursor and display outline cursor if necessary 2331 * G: cleanup cursor and display outline cursor if necessary
2285 */ 2332 */
2286 if (showcursor) 2333 if (showcursor)
2287 { 2334 {
2288 if (focus) 2335 if (focus)
2289 { 2336 {
2290 if (options & Opt_cursorUnderline) 2337 if (OPTION (Opt_cursorUnderline))
2291 *crp ^= RS_Uline; 2338 *crp ^= RS_Uline;
2292 else 2339 else
2293 { 2340 {
2294 *crp ^= RS_RVid; 2341 *crp ^= RS_RVid;
2295#ifndef NO_CURSORCOLOR 2342#ifndef NO_CURSORCOLOR
… …
2333 num_scr = 0; 2380 num_scr = 0;
2334 num_scr_allow = 1; 2381 num_scr_allow = 1;
2335} 2382}
2336 2383
2337void 2384void
2338rxvt_term::scr_remap_chars (const line_t &l) 2385rxvt_term::scr_remap_chars (line_t &l)
2339{ 2386{
2340 if (!l.t) 2387 if (!l.t)
2341 return; 2388 return;
2389
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2342 2391
2343 for (int i = ncol; i--; ) 2392 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2393 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2394}
2346 2395
… …
2414 2463
2415#if ENABLE_FRILLS 2464#if ENABLE_FRILLS
2416 if (selection.rect) 2465 if (selection.rect)
2417 { 2466 {
2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2468 {
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2472 for (col = selection.beg.col; col < selection.end.col; col++)
2420 srp[col] ^= RS_RVid; 2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2421 } 2481 }
2422 else 2482 else
2423#endif 2483#endif
2424 { 2484 {
2425 if (selection.beg.row >= -view_start) 2485 if (selection.beg.row >= -view_start)
… …
2428 row = selection.beg.row; 2488 row = selection.beg.row;
2429 } 2489 }
2430 else 2490 else
2431 { 2491 {
2432 col = 0; 2492 col = 0;
2433 row = view_start; 2493 row = -view_start;
2434 } 2494 }
2435 2495
2436 for (; row < min (selection.end.row, view_end); row++, col = 0) 2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid; 2498 srp[col] ^= RS_RVid;
… …
2509/* ------------------------------------------------------------------------- */ 2569/* ------------------------------------------------------------------------- */
2510/* 2570/*
2511 * Paste a selection direct to the command fd 2571 * Paste a selection direct to the command fd
2512 */ 2572 */
2513void 2573void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2574rxvt_term::paste (char *data, unsigned int len)
2515{ 2575{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2576 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2577 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2578 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2579 data[i] = C0_CR;
… …
2663 { 2723 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2725 char *s = rxvt_wcstombs (w);
2666 free (w); 2726 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2727 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2728 paste (s, strlen (s));
2669 free (s); 2729 free (s);
2670 } 2730 }
2671 else 2731 else
2672#endif 2732#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2734 && cl)
2675 { 2735 {
2676 for (int i = 0; i < cr; i++) 2736 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2737 paste (cl[i], strlen (cl[i]));
2678 2738
2679 XFreeStringList (cl); 2739 XFreeStringList (cl);
2680 } 2740 }
2681 else 2741 else
2682 paste (ct.value, ct.nitems); // paste raw 2742 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2743
2684bailout: 2744bailout:
2685 XFree (ct.value); 2745 XFree (ct.value);
2686 2746
2687 if (selection_wait == Sel_normal) 2747 if (selection_wait == Sel_normal)
… …
2725 return; /* outside window */ 2785 return; /* outside window */
2726 2786
2727 if (selection.text) 2787 if (selection.text)
2728 { /* internal selection */ 2788 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2789 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2790 paste (str, strlen (str));
2731 free (str); 2791 free (str);
2732 return; 2792 return;
2733 } 2793 }
2734 else 2794 else
2735 { 2795 {
… …
2827 selection.op = SELECTION_DONE; 2887 selection.op = SELECTION_DONE;
2828 2888
2829 if (selection.clicks == 4) 2889 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2890 return; /* nothing selected, go away */
2831 2891
2892 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2893 return;
2894
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2895 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2896 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2897
2835 int ofs = 0; 2898 int ofs = 0;
2836 int extra = 0; 2899 int extra = 0;
… …
2848 col = selection.beg.col; 2911 col = selection.beg.col;
2849 end_col = ncol + 1; 2912 end_col = ncol + 1;
2850 } 2913 }
2851 else 2914 else
2852#endif 2915#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2916 end_col = ROW(row).l;
2854 2917
2855 col = max (col, 0); 2918 col = max (col, 0);
2856 2919
2857 if (row == selection.end.row || selection.rect) 2920 if (row == selection.end.row
2921#if ENABLE_FRILLS
2922 || selection.rect
2923#endif
2924 )
2858 end_col = min (end_col, selection.end.col); 2925 min_it (end_col, selection.end.col);
2859 2926
2860 t = ROW(row).t + col; 2927 t = ROW(row).t + col;
2928
2861 for (; col < end_col; col++) 2929 for (; col < end_col; col++)
2862 { 2930 {
2863 if (*t == NOCHAR) 2931 if (*t == NOCHAR)
2864 t++; 2932 t++;
2865#if ENABLE_COMBINING 2933#if ENABLE_COMBINING
… …
2881#endif 2949#endif
2882 else 2950 else
2883 new_selection_text[ofs++] = *t++; 2951 new_selection_text[ofs++] = *t++;
2884 } 2952 }
2885 2953
2954#if ENABLE_FRILLS
2955 if (selection.rect)
2956 {
2957 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1]))
2960 --ofs;
2961
2962 new_selection_text[ofs++] = C0_LF;
2963 }
2964 else
2965#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 2966 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 2967 new_selection_text[ofs++] = C0_LF;
2888 } 2968 }
2889 2969
2890 if (end_col != selection.end.col) 2970 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 2971 new_selection_text[ofs++] = C0_LF;
2892 2972
… …
2902 2982
2903 // we usually allocate much more than necessary, so realloc it smaller again 2983 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 2984 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2985 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 2986
2987 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2988 return;
2989
2990 selection_grab (tm);
2991}
2992
2993bool
2994rxvt_term::selection_grab (Time tm)
2995{
2996 selection_time = tm;
2997
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3000 {
2909 display->set_selection_owner (this); 3001 display->set_selection_owner (this);
3002 return true;
3003 }
2910 else 3004 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3005 return false;
2912 3006
2913#if 0 3007#if 0
2914 XTextProperty ct; 3008 XTextProperty ct;
2915 3009
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3011 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3013 XFree (ct.value);
2920 } 3014 }
2921#endif 3015#endif
2922
2923 selection_time = tm;
2924} 3016}
2925 3017
2926/* ------------------------------------------------------------------------- */ 3018/* ------------------------------------------------------------------------- */
2927/* 3019/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3020 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3050 } 3142 }
3051 } 3143 }
3052 break; 3144 break;
3053 } 3145 }
3054 3146
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3147 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3148 col++; /* put us on one past the end */
3058 3149
3059 /* Poke the values back in */ 3150 /* Poke the values back in */
3060 ret->row = row; 3151 ret->row = row;
… …
3237 else if (selection.clicks == 2) 3328 else if (selection.clicks == 2)
3238 { 3329 {
3239 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3240 selection.end.col--; 3331 selection.end.col--;
3241 3332
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3242 selection_delimit_word (UP, &selection.beg, &selection.beg); 3335 selection_delimit_word (UP, &selection.beg, &selection.beg);
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3336 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3244 } 3338 }
3245 else if (selection.clicks == 3) 3339 else if (selection.clicks == 3)
3246 { 3340 {
3247#if ENABLE_FRILLS 3341#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3342 if (OPTION (Opt_tripleclickwords))
3249 { 3343 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3344 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3345
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3347 {
… …
3314 { 3408 {
3315 stp = ROW(end_row).t; 3409 stp = ROW(end_row).t;
3316 3410
3317 while (--end_col >= 0) 3411 while (--end_col >= 0)
3318 { 3412 {
3319 if (stp[end_col] != ' ' 3413 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3414 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3415 break;
3323 } 3416 }
3324 3417
3325 if (end_col >= 0 3418 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3419 || !ROW(end_row - 1).is_longer ())
… …
3525 3618
3526#if ENABLE_OVERLAY 3619#if ENABLE_OVERLAY
3527void 3620void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3621rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3529{ 3622{
3530 if (nrow < 3 || ncol < 3) 3623 if (nrow < 1 || ncol < 1)
3531 return; 3624 return;
3532 3625
3533 want_refresh = 1; 3626 want_refresh = 1;
3534 3627
3535 scr_overlay_off (); 3628 scr_overlay_off ();
… …
3642 for (int y = ov_h; y--; ) 3735 for (int y = ov_h; y--; )
3643 { 3736 {
3644 text_t *t1 = ov_text[y]; 3737 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3738 rend_t *r1 = ov_rend[y];
3646 3739
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3649 3742
3650 for (int x = ov_w; x--; ) 3743 for (int x = ov_w; x--; )
3651 { 3744 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3745 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3746 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