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.386 by root, Thu Jul 7 23:15:44 2011 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /* 259 /*
200 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 261 */
202 top_row = 0; 262 top_row = 0;
203 term_start = 0; 263 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 264
219 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
245 { 291 {
246 /* 292 /*
247 * add or delete rows as appropriate 293 * add or delete rows as appropriate
248 */ 294 */
249 295
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
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
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 copy_line (drawn_buf [row], prev_drawn_buf [row]);
270 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 { 300 }
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 301
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
285 305
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 314
295 do 315 do
296 { 316 {
297 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 319 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 321
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 323 {
304 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
305 325
306 plines++; 326 plines++;
307 llen += prev_ncol; 327 llen += prev_ncol;
… …
320 340
321 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
323 { 343 {
324 qline = row_buf + qrow; 344 qline = row_buf + qrow;
325 lalloc (*qline); 345 qline->alloc (); // redundant with next line
326 qline->l = ncol; 346 qline->l = ncol;
327 qline->is_longer (1); 347 qline->is_longer (1);
328 348
329 int qcol = 0; 349 int qcol = 0;
330 350
… …
345 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
346 // least. 366 // least.
347 if (prow == ocur.row) 367 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
349 369
350 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
351 371
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 373
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 396 {
377 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
378 398
379 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
380 { 400 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
383 403
384 qline = pline; 404 copy_line (dst, src);
385 lresize (qline);
386 } 405 }
387 406
388 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 409
393 term_start = 0; 410 term_start = 0;
394 } 411 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 412
400 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 415 }
403 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
404 free (tabs); 426 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 427 tabs = (char *)rxvt_malloc (ncol);
406 428
407 for (int col = ncol; col--; ) 429 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 430 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 437 tt_winch ();
416 438
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 440}
419 441
420/* ------------------------------------------------------------------------- */ 442void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 443rxvt_term::scr_release () NOTHROW
426{ 444{
427 if (row_buf) 445 chunk_free (chunk, chunk_size);
428 { 446 chunk = 0;
429 delete talloc; talloc = 0; 447 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 448
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); 449 free (tabs);
438 tabs = 0; 450 tabs = 0;
439 }
440} 451}
441 452
442/* ------------------------------------------------------------------------- */ 453/* ------------------------------------------------------------------------- */
443/* 454/*
444 * Hard/Soft reset 455 * Hard/Soft reset
445 */ 456 */
446void 457void ecb_cold
447rxvt_term::scr_poweron () 458rxvt_term::scr_poweron ()
448{ 459{
449 scr_release (); 460 scr_release ();
461
450 prev_nrow = prev_ncol = 0; 462 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 463 rvideo_mode = false;
452 scr_soft_reset (); 464 scr_soft_reset ();
453 scr_reset (); 465 scr_reset ();
454 466
455 scr_clear (true); 467 scr_clear (true);
456 scr_refresh (); 468 scr_refresh ();
457} 469}
458 470
459void 471void ecb_cold
460rxvt_term::scr_soft_reset () 472rxvt_term::scr_soft_reset () NOTHROW
461{ 473{
462 /* only affects modes, nothing drastic such as clearing the screen */ 474 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 475#if ENABLE_OVERLAY
464 scr_overlay_off (); 476 scr_overlay_off ();
465#endif 477#endif
… …
520 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
522} 534}
523 535
524void 536void
525rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
526{ 538{
527 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
528 return; 540 return;
529 541
530 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
549 return; 561 return;
550 562
551 want_refresh = 1; 563 want_refresh = 1;
552 view_start = 0; 564 view_start = 0;
553 565
554 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
555 572
556 current_screen = scrn; 573 current_screen = scrn;
557 574
558#if NSCREENS 575#if NSCREENS
559 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
… …
625/* 642/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 644 * count positive ==> scroll up
628 * count negative ==> scroll down 645 * count negative ==> scroll down
629 */ 646 */
630int 647int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 649{
633 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
634 return 0; 651 return 0;
635 652
… …
638 655
639 if (count > 0 656 if (count > 0
640 && row1 == 0 657 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 658 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 659 {
643 min_it (count, row2 - total_rows); 660 min_it (count, total_rows - (nrow - (row2 + 1)));
644 661
645 top_row = max (top_row - count, -saveLines); 662 top_row = max (top_row - count, -saveLines);
646
647 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows;
649 663
650 // sever bottommost line 664 // sever bottommost line
651 { 665 {
652 line_t &l = ROW(row2 - count); 666 line_t &l = ROW(row2);
653 l.is_longer (0); 667 l.is_longer (0);
654 l.touch (); 668 l.touch ();
655 } 669 }
656 670
671 // scroll everything up 'count' lines
672 term_start = (term_start + count) % total_rows;
673
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
657 // erase newly scrolled-in lines 686 // erase newly scrolled-in lines
658 for (int i = count; i--; ) 687 for (int i = count; i--; )
659 { 688 {
660 line_t &l = ROW(nrow - 1 - i); 689 line_t &l = ROW(row2 - i);
661 690
662 // optimise if already cleared, can be significant on slow machines 691 // optimise if already cleared, can be significant on slow machines
663 // could be rolled into scr_blank_screen_mem 692 // could be rolled into scr_blank_screen_mem
664 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 693 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
665 { 694 {
… …
669 } 698 }
670 else 699 else
671 scr_blank_screen_mem (l, rstyle); 700 scr_blank_screen_mem (l, rstyle);
672 } 701 }
673 702
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
686 // move and/or clear selection, if any 703 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 704 if (selection.op && current_screen == selection.screen
705 && selection.beg.row <= row2)
688 { 706 {
689 selection.beg.row -= count; 707 selection.beg.row -= count;
690 selection.end.row -= count; 708 selection.end.row -= count;
691 selection.mark.row -= count; 709 selection.mark.row -= count;
692 710
693 if (selection.beg.row < top_row 711 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 712 }
701 713
702 // finally move the view window, if desired 714 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 715 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 716 && view_start != 0
… …
734 } 746 }
735 747
736 // use a simple and robust scrolling algorithm, this 748 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 749 // part of scr_scroll_text is not time-critical.
738 750
751 // sever line above scroll region
752 if (row1)
753 {
754 line_t &l = ROW(row1 - 1);
755 l.is_longer (0);
756 l.touch ();
757 }
758
739 int rows = row2 - row1 + 1; 759 int rows = row2 - row1 + 1;
740 760
741 min_it (count, rows); 761 min_it (count, rows);
742 762
743 line_t *temp_buf = row_buf + total_rows; 763 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 764
745 for (int row = 0; row < rows; row++) 765 for (int row = 0; row < rows; row++)
746 { 766 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 767 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 768
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 770 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 771 }
752 772
753 for (int row = 0; row < rows; row++) 773 for (int row = 0; row < rows; row++)
754 ROW(row1 + row) = temp_buf [row]; 774 ROW(row1 + row) = temp_buf [row];
775
776 // sever bottommost line
777 {
778 line_t &l = ROW(row2);
779 l.is_longer (0);
780 l.touch ();
781 }
755 } 782 }
756 783
757 return count; 784 return count;
758} 785}
759 786
760/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
761/* 788/*
762 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
763 */ 790 */
764void 791void ecb_hot
765rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
766{ 793{
767 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
768 return; 795 return;
769 796
770 unsigned char checksel; 797 bool checksel;
771 unicode_t c; 798 unicode_t c;
772 int ncol = this->ncol; 799 int ncol = this->ncol;
773 const wchar_t *strend = str + len; 800 const wchar_t *strend = str + len;
774 801
775 want_refresh = 1; 802 want_refresh = 1;
… …
1119 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1120 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1121 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1122 */ 1149 */
1123#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1124void 1151void ecb_cold
1125rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1126{ 1153{
1127 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1128 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1129 else 1156 else
… …
1136 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1137 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1138 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1139 */ 1166 */
1140#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1141void 1168void ecb_cold
1142rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1143{ 1170{
1144 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1145 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1146 else 1173 else
… …
1297 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1298} 1325}
1299 1326
1300/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1301/* 1328/*
1302 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1303 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306 */ 1333 */
1307void 1334void
… …
1316 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1317 1344
1318 switch (mode) 1345 switch (mode)
1319 { 1346 {
1320 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1321 selection_check (1);
1322 scr_erase_line (0); 1348 scr_erase_line (0);
1323 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1324 num = nrow - row; 1350 num = nrow - row;
1325 break; 1351 break;
1326 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1327 selection_check (3);
1328 scr_erase_line (1); 1353 scr_erase_line (1);
1329 row = 0; 1354 row = 0;
1330 num = screen.cur.row; 1355 num = screen.cur.row;
1331 break; 1356 break;
1332 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1333 selection_check (3);
1334 row = 0; 1358 row = 0;
1335 num = nrow; 1359 num = nrow;
1336 break; 1360 break;
1337 default: 1361 default:
1338 return; 1362 return;
… …
1355 { 1379 {
1356 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1357 1381
1358 if (mapped) 1382 if (mapped)
1359 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1361 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1362 } 1386 }
1363 else 1387 else
1364 { 1388 {
1365 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1368 { 1392 {
1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start), 1396 0, Row2Pixel (row - view_start),
1373 (unsigned int)width, 1397 (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1375 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1376 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 } 1401 }
1378 } 1402 }
… …
1400/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1401/* 1425/*
1402 * Fill the screen with `E's 1426 * Fill the screen with `E's
1403 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1404 */ 1428 */
1405void 1429void ecb_cold
1406rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1407{ 1431{
1408 rend_t fs; 1432 rend_t fs;
1409 1433
1410 want_refresh = 1; 1434 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1412 1436
1413 num_scr_allow = 0; 1437 num_scr_allow = 0;
1414 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1415 1443
1416 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1418 { 1446 {
1419 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1570/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1571/* 1599/*
1572 * Set the scrolling region 1600 * Set the scrolling region
1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574 */ 1602 */
1575void 1603void ecb_cold
1576rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1577{ 1605{
1578 max_it (top, 0); 1606 max_it (top, 0);
1579 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1580 1608
… …
1590/* 1618/*
1591 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1592 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594 */ 1622 */
1595void 1623void ecb_cold
1596rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1597{ 1625{
1598 want_refresh = 1; 1626 want_refresh = 1;
1599 1627
1600 if (mode) 1628 if (mode)
… …
1607/* 1635/*
1608 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1609 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611 */ 1639 */
1612void 1640void ecb_cold
1613rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1614{ 1642{
1615 if (mode) 1643 if (mode)
1616 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1617 else 1645 else
… …
1626 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1627 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1628 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630 */ 1658 */
1631void 1659void ecb_cold
1632rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1633{ 1661{
1634 if (mode) 1662 if (mode)
1635 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1636 else 1664 else
… …
1643/* 1671/*
1644 * Set insert/replace mode 1672 * Set insert/replace mode
1645 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647 */ 1675 */
1648void 1676void ecb_cold
1649rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1650{ 1678{
1651 if (mode) 1679 if (mode)
1652 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1653 else 1681 else
… …
1659 * Set/Unset tabs 1687 * Set/Unset tabs
1660 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1661 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663 */ 1691 */
1664void 1692void ecb_cold
1665rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1666{ 1694{
1667 if (mode < 0) 1695 if (mode < 0)
1668 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1669 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1688 if (rvideo_state != on) 1716 if (rvideo_state != on)
1689 { 1717 {
1690 rvideo_state = on; 1718 rvideo_state = on;
1691 1719
1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1694 if (bg_pixmap == None) 1722 if (bg_img == 0)
1695#endif 1723#endif
1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697 1725
1698 XGCValues gcvalue; 1726 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1708/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1709/* 1737/*
1710 * Report current cursor position 1738 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1740 */
1713void 1741void ecb_cold
1714rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1715{ 1743{
1716 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717} 1745}
1718 1746
… …
1721 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1722 1750
1723/* 1751/*
1724 * Set font style 1752 * Set font style
1725 */ 1753 */
1726void 1754void ecb_cold
1727rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1728{ 1756{
1729#if 0 1757#if 0
1730 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1731 { 1759 {
… …
1753 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1754 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1755 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1756 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1757 */ 1785 */
1758void 1786void ecb_cold
1759rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1760{ 1788{
1761 screen.charset = set; 1789 screen.charset = set;
1762 set_font_style (); 1790 set_font_style ();
1763} 1791}
… …
1784 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1785 1813
1786/* 1814/*
1787 * refresh matching text. 1815 * refresh matching text.
1788 */ 1816 */
1789bool 1817bool ecb_cold
1790rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1791{ 1819{
1792 bool found = false; 1820 bool found = false;
1793 1821
1794 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1813 PART_BEG = 0, 1841 PART_BEG = 0,
1814 PART_END, 1842 PART_END,
1815 RC_COUNT 1843 RC_COUNT
1816}; 1844};
1817 1845
1818void 1846void ecb_hot
1819rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1820{ 1848{
1821 int i; 1849 int i;
1822 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1823 1851
… …
1860 * Refresh the entire screen 1888 * Refresh the entire screen
1861 */ 1889 */
1862void 1890void
1863rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1864{ 1892{
1865 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1866} 1894}
1867 1895
1868/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1869/* 1897/*
1870 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950#endif 1978#endif
1951} 1979}
1952 1980
1953/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1954void 1982void ecb_cold
1955rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1956{ 1984{
1957#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1958 int nrows, row_start; 1986 int nrows, row_start;
1959 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
2008/* 2036/*
2009 * Refresh the screen 2037 * Refresh the screen
2010 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
2011 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
2012 */ 2040 */
2013void 2041void ecb_hot
2014rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2015{ 2043{
2016 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2017 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2018 int i; /* tmp */ 2046 int i; /* tmp */
2019#ifndef NO_CURSORCOLOR
2020 rend_t cc1; /* store colours at cursor position (s) */
2021#endif
2022 rend_t *crp; // cursor rendition pointer
2023 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2024 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2025 2051
2026 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2027 2053
2028 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2029 return; 2055 return;
… …
2032 * A: set up vars 2058 * A: set up vars
2033 */ 2059 */
2034 refresh_count = 0; 2060 refresh_count = 0;
2035 2061
2036 unsigned int old_screen_flags = screen.flags; 2062 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0; 2063 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2039 have_bg = bg_pixmap != None; 2065 have_bg = bg_img != 0;
2040#endif 2066#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2068
2043 /* 2069 /*
2044 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2074 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY 2075#if ENABLE_OVERLAY
2050 scr_swap_overlay (); 2076 scr_swap_overlay ();
2051#endif 2077#endif
2052 2078
2053 char showcursor = screen.flags & Screen_VisibleCursor; 2079 bool showcursor = screen.flags & Screen_VisibleCursor;
2054 2080
2055 /* 2081 /*
2056 * C: set the cursor character (s) 2082 * C: set the cursor character (s)
2057 */ 2083 */
2058 { 2084 {
2059 unsigned char setoldcursor; 2085 bool setoldcursor;
2060 2086
2061#ifdef CURSOR_BLINK 2087#ifdef CURSOR_BLINK
2062 if (hidden_cursor) 2088 if (hidden_cursor)
2063 showcursor = 0; 2089 showcursor = 0;
2064#endif 2090#endif
… …
2068 int col = screen.cur.col; 2094 int col = screen.cur.col;
2069 2095
2070 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2071 col--; 2097 col--;
2072 2098
2073 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2074 2101
2075#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2076 cc1 = *crp & (RS_fgMask | RS_bgMask);
2077 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2078 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2079 else 2105 else
2080#endif 2106#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2095 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2096#endif 2122#endif
2097 2123
2098 if (focus) 2124 if (focus)
2099 { 2125 {
2126 rend_t rend = cur_rend;
2127
2100 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2101 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2102 else 2130 else
2103 { 2131 {
2104 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2105 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2106 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2107 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2108 } 2138 }
2109 } 2139 }
2110 2140
2111 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2112 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2151 { 2181 {
2152 int16_t nits; 2182 int16_t nits;
2153 int i = num_scr; 2183 int i = num_scr;
2154 int j; 2184 int j;
2155 int len, wlen; 2185 int len, wlen;
2156 dLocal (int, num_scr);
2157 2186
2158 j = nrow; 2187 j = nrow;
2159 wlen = len = -1; 2188 wlen = len = -1;
2160 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2161 2190
… …
2432 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2433 */ 2462 */
2434 if (showcursor) 2463 if (showcursor)
2435 { 2464 {
2436 if (focus) 2465 if (focus)
2437 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2438 if (option (Opt_cursorUnderline))
2439 *crp ^= RS_Uline;
2440 else
2441 {
2442 *crp ^= RS_RVid;
2443#ifndef NO_CURSORCOLOR
2444 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2445#endif
2446 }
2447 }
2448 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2449 { 2468 {
2450 int cursorwidth = 1; 2469 int cursorwidth = 1;
2451 int col = oldcursor.col; 2470 int col = oldcursor.col;
2452 2471
… …
2466 2485
2467 XDrawRectangle (dpy, vt, gc, 2486 XDrawRectangle (dpy, vt, gc,
2468 Col2Pixel (col), 2487 Col2Pixel (col),
2469 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2470 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2472 } 2491 }
2473 } 2492 }
2474 2493
2475 /* 2494 /*
2476 * H: cleanup selection 2495 * H: cleanup selection
… …
2485 screen.flags = old_screen_flags; 2504 screen.flags = old_screen_flags;
2486 num_scr = 0; 2505 num_scr = 0;
2487 num_scr_allow = 1; 2506 num_scr_allow = 1;
2488} 2507}
2489 2508
2490void 2509void ecb_cold
2491rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2492{ 2511{
2493 if (!l.t) 2512 if (!l.valid ())
2494 return; 2513 return;
2495 2514
2496 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2497 2516
2498 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2499 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2519}
2501 2520
2502void 2521void ecb_cold
2503rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2504{ 2523{
2505 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2506 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2507 2526
… …
2510 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2512 } 2531 }
2513} 2532}
2514 2533
2515void 2534void ecb_cold
2516rxvt_term::scr_recolour (bool refresh) NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2517{ 2536{
2518 bool transparent = false; 2537 bool transparent = false;
2519 2538
2520#ifdef HAVE_BG_PIXMAP 2539#ifdef HAVE_IMG
2521 if (bg_pixmap != None) 2540 if (bg_img != 0)
2522 { 2541 {
2523# ifdef ENABLE_TRANSPARENCY 2542# if ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT) 2543 if (bg_flags & BG_IS_TRANSPARENT)
2525 { 2544 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528 2547
2529 transparent = true; 2548 transparent = true;
2530 } 2549 }
2531 else 2550 else
2532# endif 2551# endif
2533 { 2552 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2536 } 2555 }
2537 } 2556 }
2538 else 2557 else
2539#endif 2558#endif
2540 { 2559 {
… …
2547 if (scrollBar.win) 2566 if (scrollBar.win)
2548 { 2567 {
2549 if (transparent) 2568 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2570 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2553 scrollBar.state = STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2573 scrollBar.show (0);
2555 } 2574 }
2556 2575
2557 if (refresh) 2576 if (refresh)
2558 { 2577 {
… …
2623 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2625} 2644}
2626 2645
2627/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2628void 2647void ecb_hot
2629rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2630{ 2649{
2631 if (selection.op 2650 if (selection.op
2632 && current_screen == selection.screen 2651 && current_screen == selection.screen
2633 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
… …
2652 */ 2671 */
2653#if 0 2672#if 0
2654void 2673void
2655rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2656{ 2675{
2657 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2658 unsigned int width, towrite; 2677 // relevant code in scr_printscreen
2659 const char r1[] = "\n";
2660
2661 for (row = saveLines + top_row;
2662 row < saveLines + nrow - 1; row++)
2663 {
2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2665 : ncol;
2666 for (towrite = width; towrite; towrite -= wrote)
2667 {
2668 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2669 towrite);
2670 if (wrote < 0)
2671 return; /* XXX: death, no report */
2672 }
2673 if (row_buf[row].l >= 0)
2674 if (write (fd, r1, 1) <= 0)
2675 return; /* XXX: death, no report */
2676 }
2677} 2678}
2678#endif 2679#endif
2679 2680
2680/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2681 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2683void 2684void
2684rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2686{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2687 if (!selection.op)
2689 return; 2688 return;
2690 2689
2691 pos.row = pos.col = 0;
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2693 || (check_more == 1
2696 && current_screen == selection.screen 2694 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 || (check_more == 2
2700 && ROWCOL_IS_BEFORE (selection.beg, pos)
2701 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 3
2703 && ROWCOL_IS_AFTER (selection.end, pos))
2704 || (check_more == 4 /* screen width change */
2705 && (selection.beg.row != selection.end.row
2706 || selection.end.col > ncol)))
2707 CLEAR_SELECTION (); 2697 CLEAR_ALL_SELECTION ();
2708} 2698}
2709 2699
2710/* ------------------------------------------------------------------------- */ 2700/* ------------------------------------------------------------------------- */
2711/* 2701/*
2712 * Paste a selection direct to the command fd 2702 * Paste a selection direct to the command fd
… …
2718 for (unsigned int i = 0; i < len; i++) 2708 for (unsigned int i = 0; i < len; i++)
2719 if (data[i] == C0_LF) 2709 if (data[i] == C0_LF)
2720 data[i] = C0_CR; 2710 data[i] = C0_CR;
2721 2711
2722 if (priv_modes & PrivMode_BracketPaste) 2712 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~"); 2713 tt_printf ("\x1b[200~");
2724 2714
2725 tt_write (data, len); 2715 tt_write (data, len);
2726 2716
2727 if (priv_modes & PrivMode_BracketPaste) 2717 if (priv_modes & PrivMode_BracketPaste)
2728 tt_printf ("\e[201~"); 2718 tt_printf ("\x1b[201~");
2729} 2719}
2730 2720
2731void 2721void
2732rxvt_term::paste (char *data, unsigned int len) NOTHROW 2722rxvt_term::paste (char *data, unsigned int len) NOTHROW
2733{ 2723{
… …
2953/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
2954/* 2944/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
2956 * EXT: button 1 press 2946 * EXT: button 1 press
2957 */ 2947 */
2958void 2948void ecb_cold
2959rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2960{ 2950{
2961 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
2962 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
2963 2953
… …
2982 2972
2983/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
2984/* 2974/*
2985 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
2986 */ 2976 */
2987void 2977void ecb_cold
2988rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2989{ 2979{
2990 want_refresh = 1; 2980 want_refresh = 1;
2991 2981
2992 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3019/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3021 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3023 3013
3024void 3014void ecb_cold
3025rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3026{ 3016{
3027 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3028 row_col_t bound; 3018 row_col_t bound;
3029 text_t *stp; 3019 text_t *stp;
… …
3103 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3104 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3105 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3106 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3107 */ 3097 */
3108void 3098void ecb_cold
3109rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3110{ 3100{
3111 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3112 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113 3103
… …
3139 3129
3140/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3141/* 3131/*
3142 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3143 */ 3133 */
3144void 3134void ecb_cold
3145rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3146{ 3136{
3147 row_col_t pos; 3137 row_col_t pos;
3148 enum { 3138 enum {
3149 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3340 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3341#endif 3331#endif
3342} 3332}
3343 3333
3344#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3345void 3335void ecb_cold
3346rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3347{ 3337{
3348 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3349 text_t *stp; 3339 text_t *stp;
3350 3340
… …
3388/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3389/* 3379/*
3390 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3391 * EXT: button 3 double click 3381 * EXT: button 3 double click
3392 */ 3382 */
3393void 3383void ecb_cold
3394rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3395{ 3385{
3396 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3397 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398} 3388}
… …
3400/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3401/* 3391/*
3402 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3403 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3404 */ 3394 */
3405void 3395void ecb_cold
3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3407{ 3397{
3408 Atom property = rq.property == None ? rq.target : rq.property; 3398 Atom property = rq.property == None ? rq.target : rq.property;
3409 XSelectionEvent ev; 3399 XSelectionEvent ev;
3410 3400
… …
3543 3533
3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545} 3535}
3546 3536
3547/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3548#ifdef USE_XIM 3538#if USE_XIM
3549void 3539void ecb_cold
3550rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3551{ 3541{
3552 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3553 3543
3554 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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