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.372 by sf-exg, Fri Feb 11 01:24:46 2011 UTC vs.
Revision 1.457 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
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 <pcg@goof.com> 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{
217#if ENABLE_OVERLAY
218 scr_overlay_off ();
219#endif
220
164 view_start = 0; 221 view_start = 0;
165 num_scr = 0; 222 num_scr = 0;
166 223
167 if (ncol == 0) 224 if (ncol == 0)
168 ncol = 80; 225 ncol = 80;
188 total_rows = nrow + saveLines; 245 total_rows = nrow + saveLines;
189 246
190 screen.tscroll = 0; 247 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 248 screen.bscroll = nrow - 1;
192 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
193 if (!row_buf) 258 if (!prev_row_buf)
194 { 259 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 260 top_row = 0;
199 term_start = 0; 261 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 262
215 memset (charsets, 'B', sizeof (charsets)); 263 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 264 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 265 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 266 screen.cur.row = screen.cur.col = 0;
241 { 289 {
242 /* 290 /*
243 * add or delete rows as appropriate 291 * add or delete rows as appropriate
244 */ 292 */
245 293
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 294 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 295
263 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
264 { 297 {
265 lresize (drawn_buf[row]); 298 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 299 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 300 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 301
269 for (int row = prev_nrow; row < nrow; row++) 302 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 303 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 304
278 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
279 int pend = MOD (term_start + top_row , prev_total_rows); 306 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 307 int q = total_rows; // rewrapped row
281 308
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 316 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 317
291 do 318 do
292 { 319 {
293 p = MOD (p - 1, prev_total_rows); 320 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 321 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 322 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 323 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 324
298 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 ())
299 { 326 {
300 p = MOD (p - 1, prev_total_rows); 327 p = MOD (p - 1, prev_total_rows);
301 328
302 plines++; 329 plines++;
303 llen += prev_ncol; 330 llen += prev_ncol;
316 343
317 // re-assemble the full line by destination lines 344 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 345 for (int qrow = q; qlines--; qrow++)
319 { 346 {
320 qline = row_buf + qrow; 347 qline = row_buf + qrow;
321 lalloc (*qline); 348 qline->alloc (); // redundant with next line
322 qline->l = ncol; 349 qline->l = ncol;
323 qline->is_longer (1); 350 qline->is_longer (1);
324 351
325 int qcol = 0; 352 int qcol = 0;
326 353
341 // this seems to upset applications/shells/readline 368 // this seems to upset applications/shells/readline
342 // least. 369 // least.
343 if (prow == ocur.row) 370 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 371 screen.cur.row = q - (total_rows - nrow);
345 372
346 line_t &pline = old_buf [prow]; 373 line_t &pline = prev_row_buf [prow];
347 374
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 375 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 376
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 377 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 378 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
372 { 399 {
373 // if no scrollback exists (yet), wing, instead of wrap 400 // if no scrollback exists (yet), wing, instead of wrap
374 401
375 for (int row = min (nrow, prev_nrow); row--; ) 402 for (int row = min (nrow, prev_nrow); row--; )
376 { 403 {
377 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)];
378 line_t &qline = row_buf [row]; 405 line_t &dst = row_buf [row];
379 406
380 qline = pline; 407 copy_line (dst, src);
381 lresize (qline);
382 } 408 }
383 409
384 for (int row = prev_nrow; row < nrow; row++) 410 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 411 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 412
389 term_start = 0; 413 term_start = 0;
390 } 414 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 415
396 clamp_it (screen.cur.row, 0, nrow - 1); 416 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 417 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 418 }
399 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
400 free (tabs); 429 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 430 tabs = (char *)rxvt_malloc (ncol);
402 431
403 for (int col = ncol; col--; ) 432 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 433 tabs [col] = col % TABSIZE == 0;
411 tt_winch (); 440 tt_winch ();
412 441
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 442 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 443}
415 444
416/* ------------------------------------------------------------------------- */ 445void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 446rxvt_term::scr_release () NOTHROW
422{ 447{
423 if (row_buf) 448 chunk_free (chunk, chunk_size);
424 { 449 chunk = 0;
425 delete talloc; talloc = 0; 450 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 451
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 452 free (tabs);
434 tabs = 0; 453 tabs = 0;
435 }
436} 454}
437 455
438/* ------------------------------------------------------------------------- */ 456/* ------------------------------------------------------------------------- */
439/* 457/*
440 * Hard/Soft reset 458 * Hard/Soft reset
441 */ 459 */
442void 460void ecb_cold
443rxvt_term::scr_poweron () 461rxvt_term::scr_poweron ()
444{ 462{
445 scr_release (); 463 scr_release ();
464
446 prev_nrow = prev_ncol = 0; 465 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 466 rvideo_mode = false;
448 scr_soft_reset (); 467 scr_soft_reset ();
449 scr_reset (); 468 scr_reset ();
450 469
451 scr_clear (true); 470 scr_clear (true);
452 scr_refresh (); 471 scr_refresh ();
453} 472}
454 473
455void 474void ecb_cold
456rxvt_term::scr_soft_reset () 475rxvt_term::scr_soft_reset () NOTHROW
457{ 476{
458 /* only affects modes, nothing drastic such as clearing the screen */ 477 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 478#if ENABLE_OVERLAY
460 scr_overlay_off (); 479 scr_overlay_off ();
461#endif 480#endif
516 assert (s->cur.row >= 0); 535 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 536 assert (s->cur.col >= 0);
518} 537}
519 538
520void 539void
521rxvt_term::scr_swap_screen () 540rxvt_term::scr_swap_screen () NOTHROW
522{ 541{
523 if (!option (Opt_secondaryScreen)) 542 if (!option (Opt_secondaryScreen))
524 return; 543 return;
525 544
526 for (int i = prev_nrow; i--; ) 545 for (int i = prev_nrow; i--; )
545 return; 564 return;
546 565
547 want_refresh = 1; 566 want_refresh = 1;
548 view_start = 0; 567 view_start = 0;
549 568
550 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 ();
551 575
552 current_screen = scrn; 576 current_screen = scrn;
553 577
554#if NSCREENS 578#if NSCREENS
555 if (option (Opt_secondaryScreen)) 579 if (option (Opt_secondaryScreen))
591 * Change the colour for following text 615 * Change the colour for following text
592 */ 616 */
593void 617void
594rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW 618rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
595{ 619{
596 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 620 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR24))
597 color = fgbg; 621 color = fgbg;
598 622
599 if (fgbg == Color_fg) 623 if (fgbg == Color_fg)
600 rstyle = SET_FGCOLOR (rstyle, color); 624 rstyle = SET_FGCOLOR (rstyle, color);
601 else 625 else
621/* 645/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 646 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 647 * count positive ==> scroll up
624 * count negative ==> scroll down 648 * count negative ==> scroll down
625 */ 649 */
626int 650int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 651rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 652{
629 if (count == 0 || (row1 > row2)) 653 if (count == 0 || (row1 > row2))
630 return 0; 654 return 0;
631 655
634 658
635 if (count > 0 659 if (count > 0
636 && row1 == 0 660 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 661 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 662 {
663 min_it (count, total_rows - (nrow - (row2 + 1)));
664
639 top_row = max (top_row - count, -saveLines); 665 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 666
644 // sever bottommost line 667 // sever bottommost line
645 { 668 {
646 line_t &l = ROW(row2 - count); 669 line_t &l = ROW(row2);
647 l.is_longer (0); 670 l.is_longer (0);
648 l.touch (); 671 l.touch ();
649 } 672 }
650 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
651 // erase newly scrolled-in lines 689 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 690 for (int i = count; i--; )
653 { 691 {
654 line_t &l = ROW(nrow - 1 - i); 692 line_t &l = ROW(row2 - i);
655 693
656 // optimize if already cleared, can be significant on slow machines 694 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 695 // could be rolled into scr_blank_screen_mem
658 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)))
659 { 697 {
660 scr_blank_line (l, 0, l.l, rstyle); 698 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 699 l.l = 0;
663 } 701 }
664 else 702 else
665 scr_blank_screen_mem (l, rstyle); 703 scr_blank_screen_mem (l, rstyle);
666 } 704 }
667 705
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 706 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen
708 && selection.beg.row <= row2)
682 { 709 {
683 selection.beg.row -= count; 710 selection.beg.row -= count;
684 selection.end.row -= count; 711 selection.end.row -= count;
685 selection.mark.row -= count; 712 selection.mark.row -= count;
686 713
687 if (selection.beg.row < top_row 714 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 715 }
695 716
696 // finally move the view window, if desired 717 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 718 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 719 && view_start != 0
699 && view_start != -saveLines) 720 && view_start != -saveLines)
700 scr_page (UP, count); 721 scr_page (count);
701 722
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 723 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 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));
704 } 725 }
705 else 726 else
728 } 749 }
729 750
730 // use a simple and robust scrolling algorithm, this 751 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 752 // part of scr_scroll_text is not time-critical.
732 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
733 int rows = row2 - row1 + 1; 762 int rows = row2 - row1 + 1;
734 763
735 min_it (count, rows); 764 min_it (count, rows);
736 765
737 line_t *temp_buf = row_buf + total_rows; 766 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 767
739 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
740 { 769 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 770 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 771
744 scr_blank_screen_mem (temp_buf [row], rstyle); 773 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 774 }
746 775
747 for (int row = 0; row < rows; row++) 776 for (int row = 0; row < rows; row++)
748 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 }
749 } 785 }
750 786
751 return count; 787 return count;
752} 788}
753 789
754/* ------------------------------------------------------------------------- */ 790/* ------------------------------------------------------------------------- */
755/* 791/*
756 * Add text given in <str> of length <len> to screen struct 792 * Add text given in <str> of length <len> to screen struct
757 */ 793 */
758void 794void ecb_hot
759rxvt_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
760{ 796{
761 if (len <= 0) /* sanity */ 797 if (len <= 0) /* sanity */
762 return; 798 return;
763 799
764 unsigned char checksel; 800 bool checksel;
765 unicode_t c; 801 unicode_t c;
766 int ncol = this->ncol; 802 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 803 const wchar_t *strend = str + len;
768 804
769 want_refresh = 1; 805 want_refresh = 1;
795 831
796 while (str < strend) 832 while (str < strend)
797 { 833 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 834 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 835
800 if (expect_false (c < 0x20)) 836 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 837 if (c == C0_LF)
802 { 838 {
803 max_it (line->l, screen.cur.col); 839 max_it (line->l, screen.cur.col);
804 840
805 screen.flags &= ~Screen_WrapNext; 841 screen.flags &= ~Screen_WrapNext;
824 { 860 {
825 scr_tab (1, true); 861 scr_tab (1, true);
826 continue; 862 continue;
827 } 863 }
828 864
829 if (expect_false ( 865 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 866 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 867 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 868 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 869 ))
834 { 870 {
839 * should be a similar check. 875 * should be a similar check.
840 */ 876 */
841 CLEAR_SELECTION (); 877 CLEAR_SELECTION ();
842 } 878 }
843 879
844 if (expect_false (screen.flags & Screen_WrapNext)) 880 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 881 {
846 scr_do_wrap (); 882 scr_do_wrap ();
847 883
848 line->l = ncol; 884 line->l = ncol;
849 line->is_longer (1); 885 line->is_longer (1);
851 row = screen.cur.row; 887 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 888 line = &ROW(row); /* _must_ refresh */
853 } 889 }
854 890
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 891 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 892 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 893 c = 0xfffd;
858 894
859 // 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
860 // further replacements, as wcwidth might return -1 for the line 896 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 897 // drawing characters below as they might be invalid in the current
862 // locale. 898 // locale.
863 int width = WCWIDTH (c); 899 int width = WCWIDTH (c);
864 900
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 901 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 902 {
867 // vt100 special graphics and line drawing 903 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 904 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 905 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 906 static uint16_t vt100_0[62] = { // 41 .. 7e
883 c = vt100_0[c - 0x41]; 919 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 920 width = 1; // vt100 line drawing characters are always single-width
885 } 921 }
886 } 922 }
887 923
888 if (expect_false (screen.flags & Screen_Insert)) 924 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 925 scr_insdel_chars (width, INSERT);
890 926
891 if (width != 0) 927 if (width != 0)
892 { 928 {
893#if !UNICODE_3 929#if !UNICODE_3
901#endif 937#endif
902 938
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 939 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 940
905 // if the character doesn't fit into the remaining columns... 941 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 942 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 943 {
908 if (screen.flags & Screen_Autowrap) 944 if (screen.flags & Screen_Autowrap)
909 { 945 {
910 // ... artificially enlargen the previous one 946 // ... artificially enlargen the previous one
911 c = NOCHAR; 947 c = NOCHAR;
918 954
919 // nuke the character at this position, if required 955 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 956 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 957 // we never have to check for overwriting a wide char itself,
922 // only its tail. 958 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 959 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 960 scr_kill_char (*line, screen.cur.col);
925 961
926 line->touch (); 962 line->touch ();
927 963
928 do 964 do
929 { 965 {
930 line->t[screen.cur.col] = c; 966 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 967 line->r[screen.cur.col] = rend;
932 968
933 if (expect_true (screen.cur.col < ncol - 1)) 969 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 970 screen.cur.col++;
935 else 971 else
936 { 972 {
937 line->l = ncol; 973 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 974 if (screen.flags & Screen_Autowrap)
941 goto end_of_line; 977 goto end_of_line;
942 } 978 }
943 979
944 c = NOCHAR; 980 c = NOCHAR;
945 } 981 }
946 while (expect_false (--width > 0)); 982 while (ecb_unlikely (--width > 0));
947 983
948 // pad with spaces when overwriting wide character with smaller one 984 // pad with spaces when overwriting wide character with smaller one
949 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++)
950 { 986 {
951 line->t[c] = ' '; 987 line->t[c] = ' ';
952 line->r[c] = rend; 988 line->r[c] = rend;
953 } 989 }
954 990
976 } 1012 }
977 else if (screen.cur.row > 0 1013 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ()) 1014 && ROW(screen.cur.row - 1).is_longer ())
979 { 1015 {
980 linep = &ROW(screen.cur.row - 1); 1016 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1; 1017 tp = linep->t + ncol - 1;
982 rp = line->r + ncol - 1; 1018 rp = linep->r + ncol - 1;
983 } 1019 }
984 else 1020 else
985 continue; 1021 continue;
986 1022
987 linep->touch (); 1023 linep->touch ();
1113 * XTERM_SEQ: ESC 6 1149 * XTERM_SEQ: ESC 6
1114 * 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
1115 * in that row right. Clear left column. 1151 * in that row right. Clear left column.
1116 */ 1152 */
1117#if !ENABLE_MINIMAL 1153#if !ENABLE_MINIMAL
1118void 1154void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1155rxvt_term::scr_backindex () NOTHROW
1120{ 1156{
1121 if (screen.cur.col > 0) 1157 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1158 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1159 else
1130 * XTERM_SEQ: ESC 9 1166 * XTERM_SEQ: ESC 9
1131 * 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
1132 * in that row left. Clear right column. 1168 * in that row left. Clear right column.
1133 */ 1169 */
1134#if !ENABLE_MINIMAL 1170#if !ENABLE_MINIMAL
1135void 1171void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1172rxvt_term::scr_forwardindex () NOTHROW
1137{ 1173{
1138 if (screen.cur.col < ncol - 1) 1174 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1175 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1176 else
1205 * direction should be UP or DN 1241 * direction should be UP or DN
1206 */ 1242 */
1207void 1243void
1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1244rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1209{ 1245{
1210 int dirn;
1211
1212 want_refresh = 1; 1246 want_refresh = 1;
1213 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
1214 1248
1215 dirn = ((direction == UP) ? 1 : -1);
1216
1217 screen.flags &= ~Screen_WrapNext; 1249 screen.flags &= ~Screen_WrapNext;
1218 1250
1219 if ((screen.cur.row == screen.bscroll && direction == UP) 1251 if ((screen.cur.row == screen.bscroll && direction == UP)
1220 || (screen.cur.row == screen.tscroll && direction == DN)) 1252 || (screen.cur.row == screen.tscroll && direction == DN))
1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1253 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1222 else 1254 else
1223 screen.cur.row += dirn; 1255 screen.cur.row += direction;
1224 1256
1225 clamp_it (screen.cur.row, 0, nrow - 1); 1257 clamp_it (screen.cur.row, 0, nrow - 1);
1226 selection_check (0); 1258 selection_check (0);
1227} 1259}
1228 1260
1291 scr_blank_line (line, col, num, rstyle); 1323 scr_blank_line (line, col, num, rstyle);
1292} 1324}
1293 1325
1294/* ------------------------------------------------------------------------- */ 1326/* ------------------------------------------------------------------------- */
1295/* 1327/*
1296 * Erase part of whole of the screen 1328 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1329 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1330 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1331 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1332 */
1301void 1333void
1310 ZERO_SCROLLBACK (); 1342 ZERO_SCROLLBACK ();
1311 1343
1312 switch (mode) 1344 switch (mode)
1313 { 1345 {
1314 case 0: /* erase to end of screen */ 1346 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1347 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1348 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1349 num = nrow - row;
1319 break; 1350 break;
1320 case 1: /* erase to beginning of screen */ 1351 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1352 scr_erase_line (1);
1323 row = 0; 1353 row = 0;
1324 num = screen.cur.row; 1354 num = screen.cur.row;
1325 break; 1355 break;
1326 case 2: /* erase whole screen */ 1356 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1357 row = 0;
1329 num = nrow; 1358 num = nrow;
1330 break; 1359 break;
1331 default: 1360 default:
1332 return; 1361 return;
1349 { 1378 {
1350 ren = DEFAULT_RSTYLE; 1379 ren = DEFAULT_RSTYLE;
1351 1380
1352 if (mapped) 1381 if (mapped)
1353 XClearArea (dpy, vt, 0, 1382 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1383 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1384 (unsigned int)Height2Pixel (num), False);
1356 } 1385 }
1357 else 1386 else
1358 { 1387 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1388 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 { 1391 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1392 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1394 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1395 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1396 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1397 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1398 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1400 }
1372 } 1401 }
1394/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1395/* 1424/*
1396 * Fill the screen with `E's 1425 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1426 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1427 */
1399void 1428void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1429rxvt_term::scr_E () NOTHROW
1401{ 1430{
1402 rend_t fs; 1431 rend_t fs;
1403 1432
1404 want_refresh = 1; 1433 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1434 ZERO_SCROLLBACK ();
1406 1435
1407 num_scr_allow = 0; 1436 num_scr_allow = 0;
1408 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 ();
1409 1442
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1443 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1444 for (int row = nrow; row--; )
1412 { 1445 {
1413 line_t &line = ROW(row); 1446 line_t &line = ROW(row);
1564/* ------------------------------------------------------------------------- */ 1597/* ------------------------------------------------------------------------- */
1565/* 1598/*
1566 * Set the scrolling region 1599 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1600 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1601 */
1569void 1602void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1603rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571{ 1604{
1572 max_it (top, 0); 1605 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1606 min_it (bot, nrow - 1);
1574 1607
1584/* 1617/*
1585 * Make the cursor visible/invisible 1618 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1619 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1620 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1621 */
1589void 1622void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1623rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591{ 1624{
1592 want_refresh = 1; 1625 want_refresh = 1;
1593 1626
1594 if (mode) 1627 if (mode)
1601/* 1634/*
1602 * Set/unset automatic wrapping 1635 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1636 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1637 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1638 */
1606void 1639void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1640rxvt_term::scr_autowrap (int mode) NOTHROW
1608{ 1641{
1609 if (mode) 1642 if (mode)
1610 screen.flags |= Screen_Autowrap; 1643 screen.flags |= Screen_Autowrap;
1611 else 1644 else
1620 * 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
1621 * and the cursor cannot be moved outside. 1654 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1655 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1656 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1657 */
1625void 1658void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1659rxvt_term::scr_relative_origin (int mode) NOTHROW
1627{ 1660{
1628 if (mode) 1661 if (mode)
1629 screen.flags |= Screen_Relative; 1662 screen.flags |= Screen_Relative;
1630 else 1663 else
1637/* 1670/*
1638 * Set insert/replace mode 1671 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1672 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1673 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1674 */
1642void 1675void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1676rxvt_term::scr_insert_mode (int mode) NOTHROW
1644{ 1677{
1645 if (mode) 1678 if (mode)
1646 screen.flags |= Screen_Insert; 1679 screen.flags |= Screen_Insert;
1647 else 1680 else
1653 * Set/Unset tabs 1686 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1687 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1688 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1689 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1690 */
1658void 1691void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1692rxvt_term::scr_set_tab (int mode) NOTHROW
1660{ 1693{
1661 if (mode < 0) 1694 if (mode < 0)
1662 memset (tabs, 0, ncol); 1695 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1696 else if (screen.cur.col < ncol)
1682 if (rvideo_state != on) 1715 if (rvideo_state != on)
1683 { 1716 {
1684 rvideo_state = on; 1717 rvideo_state = on;
1685 1718
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1719 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1720#ifdef HAVE_IMG
1688 if (bg_pixmap == None) 1721 if (bg_img == 0)
1689#endif 1722#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1723 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1724
1692 XGCValues gcvalue; 1725 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1726 gcvalue.foreground = pix_colors[Color_fg];
1702/* ------------------------------------------------------------------------- */ 1735/* ------------------------------------------------------------------------- */
1703/* 1736/*
1704 * Report current cursor position 1737 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1738 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1739 */
1707void 1740void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1741rxvt_term::scr_report_position () NOTHROW
1709{ 1742{
1710 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);
1711} 1744}
1712 1745
1715 * ------------------------------------------------------------------------- */ 1748 * ------------------------------------------------------------------------- */
1716 1749
1717/* 1750/*
1718 * Set font style 1751 * Set font style
1719 */ 1752 */
1720void 1753void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1754rxvt_term::set_font_style () NOTHROW
1722{ 1755{
1723#if 0 1756#if 0
1724 switch (charsets [screen.charset]) 1757 switch (charsets [screen.charset])
1725 { 1758 {
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1780 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1781 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1782 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1783 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1784 */
1752void 1785void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1786rxvt_term::scr_charset_choose (int set) NOTHROW
1754{ 1787{
1755 screen.charset = set; 1788 screen.charset = set;
1756 set_font_style (); 1789 set_font_style ();
1757} 1790}
1778 * ------------------------------------------------------------------------- */ 1811 * ------------------------------------------------------------------------- */
1779 1812
1780/* 1813/*
1781 * refresh matching text. 1814 * refresh matching text.
1782 */ 1815 */
1783bool 1816bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1817rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785{ 1818{
1786 bool found = false; 1819 bool found = false;
1787 1820
1788 for (int i = 0; i < nrow; i++) 1821 for (int i = 0; i < nrow; i++)
1807 PART_BEG = 0, 1840 PART_BEG = 0,
1808 PART_END, 1841 PART_END,
1809 RC_COUNT 1842 RC_COUNT
1810}; 1843};
1811 1844
1812void 1845void ecb_hot
1813rxvt_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
1814{ 1847{
1815 int i; 1848 int i;
1816 row_col_t rc[RC_COUNT]; 1849 row_col_t rc[RC_COUNT];
1817 1850
1854 * Refresh the entire screen 1887 * Refresh the entire screen
1855 */ 1888 */
1856void 1889void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1890rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1891{
1859 scr_expose (0, 0, width, height, refresh); 1892 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1893}
1861 1894
1862/* ------------------------------------------------------------------------- */ 1895/* ------------------------------------------------------------------------- */
1863/* 1896/*
1864 * 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
1865 * the top of the screen 1898 * the top of the screen
1866 */ 1899 */
1867void 1900void
1868rxvt_term::scr_move_to (int y, int len) NOTHROW 1901rxvt_term::scr_move_to (int y, int len) NOTHROW
1869{ 1902{
1870 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);
1871} 1905}
1872 1906
1873/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1874/* 1908/*
1875 * Page the screen up/down nlines 1909 * Page the screen up/down nlines
1876 * direction should be UP or DN 1910 * direction should be UP or DN
1877 */ 1911 */
1878bool 1912bool
1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1913rxvt_term::scr_page (int nlines) NOTHROW
1880{ 1914{
1881 int new_view_start =
1882 direction == UP ? view_start - nlines
1883 : view_start + nlines;
1884
1885 return scr_changeview (new_view_start); 1915 return scr_changeview (view_start - nlines);
1886} 1916}
1887 1917
1888bool 1918bool
1889rxvt_term::scr_changeview (int new_view_start) NOTHROW 1919rxvt_term::scr_changeview (int new_view_start) NOTHROW
1890{ 1920{
1920 1950
1921# ifndef NO_MAPALERT 1951# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1952# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1953 if (option (Opt_mapAlert))
1924# endif 1954# endif
1925 XMapWindow (dpy, parent[0]); 1955 XMapWindow (dpy, parent);
1926# endif 1956# endif
1927 1957
1928# if ENABLE_FRILLS 1958# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1959 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1960 set_urgency (1);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1973 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1974#endif
1945} 1975}
1946 1976
1947/* ------------------------------------------------------------------------- */ 1977/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1978void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1979rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1980{
1952#ifdef PRINTPIPE 1981#ifdef PRINTPIPE
1953 int nrows, row_start; 1982 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1983 FILE *fd = popen_printer ();
2003/* 2032/*
2004 * Refresh the screen 2033 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2034 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2035 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2036 */
2008void 2037void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2038rxvt_term::scr_refresh () NOTHROW
2010{ 2039{
2011 int16_t col, row, /* column/row we're processing */ 2040 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2041 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2042 int i; /* tmp */
2014#ifndef NO_CURSORCOLOR
2015 rend_t cc1; /* store colours at cursor position (s) */
2016#endif
2017 rend_t *crp; // cursor rendition pointer
2018 rend_t ccol1, /* Cursor colour */ 2043 rend_t ccol1, /* Cursor colour */
2019 ccol2; /* Cursor colour2 */ 2044 ccol2; /* Cursor colour2 */
2045 rend_t cur_rend;
2046 int cur_col;
2047 int cursorwidth;
2020 2048
2021 want_refresh = 0; /* screen is current */ 2049 want_refresh = 0; /* screen is current */
2022 2050
2023 if (refresh_type == NO_REFRESH || !mapped) 2051 if (refresh_type == NO_REFRESH || !mapped)
2024 return; 2052 return;
2027 * A: set up vars 2055 * A: set up vars
2028 */ 2056 */
2029 refresh_count = 0; 2057 refresh_count = 0;
2030 2058
2031 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2060 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2034 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2035#endif 2063#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2065
2038 /* 2066 /*
2039 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2073 scr_swap_overlay ();
2046#endif 2074#endif
2047 2075
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2077
2050 /* 2078 /*
2051 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2052 */ 2080 */
2053 { 2081 {
2054 unsigned char setoldcursor;
2055
2056#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2083 if (hidden_cursor)
2058 showcursor = 0; 2084 showcursor = 0;
2059#endif 2085#endif
2060 2086
2063 int col = screen.cur.col; 2089 int col = screen.cur.col;
2064 2090
2065 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2091 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066 col--; 2092 col--;
2067 2093
2094 cursorwidth = 1;
2095 while (col + cursorwidth < ncol
2096 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2097 cursorwidth++;
2098
2068 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2069 2101
2070#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2071 cc1 = *crp & (RS_fgMask | RS_bgMask);
2072 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2073 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2074 else 2105 else
2075#endif 2106#endif
2076#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2088 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2089#else 2120#else
2090 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2091#endif 2122#endif
2092 2123
2093 if (focus) 2124 if (focus && cursor_type == 0)
2094 { 2125 {
2095 if (option (Opt_cursorUnderline)) 2126 rend_t rend = cur_rend;
2096 *crp ^= RS_Uline; 2127
2097 else
2098 {
2099 *crp ^= RS_RVid; 2128 rend ^= RS_RVid;
2100 *crp = SET_FGCOLOR (*crp, ccol1); 2129 rend = SET_FGCOLOR (rend, ccol1);
2101 *crp = SET_BGCOLOR (*crp, ccol2); 2130 rend = SET_BGCOLOR (rend, ccol2);
2102 } 2131
2132 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2103 } 2133 }
2104 } 2134 }
2105 2135
2106 /* make sure no outline cursor is left around */ 2136 /* make sure no outline cursor is left around */
2107 setoldcursor = 0; 2137 if (ocrow != -1 && ocrow < nrow && oldcursor.col < ncol)
2108 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)
2109 { 2145 {
2110 if (screen.cur.row - view_start != ocrow 2146 oldcursor.row = screen.cur.row - view_start;
2111 || screen.cur.col != oldcursor.col) 2147 oldcursor.col = screen.cur.col;
2112 {
2113 if (ocrow < nrow
2114 && oldcursor.col < ncol)
2115 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2116
2117 if (focus || !showcursor)
2118 oldcursor.row = -1;
2119 else
2120 setoldcursor = 1;
2121 }
2122 } 2148 }
2123 else if (!focus) 2149 else
2124 setoldcursor = 1;
2125
2126 if (setoldcursor)
2127 {
2128 if (screen.cur.row - view_start >= nrow)
2129 oldcursor.row = -1; 2150 oldcursor.row = -1;
2130 else
2131 {
2132 oldcursor.row = screen.cur.row - view_start;
2133 oldcursor.col = screen.cur.col;
2134 }
2135 }
2136 } 2151 }
2137 2152
2138#ifndef NO_SLOW_LINK_SUPPORT 2153#ifndef NO_SLOW_LINK_SUPPORT
2139 /* 2154 /*
2140 * D: CopyArea pass - very useful for slower links 2155 * D: CopyArea pass - very useful for slower links
2146 { 2161 {
2147 int16_t nits; 2162 int16_t nits;
2148 int i = num_scr; 2163 int i = num_scr;
2149 int j; 2164 int j;
2150 int len, wlen; 2165 int len, wlen;
2151 dLocal (int, num_scr);
2152 2166
2153 j = nrow; 2167 j = nrow;
2154 wlen = len = -1; 2168 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2169 row = i > 0 ? 0 : j - 1;
2156 2170
2222 int ypixel = (int)Row2Pixel (row); 2236 int ypixel = (int)Row2Pixel (row);
2223 2237
2224 for (col = 0; col < ncol; col++) 2238 for (col = 0; col < ncol; col++)
2225 { 2239 {
2226 /* compare new text with old - if exactly the same then continue */ 2240 /* compare new text with old - if exactly the same then continue */
2227 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2241 if (stp[col] == dtp[col] && RS_SAME (srp[col], drp[col]))
2228 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2229 || (stp[col] == ' ' /* space w/ no background change */
2230 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2231 continue; 2242 continue;
2232 2243
2233 // redraw one or more characters 2244 // redraw one or more characters
2234 2245
2235 // seek to the beginning of wide characters 2246 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2247 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2248 --col;
2238 2249
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2250 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2251 text_t *text = stp + col;
2241 int count = 1; 2252 int count = 1;
2279 2290
2280 col--; /* went one too far. move back */ 2291 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2292 count -= i; /* dump any matching trailing chars */
2282 2293
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2294 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2295 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2296 count++, i--;
2286 2297
2287 /* 2298 /*
2288 * Determine the attributes for the string 2299 * Determine the attributes for the string
2289 */ 2300 */
2290 int fore = fgcolor_of (rend); // desired foreground 2301 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2302 int back = bgcolor_of (rend); // desired background
2292 2303
2293 // 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
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2305 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2306 {
2296 bool invert = rend & RS_RVid; 2307 bool invert = rend & RS_RVid;
2297 2308
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2309#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2310 if (rend & RS_Bold && fore == Color_fg)
2388 /* 2399 /*
2389 * Actually do the drawing of the string here 2400 * Actually do the drawing of the string here
2390 */ 2401 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2402 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2403
2393 if (expect_true (have_bg && back == Color_bg)) 2404 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2405 {
2395 // this is very ugly, maybe push it into ->draw? 2406 // this is very ugly, maybe push it into ->draw?
2396 2407
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2408 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2409 if (text[i] != ' ')
2405 did_clear: ; 2416 did_clear: ;
2406 } 2417 }
2407 else 2418 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2419 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2420
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2421 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 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
2412#if ENABLE_FRILLS 2427#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2428 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2429 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2430 else
2416#endif 2431#endif
2428 */ 2443 */
2429 if (showcursor) 2444 if (showcursor)
2430 { 2445 {
2431 if (focus) 2446 if (focus)
2432 { 2447 {
2433 if (option (Opt_cursorUnderline)) 2448 if (cursor_type == 0)
2434 *crp ^= RS_Uline; 2449 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 else 2450 else if (oldcursor.row >= 0)
2436 { 2451 {
2437 *crp ^= RS_RVid; 2452 XSetForeground (dpy, gc, pix_colors[ccol1]);
2438#ifndef NO_CURSORCOLOR 2453 if (cursor_type == 1)
2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2454 XFillRectangle (dpy, vt, gc,
2440#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));
2441 } 2465 }
2442 } 2466 }
2443 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2444 { 2468 {
2445 int cursorwidth = 1;
2446 int col = oldcursor.col;
2447
2448 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449 col--;
2450
2451 while (col + cursorwidth < ncol
2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453 cursorwidth++;
2454
2455#ifndef NO_CURSORCOLOR
2456 if (ISSET_PIXCOLOR (Color_cursor))
2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2459#endif
2460 XSetForeground (dpy, gc, pix_colors[ccol1]); 2469 XSetForeground (dpy, gc, pix_colors[ccol1]);
2461 2470
2462 XDrawRectangle (dpy, vt, gc, 2471 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2472 Col2Pixel (cur_col),
2464 Row2Pixel (oldcursor.row), 2473 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2474 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2475 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2476 }
2468 } 2477 }
2469 2478
2470 /* 2479 /*
2471 * H: cleanup selection 2480 * H: cleanup selection
2480 screen.flags = old_screen_flags; 2489 screen.flags = old_screen_flags;
2481 num_scr = 0; 2490 num_scr = 0;
2482 num_scr_allow = 1; 2491 num_scr_allow = 1;
2483} 2492}
2484 2493
2485void 2494void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2495rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2487{ 2496{
2488 if (!l.t) 2497 if (!l.valid ())
2489 return; 2498 return;
2490 2499
2491 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
2492 2501
2493 for (int i = ncol; i--; ) 2502 for (int i = ncol; i--; )
2494 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]));
2495} 2504}
2496 2505
2497void 2506void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2507rxvt_term::scr_remap_chars () NOTHROW
2499{ 2508{
2500 for (int i = total_rows; i--; ) 2509 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2510 scr_remap_chars (row_buf [i]);
2502 2511
2505 scr_remap_chars (drawn_buf [i]); 2514 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2515 scr_remap_chars (swap_buf [i]);
2507 } 2516 }
2508} 2517}
2509 2518
2510void 2519void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2520rxvt_term::scr_recolor (bool refresh) NOTHROW
2512{ 2521{
2513 bool transparent = false; 2522 bool transparent = false;
2514 2523
2515#ifdef HAVE_BG_PIXMAP 2524#ifdef HAVE_IMG
2516 if (bg_pixmap != None) 2525 if (bg_img != 0)
2517 { 2526 {
2518# ifdef ENABLE_TRANSPARENCY 2527# if ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2528 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2529 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2530 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2531 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2532
2524 transparent = true; 2533 transparent = true;
2525 } 2534 }
2526 else 2535 else
2527# endif 2536# endif
2528 { 2537 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2539 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531 } 2540 }
2532 } 2541 }
2533 else 2542 else
2534#endif 2543#endif
2535 { 2544 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2545 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2546 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2547 }
2539 2548
2540 XClearWindow (dpy, parent[0]); 2549 XClearWindow (dpy, parent);
2541 2550
2542 if (scrollBar.win) 2551 if (scrollBar.state && scrollBar.win)
2543 { 2552 {
2544 if (transparent) 2553 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2554 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2555 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548 scrollBar.state = STATE_IDLE; 2557 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2558 scrollBar.show (0);
2550 } 2559 }
2551 2560
2552 if (refresh) 2561 if (refresh)
2553 { 2562 {
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2627 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2628 srp[col] ^= rstyle;
2620} 2629}
2621 2630
2622/* ------------------------------------------------------------------------- */ 2631/* ------------------------------------------------------------------------- */
2623void 2632void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2633rxvt_term::scr_reverse_selection () NOTHROW
2625{ 2634{
2626 if (selection.op 2635 if (selection.op
2627 && current_screen == selection.screen 2636 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2637 && selection.end.row >= view_start)
2647 */ 2656 */
2648#if 0 2657#if 0
2649void 2658void
2650rxvt_term::scr_dump (int fd) NOTHROW 2659rxvt_term::scr_dump (int fd) NOTHROW
2651{ 2660{
2652 int row, wrote; 2661 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2662 // relevant code in scr_printscreen
2654 const char r1[] = "\n";
2655
2656 for (row = saveLines + top_row;
2657 row < saveLines + nrow - 1; row++)
2658 {
2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2660 : ncol;
2661 for (towrite = width; towrite; towrite -= wrote)
2662 {
2663 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2664 towrite);
2665 if (wrote < 0)
2666 return; /* XXX: death, no report */
2667 }
2668 if (row_buf[row].l >= 0)
2669 if (write (fd, r1, 1) <= 0)
2670 return; /* XXX: death, no report */
2671 }
2672} 2663}
2673#endif 2664#endif
2674 2665
2675/* ------------------------------------------------------------------------- * 2666/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2667 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2668 * ------------------------------------------------------------------------- */
2678void 2669void
2679rxvt_term::selection_check (int check_more) NOTHROW 2670rxvt_term::selection_check (int check_more) NOTHROW
2680{ 2671{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2672 if (!selection.op)
2684 return; 2673 return;
2685 2674
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2675 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2676 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2677 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2678 || (check_more == 1
2691 && current_screen == selection.screen 2679 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2680 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2681 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2694 || (check_more == 2
2695 && ROWCOL_IS_BEFORE (selection.beg, pos)
2696 && ROWCOL_IS_AFTER (selection.end, pos))
2697 || (check_more == 3
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 4 /* screen width change */
2700 && (selection.beg.row != selection.end.row
2701 || selection.end.col > ncol)))
2702 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;
2703} 2697}
2704 2698
2705/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2706/* 2700/*
2707 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2713 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2709 data[i] = C0_CR;
2716 2710
2717 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2718 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2719 2713
2720 tt_write (data, len); 2714 tt_write (data, len);
2721 2715
2722 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2724} 2718}
2725 2719
2726void 2720void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{ 2722{
2732 tt_paste (data, len); 2726 tt_paste (data, len);
2733} 2727}
2734 2728
2735/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2736/* 2730/*
2737 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2734 * EXT: button 2 release
2744 */ 2735 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 if (data)
2750 {
2751 rxvt_term *term = (rxvt_term *)ptr;
2752 term->paste (data, len);
2753 }
2754 delete rs;
2755}
2756
2757void 2736void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2759{ 2738{
2760 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 } 2740 {
2768 else
2769 {
2770 new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2771 } 2743 }
2772} 2744}
2773 2745
2774/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2775/* 2747/*
2970/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2971/* 2943/*
2972 * 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
2973 * EXT: button 1 press 2945 * EXT: button 1 press
2974 */ 2946 */
2975void 2947void ecb_cold
2976rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2977{ 2949{
2978 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2979 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2980 2952
2999 2971
3000/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3001/* 2973/*
3002 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3003 */ 2975 */
3004void 2976void ecb_cold
3005rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3006{ 2978{
3007 want_refresh = 1; 2979 want_refresh = 1;
3008 2980
3009 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
3032 * Word select: select text for 2 clicks 3004 * Word select: select text for 2 clicks
3033 * We now only find out the boundary in one direction 3005 * We now only find out the boundary in one direction
3034 */ 3006 */
3035 3007
3036/* 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 */
3037#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3038 (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)))
3039#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3040 3012
3041void 3013void ecb_cold
3042rxvt_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
3043{ 3015{
3044 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3045 row_col_t bound; 3017 row_col_t bound;
3046 text_t *stp; 3018 text_t *stp;
3120 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3121 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3122 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3123 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3124 */ 3096 */
3125void 3097void ecb_cold
3126rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3127{ 3099{
3128 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3129 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3130 3102
3156 3128
3157/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3158/* 3130/*
3159 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3160 */ 3132 */
3161void 3133void ecb_cold
3162rxvt_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
3163{ 3135{
3164 row_col_t pos; 3136 row_col_t pos;
3165 enum { 3137 enum {
3166 LEFT, RIGHT 3138 LEFT, RIGHT
3167 } closeto = RIGHT; 3139 } closeto = RIGHT;
3168
3169 want_refresh = 1;
3170 3140
3171 switch (selection.op) 3141 switch (selection.op)
3172 { 3142 {
3173 case SELECTION_INIT: 3143 case SELECTION_INIT:
3174 CLEAR_SELECTION (); 3144 CLEAR_SELECTION ();
3354 3324
3355#if !ENABLE_MINIMAL 3325#if !ENABLE_MINIMAL
3356 if (selection.rect && selection.beg.col > selection.end.col) 3326 if (selection.rect && selection.beg.col > selection.end.col)
3357 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3358#endif 3328#endif
3329
3330 selection_changed ();
3359} 3331}
3360 3332
3361#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3362void 3334void ecb_cold
3363rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3364{ 3336{
3365 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3366 text_t *stp; 3338 text_t *stp;
3367 3339
3405/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3406/* 3378/*
3407 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3408 * EXT: button 3 double click 3380 * EXT: button 3 double click
3409 */ 3381 */
3410void 3382void ecb_cold
3411rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3412{ 3384{
3413 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3414 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3415} 3387}
3417/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3418/* 3390/*
3419 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3420 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3421 */ 3393 */
3422void 3394void ecb_cold
3423rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3424{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3398 XSelectionEvent ev;
3426 3399
3427 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3428 ev.property = None; 3401 ev.property = None;
3429 ev.display = rq.display; 3402 ev.display = rq.display;
3444 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3445#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3446 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3447#endif 3420#endif
3448 3421
3449 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3450 32, PropModeReplace, 3423 32, PropModeReplace,
3451 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3452 ev.property = rq.property; 3425 ev.property = property;
3453 } 3426 }
3454#if TODO // TODO 3427#if TODO // TODO
3455 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3456 { 3429 {
3457 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3458 } 3431 }
3459#endif 3432#endif
3460 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3461 { 3434 {
3462 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3463 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3464 ev.property = rq.property; 3437 ev.property = property;
3465 } 3438 }
3466 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3467 { 3440 {
3468 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3469 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3470 ev.property = rq.property; 3443 ev.property = property;
3471 } 3444 }
3472 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3473 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3474 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3475 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
3546 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3547 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3548 ct.encoding = target; 3521 ct.encoding = target;
3549 } 3522 }
3550 3523
3551 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3552 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3553 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3554 ev.property = rq.property; 3527 ev.property = property;
3555 3528
3556 if (freect) 3529 if (freect)
3557 XFree (ct.value); 3530 XFree (ct.value);
3558 } 3531 }
3559 3532
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3534}
3562 3535
3563/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3537#if USE_XIM
3565void 3538void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3540{
3568 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3569 3542
3570 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines