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.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.245 by root, Fri Jan 20 10:35:25 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
143void 146void
144rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
173 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
174 { 180 {
175 //TODO//FIXME 181 //TODO//FIXME
176 saveLines++; 182 saveLines++;
177 prev_nrow--; 183 prev_nrow--;
178 nsaved++; 184 top_row--;
179 } 185 }
180 186
181 want_refresh = 1; 187 want_refresh = 1;
182 188
183 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 234 selection.text = NULL;
231 selection.len = 0; 235 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
234 selection.clicks = 0; 238 selection.clicks = 0;
235 CLEAR_ALL_SELECTION ();
236 rvideo = 0; 239 rvideo = 0;
237 } 240 }
238 else 241 else
239 { 242 {
240 /* 243 /*
… …
254 } 257 }
255 } 258 }
256#endif 259#endif
257 260
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 263
262 for (int row = min (nrow, prev_nrow); row--; ) 264 for (int row = min (nrow, prev_nrow); row--; )
263 { 265 {
264 lresize (drawn_buf[row]); 266 lresize (drawn_buf[row]);
… …
269 { 271 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 274 }
273 275
276 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 278
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
279 282
280 if (nsaved) 283 if (top_row)
281 { 284 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 286 // to come up with a lean and mean algorithm.
284 287
285 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
… …
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 296#endif
294
295 int plines = 1; 297 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 299
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 301 {
… …
317 // re-assemble the full line by destination lines 319 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
319 { 321 {
320 qline = row_buf + qrow; 322 qline = row_buf + qrow;
321 lalloc (*qline); 323 lalloc (*qline);
324 qline->l = ncol;
322 qline->set_is_longer (); 325 qline->is_longer (1);
323 326
324 int qcol = 0; 327 int qcol = 0;
325 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
326 // fill a single destination line 333 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
328 { 335 {
329 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
340 347
341 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
342 349
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344 351
352#if DEBUG_STRICT
345 assert (len); 353 assert (len);
346 assert (pline.t); 354 assert (pline.t);
355#endif
347 356
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350 359
351 lofs += len; 360 lofs += len;
352 qcol += len; 361 qcol += len;
353 } 362 }
354 } 363 }
355 364
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 368 }
359 while (p != pend && q > 0); 369 while (p != pend && q > 0);
360 370
361 term_start = total_rows - nrow; 371 term_start = total_rows - nrow;
362 nsaved = term_start - q; 372 top_row = q - term_start;
363 373
364 // make sure all terminal lines exist 374 // make sure all terminal lines exist
365 while (nsaved < 0) 375 while (top_row > 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
367
368 } 377 }
369 else 378 else
370 { 379 {
371 // if no scrollback exists (yet), wing, instead of wrap 380 // if no scrollback exists (yet), wing, instead of wrap
372 381
… …
385 } 394 }
386 395
387 term_start = 0; 396 term_start = 0;
388 } 397 }
389 398
390#ifdef DEBUG_STRICT //TODO: remove
391 for (int i = -nsaved; i < nrow; i++)
392 assert (ROW (i).t);
393#endif
394
395 free (old_buf); 399 free (old_buf);
396 delete old_ta; 400 delete old_ta;
397 delete old_ra; 401 delete old_ra;
398 402
399 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
… …
401 405
402 if (tabs) 406 if (tabs)
403 free (tabs); 407 free (tabs);
404 } 408 }
405 409
410 CLEAR_ALL_SELECTION ();
411
406 prev_nrow = nrow; 412 prev_nrow = nrow;
407 prev_ncol = ncol; 413 prev_ncol = ncol;
408 414
409 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
410 416
411 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
412 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
413 419
414 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
415} 423}
416 424
417/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
418/* 426/*
419 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
420 */ 428 */
421void 429void
422rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
423{ 431{
424 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
425 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
426 434
427 free (row_buf); 435 free (row_buf);
428 free (swap_buf); 436 free (swap_buf);
429 free (drawn_buf); 437 free (drawn_buf);
430 free (temp_buf);
431 free (tabs); 438 free (tabs);
432 439
433 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
434} 441}
435 442
436/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
437/* 444/*
438 * Hard reset 445 * Hard reset
439 */ 446 */
440void 447void
441rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
442{ 449{
443 scr_release (); 450 scr_release ();
444 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
445 scr_reset (); 452 scr_reset ();
446 453
447 scr_clear (true); 454 scr_clear (true);
448 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
449} 456}
450 457
451/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
452 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
453 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
455 * Save and Restore cursor 462 * Save and Restore cursor
456 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
457 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
458 */ 465 */
459void 466void
460rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
461{ 468{
462 screen_t *s; 469 screen_t *s;
463 470
464#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
465 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
504 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
505 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
506 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
507 */ 514 */
508int 515int
509rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
510{ 517{
511 want_refresh = 1; 518 want_refresh = 1;
512 view_start = 0; 519 view_start = 0;
513 520
514 if (current_screen == scrn) 521 if (current_screen == scrn)
… …
523 530
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526 533
527#if NSCREENS 534#if NSCREENS
528 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
529 { 536 {
530 num_scr = 0; 537 num_scr = 0;
531 538
532 for (int i = prev_nrow; i--; ) 539 for (int i = prev_nrow; i--; )
533 ::swap (ROW(i), swap_buf [i]); 540 ::swap (ROW(i), swap_buf [i]);
… …
537 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
539 } 546 }
540 else 547 else
541#endif 548#endif
542 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544 551
545 return scrn; 552 return scrn;
546} 553}
547 554
548// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
549void 556void
550rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
551{ 558{
552 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
553 return; 560 return;
554 561
555 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
565/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
566/* 573/*
567 * Change the colour for following text 574 * Change the colour for following text
568 */ 575 */
569void 576void
570rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
571{ 578{
572 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
573 color = fgbg; 580 color = fgbg;
574 581
575 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
576 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
577 else 584 else
… …
581/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
582/* 589/*
583 * Change the rendition style for following text 590 * Change the rendition style for following text
584 */ 591 */
585void 592void
586rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
587 { 594 {
588 if (set) 595 if (set)
589 rstyle |= style; 596 rstyle |= style;
590 else if (style == ~RS_None) 597 else if (style == ~RS_None)
591 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
598 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
599 * count positive ==> scroll up 606 * count positive ==> scroll up
600 * count negative ==> scroll down 607 * count negative ==> scroll down
601 */ 608 */
602int 609int
603rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
604{ 611{
605 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
606 return 0; 613 return 0;
607 614
608 want_refresh = 1; 615 want_refresh = 1;
609 num_scr += count; 616 num_scr += count;
610 617
611 if (count > 0 618 if (count > 0
612 && row1 == 0 619 && row1 == 0
613 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 621 {
616 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
617 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
618 626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
658
659 // move and/or clear selection, if any
619 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
620 { 661 {
621 selection.beg.row -= count; 662 selection.beg.row -= count;
622 selection.end.row -= count; 663 selection.end.row -= count;
623 selection.mark.row -= count; 664 selection.mark.row -= count;
624 665
625 selection_check (0); 666 if (selection.beg.row < top_row
626 } 667 || selection.end.row < top_row
627 668 || selection.mark.row < top_row)
628 for (int i = count; i--; )
629 scr_blank_screen_mem (ROW(row2 - i), rstyle);
630
631 if ((options & Opt_scrollWithBuffer)
632 && view_start != 0
633 && view_start != saveLines)
634 scr_page (UP, count);
635 }
636 else
637 {
638 if (selection.op && current_screen == selection.screen)
639 {
640 int i = selection.beg.row;
641 int j = selection.end.row;
642
643 if ((i < row1 && j > row1)
644 || (i < row2 && j > row2)
645 || (i - count < row1 && i >= row1)
646 || (i - count > row2 && i <= row2)
647 || (j - count < row1 && j >= row1)
648 || (j - count > row2 && j <= row2))
649 { 669 {
650 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
651 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
652 } 672 }
653 else if (j >= row1 && j <= row2) 673 }
674
675 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer)
677 && view_start != 0
678 && view_start != -saveLines)
679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
683 }
684 else
685 {
686 if (selection.op && current_screen == selection.screen)
687 {
688 if ((selection.beg.row < row1 && selection.end.row > row1)
689 || (selection.beg.row < row2 && selection.end.row > row2)
690 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
691 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
692 || (selection.end.row - count < row1 && selection.end.row >= row1)
693 || (selection.end.row - count > row2 && selection.end.row <= row2))
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 else if (selection.end.row >= row1 && selection.end.row <= row2)
654 { 699 {
655 /* move selected region too */ 700 /* move selected region too */
656 selection.beg.row -= count; 701 selection.beg.row -= count;
657 selection.end.row -= count; 702 selection.end.row -= count;
658 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
666 711
667 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
668 713
669 min_it (count, rows); 714 min_it (count, rows);
670 715
716 line_t *temp_buf = row_buf + total_rows;
717
671 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
672 { 719 {
673 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
674 721
675 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
686/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
687/* 734/*
688 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
689 */ 736 */
690void 737void
691rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
692{ 739{
693 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
694 return; 741 return;
695 742
696 unsigned char checksel; 743 unsigned char checksel;
697 unicode_t c; 744 unicode_t c;
698 int last_col; 745 int ncol = this->ncol;
699 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
700 747
701 want_refresh = 1; 748 want_refresh = 1;
702 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
703 last_col = ncol;
704 750
705 if (nlines > 0) 751 if (minlines > 0)
706 { 752 {
707 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
708 if (nlines > 0 755 if (minlines > 0
709 && screen.tscroll == 0 756 && screen.tscroll == 0
710 && screen.bscroll == (nrow - 1)) 757 && screen.bscroll == nrow - 1)
711 { 758 {
712 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
713 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
714 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
715 } 762 }
716 } 763 }
717 764
718#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
719 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
720 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
721 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
722#endif 769#endif
723 int row = screen.cur.row; 770 int row = screen.cur.row;
724 771
725 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
726 773
727 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
728 775
729 while (str < strend) 776 while (str < strend)
730 { 777 {
731 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
732 779
733 if (c < 0x20) 780 if (c < 0x20)
734 if (c == C0_LF) 781 if (c == C0_LF)
735 { 782 {
736 if (!line->is_longer ()) /* XXX: think about this */
737 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
738 784
739 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
740 786
741 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
742 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
746 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
747 continue; 793 continue;
748 } 794 }
749 else if (c == C0_CR) 795 else if (c == C0_CR)
750 { 796 {
751 if (!line->is_longer ()) /* XXX: think about this */
752 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
753 798
754 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
755 screen.cur.col = 0; 800 screen.cur.col = 0;
756 continue; 801 continue;
757 } 802 }
… …
774 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
775 } 820 }
776 821
777 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
778 { 823 {
779 line->set_is_longer ();
780
781 scr_do_wrap (); 824 scr_do_wrap ();
782 825
826 line->l = ncol;
827 line->is_longer (1);
828
783 row = screen.cur.row; 829 row = screen.cur.row;
784 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
785 } 831 }
786 832
787 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
792 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
793 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
794 // locale. 840 // locale.
795 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
796 842
797 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
798 { 844 {
799 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
800 // 5f-7e standard vt100 846 // 5f-7e standard vt100
801 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
802 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
854 } 900 }
855 901
856 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
857 903
858 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
859 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
860 { 906 {
861 // ...output spaces 907 // ...output spaces
862 c = ' '; 908 c = ' ';
863 // and try the same character next loop iteration 909 // and try the same character next loop iteration
864 --str; 910 --str;
865 } 911 }
866 912
913 line->touch ();
914
867 do 915 do
868 { 916 {
869 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
870 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
871 919
872 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
873 screen.cur.col++; 921 screen.cur.col++;
874 else 922 else
875 { 923 {
876 line->l = last_col; 924 line->l = ncol;
877 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
878 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
879 break; 927 break;
880 } 928 }
881 929
… …
883 } 931 }
884 while (--width > 0); 932 while (--width > 0);
885 933
886 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
887 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
888 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
889 { 940 {
890 line->t[c] = ' '; 941 line->t[c] = ' ';
891 line->r[c] = rend; 942 line->r[c] = rend;
892 } 943 }
944 }
893 } 945 }
894 else // width == 0 946 else // width == 0
895 { 947 {
896#if ENABLE_COMBINING 948#if ENABLE_COMBINING
897 // handle combining characters 949 // handle combining characters
898 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
899 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
900 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
901 text_t *tp; 954 text_t *tp;
902 rend_t *rp; 955 rend_t *rp;
903 956
904 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
905 { 958 {
959 linep = line;
906 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
907 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
908
909 while (*tp == NOCHAR && tp > line->t)
910 tp--, rp--;
911 } 962 }
912 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
913 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
914 { 965 {
915 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
916
917 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
918 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
919
920 while (*tp == NOCHAR && tp > line->t)
921 tp--, rp--;
922 } 969 }
923 else 970 else
924 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
925 977
926 // first try to find a precomposed character 978 // first try to find a precomposed character
927 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
928 if (n == NOCHAR) 980 if (n == NOCHAR)
929 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
932 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
933#endif 985#endif
934 } 986 }
935 } 987 }
936 988
937 if (!line->is_longer ()) /* XXX: think about this */
938 max_it (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
939 990
940#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
941 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
942#endif 993#endif
943} 994}
… …
946/* 997/*
947 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
948 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
949 */ 1000 */
950void 1001void
951rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
952{ 1003{
953 want_refresh = 1; 1004 want_refresh = 1;
954 1005
955 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
956 { 1007 {
… …
974 * Process Horizontal Tab 1025 * Process Horizontal Tab
975 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
976 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
977 */ 1028 */
978void 1029void
979rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
980{ 1031{
981 int i, x; 1032 int i, x;
982 1033
983 want_refresh = 1; 1034 want_refresh = 1;
984 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
993 1044
994 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
995 if (tabs[i]) 1046 if (tabs[i])
996 { 1047 {
997 x = i; 1048 x = i;
1049
998 if (!--count) 1050 if (!--count)
999 break; 1051 break;
1000 } 1052 }
1001 else 1053 else
1002 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1005 if (count) 1057 if (count)
1006 x = ncol - 1; 1058 x = ncol - 1;
1007 1059
1008 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
1009 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1010 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
1011 { 1063 {
1012 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1013 1065
1014 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1015 max_it (l.l, x);
1016 1067
1017 i = screen.cur.col; 1068 i = screen.cur.col;
1018 1069
1019 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1020 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1051 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1052 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1053 */ 1104 */
1054#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1055void 1106void
1056rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1057{ 1108{
1058 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1059 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1060 else 1111 else
1061 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1068 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1069 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1070 */ 1121 */
1071#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1072void 1123void
1073rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1074{ 1125{
1075 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1076 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1077 else 1128 else
1078 { 1129 {
1079 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1130 line_t &l = ROW(screen.cur.row);
1080 ROW(screen.cur.row).l = ncol; 1131
1132 l.touch ();
1133 l.is_longer (0);
1081 1134
1082 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1083 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1084 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1085 } 1138 }
… …
1089/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1090/* 1143/*
1091 * Goto Row/Column 1144 * Goto Row/Column
1092 */ 1145 */
1093void 1146void
1094rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1095{ 1148{
1096 want_refresh = 1; 1149 want_refresh = 1;
1097 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1098 1151
1099 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1137/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1138/* 1191/*
1139 * direction should be UP or DN 1192 * direction should be UP or DN
1140 */ 1193 */
1141void 1194void
1142rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1143{ 1196{
1144 int dirn; 1197 int dirn;
1145 1198
1146 want_refresh = 1; 1199 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1166 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1167 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1168 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1169 */ 1222 */
1170void 1223void
1171rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1172{ 1225{
1173 unsigned int col, num; 1226 unsigned int col, num;
1174 1227
1175 want_refresh = 1; 1228 want_refresh = 1;
1176 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1177 1230
1178 selection_check (1); 1231 selection_check (1);
1179 1232
1180 line_t &line = ROW(screen.cur.row); 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1181 1237
1182 switch (mode) 1238 switch (mode)
1183 { 1239 {
1184 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1185 col = screen.cur.col; 1241 col = screen.cur.col;
… …
1217 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1218 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1219 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1220 */ 1276 */
1221void 1277void
1222rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1223{ 1279{
1224 int num; 1280 int num;
1225 int32_t row; 1281 int32_t row;
1226 rend_t ren; 1282 rend_t ren;
1227 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1271 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1272 } 1328 }
1273 else 1329 else
1274 { 1330 {
1275 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1276 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1277 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1278 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1279 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 } 1337 }
1282 1338
1283 for (; num--; row++) 1339 for (; num--; row++)
1284 { 1340 {
1285 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1286 ROW (row).l = 0;
1287 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1288 } 1343 }
1289} 1344}
1290 1345
1291#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1292void 1347void
1293rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1294{ 1349{
1295 want_refresh = 1; 1350 want_refresh = 1;
1296 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1297 1352
1298 nsaved = 0; 1353 top_row = 0;
1299} 1354}
1300#endif 1355#endif
1301 1356
1302/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1303/* 1358/*
1304 * Fill the screen with `E's 1359 * Fill the screen with `E's
1305 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1306 */ 1361 */
1307void 1362void
1308rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1309{ 1364{
1310 rend_t fs; 1365 rend_t fs;
1311 1366
1312 want_refresh = 1; 1367 want_refresh = 1;
1313 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1324 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1325 1380
1326 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1327 *r1++ = fs; 1382 *r1++ = fs;
1328 1383
1329 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1330 } 1386 }
1331} 1387}
1332 1388
1333/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1334/* 1390/*
1335 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1336 */ 1392 */
1337void 1393void
1338rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1339{ 1395{
1340 int end; 1396 int end;
1341 1397
1342 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1343 1399
… …
1363/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1364/* 1420/*
1365 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1366 */ 1422 */
1367void 1423void
1368rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1369{ 1425{
1370 int col, row; 1426 int col, row;
1371 rend_t tr; 1427 rend_t tr;
1372 1428
1373 want_refresh = 1; 1429 want_refresh = 1;
… …
1382 min_it (count, ncol - screen.cur.col); 1438 min_it (count, ncol - screen.cur.col);
1383 1439
1384 row = screen.cur.row; 1440 row = screen.cur.row;
1385 1441
1386 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1387 1446
1388 switch (insdel) 1447 switch (insdel)
1389 { 1448 {
1390 case INSERT: 1449 case INSERT:
1391 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1392 { 1451 {
1393 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1394 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1395 } 1454 }
1396 1455
1397 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1398 {
1399 line->l += count;
1400 min_it (line->l, ncol);
1401 }
1402 1457
1403 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1404 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1405 { 1460 {
1406 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1419 1474
1420 case ERASE: 1475 case ERASE:
1421 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1422 selection_check (1); 1477 selection_check (1);
1423 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1424 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1425 break; 1482 break;
1426 1483
1427 case DELETE: 1484 case DELETE:
1428 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1431 { 1488 {
1432 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1433 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1434 } 1491 }
1435 1492
1493 line->l = max (line->l - count, 0);
1436 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1437
1438 if (line->is_longer ()) /* break line continuation */
1439 line->l = ncol;
1440
1441 line->l = max (line->l - count, 0);
1442 1495
1443 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1444 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1445 { 1498 {
1446 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1464/* 1517/*
1465 * Set the scrolling region 1518 * Set the scrolling region
1466 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1467 */ 1520 */
1468void 1521void
1469rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1470{ 1523{
1471 max_it (top, 0); 1524 max_it (top, 0);
1472 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1473 1526
1474 if (top > bot) 1527 if (top > bot)
… …
1484 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1485 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1486 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1487 */ 1540 */
1488void 1541void
1489rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1490{ 1543{
1491 want_refresh = 1; 1544 want_refresh = 1;
1492 1545
1493 if (mode) 1546 if (mode)
1494 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1501 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1502 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1503 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1504 */ 1557 */
1505void 1558void
1506rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1507{ 1560{
1508 if (mode) 1561 if (mode)
1509 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1510 else 1563 else
1511 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1520 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1521 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1522 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1523 */ 1576 */
1524void 1577void
1525rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1526{ 1579{
1527 if (mode) 1580 if (mode)
1528 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1529 else 1582 else
1530 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1537 * Set insert/replace mode 1590 * Set insert/replace mode
1538 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1539 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1540 */ 1593 */
1541void 1594void
1542rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1543{ 1596{
1544 if (mode) 1597 if (mode)
1545 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1546 else 1599 else
1547 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1553 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1554 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1555 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1556 */ 1609 */
1557void 1610void
1558rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1559{ 1612{
1560 if (mode < 0) 1613 if (mode < 0)
1561 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1562 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1563 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1564} 1617}
1565 1618
1566/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1567/* 1620/*
1568 * Set reverse/normal video 1621 * Set reverse/normal video
1569 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1570 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1571 */ 1624 */
1572void 1625void
1573rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW
1574{ 1627{
1575 XGCValues gcvalue; 1628 XGCValues gcvalue;
1576 1629
1577 if (rvideo != mode) 1630 if (rvideo != mode)
1578 { 1631 {
… …
1580 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1581#if XPM_BACKGROUND 1634#if XPM_BACKGROUND
1582 if (bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1583#endif 1636#endif
1584#if TRANSPARENT 1637#if TRANSPARENT
1585 if (! (options & Opt_transparent) || am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1586#endif 1639#endif
1587 XSetWindowBackground (display->display, vt, 1640 XSetWindowBackground (display->display, vt,
1588 pix_colors[Color_bg]); 1641 pix_colors[Color_bg]);
1589 1642
1590 gcvalue.foreground = pix_colors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
… …
1600/* 1653/*
1601 * Report current cursor position 1654 * Report current cursor position
1602 * XTERM_SEQ: Report position: ESC [ 6 n 1655 * XTERM_SEQ: Report position: ESC [ 6 n
1603 */ 1656 */
1604void 1657void
1605rxvt_term::scr_report_position () 1658rxvt_term::scr_report_position () NOTHROW
1606{ 1659{
1607 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1660 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1608} 1661}
1609 1662
1610/* ------------------------------------------------------------------------- * 1663/* ------------------------------------------------------------------------- *
… …
1613 1666
1614/* 1667/*
1615 * Set font style 1668 * Set font style
1616 */ 1669 */
1617void 1670void
1618rxvt_term::set_font_style () 1671rxvt_term::set_font_style () NOTHROW
1619{ 1672{
1673#if 0
1620 switch (charsets[screen.charset]) 1674 switch (charsets [screen.charset])
1621 { 1675 {
1622 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1623 break; 1677 break;
1624 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1625 break; 1679 break;
… …
1632 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1633 break; 1687 break;
1634 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1635 break; 1689 break;
1636 } 1690 }
1691#endif
1637} 1692}
1638 1693
1639/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1640/* 1695/*
1641 * Choose a font 1696 * Choose a font
… …
1643 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1698 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1644 * XTERM_SEQ: Invoke G2 character set: ESC N 1699 * XTERM_SEQ: Invoke G2 character set: ESC N
1645 * XTERM_SEQ: Invoke G3 character set: ESC O 1700 * XTERM_SEQ: Invoke G3 character set: ESC O
1646 */ 1701 */
1647void 1702void
1648rxvt_term::scr_charset_choose (int set) 1703rxvt_term::scr_charset_choose (int set) NOTHROW
1649{ 1704{
1650 screen.charset = set; 1705 screen.charset = set;
1651 set_font_style (); 1706 set_font_style ();
1652} 1707}
1653 1708
… …
1659 * XTERM_SEQ: Set G2 character set: ESC * <C> 1714 * XTERM_SEQ: Set G2 character set: ESC * <C>
1660 * XTERM_SEQ: Set G3 character set: ESC + <C> 1715 * XTERM_SEQ: Set G3 character set: ESC + <C>
1661 * See set_font_style for possible values for <C> 1716 * See set_font_style for possible values for <C>
1662 */ 1717 */
1663void 1718void
1664rxvt_term::scr_charset_set (int set, unsigned int ch) 1719rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1665{ 1720{
1666 charsets[set] = (unsigned char)ch; 1721 charsets[set] = (unsigned char)ch;
1667 set_font_style (); 1722 set_font_style ();
1668} 1723}
1669 1724
… …
1674 1729
1675/* 1730/*
1676 * refresh matching text. 1731 * refresh matching text.
1677 */ 1732 */
1678bool 1733bool
1679rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1734rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1680{ 1735{
1681 bool found = false; 1736 bool found = false;
1682 1737
1683 for (int i = 0; i < nrow; i++) 1738 for (int i = 0; i < nrow; i++)
1684 { 1739 {
… …
1704 PART_END, 1759 PART_END,
1705 RC_COUNT 1760 RC_COUNT
1706}; 1761};
1707 1762
1708void 1763void
1709rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1764rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1710{ 1765{
1711 int i; 1766 int i;
1712 row_col_t rc[RC_COUNT]; 1767 row_col_t rc[RC_COUNT];
1713 1768
1714 if (!drawn_buf) /* sanity check */ 1769 if (!drawn_buf) /* sanity check */
… …
1737 } 1792 }
1738 1793
1739 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1740 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1741 1796
1797 num_scr_allow = 0;
1798
1742 if (refresh) 1799 if (refresh)
1743 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1744} 1801}
1745 1802
1746/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1747/* 1804/*
1748 * Refresh the entire screen 1805 * Refresh the entire screen
1749 */ 1806 */
1750void 1807void
1751rxvt_term::scr_touch (bool refresh) 1808rxvt_term::scr_touch (bool refresh) NOTHROW
1752{ 1809{
1753 scr_expose (0, 0, width, height, refresh); 1810 scr_expose (0, 0, width, height, refresh);
1754} 1811}
1755 1812
1756/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1757/* 1814/*
1758 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1759 * the top of the screen 1816 * the top of the screen
1760 */ 1817 */
1761int 1818void
1762rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len) NOTHROW
1763{ 1820{
1764 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1765 unsigned int oldviewstart;
1766
1767 oldviewstart = view_start;
1768
1769 if (y < len)
1770 {
1771 p = (nrow + nsaved) * (len - y) / len;
1772 p -= (long) (nrow - 1);
1773 p = max (p, 0);
1774 }
1775
1776 view_start = (unsigned int)min (p, nsaved);
1777
1778 return scr_changeview (oldviewstart);
1779} 1822}
1780 1823
1781/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1782/* 1825/*
1783 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1784 * direction should be UP or DN 1827 * direction should be UP or DN
1785 */ 1828 */
1786int 1829bool
1787rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1788{ 1831{
1789 int n; 1832 int new_view_start =
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (direction == UP)
1795 {
1796 n = view_start + nlines;
1797 view_start = min (n, nsaved);
1798 }
1799 else
1800 {
1801 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1802 view_start = max (n, 0); 1834 : view_start + nlines;
1803 }
1804 1835
1805 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1806} 1837}
1807 1838
1808int 1839bool
1809rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start) NOTHROW
1810{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1811 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1812 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1813 want_refresh = 1; 1849 want_refresh = 1;
1814 num_scr -= (view_start - oldviewstart);
1815 }
1816 1850
1817 return (int) (view_start - oldviewstart); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1818}
1819 1852
1853 return true;
1854}
1855
1820/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1821void 1857void
1822rxvt_term::scr_bell () 1858rxvt_term::scr_bell () NOTHROW
1823{ 1859{
1824#ifndef NO_BELL 1860#ifndef NO_BELL
1825 1861
1826# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1827# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1828 if (options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1829# endif 1865# endif
1830 XMapWindow (display->display, parent[0]); 1866 XMapWindow (display->display, parent[0]);
1831# endif 1867# endif
1832 1868
1833 if (options & Opt_visualBell) 1869 if (OPTION (Opt_visualBell))
1834 { 1870 {
1835 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1836 rxvt_usleep (VISUAL_BELL_DURATION); 1873 rxvt_usleep (VISUAL_BELL_DURATION);
1837 scr_rvideo_mode (!rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1838 } 1875 }
1839 else 1876 else
1840 XBell (display->display, 0); 1877 XBell (display->display, 0);
… …
1843} 1880}
1844 1881
1845/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1846/* ARGSUSED */ 1883/* ARGSUSED */
1847void 1884void
1848rxvt_term::scr_printscreen (int fullhist) 1885rxvt_term::scr_printscreen (int fullhist) NOTHROW
1849{ 1886{
1850#ifdef PRINTPIPE 1887#ifdef PRINTPIPE
1851 int nrows, row_start; 1888 int nrows, row_start;
1852 FILE *fd; 1889 FILE *fd;
1853 1890
1854 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1855 return; 1892 return;
1856 1893
1857 if (fullhist) 1894 if (fullhist)
1858 { 1895 {
1859 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1860 row_start = -nsaved; 1897 row_start = top_row;
1861 } 1898 }
1862 else 1899 else
1863 { 1900 {
1864 nrows = nrow; 1901 nrows = nrow;
1865 row_start = -view_start; 1902 row_start = view_start;
1866 } 1903 }
1867 1904
1868 wctomb (0, 0); 1905 wctomb (0, 0);
1869 1906
1870 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1902 * Refresh the screen 1939 * Refresh the screen
1903 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1904 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1905 */ 1942 */
1906void 1943void
1907rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh () NOTHROW
1908{ 1945{
1909 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1910 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1911 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1912 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
… …
1929 1966
1930#if XPM_BACKGROUND 1967#if XPM_BACKGROUND
1931 must_clear |= bgPixmap.pixmap != None; 1968 must_clear |= bgPixmap.pixmap != None;
1932#endif 1969#endif
1933#if TRANSPARENT 1970#if TRANSPARENT
1934 must_clear |= (options & Opt_transparent) && am_transparent; 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1935#endif 1972#endif
1936 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1937 1974
1938 /* 1975 /*
1939 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
… …
1963 2000
1964 crp = &ROW(screen.cur.row).r[col]; 2001 crp = &ROW(screen.cur.row).r[col];
1965 2002
1966 if (showcursor && focus) 2003 if (showcursor && focus)
1967 { 2004 {
1968 if (options & Opt_cursorUnderline) 2005 if (OPTION (Opt_cursorUnderline))
1969 *crp ^= RS_Uline; 2006 *crp ^= RS_Uline;
1970 else 2007 else
1971 { 2008 {
1972 *crp ^= RS_RVid; 2009 *crp ^= RS_RVid;
1973 2010
… …
1975 cc1 = *crp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
1976 if (ISSET_PIXCOLOR (Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
1977 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
1978 else 2015 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol1 = GET_FGCOLOR (rstyle); 2017 ccol1 = fgcolor_of (rstyle);
1981#else 2018#else
1982 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
1983#endif 2020#endif
1984 if (ISSET_PIXCOLOR (Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
1985 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
1986 else 2023 else
1987#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1988 ccol2 = GET_BGCOLOR (rstyle); 2025 ccol2 = bgcolor_of (rstyle);
1989#else 2026#else
1990 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
1991#endif 2028#endif
1992 *crp = SET_FGCOLOR (*crp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
1993 *crp = SET_BGCOLOR (*crp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1998 2035
1999 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
2000 setoldcursor = 0; 2037 setoldcursor = 0;
2001 if (ocrow != -1) 2038 if (ocrow != -1)
2002 { 2039 {
2003 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
2004 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
2005 { 2042 {
2006 if (ocrow < nrow 2043 if (ocrow < nrow
2007 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
2008 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2016 else if (!focus) 2053 else if (!focus)
2017 setoldcursor = 1; 2054 setoldcursor = 1;
2018 2055
2019 if (setoldcursor) 2056 if (setoldcursor)
2020 { 2057 {
2021 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
2022 oldcursor.row = -1; 2059 oldcursor.row = -1;
2023 else 2060 else
2024 { 2061 {
2025 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
2026 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
2027 } 2064 }
2028 } 2065 }
2029 } 2066 }
2030 2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2031#if ENABLE_OVERLAY 2069#if ENABLE_OVERLAY
2032 scr_swap_overlay (); 2070 scr_swap_overlay ();
2033#endif 2071#endif
2034 2072
2035#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2036 /* 2074 /*
2037 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2038 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2039 */ 2077 */
2040 i = num_scr;
2041 if (!display->is_local 2078 if (!display->is_local
2042 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2043 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2044 { 2081 {
2045 int16_t nits; 2082 int16_t nits;
2046 int j; 2083 int j;
2047 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2048 2086
2049 j = nrow; 2087 j = nrow;
2050 wlen = len = -1; 2088 wlen = len = -1;
2051 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2052 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2053 { 2091 {
2054 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2055 { 2093 {
2056 line_t s = ROW(row - view_start); 2094 line_t s = ROW(view_start + row);
2057 line_t d = drawn_buf[row]; 2095 line_t d = drawn_buf[row];
2058 line_t d2 = drawn_buf[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2059 2097
2060 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2061 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2085 if (wlen < len) 2123 if (wlen < len)
2086 ::swap (wlen, len); 2124 ::swap (wlen, len);
2087 2125
2088 XCopyArea (display->display, vt, vt, 2126 XCopyArea (display->display, vt, vt,
2089 gc, 0, Row2Pixel (len + i), 2127 gc, 0, Row2Pixel (len + i),
2090 (unsigned int)TermWin_TotalWidth (), 2128 (unsigned int)this->width,
2091 (unsigned int)Height2Pixel (wlen - len + 1), 2129 (unsigned int)Height2Pixel (wlen - len + 1),
2092 0, Row2Pixel (len)); 2130 0, Row2Pixel (len));
2093 len = -1; 2131 len = -1;
2094 } 2132 }
2095 } 2133 }
… …
2099 /* 2137 /*
2100 * E: main pass across every character 2138 * E: main pass across every character
2101 */ 2139 */
2102 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2103 { 2141 {
2104 text_t *stp = ROW(row - view_start).t; 2142 text_t *stp = ROW(view_start + row).t;
2105 rend_t *srp = ROW(row - view_start).r; 2143 rend_t *srp = ROW(view_start + row).r;
2106 text_t *dtp = drawn_buf[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2107 rend_t *drp = drawn_buf[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2108 2146
2109 /* 2147 /*
2110 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
… …
2174 count++, i--; 2212 count++, i--;
2175 2213
2176 /* 2214 /*
2177 * Determine the attributes for the string 2215 * Determine the attributes for the string
2178 */ 2216 */
2179 int fore = GET_FGCOLOR (rend); // desired foreground 2217 int fore = fgcolor_of (rend); // desired foreground
2180 int back = GET_BGCOLOR (rend); // desired background 2218 int back = bgcolor_of (rend); // desired background
2181 2219
2182 // only do special processing if any attributes are set, which is rare 2220 // only do special processing if any attributes are set, which is unlikely
2183 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2184 { 2222 {
2185#if ENABLE_STYLES 2223#if ENABLE_STYLES
2186 // force redraw after "careful" characters to avoid pixel droppings 2224 // force redraw after "careful" characters to avoid pixel droppings
2187 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2298 } /* for (row....) */ 2336 } /* for (row....) */
2299 2337
2300#if ENABLE_OVERLAY 2338#if ENABLE_OVERLAY
2301 scr_swap_overlay (); 2339 scr_swap_overlay ();
2302#endif 2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2303 2342
2304 /* 2343 /*
2305 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2306 */ 2345 */
2307 if (showcursor) 2346 if (showcursor)
2308 { 2347 {
2309 if (focus) 2348 if (focus)
2310 { 2349 {
2311 if (options & Opt_cursorUnderline) 2350 if (OPTION (Opt_cursorUnderline))
2312 *crp ^= RS_Uline; 2351 *crp ^= RS_Uline;
2313 else 2352 else
2314 { 2353 {
2315 *crp ^= RS_RVid; 2354 *crp ^= RS_RVid;
2316#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
… …
2346 /* 2385 /*
2347 * H: cleanup selection 2386 * H: cleanup selection
2348 */ 2387 */
2349 scr_reverse_selection (); 2388 scr_reverse_selection ();
2350 2389
2351 if (refresh_type & SMOOTH_REFRESH)
2352 XFlush (display->display);
2353
2354 num_scr = 0; 2390 num_scr = 0;
2355 num_scr_allow = 1; 2391 num_scr_allow = 1;
2356} 2392}
2357 2393
2358void 2394void
2359rxvt_term::scr_remap_chars (const line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2360{ 2396{
2361 if (!l.t) 2397 if (!l.t)
2362 return; 2398 return;
2363 2399
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401
2364 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2365 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2366} 2404}
2367 2405
2368void 2406void
2369rxvt_term::scr_remap_chars () 2407rxvt_term::scr_remap_chars () NOTHROW
2370{ 2408{
2371 for (int i = total_rows; i--; ) 2409 for (int i = total_rows; i--; )
2372 scr_remap_chars (row_buf [i]); 2410 scr_remap_chars (row_buf [i]);
2373 2411
2374 for (int i = nrow; i--; ) 2412 for (int i = nrow; i--; )
… …
2377 scr_remap_chars (swap_buf [i]); 2415 scr_remap_chars (swap_buf [i]);
2378 } 2416 }
2379} 2417}
2380 2418
2381void 2419void
2382rxvt_term::scr_recolour () 2420rxvt_term::scr_recolour () NOTHROW
2383{ 2421{
2384 if (1 2422 if (1
2385#if TRANSPARENT 2423#if TRANSPARENT
2386 && !am_transparent 2424 && !am_transparent
2387#endif 2425#endif
… …
2408 want_refresh = 1; 2446 want_refresh = 1;
2409} 2447}
2410 2448
2411/* ------------------------------------------------------------------------- */ 2449/* ------------------------------------------------------------------------- */
2412void 2450void
2413rxvt_term::scr_clear (bool really) 2451rxvt_term::scr_clear (bool really) NOTHROW
2414{ 2452{
2415 if (!mapped) 2453 if (!mapped)
2416 return; 2454 return;
2417 2455
2418 num_scr_allow = 0; 2456 num_scr_allow = 0;
… …
2420 2458
2421 if (really) 2459 if (really)
2422 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2423} 2461}
2424 2462
2425/* ------------------------------------------------------------------------- */
2426void 2463void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{
2466 int view_end = view_start + nrow;
2467 int row, col;
2468
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2470 {
2471 text_t *stp = ROW(row).t;
2472 rend_t *srp = ROW(row).r;
2473
2474 for (col = beg_col; col < end_col; col++)
2475 srp[col] ^= rstyle1;
2476
2477 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2478 srp[col] ^= rstyle2;
2479
2480 if (++col < end_col)
2481 srp[col] ^= rstyle2;
2482 }
2483}
2484
2485void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 if (beg_row >= view_start)
2492 {
2493 col = beg_col;
2494 row = beg_row;
2495 }
2496 else
2497 {
2498 col = 0;
2499 row = view_start;
2500 }
2501
2502 for (; row < min (end_row, view_end); row++, col = 0)
2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2504 srp[col] ^= rstyle;
2505
2506 if (row == end_row)
2507 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2508 srp[col] ^= rstyle;
2509}
2510
2511/* ------------------------------------------------------------------------- */
2512void
2427rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection () NOTHROW
2428{ 2514{
2429 if (selection.op 2515 if (selection.op
2430 && current_screen == selection.screen 2516 && current_screen == selection.screen
2431 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2432 { 2518 {
2433 int view_end = -view_start + nrow;
2434 int row, col;
2435
2436#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2437 if (selection.rect) 2520 if (selection.rect)
2438 { 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2439 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2522 selection.end.row, selection.end.col,
2440 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2523 RS_RVid, RS_RVid | RS_Uline);
2441 srp[col] ^= RS_RVid;
2442 }
2443 else 2524 else
2444#endif 2525#endif
2445 { 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2446 if (selection.beg.row >= -view_start) 2527 selection.end.row, selection.end.col,
2447 { 2528 RS_RVid);
2448 col = selection.beg.col;
2449 row = selection.beg.row;
2450 }
2451 else
2452 {
2453 col = 0;
2454 row = view_start;
2455 }
2456
2457 for (; row < min (selection.end.row, view_end); row++, col = 0)
2458 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2459 srp[col] ^= RS_RVid;
2460
2461 if (row == selection.end.row)
2462 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2463 srp[col] ^= RS_RVid;
2464 }
2465 } 2529 }
2466} 2530}
2467 2531
2468/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2469/* 2533/*
2470 * Dump the whole scrollback and screen to the passed filedescriptor. The 2534 * Dump the whole scrollback and screen to the passed filedescriptor. The
2471 * invoking routine must close the fd. 2535 * invoking routine must close the fd.
2472 */ 2536 */
2473#if 0 2537#if 0
2474void 2538void
2475rxvt_term::scr_dump (int fd) 2539rxvt_term::scr_dump (int fd) NOTHROW
2476{ 2540{
2477 int row, wrote; 2541 int row, wrote;
2478 unsigned int width, towrite; 2542 unsigned int width, towrite;
2479 char r1[] = "\n"; 2543 char r1[] = "\n";
2480 2544
… …
2499 2563
2500/* ------------------------------------------------------------------------- * 2564/* ------------------------------------------------------------------------- *
2501 * CHARACTER SELECTION * 2565 * CHARACTER SELECTION *
2502 * ------------------------------------------------------------------------- */ 2566 * ------------------------------------------------------------------------- */
2503void 2567void
2504rxvt_term::selection_check (int check_more) 2568rxvt_term::selection_check (int check_more) NOTHROW
2505{ 2569{
2506 row_col_t pos; 2570 row_col_t pos;
2507 2571
2508 if (!selection.op) 2572 if (!selection.op)
2509 return; 2573 return;
2510 2574
2511 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2512 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2513 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2514 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2515 || (check_more == 1 2579 || (check_more == 1
2516 && current_screen == selection.screen 2580 && current_screen == selection.screen
2517 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2518 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2519 || (check_more == 2 2583 || (check_more == 2
… …
2530/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2531/* 2595/*
2532 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2533 */ 2597 */
2534void 2598void
2535rxvt_term::paste (unsigned char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len) NOTHROW
2536{ 2600{
2537 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2538 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2539 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2540 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2546/* 2610/*
2547 * Respond to a notification that a primary selection has been sent 2611 * Respond to a notification that a primary selection has been sent
2548 * EXT: SelectionNotify 2612 * EXT: SelectionNotify
2549 */ 2613 */
2550void 2614void
2551rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2615rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2552{ 2616{
2553 if (prop == None) /* check for failed XConvertSelection */ 2617 if (prop == None) /* check for failed XConvertSelection */
2554 { 2618 {
2555 if ((selection_type & Sel_CompoundText)) 2619 if ((selection_type & Sel_CompoundText))
2556 { 2620 {
… …
2684 { 2748 {
2685 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2686 char *s = rxvt_wcstombs (w); 2750 char *s = rxvt_wcstombs (w);
2687 free (w); 2751 free (w);
2688 // TODO: strlen == only the first element will be converted. well... 2752 // TODO: strlen == only the first element will be converted. well...
2689 paste ((unsigned char *)s, strlen (s)); 2753 paste (s, strlen (s));
2690 free (s); 2754 free (s);
2691 } 2755 }
2692 else 2756 else
2693#endif 2757#endif
2694 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2695 && cl) 2759 && cl)
2696 { 2760 {
2697 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2698 paste ((unsigned char *)cl[i], strlen (cl[i])); 2762 paste (cl[i], strlen (cl[i]));
2699 2763
2700 XFreeStringList (cl); 2764 XFreeStringList (cl);
2701 } 2765 }
2702 else 2766 else
2703 paste (ct.value, ct.nitems); // paste raw 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2704 2768
2705bailout: 2769bailout:
2706 XFree (ct.value); 2770 XFree (ct.value);
2707 2771
2708 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
2709 selection_wait = Sel_none; 2773 selection_wait = Sel_none;
2710} 2774}
2711 2775
2712void 2776void
2713rxvt_term::incr_cb (time_watcher &w) 2777rxvt_term::incr_cb (time_watcher &w) NOTHROW
2714{ 2778{
2715 selection_wait = Sel_none; 2779 selection_wait = Sel_none;
2716 2780
2717 incr_buf_size = 0; 2781 incr_buf_size = 0;
2718 free (incr_buf); 2782 free (incr_buf);
2719 2783
2720 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2784 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2721} 2785}
2722 2786
2723void 2787void
2724rxvt_term::selection_property (Window win, Atom prop) 2788rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2725{ 2789{
2726 if (prop == None || selection_wait != Sel_incr) 2790 if (prop == None || selection_wait != Sel_incr)
2727 return; 2791 return;
2728 2792
2729 selection_paste (win, prop, true); 2793 selection_paste (win, prop, true);
… …
2738 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2739 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2740 * EXT: button 2 release 2804 * EXT: button 2 release
2741 */ 2805 */
2742void 2806void
2743rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2744{ 2808{
2745 if (x < 0 || x >= width || y < 0 || y >= height) 2809 if (selection.text && selnum == Sel_Primary)
2746 return; /* outside window */
2747
2748 if (selection.text)
2749 { /* internal selection */ 2810 { /* internal selection */
2750 char *str = rxvt_wcstombs (selection.text, selection.len); 2811 char *str = rxvt_wcstombs (selection.text, selection.len);
2751 paste ((unsigned char *)str, strlen (str)); 2812 paste (str, strlen (str));
2752 free (str); 2813 free (str);
2753 return; 2814 return;
2754 } 2815 }
2755 else 2816 else
2756 { 2817 {
2757 int i;
2758
2759 selection_request_time = tm; 2818 selection_request_time = tm;
2760 selection_wait = Sel_normal; 2819 selection_wait = Sel_normal;
2761 2820
2762 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2763 {
2764#if X_HAVE_UTF8_STRING 2821#if X_HAVE_UTF8_STRING
2765 selection_type = Sel_UTF8String; 2822 selection_type = Sel_UTF8String;
2766 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2823 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2767 return; 2824 return;
2768#else 2825#else
2769 selection_type = Sel_CompoundText; 2826 selection_type = Sel_CompoundText;
2770 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2827 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2771 return; 2828 return;
2772#endif 2829#endif
2773 }
2774 } 2830 }
2775 2831
2776 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2832 selection_wait = Sel_none; /* don't loop in selection_paste () */
2777 selection_paste (display->root, XA_CUT_BUFFER0, false); 2833 selection_paste (display->root, XA_CUT_BUFFER0, false);
2778} 2834}
2779 2835
2780int 2836int
2781rxvt_term::selection_request_other (Atom target, int selnum) 2837rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2782{ 2838{
2783 Atom sel; 2839 Atom sel;
2784 2840
2785 selection_type |= selnum; 2841 selection_type |= selnum;
2786 2842
… …
2805/* 2861/*
2806 * Clear all selected text 2862 * Clear all selected text
2807 * EXT: SelectionClear 2863 * EXT: SelectionClear
2808 */ 2864 */
2809void 2865void
2810rxvt_term::selection_clear () 2866rxvt_term::selection_clear () NOTHROW
2811{ 2867{
2812 want_refresh = 1; 2868 want_refresh = 1;
2813 free (selection.text); 2869 free (selection.text);
2814 selection.text = NULL; 2870 selection.text = NULL;
2815 selection.len = 0; 2871 selection.len = 0;
… …
2848 selection.op = SELECTION_DONE; 2904 selection.op = SELECTION_DONE;
2849 2905
2850 if (selection.clicks == 4) 2906 if (selection.clicks == 4)
2851 return; /* nothing selected, go away */ 2907 return; /* nothing selected, go away */
2852 2908
2909 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2910 return;
2911
2853 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2912 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2854 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2913 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2855 2914
2856 int ofs = 0; 2915 int ofs = 0;
2857 int extra = 0; 2916 int extra = 0;
… …
2869 col = selection.beg.col; 2928 col = selection.beg.col;
2870 end_col = ncol + 1; 2929 end_col = ncol + 1;
2871 } 2930 }
2872 else 2931 else
2873#endif 2932#endif
2874 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2933 end_col = ROW(row).l;
2875 2934
2876 col = max (col, 0); 2935 col = max (col, 0);
2877 2936
2878 if (row == selection.end.row || selection.rect) 2937 if (row == selection.end.row
2938#if ENABLE_FRILLS
2939 || selection.rect
2940#endif
2941 )
2879 end_col = min (end_col, selection.end.col); 2942 min_it (end_col, selection.end.col);
2880 2943
2881 t = ROW(row).t + col; 2944 t = ROW(row).t + col;
2945
2882 for (; col < end_col; col++) 2946 for (; col < end_col; col++)
2883 { 2947 {
2884 if (*t == NOCHAR) 2948 if (*t == NOCHAR)
2885 t++; 2949 t++;
2886#if ENABLE_COMBINING 2950#if ENABLE_COMBINING
… …
2902#endif 2966#endif
2903 else 2967 else
2904 new_selection_text[ofs++] = *t++; 2968 new_selection_text[ofs++] = *t++;
2905 } 2969 }
2906 2970
2971#if ENABLE_FRILLS
2972 if (selection.rect)
2973 {
2974 while (ofs
2975 && new_selection_text[ofs - 1] != C0_LF
2976 && unicode::is_space (new_selection_text[ofs - 1]))
2977 --ofs;
2978
2979 new_selection_text[ofs++] = C0_LF;
2980 }
2981 else
2982#endif
2907 if (!ROW(row).is_longer () && row != selection.end.row) 2983 if (!ROW(row).is_longer () && row != selection.end.row)
2908 new_selection_text[ofs++] = C0_LF; 2984 new_selection_text[ofs++] = C0_LF;
2909 } 2985 }
2910 2986
2911 if (end_col != selection.end.col) 2987 if (end_col != selection.end.col)
2912 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2913 2989
… …
2923 2999
2924 // we usually allocate much more than necessary, so realloc it smaller again 3000 // we usually allocate much more than necessary, so realloc it smaller again
2925 selection.len = ofs; 3001 selection.len = ofs;
2926 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3002 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2927 3003
3004 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3005 return;
3006
3007 selection_grab (tm);
3008}
3009
3010bool
3011rxvt_term::selection_grab (Time tm) NOTHROW
3012{
3013 selection_time = tm;
3014
2928 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3015 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2929 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3016 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3017 {
2930 display->set_selection_owner (this); 3018 display->set_selection_owner (this);
3019 return true;
3020 }
2931 else 3021 else
2932 rxvt_warn ("can't get primary selection, ignoring.\n"); 3022 {
3023 selection_clear ();
3024 return false;
3025 }
2933 3026
2934#if 0 3027#if 0
2935 XTextProperty ct; 3028 XTextProperty ct;
2936 3029
2937 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3030 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2938 { 3031 {
2939 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3032 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2940 XFree (ct.value); 3033 XFree (ct.value);
2941 } 3034 }
2942#endif 3035#endif
2943
2944 selection_time = tm;
2945} 3036}
2946 3037
2947/* ------------------------------------------------------------------------- */ 3038/* ------------------------------------------------------------------------- */
2948/* 3039/*
2949 * Mark or select text based upon number of clicks: 1, 2, or 3 3040 * Mark or select text based upon number of clicks: 1, 2, or 3
2950 * EXT: button 1 press 3041 * EXT: button 1 press
2951 */ 3042 */
2952void 3043void
2953rxvt_term::selection_click (int clicks, int x, int y) 3044rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2954{ 3045{
2955 clicks = ((clicks - 1) % 3) + 1; 3046 clicks = ((clicks - 1) % 3) + 1;
2956 selection.clicks = clicks; /* save clicks so extend will work */ 3047 selection.clicks = clicks; /* save clicks so extend will work */
2957 3048
3049 if (clicks == 2 && !selection.rect
3050 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3051 {
3052 MEvent.clicks = 1; // what a mess
3053 selection.screen = current_screen;
3054 selection.op = SELECTION_CONT;
3055 return;
3056 }
3057
2958 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3058 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2959 3059
2960 if (clicks == 2 || clicks == 3) 3060 if (clicks == 2 || clicks == 3)
2961 selection_extend_colrow (selection.mark.col, 3061 selection_extend_colrow (selection.mark.col,
2962 selection.mark.row + view_start, 3062 selection.mark.row - view_start,
2963 0, /* button 3 */ 3063 0, /* button 3 */
2964 1, /* button press */ 3064 1, /* button press */
2965 0); /* click change */ 3065 0); /* click change */
2966} 3066}
2967 3067
2968/* ------------------------------------------------------------------------- */ 3068/* ------------------------------------------------------------------------- */
2969/* 3069/*
2970 * Mark a selection at the specified col/row 3070 * Mark a selection at the specified col/row
2971 */ 3071 */
2972void 3072void
2973rxvt_term::selection_start_colrow (int col, int row) 3073rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2974{ 3074{
2975 want_refresh = 1; 3075 want_refresh = 1;
2976 3076
2977 selection.mark.row = row - view_start; 3077 selection.mark.row = row + view_start;
2978 selection.mark.col = col; 3078 selection.mark.col = col;
2979 3079
2980 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3080 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2981 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3081 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2982 3082
2983 while (selection.mark.col > 0 3083 while (selection.mark.col > 0
2984 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3084 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2985 --selection.mark.col; 3085 --selection.mark.col;
… …
3004#define DELIMIT_TEXT(x) \ 3104#define DELIMIT_TEXT(x) \
3005 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3105 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3006#define DELIMIT_REND(x) 1 3106#define DELIMIT_REND(x) 1
3007 3107
3008void 3108void
3009rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3109rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3010{ 3110{
3011 int col, row, dirnadd, tcol, trow, w1, w2; 3111 int col, row, dirnadd, tcol, trow, w1, w2;
3012 row_col_t bound; 3112 row_col_t bound;
3013 text_t *stp; 3113 text_t *stp;
3014 rend_t *srp; 3114 rend_t *srp;
3015 3115
3016 if (dirn == UP) 3116 if (dirn == UP)
3017 { 3117 {
3018 bound.row = - nsaved - 1; 3118 bound.row = top_row - 1;
3019 bound.col = 0; 3119 bound.col = 0;
3020 dirnadd = -1; 3120 dirnadd = -1;
3021 } 3121 }
3022 else 3122 else
3023 { 3123 {
… …
3071 } 3171 }
3072 } 3172 }
3073 break; 3173 break;
3074 } 3174 }
3075 3175
3076Old_Word_Selection_You_Die:
3077 if (dirn == DN) 3176 if (dirn == DN)
3078 col++; /* put us on one past the end */ 3177 col++; /* put us on one past the end */
3079 3178
3080 /* Poke the values back in */ 3179 /* Poke the values back in */
3081 ret->row = row; 3180 ret->row = row;
… …
3089 * flag == 0 ==> button 1 3188 * flag == 0 ==> button 1
3090 * flag == 1 ==> button 3 press 3189 * flag == 1 ==> button 3 press
3091 * flag == 2 ==> button 3 motion 3190 * flag == 2 ==> button 3 motion
3092 */ 3191 */
3093void 3192void
3094rxvt_term::selection_extend (int x, int y, int flag) 3193rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3095{ 3194{
3096 int col = clamp (Pixel2Col (x), 0, ncol); 3195 int col = clamp (Pixel2Col (x), 0, ncol);
3097 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3196 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3098 3197
3099 /* 3198 /*
… …
3102 * select nothing. Otherwise, if we're to the right of the mark, you have to 3201 * select nothing. Otherwise, if we're to the right of the mark, you have to
3103 * be _past_ a character for it to be selected. 3202 * be _past_ a character for it to be selected.
3104 */ 3203 */
3105 if (((selection.clicks % 3) == 1) && !flag 3204 if (((selection.clicks % 3) == 1) && !flag
3106 && (col == selection.mark.col 3205 && (col == selection.mark.col
3107 && (row == selection.mark.row + view_start))) 3206 && (row == selection.mark.row - view_start)))
3108 { 3207 {
3109 /* select nothing */ 3208 /* select nothing */
3110 selection.beg.row = selection.end.row = 0; 3209 selection.beg.row = selection.end.row = 0;
3111 selection.beg.col = selection.end.col = 0; 3210 selection.beg.col = selection.end.col = 0;
3112 selection.clicks = 4; 3211 selection.clicks = 4;
… …
3125/* ------------------------------------------------------------------------- */ 3224/* ------------------------------------------------------------------------- */
3126/* 3225/*
3127 * Extend the selection to the specified col/row 3226 * Extend the selection to the specified col/row
3128 */ 3227 */
3129void 3228void
3130rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3229rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3131{ 3230{
3132 row_col_t pos; 3231 row_col_t pos;
3133 enum { 3232 enum {
3134 LEFT, RIGHT 3233 LEFT, RIGHT
3135 } closeto = RIGHT; 3234 } closeto = RIGHT;
… …
3167 selection.beg.col = selection.end.col = selection.mark.col; 3266 selection.beg.col = selection.end.col = selection.mark.col;
3168 selection.beg.row = selection.end.row = selection.mark.row; 3267 selection.beg.row = selection.end.row = selection.mark.row;
3169 } 3268 }
3170 3269
3171 pos.col = col; 3270 pos.col = col;
3172 pos.row = row - view_start; 3271 pos.row = view_start + row;
3173 3272
3174 /* 3273 /*
3175 * This is mainly xterm style selection with a couple of differences, mainly 3274 * This is mainly xterm style selection with a couple of differences, mainly
3176 * in the way button3 drag extension works. 3275 * in the way button3 drag extension works.
3177 * We're either doing: button1 drag; button3 press; or button3 drag 3276 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3264 selection_delimit_word (DN, &selection.end, &selection.end); 3363 selection_delimit_word (DN, &selection.end, &selection.end);
3265 } 3364 }
3266 else if (selection.clicks == 3) 3365 else if (selection.clicks == 3)
3267 { 3366 {
3268#if ENABLE_FRILLS 3367#if ENABLE_FRILLS
3269 if (options & Opt_tripleclickwords) 3368 if (OPTION (Opt_tripleclickwords))
3270 { 3369 {
3271 selection_delimit_word (UP, &selection.beg, &selection.beg); 3370 selection_delimit_word (UP, &selection.beg, &selection.beg);
3272 3371
3273 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3372 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3274 { 3373 {
… …
3321#endif 3420#endif
3322} 3421}
3323 3422
3324#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3325void 3424void
3326rxvt_term::selection_remove_trailing_spaces () 3425rxvt_term::selection_remove_trailing_spaces () NOTHROW
3327{ 3426{
3328 int32_t end_col, end_row; 3427 int32_t end_col, end_row;
3329 text_t *stp; 3428 text_t *stp;
3330 3429
3331 end_col = selection.end.col; 3430 end_col = selection.end.col;
… …
3335 { 3434 {
3336 stp = ROW(end_row).t; 3435 stp = ROW(end_row).t;
3337 3436
3338 while (--end_col >= 0) 3437 while (--end_col >= 0)
3339 { 3438 {
3340 if (stp[end_col] != ' ' 3439 if (stp[end_col] != NOCHAR
3341 && stp[end_col] != '\t' 3440 && !unicode::is_space (stp[end_col]))
3342 && stp[end_col] != NOCHAR)
3343 break; 3441 break;
3344 } 3442 }
3345 3443
3346 if (end_col >= 0 3444 if (end_col >= 0
3347 || !ROW(end_row - 1).is_longer ()) 3445 || !ROW(end_row - 1).is_longer ())
… …
3370/* 3468/*
3371 * Double click on button 3 when already selected 3469 * Double click on button 3 when already selected
3372 * EXT: button 3 double click 3470 * EXT: button 3 double click
3373 */ 3471 */
3374void 3472void
3375rxvt_term::selection_rotate (int x, int y) 3473rxvt_term::selection_rotate (int x, int y) NOTHROW
3376{ 3474{
3377 selection.clicks = selection.clicks % 3 + 1; 3475 selection.clicks = selection.clicks % 3 + 1;
3378 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3476 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3379} 3477}
3380 3478
… …
3382/* 3480/*
3383 * Respond to a request for our current selection 3481 * Respond to a request for our current selection
3384 * EXT: SelectionRequest 3482 * EXT: SelectionRequest
3385 */ 3483 */
3386void 3484void
3387rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3485rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3388{ 3486{
3389 XSelectionEvent ev; 3487 XSelectionEvent ev;
3390 dDisp; 3488 dDisp;
3391 3489
3392 ev.type = SelectionNotify; 3490 ev.type = SelectionNotify;
… …
3520 3618
3521/* 3619/*
3522 * return col/row values corresponding to x/y pixel values 3620 * return col/row values corresponding to x/y pixel values
3523 */ 3621 */
3524void 3622void
3525rxvt_term::pixel_position (int *x, int *y) 3623rxvt_term::pixel_position (int *x, int *y) NOTHROW
3526{ 3624{
3527 *x = Pixel2Col (*x); 3625 *x = Pixel2Col (*x);
3528 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3626 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3529 *y = Pixel2Row (*y); 3627 *y = Pixel2Row (*y);
3530 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3628 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3531} 3629}
3532 3630
3533/* ------------------------------------------------------------------------- */ 3631/* ------------------------------------------------------------------------- */
3534#ifdef USE_XIM 3632#ifdef USE_XIM
3535void 3633void
3536rxvt_term::im_set_position (XPoint &pos) 3634rxvt_term::im_set_position (XPoint &pos) NOTHROW
3537{ 3635{
3538 XWindowAttributes xwa; 3636 XWindowAttributes xwa;
3539 3637
3540 XGetWindowAttributes (display->display, vt, &xwa); 3638 XGetWindowAttributes (display->display, vt, &xwa);
3541 3639
… …
3544} 3642}
3545#endif 3643#endif
3546 3644
3547#if ENABLE_OVERLAY 3645#if ENABLE_OVERLAY
3548void 3646void
3549rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3647rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3550{ 3648{
3551 if (nrow < 3 || ncol < 3) 3649 if (nrow < 1 || ncol < 1)
3552 return; 3650 return;
3553 3651
3554 want_refresh = 1; 3652 want_refresh = 1;
3555 3653
3556 scr_overlay_off (); 3654 scr_overlay_off ();
… …
3599 *rp = r; 3697 *rp = r;
3600 } 3698 }
3601} 3699}
3602 3700
3603void 3701void
3604rxvt_term::scr_overlay_off () 3702rxvt_term::scr_overlay_off () NOTHROW
3605{ 3703{
3606 if (!ov_text) 3704 if (!ov_text)
3607 return; 3705 return;
3608 3706
3609 want_refresh = 1; 3707 want_refresh = 1;
… …
3617 delete [] ov_text; ov_text = 0; 3715 delete [] ov_text; ov_text = 0;
3618 delete [] ov_rend; ov_rend = 0; 3716 delete [] ov_rend; ov_rend = 0;
3619} 3717}
3620 3718
3621void 3719void
3622rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3720rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3623{ 3721{
3624 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3722 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3625 return; 3723 return;
3626 3724
3627 x++, y++; 3725 x++, y++;
… …
3629 ov_text[y][x] = text; 3727 ov_text[y][x] = text;
3630 ov_rend[y][x] = rend; 3728 ov_rend[y][x] = rend;
3631} 3729}
3632 3730
3633void 3731void
3634rxvt_term::scr_overlay_set (int x, int y, const char *s) 3732rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3635{ 3733{
3636 while (*s) 3734 while (*s)
3637 scr_overlay_set (x++, y, *s++); 3735 scr_overlay_set (x++, y, *s++);
3638} 3736}
3639 3737
3640void 3738void
3641rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3739rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3642{ 3740{
3643 while (*s) 3741 while (*s)
3644 { 3742 {
3645 text_t t = *s++; 3743 text_t t = *s++;
3646 int width = wcwidth (t); 3744 int width = wcwidth (t);
… …
3652 } 3750 }
3653 } 3751 }
3654} 3752}
3655 3753
3656void 3754void
3657rxvt_term::scr_swap_overlay () 3755rxvt_term::scr_swap_overlay () NOTHROW
3658{ 3756{
3659 if (!ov_text) 3757 if (!ov_text)
3660 return; 3758 return;
3661 3759
3662 // swap screen mem with overlay 3760 // swap screen mem with overlay
3663 for (int y = ov_h; y--; ) 3761 for (int y = ov_h; y--; )
3664 { 3762 {
3665 text_t *t1 = ov_text[y]; 3763 text_t *t1 = ov_text[y];
3666 rend_t *r1 = ov_rend[y]; 3764 rend_t *r1 = ov_rend[y];
3667 3765
3668 text_t *t2 = ROW(y - view_start).t + ov_x; 3766 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3669 rend_t *r2 = ROW(y - view_start).r + ov_x; 3767 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3670 3768
3671 for (int x = ov_w; x--; ) 3769 for (int x = ov_w; x--; )
3672 { 3770 {
3673 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3771 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3674 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3772 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