ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.190 by root, Thu Dec 22 15:52:57 2005 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 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);
… …
235 CLEAR_ALL_SELECTION (); 239 CLEAR_ALL_SELECTION ();
236 rvideo = 0; 240 rvideo = 0;
237 } 241 }
238 else 242 else
239 { 243 {
244 CLEAR_ALL_SELECTION ();
245
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
242 */ 248 */
243 249
244 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
275 281
276 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // re-wrap lines, this is rather ugly, possibly because I am too dumb
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 293
288 while (p != pend && q > 0) 294 do
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
326 // fill a single destination line 336 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
328 { 338 {
329 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
331 341
332 prow = MOD (p + prow, prev_total_rows); 342 prow = MOD (p + prow, prev_total_rows);
333 343
334 // we only adjust the cursor _row_, as this seems to upset 344 // we only adjust the cursor _row_ and put it into
345 // the topmost line of "long line" it was in, as
335 // applications/shells/readline least. 346 // this seems to upset applications/shells/readline
347 // least.
336 if (prow == ocur.row) 348 if (prow == ocur.row)
337 screen.cur.row = qrow - (total_rows - nrow); 349 screen.cur.row = q - (total_rows - nrow);
338 350
339 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
340 352
341 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
342 354
… …
349 lofs += len; 361 lofs += len;
350 qcol += len; 362 qcol += len;
351 } 363 }
352 } 364 }
353 365
354 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 366 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
367 qline->is_longer (0);
355 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 368 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
356 } 369 }
370 while (p != pend && q > 0);
357 371
358 term_start = total_rows - nrow; 372 term_start = total_rows - nrow;
359 view_start = 0; 373 top_row = q - term_start;
360 nsaved = term_start - q;
361 374
362 // make sure all terminal lines exist 375 // make sure all terminal lines exist
363 while (nsaved < 0) 376 while (top_row > 0)
364 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
365
366 } 378 }
367 else 379 else
368 { 380 {
369 // if no scrollback exists (yet), wing, instead of wrap 381 // if no scrollback exists (yet), wing, instead of wrap
370 382
… …
381 { 393 {
382 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 394 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
383 } 395 }
384 396
385 term_start = 0; 397 term_start = 0;
386 view_start = 0;
387 } 398 }
388
389#ifdef DEBUG_STRICT
390 for (int i = -nsaved; i < nrow; i++)
391 assert (ROW (i).t);
392#endif
393 399
394 free (old_buf); 400 free (old_buf);
395 delete old_ta; 401 delete old_ta;
396 delete old_ra; 402 delete old_ra;
397 403
… …
409 415
410 for (int col = ncol; col--; ) 416 for (int col = ncol; col--; )
411 tabs [col] = col % TABSIZE == 0; 417 tabs [col] = col % TABSIZE == 0;
412 418
413 tt_winch (); 419 tt_winch ();
420
421 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 422}
415 423
416/* ------------------------------------------------------------------------- */ 424/* ------------------------------------------------------------------------- */
417/* 425/*
418 * Free everything. That way malloc debugging can find leakage. 426 * Free everything. That way malloc debugging can find leakage.
… …
424 delete ralloc; ralloc = 0; 432 delete ralloc; ralloc = 0;
425 433
426 free (row_buf); 434 free (row_buf);
427 free (swap_buf); 435 free (swap_buf);
428 free (drawn_buf); 436 free (drawn_buf);
429 free (temp_buf);
430 free (tabs); 437 free (tabs);
431 438
432 row_buf = 0; // signal that we freed all the arrays 439 row_buf = 0; // signal that we freed all the arrays
433} 440}
434 441
… …
442 scr_release (); 449 scr_release ();
443 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
444 scr_reset (); 451 scr_reset ();
445 452
446 scr_clear (true); 453 scr_clear (true);
447 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
448} 455}
449 456
450/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
451 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
452 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
522 529
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 530 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 531 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525 532
526#if NSCREENS 533#if NSCREENS
527 if (options & Opt_secondaryScreen) 534 if (OPTION (Opt_secondaryScreen))
528 { 535 {
529 num_scr = 0; 536 num_scr = 0;
530 537
531 for (int i = prev_nrow; i--; ) 538 for (int i = prev_nrow; i--; )
532 ::swap (ROW(i), swap_buf [i]); 539 ::swap (ROW(i), swap_buf [i]);
… …
536 screen.flags |= Screen_VisibleCursor; 543 screen.flags |= Screen_VisibleCursor;
537 swap.flags |= Screen_VisibleCursor; 544 swap.flags |= Screen_VisibleCursor;
538 } 545 }
539 else 546 else
540#endif 547#endif
541 if (options & Opt_secondaryScroll) 548 if (OPTION (Opt_secondaryScroll))
542 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 549 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
543 550
544 return scrn; 551 return scrn;
545} 552}
546 553
… …
566 * Change the colour for following text 573 * Change the colour for following text
567 */ 574 */
568void 575void
569rxvt_term::scr_color (unsigned int color, int fgbg) 576rxvt_term::scr_color (unsigned int color, int fgbg)
570{ 577{
571 if (color > maxTermCOLOR) 578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
572 color = fgbg; 579 color = fgbg;
573 580
574 if (fgbg == Color_fg) 581 if (fgbg == Color_fg)
575 rstyle = SET_FGCOLOR (rstyle, color); 582 rstyle = SET_FGCOLOR (rstyle, color);
576 else 583 else
… …
607 want_refresh = 1; 614 want_refresh = 1;
608 num_scr += count; 615 num_scr += count;
609 616
610 if (count > 0 617 if (count > 0
611 && row1 == 0 618 && row1 == 0
612 && row2 == nrow - 1
613 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
614 { 620 {
615 nsaved = min (nsaved + count, saveLines); 621 top_row = max (top_row - count, -saveLines);
622
623 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows; 624 term_start = (term_start + count) % total_rows;
617 625
626 // sever bottommost line
627 {
628 line_t &l = ROW(row2 - count);
629 l.is_longer (0);
630 l.touch ();
631 }
632
633 // erase newly scrolled-in lines
634 for (int i = count; i--; )
635 {
636 // basically this is a slightly optimized scr_blank_screen_mem
637 // it is worth the effort on slower machines
638 line_t &l = ROW(nrow - 1 - i);
639
640 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0;
643 l.f = 0;
644 }
645
646 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they
648 // hadn't moved.
649 for (int i = nrow; --i > row2; )
650 {
651 line_t &l1 = ROW(i - count);
652 line_t &l2 = ROW(i);
653
654 ::swap (l1, l2);
655 l2.touch ();
656 }
657
658 // move and/or clear selection, if any
618 if (selection.op && current_screen == selection.screen) 659 if (selection.op && current_screen == selection.screen)
619 { 660 {
620 selection.beg.row -= count; 661 selection.beg.row -= count;
621 selection.end.row -= count; 662 selection.end.row -= count;
622 selection.mark.row -= count; 663 selection.mark.row -= count;
623 664
624 selection_check (0); 665 if (selection.beg.row < top_row
625 } 666 || selection.end.row < top_row
626 667 || selection.mark.row < top_row)
627 for (int i = count; i--; )
628 scr_blank_screen_mem (ROW(row2 - i), rstyle);
629
630 if ((options & Opt_scrollWithBuffer)
631 && view_start != 0
632 && view_start != saveLines)
633 scr_page (UP, count);
634 }
635 else
636 {
637 if (selection.op && current_screen == selection.screen)
638 {
639 int i = selection.beg.row;
640 int j = selection.end.row;
641
642 if ((i < row1 && j > row1)
643 || (i < row2 && j > row2)
644 || (i - count < row1 && i >= row1)
645 || (i - count > row2 && i <= row2)
646 || (j - count < row1 && j >= row1)
647 || (j - count > row2 && j <= row2))
648 { 668 {
649 CLEAR_ALL_SELECTION (); 669 CLEAR_ALL_SELECTION ();
650 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 670 selection.op = SELECTION_CLEAR;
651 } 671 }
652 else if (j >= row1 && j <= row2) 672 }
673
674 // finally move the view window, if desired
675 if (OPTION (Opt_scrollWithBuffer)
676 && view_start != 0
677 && view_start != -saveLines)
678 scr_page (UP, count);
679
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
681 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
682 }
683 else
684 {
685 if (selection.op && current_screen == selection.screen)
686 {
687 if ((selection.beg.row < row1 && selection.end.row > row1)
688 || (selection.beg.row < row2 && selection.end.row > row2)
689 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
690 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
691 || (selection.end.row - count < row1 && selection.end.row >= row1)
692 || (selection.end.row - count > row2 && selection.end.row <= row2))
693 {
694 CLEAR_ALL_SELECTION ();
695 selection.op = SELECTION_CLEAR;
696 }
697 else if (selection.end.row >= row1 && selection.end.row <= row2)
653 { 698 {
654 /* move selected region too */ 699 /* move selected region too */
655 selection.beg.row -= count; 700 selection.beg.row -= count;
656 selection.end.row -= count; 701 selection.end.row -= count;
657 selection.mark.row -= count; 702 selection.mark.row -= count;
… …
665 710
666 int rows = row2 - row1 + 1; 711 int rows = row2 - row1 + 1;
667 712
668 min_it (count, rows); 713 min_it (count, rows);
669 714
715 line_t *temp_buf = row_buf + total_rows;
716
670 for (int row = 0; row < rows; row++) 717 for (int row = 0; row < rows; row++)
671 { 718 {
672 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 719 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
673 720
674 if (!IN_RANGE_EXC (row + count, 0, rows)) 721 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
685/* ------------------------------------------------------------------------- */ 732/* ------------------------------------------------------------------------- */
686/* 733/*
687 * Add text given in <str> of length <len> to screen struct 734 * Add text given in <str> of length <len> to screen struct
688 */ 735 */
689void 736void
690rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines)
691{ 738{
692 if (len <= 0) /* sanity */ 739 if (len <= 0) /* sanity */
693 return; 740 return;
694 741
695 unsigned char checksel; 742 unsigned char checksel;
696 unicode_t c; 743 unicode_t c;
697 int row, last_col; 744 int ncol = this->ncol;
698 const unicode_t *strend = str + len; 745 const wchar_t *strend = str + len;
699 746
700 want_refresh = 1; 747 want_refresh = 1;
701 ZERO_SCROLLBACK (); 748 ZERO_SCROLLBACK ();
702 last_col = ncol;
703 749
704 if (nlines > 0) 750 if (minlines > 0)
705 { 751 {
706 nlines += screen.cur.row - screen.bscroll; 752 minlines += screen.cur.row - screen.bscroll;
753
707 if (nlines > 0 754 if (minlines > 0
708 && screen.tscroll == 0 755 && screen.tscroll == 0
709 && screen.bscroll == (nrow - 1)) 756 && screen.bscroll == nrow - 1)
710 { 757 {
711 /* _at least_ this many lines need to be scrolled */ 758 /* _at least_ this many lines need to be scrolled */
712 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
713 screen.cur.row -= nlines; 760 screen.cur.row -= minlines;
714 } 761 }
715 } 762 }
716 763
717#ifdef DEBUG_STRICT 764#ifdef DEBUG_STRICT
718 assert (screen.cur.col < last_col); 765 assert (screen.cur.col < ncol);
719 assert (screen.cur.row < nrow 766 assert (screen.cur.row < nrow
720 && screen.cur.row >= -nsaved); 767 && screen.cur.row >= top_row);
721#endif 768#endif
722 row = screen.cur.row; 769 int row = screen.cur.row;
723 770
724 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 771 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
725 772
726 line_t *line = &ROW(row); 773 line_t *line = &ROW(row);
727 774
728 while (str < strend) 775 while (str < strend)
729 { 776 {
730 c = *str++; 777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
731 778
732 if (c < 0x20) 779 if (c < 0x20)
733 if (c == C0_LF) 780 if (c == C0_LF)
734 { 781 {
735 if (!line->is_longer ()) /* XXX: think about this */
736 max_it (line->l, screen.cur.col); 782 max_it (line->l, screen.cur.col);
737 783
738 screen.flags &= ~Screen_WrapNext; 784 screen.flags &= ~Screen_WrapNext;
739 785
740 if (screen.cur.row == screen.bscroll) 786 if (screen.cur.row == screen.bscroll)
741 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 787 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
745 line = &ROW(row); /* _must_ refresh */ 791 line = &ROW(row); /* _must_ refresh */
746 continue; 792 continue;
747 } 793 }
748 else if (c == C0_CR) 794 else if (c == C0_CR)
749 { 795 {
750 if (!line->is_longer ()) /* XXX: think about this */
751 max_it (line->l, screen.cur.col); 796 max_it (line->l, screen.cur.col);
752 797
753 screen.flags &= ~Screen_WrapNext; 798 screen.flags &= ~Screen_WrapNext;
754 screen.cur.col = 0; 799 screen.cur.col = 0;
755 continue; 800 continue;
756 } 801 }
… …
773 CLEAR_SELECTION (); 818 CLEAR_SELECTION ();
774 } 819 }
775 820
776 if (screen.flags & Screen_WrapNext) 821 if (screen.flags & Screen_WrapNext)
777 { 822 {
778 line->set_is_longer ();
779
780 scr_do_wrap (); 823 scr_do_wrap ();
781 824
825 line->l = ncol;
826 line->is_longer (1);
827
782 row = screen.cur.row; 828 row = screen.cur.row;
783 line = &ROW(row); /* _must_ refresh */ 829 line = &ROW(row); /* _must_ refresh */
784 } 830 }
785 831
786 // some utf-8 decoders "decode" surrogate characters: let's fix this. 832 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
791 // do wcwidth before further replacements, as wcwidth might return -1 837 // do wcwidth before further replacements, as wcwidth might return -1
792 // for the line drawing characters below as they might be invalid in the current 838 // for the line drawing characters below as they might be invalid in the current
793 // locale. 839 // locale.
794 int width = c < 0x100 ? 1 : wcwidth (c); 840 int width = c < 0x100 ? 1 : wcwidth (c);
795 841
796 if (charsets[screen.charset] == '0') // DEC SPECIAL 842 if (charsets [screen.charset] == '0') // DEC SPECIAL
797 { 843 {
798 // vt100 special graphics and line drawing 844 // vt100 special graphics and line drawing
799 // 5f-7e standard vt100 845 // 5f-7e standard vt100
800 // 40-5e rxvt extension for extra curses acs chars 846 // 40-5e rxvt extension for extra curses acs chars
801 static uint16_t vt100_0[62] = { // 41 .. 7e 847 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
853 } 899 }
854 900
855 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 901 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
856 902
857 // if the character doesn't fit into the remaining columns... 903 // if the character doesn't fit into the remaining columns...
858 if (screen.cur.col > last_col - width && last_col >= width) 904 if (screen.cur.col > ncol - width && ncol >= width)
859 { 905 {
860 // ...output spaces 906 // ...output spaces
861 c = ' '; 907 c = ' ';
862 // and try the same character next loop iteration 908 // and try the same character next loop iteration
863 --str; 909 --str;
864 } 910 }
865 911
912 line->touch ();
913
866 do 914 do
867 { 915 {
868 line->t[screen.cur.col] = c; 916 line->t[screen.cur.col] = c;
869 line->r[screen.cur.col] = rend; 917 line->r[screen.cur.col] = rend;
870 918
871 if (screen.cur.col < last_col - 1) 919 if (screen.cur.col < ncol - 1)
872 screen.cur.col++; 920 screen.cur.col++;
873 else 921 else
874 { 922 {
875 line->l = last_col; 923 line->l = ncol;
876 if (screen.flags & Screen_Autowrap) 924 if (screen.flags & Screen_Autowrap)
877 screen.flags |= Screen_WrapNext; 925 screen.flags |= Screen_WrapNext;
878 break; 926 break;
879 } 927 }
880 928
… …
882 } 930 }
883 while (--width > 0); 931 while (--width > 0);
884 932
885 // pad with spaces when overwriting wide character with smaller one 933 // pad with spaces when overwriting wide character with smaller one
886 if (!width) 934 if (!width)
935 {
936 line->touch ();
937
887 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 938 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
888 { 939 {
889 line->t[c] = ' '; 940 line->t[c] = ' ';
890 line->r[c] = rend; 941 line->r[c] = rend;
891 } 942 }
943 }
892 } 944 }
893 else // width == 0 945 else // width == 0
894 { 946 {
895#if ENABLE_COMBINING 947#if ENABLE_COMBINING
896 // handle combining characters 948 // handle combining characters
897 // we just tag the accent on the previous on-screen character. 949 // we just tag the accent on the previous on-screen character.
898 // this is arguably not correct, but also arguably not wrong. 950 // this is arguably not correct, but also arguably not wrong.
899 // we don't handle double-width characters nicely yet. 951 // we don't handle double-width characters nicely yet.
952 line_t *linep;
900 text_t *tp; 953 text_t *tp;
901 rend_t *rp; 954 rend_t *rp;
902 955
903 if (screen.cur.col > 0) 956 if (screen.cur.col > 0)
904 { 957 {
958 linep = line;
905 tp = line->t + screen.cur.col - 1; 959 tp = line->t + screen.cur.col - 1;
906 rp = line->r + screen.cur.col - 1; 960 rp = line->r + screen.cur.col - 1;
907
908 while (*tp == NOCHAR && tp > line->t)
909 tp--, rp--;
910 } 961 }
911 else if (screen.cur.row > 0 962 else if (screen.cur.row > 0
912 && ROW(screen.cur.row - 1).is_longer ()) 963 && ROW(screen.cur.row - 1).is_longer ())
913 { 964 {
914 line_t *line = &ROW(screen.cur.row - 1); 965 linep = &ROW(screen.cur.row - 1);
915
916 tp = line->t + last_col - 1; 966 tp = line->t + ncol - 1;
917 rp = line->r + last_col - 1; 967 rp = line->r + ncol - 1;
918
919 while (*tp == NOCHAR && tp > line->t)
920 tp--, rp--;
921 } 968 }
922 else 969 else
923 continue; 970 continue;
971
972 linep->touch ();
973
974 while (*tp == NOCHAR && tp > linep->t)
975 tp--, rp--;
924 976
925 // first try to find a precomposed character 977 // first try to find a precomposed character
926 unicode_t n = rxvt_compose (*tp, c); 978 unicode_t n = rxvt_compose (*tp, c);
927 if (n == NOCHAR) 979 if (n == NOCHAR)
928 n = rxvt_composite.compose (*tp, c); 980 n = rxvt_composite.compose (*tp, c);
… …
931 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 983 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
932#endif 984#endif
933 } 985 }
934 } 986 }
935 987
936 if (!line->is_longer ()) /* XXX: think about this */
937 max_it (line->l, screen.cur.col); 988 max_it (line->l, screen.cur.col);
938 989
939#ifdef DEBUG_STRICT 990#ifdef DEBUG_STRICT
940 assert (screen.cur.row >= 0); 991 assert (screen.cur.row >= 0);
941#endif 992#endif
942} 993}
… …
984 1035
985 if (count == 0) 1036 if (count == 0)
986 return; 1037 return;
987 else if (count > 0) 1038 else if (count > 0)
988 { 1039 {
989 int row = screen.cur.row;
990
991 line_t &l = ROW(row); 1040 line_t &l = ROW(screen.cur.row);
992 rend_t base_rend = l.r[i]; 1041 rend_t base_rend = l.r[i];
993 ht &= l.t[i] == ' '; 1042 ht &= l.t[i] == ' ';
994 1043
995 for (; ++i < ncol; ) 1044 for (; ++i < ncol; )
996 if (tabs[i]) 1045 if (tabs[i])
997 { 1046 {
998 x = i; 1047 x = i;
1048
999 if (!--count) 1049 if (!--count)
1000 break; 1050 break;
1001 } 1051 }
1002 else 1052 else
1003 ht &= l.t[i] == ' ' 1053 ht &= l.t[i] == ' '
… …
1006 if (count) 1056 if (count)
1007 x = ncol - 1; 1057 x = ncol - 1;
1008 1058
1009 // store horizontal tab commands as characters inside the text 1059 // store horizontal tab commands as characters inside the text
1010 // buffer so they can be selected and pasted. 1060 // buffer so they can be selected and pasted.
1011 if (ht && options & Opt_pastableTabs) 1061 if (ht && OPTION (Opt_pastableTabs))
1012 { 1062 {
1013 base_rend = SET_FONT (base_rend, 0); 1063 base_rend = SET_FONT (base_rend, 0);
1014 1064
1015 if (!l.is_longer ()) /* XXX: think about this */ 1065 l.touch (x);
1016 max_it (l.l, x);
1017 1066
1018 i = screen.cur.col; 1067 i = screen.cur.col;
1019 1068
1020 l.t[i] = '\t'; 1069 l.t[i] = '\t';
1021 l.r[i] = base_rend; 1070 l.r[i] = base_rend;
… …
1071 */ 1120 */
1072#if ENABLE_FRILLS 1121#if ENABLE_FRILLS
1073void 1122void
1074rxvt_term::scr_forwardindex () 1123rxvt_term::scr_forwardindex ()
1075{ 1124{
1076 int row;
1077
1078 if (screen.cur.col < ncol - 1) 1125 if (screen.cur.col < ncol - 1)
1079 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1080 else 1127 else
1081 { 1128 {
1082 row = screen.cur.row; 1129 line_t &l = ROW(screen.cur.row);
1083 1130
1084 if (ROW(row).is_longer ()) //TODO//FIXME//LEN 1131 l.touch ();
1085 ROW(row).l = ncol; 1132 l.is_longer (0);
1086 1133
1087 scr_gotorc (0, 0, R_RELATIVE); 1134 scr_gotorc (0, 0, R_RELATIVE);
1088 scr_insdel_chars (1, DELETE); 1135 scr_insdel_chars (1, DELETE);
1089 scr_gotorc (0, ncol - 1, R_RELATIVE); 1136 scr_gotorc (0, ncol - 1, R_RELATIVE);
1090 } 1137 }
… …
1173 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1174 */ 1221 */
1175void 1222void
1176rxvt_term::scr_erase_line (int mode) 1223rxvt_term::scr_erase_line (int mode)
1177{ 1224{
1178 unsigned int row, col, num; 1225 unsigned int col, num;
1179 1226
1180 want_refresh = 1; 1227 want_refresh = 1;
1181 ZERO_SCROLLBACK (); 1228 ZERO_SCROLLBACK ();
1182 1229
1183 selection_check (1); 1230 selection_check (1);
1184 1231
1185 row = screen.cur.row; 1232 line_t &line = ROW(screen.cur.row);
1233
1234 line.touch ();
1235 line.is_longer (0);
1186 1236
1187 switch (mode) 1237 switch (mode)
1188 { 1238 {
1189 case 0: /* erase to end of line */ 1239 case 0: /* erase to end of line */
1190 col = screen.cur.col; 1240 col = screen.cur.col;
1191 num = ncol - col; 1241 num = ncol - col;
1192 min_it (ROW(row).l, col); 1242 min_it (line.l, col);
1193 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1243 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1194 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1244 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1195 CLEAR_SELECTION (); 1245 CLEAR_SELECTION ();
1196 break; 1246 break;
1197 case 1: /* erase to beginning of line */ 1247 case 1: /* erase to beginning of line */
… …
1202 CLEAR_SELECTION (); 1252 CLEAR_SELECTION ();
1203 break; 1253 break;
1204 case 2: /* erase whole line */ 1254 case 2: /* erase whole line */
1205 col = 0; 1255 col = 0;
1206 num = ncol; 1256 num = ncol;
1207 ROW(row).l = 0; 1257 line.l = 0;
1208 if (selection.beg.row <= screen.cur.row 1258 if (selection.beg.row <= screen.cur.row
1209 && selection.end.row >= screen.cur.row) 1259 && selection.end.row >= screen.cur.row)
1210 CLEAR_SELECTION (); 1260 CLEAR_SELECTION ();
1211 break; 1261 break;
1212 default: 1262 default:
1213 return; 1263 return;
1214 } 1264 }
1215 1265
1216 scr_blank_line (ROW(row), col, num, rstyle); 1266 scr_blank_line (line, col, num, rstyle);
1217} 1267}
1218 1268
1219/* ------------------------------------------------------------------------- */ 1269/* ------------------------------------------------------------------------- */
1220/* 1270/*
1221 * Erase part of whole of the screen 1271 * Erase part of whole of the screen
… …
1276 CLEAR_ROWS (row, num); 1326 CLEAR_ROWS (row, num);
1277 } 1327 }
1278 else 1328 else
1279 { 1329 {
1280 ren = rstyle & (RS_fgMask | RS_bgMask); 1330 ren = rstyle & (RS_fgMask | RS_bgMask);
1281 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1282 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1332 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1283 ERASE_ROWS (row, num); 1333 ERASE_ROWS (row, num);
1284 gcvalue.foreground = pix_colors[Color_fg]; 1334 gcvalue.foreground = pix_colors[Color_fg];
1285 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1335 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1286 } 1336 }
1287 1337
1288 for (; num--; row++) 1338 for (; num--; row++)
1289 { 1339 {
1290 scr_blank_screen_mem (ROW (row), rstyle); 1340 scr_blank_screen_mem (ROW(row), rstyle);
1291 ROW (row).l = 0;
1292 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1341 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1293 } 1342 }
1294} 1343}
1295 1344
1296#if ENABLE_FRILLS 1345#if ENABLE_FRILLS
… …
1298rxvt_term::scr_erase_savelines () 1347rxvt_term::scr_erase_savelines ()
1299{ 1348{
1300 want_refresh = 1; 1349 want_refresh = 1;
1301 ZERO_SCROLLBACK (); 1350 ZERO_SCROLLBACK ();
1302 1351
1303 nsaved = 0; 1352 top_row = 0;
1304} 1353}
1305#endif 1354#endif
1306 1355
1307/* ------------------------------------------------------------------------- */ 1356/* ------------------------------------------------------------------------- */
1308/* 1357/*
… …
1329 rend_t *r1 = line.r; 1378 rend_t *r1 = line.r;
1330 1379
1331 for (int j = ncol; j--; ) 1380 for (int j = ncol; j--; )
1332 *r1++ = fs; 1381 *r1++ = fs;
1333 1382
1334 line.l = ncol; /* make the `E's selectable */ 1383 line.is_longer (0);
1384 line.touch (ncol);
1335 } 1385 }
1336} 1386}
1337 1387
1338/* ------------------------------------------------------------------------- */ 1388/* ------------------------------------------------------------------------- */
1339/* 1389/*
… …
1387 min_it (count, ncol - screen.cur.col); 1437 min_it (count, ncol - screen.cur.col);
1388 1438
1389 row = screen.cur.row; 1439 row = screen.cur.row;
1390 1440
1391 line_t *line = &ROW(row); 1441 line_t *line = &ROW(row);
1442
1443 line->touch ();
1444 line->is_longer (0);
1392 1445
1393 switch (insdel) 1446 switch (insdel)
1394 { 1447 {
1395 case INSERT: 1448 case INSERT:
1396 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1397 { 1450 {
1398 line->t[col] = line->t[col - count]; 1451 line->t[col] = line->t[col - count];
1399 line->r[col] = line->r[col - count]; 1452 line->r[col] = line->r[col - count];
1400 } 1453 }
1401 1454
1402 if (!line->is_longer ()) 1455 line->l = min (line->l + count, ncol);
1403 {
1404 line->l += count;
1405 min_it (line->l, ncol);
1406 }
1407 1456
1408 if (selection.op && current_screen == selection.screen 1457 if (selection.op && current_screen == selection.screen
1409 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1410 { 1459 {
1411 if (selection.end.row != screen.cur.row 1460 if (selection.end.row != screen.cur.row
… …
1424 1473
1425 case ERASE: 1474 case ERASE:
1426 screen.cur.col += count; /* don't worry if > ncol */ 1475 screen.cur.col += count; /* don't worry if > ncol */
1427 selection_check (1); 1476 selection_check (1);
1428 screen.cur.col -= count; 1477 screen.cur.col -= count;
1478
1479 line->l = max (line->l - count, 0);
1429 scr_blank_line (*line, screen.cur.col, count, rstyle); 1480 scr_blank_line (*line, screen.cur.col, count, rstyle);
1430 break; 1481 break;
1431 1482
1432 case DELETE: 1483 case DELETE:
1433 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1436 { 1487 {
1437 line->t[col] = line->t[col + count]; 1488 line->t[col] = line->t[col + count];
1438 line->r[col] = line->r[col + count]; 1489 line->r[col] = line->r[col + count];
1439 } 1490 }
1440 1491
1492 line->l = max (line->l - count, 0);
1441 scr_blank_line (*line, ncol - count, count, tr); 1493 scr_blank_line (*line, ncol - count, count, tr);
1442
1443 if (line->is_longer ()) /* break line continuation */
1444 line->l = ncol;
1445
1446 line->l = max (line->l - count, 0);
1447 1494
1448 if (selection.op && current_screen == selection.screen 1495 if (selection.op && current_screen == selection.screen
1449 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1450 { 1497 {
1451 if (selection.end.row != screen.cur.row 1498 if (selection.end.row != screen.cur.row
… …
1563rxvt_term::scr_set_tab (int mode) 1610rxvt_term::scr_set_tab (int mode)
1564{ 1611{
1565 if (mode < 0) 1612 if (mode < 0)
1566 memset (tabs, 0, ncol * sizeof (char)); 1613 memset (tabs, 0, ncol * sizeof (char));
1567 else if (screen.cur.col < ncol) 1614 else if (screen.cur.col < ncol)
1568 tabs[screen.cur.col] = (mode ? 1 : 0); 1615 tabs [screen.cur.col] = !!mode;
1569} 1616}
1570 1617
1571/* ------------------------------------------------------------------------- */ 1618/* ------------------------------------------------------------------------- */
1572/* 1619/*
1573 * Set reverse/normal video 1620 * Set reverse/normal video
… …
1585 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1586#if XPM_BACKGROUND 1633#if XPM_BACKGROUND
1587 if (bgPixmap.pixmap == None) 1634 if (bgPixmap.pixmap == None)
1588#endif 1635#endif
1589#if TRANSPARENT 1636#if TRANSPARENT
1590 if (! (options & Opt_transparent) || am_transparent == 0) 1637 if (! OPTION (Opt_transparent) || am_transparent == 0)
1591#endif 1638#endif
1592 XSetWindowBackground (display->display, vt, 1639 XSetWindowBackground (display->display, vt,
1593 pix_colors[Color_bg]); 1640 pix_colors[Color_bg]);
1594 1641
1595 gcvalue.foreground = pix_colors[Color_fg]; 1642 gcvalue.foreground = pix_colors[Color_fg];
… …
1620 * Set font style 1667 * Set font style
1621 */ 1668 */
1622void 1669void
1623rxvt_term::set_font_style () 1670rxvt_term::set_font_style ()
1624{ 1671{
1672#if 0
1625 switch (charsets[screen.charset]) 1673 switch (charsets [screen.charset])
1626 { 1674 {
1627 case '0': /* DEC Special Character & Line Drawing Set */ 1675 case '0': /* DEC Special Character & Line Drawing Set */
1628 break; 1676 break;
1629 case 'A': /* United Kingdom (UK) */ 1677 case 'A': /* United Kingdom (UK) */
1630 break; 1678 break;
… …
1637 case 'C': /* Finnish character set */ 1685 case 'C': /* Finnish character set */
1638 break; 1686 break;
1639 case 'K': /* German character set */ 1687 case 'K': /* German character set */
1640 break; 1688 break;
1641 } 1689 }
1690#endif
1642} 1691}
1643 1692
1644/* ------------------------------------------------------------------------- */ 1693/* ------------------------------------------------------------------------- */
1645/* 1694/*
1646 * Choose a font 1695 * Choose a font
… …
1742 } 1791 }
1743 1792
1744 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1793 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1745 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1794 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1746 1795
1796 num_scr_allow = 0;
1797
1747 if (refresh) 1798 if (refresh)
1748 scr_refresh (SLOW_REFRESH); 1799 scr_refresh ();
1749} 1800}
1750 1801
1751/* ------------------------------------------------------------------------- */ 1802/* ------------------------------------------------------------------------- */
1752/* 1803/*
1753 * Refresh the entire screen 1804 * Refresh the entire screen
… …
1761/* ------------------------------------------------------------------------- */ 1812/* ------------------------------------------------------------------------- */
1762/* 1813/*
1763 * Move the display so that the line represented by scrollbar value Y is at 1814 * Move the display so that the line represented by scrollbar value Y is at
1764 * the top of the screen 1815 * the top of the screen
1765 */ 1816 */
1766int 1817void
1767rxvt_term::scr_move_to (int y, int len) 1818rxvt_term::scr_move_to (int y, int len)
1768{ 1819{
1769 long p = 0; 1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1770 unsigned int oldviewstart;
1771
1772 oldviewstart = view_start;
1773
1774 if (y < len)
1775 {
1776 p = (nrow + nsaved) * (len - y) / len;
1777 p -= (long) (nrow - 1);
1778 p = max (p, 0);
1779 }
1780
1781 view_start = (unsigned int)min (p, nsaved);
1782
1783 return scr_changeview (oldviewstart);
1784} 1821}
1785 1822
1786/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1787/* 1824/*
1788 * Page the screen up/down nlines 1825 * Page the screen up/down nlines
1789 * direction should be UP or DN 1826 * direction should be UP or DN
1790 */ 1827 */
1791int 1828bool
1792rxvt_term::scr_page (enum page_dirn direction, int nlines) 1829rxvt_term::scr_page (enum page_dirn direction, int nlines)
1793{ 1830{
1794 int n; 1831 int new_view_start =
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (direction == UP)
1800 {
1801 n = view_start + nlines;
1802 view_start = min (n, nsaved);
1803 }
1804 else
1805 {
1806 n = view_start - nlines; 1832 direction == UP ? view_start - nlines
1807 view_start = max (n, 0); 1833 : view_start + nlines;
1808 }
1809 1834
1810 return scr_changeview (oldviewstart); 1835 return scr_changeview (new_view_start);
1811} 1836}
1812 1837
1813int 1838bool
1814rxvt_term::scr_changeview (unsigned int oldviewstart) 1839rxvt_term::scr_changeview (int new_view_start)
1815{ 1840{
1841 clamp_it (new_view_start, top_row, 0);
1842
1816 if (view_start != oldviewstart) 1843 if (new_view_start == view_start)
1817 { 1844 return false;
1845
1846 num_scr += new_view_start - view_start;
1847 view_start = new_view_start;
1818 want_refresh = 1; 1848 want_refresh = 1;
1819 num_scr -= (view_start - oldviewstart);
1820 }
1821 1849
1822 return (int) (view_start - oldviewstart); 1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851
1852 return true;
1823} 1853}
1824 1854
1825/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1826void 1856void
1827rxvt_term::scr_bell () 1857rxvt_term::scr_bell ()
1828{ 1858{
1829#ifndef NO_BELL 1859#ifndef NO_BELL
1830 1860
1831# ifndef NO_MAPALERT 1861# ifndef NO_MAPALERT
1832# ifdef MAPALERT_OPTION 1862# ifdef MAPALERT_OPTION
1833 if (options & Opt_mapAlert) 1863 if (OPTION (Opt_mapAlert))
1834# endif 1864# endif
1835 XMapWindow (display->display, parent[0]); 1865 XMapWindow (display->display, parent[0]);
1836# endif 1866# endif
1837 1867
1838 if (options & Opt_visualBell) 1868 if (OPTION (Opt_visualBell))
1839 { 1869 {
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 display->flush ();
1841 rxvt_usleep (VISUAL_BELL_DURATION); 1872 rxvt_usleep (VISUAL_BELL_DURATION);
1842 scr_rvideo_mode (!rvideo); /* refresh also done */ 1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1843 } 1874 }
1844 else 1875 else
1845 XBell (display->display, 0); 1876 XBell (display->display, 0);
… …
1859 if ((fd = popen_printer ()) == NULL) 1890 if ((fd = popen_printer ()) == NULL)
1860 return; 1891 return;
1861 1892
1862 if (fullhist) 1893 if (fullhist)
1863 { 1894 {
1864 nrows = nrow + nsaved; 1895 nrows = nrow - top_row;
1865 row_start = -nsaved; 1896 row_start = top_row;
1866 } 1897 }
1867 else 1898 else
1868 { 1899 {
1869 nrows = nrow; 1900 nrows = nrow;
1870 row_start = -view_start; 1901 row_start = view_start;
1871 } 1902 }
1872 1903
1873 wctomb (0, 0); 1904 wctomb (0, 0);
1874 1905
1875 for (int r1 = 0; r1 < nrows; r1++) 1906 for (int r1 = 0; r1 < nrows; r1++)
… …
1907 * Refresh the screen 1938 * Refresh the screen
1908 * drawn_text/drawn_rend contain the screen information before the update. 1939 * drawn_text/drawn_rend contain the screen information before the update.
1909 * screen.text/screen.rend contain what the screen will change to. 1940 * screen.text/screen.rend contain what the screen will change to.
1910 */ 1941 */
1911void 1942void
1912rxvt_term::scr_refresh (unsigned char refresh_type) 1943rxvt_term::scr_refresh ()
1913{ 1944{
1914 unsigned char must_clear, /* use draw_string not draw_image_string */ 1945 unsigned char must_clear, /* use draw_string not draw_image_string */
1915 showcursor; /* show the cursor */ 1946 showcursor; /* show the cursor */
1916 int16_t col, row, /* column/row we're processing */ 1947 int16_t col, row, /* column/row we're processing */
1917 ocrow; /* old cursor row */ 1948 ocrow; /* old cursor row */
… …
1934 1965
1935#if XPM_BACKGROUND 1966#if XPM_BACKGROUND
1936 must_clear |= bgPixmap.pixmap != None; 1967 must_clear |= bgPixmap.pixmap != None;
1937#endif 1968#endif
1938#if TRANSPARENT 1969#if TRANSPARENT
1939 must_clear |= (options & Opt_transparent) && am_transparent; 1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
1940#endif 1971#endif
1941 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1942 1973
1943 /* 1974 /*
1944 * B: reverse any characters which are selected 1975 * B: reverse any characters which are selected
… …
1968 1999
1969 crp = &ROW(screen.cur.row).r[col]; 2000 crp = &ROW(screen.cur.row).r[col];
1970 2001
1971 if (showcursor && focus) 2002 if (showcursor && focus)
1972 { 2003 {
1973 if (options & Opt_cursorUnderline) 2004 if (OPTION (Opt_cursorUnderline))
1974 *crp ^= RS_Uline; 2005 *crp ^= RS_Uline;
1975 else 2006 else
1976 { 2007 {
1977 *crp ^= RS_RVid; 2008 *crp ^= RS_RVid;
1978 2009
… …
1980 cc1 = *crp & (RS_fgMask | RS_bgMask); 2011 cc1 = *crp & (RS_fgMask | RS_bgMask);
1981 if (ISSET_PIXCOLOR (Color_cursor)) 2012 if (ISSET_PIXCOLOR (Color_cursor))
1982 ccol1 = Color_cursor; 2013 ccol1 = Color_cursor;
1983 else 2014 else
1984#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2015#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1985 ccol1 = GET_FGCOLOR (rstyle); 2016 ccol1 = fgcolor_of (rstyle);
1986#else 2017#else
1987 ccol1 = Color_fg; 2018 ccol1 = Color_fg;
1988#endif 2019#endif
1989 if (ISSET_PIXCOLOR (Color_cursor2)) 2020 if (ISSET_PIXCOLOR (Color_cursor2))
1990 ccol2 = Color_cursor2; 2021 ccol2 = Color_cursor2;
1991 else 2022 else
1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2023#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1993 ccol2 = GET_BGCOLOR (rstyle); 2024 ccol2 = bgcolor_of (rstyle);
1994#else 2025#else
1995 ccol2 = Color_bg; 2026 ccol2 = Color_bg;
1996#endif 2027#endif
1997 *crp = SET_FGCOLOR (*crp, ccol1); 2028 *crp = SET_FGCOLOR (*crp, ccol1);
1998 *crp = SET_BGCOLOR (*crp, ccol2); 2029 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2003 2034
2004 /* make sure no outline cursor is left around */ 2035 /* make sure no outline cursor is left around */
2005 setoldcursor = 0; 2036 setoldcursor = 0;
2006 if (ocrow != -1) 2037 if (ocrow != -1)
2007 { 2038 {
2008 if (screen.cur.row + view_start != ocrow 2039 if (screen.cur.row - view_start != ocrow
2009 || screen.cur.col != oldcursor.col) 2040 || screen.cur.col != oldcursor.col)
2010 { 2041 {
2011 if (ocrow < nrow 2042 if (ocrow < nrow
2012 && oldcursor.col < ncol) 2043 && oldcursor.col < ncol)
2013 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2044 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2021 else if (!focus) 2052 else if (!focus)
2022 setoldcursor = 1; 2053 setoldcursor = 1;
2023 2054
2024 if (setoldcursor) 2055 if (setoldcursor)
2025 { 2056 {
2026 if (screen.cur.row + view_start >= nrow) 2057 if (screen.cur.row - view_start >= nrow)
2027 oldcursor.row = -1; 2058 oldcursor.row = -1;
2028 else 2059 else
2029 { 2060 {
2030 oldcursor.row = screen.cur.row + view_start; 2061 oldcursor.row = screen.cur.row - view_start;
2031 oldcursor.col = screen.cur.col; 2062 oldcursor.col = screen.cur.col;
2032 } 2063 }
2033 } 2064 }
2034 } 2065 }
2035 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2036#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2037 scr_swap_overlay (); 2069 scr_swap_overlay ();
2038#endif 2070#endif
2039 2071
2040#ifndef NO_SLOW_LINK_SUPPORT 2072#ifndef NO_SLOW_LINK_SUPPORT
2041 /* 2073 /*
2042 * D: CopyArea pass - very useful for slower links 2074 * D: CopyArea pass - very useful for slower links
2043 * This has been deliberately kept simple. 2075 * This has been deliberately kept simple.
2044 */ 2076 */
2045 i = num_scr;
2046 if (!display->is_local 2077 if (!display->is_local
2047 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2048 && abs (num_scr) < nrow && !must_clear) 2079 && abs (num_scr) < nrow && !must_clear)
2049 { 2080 {
2050 int16_t nits; 2081 int16_t nits;
2051 int j; 2082 int j;
2052 int len, wlen; 2083 int len, wlen;
2084 dLocal (int, num_scr);
2053 2085
2054 j = nrow; 2086 j = nrow;
2055 wlen = len = -1; 2087 wlen = len = -1;
2056 row = i > 0 ? 0 : j - 1; 2088 row = i > 0 ? 0 : j - 1;
2057 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2058 { 2090 {
2059 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2060 { 2092 {
2061 line_t s = ROW(row - view_start); 2093 line_t s = ROW(view_start + row);
2062 line_t d = drawn_buf[row]; 2094 line_t d = drawn_buf[row];
2063 line_t d2 = drawn_buf[row + i]; 2095 line_t d2 = drawn_buf[row + i];
2064 2096
2065 for (nits = 0, col = ncol; col--; ) 2097 for (nits = 0, col = ncol; col--; )
2066 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2098 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2090 if (wlen < len) 2122 if (wlen < len)
2091 ::swap (wlen, len); 2123 ::swap (wlen, len);
2092 2124
2093 XCopyArea (display->display, vt, vt, 2125 XCopyArea (display->display, vt, vt,
2094 gc, 0, Row2Pixel (len + i), 2126 gc, 0, Row2Pixel (len + i),
2095 (unsigned int)TermWin_TotalWidth (), 2127 (unsigned int)this->width,
2096 (unsigned int)Height2Pixel (wlen - len + 1), 2128 (unsigned int)Height2Pixel (wlen - len + 1),
2097 0, Row2Pixel (len)); 2129 0, Row2Pixel (len));
2098 len = -1; 2130 len = -1;
2099 } 2131 }
2100 } 2132 }
… …
2104 /* 2136 /*
2105 * E: main pass across every character 2137 * E: main pass across every character
2106 */ 2138 */
2107 for (row = 0; row < nrow; row++) 2139 for (row = 0; row < nrow; row++)
2108 { 2140 {
2109 text_t *stp = ROW(row - view_start).t; 2141 text_t *stp = ROW(view_start + row).t;
2110 rend_t *srp = ROW(row - view_start).r; 2142 rend_t *srp = ROW(view_start + row).r;
2111 text_t *dtp = drawn_buf[row].t; 2143 text_t *dtp = drawn_buf[row].t;
2112 rend_t *drp = drawn_buf[row].r; 2144 rend_t *drp = drawn_buf[row].r;
2113 2145
2114 /* 2146 /*
2115 * E2: OK, now the real pass 2147 * E2: OK, now the real pass
… …
2179 count++, i--; 2211 count++, i--;
2180 2212
2181 /* 2213 /*
2182 * Determine the attributes for the string 2214 * Determine the attributes for the string
2183 */ 2215 */
2184 int fore = GET_FGCOLOR (rend); // desired foreground 2216 int fore = fgcolor_of (rend); // desired foreground
2185 int back = GET_BGCOLOR (rend); // desired background 2217 int back = bgcolor_of (rend); // desired background
2186 2218
2187 // only do special processing if any attributes are set, which is rare 2219 // only do special processing if any attributes are set, which is unlikely
2188 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2220 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2189 { 2221 {
2190#if ENABLE_STYLES 2222#if ENABLE_STYLES
2191 // force redraw after "careful" characters to avoid pixel droppings 2223 // force redraw after "careful" characters to avoid pixel droppings
2192 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2224 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2303 } /* for (row....) */ 2335 } /* for (row....) */
2304 2336
2305#if ENABLE_OVERLAY 2337#if ENABLE_OVERLAY
2306 scr_swap_overlay (); 2338 scr_swap_overlay ();
2307#endif 2339#endif
2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2308 2341
2309 /* 2342 /*
2310 * G: cleanup cursor and display outline cursor if necessary 2343 * G: cleanup cursor and display outline cursor if necessary
2311 */ 2344 */
2312 if (showcursor) 2345 if (showcursor)
2313 { 2346 {
2314 if (focus) 2347 if (focus)
2315 { 2348 {
2316 if (options & Opt_cursorUnderline) 2349 if (OPTION (Opt_cursorUnderline))
2317 *crp ^= RS_Uline; 2350 *crp ^= RS_Uline;
2318 else 2351 else
2319 { 2352 {
2320 *crp ^= RS_RVid; 2353 *crp ^= RS_RVid;
2321#ifndef NO_CURSORCOLOR 2354#ifndef NO_CURSORCOLOR
… …
2351 /* 2384 /*
2352 * H: cleanup selection 2385 * H: cleanup selection
2353 */ 2386 */
2354 scr_reverse_selection (); 2387 scr_reverse_selection ();
2355 2388
2356 if (refresh_type & SMOOTH_REFRESH)
2357 XFlush (display->display);
2358
2359 num_scr = 0; 2389 num_scr = 0;
2360 num_scr_allow = 1; 2390 num_scr_allow = 1;
2361} 2391}
2362 2392
2363void 2393void
2364rxvt_term::scr_remap_chars (const line_t &l) 2394rxvt_term::scr_remap_chars (line_t &l)
2365{ 2395{
2366 if (!l.t) 2396 if (!l.t)
2367 return; 2397 return;
2398
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2368 2400
2369 for (int i = ncol; i--; ) 2401 for (int i = ncol; i--; )
2370 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2371} 2403}
2372 2404
… …
2425 2457
2426 if (really) 2458 if (really)
2427 XClearWindow (display->display, vt); 2459 XClearWindow (display->display, vt);
2428} 2460}
2429 2461
2462void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2)
2464{
2465 int view_end = view_start + nrow;
2466 int row, col;
2467
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2469 {
2470 text_t *stp = ROW(row).t;
2471 rend_t *srp = ROW(row).r;
2472
2473 for (col = beg_col; col < end_col; col++)
2474 srp[col] ^= rstyle1;
2475
2476 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2477 srp[col] ^= rstyle2;
2478
2479 if (++col < end_col)
2480 srp[col] ^= rstyle2;
2481 }
2482}
2483
2484void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle)
2486{
2487 int view_end = view_start + nrow;
2488 int row, col;
2489
2490 if (beg_row >= view_start)
2491 {
2492 col = beg_col;
2493 row = beg_row;
2494 }
2495 else
2496 {
2497 col = 0;
2498 row = view_start;
2499 }
2500
2501 for (; row < min (end_row, view_end); row++, col = 0)
2502 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2503 srp[col] ^= rstyle;
2504
2505 if (row == end_row)
2506 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2507 srp[col] ^= rstyle;
2508}
2509
2430/* ------------------------------------------------------------------------- */ 2510/* ------------------------------------------------------------------------- */
2431void 2511void
2432rxvt_term::scr_reverse_selection () 2512rxvt_term::scr_reverse_selection ()
2433{ 2513{
2434 if (selection.op 2514 if (selection.op
2435 && current_screen == selection.screen 2515 && current_screen == selection.screen
2436 && selection.end.row >= -view_start) 2516 && selection.end.row >= view_start)
2437 { 2517 {
2438 int view_end = -view_start + nrow;
2439 int row, col;
2440
2441#if ENABLE_FRILLS 2518#if ENABLE_FRILLS
2442 if (selection.rect) 2519 if (selection.rect)
2443 { 2520 scr_xor_rect (selection.beg.row, selection.beg.col,
2444 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2521 selection.end.row, selection.end.col,
2445 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2522 RS_RVid, RS_RVid | RS_Uline);
2446 srp[col] ^= RS_RVid;
2447 }
2448 else 2523 else
2449#endif 2524#endif
2450 { 2525 scr_xor_span (selection.beg.row, selection.beg.col,
2451 if (selection.beg.row >= -view_start) 2526 selection.end.row, selection.end.col,
2452 { 2527 RS_RVid);
2453 col = selection.beg.col;
2454 row = selection.beg.row;
2455 }
2456 else
2457 {
2458 col = 0;
2459 row = view_start;
2460 }
2461
2462 for (; row < min (selection.end.row, view_end); row++, col = 0)
2463 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2464 srp[col] ^= RS_RVid;
2465
2466 if (row == selection.end.row)
2467 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469 }
2470 } 2528 }
2471} 2529}
2472 2530
2473/* ------------------------------------------------------------------------- */ 2531/* ------------------------------------------------------------------------- */
2474/* 2532/*
… …
2512 2570
2513 if (!selection.op) 2571 if (!selection.op)
2514 return; 2572 return;
2515 2573
2516 pos.row = pos.col = 0; 2574 pos.row = pos.col = 0;
2517 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2518 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2519 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2520 || (check_more == 1 2578 || (check_more == 1
2521 && current_screen == selection.screen 2579 && current_screen == selection.screen
2522 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2580 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2523 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2524 || (check_more == 2 2582 || (check_more == 2
… …
2535/* ------------------------------------------------------------------------- */ 2593/* ------------------------------------------------------------------------- */
2536/* 2594/*
2537 * Paste a selection direct to the command fd 2595 * Paste a selection direct to the command fd
2538 */ 2596 */
2539void 2597void
2540rxvt_term::paste (unsigned char *data, unsigned int len) 2598rxvt_term::paste (char *data, unsigned int len)
2541{ 2599{
2542 /* convert normal newline chars into common keyboard Return key sequence */ 2600 /* convert normal newline chars into common keyboard Return key sequence */
2543 for (unsigned int i = 0; i < len; i++) 2601 for (unsigned int i = 0; i < len; i++)
2544 if (data[i] == C0_LF) 2602 if (data[i] == C0_LF)
2545 data[i] = C0_CR; 2603 data[i] = C0_CR;
… …
2689 { 2747 {
2690 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2691 char *s = rxvt_wcstombs (w); 2749 char *s = rxvt_wcstombs (w);
2692 free (w); 2750 free (w);
2693 // TODO: strlen == only the first element will be converted. well... 2751 // TODO: strlen == only the first element will be converted. well...
2694 paste ((unsigned char *)s, strlen (s)); 2752 paste (s, strlen (s));
2695 free (s); 2753 free (s);
2696 } 2754 }
2697 else 2755 else
2698#endif 2756#endif
2699 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2700 && cl) 2758 && cl)
2701 { 2759 {
2702 for (int i = 0; i < cr; i++) 2760 for (int i = 0; i < cr; i++)
2703 paste ((unsigned char *)cl[i], strlen (cl[i])); 2761 paste (cl[i], strlen (cl[i]));
2704 2762
2705 XFreeStringList (cl); 2763 XFreeStringList (cl);
2706 } 2764 }
2707 else 2765 else
2708 paste (ct.value, ct.nitems); // paste raw 2766 paste ((char *)ct.value, ct.nitems); // paste raw
2709 2767
2710bailout: 2768bailout:
2711 XFree (ct.value); 2769 XFree (ct.value);
2712 2770
2713 if (selection_wait == Sel_normal) 2771 if (selection_wait == Sel_normal)
… …
2743 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2744 * will auto fallback to CUT_BUFFER0 2802 * will auto fallback to CUT_BUFFER0
2745 * EXT: button 2 release 2803 * EXT: button 2 release
2746 */ 2804 */
2747void 2805void
2748rxvt_term::selection_request (Time tm, int x, int y) 2806rxvt_term::selection_request (Time tm)
2749{ 2807{
2750 if (x < 0 || x >= width || y < 0 || y >= height)
2751 return; /* outside window */
2752
2753 if (selection.text) 2808 if (selection.text)
2754 { /* internal selection */ 2809 { /* internal selection */
2755 char *str = rxvt_wcstombs (selection.text, selection.len); 2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2756 paste ((unsigned char *)str, strlen (str)); 2811 paste (str, strlen (str));
2757 free (str); 2812 free (str);
2758 return; 2813 return;
2759 } 2814 }
2760 else 2815 else
2761 { 2816 {
… …
2853 selection.op = SELECTION_DONE; 2908 selection.op = SELECTION_DONE;
2854 2909
2855 if (selection.clicks == 4) 2910 if (selection.clicks == 4)
2856 return; /* nothing selected, go away */ 2911 return; /* nothing selected, go away */
2857 2912
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return;
2915
2858 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2859 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2860 2918
2861 int ofs = 0; 2919 int ofs = 0;
2862 int extra = 0; 2920 int extra = 0;
… …
2874 col = selection.beg.col; 2932 col = selection.beg.col;
2875 end_col = ncol + 1; 2933 end_col = ncol + 1;
2876 } 2934 }
2877 else 2935 else
2878#endif 2936#endif
2879 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2937 end_col = ROW(row).l;
2880 2938
2881 col = max (col, 0); 2939 col = max (col, 0);
2882 2940
2883 if (row == selection.end.row || selection.rect) 2941 if (row == selection.end.row
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2884 end_col = min (end_col, selection.end.col); 2946 min_it (end_col, selection.end.col);
2885 2947
2886 t = ROW(row).t + col; 2948 t = ROW(row).t + col;
2949
2887 for (; col < end_col; col++) 2950 for (; col < end_col; col++)
2888 { 2951 {
2889 if (*t == NOCHAR) 2952 if (*t == NOCHAR)
2890 t++; 2953 t++;
2891#if ENABLE_COMBINING 2954#if ENABLE_COMBINING
… …
2907#endif 2970#endif
2908 else 2971 else
2909 new_selection_text[ofs++] = *t++; 2972 new_selection_text[ofs++] = *t++;
2910 } 2973 }
2911 2974
2975#if ENABLE_FRILLS
2976 if (selection.rect)
2977 {
2978 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1]))
2981 --ofs;
2982
2983 new_selection_text[ofs++] = C0_LF;
2984 }
2985 else
2986#endif
2912 if (!ROW(row).is_longer () && row != selection.end.row) 2987 if (!ROW(row).is_longer () && row != selection.end.row)
2913 new_selection_text[ofs++] = C0_LF; 2988 new_selection_text[ofs++] = C0_LF;
2914 } 2989 }
2915 2990
2916 if (end_col != selection.end.col) 2991 if (end_col != selection.end.col)
2917 new_selection_text[ofs++] = C0_LF; 2992 new_selection_text[ofs++] = C0_LF;
2918 2993
… …
2928 3003
2929 // we usually allocate much more than necessary, so realloc it smaller again 3004 // we usually allocate much more than necessary, so realloc it smaller again
2930 selection.len = ofs; 3005 selection.len = ofs;
2931 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3006 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2932 3007
3008 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3009 return;
3010
3011 selection_grab (tm);
3012}
3013
3014bool
3015rxvt_term::selection_grab (Time tm)
3016{
3017 selection_time = tm;
3018
2933 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2934 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 {
2935 display->set_selection_owner (this); 3022 display->set_selection_owner (this);
3023 return true;
3024 }
2936 else 3025 else
2937 rxvt_warn ("can't get primary selection, ignoring.\n"); 3026 {
3027 selection_clear ();
3028 return false;
3029 }
2938 3030
2939#if 0 3031#if 0
2940 XTextProperty ct; 3032 XTextProperty ct;
2941 3033
2942 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2943 { 3035 {
2944 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2945 XFree (ct.value); 3037 XFree (ct.value);
2946 } 3038 }
2947#endif 3039#endif
2948
2949 selection_time = tm;
2950} 3040}
2951 3041
2952/* ------------------------------------------------------------------------- */ 3042/* ------------------------------------------------------------------------- */
2953/* 3043/*
2954 * Mark or select text based upon number of clicks: 1, 2, or 3 3044 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
2958rxvt_term::selection_click (int clicks, int x, int y) 3048rxvt_term::selection_click (int clicks, int x, int y)
2959{ 3049{
2960 clicks = ((clicks - 1) % 3) + 1; 3050 clicks = ((clicks - 1) % 3) + 1;
2961 selection.clicks = clicks; /* save clicks so extend will work */ 3051 selection.clicks = clicks; /* save clicks so extend will work */
2962 3052
3053 if (clicks == 2 && !selection.rect
3054 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3055 {
3056 MEvent.clicks = 1; // what a mess
3057 selection.screen = current_screen;
3058 selection.op = SELECTION_CONT;
3059 return;
3060 }
3061
2963 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2964 3063
2965 if (clicks == 2 || clicks == 3) 3064 if (clicks == 2 || clicks == 3)
2966 selection_extend_colrow (selection.mark.col, 3065 selection_extend_colrow (selection.mark.col,
2967 selection.mark.row + view_start, 3066 selection.mark.row - view_start,
2968 0, /* button 3 */ 3067 0, /* button 3 */
2969 1, /* button press */ 3068 1, /* button press */
2970 0); /* click change */ 3069 0); /* click change */
2971} 3070}
2972 3071
… …
2977void 3076void
2978rxvt_term::selection_start_colrow (int col, int row) 3077rxvt_term::selection_start_colrow (int col, int row)
2979{ 3078{
2980 want_refresh = 1; 3079 want_refresh = 1;
2981 3080
2982 selection.mark.row = row - view_start; 3081 selection.mark.row = row + view_start;
2983 selection.mark.col = col; 3082 selection.mark.col = col;
2984 3083
2985 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3084 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2986 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2987 3086
2988 while (selection.mark.col > 0 3087 while (selection.mark.col > 0
2989 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2990 --selection.mark.col; 3089 --selection.mark.col;
… …
3018 text_t *stp; 3117 text_t *stp;
3019 rend_t *srp; 3118 rend_t *srp;
3020 3119
3021 if (dirn == UP) 3120 if (dirn == UP)
3022 { 3121 {
3023 bound.row = - nsaved - 1; 3122 bound.row = top_row - 1;
3024 bound.col = 0; 3123 bound.col = 0;
3025 dirnadd = -1; 3124 dirnadd = -1;
3026 } 3125 }
3027 else 3126 else
3028 { 3127 {
… …
3076 } 3175 }
3077 } 3176 }
3078 break; 3177 break;
3079 } 3178 }
3080 3179
3081Old_Word_Selection_You_Die:
3082 if (dirn == DN) 3180 if (dirn == DN)
3083 col++; /* put us on one past the end */ 3181 col++; /* put us on one past the end */
3084 3182
3085 /* Poke the values back in */ 3183 /* Poke the values back in */
3086 ret->row = row; 3184 ret->row = row;
… …
3107 * select nothing. Otherwise, if we're to the right of the mark, you have to 3205 * select nothing. Otherwise, if we're to the right of the mark, you have to
3108 * be _past_ a character for it to be selected. 3206 * be _past_ a character for it to be selected.
3109 */ 3207 */
3110 if (((selection.clicks % 3) == 1) && !flag 3208 if (((selection.clicks % 3) == 1) && !flag
3111 && (col == selection.mark.col 3209 && (col == selection.mark.col
3112 && (row == selection.mark.row + view_start))) 3210 && (row == selection.mark.row - view_start)))
3113 { 3211 {
3114 /* select nothing */ 3212 /* select nothing */
3115 selection.beg.row = selection.end.row = 0; 3213 selection.beg.row = selection.end.row = 0;
3116 selection.beg.col = selection.end.col = 0; 3214 selection.beg.col = selection.end.col = 0;
3117 selection.clicks = 4; 3215 selection.clicks = 4;
… …
3172 selection.beg.col = selection.end.col = selection.mark.col; 3270 selection.beg.col = selection.end.col = selection.mark.col;
3173 selection.beg.row = selection.end.row = selection.mark.row; 3271 selection.beg.row = selection.end.row = selection.mark.row;
3174 } 3272 }
3175 3273
3176 pos.col = col; 3274 pos.col = col;
3177 pos.row = row - view_start; 3275 pos.row = view_start + row;
3178 3276
3179 /* 3277 /*
3180 * This is mainly xterm style selection with a couple of differences, mainly 3278 * This is mainly xterm style selection with a couple of differences, mainly
3181 * in the way button3 drag extension works. 3279 * in the way button3 drag extension works.
3182 * We're either doing: button1 drag; button3 press; or button3 drag 3280 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3269 selection_delimit_word (DN, &selection.end, &selection.end); 3367 selection_delimit_word (DN, &selection.end, &selection.end);
3270 } 3368 }
3271 else if (selection.clicks == 3) 3369 else if (selection.clicks == 3)
3272 { 3370 {
3273#if ENABLE_FRILLS 3371#if ENABLE_FRILLS
3274 if (options & Opt_tripleclickwords) 3372 if (OPTION (Opt_tripleclickwords))
3275 { 3373 {
3276 selection_delimit_word (UP, &selection.beg, &selection.beg); 3374 selection_delimit_word (UP, &selection.beg, &selection.beg);
3277 3375
3278 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3279 { 3377 {
… …
3340 { 3438 {
3341 stp = ROW(end_row).t; 3439 stp = ROW(end_row).t;
3342 3440
3343 while (--end_col >= 0) 3441 while (--end_col >= 0)
3344 { 3442 {
3345 if (stp[end_col] != ' ' 3443 if (stp[end_col] != NOCHAR
3346 && stp[end_col] != '\t' 3444 && !unicode::is_space (stp[end_col]))
3347 && stp[end_col] != NOCHAR)
3348 break; 3445 break;
3349 } 3446 }
3350 3447
3351 if (end_col >= 0 3448 if (end_col >= 0
3352 || !ROW(end_row - 1).is_longer ()) 3449 || !ROW(end_row - 1).is_longer ())
… …
3551 3648
3552#if ENABLE_OVERLAY 3649#if ENABLE_OVERLAY
3553void 3650void
3554rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3651rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3555{ 3652{
3556 if (nrow < 3 || ncol < 3) 3653 if (nrow < 1 || ncol < 1)
3557 return; 3654 return;
3558 3655
3559 want_refresh = 1; 3656 want_refresh = 1;
3560 3657
3561 scr_overlay_off (); 3658 scr_overlay_off ();
… …
3668 for (int y = ov_h; y--; ) 3765 for (int y = ov_h; y--; )
3669 { 3766 {
3670 text_t *t1 = ov_text[y]; 3767 text_t *t1 = ov_text[y];
3671 rend_t *r1 = ov_rend[y]; 3768 rend_t *r1 = ov_rend[y];
3672 3769
3673 text_t *t2 = ROW(y - view_start).t + ov_x; 3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3674 rend_t *r2 = ROW(y - view_start).r + ov_x; 3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3675 3772
3676 for (int x = ov_w; x--; ) 3773 for (int x = ov_w; x--; )
3677 { 3774 {
3678 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3775 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3679 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3776 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