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.195 by root, Mon Dec 26 23:02:34 2005 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC

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