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.439 by sf-exg, Mon Mar 25 16:24:18 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 {
643 min_it (count, row2 - total_rows); 662 min_it (count, total_rows - (nrow - (row2 + 1)));
644 663
645 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
646
647 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows;
649 665
650 // sever bottommost line 666 // sever bottommost line
651 { 667 {
652 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
653 l.is_longer (0); 669 l.is_longer (0);
654 l.touch (); 670 l.touch ();
655 } 671 }
656 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
657 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
658 for (int i = count; i--; ) 689 for (int i = count; i--; )
659 { 690 {
660 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
661 692
662 // optimise if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
663 // could be rolled into scr_blank_screen_mem 694 // 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))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
665 { 696 {
… …
669 } 700 }
670 else 701 else
671 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
672 } 703 }
673 704
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 705 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
688 { 708 {
689 selection.beg.row -= count; 709 selection.beg.row -= count;
690 selection.end.row -= count; 710 selection.end.row -= count;
691 selection.mark.row -= count; 711 selection.mark.row -= count;
692 712
693 if (selection.beg.row < top_row 713 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 } 714 }
701 715
702 // finally move the view window, if desired 716 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 718 && view_start != 0
… …
734 } 748 }
735 749
736 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
738 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
739 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
740 762
741 min_it (count, rows); 763 min_it (count, rows);
742 764
743 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 766
745 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
746 { 768 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 770
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 773 }
752 774
753 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
754 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 }
755 } 784 }
756 785
757 return count; 786 return count;
758} 787}
759 788
760/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
761/* 790/*
762 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
763 */ 792 */
764void 793void ecb_hot
765rxvt_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
766{ 795{
767 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
768 return; 797 return;
769 798
770 unsigned char checksel; 799 bool checksel;
771 unicode_t c; 800 unicode_t c;
772 int ncol = this->ncol; 801 int ncol = this->ncol;
773 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
774 803
775 want_refresh = 1; 804 want_refresh = 1;
… …
1119 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1120 * 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
1121 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1122 */ 1151 */
1123#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1124void 1153void ecb_cold
1125rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1126{ 1155{
1127 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1128 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1129 else 1158 else
… …
1136 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1137 * 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
1138 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1139 */ 1168 */
1140#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1141void 1170void ecb_cold
1142rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1143{ 1172{
1144 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1145 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1146 else 1175 else
… …
1297 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1298} 1327}
1299 1328
1300/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1301/* 1330/*
1302 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1303 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306 */ 1335 */
1307void 1336void
… …
1316 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1317 1346
1318 switch (mode) 1347 switch (mode)
1319 { 1348 {
1320 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1321 selection_check (1);
1322 scr_erase_line (0); 1350 scr_erase_line (0);
1323 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1324 num = nrow - row; 1352 num = nrow - row;
1325 break; 1353 break;
1326 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1327 selection_check (3);
1328 scr_erase_line (1); 1355 scr_erase_line (1);
1329 row = 0; 1356 row = 0;
1330 num = screen.cur.row; 1357 num = screen.cur.row;
1331 break; 1358 break;
1332 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1333 selection_check (3);
1334 row = 0; 1360 row = 0;
1335 num = nrow; 1361 num = nrow;
1336 break; 1362 break;
1337 default: 1363 default:
1338 return; 1364 return;
… …
1355 { 1381 {
1356 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1357 1383
1358 if (mapped) 1384 if (mapped)
1359 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1361 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1362 } 1388 }
1363 else 1389 else
1364 { 1390 {
1365 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1368 { 1394 {
1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1373 (unsigned int)width, 1399 (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1375 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1376 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 } 1403 }
1378 } 1404 }
… …
1400/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1401/* 1427/*
1402 * Fill the screen with `E's 1428 * Fill the screen with `E's
1403 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1404 */ 1430 */
1405void 1431void ecb_cold
1406rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1407{ 1433{
1408 rend_t fs; 1434 rend_t fs;
1409 1435
1410 want_refresh = 1; 1436 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1412 1438
1413 num_scr_allow = 0; 1439 num_scr_allow = 0;
1414 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 ();
1415 1445
1416 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1418 { 1448 {
1419 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1570/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1571/* 1601/*
1572 * Set the scrolling region 1602 * Set the scrolling region
1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574 */ 1604 */
1575void 1605void ecb_cold
1576rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1577{ 1607{
1578 max_it (top, 0); 1608 max_it (top, 0);
1579 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1580 1610
… …
1590/* 1620/*
1591 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1592 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594 */ 1624 */
1595void 1625void ecb_cold
1596rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1597{ 1627{
1598 want_refresh = 1; 1628 want_refresh = 1;
1599 1629
1600 if (mode) 1630 if (mode)
… …
1607/* 1637/*
1608 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1609 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611 */ 1641 */
1612void 1642void ecb_cold
1613rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1614{ 1644{
1615 if (mode) 1645 if (mode)
1616 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1617 else 1647 else
… …
1626 * 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
1627 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1628 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630 */ 1660 */
1631void 1661void ecb_cold
1632rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1633{ 1663{
1634 if (mode) 1664 if (mode)
1635 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1636 else 1666 else
… …
1643/* 1673/*
1644 * Set insert/replace mode 1674 * Set insert/replace mode
1645 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647 */ 1677 */
1648void 1678void ecb_cold
1649rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1650{ 1680{
1651 if (mode) 1681 if (mode)
1652 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1653 else 1683 else
… …
1659 * Set/Unset tabs 1689 * Set/Unset tabs
1660 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1661 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663 */ 1693 */
1664void 1694void ecb_cold
1665rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1666{ 1696{
1667 if (mode < 0) 1697 if (mode < 0)
1668 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1669 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1688 if (rvideo_state != on) 1718 if (rvideo_state != on)
1689 { 1719 {
1690 rvideo_state = on; 1720 rvideo_state = on;
1691 1721
1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1694 if (bg_pixmap == None) 1724 if (bg_img == 0)
1695#endif 1725#endif
1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697 1727
1698 XGCValues gcvalue; 1728 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1708/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1709/* 1739/*
1710 * Report current cursor position 1740 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1742 */
1713void 1743void ecb_cold
1714rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1715{ 1745{
1716 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);
1717} 1747}
1718 1748
… …
1721 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1722 1752
1723/* 1753/*
1724 * Set font style 1754 * Set font style
1725 */ 1755 */
1726void 1756void ecb_cold
1727rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1728{ 1758{
1729#if 0 1759#if 0
1730 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1731 { 1761 {
… …
1753 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1754 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1755 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1756 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1757 */ 1787 */
1758void 1788void ecb_cold
1759rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1760{ 1790{
1761 screen.charset = set; 1791 screen.charset = set;
1762 set_font_style (); 1792 set_font_style ();
1763} 1793}
… …
1784 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1785 1815
1786/* 1816/*
1787 * refresh matching text. 1817 * refresh matching text.
1788 */ 1818 */
1789bool 1819bool ecb_cold
1790rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1791{ 1821{
1792 bool found = false; 1822 bool found = false;
1793 1823
1794 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1813 PART_BEG = 0, 1843 PART_BEG = 0,
1814 PART_END, 1844 PART_END,
1815 RC_COUNT 1845 RC_COUNT
1816}; 1846};
1817 1847
1818void 1848void ecb_hot
1819rxvt_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
1820{ 1850{
1821 int i; 1851 int i;
1822 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1823 1853
… …
1860 * Refresh the entire screen 1890 * Refresh the entire screen
1861 */ 1891 */
1862void 1892void
1863rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1864{ 1894{
1865 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1866} 1896}
1867 1897
1868/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1869/* 1899/*
1870 * 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
… …
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950#endif 1980#endif
1951} 1981}
1952 1982
1953/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1954void 1984void ecb_cold
1955rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1956{ 1986{
1957#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1958 int nrows, row_start; 1988 int nrows, row_start;
1959 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2008/* 2038/*
2009 * Refresh the screen 2039 * Refresh the screen
2010 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2011 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2012 */ 2042 */
2013void 2043void ecb_hot
2014rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2015{ 2045{
2016 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2017 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2018 int i; /* tmp */ 2048 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 */ 2049 rend_t ccol1, /* Cursor colour */
2024 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2025 2054
2026 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2027 2056
2028 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2029 return; 2058 return;
… …
2032 * A: set up vars 2061 * A: set up vars
2033 */ 2062 */
2034 refresh_count = 0; 2063 refresh_count = 0;
2035 2064
2036 unsigned int old_screen_flags = screen.flags; 2065 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0; 2066 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2039 have_bg = bg_pixmap != None; 2068 have_bg = bg_img != 0;
2040#endif 2069#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2071
2043 /* 2072 /*
2044 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
… …
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2077 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY 2078#if ENABLE_OVERLAY
2050 scr_swap_overlay (); 2079 scr_swap_overlay ();
2051#endif 2080#endif
2052 2081
2053 char showcursor = screen.flags & Screen_VisibleCursor; 2082 bool showcursor = screen.flags & Screen_VisibleCursor;
2054 2083
2055 /* 2084 /*
2056 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2057 */ 2086 */
2058 { 2087 {
2059 unsigned char setoldcursor;
2060
2061#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2062 if (hidden_cursor) 2089 if (hidden_cursor)
2063 showcursor = 0; 2090 showcursor = 0;
2064#endif 2091#endif
2065 2092
… …
2068 int col = screen.cur.col; 2095 int col = screen.cur.col;
2069 2096
2070 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2071 col--; 2098 col--;
2072 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2073 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2074 2107
2075#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2076 cc1 = *crp & (RS_fgMask | RS_bgMask);
2077 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2078 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2079 else 2111 else
2080#endif 2112#endif
2081#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2095 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2096#endif 2128#endif
2097 2129
2098 if (focus) 2130 if (focus)
2099 { 2131 {
2132 rend_t rend = cur_rend;
2133
2100 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2101 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2102 else 2136 else
2103 { 2137 {
2104 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2105 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2106 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2107 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2108 } 2144 }
2109 } 2145 }
2110 2146
2111 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2112 setoldcursor = 0;
2113 if (ocrow != -1) 2148 if (ocrow != -1)
2114 { 2149 {
2115 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2116 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2117 { 2152 {
2118 if (ocrow < nrow 2153 if (ocrow < nrow
2119 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2120 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2121
2122 if (focus || !showcursor)
2123 oldcursor.row = -1;
2124 else
2125 setoldcursor = 1;
2126 } 2156 }
2127 } 2157 }
2128 else if (!focus)
2129 setoldcursor = 1;
2130 2158
2131 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2132 { 2163 {
2133 if (screen.cur.row - view_start >= nrow)
2134 oldcursor.row = -1;
2135 else
2136 {
2137 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2138 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2139 }
2140 } 2166 }
2167 else
2168 oldcursor.row = -1;
2141 } 2169 }
2142 2170
2143#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2144 /* 2172 /*
2145 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
… …
2151 { 2179 {
2152 int16_t nits; 2180 int16_t nits;
2153 int i = num_scr; 2181 int i = num_scr;
2154 int j; 2182 int j;
2155 int len, wlen; 2183 int len, wlen;
2156 dLocal (int, num_scr);
2157 2184
2158 j = nrow; 2185 j = nrow;
2159 wlen = len = -1; 2186 wlen = len = -1;
2160 row = i > 0 ? 0 : j - 1; 2187 row = i > 0 ? 0 : j - 1;
2161 2188
… …
2412 else 2439 else
2413 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2414 2441
2415 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2416 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2417#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2418 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2419 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2420 else 2451 else
2421#endif 2452#endif
… …
2432 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2433 */ 2464 */
2434 if (showcursor) 2465 if (showcursor)
2435 { 2466 {
2436 if (focus) 2467 if (focus)
2437 { 2468 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) 2469 else if (oldcursor.row >= 0)
2449 { 2470 {
2450 int cursorwidth = 1;
2451 int col = oldcursor.col;
2452
2453 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2454 col--;
2455
2456 while (col + cursorwidth < ncol
2457 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2458 cursorwidth++;
2459
2460#ifndef NO_CURSORCOLOR
2461 if (ISSET_PIXCOLOR (Color_cursor))
2462 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2463 else
2464#endif
2465 XSetForeground (dpy, gc, pix_colors[ccol1]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2466 2472
2467 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2468 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2469 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2470 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2472 } 2478 }
2473 } 2479 }
2474 2480
2475 /* 2481 /*
2476 * H: cleanup selection 2482 * H: cleanup selection
… …
2485 screen.flags = old_screen_flags; 2491 screen.flags = old_screen_flags;
2486 num_scr = 0; 2492 num_scr = 0;
2487 num_scr_allow = 1; 2493 num_scr_allow = 1;
2488} 2494}
2489 2495
2490void 2496void ecb_cold
2491rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2497rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2492{ 2498{
2493 if (!l.t) 2499 if (!l.valid ())
2494 return; 2500 return;
2495 2501
2496 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2502 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2497 2503
2498 for (int i = ncol; i--; ) 2504 for (int i = ncol; i--; )
2499 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2505 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2506}
2501 2507
2502void 2508void ecb_cold
2503rxvt_term::scr_remap_chars () NOTHROW 2509rxvt_term::scr_remap_chars () NOTHROW
2504{ 2510{
2505 for (int i = total_rows; i--; ) 2511 for (int i = total_rows; i--; )
2506 scr_remap_chars (row_buf [i]); 2512 scr_remap_chars (row_buf [i]);
2507 2513
… …
2510 scr_remap_chars (drawn_buf [i]); 2516 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap_buf [i]); 2517 scr_remap_chars (swap_buf [i]);
2512 } 2518 }
2513} 2519}
2514 2520
2515void 2521void ecb_cold
2516rxvt_term::scr_recolour (bool refresh) NOTHROW 2522rxvt_term::scr_recolour (bool refresh) NOTHROW
2517{ 2523{
2518 bool transparent = false; 2524 bool transparent = false;
2519 2525
2520#ifdef HAVE_BG_PIXMAP 2526#ifdef HAVE_IMG
2521 if (bg_pixmap != None) 2527 if (bg_img != 0)
2522 { 2528 {
2523# ifdef ENABLE_TRANSPARENCY 2529# if ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT) 2530 if (bg_flags & BG_IS_TRANSPARENT)
2525 { 2531 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2532 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2533 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528 2534
2529 transparent = true; 2535 transparent = true;
2530 } 2536 }
2531 else 2537 else
2532# endif 2538# endif
2533 { 2539 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2541 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2536 } 2542 }
2537 } 2543 }
2538 else 2544 else
2539#endif 2545#endif
2540 { 2546 {
… …
2547 if (scrollBar.win) 2553 if (scrollBar.win)
2548 { 2554 {
2549 if (transparent) 2555 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2557 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2553 scrollBar.state = STATE_IDLE; 2559 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2560 scrollBar.show (0);
2555 } 2561 }
2556 2562
2557 if (refresh) 2563 if (refresh)
2558 { 2564 {
… …
2623 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2629 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
2625} 2631}
2626 2632
2627/* ------------------------------------------------------------------------- */ 2633/* ------------------------------------------------------------------------- */
2628void 2634void ecb_hot
2629rxvt_term::scr_reverse_selection () NOTHROW 2635rxvt_term::scr_reverse_selection () NOTHROW
2630{ 2636{
2631 if (selection.op 2637 if (selection.op
2632 && current_screen == selection.screen 2638 && current_screen == selection.screen
2633 && selection.end.row >= view_start) 2639 && selection.end.row >= view_start)
… …
2652 */ 2658 */
2653#if 0 2659#if 0
2654void 2660void
2655rxvt_term::scr_dump (int fd) NOTHROW 2661rxvt_term::scr_dump (int fd) NOTHROW
2656{ 2662{
2657 int row, wrote; 2663 // if this method is needed, it can be implemented by factoring the
2658 unsigned int width, towrite; 2664 // 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} 2665}
2678#endif 2666#endif
2679 2667
2680/* ------------------------------------------------------------------------- * 2668/* ------------------------------------------------------------------------- *
2681 * CHARACTER SELECTION * 2669 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2670 * ------------------------------------------------------------------------- */
2683void 2671void
2684rxvt_term::selection_check (int check_more) NOTHROW 2672rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2673{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2674 if (!selection.op)
2689 return; 2675 return;
2690 2676
2691 pos.row = pos.col = 0;
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2677 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2678 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2679 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2680 || (check_more == 1
2696 && current_screen == selection.screen 2681 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2683 && 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 (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2708} 2699}
2709 2700
2710/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2711/* 2702/*
2712 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
2718 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2719 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2720 data[i] = C0_CR; 2711 data[i] = C0_CR;
2721 2712
2722 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2724 2715
2725 tt_write (data, len); 2716 tt_write (data, len);
2726 2717
2727 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2728 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2729} 2720}
2730 2721
2731void 2722void
2732rxvt_term::paste (char *data, unsigned int len) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2733{ 2724{
… …
2953/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
2954/* 2945/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
2956 * EXT: button 1 press 2947 * EXT: button 1 press
2957 */ 2948 */
2958void 2949void ecb_cold
2959rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2960{ 2951{
2961 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
2962 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
2963 2954
… …
2982 2973
2983/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
2984/* 2975/*
2985 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
2986 */ 2977 */
2987void 2978void ecb_cold
2988rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2989{ 2980{
2990 want_refresh = 1; 2981 want_refresh = 1;
2991 2982
2992 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3015 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3016 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3017 */ 3008 */
3018 3009
3019/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3021 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3023 3014
3024void 3015void ecb_cold
3025rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3026{ 3017{
3027 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3028 row_col_t bound; 3019 row_col_t bound;
3029 text_t *stp; 3020 text_t *stp;
… …
3103 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3104 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3105 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3106 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3107 */ 3098 */
3108void 3099void ecb_cold
3109rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3110{ 3101{
3111 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3112 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113 3104
… …
3139 3130
3140/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3141/* 3132/*
3142 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3143 */ 3134 */
3144void 3135void ecb_cold
3145rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3146{ 3137{
3147 row_col_t pos; 3138 row_col_t pos;
3148 enum { 3139 enum {
3149 LEFT, RIGHT 3140 LEFT, RIGHT
3150 } closeto = RIGHT; 3141 } closeto = RIGHT;
3151
3152 want_refresh = 1;
3153 3142
3154 switch (selection.op) 3143 switch (selection.op)
3155 { 3144 {
3156 case SELECTION_INIT: 3145 case SELECTION_INIT:
3157 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3337 3326
3338#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3339 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3340 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3341#endif 3330#endif
3331
3332 selection_changed ();
3342} 3333}
3343 3334
3344#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3345void 3336void ecb_cold
3346rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3347{ 3338{
3348 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3349 text_t *stp; 3340 text_t *stp;
3350 3341
… …
3388/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3389/* 3380/*
3390 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3391 * EXT: button 3 double click 3382 * EXT: button 3 double click
3392 */ 3383 */
3393void 3384void ecb_cold
3394rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3395{ 3386{
3396 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3397 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398} 3389}
… …
3400/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3401/* 3392/*
3402 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3403 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3404 */ 3395 */
3405void 3396void ecb_cold
3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3407{ 3398{
3408 Atom property = rq.property == None ? rq.target : rq.property; 3399 Atom property = rq.property == None ? rq.target : rq.property;
3409 XSelectionEvent ev; 3400 XSelectionEvent ev;
3410 3401
… …
3543 3534
3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545} 3536}
3546 3537
3547/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3548#ifdef USE_XIM 3539#if USE_XIM
3549void 3540void ecb_cold
3550rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3551{ 3542{
3552 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3553 3544
3554 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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