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.416 by root, Mon May 28 14:26:11 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 ()
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 tetx_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 281
273 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 286 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 305 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 307
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 309 {
304 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
305 311
306 plines++; 312 plines++;
307 llen += prev_ncol; 313 llen += prev_ncol;
… …
320 326
321 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
323 { 329 {
324 qline = row_buf + qrow; 330 qline = row_buf + qrow;
325 lalloc (*qline); 331 qline->alloc (); // redundant with next line
326 qline->l = ncol; 332 qline->l = ncol;
327 qline->is_longer (1); 333 qline->is_longer (1);
328 334
329 int qcol = 0; 335 int qcol = 0;
330 336
… …
345 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
346 // least. 352 // least.
347 if (prow == ocur.row) 353 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
349 355
350 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
351 357
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 359
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 382 {
377 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
378 384
379 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
380 { 386 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
383 389
384 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 394 }
387 395
388 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 398
393 term_start = 0; 399 term_start = 0;
394 } 400 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 401
400 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
406 417
407 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
… …
422 * Free everything. That way malloc debugging can find leakage. 433 * Free everything. That way malloc debugging can find leakage.
423 */ 434 */
424void 435void
425rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
426{ 437{
427 if (row_buf) 438 free (chunk);
428 {
429 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0;
431
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 439 free (tabs);
438 tabs = 0;
439 }
440} 440}
441 441
442/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
443/* 443/*
444 * Hard/Soft reset 444 * Hard/Soft reset
445 */ 445 */
446void 446void
447rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
448{ 448{
449 scr_release (); 449 scr_release ();
450
451 row_buf = 0;
452 tabs = 0;
450 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 454 rvideo_mode = false;
452 scr_soft_reset (); 455 scr_soft_reset ();
453 scr_reset (); 456 scr_reset ();
454 457
455 scr_clear (true); 458 scr_clear (true);
456 scr_refresh (); 459 scr_refresh ();
457} 460}
458 461
459void 462void
460rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
461{ 464{
462 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
464 scr_overlay_off (); 467 scr_overlay_off ();
465#endif 468#endif
… …
520 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
522} 525}
523 526
524void 527void
525rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
526{ 529{
527 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
528 return; 531 return;
529 532
530 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
549 return; 552 return;
550 553
551 want_refresh = 1; 554 want_refresh = 1;
552 view_start = 0; 555 view_start = 0;
553 556
554 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
555 563
556 current_screen = scrn; 564 current_screen = scrn;
557 565
558#if NSCREENS 566#if NSCREENS
559 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
638 646
639 if (count > 0 647 if (count > 0
640 && row1 == 0 648 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
643 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 654
648 // sever bottommost line 655 // sever bottommost line
649 { 656 {
650 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
651 l.is_longer (0); 658 l.is_longer (0);
652 l.touch (); 659 l.touch ();
653 } 660 }
654 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
655 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 678 for (int i = count; i--; )
657 { 679 {
658 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
659 681
660 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 683 // 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))) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 685 {
664 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 687 l.l = 0;
… …
667 } 689 }
668 else 690 else
669 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
670 } 692 }
671 693
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 694 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
686 { 697 {
687 selection.beg.row -= count; 698 selection.beg.row -= count;
688 selection.end.row -= count; 699 selection.end.row -= count;
689 selection.mark.row -= count; 700 selection.mark.row -= count;
690 701
691 if (selection.beg.row < top_row 702 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 } 703 }
699 704
700 // finally move the view window, if desired 705 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 707 && view_start != 0
… …
732 } 737 }
733 738
734 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
736 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
737 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
738 751
739 min_it (count, rows); 752 min_it (count, rows);
740 753
741 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 755
743 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
744 { 757 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 759
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 762 }
750 763
751 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
753 } 773 }
754 774
755 return count; 775 return count;
756} 776}
757 777
… …
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 784{
765 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
766 return; 786 return;
767 787
768 unsigned char checksel; 788 bool checksel;
769 unicode_t c; 789 unicode_t c;
770 int ncol = this->ncol; 790 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
772 792
773 want_refresh = 1; 793 want_refresh = 1;
… …
1295 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1296} 1316}
1297 1317
1298/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1299/* 1319/*
1300 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1324 */
1305void 1325void
… …
1314 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1315 1335
1316 switch (mode) 1336 switch (mode)
1317 { 1337 {
1318 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1339 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1341 num = nrow - row;
1323 break; 1342 break;
1324 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1344 scr_erase_line (1);
1327 row = 0; 1345 row = 0;
1328 num = screen.cur.row; 1346 num = screen.cur.row;
1329 break; 1347 break;
1330 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1349 row = 0;
1333 num = nrow; 1350 num = nrow;
1334 break; 1351 break;
1335 default: 1352 default:
1336 return; 1353 return;
… …
1353 { 1370 {
1354 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1355 1372
1356 if (mapped) 1373 if (mapped)
1357 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1360 } 1377 }
1361 else 1378 else
1362 { 1379 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1383 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1388 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1392 }
1376 } 1393 }
… …
1407 1424
1408 want_refresh = 1; 1425 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1410 1427
1411 num_scr_allow = 0; 1428 num_scr_allow = 0;
1412 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1413 1434
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1416 { 1437 {
1417 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1858 * Refresh the entire screen 1879 * Refresh the entire screen
1859 */ 1880 */
1860void 1881void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1883{
1863 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1885}
1865 1886
1866/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1867/* 1888/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
2030 * A: set up vars 2051 * A: set up vars
2031 */ 2052 */
2032 refresh_count = 0; 2053 refresh_count = 0;
2033 2054
2034 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2035 char have_bg = 0; 2056 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2037 have_bg = bg_pixmap != None; 2058 have_bg = bg_pixmap != None;
2038#endif 2059#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2061
… …
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2048 scr_swap_overlay (); 2069 scr_swap_overlay ();
2049#endif 2070#endif
2050 2071
2051 char showcursor = screen.flags & Screen_VisibleCursor; 2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2052 2073
2053 /* 2074 /*
2054 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2055 */ 2076 */
2056 { 2077 {
2057 unsigned char setoldcursor; 2078 bool setoldcursor;
2058 2079
2059#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2060 if (hidden_cursor) 2081 if (hidden_cursor)
2061 showcursor = 0; 2082 showcursor = 0;
2062#endif 2083#endif
… …
2149 { 2170 {
2150 int16_t nits; 2171 int16_t nits;
2151 int i = num_scr; 2172 int i = num_scr;
2152 int j; 2173 int j;
2153 int len, wlen; 2174 int len, wlen;
2154 dLocal (int, num_scr);
2155 2175
2156 j = nrow; 2176 j = nrow;
2157 wlen = len = -1; 2177 wlen = len = -1;
2158 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2159 2179
… …
2464 2484
2465 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2466 Col2Pixel (col), 2486 Col2Pixel (col),
2467 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2468 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2469 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2470 } 2490 }
2471 } 2491 }
2472 2492
2473 /* 2493 /*
2474 * H: cleanup selection 2494 * H: cleanup selection
… …
2486} 2506}
2487 2507
2488void 2508void
2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2490{ 2510{
2491 if (!l.t) 2511 if (!l.valid ())
2492 return; 2512 return;
2493 2513
2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2495 2515
2496 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
… …
2546 { 2566 {
2547 if (transparent) 2567 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else 2569 else
2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2551 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2552 scrollBar.show (0); 2572 scrollBar.show (0);
2553 } 2573 }
2554 2574
2555 if (refresh) 2575 if (refresh)
2556 { 2576 {
… …
2650 */ 2670 */
2651#if 0 2671#if 0
2652void 2672void
2653rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2654{ 2674{
2655 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2656 unsigned int width, towrite; 2676 // 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} 2677}
2676#endif 2678#endif
2677 2679
2678/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2679 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2680 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2681void 2683void
2682rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2683{ 2685{
2684 row_col_t pos;
2685
2686 if (!selection.op) 2686 if (!selection.op)
2687 return; 2687 return;
2688 2688
2689 pos.row = pos.col = 0;
2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2693 || (check_more == 1 2692 || (check_more == 1
2694 && current_screen == selection.screen 2693 && current_screen == selection.screen
2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2696 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && 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 (); 2696 CLEAR_ALL_SELECTION ();
2706} 2697}
2707 2698
2708/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2709/* 2700/*
2710 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2716 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2717 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2718 data[i] = C0_CR; 2709 data[i] = C0_CR;
2719 2710
2720 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2721 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2722 2713
2723 tt_write (data, len); 2714 tt_write (data, len);
2724 2715
2725 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2726 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2727} 2718}
2728 2719
2729void 2720void
2730rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2731{ 2722{

Diff Legend

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