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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines