ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.384 by sf-exg, Mon May 30 18:39:04 2011 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 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 ();
… …
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 = chunk_alloc (chunk_size, 0);
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 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 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 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
245 { 273 {
246 /* 274 /*
247 * add or delete rows as appropriate 275 * add or delete rows as appropriate
248 */ 276 */
249 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
268 { 279 {
269 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 282
273 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l;
274 { 289 }
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 290
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 291 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
285 294
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 302 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 303
295 do 304 do
296 { 305 {
297 p = MOD (p - 1, prev_total_rows); 306 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 307 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 308 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 309 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 310
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 311 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 312 {
304 p = MOD (p - 1, prev_total_rows); 313 p = MOD (p - 1, prev_total_rows);
305 314
306 plines++; 315 plines++;
307 llen += prev_ncol; 316 llen += prev_ncol;
… …
320 329
321 // re-assemble the full line by destination lines 330 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 331 for (int qrow = q; qlines--; qrow++)
323 { 332 {
324 qline = row_buf + qrow; 333 qline = row_buf + qrow;
325 lalloc (*qline); 334 qline->alloc (); // redundant with next line
326 qline->l = ncol; 335 qline->l = ncol;
327 qline->is_longer (1); 336 qline->is_longer (1);
328 337
329 int qcol = 0; 338 int qcol = 0;
330 339
… …
345 // this seems to upset applications/shells/readline 354 // this seems to upset applications/shells/readline
346 // least. 355 // least.
347 if (prow == ocur.row) 356 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 357 screen.cur.row = q - (total_rows - nrow);
349 358
350 line_t &pline = old_buf [prow]; 359 line_t &pline = prev_row_buf [prow];
351 360
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 361 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 362
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 363 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 364 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 385 {
377 // if no scrollback exists (yet), wing, instead of wrap 386 // if no scrollback exists (yet), wing, instead of wrap
378 387
379 for (int row = min (nrow, prev_nrow); row--; ) 388 for (int row = min (nrow, prev_nrow); row--; )
380 { 389 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 390 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 391 line_t &dst = row_buf [row];
383 392
384 qline = pline; 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 394
395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
386 } 398 }
387 399
388 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 402
393 term_start = 0; 403 term_start = 0;
394 } 404 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 405
400 clamp_it (screen.cur.row, 0, nrow - 1); 406 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 407 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 408 }
403 409
410 for (int row = nrow; row--; )
411 {
412 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
413 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
414 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
415 }
416
417 chunk_free (prev_chunk, prev_chunk_size);
418
404 free (tabs); 419 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 420 tabs = (char *)rxvt_malloc (ncol);
406 421
407 for (int col = ncol; col--; ) 422 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 423 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 430 tt_winch ();
416 431
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 432 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 433}
419 434
420/* ------------------------------------------------------------------------- */ 435void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
426{ 437{
427 if (row_buf) 438 chunk_free (chunk, chunk_size);
428 { 439 chunk = 0;
429 delete talloc; talloc = 0; 440 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 441
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); 442 free (tabs);
438 tabs = 0; 443 tabs = 0;
439 }
440} 444}
441 445
442/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
443/* 447/*
444 * Hard/Soft reset 448 * Hard/Soft reset
445 */ 449 */
446void 450void ecb_cold
447rxvt_term::scr_poweron () 451rxvt_term::scr_poweron ()
448{ 452{
449 scr_release (); 453 scr_release ();
454
450 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 456 rvideo_mode = false;
452 scr_soft_reset (); 457 scr_soft_reset ();
453 scr_reset (); 458 scr_reset ();
454 459
455 scr_clear (true); 460 scr_clear (true);
456 scr_refresh (); 461 scr_refresh ();
457} 462}
458 463
459void 464void ecb_cold
460rxvt_term::scr_soft_reset () 465rxvt_term::scr_soft_reset () NOTHROW
461{ 466{
462 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
464 scr_overlay_off (); 469 scr_overlay_off ();
465#endif 470#endif
… …
520 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
522} 527}
523 528
524void 529void
525rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
526{ 531{
527 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
528 return; 533 return;
529 534
530 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
549 return; 554 return;
550 555
551 want_refresh = 1; 556 want_refresh = 1;
552 view_start = 0; 557 view_start = 0;
553 558
554 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
555 565
556 current_screen = scrn; 566 current_screen = scrn;
557 567
558#if NSCREENS 568#if NSCREENS
559 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
… …
625/* 635/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 637 * count positive ==> scroll up
628 * count negative ==> scroll down 638 * count negative ==> scroll down
629 */ 639 */
630int 640int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 642{
633 if (count == 0 || (row1 > row2)) 643 if (count == 0 || (row1 > row2))
634 return 0; 644 return 0;
635 645
… …
638 648
639 if (count > 0 649 if (count > 0
640 && row1 == 0 650 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
643 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 656
648 // sever bottommost line 657 // sever bottommost line
649 { 658 {
650 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
651 l.is_longer (0); 660 l.is_longer (0);
652 l.touch (); 661 l.touch ();
653 } 662 }
654 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
655 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 680 for (int i = count; i--; )
657 { 681 {
658 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
659 683
660 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 687 {
664 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 689 l.l = 0;
… …
667 } 691 }
668 else 692 else
669 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
670 } 694 }
671 695
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 696 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
686 { 699 {
687 selection.beg.row -= count; 700 selection.beg.row -= count;
688 selection.end.row -= count; 701 selection.end.row -= count;
689 selection.mark.row -= count; 702 selection.mark.row -= count;
690 703
691 if (selection.beg.row < top_row 704 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 705 }
699 706
700 // finally move the view window, if desired 707 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 709 && view_start != 0
… …
732 } 739 }
733 740
734 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
736 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
737 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
738 753
739 min_it (count, rows); 754 min_it (count, rows);
740 755
741 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 757
743 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
744 { 759 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 761
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 764 }
750 765
751 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
753 } 775 }
754 776
755 return count; 777 return count;
756} 778}
757 779
758/* ------------------------------------------------------------------------- */ 780/* ------------------------------------------------------------------------- */
759/* 781/*
760 * Add text given in <str> of length <len> to screen struct 782 * Add text given in <str> of length <len> to screen struct
761 */ 783 */
762void 784void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 786{
765 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
766 return; 788 return;
767 789
768 unsigned char checksel; 790 bool checksel;
769 unicode_t c; 791 unicode_t c;
770 int ncol = this->ncol; 792 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
772 794
773 want_refresh = 1; 795 want_refresh = 1;
… …
1117 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1120 */ 1142 */
1121#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1122void 1144void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1124{ 1146{
1125 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1149 else
… …
1134 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1137 */ 1159 */
1138#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1139void 1161void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1141{ 1163{
1142 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1166 else
… …
1295 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1296} 1318}
1297 1319
1298/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1299/* 1321/*
1300 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1326 */
1305void 1327void
… …
1314 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1315 1337
1316 switch (mode) 1338 switch (mode)
1317 { 1339 {
1318 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1341 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1343 num = nrow - row;
1323 break; 1344 break;
1324 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1346 scr_erase_line (1);
1327 row = 0; 1347 row = 0;
1328 num = screen.cur.row; 1348 num = screen.cur.row;
1329 break; 1349 break;
1330 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1351 row = 0;
1333 num = nrow; 1352 num = nrow;
1334 break; 1353 break;
1335 default: 1354 default:
1336 return; 1355 return;
… …
1353 { 1372 {
1354 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1355 1374
1356 if (mapped) 1375 if (mapped)
1357 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1360 } 1379 }
1361 else 1380 else
1362 { 1381 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1385 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1389 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1390 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1394 }
1376 } 1395 }
… …
1398/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1399/* 1418/*
1400 * Fill the screen with `E's 1419 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1421 */
1403void 1422void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1405{ 1424{
1406 rend_t fs; 1425 rend_t fs;
1407 1426
1408 want_refresh = 1; 1427 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1410 1429
1411 num_scr_allow = 0; 1430 num_scr_allow = 0;
1412 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1413 1436
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1416 { 1439 {
1417 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1569/* 1592/*
1570 * Set the scrolling region 1593 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1595 */
1573void 1596void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1598{
1576 max_it (top, 0); 1599 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1578 1601
… …
1588/* 1611/*
1589 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1615 */
1593void 1616void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1618{
1596 want_refresh = 1; 1619 want_refresh = 1;
1597 1620
1598 if (mode) 1621 if (mode)
… …
1605/* 1628/*
1606 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1632 */
1610void 1633void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1635{
1613 if (mode) 1636 if (mode)
1614 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1615 else 1638 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1647 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1651 */
1629void 1652void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1654{
1632 if (mode) 1655 if (mode)
1633 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1634 else 1657 else
… …
1641/* 1664/*
1642 * Set insert/replace mode 1665 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1668 */
1646void 1669void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1671{
1649 if (mode) 1672 if (mode)
1650 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1651 else 1674 else
… …
1657 * Set/Unset tabs 1680 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1684 */
1662void 1685void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1687{
1665 if (mode < 0) 1688 if (mode < 0)
1666 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
… …
1686 if (rvideo_state != on) 1709 if (rvideo_state != on)
1687 { 1710 {
1688 rvideo_state = on; 1711 rvideo_state = on;
1689 1712
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1692 if (bg_pixmap == None) 1715 if (bg_img == 0)
1693#endif 1716#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1718
1696 XGCValues gcvalue; 1719 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1707/* 1730/*
1708 * Report current cursor position 1731 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1733 */
1711void 1734void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1713{ 1736{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1738}
1716 1739
… …
1719 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1720 1743
1721/* 1744/*
1722 * Set font style 1745 * Set font style
1723 */ 1746 */
1724void 1747void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1726{ 1749{
1727#if 0 1750#if 0
1728 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1729 { 1752 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1778 */
1756void 1779void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1781{
1759 screen.charset = set; 1782 screen.charset = set;
1760 set_font_style (); 1783 set_font_style ();
1761} 1784}
… …
1782 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1783 1806
1784/* 1807/*
1785 * refresh matching text. 1808 * refresh matching text.
1786 */ 1809 */
1787bool 1810bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1812{
1790 bool found = false; 1813 bool found = false;
1791 1814
1792 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1834 PART_BEG = 0,
1812 PART_END, 1835 PART_END,
1813 RC_COUNT 1836 RC_COUNT
1814}; 1837};
1815 1838
1816void 1839void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1841{
1819 int i; 1842 int i;
1820 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1821 1844
… …
1858 * Refresh the entire screen 1881 * Refresh the entire screen
1859 */ 1882 */
1860void 1883void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1885{
1863 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1887}
1865 1888
1866/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1867/* 1890/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1971#endif
1949} 1972}
1950 1973
1951/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1952void 1975void ecb_cold
1953rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1954{ 1977{
1955#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1956 int nrows, row_start; 1979 int nrows, row_start;
1957 FILE *fd = popen_printer (); 1980 FILE *fd = popen_printer ();
… …
2006/* 2029/*
2007 * Refresh the screen 2030 * Refresh the screen
2008 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2009 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2010 */ 2033 */
2011void 2034void ecb_hot
2012rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2013{ 2036{
2014 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2039 int i; /* tmp */
… …
2030 * A: set up vars 2053 * A: set up vars
2031 */ 2054 */
2032 refresh_count = 0; 2055 refresh_count = 0;
2033 2056
2034 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2058 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2037 have_bg = bg_pixmap != None; 2060 have_bg = bg_img != 0;
2038#endif 2061#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2063
2041 /* 2064 /*
2042 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2071 scr_swap_overlay ();
2049#endif 2072#endif
2050 2073
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2075
2053 /* 2076 /*
2054 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2055 */ 2078 */
2056 { 2079 {
2057 unsigned char setoldcursor; 2080 bool setoldcursor;
2058 2081
2059#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2083 if (hidden_cursor)
2061 showcursor = 0; 2084 showcursor = 0;
2062#endif 2085#endif
… …
2149 { 2172 {
2150 int16_t nits; 2173 int16_t nits;
2151 int i = num_scr; 2174 int i = num_scr;
2152 int j; 2175 int j;
2153 int len, wlen; 2176 int len, wlen;
2154 dLocal (int, num_scr);
2155 2177
2156 j = nrow; 2178 j = nrow;
2157 wlen = len = -1; 2179 wlen = len = -1;
2158 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2159 2181
… …
2464 2486
2465 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2466 Col2Pixel (col), 2488 Col2Pixel (col),
2467 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2468 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2470 } 2492 }
2471 } 2493 }
2472 2494
2473 /* 2495 /*
2474 * H: cleanup selection 2496 * H: cleanup selection
… …
2483 screen.flags = old_screen_flags; 2505 screen.flags = old_screen_flags;
2484 num_scr = 0; 2506 num_scr = 0;
2485 num_scr_allow = 1; 2507 num_scr_allow = 1;
2486} 2508}
2487 2509
2488void 2510void ecb_cold
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490{ 2512{
2491 if (!l.t) 2513 if (!l.valid ())
2492 return; 2514 return;
2493 2515
2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495 2517
2496 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2498} 2520}
2499 2521
2500void 2522void ecb_cold
2501rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2502{ 2524{
2503 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2504 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2505 2527
… …
2508 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2509 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2510 } 2532 }
2511} 2533}
2512 2534
2513void 2535void ecb_cold
2514rxvt_term::scr_recolour (bool refresh) NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2515{ 2537{
2516 bool transparent = false; 2538 bool transparent = false;
2517 2539
2518#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_IMG
2519 if (bg_pixmap != None) 2541 if (bg_img != 0)
2520 { 2542 {
2521# ifdef ENABLE_TRANSPARENCY 2543# if ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT) 2544 if (bg_flags & BG_IS_TRANSPARENT)
2523 { 2545 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2546 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526 2548
2527 transparent = true; 2549 transparent = true;
2528 } 2550 }
2529 else 2551 else
2530# endif 2552# endif
2531 { 2553 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2555 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2534 } 2556 }
2535 } 2557 }
2536 else 2558 else
2537#endif 2559#endif
2538 { 2560 {
… …
2545 if (scrollBar.win) 2567 if (scrollBar.win)
2546 { 2568 {
2547 if (transparent) 2569 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2571 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2551 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2552 scrollBar.show (0); 2574 scrollBar.show (0);
2553 } 2575 }
2554 2576
2555 if (refresh) 2577 if (refresh)
2556 { 2578 {
… …
2621 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2622 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2623} 2645}
2624 2646
2625/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2626void 2648void ecb_hot
2627rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2628{ 2650{
2629 if (selection.op 2651 if (selection.op
2630 && current_screen == selection.screen 2652 && current_screen == selection.screen
2631 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
… …
2650 */ 2672 */
2651#if 0 2673#if 0
2652void 2674void
2653rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2654{ 2676{
2655 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2656 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2657 const char r1[] = "\n";
2658
2659 for (row = saveLines + top_row;
2660 row < saveLines + nrow - 1; row++)
2661 {
2662 width = row_buf[row].l >= 0 ? row_buf[row].l
2663 : ncol;
2664 for (towrite = width; towrite; towrite -= wrote)
2665 {
2666 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2667 towrite);
2668 if (wrote < 0)
2669 return; /* XXX: death, no report */
2670 }
2671 if (row_buf[row].l >= 0)
2672 if (write (fd, r1, 1) <= 0)
2673 return; /* XXX: death, no report */
2674 }
2675} 2679}
2676#endif 2680#endif
2677 2681
2678/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2679 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2680 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2681void 2685void
2682rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2683{ 2687{
2684 row_col_t pos;
2685
2686 if (!selection.op) 2688 if (!selection.op)
2687 return; 2689 return;
2688 2690
2689 pos.row = pos.col = 0;
2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2693 || (check_more == 1 2694 || (check_more == 1
2694 && current_screen == selection.screen 2695 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2697 || (check_more == 2
2698 && ROWCOL_IS_BEFORE (selection.beg, pos)
2699 && ROWCOL_IS_AFTER (selection.end, pos))
2700 || (check_more == 3
2701 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 4 /* screen width change */
2703 && (selection.beg.row != selection.end.row
2704 || selection.end.col > ncol)))
2705 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2706} 2699}
2707 2700
2708/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2709/* 2702/*
2710 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
2716 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2717 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2718 data[i] = C0_CR; 2711 data[i] = C0_CR;
2719 2712
2720 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2721 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2722 2715
2723 tt_write (data, len); 2716 tt_write (data, len);
2724 2717
2725 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2726 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2727} 2720}
2728 2721
2729void 2722void
2730rxvt_term::paste (char *data, unsigned int len) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2731{ 2724{
… …
2951/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
2952/* 2945/*
2953 * 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
2954 * EXT: button 1 press 2947 * EXT: button 1 press
2955 */ 2948 */
2956void 2949void ecb_cold
2957rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2958{ 2951{
2959 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
2960 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
2961 2954
… …
2980 2973
2981/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
2982/* 2975/*
2983 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
2984 */ 2977 */
2985void 2978void ecb_cold
2986rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2987{ 2980{
2988 want_refresh = 1; 2981 want_refresh = 1;
2989 2982
2990 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3017/* 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 */
3018#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3019 (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)))
3020#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3021 3014
3022void 3015void ecb_cold
3023rxvt_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
3024{ 3017{
3025 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3026 row_col_t bound; 3019 row_col_t bound;
3027 text_t *stp; 3020 text_t *stp;
… …
3101 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3102 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3103 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3104 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3105 */ 3098 */
3106void 3099void ecb_cold
3107rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3108{ 3101{
3109 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3110 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3111 3104
… …
3137 3130
3138/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3139/* 3132/*
3140 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3141 */ 3134 */
3142void 3135void ecb_cold
3143rxvt_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
3144{ 3137{
3145 row_col_t pos; 3138 row_col_t pos;
3146 enum { 3139 enum {
3147 LEFT, RIGHT 3140 LEFT, RIGHT
… …
3338 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3339#endif 3332#endif
3340} 3333}
3341 3334
3342#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3343void 3336void ecb_cold
3344rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3345{ 3338{
3346 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3347 text_t *stp; 3340 text_t *stp;
3348 3341
… …
3386/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3387/* 3380/*
3388 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3389 * EXT: button 3 double click 3382 * EXT: button 3 double click
3390 */ 3383 */
3391void 3384void ecb_cold
3392rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3393{ 3386{
3394 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3395 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3396} 3389}
… …
3398/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3399/* 3392/*
3400 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3401 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3402 */ 3395 */
3403void 3396void ecb_cold
3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3405{ 3398{
3406 Atom property = rq.property == None ? rq.target : rq.property; 3399 Atom property = rq.property == None ? rq.target : rq.property;
3407 XSelectionEvent ev; 3400 XSelectionEvent ev;
3408 3401
… …
3541 3534
3542 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3543} 3536}
3544 3537
3545/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3546#ifdef USE_XIM 3539#if USE_XIM
3547void 3540void ecb_cold
3548rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3549{ 3542{
3550 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3551 3544
3552 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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