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.420 by root, Mon Jun 4 15:18:52 2012 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 ();
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 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 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 281
273 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 286 }
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 287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 305 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 307
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 309 {
304 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
305 311
306 plines++; 312 plines++;
307 llen += prev_ncol; 313 llen += prev_ncol;
… …
320 326
321 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
323 { 329 {
324 qline = row_buf + qrow; 330 qline = row_buf + qrow;
325 lalloc (*qline); 331 qline->alloc (); // redundant with next line
326 qline->l = ncol; 332 qline->l = ncol;
327 qline->is_longer (1); 333 qline->is_longer (1);
328 334
329 int qcol = 0; 335 int qcol = 0;
330 336
… …
345 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
346 // least. 352 // least.
347 if (prow == ocur.row) 353 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
349 355
350 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
351 357
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 359
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 382 {
377 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
378 384
379 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
380 { 386 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
383 389
384 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 394 }
387 395
388 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 398
393 term_start = 0; 399 term_start = 0;
394 } 400 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 401
400 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
406 417
407 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 426 tt_winch ();
416 427
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 429}
419 430
420/* ------------------------------------------------------------------------- */ 431void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
426{ 433{
427 if (row_buf) 434 free (chunk); chunk = 0; row_buf = 0;
428 { 435 free (tabs); tabs = 0;
429 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0;
431
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);
438 tabs = 0;
439 }
440} 436}
441 437
442/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
443/* 439/*
444 * Hard/Soft reset 440 * Hard/Soft reset
445 */ 441 */
446void 442void ecb_cold
447rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
448{ 444{
449 scr_release (); 445 scr_release ();
446
450 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 448 rvideo_mode = false;
452 scr_soft_reset (); 449 scr_soft_reset ();
453 scr_reset (); 450 scr_reset ();
454 451
455 scr_clear (true); 452 scr_clear (true);
456 scr_refresh (); 453 scr_refresh ();
457} 454}
458 455
459void 456void ecb_cold
460rxvt_term::scr_soft_reset () 457rxvt_term::scr_soft_reset () NOTHROW
461{ 458{
462 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
464 scr_overlay_off (); 461 scr_overlay_off ();
465#endif 462#endif
… …
520 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
522} 519}
523 520
524void 521void
525rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
526{ 523{
527 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
528 return; 525 return;
529 526
530 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
549 return; 546 return;
550 547
551 want_refresh = 1; 548 want_refresh = 1;
552 view_start = 0; 549 view_start = 0;
553 550
554 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
555 557
556 current_screen = scrn; 558 current_screen = scrn;
557 559
558#if NSCREENS 560#if NSCREENS
559 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
… …
625/* 627/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 629 * count positive ==> scroll up
628 * count negative ==> scroll down 630 * count negative ==> scroll down
629 */ 631 */
630int 632int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 634{
633 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
634 return 0; 636 return 0;
635 637
… …
638 640
639 if (count > 0 641 if (count > 0
640 && row1 == 0 642 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 644 {
643 min_it (count, row2 - total_rows); 645 min_it (count, total_rows - (nrow - (row2 + 1)));
644 646
645 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
646
647 // scroll everything up 'count' lines
648 term_start = (term_start + count) % total_rows;
649 648
650 // sever bottommost line 649 // sever bottommost line
651 { 650 {
652 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
653 l.is_longer (0); 652 l.is_longer (0);
654 l.touch (); 653 l.touch ();
655 } 654 }
656 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
657 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
658 for (int i = count; i--; ) 672 for (int i = count; i--; )
659 { 673 {
660 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
661 675
662 // optimise if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
663 // could be rolled into scr_blank_screen_mem 677 // 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))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
665 { 679 {
… …
669 } 683 }
670 else 684 else
671 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
672 } 686 }
673 687
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 688 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
688 { 691 {
689 selection.beg.row -= count; 692 selection.beg.row -= count;
690 selection.end.row -= count; 693 selection.end.row -= count;
691 selection.mark.row -= count; 694 selection.mark.row -= count;
692 695
693 if (selection.beg.row < top_row 696 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 } 697 }
701 698
702 // finally move the view window, if desired 699 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 701 && view_start != 0
… …
734 } 731 }
735 732
736 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
738 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
739 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
740 745
741 min_it (count, rows); 746 min_it (count, rows);
742 747
743 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 749
745 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
746 { 751 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 753
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 756 }
752 757
753 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
754 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
755 } 767 }
756 768
757 return count; 769 return count;
758} 770}
759 771
760/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
761/* 773/*
762 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
763 */ 775 */
764void 776void ecb_hot
765rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
766{ 778{
767 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
768 return; 780 return;
769 781
770 unsigned char checksel; 782 bool checksel;
771 unicode_t c; 783 unicode_t c;
772 int ncol = this->ncol; 784 int ncol = this->ncol;
773 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
774 786
775 want_refresh = 1; 787 want_refresh = 1;
… …
1119 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1120 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1121 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1122 */ 1134 */
1123#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1124void 1136void ecb_cold
1125rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1126{ 1138{
1127 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1128 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1129 else 1141 else
… …
1136 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1137 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1138 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1139 */ 1151 */
1140#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1141void 1153void ecb_cold
1142rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1143{ 1155{
1144 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1145 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1146 else 1158 else
… …
1297 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1298} 1310}
1299 1311
1300/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1301/* 1313/*
1302 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1303 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306 */ 1318 */
1307void 1319void
… …
1316 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1317 1329
1318 switch (mode) 1330 switch (mode)
1319 { 1331 {
1320 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1321 selection_check (1);
1322 scr_erase_line (0); 1333 scr_erase_line (0);
1323 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1324 num = nrow - row; 1335 num = nrow - row;
1325 break; 1336 break;
1326 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1327 selection_check (3);
1328 scr_erase_line (1); 1338 scr_erase_line (1);
1329 row = 0; 1339 row = 0;
1330 num = screen.cur.row; 1340 num = screen.cur.row;
1331 break; 1341 break;
1332 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1333 selection_check (3);
1334 row = 0; 1343 row = 0;
1335 num = nrow; 1344 num = nrow;
1336 break; 1345 break;
1337 default: 1346 default:
1338 return; 1347 return;
… …
1355 { 1364 {
1356 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1357 1366
1358 if (mapped) 1367 if (mapped)
1359 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1361 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1362 } 1371 }
1363 else 1372 else
1364 { 1373 {
1365 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1368 { 1377 {
1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start), 1381 0, Row2Pixel (row - view_start),
1373 (unsigned int)width, 1382 (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1375 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1376 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 } 1386 }
1378 } 1387 }
… …
1400/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1401/* 1410/*
1402 * Fill the screen with `E's 1411 * Fill the screen with `E's
1403 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1404 */ 1413 */
1405void 1414void ecb_cold
1406rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1407{ 1416{
1408 rend_t fs; 1417 rend_t fs;
1409 1418
1410 want_refresh = 1; 1419 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1412 1421
1413 num_scr_allow = 0; 1422 num_scr_allow = 0;
1414 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1415 1428
1416 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1418 { 1431 {
1419 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1570/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1571/* 1584/*
1572 * Set the scrolling region 1585 * Set the scrolling region
1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574 */ 1587 */
1575void 1588void ecb_cold
1576rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1577{ 1590{
1578 max_it (top, 0); 1591 max_it (top, 0);
1579 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1580 1593
… …
1590/* 1603/*
1591 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1592 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594 */ 1607 */
1595void 1608void ecb_cold
1596rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1597{ 1610{
1598 want_refresh = 1; 1611 want_refresh = 1;
1599 1612
1600 if (mode) 1613 if (mode)
… …
1607/* 1620/*
1608 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1609 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611 */ 1624 */
1612void 1625void ecb_cold
1613rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1614{ 1627{
1615 if (mode) 1628 if (mode)
1616 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1617 else 1630 else
… …
1626 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1627 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1628 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630 */ 1643 */
1631void 1644void ecb_cold
1632rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1633{ 1646{
1634 if (mode) 1647 if (mode)
1635 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1636 else 1649 else
… …
1643/* 1656/*
1644 * Set insert/replace mode 1657 * Set insert/replace mode
1645 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647 */ 1660 */
1648void 1661void ecb_cold
1649rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1650{ 1663{
1651 if (mode) 1664 if (mode)
1652 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1653 else 1666 else
… …
1659 * Set/Unset tabs 1672 * Set/Unset tabs
1660 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1661 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663 */ 1676 */
1664void 1677void ecb_cold
1665rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1666{ 1679{
1667 if (mode < 0) 1680 if (mode < 0)
1668 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1669 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1708/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1709/* 1722/*
1710 * Report current cursor position 1723 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1725 */
1713void 1726void ecb_cold
1714rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1715{ 1728{
1716 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717} 1730}
1718 1731
… …
1721 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1722 1735
1723/* 1736/*
1724 * Set font style 1737 * Set font style
1725 */ 1738 */
1726void 1739void ecb_cold
1727rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1728{ 1741{
1729#if 0 1742#if 0
1730 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1731 { 1744 {
… …
1753 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1754 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1755 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1756 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1757 */ 1770 */
1758void 1771void ecb_cold
1759rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1760{ 1773{
1761 screen.charset = set; 1774 screen.charset = set;
1762 set_font_style (); 1775 set_font_style ();
1763} 1776}
… …
1784 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1785 1798
1786/* 1799/*
1787 * refresh matching text. 1800 * refresh matching text.
1788 */ 1801 */
1789bool 1802bool ecb_cold
1790rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1791{ 1804{
1792 bool found = false; 1805 bool found = false;
1793 1806
1794 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1813 PART_BEG = 0, 1826 PART_BEG = 0,
1814 PART_END, 1827 PART_END,
1815 RC_COUNT 1828 RC_COUNT
1816}; 1829};
1817 1830
1818void 1831void ecb_hot
1819rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1820{ 1833{
1821 int i; 1834 int i;
1822 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1823 1836
… …
1860 * Refresh the entire screen 1873 * Refresh the entire screen
1861 */ 1874 */
1862void 1875void
1863rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1864{ 1877{
1865 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1866} 1879}
1867 1880
1868/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1869/* 1882/*
1870 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950#endif 1963#endif
1951} 1964}
1952 1965
1953/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1954void 1967void ecb_cold
1955rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1956{ 1969{
1957#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1958 int nrows, row_start; 1971 int nrows, row_start;
1959 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
2008/* 2021/*
2009 * Refresh the screen 2022 * Refresh the screen
2010 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2011 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2012 */ 2025 */
2013void 2026void ecb_hot
2014rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2015{ 2028{
2016 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2017 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2018 int i; /* tmp */ 2031 int i; /* tmp */
… …
2032 * A: set up vars 2045 * A: set up vars
2033 */ 2046 */
2034 refresh_count = 0; 2047 refresh_count = 0;
2035 2048
2036 unsigned int old_screen_flags = screen.flags; 2049 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0; 2050 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2039 have_bg = bg_pixmap != None; 2052 have_bg = bg_pixmap != None;
2040#endif 2053#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2055
… …
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY 2062#if ENABLE_OVERLAY
2050 scr_swap_overlay (); 2063 scr_swap_overlay ();
2051#endif 2064#endif
2052 2065
2053 char showcursor = screen.flags & Screen_VisibleCursor; 2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2054 2067
2055 /* 2068 /*
2056 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2057 */ 2070 */
2058 { 2071 {
2059 unsigned char setoldcursor; 2072 bool setoldcursor;
2060 2073
2061#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2062 if (hidden_cursor) 2075 if (hidden_cursor)
2063 showcursor = 0; 2076 showcursor = 0;
2064#endif 2077#endif
… …
2151 { 2164 {
2152 int16_t nits; 2165 int16_t nits;
2153 int i = num_scr; 2166 int i = num_scr;
2154 int j; 2167 int j;
2155 int len, wlen; 2168 int len, wlen;
2156 dLocal (int, num_scr);
2157 2169
2158 j = nrow; 2170 j = nrow;
2159 wlen = len = -1; 2171 wlen = len = -1;
2160 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2161 2173
… …
2466 2478
2467 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2468 Col2Pixel (col), 2480 Col2Pixel (col),
2469 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2470 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2472 } 2484 }
2473 } 2485 }
2474 2486
2475 /* 2487 /*
2476 * H: cleanup selection 2488 * H: cleanup selection
… …
2485 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2486 num_scr = 0; 2498 num_scr = 0;
2487 num_scr_allow = 1; 2499 num_scr_allow = 1;
2488} 2500}
2489 2501
2490void 2502void ecb_cold
2491rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2492{ 2504{
2493 if (!l.t) 2505 if (!l.valid ())
2494 return; 2506 return;
2495 2507
2496 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2497 2509
2498 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2499 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2512}
2501 2513
2502void 2514void ecb_cold
2503rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2504{ 2516{
2505 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2506 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2507 2519
… …
2510 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2512 } 2524 }
2513} 2525}
2514 2526
2515void 2527void ecb_cold
2516rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2517{ 2529{
2518 bool transparent = false; 2530 bool transparent = false;
2519 2531
2520#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2521 if (bg_pixmap != None) 2533 if (bg_pixmap != None)
2522 { 2534 {
2523# ifdef ENABLE_TRANSPARENCY 2535# if ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2525 { 2537 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528 2540
… …
2548 { 2560 {
2549 if (transparent) 2561 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2563 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2553 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2566 scrollBar.show (0);
2555 } 2567 }
2556 2568
2557 if (refresh) 2569 if (refresh)
2558 { 2570 {
… …
2623 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2625} 2637}
2626 2638
2627/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2628void 2640void ecb_hot
2629rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2630{ 2642{
2631 if (selection.op 2643 if (selection.op
2632 && current_screen == selection.screen 2644 && current_screen == selection.screen
2633 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2652 */ 2664 */
2653#if 0 2665#if 0
2654void 2666void
2655rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2656{ 2668{
2657 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2658 unsigned int width, towrite; 2670 // 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} 2671}
2678#endif 2672#endif
2679 2673
2680/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2681 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2683void 2677void
2684rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2679{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2680 if (!selection.op)
2689 return; 2681 return;
2690 2682
2691 pos.row = pos.col = 0;
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2686 || (check_more == 1
2696 && current_screen == selection.screen 2687 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && 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 (); 2690 CLEAR_ALL_SELECTION ();
2708} 2691}
2709 2692
2710/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2711/* 2694/*
2712 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
… …
2718 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2719 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2720 data[i] = C0_CR; 2703 data[i] = C0_CR;
2721 2704
2722 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2724 2707
2725 tt_write (data, len); 2708 tt_write (data, len);
2726 2709
2727 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2728 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2729} 2712}
2730 2713
2731void 2714void
2732rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2733{ 2716{
… …
2953/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2954/* 2937/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2956 * EXT: button 1 press 2939 * EXT: button 1 press
2957 */ 2940 */
2958void 2941void ecb_cold
2959rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2960{ 2943{
2961 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2962 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2963 2946
… …
2982 2965
2983/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2984/* 2967/*
2985 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2986 */ 2969 */
2987void 2970void ecb_cold
2988rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2989{ 2972{
2990 want_refresh = 1; 2973 want_refresh = 1;
2991 2974
2992 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3019/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3021 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3023 3006
3024void 3007void ecb_cold
3025rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3026{ 3009{
3027 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3028 row_col_t bound; 3011 row_col_t bound;
3029 text_t *stp; 3012 text_t *stp;
… …
3103 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3104 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3105 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3106 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3107 */ 3090 */
3108void 3091void ecb_cold
3109rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3110{ 3093{
3111 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3112 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113 3096
… …
3139 3122
3140/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3141/* 3124/*
3142 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3143 */ 3126 */
3144void 3127void ecb_cold
3145rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3146{ 3129{
3147 row_col_t pos; 3130 row_col_t pos;
3148 enum { 3131 enum {
3149 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3340 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3341#endif 3324#endif
3342} 3325}
3343 3326
3344#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3345void 3328void ecb_cold
3346rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3347{ 3330{
3348 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3349 text_t *stp; 3332 text_t *stp;
3350 3333
… …
3388/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3389/* 3372/*
3390 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3391 * EXT: button 3 double click 3374 * EXT: button 3 double click
3392 */ 3375 */
3393void 3376void ecb_cold
3394rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3395{ 3378{
3396 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3397 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398} 3381}
… …
3400/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3401/* 3384/*
3402 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3403 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3404 */ 3387 */
3405void 3388void ecb_cold
3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3407{ 3390{
3408 Atom property = rq.property == None ? rq.target : rq.property; 3391 Atom property = rq.property == None ? rq.target : rq.property;
3409 XSelectionEvent ev; 3392 XSelectionEvent ev;
3410 3393
… …
3543 3526
3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545} 3528}
3546 3529
3547/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3548#ifdef USE_XIM 3531#if USE_XIM
3549void 3532void ecb_cold
3550rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3551{ 3534{
3552 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3553 3536
3554 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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