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.224 by root, Thu Jan 12 03:32:56 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 * ------------------------------------------------------------------------- */
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 nsaved = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
239 { 243 {
240 /* 244 /*
241 * add or delete rows as appropriate 245 * add or delete rows as appropriate
242 */ 246 */
243 247
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)); 248 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)); 249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248 250
249#if 0 251#if 0
250 if (nrow < prev_nrow) 252 if (nrow < prev_nrow)
… …
255 lfree (drawn_buf[row]); 257 lfree (drawn_buf[row]);
256 } 258 }
257 } 259 }
258#endif 260#endif
259 261
260 drawn_buf = (line_t *) rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 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)); 263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
263 264
264 for (int row = min (nrow, prev_nrow); row--; ) 265 for (int row = min (nrow, prev_nrow); row--; )
265 { 266 {
266 lresize (drawn_buf[row]); 267 lresize (drawn_buf[row]);
267 lresize (swap_buf [row]); 268 lresize (swap_buf [row]);
… …
271 { 272 {
272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 275 }
275 276
277 line_t *old_buf = row_buf;
276 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 279
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 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
282 int pend = MOD (term_start - nsaved, prev_total_rows); 281 int pend = MOD (term_start - nsaved , prev_total_rows);
283 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
284 283
285 while (p != pend && q > 0) 284 if (nsaved)
285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm.
288
289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291
286 { 292 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 { 293 {
296 p = MOD (p - 1, prev_total_rows); 294 p = MOD (p - 1, prev_total_rows);
297 295#ifdef DEBUG_STRICT
298 llen += prev_ncol; 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299 } 297#endif
300
301 int qlines = llen / ncol + 1;
302 int lofs = 0; 298 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 300
304 q -= qlines; 301 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 { 302 {
303 p = MOD (p - 1, prev_total_rows);
304
305 plines++;
306 llen += prev_ncol;
307 }
308
309 int qlines = max (0, (llen - 1) / ncol) + 1;
310
311 // drop partial lines completely
312 if (q < qlines)
313 break;
314
315 q -= qlines;
316
317 int lofs = 0;
318 line_t *qline;
319
320 // re-assemble the full line by destination lines
321 for (int qrow = q; qlines--; qrow++)
322 {
312 line_t &qline = row_buf [qrow]; 323 qline = row_buf + qrow;
313
314 lalloc (qline); 324 lalloc (*qline);
325 qline->l = ncol;
315 qline.set_is_longer (); 326 qline->is_longer (1);
316 327
317 int qcol = 0; 328 int qcol = 0;
318 329
319 for (;;) 330 // fill a single destination line
331 while (lofs < llen && qcol < ncol)
320 { 332 {
321 int prow = lofs / prev_ncol + p; 333 int prow = lofs / prev_ncol;
322 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
323 335
336 prow = MOD (p + prow, prev_total_rows);
337
338 // we only adjust the cursor _row_ and put it into
339 // the topmost line of "long line" it was in, as
340 // this seems to upset applications/shells/readline
341 // least.
342 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow);
344
324 line_t &pline = old_buf [p]; 345 line_t &pline = old_buf [prow];
325 346
326 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
327 348
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); 349 assert (len);
350 assert (pline.t);
338 351
339 memcpy (qline.t + qcol, pline.t + pcol, len * sizeof (text_t)); 352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
340 memcpy (qline.r + qcol, pline.r + pcol, len * sizeof (rend_t)); 353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
341 354
342 lofs += len; 355 lofs += len;
343 qcol += len; 356 qcol += len;
344
345 if (qcol == ncol)
346 break;
347 } 357 }
348 } 358 }
349 else 359
350 lofs += ncol; 360 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
361 qline->is_longer (0);
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
351 } 363 }
364 while (p != pend && q > 0);
365
366 term_start = total_rows - nrow;
367 nsaved = term_start - q;
368
369 // make sure all terminal lines exist
370 while (nsaved < 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
372 }
373 else
352 } 374 {
375 // if no scrollback exists (yet), wing, instead of wrap
376
377 for (int row = min (nrow, prev_nrow); row--; )
378 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row];
381
382 qline = pline;
383 lresize (qline);
384 }
385
386 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390
391 term_start = 0;
392 }
393
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
353 398
354 free (old_buf); 399 free (old_buf);
355 delete old_ta; 400 delete old_ta;
356 delete old_ra; 401 delete old_ra;
357 402
358 min_it (screen.cur.row, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
359 min_it (screen.cur.col, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
360 405
361 if (tabs) 406 if (tabs)
362 free (tabs); 407 free (tabs);
363 } 408 }
364 409
… …
369 414
370 for (int col = ncol; col--; ) 415 for (int col = ncol; col--; )
371 tabs [col] = col % TABSIZE == 0; 416 tabs [col] = col % TABSIZE == 0;
372 417
373 tt_winch (); 418 tt_winch ();
419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
374} 421}
375 422
376/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
377/* 424/*
378 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
… …
384 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
385 432
386 free (row_buf); 433 free (row_buf);
387 free (swap_buf); 434 free (swap_buf);
388 free (drawn_buf); 435 free (drawn_buf);
389 free (temp_buf);
390 free (tabs); 436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays
391} 439}
392 440
393/* ------------------------------------------------------------------------- */ 441/* ------------------------------------------------------------------------- */
394/* 442/*
395 * Hard reset 443 * Hard reset
… …
451 min_it (s->cur.row, nrow - 1); 499 min_it (s->cur.row, nrow - 1);
452 min_it (s->cur.col, ncol - 1); 500 min_it (s->cur.col, ncol - 1);
453#ifdef DEBUG_STRICT 501#ifdef DEBUG_STRICT
454 assert (s->cur.row >= 0); 502 assert (s->cur.row >= 0);
455 assert (s->cur.col >= 0); 503 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 504#endif
460} 505}
461 506
462/* ------------------------------------------------------------------------- */ 507/* ------------------------------------------------------------------------- */
463/* 508/*
… …
483 528
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 531
487#if NSCREENS 532#if NSCREENS
488 if (options & Opt_secondaryScreen) 533 if (OPTION (Opt_secondaryScreen))
489 { 534 {
490 num_scr = 0; 535 num_scr = 0;
491 536
492 for (int i = nrow; i--; ) 537 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 538 ::swap (ROW(i), swap_buf [i]);
494 539
495 ::swap (screen.charset, swap.charset); 540 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 541 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 542 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 543 swap.flags |= Screen_VisibleCursor;
499 } 544 }
500 else 545 else
501#endif 546#endif
502 if (options & Opt_secondaryScroll) 547 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 548 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 549
505 return scrn; 550 return scrn;
506} 551}
507 552
… …
527 * Change the colour for following text 572 * Change the colour for following text
528 */ 573 */
529void 574void
530rxvt_term::scr_color (unsigned int color, int fgbg) 575rxvt_term::scr_color (unsigned int color, int fgbg)
531{ 576{
532 if (color > maxTermCOLOR) 577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 578 color = fgbg;
534 579
535 if (fgbg == Color_fg) 580 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 581 rstyle = SET_FGCOLOR (rstyle, color);
537 else 582 else
… …
569 num_scr += count; 614 num_scr += count;
570 615
571 if (count > 0 616 if (count > 0
572 && row1 == 0 617 && row1 == 0
573 && row2 == nrow - 1 618 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 620 {
576 nsaved = min (nsaved + count, saveLines); 621 nsaved = min (nsaved + count, saveLines);
622
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
624
577 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
578 626
579 if (selection.op && current_screen == selection.screen) 627 if (selection.op && current_screen == selection.screen)
580 { 628 {
581 selection.beg.row -= count; 629 selection.beg.row -= count;
582 selection.end.row -= count; 630 selection.end.row -= count;
583 selection.mark.row -= count; 631 selection.mark.row -= count;
584 632
585 selection_check (0); 633 if (selection.beg.row < -nsaved
634 || selection.end.row < -nsaved
635 || selection.mark.row < -nsaved)
636 {
637 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR;
639 }
586 } 640 }
587 641
588 for (int i = count; i--; ) 642 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle); 643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
590 653
591 if ((options & Opt_scrollWithBuffer) 654 if (OPTION (Opt_scrollWithBuffer)
592 && view_start != 0 655 && view_start != 0
593 && view_start != saveLines) 656 && view_start != saveLines)
594 scr_page (UP, count); 657 scr_page (UP, count);
595 } 658 }
596 else 659 else
597 { 660 {
598 if (selection.op && current_screen == selection.screen) 661 if (selection.op && current_screen == selection.screen)
599 { 662 {
600 int i = selection.beg.row; 663 if ((selection.beg.row < row1 && selection.end.row > row1)
601 int j = selection.end.row; 664 || (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) 665 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
606 || (i - count > row2 && i <= row2) 666 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
607 || (j - count < row1 && j >= row1) 667 || (selection.end.row - count < row1 && selection.end.row >= row1)
608 || (j - count > row2 && j <= row2)) 668 || (selection.end.row - count > row2 && selection.end.row <= row2))
609 { 669 {
610 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
612 } 672 }
613 else if (j >= row1 && j <= row2) 673 else if (selection.end.row >= row1 && selection.end.row <= row2)
614 { 674 {
615 /* move selected region too */ 675 /* move selected region too */
616 selection.beg.row -= count; 676 selection.beg.row -= count;
617 selection.end.row -= count; 677 selection.end.row -= count;
618 selection.mark.row -= count; 678 selection.mark.row -= count;
… …
626 686
627 int rows = row2 - row1 + 1; 687 int rows = row2 - row1 + 1;
628 688
629 min_it (count, rows); 689 min_it (count, rows);
630 690
691 line_t *temp_buf = row_buf + total_rows;
692
631 for (int row = 0; row < rows; row++) 693 for (int row = 0; row < rows; row++)
632 { 694 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 695 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 696
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 697 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 708/* ------------------------------------------------------------------------- */
647/* 709/*
648 * Add text given in <str> of length <len> to screen struct 710 * Add text given in <str> of length <len> to screen struct
649 */ 711 */
650void 712void
651rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
652{ 714{
653 if (len <= 0) /* sanity */ 715 if (len <= 0) /* sanity */
654 return; 716 return;
655 717
656 unsigned char checksel; 718 unsigned char checksel;
657 unicode_t c; 719 unicode_t c;
658 int row, last_col; 720 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 721 const wchar_t *strend = str + len;
660 722
661 want_refresh = 1; 723 want_refresh = 1;
662 ZERO_SCROLLBACK (); 724 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 725
665 if (nlines > 0) 726 if (minlines > 0)
666 { 727 {
667 nlines += screen.cur.row - screen.bscroll; 728 minlines += screen.cur.row - screen.bscroll;
729
668 if (nlines > 0 730 if (minlines > 0
669 && screen.tscroll == 0 731 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 732 && screen.bscroll == nrow - 1)
671 { 733 {
672 /* _at least_ this many lines need to be scrolled */ 734 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 735 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 736 screen.cur.row -= minlines;
675 } 737 }
676 } 738 }
677 739
678#ifdef DEBUG_STRICT 740#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 741 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 742 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 743 && 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 744#endif
686 row = screen.cur.row; 745 int row = screen.cur.row;
687 746
688 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 747 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
689 748
690 line_t *line = &ROW(row); 749 line_t *line = &ROW(row);
691 750
692 while (str < strend) 751 while (str < strend)
693 { 752 {
694 c = *str++; 753 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
695 754
696 if (c < 0x20) 755 if (c < 0x20)
697 if (c == C0_LF) 756 if (c == C0_LF)
698 { 757 {
699 if (!line->is_longer ()) /* XXX: think about this */
700 max_it (line->l, screen.cur.col); 758 max_it (line->l, screen.cur.col);
701 759
702 screen.flags &= ~Screen_WrapNext; 760 screen.flags &= ~Screen_WrapNext;
703 761
704 if (screen.cur.row == screen.bscroll) 762 if (screen.cur.row == screen.bscroll)
705 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 763 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
709 line = &ROW(row); /* _must_ refresh */ 767 line = &ROW(row); /* _must_ refresh */
710 continue; 768 continue;
711 } 769 }
712 else if (c == C0_CR) 770 else if (c == C0_CR)
713 { 771 {
714 if (!line->is_longer ()) /* XXX: think about this */
715 max_it (line->l, screen.cur.col); 772 max_it (line->l, screen.cur.col);
716 773
717 screen.flags &= ~Screen_WrapNext; 774 screen.flags &= ~Screen_WrapNext;
718 screen.cur.col = 0; 775 screen.cur.col = 0;
719 continue; 776 continue;
720 } 777 }
… …
737 CLEAR_SELECTION (); 794 CLEAR_SELECTION ();
738 } 795 }
739 796
740 if (screen.flags & Screen_WrapNext) 797 if (screen.flags & Screen_WrapNext)
741 { 798 {
799 max_it (line->l, ncol);
742 line->set_is_longer (); 800 line->is_longer (1);
743 801
744 scr_do_wrap (); 802 scr_do_wrap ();
745 803
746 row = screen.cur.row; 804 row = screen.cur.row;
747 line = &ROW(row); /* _must_ refresh */ 805 line = &ROW(row); /* _must_ refresh */
… …
755 // do wcwidth before further replacements, as wcwidth might return -1 813 // 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 814 // for the line drawing characters below as they might be invalid in the current
757 // locale. 815 // locale.
758 int width = c < 0x100 ? 1 : wcwidth (c); 816 int width = c < 0x100 ? 1 : wcwidth (c);
759 817
760 if (charsets[screen.charset] == '0') // DEC SPECIAL 818 if (charsets [screen.charset] == '0') // DEC SPECIAL
761 { 819 {
762 // vt100 special graphics and line drawing 820 // vt100 special graphics and line drawing
763 // 5f-7e standard vt100 821 // 5f-7e standard vt100
764 // 40-5e rxvt extension for extra curses acs chars 822 // 40-5e rxvt extension for extra curses acs chars
765 static uint16_t vt100_0[62] = { // 41 .. 7e 823 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
817 } 875 }
818 876
819 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 877 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
820 878
821 // if the character doesn't fit into the remaining columns... 879 // if the character doesn't fit into the remaining columns...
822 if (screen.cur.col > last_col - width && last_col >= width) 880 if (screen.cur.col > ncol - width && ncol >= width)
823 { 881 {
824 // ...output spaces 882 // ...output spaces
825 c = ' '; 883 c = ' ';
826 // and try the same character next loop iteration 884 // and try the same character next loop iteration
827 --str; 885 --str;
828 } 886 }
829 887
888 line->touch ();
889
830 do 890 do
831 { 891 {
832 line->t[screen.cur.col] = c; 892 line->t[screen.cur.col] = c;
833 line->r[screen.cur.col] = rend; 893 line->r[screen.cur.col] = rend;
834 894
835 if (screen.cur.col < last_col - 1) 895 if (screen.cur.col < ncol - 1)
836 screen.cur.col++; 896 screen.cur.col++;
837 else 897 else
838 { 898 {
839 line->l = last_col; 899 line->l = ncol;
840 if (screen.flags & Screen_Autowrap) 900 if (screen.flags & Screen_Autowrap)
841 screen.flags |= Screen_WrapNext; 901 screen.flags |= Screen_WrapNext;
842 break; 902 break;
843 } 903 }
844 904
… …
846 } 906 }
847 while (--width > 0); 907 while (--width > 0);
848 908
849 // pad with spaces when overwriting wide character with smaller one 909 // pad with spaces when overwriting wide character with smaller one
850 if (!width) 910 if (!width)
911 {
912 line->touch ();
913
851 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 914 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
852 { 915 {
853 line->t[c] = ' '; 916 line->t[c] = ' ';
854 line->r[c] = rend; 917 line->r[c] = rend;
855 } 918 }
919 }
856 } 920 }
857 else // width == 0 921 else // width == 0
858 { 922 {
859#if ENABLE_COMBINING 923#if ENABLE_COMBINING
860 // handle combining characters 924 // handle combining characters
861 // we just tag the accent on the previous on-screen character. 925 // we just tag the accent on the previous on-screen character.
862 // this is arguably not correct, but also arguably not wrong. 926 // this is arguably not correct, but also arguably not wrong.
863 // we don't handle double-width characters nicely yet. 927 // we don't handle double-width characters nicely yet.
928 line_t *linep;
864 text_t *tp; 929 text_t *tp;
865 rend_t *rp; 930 rend_t *rp;
866 931
867 if (screen.cur.col > 0) 932 if (screen.cur.col > 0)
868 { 933 {
934 linep = line;
869 tp = line->t + screen.cur.col - 1; 935 tp = line->t + screen.cur.col - 1;
870 rp = line->r + screen.cur.col - 1; 936 rp = line->r + screen.cur.col - 1;
871
872 while (*tp == NOCHAR && tp > line->t)
873 tp--, rp--;
874 } 937 }
875 else if (screen.cur.row > 0 938 else if (screen.cur.row > 0
876 && ROW(screen.cur.row - 1).is_longer ()) 939 && ROW(screen.cur.row - 1).is_longer ())
877 { 940 {
878 line_t *line = &ROW(screen.cur.row - 1); 941 linep = &ROW(screen.cur.row - 1);
879
880 tp = line->t + last_col - 1; 942 tp = line->t + ncol - 1;
881 rp = line->r + last_col - 1; 943 rp = line->r + ncol - 1;
882
883 while (*tp == NOCHAR && tp > line->t)
884 tp--, rp--;
885 } 944 }
886 else 945 else
887 continue; 946 continue;
947
948 linep->touch ();
949
950 while (*tp == NOCHAR && tp > linep->t)
951 tp--, rp--;
888 952
889 // first try to find a precomposed character 953 // first try to find a precomposed character
890 unicode_t n = rxvt_compose (*tp, c); 954 unicode_t n = rxvt_compose (*tp, c);
891 if (n == NOCHAR) 955 if (n == NOCHAR)
892 n = rxvt_composite.compose (*tp, c); 956 n = rxvt_composite.compose (*tp, c);
… …
895 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 959 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
896#endif 960#endif
897 } 961 }
898 } 962 }
899 963
900 if (!line->is_longer ()) /* XXX: think about this */
901 max_it (line->l, screen.cur.col); 964 max_it (line->l, screen.cur.col);
902 965
903#ifdef DEBUG_STRICT 966#ifdef DEBUG_STRICT
904 assert (screen.cur.row >= 0); 967 assert (screen.cur.row >= 0);
905#else /* drive with your eyes closed */
906 max_it (screen.cur.row, 0);
907#endif 968#endif
908} 969}
909 970
910/* ------------------------------------------------------------------------- */ 971/* ------------------------------------------------------------------------- */
911/* 972/*
… …
950 1011
951 if (count == 0) 1012 if (count == 0)
952 return; 1013 return;
953 else if (count > 0) 1014 else if (count > 0)
954 { 1015 {
955 int row = screen.cur.row;
956
957 line_t &l = ROW(row); 1016 line_t &l = ROW(screen.cur.row);
958 rend_t base_rend = l.r[i]; 1017 rend_t base_rend = l.r[i];
959 ht &= l.t[i] == ' '; 1018 ht &= l.t[i] == ' ';
960 1019
961 for (; ++i < ncol; ) 1020 for (; ++i < ncol; )
962 if (tabs[i]) 1021 if (tabs[i])
963 { 1022 {
964 x = i; 1023 x = i;
1024
965 if (!--count) 1025 if (!--count)
966 break; 1026 break;
967 } 1027 }
968 else 1028 else
969 ht &= l.t[i] == ' ' 1029 ht &= l.t[i] == ' '
… …
972 if (count) 1032 if (count)
973 x = ncol - 1; 1033 x = ncol - 1;
974 1034
975 // store horizontal tab commands as characters inside the text 1035 // store horizontal tab commands as characters inside the text
976 // buffer so they can be selected and pasted. 1036 // buffer so they can be selected and pasted.
977 if (ht && options & Opt_pastableTabs) 1037 if (ht && OPTION (Opt_pastableTabs))
978 { 1038 {
979 base_rend = SET_FONT (base_rend, 0); 1039 base_rend = SET_FONT (base_rend, 0);
980 1040
981 if (!l.is_longer ()) /* XXX: think about this */ 1041 l.touch (x);
982 max_it (l.l, x);
983 1042
984 i = screen.cur.col; 1043 i = screen.cur.col;
985 1044
986 l.t[i] = '\t'; 1045 l.t[i] = '\t';
987 l.r[i] = base_rend; 1046 l.r[i] = base_rend;
… …
1037 */ 1096 */
1038#if ENABLE_FRILLS 1097#if ENABLE_FRILLS
1039void 1098void
1040rxvt_term::scr_forwardindex () 1099rxvt_term::scr_forwardindex ()
1041{ 1100{
1042 int row;
1043
1044 if (screen.cur.col < ncol - 1) 1101 if (screen.cur.col < ncol - 1)
1045 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1046 else 1103 else
1047 { 1104 {
1048 row = screen.cur.row; 1105 line_t &l = ROW(screen.cur.row);
1049 1106
1050 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1107 l.touch ();
1051 ROW(row).l = ncol; 1108 l.is_longer (0);
1052 1109
1053 scr_gotorc (0, 0, R_RELATIVE); 1110 scr_gotorc (0, 0, R_RELATIVE);
1054 scr_insdel_chars (1, DELETE); 1111 scr_insdel_chars (1, DELETE);
1055 scr_gotorc (0, ncol - 1, R_RELATIVE); 1112 scr_gotorc (0, ncol - 1, R_RELATIVE);
1056 } 1113 }
… …
1139 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1140 */ 1197 */
1141void 1198void
1142rxvt_term::scr_erase_line (int mode) 1199rxvt_term::scr_erase_line (int mode)
1143{ 1200{
1144 unsigned int row, col, num; 1201 unsigned int col, num;
1145 1202
1146 want_refresh = 1; 1203 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1204 ZERO_SCROLLBACK ();
1148 1205
1149 selection_check (1); 1206 selection_check (1);
1150 1207
1151 row = screen.cur.row; 1208 line_t &line = ROW(screen.cur.row);
1209
1210 line.touch ();
1211 line.is_longer (0);
1152 1212
1153 switch (mode) 1213 switch (mode)
1154 { 1214 {
1155 case 0: /* erase to end of line */ 1215 case 0: /* erase to end of line */
1156 col = screen.cur.col; 1216 col = screen.cur.col;
1157 num = ncol - col; 1217 num = ncol - col;
1158 min_it (ROW(row).l, col); 1218 min_it (line.l, col);
1159 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1219 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1160 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1220 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1161 CLEAR_SELECTION (); 1221 CLEAR_SELECTION ();
1162 break; 1222 break;
1163 case 1: /* erase to beginning of line */ 1223 case 1: /* erase to beginning of line */
… …
1168 CLEAR_SELECTION (); 1228 CLEAR_SELECTION ();
1169 break; 1229 break;
1170 case 2: /* erase whole line */ 1230 case 2: /* erase whole line */
1171 col = 0; 1231 col = 0;
1172 num = ncol; 1232 num = ncol;
1173 ROW(row).l = 0; 1233 line.l = 0;
1174 if (selection.beg.row <= screen.cur.row 1234 if (selection.beg.row <= screen.cur.row
1175 && selection.end.row >= screen.cur.row) 1235 && selection.end.row >= screen.cur.row)
1176 CLEAR_SELECTION (); 1236 CLEAR_SELECTION ();
1177 break; 1237 break;
1178 default: 1238 default:
1179 return; 1239 return;
1180 } 1240 }
1181 1241
1182 scr_blank_line (ROW(row), col, num, rstyle); 1242 scr_blank_line (line, col, num, rstyle);
1183} 1243}
1184 1244
1185/* ------------------------------------------------------------------------- */ 1245/* ------------------------------------------------------------------------- */
1186/* 1246/*
1187 * Erase part of whole of the screen 1247 * Erase part of whole of the screen
… …
1242 CLEAR_ROWS (row, num); 1302 CLEAR_ROWS (row, num);
1243 } 1303 }
1244 else 1304 else
1245 { 1305 {
1246 ren = rstyle & (RS_fgMask | RS_bgMask); 1306 ren = rstyle & (RS_fgMask | RS_bgMask);
1247 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1248 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1308 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1249 ERASE_ROWS (row, num); 1309 ERASE_ROWS (row, num);
1250 gcvalue.foreground = pix_colors[Color_fg]; 1310 gcvalue.foreground = pix_colors[Color_fg];
1251 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1311 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1252 } 1312 }
1253 1313
1254 for (; num--; row++) 1314 for (; num--; row++)
1255 { 1315 {
1256 scr_blank_screen_mem (ROW (row), rstyle); 1316 scr_blank_screen_mem (ROW(row), rstyle);
1257 ROW (row).l = 0;
1258 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1317 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1259 } 1318 }
1260} 1319}
1261 1320
1262#if ENABLE_FRILLS 1321#if ENABLE_FRILLS
… …
1295 rend_t *r1 = line.r; 1354 rend_t *r1 = line.r;
1296 1355
1297 for (int j = ncol; j--; ) 1356 for (int j = ncol; j--; )
1298 *r1++ = fs; 1357 *r1++ = fs;
1299 1358
1300 line.l = ncol; /* make the `E's selectable */ 1359 line.is_longer (0);
1360 line.touch (ncol);
1301 } 1361 }
1302} 1362}
1303 1363
1304/* ------------------------------------------------------------------------- */ 1364/* ------------------------------------------------------------------------- */
1305/* 1365/*
… …
1353 min_it (count, ncol - screen.cur.col); 1413 min_it (count, ncol - screen.cur.col);
1354 1414
1355 row = screen.cur.row; 1415 row = screen.cur.row;
1356 1416
1357 line_t *line = &ROW(row); 1417 line_t *line = &ROW(row);
1418
1419 line->touch ();
1420 line->is_longer (0);
1358 1421
1359 switch (insdel) 1422 switch (insdel)
1360 { 1423 {
1361 case INSERT: 1424 case INSERT:
1362 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1425 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1363 { 1426 {
1364 line->t[col] = line->t[col - count]; 1427 line->t[col] = line->t[col - count];
1365 line->r[col] = line->r[col - count]; 1428 line->r[col] = line->r[col - count];
1366 } 1429 }
1367 1430
1368 if (!line->is_longer ()) 1431 line->l = min (line->l + count, ncol);
1369 {
1370 line->l += count;
1371 min_it (line->l, ncol);
1372 }
1373 1432
1374 if (selection.op && current_screen == selection.screen 1433 if (selection.op && current_screen == selection.screen
1375 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1434 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1376 { 1435 {
1377 if (selection.end.row != screen.cur.row 1436 if (selection.end.row != screen.cur.row
… …
1390 1449
1391 case ERASE: 1450 case ERASE:
1392 screen.cur.col += count; /* don't worry if > ncol */ 1451 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1452 selection_check (1);
1394 screen.cur.col -= count; 1453 screen.cur.col -= count;
1454
1455 line->l = max (line->l - count, 0);
1395 scr_blank_line (*line, screen.cur.col, count, rstyle); 1456 scr_blank_line (*line, screen.cur.col, count, rstyle);
1396 break; 1457 break;
1397 1458
1398 case DELETE: 1459 case DELETE:
1399 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1460 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1402 { 1463 {
1403 line->t[col] = line->t[col + count]; 1464 line->t[col] = line->t[col + count];
1404 line->r[col] = line->r[col + count]; 1465 line->r[col] = line->r[col + count];
1405 } 1466 }
1406 1467
1468 line->l = max (line->l - count, 0);
1407 scr_blank_line (*line, ncol - count, count, tr); 1469 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 1470
1414 if (selection.op && current_screen == selection.screen 1471 if (selection.op && current_screen == selection.screen
1415 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1472 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1416 { 1473 {
1417 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
… …
1529rxvt_term::scr_set_tab (int mode) 1586rxvt_term::scr_set_tab (int mode)
1530{ 1587{
1531 if (mode < 0) 1588 if (mode < 0)
1532 memset (tabs, 0, ncol * sizeof (char)); 1589 memset (tabs, 0, ncol * sizeof (char));
1533 else if (screen.cur.col < ncol) 1590 else if (screen.cur.col < ncol)
1534 tabs[screen.cur.col] = (mode ? 1 : 0); 1591 tabs [screen.cur.col] = !!mode;
1535} 1592}
1536 1593
1537/* ------------------------------------------------------------------------- */ 1594/* ------------------------------------------------------------------------- */
1538/* 1595/*
1539 * Set reverse/normal video 1596 * Set reverse/normal video
… …
1551 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1552#if XPM_BACKGROUND 1609#if XPM_BACKGROUND
1553 if (bgPixmap.pixmap == None) 1610 if (bgPixmap.pixmap == None)
1554#endif 1611#endif
1555#if TRANSPARENT 1612#if TRANSPARENT
1556 if (! (options & Opt_transparent) || am_transparent == 0) 1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1557#endif 1614#endif
1558 XSetWindowBackground (display->display, vt, 1615 XSetWindowBackground (display->display, vt,
1559 pix_colors[Color_bg]); 1616 pix_colors[Color_bg]);
1560 1617
1561 gcvalue.foreground = pix_colors[Color_fg]; 1618 gcvalue.foreground = pix_colors[Color_fg];
… …
1586 * Set font style 1643 * Set font style
1587 */ 1644 */
1588void 1645void
1589rxvt_term::set_font_style () 1646rxvt_term::set_font_style ()
1590{ 1647{
1648#if 0
1591 switch (charsets[screen.charset]) 1649 switch (charsets [screen.charset])
1592 { 1650 {
1593 case '0': /* DEC Special Character & Line Drawing Set */ 1651 case '0': /* DEC Special Character & Line Drawing Set */
1594 break; 1652 break;
1595 case 'A': /* United Kingdom (UK) */ 1653 case 'A': /* United Kingdom (UK) */
1596 break; 1654 break;
… …
1603 case 'C': /* Finnish character set */ 1661 case 'C': /* Finnish character set */
1604 break; 1662 break;
1605 case 'K': /* German character set */ 1663 case 'K': /* German character set */
1606 break; 1664 break;
1607 } 1665 }
1666#endif
1608} 1667}
1609 1668
1610/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
1611/* 1670/*
1612 * Choose a font 1671 * Choose a font
… …
1691 y = 0; 1750 y = 0;
1692 eheight = height; 1751 eheight = height;
1693 } 1752 }
1694#endif 1753#endif
1695 1754
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 */ 1755 /* round down */
1705 rc[PART_BEG].col = Pixel2Col (x); 1756 rc[PART_BEG].col = Pixel2Col (x);
1706 rc[PART_BEG].row = Pixel2Row (y); 1757 rc[PART_BEG].row = Pixel2Row (y);
1707 /* round up */ 1758 /* round up */
1708 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1); 1759 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
… …
1787int 1838int
1788rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (unsigned int oldviewstart)
1789{ 1840{
1790 if (view_start != oldviewstart) 1841 if (view_start != oldviewstart)
1791 { 1842 {
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844
1792 want_refresh = 1; 1845 want_refresh = 1;
1793 num_scr -= (view_start - oldviewstart); 1846 num_scr -= (view_start - oldviewstart);
1794 } 1847 }
1795 1848
1796 return (int) (view_start - oldviewstart); 1849 return (int)view_start - (int)oldviewstart;
1797} 1850}
1798 1851
1799/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1800void 1853void
1801rxvt_term::scr_bell () 1854rxvt_term::scr_bell ()
1802{ 1855{
1803#ifndef NO_BELL 1856#ifndef NO_BELL
1804 1857
1805# ifndef NO_MAPALERT 1858# ifndef NO_MAPALERT
1806# ifdef MAPALERT_OPTION 1859# ifdef MAPALERT_OPTION
1807 if (options & Opt_mapAlert) 1860 if (OPTION (Opt_mapAlert))
1808# endif 1861# endif
1809 XMapWindow (display->display, parent[0]); 1862 XMapWindow (display->display, parent[0]);
1810# endif 1863# endif
1811 1864
1812 if (options & Opt_visualBell) 1865 if (OPTION (Opt_visualBell))
1813 { 1866 {
1814 scr_rvideo_mode (!rvideo); /* refresh also done */ 1867 scr_rvideo_mode (!rvideo); /* refresh also done */
1868 display->flush ();
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 }
1818 else 1872 else
1819 XBell (display->display, 0); 1873 XBell (display->display, 0);
… …
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
… …
2325 /* 2381 /*
2326 * H: cleanup selection 2382 * H: cleanup selection
2327 */ 2383 */
2328 scr_reverse_selection (); 2384 scr_reverse_selection ();
2329 2385
2330 if (refresh_type & SMOOTH_REFRESH)
2331 XFlush (display->display);
2332
2333 num_scr = 0; 2386 num_scr = 0;
2334 num_scr_allow = 1; 2387 num_scr_allow = 1;
2335} 2388}
2336 2389
2337void 2390void
2338rxvt_term::scr_remap_chars (const line_t &l) 2391rxvt_term::scr_remap_chars (line_t &l)
2339{ 2392{
2340 if (!l.t) 2393 if (!l.t)
2341 return; 2394 return;
2395
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2342 2397
2343 for (int i = ncol; i--; ) 2398 for (int i = ncol; i--; )
2344 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2345} 2400}
2346 2401
… …
2399 2454
2400 if (really) 2455 if (really)
2401 XClearWindow (display->display, vt); 2456 XClearWindow (display->display, vt);
2402} 2457}
2403 2458
2459void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2461{
2462 int view_end = -view_start + nrow;
2463 int row, col;
2464
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++)
2466 {
2467 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r;
2469
2470 for (col = beg_col; col < end_col; col++)
2471 srp[col] ^= rstyle1;
2472
2473 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2474 srp[col] ^= rstyle2;
2475
2476 if (++col < end_col)
2477 srp[col] ^= rstyle2;
2478 }
2479}
2480
2481void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2483{
2484 int view_end = -view_start + nrow;
2485 int row, col;
2486
2487 if (beg_row >= -view_start)
2488 {
2489 col = beg_col;
2490 row = beg_row;
2491 }
2492 else
2493 {
2494 col = 0;
2495 row = -view_start;
2496 }
2497
2498 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle;
2501
2502 if (row == end_row)
2503 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2504 srp[col] ^= rstyle;
2505}
2506
2404/* ------------------------------------------------------------------------- */ 2507/* ------------------------------------------------------------------------- */
2405void 2508void
2406rxvt_term::scr_reverse_selection () 2509rxvt_term::scr_reverse_selection ()
2407{ 2510{
2408 if (selection.op 2511 if (selection.op
2409 && current_screen == selection.screen 2512 && current_screen == selection.screen
2410 && selection.end.row >= -view_start) 2513 && selection.end.row >= -view_start)
2411 { 2514 {
2412 int view_end = -view_start + nrow;
2413 int row, col;
2414
2415#if ENABLE_FRILLS 2515#if ENABLE_FRILLS
2416 if (selection.rect) 2516 if (selection.rect)
2417 { 2517 scr_xor_rect (selection.beg.row, selection.beg.col,
2418 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2518 selection.end.row, selection.end.col,
2419 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2519 RS_RVid, RS_RVid | RS_Uline);
2420 srp[col] ^= RS_RVid;
2421 }
2422 else 2520 else
2423#endif 2521#endif
2424 { 2522 scr_xor_span (selection.beg.row, selection.beg.col,
2425 if (selection.beg.row >= -view_start) 2523 selection.end.row, selection.end.col,
2426 { 2524 RS_RVid);
2427 col = selection.beg.col;
2428 row = selection.beg.row;
2429 }
2430 else
2431 {
2432 col = 0;
2433 row = view_start;
2434 }
2435
2436 for (; row < min (selection.end.row, view_end); row++, col = 0)
2437 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2438 srp[col] ^= RS_RVid;
2439
2440 if (row == selection.end.row)
2441 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2442 srp[col] ^= RS_RVid;
2443 }
2444 } 2525 }
2445} 2526}
2446 2527
2447/* ------------------------------------------------------------------------- */ 2528/* ------------------------------------------------------------------------- */
2448/* 2529/*
… …
2509/* ------------------------------------------------------------------------- */ 2590/* ------------------------------------------------------------------------- */
2510/* 2591/*
2511 * Paste a selection direct to the command fd 2592 * Paste a selection direct to the command fd
2512 */ 2593 */
2513void 2594void
2514rxvt_term::paste (unsigned char *data, unsigned int len) 2595rxvt_term::paste (char *data, unsigned int len)
2515{ 2596{
2516 /* convert normal newline chars into common keyboard Return key sequence */ 2597 /* convert normal newline chars into common keyboard Return key sequence */
2517 for (unsigned int i = 0; i < len; i++) 2598 for (unsigned int i = 0; i < len; i++)
2518 if (data[i] == C0_LF) 2599 if (data[i] == C0_LF)
2519 data[i] = C0_CR; 2600 data[i] = C0_CR;
… …
2663 { 2744 {
2664 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2665 char *s = rxvt_wcstombs (w); 2746 char *s = rxvt_wcstombs (w);
2666 free (w); 2747 free (w);
2667 // TODO: strlen == only the first element will be converted. well... 2748 // TODO: strlen == only the first element will be converted. well...
2668 paste ((unsigned char *)s, strlen (s)); 2749 paste (s, strlen (s));
2669 free (s); 2750 free (s);
2670 } 2751 }
2671 else 2752 else
2672#endif 2753#endif
2673 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2674 && cl) 2755 && cl)
2675 { 2756 {
2676 for (int i = 0; i < cr; i++) 2757 for (int i = 0; i < cr; i++)
2677 paste ((unsigned char *)cl[i], strlen (cl[i])); 2758 paste (cl[i], strlen (cl[i]));
2678 2759
2679 XFreeStringList (cl); 2760 XFreeStringList (cl);
2680 } 2761 }
2681 else 2762 else
2682 paste (ct.value, ct.nitems); // paste raw 2763 paste ((char *)ct.value, ct.nitems); // paste raw
2683 2764
2684bailout: 2765bailout:
2685 XFree (ct.value); 2766 XFree (ct.value);
2686 2767
2687 if (selection_wait == Sel_normal) 2768 if (selection_wait == Sel_normal)
… …
2725 return; /* outside window */ 2806 return; /* outside window */
2726 2807
2727 if (selection.text) 2808 if (selection.text)
2728 { /* internal selection */ 2809 { /* internal selection */
2729 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2730 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2731 free (str); 2812 free (str);
2732 return; 2813 return;
2733 } 2814 }
2734 else 2815 else
2735 { 2816 {
… …
2827 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2828 2909
2829 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2830 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2831 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2832 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2833 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2834 2918
2835 int ofs = 0; 2919 int ofs = 0;
2836 int extra = 0; 2920 int extra = 0;
… …
2848 col = selection.beg.col; 2932 col = selection.beg.col;
2849 end_col = ncol + 1; 2933 end_col = ncol + 1;
2850 } 2934 }
2851 else 2935 else
2852#endif 2936#endif
2853 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2854 2938
2855 col = max (col, 0); 2939 col = max (col, 0);
2856 2940
2857 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2858 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2859 2947
2860 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2861 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2862 { 2951 {
2863 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2864 t++; 2953 t++;
2865#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2881#endif 2970#endif
2882 else 2971 else
2883 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2884 } 2973 }
2885 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2886 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
2887 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2888 } 2989 }
2889 2990
2890 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2891 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
2892 2993
… …
2902 3003
2903 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2904 selection.len = ofs; 3005 selection.len = ofs;
2905 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2906 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
2907 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2908 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2909 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2910 else 3025 else
2911 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 return false;
2912 3027
2913#if 0 3028#if 0
2914 XTextProperty ct; 3029 XTextProperty ct;
2915 3030
2916 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3031 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2917 { 3032 {
2918 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3033 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2919 XFree (ct.value); 3034 XFree (ct.value);
2920 } 3035 }
2921#endif 3036#endif
2922
2923 selection_time = tm;
2924} 3037}
2925 3038
2926/* ------------------------------------------------------------------------- */ 3039/* ------------------------------------------------------------------------- */
2927/* 3040/*
2928 * Mark or select text based upon number of clicks: 1, 2, or 3 3041 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2931void 3044void
2932rxvt_term::selection_click (int clicks, int x, int y) 3045rxvt_term::selection_click (int clicks, int x, int y)
2933{ 3046{
2934 clicks = ((clicks - 1) % 3) + 1; 3047 clicks = ((clicks - 1) % 3) + 1;
2935 selection.clicks = clicks; /* save clicks so extend will work */ 3048 selection.clicks = clicks; /* save clicks so extend will work */
3049
3050 if (clicks == 2 && !selection.rect
3051 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3052 {
3053 MEvent.clicks = 1; // what a mess
3054 return;
3055 }
2936 3056
2937 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3057 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2938 3058
2939 if (clicks == 2 || clicks == 3) 3059 if (clicks == 2 || clicks == 3)
2940 selection_extend_colrow (selection.mark.col, 3060 selection_extend_colrow (selection.mark.col,
… …
3050 } 3170 }
3051 } 3171 }
3052 break; 3172 break;
3053 } 3173 }
3054 3174
3055Old_Word_Selection_You_Die:
3056 if (dirn == DN) 3175 if (dirn == DN)
3057 col++; /* put us on one past the end */ 3176 col++; /* put us on one past the end */
3058 3177
3059 /* Poke the values back in */ 3178 /* Poke the values back in */
3060 ret->row = row; 3179 ret->row = row;
… …
3243 selection_delimit_word (DN, &selection.end, &selection.end); 3362 selection_delimit_word (DN, &selection.end, &selection.end);
3244 } 3363 }
3245 else if (selection.clicks == 3) 3364 else if (selection.clicks == 3)
3246 { 3365 {
3247#if ENABLE_FRILLS 3366#if ENABLE_FRILLS
3248 if (options & Opt_tripleclickwords) 3367 if (OPTION (Opt_tripleclickwords))
3249 { 3368 {
3250 selection_delimit_word (UP, &selection.beg, &selection.beg); 3369 selection_delimit_word (UP, &selection.beg, &selection.beg);
3251 3370
3252 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3371 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3253 { 3372 {
… …
3314 { 3433 {
3315 stp = ROW(end_row).t; 3434 stp = ROW(end_row).t;
3316 3435
3317 while (--end_col >= 0) 3436 while (--end_col >= 0)
3318 { 3437 {
3319 if (stp[end_col] != ' ' 3438 if (stp[end_col] != NOCHAR
3320 && stp[end_col] != '\t' 3439 && !unicode::is_space (stp[end_col]))
3321 && stp[end_col] != NOCHAR)
3322 break; 3440 break;
3323 } 3441 }
3324 3442
3325 if (end_col >= 0 3443 if (end_col >= 0
3326 || !ROW(end_row - 1).is_longer ()) 3444 || !ROW(end_row - 1).is_longer ())
… …
3525 3643
3526#if ENABLE_OVERLAY 3644#if ENABLE_OVERLAY
3527void 3645void
3528rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3646rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3529{ 3647{
3530 if (nrow < 3 || ncol < 3) 3648 if (nrow < 1 || ncol < 1)
3531 return; 3649 return;
3532 3650
3533 want_refresh = 1; 3651 want_refresh = 1;
3534 3652
3535 scr_overlay_off (); 3653 scr_overlay_off ();
… …
3642 for (int y = ov_h; y--; ) 3760 for (int y = ov_h; y--; )
3643 { 3761 {
3644 text_t *t1 = ov_text[y]; 3762 text_t *t1 = ov_text[y];
3645 rend_t *r1 = ov_rend[y]; 3763 rend_t *r1 = ov_rend[y];
3646 3764
3647 text_t *t2 = ROW(y - view_start).t + ov_x; 3765 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3648 rend_t *r2 = ROW(y - view_start).r + ov_x; 3766 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3649 3767
3650 for (int x = ov_w; x--; ) 3768 for (int x = ov_w; x--; )
3651 { 3769 {
3652 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3770 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3653 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3771 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