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