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

Diff Legend

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