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

Diff Legend

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