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.187 by root, Wed Dec 21 23:57:12 2005 UTC vs.
Revision 1.243 by ayin, Thu Jan 19 23:15:21 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
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
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
173 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
174 { 180 {
175 //TODO//FIXME 181 //TODO//FIXME
176 saveLines++; 182 saveLines++;
177 prev_nrow--; 183 prev_nrow--;
178 nsaved++; 184 top_row--;
179 } 185 }
180 186
181 want_refresh = 1; 187 want_refresh = 1;
182 188
183 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
188 194
189 if (!row_buf) 195 if (!row_buf)
190 { 196 {
191 /* 197 /*
192 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 199 */
195 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
196 term_start = 0; 201 term_start = 0;
197 202
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 205
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 209
206 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
207 { 211 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 234 selection.text = NULL;
231 selection.len = 0; 235 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
234 selection.clicks = 0; 238 selection.clicks = 0;
235 CLEAR_ALL_SELECTION ();
236 rvideo = 0; 239 rvideo = 0;
237 } 240 }
238 else 241 else
239 { 242 {
240 /* 243 /*
… …
254 } 257 }
255 } 258 }
256#endif 259#endif
257 260
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 263
262 for (int row = min (nrow, prev_nrow); row--; ) 264 for (int row = min (nrow, prev_nrow); row--; )
263 { 265 {
264 lresize (drawn_buf[row]); 266 lresize (drawn_buf[row]);
… …
269 { 271 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 274 }
273 275
276 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 278
276 // re-wrap lines, this is rather ugly, possibly because I am too dumb
277 // to come up with a lean and mean algorithm.
278
279 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
280 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
282 282
283 while (p != pend && q > 0) 283 if (top_row)
284 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm.
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
284 { 291 do
285 p = MOD (p - 1, prev_total_rows);
286#ifdef DEBUG_STRICT
287 assert (old_buf [MOD (p, prev_total_rows)].t);
288#endif
289
290 int llen = old_buf [MOD (p, prev_total_rows)].l;
291
292 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
293 { 292 {
294 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 299
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 {
302 p = MOD (p - 1, prev_total_rows);
303
304 plines++;
296 llen += prev_ncol; 305 llen += prev_ncol;
306 }
307
308 int qlines = max (0, (llen - 1) / ncol) + 1;
309
310 // drop partial lines completely
311 if (q < qlines)
312 break;
313
314 q -= qlines;
315
316 int lofs = 0;
317 line_t *qline;
318
319 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++)
321 {
322 qline = row_buf + qrow;
323 lalloc (*qline);
324 qline->l = ncol;
325 qline->is_longer (1);
326
327 int qcol = 0;
328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
333 // fill a single destination line
334 while (lofs < llen && qcol < ncol)
335 {
336 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol;
338
339 prow = MOD (p + prow, prev_total_rows);
340
341 // we only adjust the cursor _row_ and put it into
342 // the topmost line of "long line" it was in, as
343 // this seems to upset applications/shells/readline
344 // least.
345 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow);
347
348 line_t &pline = old_buf [prow];
349
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359
360 lofs += len;
361 qcol += len;
362 }
363 }
364
365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
366 qline->is_longer (0);
367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
297 } 368 }
369 while (p != pend && q > 0);
298 370
299 int qlines = max (0, (llen - 1) / ncol) + 1; 371 term_start = total_rows - nrow;
300 372 top_row = q - term_start;
301 // drop partial lines completely 373
302 if (q < qlines) 374 // make sure all terminal lines exist
303 break; 375 while (top_row > 0)
304 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
305 q -= qlines; 377 }
306 378 else
307 int lofs = 0; 379 {
308 line_t *qline; 380 // if no scrollback exists (yet), wing, instead of wrap
309 381
310 // re-assemble the full line by destination lines 382 for (int row = min (nrow, prev_nrow); row--; )
311 for (int qrow = q; qlines--; qrow++)
312 { 383 {
313 qline = row_buf + qrow;
314 lalloc (*qline);
315 qline->set_is_longer ();
316
317 int qcol = 0;
318
319 // fill a single destination line
320 while (lofs < llen && qcol < ncol)
321 {
322 int prow = lofs / prev_ncol;
323 int pcol = lofs % prev_ncol;
324
325 line_t &pline = old_buf [MOD (p + prow, prev_total_rows)]; 384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row];
326 386
327 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 387 qline = pline;
328 388 lresize (qline);
329 assert (len);
330 assert (pline.t);
331
332 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
333 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
334
335 lofs += len;
336 qcol += len;
337 }
338 } 389 }
339 390
340 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 391 for (int row = prev_nrow; row < nrow; row++)
341 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 392 {
393 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
342 } 394 }
343 395
344 term_start = total_rows - nrow;
345 view_start = 0; 396 term_start = 0;
346 nsaved = term_start - q; 397 }
347
348 // make sure all terminal lines exist
349 while (nsaved < 0)
350 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
351
352 for (int i = -nsaved; i < nrow; i++)
353 assert (ROW (i).t);//D
354 398
355 free (old_buf); 399 free (old_buf);
356 delete old_ta; 400 delete old_ta;
357 delete old_ra; 401 delete old_ra;
358 402
359 min_it (screen.cur.row, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
360 min_it (screen.cur.col, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
361 405
362 if (tabs) 406 if (tabs)
363 free (tabs); 407 free (tabs);
364 } 408 }
365 409
410 CLEAR_ALL_SELECTION ();
411
366 prev_nrow = nrow; 412 prev_nrow = nrow;
367 prev_ncol = ncol; 413 prev_ncol = ncol;
368 414
369 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
370 416
371 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
372 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
373 419
374 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
375} 423}
376 424
377/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
378/* 426/*
379 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
… …
385 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
386 434
387 free (row_buf); 435 free (row_buf);
388 free (swap_buf); 436 free (swap_buf);
389 free (drawn_buf); 437 free (drawn_buf);
390 free (temp_buf);
391 free (tabs); 438 free (tabs);
392 439
393 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
394} 441}
395 442
… …
403 scr_release (); 450 scr_release ();
404 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
405 scr_reset (); 452 scr_reset ();
406 453
407 scr_clear (true); 454 scr_clear (true);
408 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
409} 456}
410 457
411/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
412 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
413 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
415 * Save and Restore cursor 462 * Save and Restore cursor
416 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
417 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
418 */ 465 */
419void 466void
420rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode)
421{ 468{
422 screen_t *s; 469 screen_t *s;
423 470
424#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
425 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
483 530
484 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
485 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
486 533
487#if NSCREENS 534#if NSCREENS
488 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
489 { 536 {
490 num_scr = 0; 537 num_scr = 0;
491 538
492 for (int i = nrow; i--; ) 539 for (int i = prev_nrow; i--; )
493 ::swap (ROW(i), swap_buf [i]); 540 ::swap (ROW(i), swap_buf [i]);
494 541
495 ::swap (screen.charset, swap.charset); 542 ::swap (screen.charset, swap.charset);
496 ::swap (screen.flags, swap.flags); 543 ::swap (screen.flags, swap.flags);
497 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
498 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
499 } 546 }
500 else 547 else
501#endif 548#endif
502 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
503 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
504 551
505 return scrn; 552 return scrn;
506} 553}
507 554
… …
527 * Change the colour for following text 574 * Change the colour for following text
528 */ 575 */
529void 576void
530rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg)
531{ 578{
532 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
533 color = fgbg; 580 color = fgbg;
534 581
535 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
536 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
537 else 584 else
… …
568 want_refresh = 1; 615 want_refresh = 1;
569 num_scr += count; 616 num_scr += count;
570 617
571 if (count > 0 618 if (count > 0
572 && row1 == 0 619 && row1 == 0
573 && row2 == nrow - 1
574 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
575 { 621 {
576 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
623
624 // scroll everything up 'count' lines
577 term_start = (term_start + count) % total_rows; 625 term_start = (term_start + count) % total_rows;
578 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
579 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
580 { 661 {
581 selection.beg.row -= count; 662 selection.beg.row -= count;
582 selection.end.row -= count; 663 selection.end.row -= count;
583 selection.mark.row -= count; 664 selection.mark.row -= count;
584 665
585 selection_check (0); 666 if (selection.beg.row < top_row
586 } 667 || selection.end.row < top_row
587 668 || selection.mark.row < top_row)
588 for (int i = count; i--; )
589 scr_blank_screen_mem (ROW(row2 - i), rstyle);
590
591 if ((options & Opt_scrollWithBuffer)
592 && view_start != 0
593 && view_start != saveLines)
594 scr_page (UP, count);
595 }
596 else
597 {
598 if (selection.op && current_screen == selection.screen)
599 {
600 int i = selection.beg.row;
601 int j = selection.end.row;
602
603 if ((i < row1 && j > row1)
604 || (i < row2 && j > row2)
605 || (i - count < row1 && i >= row1)
606 || (i - count > row2 && i <= row2)
607 || (j - count < row1 && j >= row1)
608 || (j - count > row2 && j <= row2))
609 { 669 {
610 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
611 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 671 selection.op = SELECTION_CLEAR;
612 } 672 }
613 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)
614 { 699 {
615 /* move selected region too */ 700 /* move selected region too */
616 selection.beg.row -= count; 701 selection.beg.row -= count;
617 selection.end.row -= count; 702 selection.end.row -= count;
618 selection.mark.row -= count; 703 selection.mark.row -= count;
… …
626 711
627 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
628 713
629 min_it (count, rows); 714 min_it (count, rows);
630 715
716 line_t *temp_buf = row_buf + total_rows;
717
631 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
632 { 719 {
633 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
634 721
635 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
646/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
647/* 734/*
648 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
649 */ 736 */
650void 737void
651rxvt_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)
652{ 739{
653 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
654 return; 741 return;
655 742
656 unsigned char checksel; 743 unsigned char checksel;
657 unicode_t c; 744 unicode_t c;
658 int row, last_col; 745 int ncol = this->ncol;
659 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
660 747
661 want_refresh = 1; 748 want_refresh = 1;
662 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
663 last_col = ncol;
664 750
665 if (nlines > 0) 751 if (minlines > 0)
666 { 752 {
667 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
668 if (nlines > 0 755 if (minlines > 0
669 && screen.tscroll == 0 756 && screen.tscroll == 0
670 && screen.bscroll == (nrow - 1)) 757 && screen.bscroll == nrow - 1)
671 { 758 {
672 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
673 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
674 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
675 } 762 }
676 } 763 }
677 764
678#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
679 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
680 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
681 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
682#endif 769#endif
683 row = screen.cur.row; 770 int row = screen.cur.row;
684 771
685 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
686 773
687 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
688 775
689 while (str < strend) 776 while (str < strend)
690 { 777 {
691 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
692 779
693 if (c < 0x20) 780 if (c < 0x20)
694 if (c == C0_LF) 781 if (c == C0_LF)
695 { 782 {
696 if (!line->is_longer ()) /* XXX: think about this */
697 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
698 784
699 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
700 786
701 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
702 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
706 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
707 continue; 793 continue;
708 } 794 }
709 else if (c == C0_CR) 795 else if (c == C0_CR)
710 { 796 {
711 if (!line->is_longer ()) /* XXX: think about this */
712 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
713 798
714 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
715 screen.cur.col = 0; 800 screen.cur.col = 0;
716 continue; 801 continue;
717 } 802 }
… …
734 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
735 } 820 }
736 821
737 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
738 { 823 {
739 line->set_is_longer ();
740
741 scr_do_wrap (); 824 scr_do_wrap ();
742 825
826 line->l = ncol;
827 line->is_longer (1);
828
743 row = screen.cur.row; 829 row = screen.cur.row;
744 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
745 } 831 }
746 832
747 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
752 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
753 // 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
754 // locale. 840 // locale.
755 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
756 842
757 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
758 { 844 {
759 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
760 // 5f-7e standard vt100 846 // 5f-7e standard vt100
761 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
762 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
814 } 900 }
815 901
816 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
817 903
818 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
819 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
820 { 906 {
821 // ...output spaces 907 // ...output spaces
822 c = ' '; 908 c = ' ';
823 // and try the same character next loop iteration 909 // and try the same character next loop iteration
824 --str; 910 --str;
825 } 911 }
826 912
913 line->touch ();
914
827 do 915 do
828 { 916 {
829 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
830 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
831 919
832 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
833 screen.cur.col++; 921 screen.cur.col++;
834 else 922 else
835 { 923 {
836 line->l = last_col; 924 line->l = ncol;
837 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
838 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
839 break; 927 break;
840 } 928 }
841 929
… …
843 } 931 }
844 while (--width > 0); 932 while (--width > 0);
845 933
846 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
847 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
848 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++)
849 { 940 {
850 line->t[c] = ' '; 941 line->t[c] = ' ';
851 line->r[c] = rend; 942 line->r[c] = rend;
852 } 943 }
944 }
853 } 945 }
854 else // width == 0 946 else // width == 0
855 { 947 {
856#if ENABLE_COMBINING 948#if ENABLE_COMBINING
857 // handle combining characters 949 // handle combining characters
858 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
859 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
860 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
861 text_t *tp; 954 text_t *tp;
862 rend_t *rp; 955 rend_t *rp;
863 956
864 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
865 { 958 {
959 linep = line;
866 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
867 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
868
869 while (*tp == NOCHAR && tp > line->t)
870 tp--, rp--;
871 } 962 }
872 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
873 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
874 { 965 {
875 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
876
877 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
878 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
879
880 while (*tp == NOCHAR && tp > line->t)
881 tp--, rp--;
882 } 969 }
883 else 970 else
884 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
885 977
886 // first try to find a precomposed character 978 // first try to find a precomposed character
887 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
888 if (n == NOCHAR) 980 if (n == NOCHAR)
889 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
892 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
893#endif 985#endif
894 } 986 }
895 } 987 }
896 988
897 if (!line->is_longer ()) /* XXX: think about this */
898 max_it (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
899 990
900#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
901 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
902#endif 993#endif
903} 994}
… …
945 1036
946 if (count == 0) 1037 if (count == 0)
947 return; 1038 return;
948 else if (count > 0) 1039 else if (count > 0)
949 { 1040 {
950 int row = screen.cur.row;
951
952 line_t &l = ROW(row); 1041 line_t &l = ROW(screen.cur.row);
953 rend_t base_rend = l.r[i]; 1042 rend_t base_rend = l.r[i];
954 ht &= l.t[i] == ' '; 1043 ht &= l.t[i] == ' ';
955 1044
956 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
957 if (tabs[i]) 1046 if (tabs[i])
958 { 1047 {
959 x = i; 1048 x = i;
1049
960 if (!--count) 1050 if (!--count)
961 break; 1051 break;
962 } 1052 }
963 else 1053 else
964 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
967 if (count) 1057 if (count)
968 x = ncol - 1; 1058 x = ncol - 1;
969 1059
970 // store horizontal tab commands as characters inside the text 1060 // store horizontal tab commands as characters inside the text
971 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
972 if (ht && options & Opt_pastableTabs) 1062 if (ht && OPTION (Opt_pastableTabs))
973 { 1063 {
974 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
975 1065
976 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
977 max_it (l.l, x);
978 1067
979 i = screen.cur.col; 1068 i = screen.cur.col;
980 1069
981 l.t[i] = '\t'; 1070 l.t[i] = '\t';
982 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1032 */ 1121 */
1033#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1034void 1123void
1035rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex ()
1036{ 1125{
1037 int row;
1038
1039 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1040 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1041 else 1128 else
1042 { 1129 {
1043 row = screen.cur.row; 1130 line_t &l = ROW(screen.cur.row);
1044 1131
1045 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1132 l.touch ();
1046 ROW(row).l = ncol; 1133 l.is_longer (0);
1047 1134
1048 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1049 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1050 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1051 } 1138 }
… …
1134 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1135 */ 1222 */
1136void 1223void
1137rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode)
1138{ 1225{
1139 unsigned int row, col, num; 1226 unsigned int col, num;
1140 1227
1141 want_refresh = 1; 1228 want_refresh = 1;
1142 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1143 1230
1144 selection_check (1); 1231 selection_check (1);
1145 1232
1146 row = screen.cur.row; 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1147 1237
1148 switch (mode) 1238 switch (mode)
1149 { 1239 {
1150 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1151 col = screen.cur.col; 1241 col = screen.cur.col;
1152 num = ncol - col; 1242 num = ncol - col;
1153 min_it (ROW(row).l, col); 1243 min_it (line.l, col);
1154 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1155 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1156 CLEAR_SELECTION (); 1246 CLEAR_SELECTION ();
1157 break; 1247 break;
1158 case 1: /* erase to beginning of line */ 1248 case 1: /* erase to beginning of line */
… …
1163 CLEAR_SELECTION (); 1253 CLEAR_SELECTION ();
1164 break; 1254 break;
1165 case 2: /* erase whole line */ 1255 case 2: /* erase whole line */
1166 col = 0; 1256 col = 0;
1167 num = ncol; 1257 num = ncol;
1168 ROW(row).l = 0; 1258 line.l = 0;
1169 if (selection.beg.row <= screen.cur.row 1259 if (selection.beg.row <= screen.cur.row
1170 && selection.end.row >= screen.cur.row) 1260 && selection.end.row >= screen.cur.row)
1171 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1172 break; 1262 break;
1173 default: 1263 default:
1174 return; 1264 return;
1175 } 1265 }
1176 1266
1177 scr_blank_line (ROW(row), col, num, rstyle); 1267 scr_blank_line (line, col, num, rstyle);
1178} 1268}
1179 1269
1180/* ------------------------------------------------------------------------- */ 1270/* ------------------------------------------------------------------------- */
1181/* 1271/*
1182 * Erase part of whole of the screen 1272 * Erase part of whole of the screen
… …
1237 CLEAR_ROWS (row, num); 1327 CLEAR_ROWS (row, num);
1238 } 1328 }
1239 else 1329 else
1240 { 1330 {
1241 ren = rstyle & (RS_fgMask | RS_bgMask); 1331 ren = rstyle & (RS_fgMask | RS_bgMask);
1242 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1243 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1333 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1244 ERASE_ROWS (row, num); 1334 ERASE_ROWS (row, num);
1245 gcvalue.foreground = pix_colors[Color_fg]; 1335 gcvalue.foreground = pix_colors[Color_fg];
1246 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1247 } 1337 }
1248 1338
1249 for (; num--; row++) 1339 for (; num--; row++)
1250 { 1340 {
1251 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1252 ROW (row).l = 0;
1253 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1254 } 1343 }
1255} 1344}
1256 1345
1257#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
… …
1259rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines ()
1260{ 1349{
1261 want_refresh = 1; 1350 want_refresh = 1;
1262 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1263 1352
1264 nsaved = 0; 1353 top_row = 0;
1265} 1354}
1266#endif 1355#endif
1267 1356
1268/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1269/* 1358/*
… …
1290 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1291 1380
1292 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1293 *r1++ = fs; 1382 *r1++ = fs;
1294 1383
1295 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1296 } 1386 }
1297} 1387}
1298 1388
1299/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1300/* 1390/*
… …
1348 min_it (count, ncol - screen.cur.col); 1438 min_it (count, ncol - screen.cur.col);
1349 1439
1350 row = screen.cur.row; 1440 row = screen.cur.row;
1351 1441
1352 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1353 1446
1354 switch (insdel) 1447 switch (insdel)
1355 { 1448 {
1356 case INSERT: 1449 case INSERT:
1357 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1358 { 1451 {
1359 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1360 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1361 } 1454 }
1362 1455
1363 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1364 {
1365 line->l += count;
1366 min_it (line->l, ncol);
1367 }
1368 1457
1369 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1370 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1371 { 1460 {
1372 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1385 1474
1386 case ERASE: 1475 case ERASE:
1387 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1388 selection_check (1); 1477 selection_check (1);
1389 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1390 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1391 break; 1482 break;
1392 1483
1393 case DELETE: 1484 case DELETE:
1394 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1397 { 1488 {
1398 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1399 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1400 } 1491 }
1401 1492
1493 line->l = max (line->l - count, 0);
1402 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1403
1404 if (line->is_longer ()) /* break line continuation */
1405 line->l = ncol;
1406
1407 line->l = max (line->l - count, 0);
1408 1495
1409 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1410 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1411 { 1498 {
1412 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1524rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode)
1525{ 1612{
1526 if (mode < 0) 1613 if (mode < 0)
1527 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1528 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1529 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1530} 1617}
1531 1618
1532/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1533/* 1620/*
1534 * Set reverse/normal video 1621 * Set reverse/normal video
… …
1546 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1547#if XPM_BACKGROUND 1634#if XPM_BACKGROUND
1548 if (bgPixmap.pixmap == None) 1635 if (bgPixmap.pixmap == None)
1549#endif 1636#endif
1550#if TRANSPARENT 1637#if TRANSPARENT
1551 if (! (options & Opt_transparent) || am_transparent == 0) 1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1552#endif 1639#endif
1553 XSetWindowBackground (display->display, vt, 1640 XSetWindowBackground (display->display, vt,
1554 pix_colors[Color_bg]); 1641 pix_colors[Color_bg]);
1555 1642
1556 gcvalue.foreground = pix_colors[Color_fg]; 1643 gcvalue.foreground = pix_colors[Color_fg];
… …
1581 * Set font style 1668 * Set font style
1582 */ 1669 */
1583void 1670void
1584rxvt_term::set_font_style () 1671rxvt_term::set_font_style ()
1585{ 1672{
1673#if 0
1586 switch (charsets[screen.charset]) 1674 switch (charsets [screen.charset])
1587 { 1675 {
1588 case '0': /* DEC Special Character & Line Drawing Set */ 1676 case '0': /* DEC Special Character & Line Drawing Set */
1589 break; 1677 break;
1590 case 'A': /* United Kingdom (UK) */ 1678 case 'A': /* United Kingdom (UK) */
1591 break; 1679 break;
… …
1598 case 'C': /* Finnish character set */ 1686 case 'C': /* Finnish character set */
1599 break; 1687 break;
1600 case 'K': /* German character set */ 1688 case 'K': /* German character set */
1601 break; 1689 break;
1602 } 1690 }
1691#endif
1603} 1692}
1604 1693
1605/* ------------------------------------------------------------------------- */ 1694/* ------------------------------------------------------------------------- */
1606/* 1695/*
1607 * Choose a font 1696 * Choose a font
… …
1703 } 1792 }
1704 1793
1705 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1706 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1707 1796
1797 num_scr_allow = 0;
1798
1708 if (refresh) 1799 if (refresh)
1709 scr_refresh (SLOW_REFRESH); 1800 scr_refresh ();
1710} 1801}
1711 1802
1712/* ------------------------------------------------------------------------- */ 1803/* ------------------------------------------------------------------------- */
1713/* 1804/*
1714 * Refresh the entire screen 1805 * Refresh the entire screen
… …
1722/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1723/* 1814/*
1724 * Move the display so that the line represented by scrollbar value Y is at 1815 * Move the display so that the line represented by scrollbar value Y is at
1725 * the top of the screen 1816 * the top of the screen
1726 */ 1817 */
1727int 1818void
1728rxvt_term::scr_move_to (int y, int len) 1819rxvt_term::scr_move_to (int y, int len)
1729{ 1820{
1730 long p = 0; 1821 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1731 unsigned int oldviewstart;
1732
1733 oldviewstart = view_start;
1734
1735 if (y < len)
1736 {
1737 p = (nrow + nsaved) * (len - y) / len;
1738 p -= (long) (nrow - 1);
1739 p = max (p, 0);
1740 }
1741
1742 view_start = (unsigned int)min (p, nsaved);
1743
1744 return scr_changeview (oldviewstart);
1745} 1822}
1746 1823
1747/* ------------------------------------------------------------------------- */ 1824/* ------------------------------------------------------------------------- */
1748/* 1825/*
1749 * Page the screen up/down nlines 1826 * Page the screen up/down nlines
1750 * direction should be UP or DN 1827 * direction should be UP or DN
1751 */ 1828 */
1752int 1829bool
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1830rxvt_term::scr_page (enum page_dirn direction, int nlines)
1754{ 1831{
1755 int n; 1832 int new_view_start =
1756 unsigned int oldviewstart;
1757
1758 oldviewstart = view_start;
1759
1760 if (direction == UP)
1761 {
1762 n = view_start + nlines;
1763 view_start = min (n, nsaved);
1764 }
1765 else
1766 {
1767 n = view_start - nlines; 1833 direction == UP ? view_start - nlines
1768 view_start = max (n, 0); 1834 : view_start + nlines;
1769 }
1770 1835
1771 return scr_changeview (oldviewstart); 1836 return scr_changeview (new_view_start);
1772} 1837}
1773 1838
1774int 1839bool
1775rxvt_term::scr_changeview (unsigned int oldviewstart) 1840rxvt_term::scr_changeview (int new_view_start)
1776{ 1841{
1842 clamp_it (new_view_start, top_row, 0);
1843
1777 if (view_start != oldviewstart) 1844 if (new_view_start == view_start)
1778 { 1845 return false;
1846
1847 num_scr += new_view_start - view_start;
1848 view_start = new_view_start;
1779 want_refresh = 1; 1849 want_refresh = 1;
1780 num_scr -= (view_start - oldviewstart);
1781 }
1782 1850
1783 return (int) (view_start - oldviewstart); 1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852
1853 return true;
1784} 1854}
1785 1855
1786/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1787void 1857void
1788rxvt_term::scr_bell () 1858rxvt_term::scr_bell ()
1789{ 1859{
1790#ifndef NO_BELL 1860#ifndef NO_BELL
1791 1861
1792# ifndef NO_MAPALERT 1862# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1863# ifdef MAPALERT_OPTION
1794 if (options & Opt_mapAlert) 1864 if (OPTION (Opt_mapAlert))
1795# endif 1865# endif
1796 XMapWindow (display->display, parent[0]); 1866 XMapWindow (display->display, parent[0]);
1797# endif 1867# endif
1798 1868
1799 if (options & Opt_visualBell) 1869 if (OPTION (Opt_visualBell))
1800 { 1870 {
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1871 scr_rvideo_mode (!rvideo); /* refresh also done */
1872 display->flush ();
1802 rxvt_usleep (VISUAL_BELL_DURATION); 1873 rxvt_usleep (VISUAL_BELL_DURATION);
1803 scr_rvideo_mode (!rvideo); /* refresh also done */ 1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1804 } 1875 }
1805 else 1876 else
1806 XBell (display->display, 0); 1877 XBell (display->display, 0);
… …
1820 if ((fd = popen_printer ()) == NULL) 1891 if ((fd = popen_printer ()) == NULL)
1821 return; 1892 return;
1822 1893
1823 if (fullhist) 1894 if (fullhist)
1824 { 1895 {
1825 nrows = nrow + nsaved; 1896 nrows = nrow - top_row;
1826 row_start = -nsaved; 1897 row_start = top_row;
1827 } 1898 }
1828 else 1899 else
1829 { 1900 {
1830 nrows = nrow; 1901 nrows = nrow;
1831 row_start = -view_start; 1902 row_start = view_start;
1832 } 1903 }
1833 1904
1834 wctomb (0, 0); 1905 wctomb (0, 0);
1835 1906
1836 for (int r1 = 0; r1 < nrows; r1++) 1907 for (int r1 = 0; r1 < nrows; r1++)
… …
1868 * Refresh the screen 1939 * Refresh the screen
1869 * drawn_text/drawn_rend contain the screen information before the update. 1940 * drawn_text/drawn_rend contain the screen information before the update.
1870 * screen.text/screen.rend contain what the screen will change to. 1941 * screen.text/screen.rend contain what the screen will change to.
1871 */ 1942 */
1872void 1943void
1873rxvt_term::scr_refresh (unsigned char refresh_type) 1944rxvt_term::scr_refresh ()
1874{ 1945{
1875 unsigned char must_clear, /* use draw_string not draw_image_string */ 1946 unsigned char must_clear, /* use draw_string not draw_image_string */
1876 showcursor; /* show the cursor */ 1947 showcursor; /* show the cursor */
1877 int16_t col, row, /* column/row we're processing */ 1948 int16_t col, row, /* column/row we're processing */
1878 ocrow; /* old cursor row */ 1949 ocrow; /* old cursor row */
… …
1895 1966
1896#if XPM_BACKGROUND 1967#if XPM_BACKGROUND
1897 must_clear |= bgPixmap.pixmap != None; 1968 must_clear |= bgPixmap.pixmap != None;
1898#endif 1969#endif
1899#if TRANSPARENT 1970#if TRANSPARENT
1900 must_clear |= (options & Opt_transparent) && am_transparent; 1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1901#endif 1972#endif
1902 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1903 1974
1904 /* 1975 /*
1905 * B: reverse any characters which are selected 1976 * B: reverse any characters which are selected
… …
1929 2000
1930 crp = &ROW(screen.cur.row).r[col]; 2001 crp = &ROW(screen.cur.row).r[col];
1931 2002
1932 if (showcursor && focus) 2003 if (showcursor && focus)
1933 { 2004 {
1934 if (options & Opt_cursorUnderline) 2005 if (OPTION (Opt_cursorUnderline))
1935 *crp ^= RS_Uline; 2006 *crp ^= RS_Uline;
1936 else 2007 else
1937 { 2008 {
1938 *crp ^= RS_RVid; 2009 *crp ^= RS_RVid;
1939 2010
… …
1941 cc1 = *crp & (RS_fgMask | RS_bgMask); 2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
1942 if (ISSET_PIXCOLOR (Color_cursor)) 2013 if (ISSET_PIXCOLOR (Color_cursor))
1943 ccol1 = Color_cursor; 2014 ccol1 = Color_cursor;
1944 else 2015 else
1945#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1946 ccol1 = GET_FGCOLOR (rstyle); 2017 ccol1 = fgcolor_of (rstyle);
1947#else 2018#else
1948 ccol1 = Color_fg; 2019 ccol1 = Color_fg;
1949#endif 2020#endif
1950 if (ISSET_PIXCOLOR (Color_cursor2)) 2021 if (ISSET_PIXCOLOR (Color_cursor2))
1951 ccol2 = Color_cursor2; 2022 ccol2 = Color_cursor2;
1952 else 2023 else
1953#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1954 ccol2 = GET_BGCOLOR (rstyle); 2025 ccol2 = bgcolor_of (rstyle);
1955#else 2026#else
1956 ccol2 = Color_bg; 2027 ccol2 = Color_bg;
1957#endif 2028#endif
1958 *crp = SET_FGCOLOR (*crp, ccol1); 2029 *crp = SET_FGCOLOR (*crp, ccol1);
1959 *crp = SET_BGCOLOR (*crp, ccol2); 2030 *crp = SET_BGCOLOR (*crp, ccol2);
… …
1964 2035
1965 /* make sure no outline cursor is left around */ 2036 /* make sure no outline cursor is left around */
1966 setoldcursor = 0; 2037 setoldcursor = 0;
1967 if (ocrow != -1) 2038 if (ocrow != -1)
1968 { 2039 {
1969 if (screen.cur.row + view_start != ocrow 2040 if (screen.cur.row - view_start != ocrow
1970 || screen.cur.col != oldcursor.col) 2041 || screen.cur.col != oldcursor.col)
1971 { 2042 {
1972 if (ocrow < nrow 2043 if (ocrow < nrow
1973 && oldcursor.col < ncol) 2044 && oldcursor.col < ncol)
1974 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2045 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
1982 else if (!focus) 2053 else if (!focus)
1983 setoldcursor = 1; 2054 setoldcursor = 1;
1984 2055
1985 if (setoldcursor) 2056 if (setoldcursor)
1986 { 2057 {
1987 if (screen.cur.row + view_start >= nrow) 2058 if (screen.cur.row - view_start >= nrow)
1988 oldcursor.row = -1; 2059 oldcursor.row = -1;
1989 else 2060 else
1990 { 2061 {
1991 oldcursor.row = screen.cur.row + view_start; 2062 oldcursor.row = screen.cur.row - view_start;
1992 oldcursor.col = screen.cur.col; 2063 oldcursor.col = screen.cur.col;
1993 } 2064 }
1994 } 2065 }
1995 } 2066 }
1996 2067
2068 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
1997#if ENABLE_OVERLAY 2069#if ENABLE_OVERLAY
1998 scr_swap_overlay (); 2070 scr_swap_overlay ();
1999#endif 2071#endif
2000 2072
2001#ifndef NO_SLOW_LINK_SUPPORT 2073#ifndef NO_SLOW_LINK_SUPPORT
2002 /* 2074 /*
2003 * D: CopyArea pass - very useful for slower links 2075 * D: CopyArea pass - very useful for slower links
2004 * This has been deliberately kept simple. 2076 * This has been deliberately kept simple.
2005 */ 2077 */
2006 i = num_scr;
2007 if (!display->is_local 2078 if (!display->is_local
2008 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2009 && abs (num_scr) < nrow && !must_clear) 2080 && abs (num_scr) < nrow && !must_clear)
2010 { 2081 {
2011 int16_t nits; 2082 int16_t nits;
2012 int j; 2083 int j;
2013 int len, wlen; 2084 int len, wlen;
2085 dLocal (int, num_scr);
2014 2086
2015 j = nrow; 2087 j = nrow;
2016 wlen = len = -1; 2088 wlen = len = -1;
2017 row = i > 0 ? 0 : j - 1; 2089 row = i > 0 ? 0 : j - 1;
2018 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2019 { 2091 {
2020 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2021 { 2093 {
2022 line_t s = ROW(row - view_start); 2094 line_t s = ROW(view_start + row);
2023 line_t d = drawn_buf[row]; 2095 line_t d = drawn_buf[row];
2024 line_t d2 = drawn_buf[row + i]; 2096 line_t d2 = drawn_buf[row + i];
2025 2097
2026 for (nits = 0, col = ncol; col--; ) 2098 for (nits = 0, col = ncol; col--; )
2027 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2099 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2051 if (wlen < len) 2123 if (wlen < len)
2052 ::swap (wlen, len); 2124 ::swap (wlen, len);
2053 2125
2054 XCopyArea (display->display, vt, vt, 2126 XCopyArea (display->display, vt, vt,
2055 gc, 0, Row2Pixel (len + i), 2127 gc, 0, Row2Pixel (len + i),
2056 (unsigned int)TermWin_TotalWidth (), 2128 (unsigned int)this->width,
2057 (unsigned int)Height2Pixel (wlen - len + 1), 2129 (unsigned int)Height2Pixel (wlen - len + 1),
2058 0, Row2Pixel (len)); 2130 0, Row2Pixel (len));
2059 len = -1; 2131 len = -1;
2060 } 2132 }
2061 } 2133 }
… …
2065 /* 2137 /*
2066 * E: main pass across every character 2138 * E: main pass across every character
2067 */ 2139 */
2068 for (row = 0; row < nrow; row++) 2140 for (row = 0; row < nrow; row++)
2069 { 2141 {
2070 text_t *stp = ROW(row - view_start).t; 2142 text_t *stp = ROW(view_start + row).t;
2071 rend_t *srp = ROW(row - view_start).r; 2143 rend_t *srp = ROW(view_start + row).r;
2072 text_t *dtp = drawn_buf[row].t; 2144 text_t *dtp = drawn_buf[row].t;
2073 rend_t *drp = drawn_buf[row].r; 2145 rend_t *drp = drawn_buf[row].r;
2074 2146
2075 /* 2147 /*
2076 * E2: OK, now the real pass 2148 * E2: OK, now the real pass
… …
2140 count++, i--; 2212 count++, i--;
2141 2213
2142 /* 2214 /*
2143 * Determine the attributes for the string 2215 * Determine the attributes for the string
2144 */ 2216 */
2145 int fore = GET_FGCOLOR (rend); // desired foreground 2217 int fore = fgcolor_of (rend); // desired foreground
2146 int back = GET_BGCOLOR (rend); // desired background 2218 int back = bgcolor_of (rend); // desired background
2147 2219
2148 // only do special processing if any attributes are set, which is rare 2220 // only do special processing if any attributes are set, which is unlikely
2149 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2150 { 2222 {
2151#if ENABLE_STYLES 2223#if ENABLE_STYLES
2152 // force redraw after "careful" characters to avoid pixel droppings 2224 // force redraw after "careful" characters to avoid pixel droppings
2153 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2264 } /* for (row....) */ 2336 } /* for (row....) */
2265 2337
2266#if ENABLE_OVERLAY 2338#if ENABLE_OVERLAY
2267 scr_swap_overlay (); 2339 scr_swap_overlay ();
2268#endif 2340#endif
2341 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2269 2342
2270 /* 2343 /*
2271 * G: cleanup cursor and display outline cursor if necessary 2344 * G: cleanup cursor and display outline cursor if necessary
2272 */ 2345 */
2273 if (showcursor) 2346 if (showcursor)
2274 { 2347 {
2275 if (focus) 2348 if (focus)
2276 { 2349 {
2277 if (options & Opt_cursorUnderline) 2350 if (OPTION (Opt_cursorUnderline))
2278 *crp ^= RS_Uline; 2351 *crp ^= RS_Uline;
2279 else 2352 else
2280 { 2353 {
2281 *crp ^= RS_RVid; 2354 *crp ^= RS_RVid;
2282#ifndef NO_CURSORCOLOR 2355#ifndef NO_CURSORCOLOR
… …
2312 /* 2385 /*
2313 * H: cleanup selection 2386 * H: cleanup selection
2314 */ 2387 */
2315 scr_reverse_selection (); 2388 scr_reverse_selection ();
2316 2389
2317 if (refresh_type & SMOOTH_REFRESH)
2318 XFlush (display->display);
2319
2320 num_scr = 0; 2390 num_scr = 0;
2321 num_scr_allow = 1; 2391 num_scr_allow = 1;
2322} 2392}
2323 2393
2324void 2394void
2325rxvt_term::scr_remap_chars (const line_t &l) 2395rxvt_term::scr_remap_chars (line_t &l)
2326{ 2396{
2327 if (!l.t) 2397 if (!l.t)
2328 return; 2398 return;
2399
2400 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2329 2401
2330 for (int i = ncol; i--; ) 2402 for (int i = ncol; i--; )
2331 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2403 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2332} 2404}
2333 2405
… …
2386 2458
2387 if (really) 2459 if (really)
2388 XClearWindow (display->display, vt); 2460 XClearWindow (display->display, vt);
2389} 2461}
2390 2462
2463void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2465{
2466 int view_end = view_start + nrow;
2467 int row, col;
2468
2469 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2470 {
2471 text_t *stp = ROW(row).t;
2472 rend_t *srp = ROW(row).r;
2473
2474 for (col = beg_col; col < end_col; col++)
2475 srp[col] ^= rstyle1;
2476
2477 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2478 srp[col] ^= rstyle2;
2479
2480 if (++col < end_col)
2481 srp[col] ^= rstyle2;
2482 }
2483}
2484
2485void
2486rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2487{
2488 int view_end = view_start + nrow;
2489 int row, col;
2490
2491 if (beg_row >= view_start)
2492 {
2493 col = beg_col;
2494 row = beg_row;
2495 }
2496 else
2497 {
2498 col = 0;
2499 row = view_start;
2500 }
2501
2502 for (; row < min (end_row, view_end); row++, col = 0)
2503 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2504 srp[col] ^= rstyle;
2505
2506 if (row == end_row)
2507 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2508 srp[col] ^= rstyle;
2509}
2510
2391/* ------------------------------------------------------------------------- */ 2511/* ------------------------------------------------------------------------- */
2392void 2512void
2393rxvt_term::scr_reverse_selection () 2513rxvt_term::scr_reverse_selection ()
2394{ 2514{
2395 if (selection.op 2515 if (selection.op
2396 && current_screen == selection.screen 2516 && current_screen == selection.screen
2397 && selection.end.row >= -view_start) 2517 && selection.end.row >= view_start)
2398 { 2518 {
2399 int view_end = -view_start + nrow;
2400 int row, col;
2401
2402#if ENABLE_FRILLS 2519#if ENABLE_FRILLS
2403 if (selection.rect) 2520 if (selection.rect)
2404 { 2521 scr_xor_rect (selection.beg.row, selection.beg.col,
2405 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2522 selection.end.row, selection.end.col,
2406 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2523 RS_RVid, RS_RVid | RS_Uline);
2407 srp[col] ^= RS_RVid;
2408 }
2409 else 2524 else
2410#endif 2525#endif
2411 { 2526 scr_xor_span (selection.beg.row, selection.beg.col,
2412 if (selection.beg.row >= -view_start) 2527 selection.end.row, selection.end.col,
2413 { 2528 RS_RVid);
2414 col = selection.beg.col;
2415 row = selection.beg.row;
2416 }
2417 else
2418 {
2419 col = 0;
2420 row = view_start;
2421 }
2422
2423 for (; row < min (selection.end.row, view_end); row++, col = 0)
2424 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2425 srp[col] ^= RS_RVid;
2426
2427 if (row == selection.end.row)
2428 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2429 srp[col] ^= RS_RVid;
2430 }
2431 } 2529 }
2432} 2530}
2433 2531
2434/* ------------------------------------------------------------------------- */ 2532/* ------------------------------------------------------------------------- */
2435/* 2533/*
… …
2473 2571
2474 if (!selection.op) 2572 if (!selection.op)
2475 return; 2573 return;
2476 2574
2477 pos.row = pos.col = 0; 2575 pos.row = pos.col = 0;
2478 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2576 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2479 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2480 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2578 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2481 || (check_more == 1 2579 || (check_more == 1
2482 && current_screen == selection.screen 2580 && current_screen == selection.screen
2483 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2581 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2484 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2582 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2485 || (check_more == 2 2583 || (check_more == 2
… …
2496/* ------------------------------------------------------------------------- */ 2594/* ------------------------------------------------------------------------- */
2497/* 2595/*
2498 * Paste a selection direct to the command fd 2596 * Paste a selection direct to the command fd
2499 */ 2597 */
2500void 2598void
2501rxvt_term::paste (unsigned char *data, unsigned int len) 2599rxvt_term::paste (char *data, unsigned int len)
2502{ 2600{
2503 /* convert normal newline chars into common keyboard Return key sequence */ 2601 /* convert normal newline chars into common keyboard Return key sequence */
2504 for (unsigned int i = 0; i < len; i++) 2602 for (unsigned int i = 0; i < len; i++)
2505 if (data[i] == C0_LF) 2603 if (data[i] == C0_LF)
2506 data[i] = C0_CR; 2604 data[i] = C0_CR;
… …
2650 { 2748 {
2651 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2652 char *s = rxvt_wcstombs (w); 2750 char *s = rxvt_wcstombs (w);
2653 free (w); 2751 free (w);
2654 // TODO: strlen == only the first element will be converted. well... 2752 // TODO: strlen == only the first element will be converted. well...
2655 paste ((unsigned char *)s, strlen (s)); 2753 paste (s, strlen (s));
2656 free (s); 2754 free (s);
2657 } 2755 }
2658 else 2756 else
2659#endif 2757#endif
2660 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2661 && cl) 2759 && cl)
2662 { 2760 {
2663 for (int i = 0; i < cr; i++) 2761 for (int i = 0; i < cr; i++)
2664 paste ((unsigned char *)cl[i], strlen (cl[i])); 2762 paste (cl[i], strlen (cl[i]));
2665 2763
2666 XFreeStringList (cl); 2764 XFreeStringList (cl);
2667 } 2765 }
2668 else 2766 else
2669 paste (ct.value, ct.nitems); // paste raw 2767 paste ((char *)ct.value, ct.nitems); // paste raw
2670 2768
2671bailout: 2769bailout:
2672 XFree (ct.value); 2770 XFree (ct.value);
2673 2771
2674 if (selection_wait == Sel_normal) 2772 if (selection_wait == Sel_normal)
… …
2704 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2705 * will auto fallback to CUT_BUFFER0 2803 * will auto fallback to CUT_BUFFER0
2706 * EXT: button 2 release 2804 * EXT: button 2 release
2707 */ 2805 */
2708void 2806void
2709rxvt_term::selection_request (Time tm, int x, int y) 2807rxvt_term::selection_request (Time tm, int selnum)
2710{ 2808{
2711 if (x < 0 || x >= width || y < 0 || y >= height) 2809/* After making a selection with selection_make this function will always
2712 return; /* outside window */ 2810 * return the internal selection, which is not correct IMO, now much more since
2713 2811 * I added the selnum parameter.
2812 */
2813#if 0
2714 if (selection.text) 2814 if (selection.text)
2715 { /* internal selection */ 2815 { /* internal selection */
2716 char *str = rxvt_wcstombs (selection.text, selection.len); 2816 char *str = rxvt_wcstombs (selection.text, selection.len);
2717 paste ((unsigned char *)str, strlen (str)); 2817 paste (str, strlen (str));
2718 free (str); 2818 free (str);
2719 return; 2819 return;
2720 } 2820 }
2721 else 2821 else
2822#endif
2722 { 2823 {
2723 int i;
2724
2725 selection_request_time = tm; 2824 selection_request_time = tm;
2726 selection_wait = Sel_normal; 2825 selection_wait = Sel_normal;
2727 2826
2728 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2729 {
2730#if X_HAVE_UTF8_STRING 2827#if X_HAVE_UTF8_STRING
2731 selection_type = Sel_UTF8String; 2828 selection_type = Sel_UTF8String;
2732 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2829 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2733 return; 2830 return;
2734#else 2831#else
2735 selection_type = Sel_CompoundText; 2832 selection_type = Sel_CompoundText;
2736 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2833 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2737 return; 2834 return;
2738#endif 2835#endif
2739 }
2740 } 2836 }
2741 2837
2742 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2838 selection_wait = Sel_none; /* don't loop in selection_paste () */
2743 selection_paste (display->root, XA_CUT_BUFFER0, false); 2839 selection_paste (display->root, XA_CUT_BUFFER0, false);
2744} 2840}
… …
2814 selection.op = SELECTION_DONE; 2910 selection.op = SELECTION_DONE;
2815 2911
2816 if (selection.clicks == 4) 2912 if (selection.clicks == 4)
2817 return; /* nothing selected, go away */ 2913 return; /* nothing selected, go away */
2818 2914
2915 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2916 return;
2917
2819 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2918 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2820 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2919 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2821 2920
2822 int ofs = 0; 2921 int ofs = 0;
2823 int extra = 0; 2922 int extra = 0;
… …
2835 col = selection.beg.col; 2934 col = selection.beg.col;
2836 end_col = ncol + 1; 2935 end_col = ncol + 1;
2837 } 2936 }
2838 else 2937 else
2839#endif 2938#endif
2840 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2939 end_col = ROW(row).l;
2841 2940
2842 col = max (col, 0); 2941 col = max (col, 0);
2843 2942
2844 if (row == selection.end.row || selection.rect) 2943 if (row == selection.end.row
2944#if ENABLE_FRILLS
2945 || selection.rect
2946#endif
2947 )
2845 end_col = min (end_col, selection.end.col); 2948 min_it (end_col, selection.end.col);
2846 2949
2847 t = ROW(row).t + col; 2950 t = ROW(row).t + col;
2951
2848 for (; col < end_col; col++) 2952 for (; col < end_col; col++)
2849 { 2953 {
2850 if (*t == NOCHAR) 2954 if (*t == NOCHAR)
2851 t++; 2955 t++;
2852#if ENABLE_COMBINING 2956#if ENABLE_COMBINING
… …
2868#endif 2972#endif
2869 else 2973 else
2870 new_selection_text[ofs++] = *t++; 2974 new_selection_text[ofs++] = *t++;
2871 } 2975 }
2872 2976
2977#if ENABLE_FRILLS
2978 if (selection.rect)
2979 {
2980 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1]))
2983 --ofs;
2984
2985 new_selection_text[ofs++] = C0_LF;
2986 }
2987 else
2988#endif
2873 if (!ROW(row).is_longer () && row != selection.end.row) 2989 if (!ROW(row).is_longer () && row != selection.end.row)
2874 new_selection_text[ofs++] = C0_LF; 2990 new_selection_text[ofs++] = C0_LF;
2875 } 2991 }
2876 2992
2877 if (end_col != selection.end.col) 2993 if (end_col != selection.end.col)
2878 new_selection_text[ofs++] = C0_LF; 2994 new_selection_text[ofs++] = C0_LF;
2879 2995
… …
2889 3005
2890 // we usually allocate much more than necessary, so realloc it smaller again 3006 // we usually allocate much more than necessary, so realloc it smaller again
2891 selection.len = ofs; 3007 selection.len = ofs;
2892 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3008 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2893 3009
3010 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3011 return;
3012
3013 selection_grab (tm);
3014}
3015
3016bool
3017rxvt_term::selection_grab (Time tm)
3018{
3019 selection_time = tm;
3020
2894 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2895 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3023 {
2896 display->set_selection_owner (this); 3024 display->set_selection_owner (this);
3025 return true;
3026 }
2897 else 3027 else
2898 rxvt_warn ("can't get primary selection, ignoring.\n"); 3028 {
3029 selection_clear ();
3030 return false;
3031 }
2899 3032
2900#if 0 3033#if 0
2901 XTextProperty ct; 3034 XTextProperty ct;
2902 3035
2903 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2904 { 3037 {
2905 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2906 XFree (ct.value); 3039 XFree (ct.value);
2907 } 3040 }
2908#endif 3041#endif
2909
2910 selection_time = tm;
2911} 3042}
2912 3043
2913/* ------------------------------------------------------------------------- */ 3044/* ------------------------------------------------------------------------- */
2914/* 3045/*
2915 * Mark or select text based upon number of clicks: 1, 2, or 3 3046 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2919rxvt_term::selection_click (int clicks, int x, int y) 3050rxvt_term::selection_click (int clicks, int x, int y)
2920{ 3051{
2921 clicks = ((clicks - 1) % 3) + 1; 3052 clicks = ((clicks - 1) % 3) + 1;
2922 selection.clicks = clicks; /* save clicks so extend will work */ 3053 selection.clicks = clicks; /* save clicks so extend will work */
2923 3054
3055 if (clicks == 2 && !selection.rect
3056 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3057 {
3058 MEvent.clicks = 1; // what a mess
3059 selection.screen = current_screen;
3060 selection.op = SELECTION_CONT;
3061 return;
3062 }
3063
2924 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3064 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2925 3065
2926 if (clicks == 2 || clicks == 3) 3066 if (clicks == 2 || clicks == 3)
2927 selection_extend_colrow (selection.mark.col, 3067 selection_extend_colrow (selection.mark.col,
2928 selection.mark.row + view_start, 3068 selection.mark.row - view_start,
2929 0, /* button 3 */ 3069 0, /* button 3 */
2930 1, /* button press */ 3070 1, /* button press */
2931 0); /* click change */ 3071 0); /* click change */
2932} 3072}
2933 3073
… …
2938void 3078void
2939rxvt_term::selection_start_colrow (int col, int row) 3079rxvt_term::selection_start_colrow (int col, int row)
2940{ 3080{
2941 want_refresh = 1; 3081 want_refresh = 1;
2942 3082
2943 selection.mark.row = row - view_start; 3083 selection.mark.row = row + view_start;
2944 selection.mark.col = col; 3084 selection.mark.col = col;
2945 3085
2946 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3086 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2947 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2948 3088
2949 while (selection.mark.col > 0 3089 while (selection.mark.col > 0
2950 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2951 --selection.mark.col; 3091 --selection.mark.col;
… …
2979 text_t *stp; 3119 text_t *stp;
2980 rend_t *srp; 3120 rend_t *srp;
2981 3121
2982 if (dirn == UP) 3122 if (dirn == UP)
2983 { 3123 {
2984 bound.row = - nsaved - 1; 3124 bound.row = top_row - 1;
2985 bound.col = 0; 3125 bound.col = 0;
2986 dirnadd = -1; 3126 dirnadd = -1;
2987 } 3127 }
2988 else 3128 else
2989 { 3129 {
… …
3037 } 3177 }
3038 } 3178 }
3039 break; 3179 break;
3040 } 3180 }
3041 3181
3042Old_Word_Selection_You_Die:
3043 if (dirn == DN) 3182 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3183 col++; /* put us on one past the end */
3045 3184
3046 /* Poke the values back in */ 3185 /* Poke the values back in */
3047 ret->row = row; 3186 ret->row = row;
… …
3068 * select nothing. Otherwise, if we're to the right of the mark, you have to 3207 * select nothing. Otherwise, if we're to the right of the mark, you have to
3069 * be _past_ a character for it to be selected. 3208 * be _past_ a character for it to be selected.
3070 */ 3209 */
3071 if (((selection.clicks % 3) == 1) && !flag 3210 if (((selection.clicks % 3) == 1) && !flag
3072 && (col == selection.mark.col 3211 && (col == selection.mark.col
3073 && (row == selection.mark.row + view_start))) 3212 && (row == selection.mark.row - view_start)))
3074 { 3213 {
3075 /* select nothing */ 3214 /* select nothing */
3076 selection.beg.row = selection.end.row = 0; 3215 selection.beg.row = selection.end.row = 0;
3077 selection.beg.col = selection.end.col = 0; 3216 selection.beg.col = selection.end.col = 0;
3078 selection.clicks = 4; 3217 selection.clicks = 4;
… …
3133 selection.beg.col = selection.end.col = selection.mark.col; 3272 selection.beg.col = selection.end.col = selection.mark.col;
3134 selection.beg.row = selection.end.row = selection.mark.row; 3273 selection.beg.row = selection.end.row = selection.mark.row;
3135 } 3274 }
3136 3275
3137 pos.col = col; 3276 pos.col = col;
3138 pos.row = row - view_start; 3277 pos.row = view_start + row;
3139 3278
3140 /* 3279 /*
3141 * This is mainly xterm style selection with a couple of differences, mainly 3280 * This is mainly xterm style selection with a couple of differences, mainly
3142 * in the way button3 drag extension works. 3281 * in the way button3 drag extension works.
3143 * We're either doing: button1 drag; button3 press; or button3 drag 3282 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3230 selection_delimit_word (DN, &selection.end, &selection.end); 3369 selection_delimit_word (DN, &selection.end, &selection.end);
3231 } 3370 }
3232 else if (selection.clicks == 3) 3371 else if (selection.clicks == 3)
3233 { 3372 {
3234#if ENABLE_FRILLS 3373#if ENABLE_FRILLS
3235 if (options & Opt_tripleclickwords) 3374 if (OPTION (Opt_tripleclickwords))
3236 { 3375 {
3237 selection_delimit_word (UP, &selection.beg, &selection.beg); 3376 selection_delimit_word (UP, &selection.beg, &selection.beg);
3238 3377
3239 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3240 { 3379 {
… …
3301 { 3440 {
3302 stp = ROW(end_row).t; 3441 stp = ROW(end_row).t;
3303 3442
3304 while (--end_col >= 0) 3443 while (--end_col >= 0)
3305 { 3444 {
3306 if (stp[end_col] != ' ' 3445 if (stp[end_col] != NOCHAR
3307 && stp[end_col] != '\t' 3446 && !unicode::is_space (stp[end_col]))
3308 && stp[end_col] != NOCHAR)
3309 break; 3447 break;
3310 } 3448 }
3311 3449
3312 if (end_col >= 0 3450 if (end_col >= 0
3313 || !ROW(end_row - 1).is_longer ()) 3451 || !ROW(end_row - 1).is_longer ())
… …
3512 3650
3513#if ENABLE_OVERLAY 3651#if ENABLE_OVERLAY
3514void 3652void
3515rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3653rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3516{ 3654{
3517 if (nrow < 3 || ncol < 3) 3655 if (nrow < 1 || ncol < 1)
3518 return; 3656 return;
3519 3657
3520 want_refresh = 1; 3658 want_refresh = 1;
3521 3659
3522 scr_overlay_off (); 3660 scr_overlay_off ();
… …
3629 for (int y = ov_h; y--; ) 3767 for (int y = ov_h; y--; )
3630 { 3768 {
3631 text_t *t1 = ov_text[y]; 3769 text_t *t1 = ov_text[y];
3632 rend_t *r1 = ov_rend[y]; 3770 rend_t *r1 = ov_rend[y];
3633 3771
3634 text_t *t2 = ROW(y - view_start).t + ov_x; 3772 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3635 rend_t *r2 = ROW(y - view_start).r + ov_x; 3773 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3636 3774
3637 for (int x = ov_w; x--; ) 3775 for (int x = ov_w; x--; )
3638 { 3776 {
3639 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3777 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3640 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3778 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