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.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.456 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
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-2007 Marc Lehmann <schmorp@schmorp.de> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
7 * 8 *
8 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 3 of the License, or
11 * (at your option) any later version. 12 * (at your option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
27#include "../config.h" /* NECESSARY */ 28#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 29#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 30#include "rxvtperl.h" /* NECESSARY */
30 31
31#include <inttypes.h> 32#include <inttypes.h>
32
33#include "salloc.C" // HACK, should be a separate compile!
34 33
35static inline void 34static inline void
36fill_text (text_t *start, text_t value, int len) 35fill_text (text_t *start, text_t value, int len)
37{ 36{
38 while (len--) 37 while (len--)
… …
98 97
99/* Fill part/all of a line with blanks. */ 98/* Fill part/all of a line with blanks. */
100void 99void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 100rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 101{
103 if (!l.t) 102 if (!l.valid ())
104 { 103 {
105 lalloc (l); 104 l.alloc ();
106 col = 0; 105 col = 0;
107 width = ncol; 106 width = ncol;
108 } 107 }
109 108
110 l.touch (); 109 l.touch ();
… …
152 l.r[col] = rend; 151 l.r[col] = rend;
153 col++; 152 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 153 } while (col < ncol && l.t[col] == NOCHAR);
155} 154}
156 155
156// set the rendition of a single wide character beginning at the given column
157void
158rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
159{
160 do {
161 l.r[col] = rend;
162 col++;
163 } while (col < ncol && l.t[col] == NOCHAR);
164}
165
157/* ------------------------------------------------------------------------- * 166/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 167 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 168 * ------------------------------------------------------------------------- */
160 169
161void 170void
171rxvt_term::scr_alloc () NOTHROW
172{
173 int tsize = sizeof (text_t) * ncol;
174 int rsize = sizeof (rend_t) * ncol;
175
176 // we assume that rend_t size is a sufficient alignment
177 // factor for text_t and line_t values, and we only
178 // need to adjust tsize.
179 tsize = (tsize + sizeof (rend_t) - 1);
180 tsize -= tsize % sizeof (rend_t);
181
182 int all_rows = total_rows + nrow + nrow;
183
184 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
185 chunk = chunk_alloc (chunk_size, 0);
186
187 char *base = (char *)chunk + sizeof (line_t) * all_rows;
188
189 for (int row = 0; row < all_rows; ++row)
190 {
191 line_t &l = ((line_t *)chunk) [row];
192
193 l.t = (text_t *)base; base += tsize;
194 l.r = (rend_t *)base; base += rsize;
195 l.l = -1;
196 l.f = 0;
197 }
198
199 drawn_buf = (line_t *)chunk;
200 swap_buf = drawn_buf + nrow;
201 row_buf = swap_buf + nrow;
202}
203
204void
205rxvt_term::copy_line (line_t &dst, line_t &src)
206{
207 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
208 dst.l = min (src.l, ncol);
209 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
210 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
211 dst.f = src.f;
212}
213
214void ecb_cold
162rxvt_term::scr_reset () 215rxvt_term::scr_reset ()
163{ 216{
164#if ENABLE_OVERLAY 217#if ENABLE_OVERLAY
165 scr_overlay_off (); 218 scr_overlay_off ();
166#endif 219#endif
… …
192 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
193 246
194 screen.tscroll = 0; 247 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
196 249
250 void *prev_chunk = chunk;
251 size_t prev_chunk_size = chunk_size;
252 line_t *prev_drawn_buf = drawn_buf;
253 line_t *prev_swap_buf = swap_buf;
254 line_t *prev_row_buf = row_buf;
255
256 scr_alloc ();
257
197 if (!row_buf) 258 if (!prev_row_buf)
198 { 259 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 260 top_row = 0;
203 term_start = 0; 261 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 262
219 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
… …
245 { 289 {
246 /* 290 /*
247 * add or delete rows as appropriate 291 * add or delete rows as appropriate
248 */ 292 */
249 293
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266 295
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 301
273 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 303 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 304
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 305 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
285 308
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 317
295 do 318 do
296 { 319 {
297 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 322 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 324
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 325 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 326 {
304 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
305 328
306 plines++; 329 plines++;
307 llen += prev_ncol; 330 llen += prev_ncol;
… …
320 343
321 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
323 { 346 {
324 qline = row_buf + qrow; 347 qline = row_buf + qrow;
325 lalloc (*qline); 348 qline->alloc (); // redundant with next line
326 qline->l = ncol; 349 qline->l = ncol;
327 qline->is_longer (1); 350 qline->is_longer (1);
328 351
329 int qcol = 0; 352 int qcol = 0;
330 353
… …
345 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
346 // least. 369 // least.
347 if (prow == ocur.row) 370 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
349 372
350 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
351 374
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 376
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 399 {
377 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
378 401
379 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
380 { 403 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 404 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
383 406
384 qline = pline; 407 copy_line (dst, src);
385 lresize (qline);
386 } 408 }
387 409
388 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 412
393 term_start = 0; 413 term_start = 0;
394 } 414 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 415
400 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 418 }
403 419
420 for (int row = nrow; row--; )
421 {
422 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
423 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
424 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
425 }
426
427 chunk_free (prev_chunk, prev_chunk_size);
428
404 free (tabs); 429 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
406 431
407 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 440 tt_winch ();
416 441
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 443}
419 444
420/* ------------------------------------------------------------------------- */ 445void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
426{ 447{
427 if (row_buf) 448 chunk_free (chunk, chunk_size);
428 { 449 chunk = 0;
429 delete talloc; talloc = 0; 450 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 451
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 452 free (tabs);
438 tabs = 0; 453 tabs = 0;
439 }
440} 454}
441 455
442/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
443/* 457/*
444 * Hard/Soft reset 458 * Hard/Soft reset
445 */ 459 */
446void 460void ecb_cold
447rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
448{ 462{
449 scr_release (); 463 scr_release ();
464
450 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 466 rvideo_mode = false;
452 scr_soft_reset (); 467 scr_soft_reset ();
453 scr_reset (); 468 scr_reset ();
454 469
455 scr_clear (true); 470 scr_clear (true);
456 scr_refresh (); 471 scr_refresh ();
457} 472}
458 473
459void 474void ecb_cold
460rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
461{ 476{
462 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
464 scr_overlay_off (); 479 scr_overlay_off ();
465#endif 480#endif
… …
520 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
522} 537}
523 538
524void 539void
525rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
526{ 541{
527 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
528 return; 543 return;
529 544
530 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
… …
549 return; 564 return;
550 565
551 want_refresh = 1; 566 want_refresh = 1;
552 view_start = 0; 567 view_start = 0;
553 568
554 selection_check (2); /* check for boundary cross */ 569 /* check for boundary cross */
570 row_col_t pos;
571 pos.row = pos.col = 0;
572 if (ROWCOL_IS_BEFORE (selection.beg, pos)
573 && ROWCOL_IS_AFTER (selection.end, pos))
574 CLEAR_SELECTION ();
555 575
556 current_screen = scrn; 576 current_screen = scrn;
557 577
558#if NSCREENS 578#if NSCREENS
559 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
… …
625/* 645/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 647 * count positive ==> scroll up
628 * count negative ==> scroll down 648 * count negative ==> scroll down
629 */ 649 */
630int 650int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 652{
633 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
634 return 0; 654 return 0;
635 655
… …
638 658
639 if (count > 0 659 if (count > 0
640 && row1 == 0 660 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
643 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 666
648 // sever bottommost line 667 // sever bottommost line
649 { 668 {
650 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
651 l.is_longer (0); 670 l.is_longer (0);
652 l.touch (); 671 l.touch ();
653 } 672 }
654 673
674 // scroll everything up 'count' lines
675 term_start = (term_start + count) % total_rows;
676
677 // now copy lines below the scroll region bottom to the
678 // bottom of the screen again, so they look as if they
679 // hadn't moved.
680 for (int i = nrow; --i > row2; )
681 {
682 line_t &l1 = ROW(i - count);
683 line_t &l2 = ROW(i);
684
685 ::swap (l1, l2);
686 l2.touch ();
687 }
688
655 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 690 for (int i = count; i--; )
657 { 691 {
658 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
659 693
660 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 696 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 697 {
664 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 699 l.l = 0;
… …
667 } 701 }
668 else 702 else
669 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
670 } 704 }
671 705
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 706 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
686 { 709 {
687 selection.beg.row -= count; 710 selection.beg.row -= count;
688 selection.end.row -= count; 711 selection.end.row -= count;
689 selection.mark.row -= count; 712 selection.mark.row -= count;
690 713
691 if (selection.beg.row < top_row 714 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 715 }
699 716
700 // finally move the view window, if desired 717 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 719 && view_start != 0
703 && view_start != -saveLines) 720 && view_start != -saveLines)
704 scr_page (UP, count); 721 scr_page (count);
705 722
706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
707 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 724 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
708 } 725 }
709 else 726 else
… …
732 } 749 }
733 750
734 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
736 753
754 // sever line above scroll region
755 if (row1)
756 {
757 line_t &l = ROW(row1 - 1);
758 l.is_longer (0);
759 l.touch ();
760 }
761
737 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
738 763
739 min_it (count, rows); 764 min_it (count, rows);
740 765
741 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 767
743 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
744 { 769 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 771
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 774 }
750 775
751 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 777 ROW(row1 + row) = temp_buf [row];
778
779 // sever bottommost line
780 {
781 line_t &l = ROW(row2);
782 l.is_longer (0);
783 l.touch ();
784 }
753 } 785 }
754 786
755 return count; 787 return count;
756} 788}
757 789
758/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
759/* 791/*
760 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
761 */ 793 */
762void 794void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 795rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 796{
765 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
766 return; 798 return;
767 799
768 unsigned char checksel; 800 bool checksel;
769 unicode_t c; 801 unicode_t c;
770 int ncol = this->ncol; 802 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
772 804
773 want_refresh = 1; 805 want_refresh = 1;
… …
799 831
800 while (str < strend) 832 while (str < strend)
801 { 833 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 835
804 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 837 if (c == C0_LF)
806 { 838 {
807 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
808 840
809 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
… …
828 { 860 {
829 scr_tab (1, true); 861 scr_tab (1, true);
830 continue; 862 continue;
831 } 863 }
832 864
833 if (expect_false ( 865 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 869 ))
838 { 870 {
… …
843 * should be a similar check. 875 * should be a similar check.
844 */ 876 */
845 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
846 } 878 }
847 879
848 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 881 {
850 scr_do_wrap (); 882 scr_do_wrap ();
851 883
852 line->l = ncol; 884 line->l = ncol;
853 line->is_longer (1); 885 line->is_longer (1);
… …
855 row = screen.cur.row; 887 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
857 } 889 }
858 890
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 893 c = 0xfffd;
862 894
863 // rely on wcwidth to tell us the character width, do wcwidth before 895 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
866 // locale. 898 // locale.
867 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
868 900
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 902 {
871 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 904 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
889 } 921 }
890 } 922 }
891 923
892 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
894 926
895 if (width != 0) 927 if (width != 0)
896 { 928 {
897#if !UNICODE_3 929#if !UNICODE_3
… …
905#endif 937#endif
906 938
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 940
909 // if the character doesn't fit into the remaining columns... 941 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 { 943 {
912 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
913 { 945 {
914 // ... artificially enlargen the previous one 946 // ... artificially enlargen the previous one
915 c = NOCHAR; 947 c = NOCHAR;
… …
922 954
923 // nuke the character at this position, if required 955 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop 956 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself, 957 // we never have to check for overwriting a wide char itself,
926 // only its tail. 958 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
929 961
930 line->touch (); 962 line->touch ();
931 963
932 do 964 do
933 { 965 {
934 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
935 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
936 968
937 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
938 screen.cur.col++; 970 screen.cur.col++;
939 else 971 else
940 { 972 {
941 line->l = ncol; 973 line->l = ncol;
942 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
… …
945 goto end_of_line; 977 goto end_of_line;
946 } 978 }
947 979
948 c = NOCHAR; 980 c = NOCHAR;
949 } 981 }
950 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
951 983
952 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 985 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954 { 986 {
955 line->t[c] = ' '; 987 line->t[c] = ' ';
956 line->r[c] = rend; 988 line->r[c] = rend;
957 } 989 }
958 990
… …
980 } 1012 }
981 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
982 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
983 { 1015 {
984 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
985 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
986 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
987 } 1019 }
988 else 1020 else
989 continue; 1021 continue;
990 1022
991 linep->touch (); 1023 linep->touch ();
… …
1117 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1150 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1120 */ 1152 */
1121#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1122void 1154void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1124{ 1156{
1125 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1159 else
… …
1134 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1167 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1137 */ 1169 */
1138#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1139void 1171void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1141{ 1173{
1142 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1176 else
… …
1209 * direction should be UP or DN 1241 * direction should be UP or DN
1210 */ 1242 */
1211void 1243void
1212rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1213{ 1245{
1214 int dirn;
1215
1216 want_refresh = 1; 1246 want_refresh = 1;
1217 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1218 1248
1219 dirn = ((direction == UP) ? 1 : -1);
1220
1221 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1222 1250
1223 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1224 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1225 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1226 else 1254 else
1227 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1228 1256
1229 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1230 selection_check (0); 1258 selection_check (0);
1231} 1259}
1232 1260
… …
1295 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1296} 1324}
1297 1325
1298/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1299/* 1327/*
1300 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1332 */
1305void 1333void
… …
1314 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1315 1343
1316 switch (mode) 1344 switch (mode)
1317 { 1345 {
1318 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1347 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1349 num = nrow - row;
1323 break; 1350 break;
1324 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1352 scr_erase_line (1);
1327 row = 0; 1353 row = 0;
1328 num = screen.cur.row; 1354 num = screen.cur.row;
1329 break; 1355 break;
1330 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1357 row = 0;
1333 num = nrow; 1358 num = nrow;
1334 break; 1359 break;
1335 default: 1360 default:
1336 return; 1361 return;
… …
1353 { 1378 {
1354 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1355 1380
1356 if (mapped) 1381 if (mapped)
1357 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1360 } 1385 }
1361 else 1386 else
1362 { 1387 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1391 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1396 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1400 }
1376 } 1401 }
… …
1398/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1399/* 1424/*
1400 * Fill the screen with `E's 1425 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1427 */
1403void 1428void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1405{ 1430{
1406 rend_t fs; 1431 rend_t fs;
1407 1432
1408 want_refresh = 1; 1433 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1410 1435
1411 num_scr_allow = 0; 1436 num_scr_allow = 0;
1412 selection_check (3); 1437
1438 row_col_t pos;
1439 pos.row = pos.col = 0;
1440 if (ROWCOL_IS_AFTER (selection.end, pos))
1441 CLEAR_SELECTION ();
1413 1442
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1416 { 1445 {
1417 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1569/* 1598/*
1570 * Set the scrolling region 1599 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1601 */
1573void 1602void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1604{
1576 max_it (top, 0); 1605 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1578 1607
… …
1588/* 1617/*
1589 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1621 */
1593void 1622void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1624{
1596 want_refresh = 1; 1625 want_refresh = 1;
1597 1626
1598 if (mode) 1627 if (mode)
… …
1605/* 1634/*
1606 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1638 */
1610void 1639void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1641{
1613 if (mode) 1642 if (mode)
1614 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1615 else 1644 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1653 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1657 */
1629void 1658void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1660{
1632 if (mode) 1661 if (mode)
1633 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1634 else 1663 else
… …
1641/* 1670/*
1642 * Set insert/replace mode 1671 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1674 */
1646void 1675void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1677{
1649 if (mode) 1678 if (mode)
1650 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1651 else 1680 else
… …
1657 * Set/Unset tabs 1686 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1690 */
1662void 1691void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1693{
1665 if (mode < 0) 1694 if (mode < 0)
1666 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
… …
1686 if (rvideo_state != on) 1715 if (rvideo_state != on)
1687 { 1716 {
1688 rvideo_state = on; 1717 rvideo_state = on;
1689 1718
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1692 if (bg_pixmap == None) 1721 if (bg_img == 0)
1693#endif 1722#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1724
1696 XGCValues gcvalue; 1725 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1707/* 1736/*
1708 * Report current cursor position 1737 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1739 */
1711void 1740void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1713{ 1742{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1743 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1744}
1716 1745
… …
1719 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1720 1749
1721/* 1750/*
1722 * Set font style 1751 * Set font style
1723 */ 1752 */
1724void 1753void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1726{ 1755{
1727#if 0 1756#if 0
1728 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1729 { 1758 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1784 */
1756void 1785void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1787{
1759 screen.charset = set; 1788 screen.charset = set;
1760 set_font_style (); 1789 set_font_style ();
1761} 1790}
… …
1782 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1783 1812
1784/* 1813/*
1785 * refresh matching text. 1814 * refresh matching text.
1786 */ 1815 */
1787bool 1816bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1818{
1790 bool found = false; 1819 bool found = false;
1791 1820
1792 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1840 PART_BEG = 0,
1812 PART_END, 1841 PART_END,
1813 RC_COUNT 1842 RC_COUNT
1814}; 1843};
1815 1844
1816void 1845void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1846rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1847{
1819 int i; 1848 int i;
1820 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1821 1850
… …
1858 * Refresh the entire screen 1887 * Refresh the entire screen
1859 */ 1888 */
1860void 1889void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1891{
1863 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1893}
1865 1894
1866/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1867/* 1896/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1897 * Move the display so that the line represented by scrollbar value Y is at
1869 * the top of the screen 1898 * the top of the screen
1870 */ 1899 */
1871void 1900void
1872rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1873{ 1902{
1874 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1903 // lerp (y, 0, len, top_row, nrow - 1)
1904 scr_changeview (top_row + (nrow - 1 - top_row) * y / len);
1875} 1905}
1876 1906
1877/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1878/* 1908/*
1879 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1880 * direction should be UP or DN 1910 * direction should be UP or DN
1881 */ 1911 */
1882bool 1912bool
1883rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1884{ 1914{
1885 int new_view_start =
1886 direction == UP ? view_start - nlines
1887 : view_start + nlines;
1888
1889 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1890} 1916}
1891 1917
1892bool 1918bool
1893rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1894{ 1920{
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1974#endif
1949} 1975}
1950 1976
1951/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1978void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1980{
1956#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1957 int nrows, row_start; 1982 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
… …
2007/* 2032/*
2008 * Refresh the screen 2033 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2036 */
2012void 2037void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2014{ 2039{
2015 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2042 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */
2020#endif
2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2024 2048
2025 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2026 2050
2027 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2028 return; 2052 return;
… …
2031 * A: set up vars 2055 * A: set up vars
2032 */ 2056 */
2033 refresh_count = 0; 2057 refresh_count = 0;
2034 2058
2035 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2060 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2038 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2039#endif 2063#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2065
2042 /* 2066 /*
2043 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2073 scr_swap_overlay ();
2050#endif 2074#endif
2051 2075
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2077
2054 /* 2078 /*
2055 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2056 */ 2080 */
2057 { 2081 {
2058 unsigned char setoldcursor;
2059
2060#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2083 if (hidden_cursor)
2062 showcursor = 0; 2084 showcursor = 0;
2063#endif 2085#endif
2064 2086
… …
2067 int col = screen.cur.col; 2089 int col = screen.cur.col;
2068 2090
2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2070 col--; 2092 col--;
2071 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2072 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2073 2101
2074#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2078 else 2105 else
2079#endif 2106#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2092 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2093#else 2120#else
2094 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2095#endif 2122#endif
2096 2123
2097 if (focus) 2124 if (focus && cursor_type == 0)
2098 { 2125 {
2099 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2100 *crp ^= RS_Uline; 2127
2101 else
2102 {
2103 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2104 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2105 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2106 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2107 } 2133 }
2108 } 2134 }
2109 2135
2110 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2111 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2112 if (ocrow != -1) 2138 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2139
2140 // save the current cursor coordinates if the cursor is visible
2141 // and either the window is unfocused or the cursor style is
2142 // underline or vertical bar, so as to clear the outline cursor in
2143 // the next refresh if the cursor moves or becomes invisible
2144 if (showcursor && (!focus || cursor_type != 0) && screen.cur.row - view_start < nrow)
2113 { 2145 {
2114 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2115 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2116 {
2117 if (ocrow < nrow
2118 && oldcursor.col < ncol)
2119 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2120
2121 if (focus || !showcursor)
2122 oldcursor.row = -1;
2123 else
2124 setoldcursor = 1;
2125 }
2126 } 2148 }
2127 else if (!focus) 2149 else
2128 setoldcursor = 1;
2129
2130 if (setoldcursor)
2131 {
2132 if (screen.cur.row - view_start >= nrow)
2133 oldcursor.row = -1; 2150 oldcursor.row = -1;
2134 else
2135 {
2136 oldcursor.row = screen.cur.row - view_start;
2137 oldcursor.col = screen.cur.col;
2138 }
2139 }
2140 } 2151 }
2141 2152
2142#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2154 /*
2144 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
… …
2150 { 2161 {
2151 int16_t nits; 2162 int16_t nits;
2152 int i = num_scr; 2163 int i = num_scr;
2153 int j; 2164 int j;
2154 int len, wlen; 2165 int len, wlen;
2155 dLocal (int, num_scr);
2156 2166
2157 j = nrow; 2167 j = nrow;
2158 wlen = len = -1; 2168 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2160 2170
… …
2226 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2227 2237
2228 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2229 { 2239 {
2230 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2231 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2232 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2233 || (stp[col] == ' ' /* space w/ no background change */
2234 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2235 continue; 2242 continue;
2236 2243
2237 // redraw one or more characters 2244 // redraw one or more characters
2238 2245
2239 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2247 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2248 --col;
2242 2249
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2251 text_t *text = stp + col;
2245 int count = 1; 2252 int count = 1;
… …
2283 2290
2284 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2286 2293
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2295 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2296 count++, i--;
2290 2297
2291 /* 2298 /*
2292 * Determine the attributes for the string 2299 * Determine the attributes for the string
2293 */ 2300 */
2294 int fore = fgcolor_of (rend); // desired foreground 2301 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2302 int back = bgcolor_of (rend); // desired background
2296 2303
2297 // only do special processing if any attributes are set, which is unlikely 2304 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2305 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2306 {
2300 bool invert = rend & RS_RVid; 2307 bool invert = rend & RS_RVid;
2301 2308
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2309#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2310 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2399 /*
2393 * Actually do the drawing of the string here 2400 * Actually do the drawing of the string here
2394 */ 2401 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2402 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2403
2397 if (expect_true (have_bg && back == Color_bg)) 2404 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2405 {
2399 // this is very ugly, maybe push it into ->draw? 2406 // this is very ugly, maybe push it into ->draw?
2400 2407
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2408 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2409 if (text[i] != ' ')
… …
2409 did_clear: ; 2416 did_clear: ;
2410 } 2417 }
2411 else 2418 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2420
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 2422 {
2423 if (showcursor && focus && row == screen.cur.row
2424 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2425 XSetForeground (dpy, gc, pix_colors[ccol1]);
2426 else
2416#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2430 else
2420#endif 2431#endif
… …
2432 */ 2443 */
2433 if (showcursor) 2444 if (showcursor)
2434 { 2445 {
2435 if (focus) 2446 if (focus)
2436 { 2447 {
2437 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2438 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2439 else 2450 else if (oldcursor.row >= 0)
2440 { 2451 {
2441 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2442#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2443 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2444#endif 2455 Col2Pixel (cur_col),
2456 Row2Pixel (oldcursor.row + 1) - 2,
2457 Width2Pixel (1),
2458 2);
2459 else
2460 XFillRectangle (dpy, vt, gc,
2461 Col2Pixel (cur_col),
2462 Row2Pixel (oldcursor.row),
2463 2,
2464 Height2Pixel (1));
2445 } 2465 }
2446 } 2466 }
2447 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2448 { 2468 {
2449 int cursorwidth = 1;
2450 int col = oldcursor.col;
2451
2452 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2453 col--;
2454
2455 while (col + cursorwidth < ncol
2456 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2457 cursorwidth++;
2458
2459#ifndef NO_CURSORCOLOR
2460 if (ISSET_PIXCOLOR (Color_cursor))
2461 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2462 else
2463#endif
2464 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2465 2470
2466 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2468 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2476 }
2472 } 2477 }
2473 2478
2474 /* 2479 /*
2475 * H: cleanup selection 2480 * H: cleanup selection
… …
2484 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2485 num_scr = 0; 2490 num_scr = 0;
2486 num_scr_allow = 1; 2491 num_scr_allow = 1;
2487} 2492}
2488 2493
2489void 2494void ecb_cold
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2496{
2492 if (!l.t) 2497 if (!l.valid ())
2493 return; 2498 return;
2494 2499
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2500 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2501
2497 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2498 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2503 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2499} 2504}
2500 2505
2501void 2506void ecb_cold
2502rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2503{ 2508{
2504 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2505 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2506 2511
… …
2509 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2510 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2511 } 2516 }
2512} 2517}
2513 2518
2514void 2519void ecb_cold
2515rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2516{ 2521{
2517 bool transparent = false; 2522 bool transparent = false;
2518 2523
2519#ifdef HAVE_BG_PIXMAP 2524#ifdef HAVE_IMG
2520 if (bg_pixmap != None) 2525 if (bg_img != 0)
2521 { 2526 {
2522# ifdef ENABLE_TRANSPARENCY 2527# if ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT) 2528 if (bg_flags & BG_IS_TRANSPARENT)
2524 { 2529 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527 2532
2528 transparent = true; 2533 transparent = true;
2529 } 2534 }
2530 else 2535 else
2531# endif 2536# endif
2532 { 2537 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2535 } 2540 }
2536 } 2541 }
2537 else 2542 else
2538#endif 2543#endif
2539 { 2544 {
… …
2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 } 2547 }
2543 2548
2544 XClearWindow (dpy, parent); 2549 XClearWindow (dpy, parent);
2545 2550
2546 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2547 { 2552 {
2548 if (transparent) 2553 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else 2555 else
2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2552 scrollBar.state = STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2553 scrollBar.show (0); 2558 scrollBar.show (0);
2554 } 2559 }
2555 2560
2556 if (refresh) 2561 if (refresh)
2557 { 2562 {
… …
2622 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2623 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2624} 2629}
2625 2630
2626/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2627void 2632void ecb_hot
2628rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2629{ 2634{
2630 if (selection.op 2635 if (selection.op
2631 && current_screen == selection.screen 2636 && current_screen == selection.screen
2632 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
… …
2651 */ 2656 */
2652#if 0 2657#if 0
2653void 2658void
2654rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2655{ 2660{
2656 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2657 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2658 const char r1[] = "\n";
2659
2660 for (row = saveLines + top_row;
2661 row < saveLines + nrow - 1; row++)
2662 {
2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2664 : ncol;
2665 for (towrite = width; towrite; towrite -= wrote)
2666 {
2667 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2668 towrite);
2669 if (wrote < 0)
2670 return; /* XXX: death, no report */
2671 }
2672 if (row_buf[row].l >= 0)
2673 if (write (fd, r1, 1) <= 0)
2674 return; /* XXX: death, no report */
2675 }
2676} 2663}
2677#endif 2664#endif
2678 2665
2679/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2680 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2681 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2682void 2669void
2683rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2684{ 2671{
2685 row_col_t pos;
2686
2687 if (!selection.op) 2672 if (!selection.op)
2688 return; 2673 return;
2689 2674
2690 pos.row = pos.col = 0;
2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2694 || (check_more == 1 2678 || (check_more == 1
2695 && current_screen == selection.screen 2679 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698 || (check_more == 2
2699 && ROWCOL_IS_BEFORE (selection.beg, pos)
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 3
2702 && ROWCOL_IS_AFTER (selection.end, pos))
2703 || (check_more == 4 /* screen width change */
2704 && (selection.beg.row != selection.end.row
2705 || selection.end.col > ncol)))
2706 CLEAR_SELECTION (); 2682 CLEAR_ALL_SELECTION ();
2683}
2684
2685void
2686rxvt_term::selection_changed () NOTHROW
2687{
2688 line_t &r1 = ROW (selection.beg.row);
2689 while (selection.beg.col < r1.l && r1.t [selection.beg.col] == NOCHAR)
2690 ++selection.beg.col;
2691
2692 line_t &r2 = ROW (selection.end.row);
2693 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2694 ++selection.end.col;
2695
2696 want_refresh = 1;
2707} 2697}
2708 2698
2709/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2710/* 2700/*
2711 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2717 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2718 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2719 data[i] = C0_CR; 2709 data[i] = C0_CR;
2720 2710
2721 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2723 2713
2724 tt_write (data, len); 2714 tt_write (data, len);
2725 2715
2726 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2728} 2718}
2729 2719
2730void 2720void
2731rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2732{ 2722{
… …
2952/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2953/* 2943/*
2954 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
2955 * EXT: button 1 press 2945 * EXT: button 1 press
2956 */ 2946 */
2957void 2947void ecb_cold
2958rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2959{ 2949{
2960 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2961 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2962 2952
… …
2981 2971
2982/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2983/* 2973/*
2984 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2985 */ 2975 */
2986void 2976void ecb_cold
2987rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2988{ 2978{
2989 want_refresh = 1; 2979 want_refresh = 1;
2990 2980
2991 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3014 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3015 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3016 */ 3006 */
3017 3007
3018/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3019#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3020 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3021#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3022 3012
3023void 3013void ecb_cold
3024rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3025{ 3015{
3026 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3027 row_col_t bound; 3017 row_col_t bound;
3028 text_t *stp; 3018 text_t *stp;
… …
3102 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3103 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3104 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3105 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3106 */ 3096 */
3107void 3097void ecb_cold
3108rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3109{ 3099{
3110 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3111 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3112 3102
… …
3138 3128
3139/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3140/* 3130/*
3141 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3142 */ 3132 */
3143void 3133void ecb_cold
3144rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3145{ 3135{
3146 row_col_t pos; 3136 row_col_t pos;
3147 enum { 3137 enum {
3148 LEFT, RIGHT 3138 LEFT, RIGHT
3149 } closeto = RIGHT; 3139 } closeto = RIGHT;
3150
3151 want_refresh = 1;
3152 3140
3153 switch (selection.op) 3141 switch (selection.op)
3154 { 3142 {
3155 case SELECTION_INIT: 3143 case SELECTION_INIT:
3156 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
… …
3336 3324
3337#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3338 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3339 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3340#endif 3328#endif
3329
3330 selection_changed ();
3341} 3331}
3342 3332
3343#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3344void 3334void ecb_cold
3345rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3346{ 3336{
3347 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3348 text_t *stp; 3338 text_t *stp;
3349 3339
… …
3387/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3388/* 3378/*
3389 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3390 * EXT: button 3 double click 3380 * EXT: button 3 double click
3391 */ 3381 */
3392void 3382void ecb_cold
3393rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3394{ 3384{
3395 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3396 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3397} 3387}
… …
3399/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3400/* 3390/*
3401 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3402 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3403 */ 3393 */
3404void 3394void ecb_cold
3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3406{ 3396{
3407 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3408 XSelectionEvent ev; 3398 XSelectionEvent ev;
3409 3399
… …
3542 3532
3543 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3544} 3534}
3545 3535
3546/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3547#ifdef USE_XIM 3537#if USE_XIM
3548void 3538void ecb_cold
3549rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3550{ 3540{
3551 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3552 3542
3553 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines