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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 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 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * first time called so just malloc everything: don't rely on realloc 201 * 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 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 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)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
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)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 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); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 281
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 293
… …
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
326 // fill a single destination line 336 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
328 { 338 {
329 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
340 350
341 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
342 352
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344 354
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350 357
351 lofs += len; 358 lofs += len;
352 qcol += len; 359 qcol += len;
353 } 360 }
354 } 361 }
355 362
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
364 qline->is_longer (0);
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 366 }
359 while (p != pend && q > 0); 367 while (p != pend && q > 0);
360 368
361 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
362 nsaved = term_start - q; 370 top_row = q - term_start;
363 371
364 // make sure all terminal lines exist 372 // make sure all terminal lines exist
365 while (nsaved < 0) 373 while (top_row > 0)
366 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
367
368 } 375 }
369 else 376 else
370 { 377 {
371 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
372 379
… …
385 } 392 }
386 393
387 term_start = 0; 394 term_start = 0;
388 } 395 }
389 396
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); 397 free (old_buf);
396 delete old_ta; 398 delete old_ta;
397 delete old_ra; 399 delete old_ra;
398 400
399 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
401 403
402 if (tabs)
403 free (tabs); 404 free (tabs);
404 } 405 }
406
407 CLEAR_ALL_SELECTION ();
405 408
406 prev_nrow = nrow; 409 prev_nrow = nrow;
407 prev_ncol = ncol; 410 prev_ncol = ncol;
408 411
409 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
410 413
411 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
412 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
413 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
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{
432 if (row_buf)
433 {
424 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
425 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
426 436
427 free (row_buf); 437 free (row_buf);
428 free (swap_buf); 438 free (swap_buf);
429 free (drawn_buf); 439 free (drawn_buf);
430 free (temp_buf);
431 free (tabs); 440 free (tabs);
432 441
433 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
434} 444}
435 445
436/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
437/* 447/*
438 * Hard reset 448 * Hard reset
… …
443 scr_release (); 453 scr_release ();
444 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
445 scr_reset (); 455 scr_reset ();
446 456
447 scr_clear (true); 457 scr_clear (true);
448 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
449} 459}
450 460
451/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
452 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
453 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
455 * Save and Restore cursor 465 * Save and Restore cursor
456 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
457 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
458 */ 468 */
459void 469void
460rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
461{ 471{
462 screen_t *s; 472 screen_t *s;
463 473
464#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
465 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
497 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
498 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
499#endif 509#endif
500} 510}
501 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
502/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
503/* 528/*
504 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
505 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
506 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
507 */ 532 */
508int 533void
509rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
510{ 535{
536 if (scrn == current_screen)
537 return;
538
511 want_refresh = 1; 539 want_refresh = 1;
512 view_start = 0; 540 view_start = 0;
513 541
514 if (current_screen == scrn)
515 return scrn;
516
517 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
518 543
519 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
520 545
521 ::swap (screen.cur.row, swap.cur.row);
522 ::swap (screen.cur.col, swap.cur.col);
523
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526
527#if NSCREENS 546#if NSCREENS
528 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
529 { 548 {
530 num_scr = 0; 549 num_scr = 0;
531 550
532 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
533 ::swap (ROW(i), swap_buf [i]);
534 552
535 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
536 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
537 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
539 } 557 }
540 else 558 else
541#endif 559#endif
542 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544
545 return scrn;
546} 562}
547 563
548// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
549void 565void
550rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
551{ 567{
552 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
553 return; 569 return;
554 570
555 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
565/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
566/* 582/*
567 * Change the colour for following text 583 * Change the colour for following text
568 */ 584 */
569void 585void
570rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
571{ 587{
572 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
573 color = fgbg; 589 color = fgbg;
574 590
575 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
576 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
577 else 593 else
… …
581/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
582/* 598/*
583 * Change the rendition style for following text 599 * Change the rendition style for following text
584 */ 600 */
585void 601void
586rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
587 { 603 {
588 if (set) 604 if (set)
589 rstyle |= style; 605 rstyle |= style;
590 else if (style == ~RS_None) 606 else if (style == ~RS_None)
591 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
598 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
599 * count positive ==> scroll up 615 * count positive ==> scroll up
600 * count negative ==> scroll down 616 * count negative ==> scroll down
601 */ 617 */
602int 618int
603rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
604{ 620{
605 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
606 return 0; 622 return 0;
607 623
608 want_refresh = 1; 624 want_refresh = 1;
609 num_scr += count; 625 num_scr += count;
610 626
611 if (count > 0 627 if (count > 0
612 && row1 == 0 628 && row1 == 0
613 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 630 {
616 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
617 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
618 635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
619 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
620 { 670 {
621 selection.beg.row -= count; 671 selection.beg.row -= count;
622 selection.end.row -= count; 672 selection.end.row -= count;
623 selection.mark.row -= count; 673 selection.mark.row -= count;
624 674
625 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
626 || selection.end.row < -nsaved 676 || selection.end.row < top_row
627 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
628 { 678 {
629 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
630 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
631 } 681 }
632 } 682 }
633 683
634 for (int i = count; i--; ) 684 // finally move the view window, if desired
635 scr_blank_screen_mem (ROW(row2 - i), rstyle);
636
637 if ((options & Opt_scrollWithBuffer) 685 if (OPTION (Opt_scrollWithBuffer)
638 && view_start != 0 686 && view_start != 0
639 && view_start != saveLines) 687 && view_start != -saveLines)
640 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
641 } 692 }
642 else 693 else
643 { 694 {
644 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
645 { 696 {
… …
669 720
670 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
671 722
672 min_it (count, rows); 723 min_it (count, rows);
673 724
725 line_t *temp_buf = row_buf + total_rows;
726
674 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
675 { 728 {
676 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
677 730
678 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
689/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
690/* 743/*
691 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
692 */ 745 */
693void 746void
694rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
695{ 748{
696 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
697 return; 750 return;
698 751
699 unsigned char checksel; 752 unsigned char checksel;
700 unicode_t c; 753 unicode_t c;
701 int last_col; 754 int ncol = this->ncol;
702 const unicode_t *strend = str + len; 755 const wchar_t *strend = str + len;
703 756
704 want_refresh = 1; 757 want_refresh = 1;
705 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
706 last_col = ncol;
707 759
708 if (nlines > 0) 760 if (minlines > 0)
709 { 761 {
710 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763
711 if (nlines > 0 764 if (minlines > 0
712 && screen.tscroll == 0 765 && screen.tscroll == 0
713 && screen.bscroll == (nrow - 1)) 766 && screen.bscroll == nrow - 1)
714 { 767 {
715 /* _at least_ this many lines need to be scrolled */ 768 /* _at least_ this many lines need to be scrolled */
716 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 769 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
717 screen.cur.row -= nlines; 770 screen.cur.row -= minlines;
718 } 771 }
719 } 772 }
720 773
721#ifdef DEBUG_STRICT 774#ifdef DEBUG_STRICT
722 assert (screen.cur.col < last_col); 775 assert (screen.cur.col < ncol);
723 assert (screen.cur.row < nrow 776 assert (screen.cur.row < nrow
724 && screen.cur.row >= -nsaved); 777 && screen.cur.row >= top_row);
725#endif 778#endif
726 int row = screen.cur.row; 779 int row = screen.cur.row;
727 780
728 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 781 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
729 782
730 line_t *line = &ROW(row); 783 line_t *line = &ROW(row);
731 784
732 while (str < strend) 785 while (str < strend)
733 { 786 {
734 c = *str++; 787 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
735 788
736 if (c < 0x20) 789 if (c < 0x20)
737 if (c == C0_LF) 790 if (c == C0_LF)
738 { 791 {
739 if (!line->is_longer ()) /* XXX: think about this */
740 max_it (line->l, screen.cur.col); 792 max_it (line->l, screen.cur.col);
741 793
742 screen.flags &= ~Screen_WrapNext; 794 screen.flags &= ~Screen_WrapNext;
743 795
744 if (screen.cur.row == screen.bscroll) 796 if (screen.cur.row == screen.bscroll)
745 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 797 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
749 line = &ROW(row); /* _must_ refresh */ 801 line = &ROW(row); /* _must_ refresh */
750 continue; 802 continue;
751 } 803 }
752 else if (c == C0_CR) 804 else if (c == C0_CR)
753 { 805 {
754 if (!line->is_longer ()) /* XXX: think about this */
755 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
756 807
757 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
758 screen.cur.col = 0; 809 screen.cur.col = 0;
759 continue; 810 continue;
760 } 811 }
… …
777 CLEAR_SELECTION (); 828 CLEAR_SELECTION ();
778 } 829 }
779 830
780 if (screen.flags & Screen_WrapNext) 831 if (screen.flags & Screen_WrapNext)
781 { 832 {
782 line->set_is_longer ();
783
784 scr_do_wrap (); 833 scr_do_wrap ();
785 834
835 line->l = ncol;
836 line->is_longer (1);
837
786 row = screen.cur.row; 838 row = screen.cur.row;
787 line = &ROW(row); /* _must_ refresh */ 839 line = &ROW(row); /* _must_ refresh */
788 } 840 }
789 841
790 // some utf-8 decoders "decode" surrogate characters: let's fix this. 842 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
795 // do wcwidth before further replacements, as wcwidth might return -1 847 // do wcwidth before further replacements, as wcwidth might return -1
796 // for the line drawing characters below as they might be invalid in the current 848 // for the line drawing characters below as they might be invalid in the current
797 // locale. 849 // locale.
798 int width = c < 0x100 ? 1 : wcwidth (c); 850 int width = c < 0x100 ? 1 : wcwidth (c);
799 851
800 if (charsets[screen.charset] == '0') // DEC SPECIAL 852 if (charsets [screen.charset] == '0') // DEC SPECIAL
801 { 853 {
802 // vt100 special graphics and line drawing 854 // vt100 special graphics and line drawing
803 // 5f-7e standard vt100 855 // 5f-7e standard vt100
804 // 40-5e rxvt extension for extra curses acs chars 856 // 40-5e rxvt extension for extra curses acs chars
805 static uint16_t vt100_0[62] = { // 41 .. 7e 857 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 } 909 }
858 910
859 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
860 912
861 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
862 if (screen.cur.col > last_col - width && last_col >= width) 914 if (screen.cur.col > ncol - width && ncol >= width)
863 { 915 {
864 // ...output spaces 916 // ...output spaces
865 c = ' '; 917 c = ' ';
866 // and try the same character next loop iteration 918 // and try the same character next loop iteration
867 --str; 919 --str;
868 } 920 }
869 921
922 line->touch ();
923
870 do 924 do
871 { 925 {
872 line->t[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
873 line->r[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
874 928
875 if (screen.cur.col < last_col - 1) 929 if (screen.cur.col < ncol - 1)
876 screen.cur.col++; 930 screen.cur.col++;
877 else 931 else
878 { 932 {
879 line->l = last_col; 933 line->l = ncol;
880 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
881 screen.flags |= Screen_WrapNext; 935 screen.flags |= Screen_WrapNext;
882 break; 936 break;
883 } 937 }
884 938
… …
886 } 940 }
887 while (--width > 0); 941 while (--width > 0);
888 942
889 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
890 if (!width) 944 if (!width)
945 {
946 line->touch ();
947
891 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
892 { 949 {
893 line->t[c] = ' '; 950 line->t[c] = ' ';
894 line->r[c] = rend; 951 line->r[c] = rend;
895 } 952 }
953 }
896 } 954 }
897 else // width == 0 955 else // width == 0
898 { 956 {
899#if ENABLE_COMBINING 957#if ENABLE_COMBINING
900 // handle combining characters 958 // handle combining characters
901 // we just tag the accent on the previous on-screen character. 959 // we just tag the accent on the previous on-screen character.
902 // this is arguably not correct, but also arguably not wrong. 960 // this is arguably not correct, but also arguably not wrong.
903 // we don't handle double-width characters nicely yet. 961 // we don't handle double-width characters nicely yet.
962 line_t *linep;
904 text_t *tp; 963 text_t *tp;
905 rend_t *rp; 964 rend_t *rp;
906 965
907 if (screen.cur.col > 0) 966 if (screen.cur.col > 0)
908 { 967 {
968 linep = line;
909 tp = line->t + screen.cur.col - 1; 969 tp = line->t + screen.cur.col - 1;
910 rp = line->r + screen.cur.col - 1; 970 rp = line->r + screen.cur.col - 1;
911
912 while (*tp == NOCHAR && tp > line->t)
913 tp--, rp--;
914 } 971 }
915 else if (screen.cur.row > 0 972 else if (screen.cur.row > 0
916 && ROW(screen.cur.row - 1).is_longer ()) 973 && ROW(screen.cur.row - 1).is_longer ())
917 { 974 {
918 line_t *line = &ROW(screen.cur.row - 1); 975 linep = &ROW(screen.cur.row - 1);
919
920 tp = line->t + last_col - 1; 976 tp = line->t + ncol - 1;
921 rp = line->r + last_col - 1; 977 rp = line->r + ncol - 1;
922
923 while (*tp == NOCHAR && tp > line->t)
924 tp--, rp--;
925 } 978 }
926 else 979 else
927 continue; 980 continue;
981
982 linep->touch ();
983
984 while (*tp == NOCHAR && tp > linep->t)
985 tp--, rp--;
928 986
929 // first try to find a precomposed character 987 // first try to find a precomposed character
930 unicode_t n = rxvt_compose (*tp, c); 988 unicode_t n = rxvt_compose (*tp, c);
931 if (n == NOCHAR) 989 if (n == NOCHAR)
932 n = rxvt_composite.compose (*tp, c); 990 n = rxvt_composite.compose (*tp, c);
… …
935 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 993 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
936#endif 994#endif
937 } 995 }
938 } 996 }
939 997
940 if (!line->is_longer ()) /* XXX: think about this */
941 max_it (line->l, screen.cur.col); 998 max_it (line->l, screen.cur.col);
942 999
943#ifdef DEBUG_STRICT 1000#ifdef DEBUG_STRICT
944 assert (screen.cur.row >= 0); 1001 assert (screen.cur.row >= 0);
945#endif 1002#endif
946} 1003}
… …
949/* 1006/*
950 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
951 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
952 */ 1009 */
953void 1010void
954rxvt_term::scr_backspace () 1011rxvt_term::scr_backspace () NOTHROW
955{ 1012{
956 want_refresh = 1; 1013 want_refresh = 1;
957 1014
958 if (screen.cur.col == 0) 1015 if (screen.cur.col == 0)
959 { 1016 {
… …
977 * Process Horizontal Tab 1034 * Process Horizontal Tab
978 * count: +ve = forward; -ve = backwards 1035 * count: +ve = forward; -ve = backwards
979 * XTERM_SEQ: CTRL-I 1036 * XTERM_SEQ: CTRL-I
980 */ 1037 */
981void 1038void
982rxvt_term::scr_tab (int count, bool ht) 1039rxvt_term::scr_tab (int count, bool ht) NOTHROW
983{ 1040{
984 int i, x; 1041 int i, x;
985 1042
986 want_refresh = 1; 1043 want_refresh = 1;
987 i = x = screen.cur.col; 1044 i = x = screen.cur.col;
… …
996 1053
997 for (; ++i < ncol; ) 1054 for (; ++i < ncol; )
998 if (tabs[i]) 1055 if (tabs[i])
999 { 1056 {
1000 x = i; 1057 x = i;
1058
1001 if (!--count) 1059 if (!--count)
1002 break; 1060 break;
1003 } 1061 }
1004 else 1062 else
1005 ht &= l.t[i] == ' ' 1063 ht &= l.t[i] == ' '
… …
1008 if (count) 1066 if (count)
1009 x = ncol - 1; 1067 x = ncol - 1;
1010 1068
1011 // store horizontal tab commands as characters inside the text 1069 // store horizontal tab commands as characters inside the text
1012 // buffer so they can be selected and pasted. 1070 // buffer so they can be selected and pasted.
1013 if (ht && options & Opt_pastableTabs) 1071 if (ht && OPTION (Opt_pastableTabs))
1014 { 1072 {
1015 base_rend = SET_FONT (base_rend, 0); 1073 base_rend = SET_FONT (base_rend, 0);
1016 1074
1017 if (!l.is_longer ()) /* XXX: think about this */ 1075 l.touch (x);
1018 max_it (l.l, x);
1019 1076
1020 i = screen.cur.col; 1077 i = screen.cur.col;
1021 1078
1022 l.t[i] = '\t'; 1079 l.t[i] = '\t';
1023 l.r[i] = base_rend; 1080 l.r[i] = base_rend;
… …
1054 * Move cursor left in row. If we're at the left boundary, shift everything 1111 * Move cursor left in row. If we're at the left boundary, shift everything
1055 * in that row right. Clear left column. 1112 * in that row right. Clear left column.
1056 */ 1113 */
1057#if ENABLE_FRILLS 1114#if ENABLE_FRILLS
1058void 1115void
1059rxvt_term::scr_backindex () 1116rxvt_term::scr_backindex () NOTHROW
1060{ 1117{
1061 if (screen.cur.col > 0) 1118 if (screen.cur.col > 0)
1062 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1063 else 1120 else
1064 scr_insdel_chars (1, INSERT); 1121 scr_insdel_chars (1, INSERT);
… …
1071 * Move cursor right in row. If we're at the right boundary, shift everything 1128 * Move cursor right in row. If we're at the right boundary, shift everything
1072 * in that row left. Clear right column. 1129 * in that row left. Clear right column.
1073 */ 1130 */
1074#if ENABLE_FRILLS 1131#if ENABLE_FRILLS
1075void 1132void
1076rxvt_term::scr_forwardindex () 1133rxvt_term::scr_forwardindex () NOTHROW
1077{ 1134{
1078 if (screen.cur.col < ncol - 1) 1135 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1137 else
1081 { 1138 {
1082 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1139 line_t &l = ROW(screen.cur.row);
1083 ROW(screen.cur.row).l = ncol; 1140
1141 l.touch ();
1142 l.is_longer (0);
1084 1143
1085 scr_gotorc (0, 0, R_RELATIVE); 1144 scr_gotorc (0, 0, R_RELATIVE);
1086 scr_insdel_chars (1, DELETE); 1145 scr_insdel_chars (1, DELETE);
1087 scr_gotorc (0, ncol - 1, R_RELATIVE); 1146 scr_gotorc (0, ncol - 1, R_RELATIVE);
1088 } 1147 }
… …
1092/* ------------------------------------------------------------------------- */ 1151/* ------------------------------------------------------------------------- */
1093/* 1152/*
1094 * Goto Row/Column 1153 * Goto Row/Column
1095 */ 1154 */
1096void 1155void
1097rxvt_term::scr_gotorc (int row, int col, int relative) 1156rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1098{ 1157{
1099 want_refresh = 1; 1158 want_refresh = 1;
1100 ZERO_SCROLLBACK (); 1159 ZERO_SCROLLBACK ();
1101 1160
1102 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1161 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1140/* ------------------------------------------------------------------------- */ 1199/* ------------------------------------------------------------------------- */
1141/* 1200/*
1142 * direction should be UP or DN 1201 * direction should be UP or DN
1143 */ 1202 */
1144void 1203void
1145rxvt_term::scr_index (enum page_dirn direction) 1204rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1146{ 1205{
1147 int dirn; 1206 int dirn;
1148 1207
1149 want_refresh = 1; 1208 want_refresh = 1;
1150 ZERO_SCROLLBACK (); 1209 ZERO_SCROLLBACK ();
… …
1169 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1170 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1171 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1230 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1172 */ 1231 */
1173void 1232void
1174rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1175{ 1234{
1176 unsigned int col, num; 1235 unsigned int col, num;
1177 1236
1178 want_refresh = 1; 1237 want_refresh = 1;
1179 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
1180 1239
1181 selection_check (1); 1240 selection_check (1);
1182 1241
1183 line_t &line = ROW(screen.cur.row); 1242 line_t &line = ROW(screen.cur.row);
1243
1244 line.touch ();
1245 line.is_longer (0);
1184 1246
1185 switch (mode) 1247 switch (mode)
1186 { 1248 {
1187 case 0: /* erase to end of line */ 1249 case 0: /* erase to end of line */
1188 col = screen.cur.col; 1250 col = screen.cur.col;
… …
1220 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1221 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1222 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1223 */ 1285 */
1224void 1286void
1225rxvt_term::scr_erase_screen (int mode) 1287rxvt_term::scr_erase_screen (int mode) NOTHROW
1226{ 1288{
1227 int num; 1289 int num;
1228 int32_t row; 1290 int32_t row;
1229 rend_t ren; 1291 rend_t ren;
1230 XGCValues gcvalue; 1292 XGCValues gcvalue;
… …
1274 CLEAR_ROWS (row, num); 1336 CLEAR_ROWS (row, num);
1275 } 1337 }
1276 else 1338 else
1277 { 1339 {
1278 ren = rstyle & (RS_fgMask | RS_bgMask); 1340 ren = rstyle & (RS_fgMask | RS_bgMask);
1279 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1342 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 ERASE_ROWS (row, num); 1343 ERASE_ROWS (row, num);
1282 gcvalue.foreground = pix_colors[Color_fg]; 1344 gcvalue.foreground = pix_colors[Color_fg];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1284 } 1346 }
1285 1347
1286 for (; num--; row++) 1348 for (; num--; row++)
1287 { 1349 {
1288 scr_blank_screen_mem (ROW (row), rstyle); 1350 scr_blank_screen_mem (ROW(row), rstyle);
1289 ROW (row).l = 0;
1290 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1351 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1291 } 1352 }
1292} 1353}
1293 1354
1294#if ENABLE_FRILLS 1355#if ENABLE_FRILLS
1295void 1356void
1296rxvt_term::scr_erase_savelines () 1357rxvt_term::scr_erase_savelines () NOTHROW
1297{ 1358{
1298 want_refresh = 1; 1359 want_refresh = 1;
1299 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1300 1361
1301 nsaved = 0; 1362 top_row = 0;
1302} 1363}
1303#endif 1364#endif
1304 1365
1305/* ------------------------------------------------------------------------- */ 1366/* ------------------------------------------------------------------------- */
1306/* 1367/*
1307 * Fill the screen with `E's 1368 * Fill the screen with `E's
1308 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1369 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1309 */ 1370 */
1310void 1371void
1311rxvt_term::scr_E () 1372rxvt_term::scr_E () NOTHROW
1312{ 1373{
1313 rend_t fs; 1374 rend_t fs;
1314 1375
1315 want_refresh = 1; 1376 want_refresh = 1;
1316 ZERO_SCROLLBACK (); 1377 ZERO_SCROLLBACK ();
… …
1327 rend_t *r1 = line.r; 1388 rend_t *r1 = line.r;
1328 1389
1329 for (int j = ncol; j--; ) 1390 for (int j = ncol; j--; )
1330 *r1++ = fs; 1391 *r1++ = fs;
1331 1392
1332 line.l = ncol; /* make the `E's selectable */ 1393 line.is_longer (0);
1394 line.touch (ncol);
1333 } 1395 }
1334} 1396}
1335 1397
1336/* ------------------------------------------------------------------------- */ 1398/* ------------------------------------------------------------------------- */
1337/* 1399/*
1338 * Insert/Delete <count> lines 1400 * Insert/Delete <count> lines
1339 */ 1401 */
1340void 1402void
1341rxvt_term::scr_insdel_lines (int count, int insdel) 1403rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1342{ 1404{
1343 int end; 1405 int end;
1344 1406
1345 ZERO_SCROLLBACK (); 1407 ZERO_SCROLLBACK ();
1346 1408
… …
1366/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1367/* 1429/*
1368 * Insert/Delete <count> characters from the current position 1430 * Insert/Delete <count> characters from the current position
1369 */ 1431 */
1370void 1432void
1371rxvt_term::scr_insdel_chars (int count, int insdel) 1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1372{ 1434{
1373 int col, row; 1435 int col, row;
1374 rend_t tr; 1436 rend_t tr;
1375 1437
1376 want_refresh = 1; 1438 want_refresh = 1;
… …
1385 min_it (count, ncol - screen.cur.col); 1447 min_it (count, ncol - screen.cur.col);
1386 1448
1387 row = screen.cur.row; 1449 row = screen.cur.row;
1388 1450
1389 line_t *line = &ROW(row); 1451 line_t *line = &ROW(row);
1452
1453 line->touch ();
1454 line->is_longer (0);
1390 1455
1391 switch (insdel) 1456 switch (insdel)
1392 { 1457 {
1393 case INSERT: 1458 case INSERT:
1394 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1459 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1395 { 1460 {
1396 line->t[col] = line->t[col - count]; 1461 line->t[col] = line->t[col - count];
1397 line->r[col] = line->r[col - count]; 1462 line->r[col] = line->r[col - count];
1398 } 1463 }
1399 1464
1400 if (!line->is_longer ()) 1465 line->l = min (line->l + count, ncol);
1401 {
1402 line->l += count;
1403 min_it (line->l, ncol);
1404 }
1405 1466
1406 if (selection.op && current_screen == selection.screen 1467 if (selection.op && current_screen == selection.screen
1407 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1468 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1408 { 1469 {
1409 if (selection.end.row != screen.cur.row 1470 if (selection.end.row != screen.cur.row
… …
1422 1483
1423 case ERASE: 1484 case ERASE:
1424 screen.cur.col += count; /* don't worry if > ncol */ 1485 screen.cur.col += count; /* don't worry if > ncol */
1425 selection_check (1); 1486 selection_check (1);
1426 screen.cur.col -= count; 1487 screen.cur.col -= count;
1488
1489 line->l = max (line->l - count, 0);
1427 scr_blank_line (*line, screen.cur.col, count, rstyle); 1490 scr_blank_line (*line, screen.cur.col, count, rstyle);
1428 break; 1491 break;
1429 1492
1430 case DELETE: 1493 case DELETE:
1431 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1494 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1434 { 1497 {
1435 line->t[col] = line->t[col + count]; 1498 line->t[col] = line->t[col + count];
1436 line->r[col] = line->r[col + count]; 1499 line->r[col] = line->r[col + count];
1437 } 1500 }
1438 1501
1502 line->l = max (line->l - count, 0);
1439 scr_blank_line (*line, ncol - count, count, tr); 1503 scr_blank_line (*line, ncol - count, count, tr);
1440
1441 if (line->is_longer ()) /* break line continuation */
1442 line->l = ncol;
1443
1444 line->l = max (line->l - count, 0);
1445 1504
1446 if (selection.op && current_screen == selection.screen 1505 if (selection.op && current_screen == selection.screen
1447 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1506 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1448 { 1507 {
1449 if (selection.end.row != screen.cur.row 1508 if (selection.end.row != screen.cur.row
… …
1467/* 1526/*
1468 * Set the scrolling region 1527 * Set the scrolling region
1469 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1470 */ 1529 */
1471void 1530void
1472rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1473{ 1532{
1474 max_it (top, 0); 1533 max_it (top, 0);
1475 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1476 1535
1477 if (top > bot) 1536 if (top > bot)
… …
1487 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1488 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1489 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1490 */ 1549 */
1491void 1550void
1492rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1493{ 1552{
1494 want_refresh = 1; 1553 want_refresh = 1;
1495 1554
1496 if (mode) 1555 if (mode)
1497 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1504 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1505 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1506 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1507 */ 1566 */
1508void 1567void
1509rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1510{ 1569{
1511 if (mode) 1570 if (mode)
1512 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1513 else 1572 else
1514 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1523 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1524 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1525 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1526 */ 1585 */
1527void 1586void
1528rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1529{ 1588{
1530 if (mode) 1589 if (mode)
1531 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1532 else 1591 else
1533 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1540 * Set insert/replace mode 1599 * Set insert/replace mode
1541 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1542 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1543 */ 1602 */
1544void 1603void
1545rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1546{ 1605{
1547 if (mode) 1606 if (mode)
1548 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1549 else 1608 else
1550 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1556 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1557 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1558 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1559 */ 1618 */
1560void 1619void
1561rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1562{ 1621{
1563 if (mode < 0) 1622 if (mode < 0)
1564 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol * sizeof (char));
1565 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1566 tabs[screen.cur.col] = (mode ? 1 : 0); 1625 tabs [screen.cur.col] = !!mode;
1567} 1626}
1568 1627
1569/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
1570/* 1629/*
1571 * Set reverse/normal video 1630 * Set reverse/normal video
1572 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1573 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1574 */ 1633 */
1575void 1634void
1576rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1577{ 1636{
1578 XGCValues gcvalue; 1637 rvideo_mode = on;
1579 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1580 if (rvideo != mode) 1643 if (rvideo_state != on)
1581 { 1644 {
1582 rvideo = mode; 1645 rvideo_state = on;
1646
1583 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1584#if XPM_BACKGROUND 1648#if XPM_BACKGROUND
1585 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1586#endif 1650#endif
1587#if TRANSPARENT 1651#if TRANSPARENT
1588 if (! (options & Opt_transparent) || am_transparent == 0) 1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1589#endif 1653#endif
1590 XSetWindowBackground (display->display, vt, 1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1591 pix_colors[Color_bg]);
1592 1655
1656 XGCValues gcvalue;
1593 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1594 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1595 XChangeGC (display->display, gc, GCBackground | GCForeground, 1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1596 &gcvalue); 1660
1597 scr_clear (); 1661 scr_clear ();
1598 scr_touch (true); 1662 scr_touch (true);
1599 } 1663 }
1600} 1664}
1601 1665
… …
1603/* 1667/*
1604 * Report current cursor position 1668 * Report current cursor position
1605 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1606 */ 1670 */
1607void 1671void
1608rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1609{ 1673{
1610 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1611} 1675}
1612 1676
1613/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1616 1680
1617/* 1681/*
1618 * Set font style 1682 * Set font style
1619 */ 1683 */
1620void 1684void
1621rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1622{ 1686{
1687#if 0
1623 switch (charsets[screen.charset]) 1688 switch (charsets [screen.charset])
1624 { 1689 {
1625 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
1626 break; 1691 break;
1627 case 'A': /* United Kingdom (UK) */ 1692 case 'A': /* United Kingdom (UK) */
1628 break; 1693 break;
… …
1635 case 'C': /* Finnish character set */ 1700 case 'C': /* Finnish character set */
1636 break; 1701 break;
1637 case 'K': /* German character set */ 1702 case 'K': /* German character set */
1638 break; 1703 break;
1639 } 1704 }
1705#endif
1640} 1706}
1641 1707
1642/* ------------------------------------------------------------------------- */ 1708/* ------------------------------------------------------------------------- */
1643/* 1709/*
1644 * Choose a font 1710 * Choose a font
… …
1646 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1647 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1648 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1649 */ 1715 */
1650void 1716void
1651rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1652{ 1718{
1653 screen.charset = set; 1719 screen.charset = set;
1654 set_font_style (); 1720 set_font_style ();
1655} 1721}
1656 1722
… …
1662 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1663 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1664 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1665 */ 1731 */
1666void 1732void
1667rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1668{ 1734{
1669 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1670 set_font_style (); 1736 set_font_style ();
1671} 1737}
1672 1738
… …
1677 1743
1678/* 1744/*
1679 * refresh matching text. 1745 * refresh matching text.
1680 */ 1746 */
1681bool 1747bool
1682rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1683{ 1749{
1684 bool found = false; 1750 bool found = false;
1685 1751
1686 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1687 { 1753 {
… …
1707 PART_END, 1773 PART_END,
1708 RC_COUNT 1774 RC_COUNT
1709}; 1775};
1710 1776
1711void 1777void
1712rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1778rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1713{ 1779{
1714 int i; 1780 int i;
1715 row_col_t rc[RC_COUNT]; 1781 row_col_t rc[RC_COUNT];
1716 1782
1717 if (!drawn_buf) /* sanity check */ 1783 if (!drawn_buf) /* sanity check */
… …
1740 } 1806 }
1741 1807
1742 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1808 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1743 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1809 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1744 1810
1811 num_scr_allow = 0;
1812
1745 if (refresh) 1813 if (refresh)
1746 scr_refresh (SLOW_REFRESH); 1814 scr_refresh ();
1747} 1815}
1748 1816
1749/* ------------------------------------------------------------------------- */ 1817/* ------------------------------------------------------------------------- */
1750/* 1818/*
1751 * Refresh the entire screen 1819 * Refresh the entire screen
1752 */ 1820 */
1753void 1821void
1754rxvt_term::scr_touch (bool refresh) 1822rxvt_term::scr_touch (bool refresh) NOTHROW
1755{ 1823{
1756 scr_expose (0, 0, width, height, refresh); 1824 scr_expose (0, 0, width, height, refresh);
1757} 1825}
1758 1826
1759/* ------------------------------------------------------------------------- */ 1827/* ------------------------------------------------------------------------- */
1760/* 1828/*
1761 * Move the display so that the line represented by scrollbar value Y is at 1829 * Move the display so that the line represented by scrollbar value Y is at
1762 * the top of the screen 1830 * the top of the screen
1763 */ 1831 */
1764int 1832void
1765rxvt_term::scr_move_to (int y, int len) 1833rxvt_term::scr_move_to (int y, int len) NOTHROW
1766{ 1834{
1767 long p = 0; 1835 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1768 unsigned int oldviewstart;
1769
1770 oldviewstart = view_start;
1771
1772 if (y < len)
1773 {
1774 p = (nrow + nsaved) * (len - y) / len;
1775 p -= (long) (nrow - 1);
1776 p = max (p, 0);
1777 }
1778
1779 view_start = (unsigned int)min (p, nsaved);
1780
1781 return scr_changeview (oldviewstart);
1782} 1836}
1783 1837
1784/* ------------------------------------------------------------------------- */ 1838/* ------------------------------------------------------------------------- */
1785/* 1839/*
1786 * Page the screen up/down nlines 1840 * Page the screen up/down nlines
1787 * direction should be UP or DN 1841 * direction should be UP or DN
1788 */ 1842 */
1789int 1843bool
1790rxvt_term::scr_page (enum page_dirn direction, int nlines) 1844rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1791{ 1845{
1792 int n; 1846 int new_view_start =
1793 unsigned int oldviewstart;
1794
1795 oldviewstart = view_start;
1796
1797 if (direction == UP)
1798 {
1799 n = view_start + nlines;
1800 view_start = min (n, nsaved);
1801 }
1802 else
1803 {
1804 n = view_start - nlines; 1847 direction == UP ? view_start - nlines
1805 view_start = max (n, 0); 1848 : view_start + nlines;
1806 }
1807 1849
1808 return scr_changeview (oldviewstart); 1850 return scr_changeview (new_view_start);
1809} 1851}
1810 1852
1811int 1853bool
1812rxvt_term::scr_changeview (unsigned int oldviewstart) 1854rxvt_term::scr_changeview (int new_view_start) NOTHROW
1813{ 1855{
1856 clamp_it (new_view_start, top_row, 0);
1857
1814 if (view_start != oldviewstart) 1858 if (new_view_start == view_start)
1815 { 1859 return false;
1860
1861 num_scr += new_view_start - view_start;
1862 view_start = new_view_start;
1816 want_refresh = 1; 1863 want_refresh = 1;
1817 num_scr -= (view_start - oldviewstart);
1818 }
1819 1864
1820 return (int) (view_start - oldviewstart); 1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1821}
1822 1866
1823/* ------------------------------------------------------------------------- */ 1867 return true;
1868}
1869
1870#ifndef NO_BELL
1824void 1871void
1872rxvt_term::bell_cb (time_watcher &w)
1873{
1874 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode);
1876}
1877#endif
1878
1879/* ------------------------------------------------------------------------- */
1880void
1825rxvt_term::scr_bell () 1881rxvt_term::scr_bell () NOTHROW
1826{ 1882{
1827#ifndef NO_BELL 1883#ifndef NO_BELL
1828 1884
1829# ifndef NO_MAPALERT 1885# ifndef NO_MAPALERT
1830# ifdef MAPALERT_OPTION 1886# ifdef MAPALERT_OPTION
1831 if (options & Opt_mapAlert) 1887 if (OPTION (Opt_mapAlert))
1832# endif 1888# endif
1833 XMapWindow (display->display, parent[0]); 1889 XMapWindow (display->display, parent[0]);
1834# endif 1890# endif
1835 1891
1836 if (options & Opt_visualBell) 1892 if (OPTION (Opt_visualBell))
1837 { 1893 {
1838 scr_rvideo_mode (!rvideo); /* refresh also done */ 1894 rvideo_bell = true;
1839 rxvt_usleep (VISUAL_BELL_DURATION); 1895 scr_rvideo_mode (rvideo_mode);
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1896 display->flush ();
1897
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1841 } 1899 }
1842 else 1900 else
1843 XBell (display->display, 0); 1901 XBell (display->display, 0);
1844 1902
1845#endif 1903#endif
1846} 1904}
1847 1905
1848/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1849/* ARGSUSED */ 1907/* ARGSUSED */
1850void 1908void
1851rxvt_term::scr_printscreen (int fullhist) 1909rxvt_term::scr_printscreen (int fullhist) NOTHROW
1852{ 1910{
1853#ifdef PRINTPIPE 1911#ifdef PRINTPIPE
1854 int nrows, row_start; 1912 int nrows, row_start;
1855 FILE *fd; 1913 FILE *fd;
1856 1914
1857 if ((fd = popen_printer ()) == NULL) 1915 if ((fd = popen_printer ()) == NULL)
1858 return; 1916 return;
1859 1917
1860 if (fullhist) 1918 if (fullhist)
1861 { 1919 {
1862 nrows = nrow + nsaved; 1920 nrows = nrow - top_row;
1863 row_start = -nsaved; 1921 row_start = top_row;
1864 } 1922 }
1865 else 1923 else
1866 { 1924 {
1867 nrows = nrow; 1925 nrows = nrow;
1868 row_start = -view_start; 1926 row_start = view_start;
1869 } 1927 }
1870 1928
1871 wctomb (0, 0); 1929 wctomb (0, 0);
1872 1930
1873 for (int r1 = 0; r1 < nrows; r1++) 1931 for (int r1 = 0; r1 < nrows; r1++)
… …
1905 * Refresh the screen 1963 * Refresh the screen
1906 * drawn_text/drawn_rend contain the screen information before the update. 1964 * drawn_text/drawn_rend contain the screen information before the update.
1907 * screen.text/screen.rend contain what the screen will change to. 1965 * screen.text/screen.rend contain what the screen will change to.
1908 */ 1966 */
1909void 1967void
1910rxvt_term::scr_refresh (unsigned char refresh_type) 1968rxvt_term::scr_refresh () NOTHROW
1911{ 1969{
1912 unsigned char must_clear, /* use draw_string not draw_image_string */ 1970 unsigned char must_clear, /* use draw_string not draw_image_string */
1913 showcursor; /* show the cursor */ 1971 showcursor; /* show the cursor */
1914 int16_t col, row, /* column/row we're processing */ 1972 int16_t col, row, /* column/row we're processing */
1915 ocrow; /* old cursor row */ 1973 ocrow; /* old cursor row */
… …
1932 1990
1933#if XPM_BACKGROUND 1991#if XPM_BACKGROUND
1934 must_clear |= bgPixmap.pixmap != None; 1992 must_clear |= bgPixmap.pixmap != None;
1935#endif 1993#endif
1936#if TRANSPARENT 1994#if TRANSPARENT
1937 must_clear |= (options & Opt_transparent) && am_transparent; 1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
1938#endif 1996#endif
1939 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1940 1998
1941 /* 1999 /*
1942 * B: reverse any characters which are selected 2000 * B: reverse any characters which are selected
… …
1966 2024
1967 crp = &ROW(screen.cur.row).r[col]; 2025 crp = &ROW(screen.cur.row).r[col];
1968 2026
1969 if (showcursor && focus) 2027 if (showcursor && focus)
1970 { 2028 {
1971 if (options & Opt_cursorUnderline) 2029 if (OPTION (Opt_cursorUnderline))
1972 *crp ^= RS_Uline; 2030 *crp ^= RS_Uline;
1973 else 2031 else
1974 { 2032 {
1975 *crp ^= RS_RVid; 2033 *crp ^= RS_RVid;
1976 2034
… …
1978 cc1 = *crp & (RS_fgMask | RS_bgMask); 2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
1979 if (ISSET_PIXCOLOR (Color_cursor)) 2037 if (ISSET_PIXCOLOR (Color_cursor))
1980 ccol1 = Color_cursor; 2038 ccol1 = Color_cursor;
1981 else 2039 else
1982#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1983 ccol1 = GET_FGCOLOR (rstyle); 2041 ccol1 = fgcolor_of (rstyle);
1984#else 2042#else
1985 ccol1 = Color_fg; 2043 ccol1 = Color_fg;
1986#endif 2044#endif
1987 if (ISSET_PIXCOLOR (Color_cursor2)) 2045 if (ISSET_PIXCOLOR (Color_cursor2))
1988 ccol2 = Color_cursor2; 2046 ccol2 = Color_cursor2;
1989 else 2047 else
1990#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1991 ccol2 = GET_BGCOLOR (rstyle); 2049 ccol2 = bgcolor_of (rstyle);
1992#else 2050#else
1993 ccol2 = Color_bg; 2051 ccol2 = Color_bg;
1994#endif 2052#endif
1995 *crp = SET_FGCOLOR (*crp, ccol1); 2053 *crp = SET_FGCOLOR (*crp, ccol1);
1996 *crp = SET_BGCOLOR (*crp, ccol2); 2054 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2001 2059
2002 /* make sure no outline cursor is left around */ 2060 /* make sure no outline cursor is left around */
2003 setoldcursor = 0; 2061 setoldcursor = 0;
2004 if (ocrow != -1) 2062 if (ocrow != -1)
2005 { 2063 {
2006 if (screen.cur.row + view_start != ocrow 2064 if (screen.cur.row - view_start != ocrow
2007 || screen.cur.col != oldcursor.col) 2065 || screen.cur.col != oldcursor.col)
2008 { 2066 {
2009 if (ocrow < nrow 2067 if (ocrow < nrow
2010 && oldcursor.col < ncol) 2068 && oldcursor.col < ncol)
2011 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2069 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2019 else if (!focus) 2077 else if (!focus)
2020 setoldcursor = 1; 2078 setoldcursor = 1;
2021 2079
2022 if (setoldcursor) 2080 if (setoldcursor)
2023 { 2081 {
2024 if (screen.cur.row + view_start >= nrow) 2082 if (screen.cur.row - view_start >= nrow)
2025 oldcursor.row = -1; 2083 oldcursor.row = -1;
2026 else 2084 else
2027 { 2085 {
2028 oldcursor.row = screen.cur.row + view_start; 2086 oldcursor.row = screen.cur.row - view_start;
2029 oldcursor.col = screen.cur.col; 2087 oldcursor.col = screen.cur.col;
2030 } 2088 }
2031 } 2089 }
2032 } 2090 }
2033 2091
2092 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2034#if ENABLE_OVERLAY 2093#if ENABLE_OVERLAY
2035 scr_swap_overlay (); 2094 scr_swap_overlay ();
2036#endif 2095#endif
2037 2096
2038#ifndef NO_SLOW_LINK_SUPPORT 2097#ifndef NO_SLOW_LINK_SUPPORT
2039 /* 2098 /*
2040 * D: CopyArea pass - very useful for slower links 2099 * D: CopyArea pass - very useful for slower links
2041 * This has been deliberately kept simple. 2100 * This has been deliberately kept simple.
2042 */ 2101 */
2043 i = num_scr;
2044 if (!display->is_local 2102 if (!display->is_local
2045 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2046 && abs (num_scr) < nrow && !must_clear) 2104 && abs (num_scr) < nrow && !must_clear)
2047 { 2105 {
2048 int16_t nits; 2106 int16_t nits;
2049 int j; 2107 int j;
2050 int len, wlen; 2108 int len, wlen;
2109 dLocal (int, num_scr);
2051 2110
2052 j = nrow; 2111 j = nrow;
2053 wlen = len = -1; 2112 wlen = len = -1;
2054 row = i > 0 ? 0 : j - 1; 2113 row = i > 0 ? 0 : j - 1;
2055 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2056 { 2115 {
2057 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2058 { 2117 {
2059 line_t s = ROW(row - view_start); 2118 line_t s = ROW(view_start + row);
2060 line_t d = drawn_buf[row]; 2119 line_t d = drawn_buf[row];
2061 line_t d2 = drawn_buf[row + i]; 2120 line_t d2 = drawn_buf[row + i];
2062 2121
2063 for (nits = 0, col = ncol; col--; ) 2122 for (nits = 0, col = ncol; col--; )
2064 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2123 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2088 if (wlen < len) 2147 if (wlen < len)
2089 ::swap (wlen, len); 2148 ::swap (wlen, len);
2090 2149
2091 XCopyArea (display->display, vt, vt, 2150 XCopyArea (display->display, vt, vt,
2092 gc, 0, Row2Pixel (len + i), 2151 gc, 0, Row2Pixel (len + i),
2093 (unsigned int)TermWin_TotalWidth (), 2152 (unsigned int)this->width,
2094 (unsigned int)Height2Pixel (wlen - len + 1), 2153 (unsigned int)Height2Pixel (wlen - len + 1),
2095 0, Row2Pixel (len)); 2154 0, Row2Pixel (len));
2096 len = -1; 2155 len = -1;
2097 } 2156 }
2098 } 2157 }
… …
2102 /* 2161 /*
2103 * E: main pass across every character 2162 * E: main pass across every character
2104 */ 2163 */
2105 for (row = 0; row < nrow; row++) 2164 for (row = 0; row < nrow; row++)
2106 { 2165 {
2107 text_t *stp = ROW(row - view_start).t; 2166 text_t *stp = ROW(view_start + row).t;
2108 rend_t *srp = ROW(row - view_start).r; 2167 rend_t *srp = ROW(view_start + row).r;
2109 text_t *dtp = drawn_buf[row].t; 2168 text_t *dtp = drawn_buf[row].t;
2110 rend_t *drp = drawn_buf[row].r; 2169 rend_t *drp = drawn_buf[row].r;
2111 2170
2112 /* 2171 /*
2113 * E2: OK, now the real pass 2172 * E2: OK, now the real pass
… …
2177 count++, i--; 2236 count++, i--;
2178 2237
2179 /* 2238 /*
2180 * Determine the attributes for the string 2239 * Determine the attributes for the string
2181 */ 2240 */
2182 int fore = GET_FGCOLOR (rend); // desired foreground 2241 int fore = fgcolor_of (rend); // desired foreground
2183 int back = GET_BGCOLOR (rend); // desired background 2242 int back = bgcolor_of (rend); // desired background
2184 2243
2185 // only do special processing if any attributes are set, which is rare 2244 // only do special processing if any attributes are set, which is unlikely
2186 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2187 { 2246 {
2188#if ENABLE_STYLES 2247#if ENABLE_STYLES
2189 // force redraw after "careful" characters to avoid pixel droppings 2248 // force redraw after "careful" characters to avoid pixel droppings
2190 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2301 } /* for (row....) */ 2360 } /* for (row....) */
2302 2361
2303#if ENABLE_OVERLAY 2362#if ENABLE_OVERLAY
2304 scr_swap_overlay (); 2363 scr_swap_overlay ();
2305#endif 2364#endif
2365 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2306 2366
2307 /* 2367 /*
2308 * G: cleanup cursor and display outline cursor if necessary 2368 * G: cleanup cursor and display outline cursor if necessary
2309 */ 2369 */
2310 if (showcursor) 2370 if (showcursor)
2311 { 2371 {
2312 if (focus) 2372 if (focus)
2313 { 2373 {
2314 if (options & Opt_cursorUnderline) 2374 if (OPTION (Opt_cursorUnderline))
2315 *crp ^= RS_Uline; 2375 *crp ^= RS_Uline;
2316 else 2376 else
2317 { 2377 {
2318 *crp ^= RS_RVid; 2378 *crp ^= RS_RVid;
2319#ifndef NO_CURSORCOLOR 2379#ifndef NO_CURSORCOLOR
… …
2349 /* 2409 /*
2350 * H: cleanup selection 2410 * H: cleanup selection
2351 */ 2411 */
2352 scr_reverse_selection (); 2412 scr_reverse_selection ();
2353 2413
2354 if (refresh_type & SMOOTH_REFRESH)
2355 XFlush (display->display);
2356
2357 num_scr = 0; 2414 num_scr = 0;
2358 num_scr_allow = 1; 2415 num_scr_allow = 1;
2359} 2416}
2360 2417
2361void 2418void
2362rxvt_term::scr_remap_chars (const line_t &l) 2419rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2363{ 2420{
2364 if (!l.t) 2421 if (!l.t)
2365 return; 2422 return;
2366 2423
2424 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2425
2367 for (int i = ncol; i--; ) 2426 for (int i = ncol; i--; )
2368 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2427 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2369} 2428}
2370 2429
2371void 2430void
2372rxvt_term::scr_remap_chars () 2431rxvt_term::scr_remap_chars () NOTHROW
2373{ 2432{
2374 for (int i = total_rows; i--; ) 2433 for (int i = total_rows; i--; )
2375 scr_remap_chars (row_buf [i]); 2434 scr_remap_chars (row_buf [i]);
2376 2435
2377 for (int i = nrow; i--; ) 2436 for (int i = nrow; i--; )
… …
2380 scr_remap_chars (swap_buf [i]); 2439 scr_remap_chars (swap_buf [i]);
2381 } 2440 }
2382} 2441}
2383 2442
2384void 2443void
2385rxvt_term::scr_recolour () 2444rxvt_term::scr_recolour () NOTHROW
2386{ 2445{
2387 if (1 2446 if (1
2388#if TRANSPARENT 2447#if TRANSPARENT
2389 && !am_transparent 2448 && !am_transparent
2390#endif 2449#endif
… …
2411 want_refresh = 1; 2470 want_refresh = 1;
2412} 2471}
2413 2472
2414/* ------------------------------------------------------------------------- */ 2473/* ------------------------------------------------------------------------- */
2415void 2474void
2416rxvt_term::scr_clear (bool really) 2475rxvt_term::scr_clear (bool really) NOTHROW
2417{ 2476{
2418 if (!mapped) 2477 if (!mapped)
2419 return; 2478 return;
2420 2479
2421 num_scr_allow = 0; 2480 num_scr_allow = 0;
… …
2423 2482
2424 if (really) 2483 if (really)
2425 XClearWindow (display->display, vt); 2484 XClearWindow (display->display, vt);
2426} 2485}
2427 2486
2428/* ------------------------------------------------------------------------- */
2429void 2487void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{
2490 int view_end = view_start + nrow;
2491 int row, col;
2492
2493 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2494 {
2495 text_t *stp = ROW(row).t;
2496 rend_t *srp = ROW(row).r;
2497
2498 for (col = beg_col; col < end_col; col++)
2499 srp[col] ^= rstyle1;
2500
2501 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2502 srp[col] ^= rstyle2;
2503
2504 if (++col < end_col)
2505 srp[col] ^= rstyle2;
2506 }
2507}
2508
2509void
2510rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2511{
2512 int view_end = view_start + nrow;
2513 int row, col;
2514
2515 if (beg_row >= view_start)
2516 {
2517 col = beg_col;
2518 row = beg_row;
2519 }
2520 else
2521 {
2522 col = 0;
2523 row = view_start;
2524 }
2525
2526 for (; row < min (end_row, view_end); row++, col = 0)
2527 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2528 srp[col] ^= rstyle;
2529
2530 if (row == end_row)
2531 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2532 srp[col] ^= rstyle;
2533}
2534
2535/* ------------------------------------------------------------------------- */
2536void
2430rxvt_term::scr_reverse_selection () 2537rxvt_term::scr_reverse_selection () NOTHROW
2431{ 2538{
2432 if (selection.op 2539 if (selection.op
2433 && current_screen == selection.screen 2540 && current_screen == selection.screen
2434 && selection.end.row >= -view_start) 2541 && selection.end.row >= view_start)
2435 { 2542 {
2436 int view_end = -view_start + nrow;
2437 int row, col;
2438
2439#if ENABLE_FRILLS 2543#if ENABLE_FRILLS
2440 if (selection.rect) 2544 if (selection.rect)
2441 { 2545 scr_xor_rect (selection.beg.row, selection.beg.col,
2442 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2546 selection.end.row, selection.end.col,
2443 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2547 RS_RVid, RS_RVid | RS_Uline);
2444 srp[col] ^= RS_RVid;
2445 }
2446 else 2548 else
2447#endif 2549#endif
2448 { 2550 scr_xor_span (selection.beg.row, selection.beg.col,
2449 if (selection.beg.row >= -view_start) 2551 selection.end.row, selection.end.col,
2450 { 2552 RS_RVid);
2451 col = selection.beg.col;
2452 row = selection.beg.row;
2453 }
2454 else
2455 {
2456 col = 0;
2457 row = view_start;
2458 }
2459
2460 for (; row < min (selection.end.row, view_end); row++, col = 0)
2461 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2462 srp[col] ^= RS_RVid;
2463
2464 if (row == selection.end.row)
2465 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2466 srp[col] ^= RS_RVid;
2467 }
2468 } 2553 }
2469} 2554}
2470 2555
2471/* ------------------------------------------------------------------------- */ 2556/* ------------------------------------------------------------------------- */
2472/* 2557/*
2473 * Dump the whole scrollback and screen to the passed filedescriptor. The 2558 * Dump the whole scrollback and screen to the passed filedescriptor. The
2474 * invoking routine must close the fd. 2559 * invoking routine must close the fd.
2475 */ 2560 */
2476#if 0 2561#if 0
2477void 2562void
2478rxvt_term::scr_dump (int fd) 2563rxvt_term::scr_dump (int fd) NOTHROW
2479{ 2564{
2480 int row, wrote; 2565 int row, wrote;
2481 unsigned int width, towrite; 2566 unsigned int width, towrite;
2482 char r1[] = "\n"; 2567 char r1[] = "\n";
2483 2568
… …
2502 2587
2503/* ------------------------------------------------------------------------- * 2588/* ------------------------------------------------------------------------- *
2504 * CHARACTER SELECTION * 2589 * CHARACTER SELECTION *
2505 * ------------------------------------------------------------------------- */ 2590 * ------------------------------------------------------------------------- */
2506void 2591void
2507rxvt_term::selection_check (int check_more) 2592rxvt_term::selection_check (int check_more) NOTHROW
2508{ 2593{
2509 row_col_t pos; 2594 row_col_t pos;
2510 2595
2511 if (!selection.op) 2596 if (!selection.op)
2512 return; 2597 return;
2513 2598
2514 pos.row = pos.col = 0; 2599 pos.row = pos.col = 0;
2515 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2600 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2516 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2601 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2517 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2602 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2518 || (check_more == 1 2603 || (check_more == 1
2519 && current_screen == selection.screen 2604 && current_screen == selection.screen
2520 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2605 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2521 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2606 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2522 || (check_more == 2 2607 || (check_more == 2
… …
2533/* ------------------------------------------------------------------------- */ 2618/* ------------------------------------------------------------------------- */
2534/* 2619/*
2535 * Paste a selection direct to the command fd 2620 * Paste a selection direct to the command fd
2536 */ 2621 */
2537void 2622void
2538rxvt_term::paste (unsigned char *data, unsigned int len) 2623rxvt_term::paste (char *data, unsigned int len) NOTHROW
2539{ 2624{
2540 /* convert normal newline chars into common keyboard Return key sequence */ 2625 /* convert normal newline chars into common keyboard Return key sequence */
2541 for (unsigned int i = 0; i < len; i++) 2626 for (unsigned int i = 0; i < len; i++)
2542 if (data[i] == C0_LF) 2627 if (data[i] == C0_LF)
2543 data[i] = C0_CR; 2628 data[i] = C0_CR;
… …
2549/* 2634/*
2550 * Respond to a notification that a primary selection has been sent 2635 * Respond to a notification that a primary selection has been sent
2551 * EXT: SelectionNotify 2636 * EXT: SelectionNotify
2552 */ 2637 */
2553void 2638void
2554rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2639rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2555{ 2640{
2556 if (prop == None) /* check for failed XConvertSelection */ 2641 if (prop == None) /* check for failed XConvertSelection */
2557 { 2642 {
2558 if ((selection_type & Sel_CompoundText)) 2643 if ((selection_type & Sel_CompoundText))
2559 { 2644 {
… …
2687 { 2772 {
2688 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2689 char *s = rxvt_wcstombs (w); 2774 char *s = rxvt_wcstombs (w);
2690 free (w); 2775 free (w);
2691 // TODO: strlen == only the first element will be converted. well... 2776 // TODO: strlen == only the first element will be converted. well...
2692 paste ((unsigned char *)s, strlen (s)); 2777 paste (s, strlen (s));
2693 free (s); 2778 free (s);
2694 } 2779 }
2695 else 2780 else
2696#endif 2781#endif
2697 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2698 && cl) 2783 && cl)
2699 { 2784 {
2700 for (int i = 0; i < cr; i++) 2785 for (int i = 0; i < cr; i++)
2701 paste ((unsigned char *)cl[i], strlen (cl[i])); 2786 paste (cl[i], strlen (cl[i]));
2702 2787
2703 XFreeStringList (cl); 2788 XFreeStringList (cl);
2704 } 2789 }
2705 else 2790 else
2706 paste (ct.value, ct.nitems); // paste raw 2791 paste ((char *)ct.value, ct.nitems); // paste raw
2707 2792
2708bailout: 2793bailout:
2709 XFree (ct.value); 2794 XFree (ct.value);
2710 2795
2711 if (selection_wait == Sel_normal) 2796 if (selection_wait == Sel_normal)
2712 selection_wait = Sel_none; 2797 selection_wait = Sel_none;
2713} 2798}
2714 2799
2715void 2800void
2716rxvt_term::incr_cb (time_watcher &w) 2801rxvt_term::incr_cb (time_watcher &w) NOTHROW
2717{ 2802{
2718 selection_wait = Sel_none; 2803 selection_wait = Sel_none;
2719 2804
2720 incr_buf_size = 0; 2805 incr_buf_size = 0;
2721 free (incr_buf); 2806 free (incr_buf);
2722 2807
2723 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2808 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2724} 2809}
2725 2810
2726void 2811void
2727rxvt_term::selection_property (Window win, Atom prop) 2812rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2728{ 2813{
2729 if (prop == None || selection_wait != Sel_incr) 2814 if (prop == None || selection_wait != Sel_incr)
2730 return; 2815 return;
2731 2816
2732 selection_paste (win, prop, true); 2817 selection_paste (win, prop, true);
… …
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0 2827 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2828 * EXT: button 2 release
2744 */ 2829 */
2745void 2830void
2746rxvt_term::selection_request (Time tm, int x, int y) 2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2747{ 2832{
2748 if (x < 0 || x >= width || y < 0 || y >= height) 2833 if (selection.text && selnum == Sel_Primary)
2749 return; /* outside window */
2750
2751 if (selection.text)
2752 { /* internal selection */ 2834 { /* internal selection */
2753 char *str = rxvt_wcstombs (selection.text, selection.len); 2835 char *str = rxvt_wcstombs (selection.text, selection.len);
2754 paste ((unsigned char *)str, strlen (str)); 2836 paste (str, strlen (str));
2755 free (str); 2837 free (str);
2756 return; 2838 return;
2757 } 2839 }
2758 else 2840 else
2759 { 2841 {
2760 int i;
2761
2762 selection_request_time = tm; 2842 selection_request_time = tm;
2763 selection_wait = Sel_normal; 2843 selection_wait = Sel_normal;
2764 2844
2765 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2766 {
2767#if X_HAVE_UTF8_STRING 2845#if X_HAVE_UTF8_STRING
2768 selection_type = Sel_UTF8String; 2846 selection_type = Sel_UTF8String;
2769 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2847 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2770 return; 2848 return;
2771#else 2849#else
2772 selection_type = Sel_CompoundText; 2850 selection_type = Sel_CompoundText;
2773 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2851 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2774 return; 2852 return;
2775#endif 2853#endif
2776 }
2777 } 2854 }
2778 2855
2779 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2856 selection_wait = Sel_none; /* don't loop in selection_paste () */
2780 selection_paste (display->root, XA_CUT_BUFFER0, false); 2857 selection_paste (display->root, XA_CUT_BUFFER0, false);
2781} 2858}
2782 2859
2783int 2860int
2784rxvt_term::selection_request_other (Atom target, int selnum) 2861rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2785{ 2862{
2786 Atom sel; 2863 Atom sel;
2787 2864
2788 selection_type |= selnum; 2865 selection_type |= selnum;
2789 2866
… …
2808/* 2885/*
2809 * Clear all selected text 2886 * Clear all selected text
2810 * EXT: SelectionClear 2887 * EXT: SelectionClear
2811 */ 2888 */
2812void 2889void
2813rxvt_term::selection_clear () 2890rxvt_term::selection_clear () NOTHROW
2814{ 2891{
2815 want_refresh = 1; 2892 want_refresh = 1;
2816 free (selection.text); 2893 free (selection.text);
2817 selection.text = NULL; 2894 selection.text = NULL;
2818 selection.len = 0; 2895 selection.len = 0;
… …
2851 selection.op = SELECTION_DONE; 2928 selection.op = SELECTION_DONE;
2852 2929
2853 if (selection.clicks == 4) 2930 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2931 return; /* nothing selected, go away */
2855 2932
2933 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2934 return;
2935
2856 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2936 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2937 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2858 2938
2859 int ofs = 0; 2939 int ofs = 0;
2860 int extra = 0; 2940 int extra = 0;
… …
2872 col = selection.beg.col; 2952 col = selection.beg.col;
2873 end_col = ncol + 1; 2953 end_col = ncol + 1;
2874 } 2954 }
2875 else 2955 else
2876#endif 2956#endif
2877 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2957 end_col = ROW(row).l;
2878 2958
2879 col = max (col, 0); 2959 col = max (col, 0);
2880 2960
2881 if (row == selection.end.row || selection.rect) 2961 if (row == selection.end.row
2962#if ENABLE_FRILLS
2963 || selection.rect
2964#endif
2965 )
2882 end_col = min (end_col, selection.end.col); 2966 min_it (end_col, selection.end.col);
2883 2967
2884 t = ROW(row).t + col; 2968 t = ROW(row).t + col;
2969
2885 for (; col < end_col; col++) 2970 for (; col < end_col; col++)
2886 { 2971 {
2887 if (*t == NOCHAR) 2972 if (*t == NOCHAR)
2888 t++; 2973 t++;
2889#if ENABLE_COMBINING 2974#if ENABLE_COMBINING
… …
2905#endif 2990#endif
2906 else 2991 else
2907 new_selection_text[ofs++] = *t++; 2992 new_selection_text[ofs++] = *t++;
2908 } 2993 }
2909 2994
2995#if ENABLE_FRILLS
2996 if (selection.rect)
2997 {
2998 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1]))
3001 --ofs;
3002
3003 new_selection_text[ofs++] = C0_LF;
3004 }
3005 else
3006#endif
2910 if (!ROW(row).is_longer () && row != selection.end.row) 3007 if (!ROW(row).is_longer () && row != selection.end.row)
2911 new_selection_text[ofs++] = C0_LF; 3008 new_selection_text[ofs++] = C0_LF;
2912 } 3009 }
2913 3010
2914 if (end_col != selection.end.col) 3011 if (end_col != selection.end.col)
2915 new_selection_text[ofs++] = C0_LF; 3012 new_selection_text[ofs++] = C0_LF;
2916 3013
… …
2926 3023
2927 // we usually allocate much more than necessary, so realloc it smaller again 3024 // we usually allocate much more than necessary, so realloc it smaller again
2928 selection.len = ofs; 3025 selection.len = ofs;
2929 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3026 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2930 3027
3028 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3029 return;
3030
3031 selection_grab (tm);
3032}
3033
3034bool
3035rxvt_term::selection_grab (Time tm) NOTHROW
3036{
3037 selection_time = tm;
3038
2931 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2932 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3041 {
2933 display->set_selection_owner (this); 3042 display->set_selection_owner (this);
3043 return true;
3044 }
2934 else 3045 else
2935 rxvt_warn ("can't get primary selection, ignoring.\n"); 3046 {
3047 selection_clear ();
3048 return false;
3049 }
2936 3050
2937#if 0 3051#if 0
2938 XTextProperty ct; 3052 XTextProperty ct;
2939 3053
2940 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2941 { 3055 {
2942 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2943 XFree (ct.value); 3057 XFree (ct.value);
2944 } 3058 }
2945#endif 3059#endif
2946
2947 selection_time = tm;
2948} 3060}
2949 3061
2950/* ------------------------------------------------------------------------- */ 3062/* ------------------------------------------------------------------------- */
2951/* 3063/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 3064 * Mark or select text based upon number of clicks: 1, 2, or 3
2953 * EXT: button 1 press 3065 * EXT: button 1 press
2954 */ 3066 */
2955void 3067void
2956rxvt_term::selection_click (int clicks, int x, int y) 3068rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2957{ 3069{
2958 clicks = ((clicks - 1) % 3) + 1; 3070 clicks = ((clicks - 1) % 3) + 1;
2959 selection.clicks = clicks; /* save clicks so extend will work */ 3071 selection.clicks = clicks; /* save clicks so extend will work */
2960 3072
3073 if (clicks == 2 && !selection.rect
3074 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3075 {
3076 MEvent.clicks = 1; // what a mess
3077 selection.screen = current_screen;
3078 selection.op = SELECTION_CONT;
3079 return;
3080 }
3081
2961 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3082 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2962 3083
2963 if (clicks == 2 || clicks == 3) 3084 if (clicks == 2 || clicks == 3)
2964 selection_extend_colrow (selection.mark.col, 3085 selection_extend_colrow (selection.mark.col,
2965 selection.mark.row + view_start, 3086 selection.mark.row - view_start,
2966 0, /* button 3 */ 3087 0, /* button 3 */
2967 1, /* button press */ 3088 1, /* button press */
2968 0); /* click change */ 3089 0); /* click change */
2969} 3090}
2970 3091
2971/* ------------------------------------------------------------------------- */ 3092/* ------------------------------------------------------------------------- */
2972/* 3093/*
2973 * Mark a selection at the specified col/row 3094 * Mark a selection at the specified col/row
2974 */ 3095 */
2975void 3096void
2976rxvt_term::selection_start_colrow (int col, int row) 3097rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2977{ 3098{
2978 want_refresh = 1; 3099 want_refresh = 1;
2979 3100
2980 selection.mark.row = row - view_start; 3101 selection.mark.row = row + view_start;
2981 selection.mark.col = col; 3102 selection.mark.col = col;
2982 3103
2983 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3104 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2984 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2985 3106
2986 while (selection.mark.col > 0 3107 while (selection.mark.col > 0
2987 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2988 --selection.mark.col; 3109 --selection.mark.col;
… …
3007#define DELIMIT_TEXT(x) \ 3128#define DELIMIT_TEXT(x) \
3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3129 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3009#define DELIMIT_REND(x) 1 3130#define DELIMIT_REND(x) 1
3010 3131
3011void 3132void
3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3133rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3013{ 3134{
3014 int col, row, dirnadd, tcol, trow, w1, w2; 3135 int col, row, dirnadd, tcol, trow, w1, w2;
3015 row_col_t bound; 3136 row_col_t bound;
3016 text_t *stp; 3137 text_t *stp;
3017 rend_t *srp; 3138 rend_t *srp;
3018 3139
3019 if (dirn == UP) 3140 if (dirn == UP)
3020 { 3141 {
3021 bound.row = - nsaved - 1; 3142 bound.row = top_row - 1;
3022 bound.col = 0; 3143 bound.col = 0;
3023 dirnadd = -1; 3144 dirnadd = -1;
3024 } 3145 }
3025 else 3146 else
3026 { 3147 {
… …
3074 } 3195 }
3075 } 3196 }
3076 break; 3197 break;
3077 } 3198 }
3078 3199
3079Old_Word_Selection_You_Die:
3080 if (dirn == DN) 3200 if (dirn == DN)
3081 col++; /* put us on one past the end */ 3201 col++; /* put us on one past the end */
3082 3202
3083 /* Poke the values back in */ 3203 /* Poke the values back in */
3084 ret->row = row; 3204 ret->row = row;
… …
3092 * flag == 0 ==> button 1 3212 * flag == 0 ==> button 1
3093 * flag == 1 ==> button 3 press 3213 * flag == 1 ==> button 3 press
3094 * flag == 2 ==> button 3 motion 3214 * flag == 2 ==> button 3 motion
3095 */ 3215 */
3096void 3216void
3097rxvt_term::selection_extend (int x, int y, int flag) 3217rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3098{ 3218{
3099 int col = clamp (Pixel2Col (x), 0, ncol); 3219 int col = clamp (Pixel2Col (x), 0, ncol);
3100 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3220 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3101 3221
3102 /* 3222 /*
… …
3105 * select nothing. Otherwise, if we're to the right of the mark, you have to 3225 * select nothing. Otherwise, if we're to the right of the mark, you have to
3106 * be _past_ a character for it to be selected. 3226 * be _past_ a character for it to be selected.
3107 */ 3227 */
3108 if (((selection.clicks % 3) == 1) && !flag 3228 if (((selection.clicks % 3) == 1) && !flag
3109 && (col == selection.mark.col 3229 && (col == selection.mark.col
3110 && (row == selection.mark.row + view_start))) 3230 && (row == selection.mark.row - view_start)))
3111 { 3231 {
3112 /* select nothing */ 3232 /* select nothing */
3113 selection.beg.row = selection.end.row = 0; 3233 selection.beg.row = selection.end.row = 0;
3114 selection.beg.col = selection.end.col = 0; 3234 selection.beg.col = selection.end.col = 0;
3115 selection.clicks = 4; 3235 selection.clicks = 4;
… …
3128/* ------------------------------------------------------------------------- */ 3248/* ------------------------------------------------------------------------- */
3129/* 3249/*
3130 * Extend the selection to the specified col/row 3250 * Extend the selection to the specified col/row
3131 */ 3251 */
3132void 3252void
3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3253rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3134{ 3254{
3135 row_col_t pos; 3255 row_col_t pos;
3136 enum { 3256 enum {
3137 LEFT, RIGHT 3257 LEFT, RIGHT
3138 } closeto = RIGHT; 3258 } closeto = RIGHT;
… …
3170 selection.beg.col = selection.end.col = selection.mark.col; 3290 selection.beg.col = selection.end.col = selection.mark.col;
3171 selection.beg.row = selection.end.row = selection.mark.row; 3291 selection.beg.row = selection.end.row = selection.mark.row;
3172 } 3292 }
3173 3293
3174 pos.col = col; 3294 pos.col = col;
3175 pos.row = row - view_start; 3295 pos.row = view_start + row;
3176 3296
3177 /* 3297 /*
3178 * This is mainly xterm style selection with a couple of differences, mainly 3298 * This is mainly xterm style selection with a couple of differences, mainly
3179 * in the way button3 drag extension works. 3299 * in the way button3 drag extension works.
3180 * We're either doing: button1 drag; button3 press; or button3 drag 3300 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3267 selection_delimit_word (DN, &selection.end, &selection.end); 3387 selection_delimit_word (DN, &selection.end, &selection.end);
3268 } 3388 }
3269 else if (selection.clicks == 3) 3389 else if (selection.clicks == 3)
3270 { 3390 {
3271#if ENABLE_FRILLS 3391#if ENABLE_FRILLS
3272 if (options & Opt_tripleclickwords) 3392 if (OPTION (Opt_tripleclickwords))
3273 { 3393 {
3274 selection_delimit_word (UP, &selection.beg, &selection.beg); 3394 selection_delimit_word (UP, &selection.beg, &selection.beg);
3275 3395
3276 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3277 { 3397 {
… …
3324#endif 3444#endif
3325} 3445}
3326 3446
3327#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3328void 3448void
3329rxvt_term::selection_remove_trailing_spaces () 3449rxvt_term::selection_remove_trailing_spaces () NOTHROW
3330{ 3450{
3331 int32_t end_col, end_row; 3451 int32_t end_col, end_row;
3332 text_t *stp; 3452 text_t *stp;
3333 3453
3334 end_col = selection.end.col; 3454 end_col = selection.end.col;
… …
3338 { 3458 {
3339 stp = ROW(end_row).t; 3459 stp = ROW(end_row).t;
3340 3460
3341 while (--end_col >= 0) 3461 while (--end_col >= 0)
3342 { 3462 {
3343 if (stp[end_col] != ' ' 3463 if (stp[end_col] != NOCHAR
3344 && stp[end_col] != '\t' 3464 && !unicode::is_space (stp[end_col]))
3345 && stp[end_col] != NOCHAR)
3346 break; 3465 break;
3347 } 3466 }
3348 3467
3349 if (end_col >= 0 3468 if (end_col >= 0
3350 || !ROW(end_row - 1).is_longer ()) 3469 || !ROW(end_row - 1).is_longer ())
… …
3373/* 3492/*
3374 * Double click on button 3 when already selected 3493 * Double click on button 3 when already selected
3375 * EXT: button 3 double click 3494 * EXT: button 3 double click
3376 */ 3495 */
3377void 3496void
3378rxvt_term::selection_rotate (int x, int y) 3497rxvt_term::selection_rotate (int x, int y) NOTHROW
3379{ 3498{
3380 selection.clicks = selection.clicks % 3 + 1; 3499 selection.clicks = selection.clicks % 3 + 1;
3381 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3500 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3382} 3501}
3383 3502
… …
3385/* 3504/*
3386 * Respond to a request for our current selection 3505 * Respond to a request for our current selection
3387 * EXT: SelectionRequest 3506 * EXT: SelectionRequest
3388 */ 3507 */
3389void 3508void
3390rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3391{ 3510{
3392 XSelectionEvent ev; 3511 XSelectionEvent ev;
3393 dDisp; 3512 dDisp;
3394 3513
3395 ev.type = SelectionNotify; 3514 ev.type = SelectionNotify;
… …
3523 3642
3524/* 3643/*
3525 * return col/row values corresponding to x/y pixel values 3644 * return col/row values corresponding to x/y pixel values
3526 */ 3645 */
3527void 3646void
3528rxvt_term::pixel_position (int *x, int *y) 3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3529{ 3648{
3530 *x = Pixel2Col (*x); 3649 *x = Pixel2Col (*x);
3531 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3532 *y = Pixel2Row (*y); 3651 *y = Pixel2Row (*y);
3533 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3534} 3653}
3535 3654
3536/* ------------------------------------------------------------------------- */ 3655/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3656#ifdef USE_XIM
3538void 3657void
3539rxvt_term::im_set_position (XPoint &pos) 3658rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3659{
3541 XWindowAttributes xwa; 3660 XWindowAttributes xwa;
3542 3661
3543 XGetWindowAttributes (display->display, vt, &xwa); 3662 XGetWindowAttributes (display->display, vt, &xwa);
3544 3663
… …
3547} 3666}
3548#endif 3667#endif
3549 3668
3550#if ENABLE_OVERLAY 3669#if ENABLE_OVERLAY
3551void 3670void
3552rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3671rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3553{ 3672{
3554 if (nrow < 3 || ncol < 3) 3673 if (nrow < 1 || ncol < 1)
3555 return; 3674 return;
3556 3675
3557 want_refresh = 1; 3676 want_refresh = 1;
3558 3677
3559 scr_overlay_off (); 3678 scr_overlay_off ();
… …
3602 *rp = r; 3721 *rp = r;
3603 } 3722 }
3604} 3723}
3605 3724
3606void 3725void
3607rxvt_term::scr_overlay_off () 3726rxvt_term::scr_overlay_off () NOTHROW
3608{ 3727{
3609 if (!ov_text) 3728 if (!ov_text)
3610 return; 3729 return;
3611 3730
3612 want_refresh = 1; 3731 want_refresh = 1;
… …
3620 delete [] ov_text; ov_text = 0; 3739 delete [] ov_text; ov_text = 0;
3621 delete [] ov_rend; ov_rend = 0; 3740 delete [] ov_rend; ov_rend = 0;
3622} 3741}
3623 3742
3624void 3743void
3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3744rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3626{ 3745{
3627 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3628 return; 3747 return;
3629 3748
3630 x++, y++; 3749 x++, y++;
… …
3632 ov_text[y][x] = text; 3751 ov_text[y][x] = text;
3633 ov_rend[y][x] = rend; 3752 ov_rend[y][x] = rend;
3634} 3753}
3635 3754
3636void 3755void
3637rxvt_term::scr_overlay_set (int x, int y, const char *s) 3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3638{ 3757{
3639 while (*s) 3758 while (*s)
3640 scr_overlay_set (x++, y, *s++); 3759 scr_overlay_set (x++, y, *s++);
3641} 3760}
3642 3761
3643void 3762void
3644rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3645{ 3764{
3646 while (*s) 3765 while (*s)
3647 { 3766 {
3648 text_t t = *s++; 3767 text_t t = *s++;
3649 int width = wcwidth (t); 3768 int width = wcwidth (t);
… …
3655 } 3774 }
3656 } 3775 }
3657} 3776}
3658 3777
3659void 3778void
3660rxvt_term::scr_swap_overlay () 3779rxvt_term::scr_swap_overlay () NOTHROW
3661{ 3780{
3662 if (!ov_text) 3781 if (!ov_text)
3663 return; 3782 return;
3664 3783
3665 // swap screen mem with overlay 3784 // swap screen mem with overlay
3666 for (int y = ov_h; y--; ) 3785 for (int y = ov_h; y--; )
3667 { 3786 {
3668 text_t *t1 = ov_text[y]; 3787 text_t *t1 = ov_text[y];
3669 rend_t *r1 = ov_rend[y]; 3788 rend_t *r1 = ov_rend[y];
3670 3789
3671 text_t *t2 = ROW(y - view_start).t + ov_x; 3790 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3672 rend_t *r2 = ROW(y - view_start).r + ov_x; 3791 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3673 3792
3674 for (int x = ov_w; x--; ) 3793 for (int x = ov_w; x--; )
3675 { 3794 {
3676 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3795 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3796 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