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.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 2006 UTC

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