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.381 by sf-exg, Fri Apr 22 10:01:39 2011 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 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 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 281
273 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 286 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 305 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 307
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 309 {
304 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
305 311
306 plines++; 312 plines++;
307 llen += prev_ncol; 313 llen += prev_ncol;
… …
320 326
321 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
323 { 329 {
324 qline = row_buf + qrow; 330 qline = row_buf + qrow;
325 lalloc (*qline); 331 qline->alloc (); // redundant with next line
326 qline->l = ncol; 332 qline->l = ncol;
327 qline->is_longer (1); 333 qline->is_longer (1);
328 334
329 int qcol = 0; 335 int qcol = 0;
330 336
… …
345 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
346 // least. 352 // least.
347 if (prow == ocur.row) 353 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
349 355
350 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
351 357
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 359
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 382 {
377 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
378 384
379 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
380 { 386 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
383 389
384 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 394 }
387 395
388 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 398
393 term_start = 0; 399 term_start = 0;
394 } 400 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 401
400 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
406 417
407 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 426 tt_winch ();
416 427
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 429}
419 430
420/* ------------------------------------------------------------------------- */ 431void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
426{ 433{
427 if (row_buf) 434 chunk_free (chunk, chunk_size);
428 { 435 chunk = 0;
429 delete talloc; talloc = 0; 436 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 437
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 438 free (tabs);
438 tabs = 0; 439 tabs = 0;
439 }
440} 440}
441 441
442/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
443/* 443/*
444 * Hard/Soft reset 444 * Hard/Soft reset
445 */ 445 */
446void 446void ecb_cold
447rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
448{ 448{
449 scr_release (); 449 scr_release ();
450
450 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 452 rvideo_mode = false;
452 scr_soft_reset (); 453 scr_soft_reset ();
453 scr_reset (); 454 scr_reset ();
454 455
455 scr_clear (true); 456 scr_clear (true);
456 scr_refresh (); 457 scr_refresh ();
457} 458}
458 459
459void 460void ecb_cold
460rxvt_term::scr_soft_reset () 461rxvt_term::scr_soft_reset () NOTHROW
461{ 462{
462 /* only affects modes, nothing drastic such as clearing the screen */ 463 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 464#if ENABLE_OVERLAY
464 scr_overlay_off (); 465 scr_overlay_off ();
465#endif 466#endif
… …
520 assert (s->cur.row >= 0); 521 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 522 assert (s->cur.col >= 0);
522} 523}
523 524
524void 525void
525rxvt_term::scr_swap_screen () 526rxvt_term::scr_swap_screen () NOTHROW
526{ 527{
527 if (!option (Opt_secondaryScreen)) 528 if (!option (Opt_secondaryScreen))
528 return; 529 return;
529 530
530 for (int i = prev_nrow; i--; ) 531 for (int i = prev_nrow; i--; )
… …
549 return; 550 return;
550 551
551 want_refresh = 1; 552 want_refresh = 1;
552 view_start = 0; 553 view_start = 0;
553 554
554 selection_check (2); /* check for boundary cross */ 555 /* check for boundary cross */
556 row_col_t pos;
557 pos.row = pos.col = 0;
558 if (ROWCOL_IS_BEFORE (selection.beg, pos)
559 && ROWCOL_IS_AFTER (selection.end, pos))
560 CLEAR_SELECTION ();
555 561
556 current_screen = scrn; 562 current_screen = scrn;
557 563
558#if NSCREENS 564#if NSCREENS
559 if (option (Opt_secondaryScreen)) 565 if (option (Opt_secondaryScreen))
… …
625/* 631/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 632 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 633 * count positive ==> scroll up
628 * count negative ==> scroll down 634 * count negative ==> scroll down
629 */ 635 */
630int 636int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 638{
633 if (count == 0 || (row1 > row2)) 639 if (count == 0 || (row1 > row2))
634 return 0; 640 return 0;
635 641
… …
638 644
639 if (count > 0 645 if (count > 0
640 && row1 == 0 646 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 647 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 648 {
649 min_it (count, total_rows - (nrow - (row2 + 1)));
650
643 top_row = max (top_row - count, -saveLines); 651 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 652
648 // sever bottommost line 653 // sever bottommost line
649 { 654 {
650 line_t &l = ROW(row2 - count); 655 line_t &l = ROW(row2);
651 l.is_longer (0); 656 l.is_longer (0);
652 l.touch (); 657 l.touch ();
653 } 658 }
654 659
660 // scroll everything up 'count' lines
661 term_start = (term_start + count) % total_rows;
662
663 // now copy lines below the scroll region bottom to the
664 // bottom of the screen again, so they look as if they
665 // hadn't moved.
666 for (int i = nrow; --i > row2; )
667 {
668 line_t &l1 = ROW(i - count);
669 line_t &l2 = ROW(i);
670
671 ::swap (l1, l2);
672 l2.touch ();
673 }
674
655 // erase newly scrolled-in lines 675 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 676 for (int i = count; i--; )
657 { 677 {
658 line_t &l = ROW(nrow - 1 - i); 678 line_t &l = ROW(row2 - i);
659 679
660 // optimize if already cleared, can be significant on slow machines 680 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 681 // 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))) 682 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 683 {
664 scr_blank_line (l, 0, l.l, rstyle); 684 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 685 l.l = 0;
… …
667 } 687 }
668 else 688 else
669 scr_blank_screen_mem (l, rstyle); 689 scr_blank_screen_mem (l, rstyle);
670 } 690 }
671 691
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 692 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 693 if (selection.op && current_screen == selection.screen
694 && selection.beg.row <= row2)
686 { 695 {
687 selection.beg.row -= count; 696 selection.beg.row -= count;
688 selection.end.row -= count; 697 selection.end.row -= count;
689 selection.mark.row -= count; 698 selection.mark.row -= count;
690 699
691 if (selection.beg.row < top_row 700 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 } 701 }
699 702
700 // finally move the view window, if desired 703 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 704 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 705 && view_start != 0
… …
732 } 735 }
733 736
734 // use a simple and robust scrolling algorithm, this 737 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 738 // part of scr_scroll_text is not time-critical.
736 739
740 // sever line above scroll region
741 if (row1)
742 {
743 line_t &l = ROW(row1 - 1);
744 l.is_longer (0);
745 l.touch ();
746 }
747
737 int rows = row2 - row1 + 1; 748 int rows = row2 - row1 + 1;
738 749
739 min_it (count, rows); 750 min_it (count, rows);
740 751
741 line_t *temp_buf = row_buf + total_rows; 752 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 753
743 for (int row = 0; row < rows; row++) 754 for (int row = 0; row < rows; row++)
744 { 755 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 756 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 757
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 759 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 760 }
750 761
751 for (int row = 0; row < rows; row++) 762 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 763 ROW(row1 + row) = temp_buf [row];
764
765 // sever bottommost line
766 {
767 line_t &l = ROW(row2);
768 l.is_longer (0);
769 l.touch ();
770 }
753 } 771 }
754 772
755 return count; 773 return count;
756} 774}
757 775
758/* ------------------------------------------------------------------------- */ 776/* ------------------------------------------------------------------------- */
759/* 777/*
760 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
761 */ 779 */
762void 780void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 782{
765 if (len <= 0) /* sanity */ 783 if (len <= 0) /* sanity */
766 return; 784 return;
767 785
768 unsigned char checksel; 786 bool checksel;
769 unicode_t c; 787 unicode_t c;
770 int ncol = this->ncol; 788 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 789 const wchar_t *strend = str + len;
772 790
773 want_refresh = 1; 791 want_refresh = 1;
… …
799 817
800 while (str < strend) 818 while (str < strend)
801 { 819 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 821
804 if (expect_false (c < 0x20)) 822 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 823 if (c == C0_LF)
806 { 824 {
807 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
808 826
809 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
828 { 846 {
829 scr_tab (1, true); 847 scr_tab (1, true);
830 continue; 848 continue;
831 } 849 }
832 850
833 if (expect_false ( 851 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 855 ))
838 { 856 {
… …
843 * should be a similar check. 861 * should be a similar check.
844 */ 862 */
845 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
846 } 864 }
847 865
848 if (expect_false (screen.flags & Screen_WrapNext)) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 867 {
850 scr_do_wrap (); 868 scr_do_wrap ();
851 869
852 line->l = ncol; 870 line->l = ncol;
853 line->is_longer (1); 871 line->is_longer (1);
… …
855 row = screen.cur.row; 873 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
857 } 875 }
858 876
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 879 c = 0xfffd;
862 880
863 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
866 // locale. 884 // locale.
867 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
868 886
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 888 {
871 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 890 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
889 } 907 }
890 } 908 }
891 909
892 if (expect_false (screen.flags & Screen_Insert)) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
894 912
895 if (width != 0) 913 if (width != 0)
896 { 914 {
897#if !UNICODE_3 915#if !UNICODE_3
… …
905#endif 923#endif
906 924
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 926
909 // if the character doesn't fit into the remaining columns... 927 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 { 929 {
912 if (screen.flags & Screen_Autowrap) 930 if (screen.flags & Screen_Autowrap)
913 { 931 {
914 // ... artificially enlargen the previous one 932 // ... artificially enlargen the previous one
915 c = NOCHAR; 933 c = NOCHAR;
… …
922 940
923 // nuke the character at this position, if required 941 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop 942 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself, 943 // we never have to check for overwriting a wide char itself,
926 // only its tail. 944 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 945 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col); 946 scr_kill_char (*line, screen.cur.col);
929 947
930 line->touch (); 948 line->touch ();
931 949
932 do 950 do
933 { 951 {
934 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
935 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
936 954
937 if (expect_true (screen.cur.col < ncol - 1)) 955 if (ecb_likely (screen.cur.col < ncol - 1))
938 screen.cur.col++; 956 screen.cur.col++;
939 else 957 else
940 { 958 {
941 line->l = ncol; 959 line->l = ncol;
942 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
… …
945 goto end_of_line; 963 goto end_of_line;
946 } 964 }
947 965
948 c = NOCHAR; 966 c = NOCHAR;
949 } 967 }
950 while (expect_false (--width > 0)); 968 while (ecb_unlikely (--width > 0));
951 969
952 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954 { 972 {
955 line->t[c] = ' '; 973 line->t[c] = ' ';
956 line->r[c] = rend; 974 line->r[c] = rend;
957 } 975 }
958 976
… …
1117 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1136 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1120 */ 1138 */
1121#if !ENABLE_MINIMAL 1139#if !ENABLE_MINIMAL
1122void 1140void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1141rxvt_term::scr_backindex () NOTHROW
1124{ 1142{
1125 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1145 else
… …
1134 * XTERM_SEQ: ESC 9 1152 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1153 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1154 * in that row left. Clear right column.
1137 */ 1155 */
1138#if !ENABLE_MINIMAL 1156#if !ENABLE_MINIMAL
1139void 1157void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1158rxvt_term::scr_forwardindex () NOTHROW
1141{ 1159{
1142 if (screen.cur.col < ncol - 1) 1160 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1162 else
… …
1295 scr_blank_line (line, col, num, rstyle); 1313 scr_blank_line (line, col, num, rstyle);
1296} 1314}
1297 1315
1298/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1299/* 1317/*
1300 * Erase part of whole of the screen 1318 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1322 */
1305void 1323void
… …
1314 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1315 1333
1316 switch (mode) 1334 switch (mode)
1317 { 1335 {
1318 case 0: /* erase to end of screen */ 1336 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1337 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1338 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1339 num = nrow - row;
1323 break; 1340 break;
1324 case 1: /* erase to beginning of screen */ 1341 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1342 scr_erase_line (1);
1327 row = 0; 1343 row = 0;
1328 num = screen.cur.row; 1344 num = screen.cur.row;
1329 break; 1345 break;
1330 case 2: /* erase whole screen */ 1346 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1347 row = 0;
1333 num = nrow; 1348 num = nrow;
1334 break; 1349 break;
1335 default: 1350 default:
1336 return; 1351 return;
… …
1353 { 1368 {
1354 ren = DEFAULT_RSTYLE; 1369 ren = DEFAULT_RSTYLE;
1355 1370
1356 if (mapped) 1371 if (mapped)
1357 XClearArea (dpy, vt, 0, 1372 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1373 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1374 (unsigned int)Height2Pixel (num), False);
1360 } 1375 }
1361 else 1376 else
1362 { 1377 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1378 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1381 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1382 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1384 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1385 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1386 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1387 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1390 }
1376 } 1391 }
… …
1398/* ------------------------------------------------------------------------- */ 1413/* ------------------------------------------------------------------------- */
1399/* 1414/*
1400 * Fill the screen with `E's 1415 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1417 */
1403void 1418void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1419rxvt_term::scr_E () NOTHROW
1405{ 1420{
1406 rend_t fs; 1421 rend_t fs;
1407 1422
1408 want_refresh = 1; 1423 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1424 ZERO_SCROLLBACK ();
1410 1425
1411 num_scr_allow = 0; 1426 num_scr_allow = 0;
1412 selection_check (3); 1427
1428 row_col_t pos;
1429 pos.row = pos.col = 0;
1430 if (ROWCOL_IS_AFTER (selection.end, pos))
1431 CLEAR_SELECTION ();
1413 1432
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1433 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1434 for (int row = nrow; row--; )
1416 { 1435 {
1417 line_t &line = ROW(row); 1436 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1569/* 1588/*
1570 * Set the scrolling region 1589 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1591 */
1573void 1592void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1594{
1576 max_it (top, 0); 1595 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1596 min_it (bot, nrow - 1);
1578 1597
… …
1588/* 1607/*
1589 * Make the cursor visible/invisible 1608 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1611 */
1593void 1612void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1613rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1614{
1596 want_refresh = 1; 1615 want_refresh = 1;
1597 1616
1598 if (mode) 1617 if (mode)
… …
1605/* 1624/*
1606 * Set/unset automatic wrapping 1625 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1628 */
1610void 1629void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1630rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1631{
1613 if (mode) 1632 if (mode)
1614 screen.flags |= Screen_Autowrap; 1633 screen.flags |= Screen_Autowrap;
1615 else 1634 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1643 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1644 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1647 */
1629void 1648void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1649rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1650{
1632 if (mode) 1651 if (mode)
1633 screen.flags |= Screen_Relative; 1652 screen.flags |= Screen_Relative;
1634 else 1653 else
… …
1641/* 1660/*
1642 * Set insert/replace mode 1661 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1664 */
1646void 1665void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1666rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1667{
1649 if (mode) 1668 if (mode)
1650 screen.flags |= Screen_Insert; 1669 screen.flags |= Screen_Insert;
1651 else 1670 else
… …
1657 * Set/Unset tabs 1676 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1677 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1680 */
1662void 1681void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1682rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1683{
1665 if (mode < 0) 1684 if (mode < 0)
1666 memset (tabs, 0, ncol); 1685 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1686 else if (screen.cur.col < ncol)
… …
1687 { 1706 {
1688 rvideo_state = on; 1707 rvideo_state = on;
1689 1708
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1692 if (bg_pixmap == None) 1711 if (bg_img == 0)
1693#endif 1712#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1714
1696 XGCValues gcvalue; 1715 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1716 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1707/* 1726/*
1708 * Report current cursor position 1727 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1728 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1729 */
1711void 1730void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1731rxvt_term::scr_report_position () NOTHROW
1713{ 1732{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1734}
1716 1735
… …
1719 * ------------------------------------------------------------------------- */ 1738 * ------------------------------------------------------------------------- */
1720 1739
1721/* 1740/*
1722 * Set font style 1741 * Set font style
1723 */ 1742 */
1724void 1743void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1744rxvt_term::set_font_style () NOTHROW
1726{ 1745{
1727#if 0 1746#if 0
1728 switch (charsets [screen.charset]) 1747 switch (charsets [screen.charset])
1729 { 1748 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1770 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1772 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1773 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1774 */
1756void 1775void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1776rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1777{
1759 screen.charset = set; 1778 screen.charset = set;
1760 set_font_style (); 1779 set_font_style ();
1761} 1780}
… …
1782 * ------------------------------------------------------------------------- */ 1801 * ------------------------------------------------------------------------- */
1783 1802
1784/* 1803/*
1785 * refresh matching text. 1804 * refresh matching text.
1786 */ 1805 */
1787bool 1806bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1808{
1790 bool found = false; 1809 bool found = false;
1791 1810
1792 for (int i = 0; i < nrow; i++) 1811 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1830 PART_BEG = 0,
1812 PART_END, 1831 PART_END,
1813 RC_COUNT 1832 RC_COUNT
1814}; 1833};
1815 1834
1816void 1835void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1837{
1819 int i; 1838 int i;
1820 row_col_t rc[RC_COUNT]; 1839 row_col_t rc[RC_COUNT];
1821 1840
… …
1858 * Refresh the entire screen 1877 * Refresh the entire screen
1859 */ 1878 */
1860void 1879void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1880rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1881{
1863 scr_expose (0, 0, width, height, refresh); 1882 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1883}
1865 1884
1866/* ------------------------------------------------------------------------- */ 1885/* ------------------------------------------------------------------------- */
1867/* 1886/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1887 * Move the display so that the line represented by scrollbar value Y is at
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1966 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1967#endif
1949} 1968}
1950 1969
1951/* ------------------------------------------------------------------------- */ 1970/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1971void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1972rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1973{
1956#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1957 int nrows, row_start; 1975 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1976 FILE *fd = popen_printer ();
… …
2007/* 2025/*
2008 * Refresh the screen 2026 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2029 */
2012void 2030void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2031rxvt_term::scr_refresh () NOTHROW
2014{ 2032{
2015 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2035 int i; /* tmp */
… …
2031 * A: set up vars 2049 * A: set up vars
2032 */ 2050 */
2033 refresh_count = 0; 2051 refresh_count = 0;
2034 2052
2035 unsigned int old_screen_flags = screen.flags; 2053 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2054 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2055#ifdef HAVE_BG_PIXMAP
2038 have_bg = bg_pixmap != None; 2056 have_bg = bg_img != 0;
2039#endif 2057#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2059
2042 /* 2060 /*
2043 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2066#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2067 scr_swap_overlay ();
2050#endif 2068#endif
2051 2069
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2070 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2071
2054 /* 2072 /*
2055 * C: set the cursor character (s) 2073 * C: set the cursor character (s)
2056 */ 2074 */
2057 { 2075 {
2058 unsigned char setoldcursor; 2076 bool setoldcursor;
2059 2077
2060#ifdef CURSOR_BLINK 2078#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2079 if (hidden_cursor)
2062 showcursor = 0; 2080 showcursor = 0;
2063#endif 2081#endif
… …
2150 { 2168 {
2151 int16_t nits; 2169 int16_t nits;
2152 int i = num_scr; 2170 int i = num_scr;
2153 int j; 2171 int j;
2154 int len, wlen; 2172 int len, wlen;
2155 dLocal (int, num_scr);
2156 2173
2157 j = nrow; 2174 j = nrow;
2158 wlen = len = -1; 2175 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2176 row = i > 0 ? 0 : j - 1;
2160 2177
… …
2235 continue; 2252 continue;
2236 2253
2237 // redraw one or more characters 2254 // redraw one or more characters
2238 2255
2239 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2258 --col;
2242 2259
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2261 text_t *text = stp + col;
2245 int count = 1; 2262 int count = 1;
… …
2283 2300
2284 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2286 2303
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2306 count++, i--;
2290 2307
2291 /* 2308 /*
2292 * Determine the attributes for the string 2309 * Determine the attributes for the string
2293 */ 2310 */
2294 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2296 2313
2297 // only do special processing if any attributes are set, which is unlikely 2314 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2316 {
2300 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2301 2318
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2409 /*
2393 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2394 */ 2411 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2413
2397 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2415 {
2399 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2400 2417
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2409 did_clear: ; 2426 did_clear: ;
2410 } 2427 }
2411 else 2428 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2430
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 2432 {
2416#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2436 else
… …
2465 2482
2466 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2484 Col2Pixel (col),
2468 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2488 }
2472 } 2489 }
2473 2490
2474 /* 2491 /*
2475 * H: cleanup selection 2492 * H: cleanup selection
… …
2484 screen.flags = old_screen_flags; 2501 screen.flags = old_screen_flags;
2485 num_scr = 0; 2502 num_scr = 0;
2486 num_scr_allow = 1; 2503 num_scr_allow = 1;
2487} 2504}
2488 2505
2489void 2506void ecb_cold
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2508{
2492 if (!l.t) 2509 if (!l.valid ())
2493 return; 2510 return;
2494 2511
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2513
2497 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2498 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2499} 2516}
2500 2517
2501void 2518void ecb_cold
2502rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2503{ 2520{
2504 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2505 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2506 2523
… …
2509 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2510 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2511 } 2528 }
2512} 2529}
2513 2530
2514void 2531void ecb_cold
2515rxvt_term::scr_recolour (bool refresh) NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2533{
2517 bool transparent = false; 2534 bool transparent = false;
2518 2535
2519#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2520 if (bg_pixmap != None) 2537 if (bg_img != 0)
2521 { 2538 {
2522# ifdef ENABLE_TRANSPARENCY 2539# if ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT) 2540 if (bg_flags & BG_IS_TRANSPARENT)
2524 { 2541 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527 2544
2528 transparent = true; 2545 transparent = true;
2529 } 2546 }
2530 else 2547 else
2531# endif 2548# endif
2532 { 2549 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2535 } 2552 }
2536 } 2553 }
2537 else 2554 else
2538#endif 2555#endif
2539 { 2556 {
… …
2547 { 2564 {
2548 if (transparent) 2565 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else 2567 else
2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2552 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2553 scrollBar.show (0); 2570 scrollBar.show (0);
2554 } 2571 }
2555 2572
2556 if (refresh) 2573 if (refresh)
2557 { 2574 {
… …
2622 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2623 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2624} 2641}
2625 2642
2626/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2627void 2644void ecb_hot
2628rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2629{ 2646{
2630 if (selection.op 2647 if (selection.op
2631 && current_screen == selection.screen 2648 && current_screen == selection.screen
2632 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
… …
2651 */ 2668 */
2652#if 0 2669#if 0
2653void 2670void
2654rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2655{ 2672{
2656 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2657 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2658 const char r1[] = "\n";
2659
2660 for (row = saveLines + top_row;
2661 row < saveLines + nrow - 1; row++)
2662 {
2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2664 : ncol;
2665 for (towrite = width; towrite; towrite -= wrote)
2666 {
2667 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2668 towrite);
2669 if (wrote < 0)
2670 return; /* XXX: death, no report */
2671 }
2672 if (row_buf[row].l >= 0)
2673 if (write (fd, r1, 1) <= 0)
2674 return; /* XXX: death, no report */
2675 }
2676} 2675}
2677#endif 2676#endif
2678 2677
2679/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2680 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2681 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2682void 2681void
2683rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2684{ 2683{
2685 row_col_t pos;
2686
2687 if (!selection.op) 2684 if (!selection.op)
2688 return; 2685 return;
2689 2686
2690 pos.row = pos.col = 0;
2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2694 || (check_more == 1 2690 || (check_more == 1
2695 && current_screen == selection.screen 2691 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2698 || (check_more == 2
2699 && ROWCOL_IS_BEFORE (selection.beg, pos)
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 3
2702 && ROWCOL_IS_AFTER (selection.end, pos))
2703 || (check_more == 4 /* screen width change */
2704 && (selection.beg.row != selection.end.row
2705 || selection.end.col > ncol)))
2706 CLEAR_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2707} 2695}
2708 2696
2709/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2710/* 2698/*
2711 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
… …
2717 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2718 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2719 data[i] = C0_CR; 2707 data[i] = C0_CR;
2720 2708
2721 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2723 2711
2724 tt_write (data, len); 2712 tt_write (data, len);
2725 2713
2726 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2728} 2716}
2729 2717
2730void 2718void
2731rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2732{ 2720{
… …
2736 tt_paste (data, len); 2724 tt_paste (data, len);
2737} 2725}
2738 2726
2739/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2740/* 2728/*
2741 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2742 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2743 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * as fallback
2744 * > CUT_BUFFER0
2745 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2746 * will auto fallback to CUT_BUFFER0
2747 * EXT: button 2 release 2732 * EXT: button 2 release
2748 */ 2733 */
2749void 2734void
2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2751{ 2736{
… …
2955/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
2956/* 2941/*
2957 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
2958 * EXT: button 1 press 2943 * EXT: button 1 press
2959 */ 2944 */
2960void 2945void ecb_cold
2961rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2962{ 2947{
2963 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
2964 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
2965 2950
… …
2984 2969
2985/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
2986/* 2971/*
2987 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
2988 */ 2973 */
2989void 2974void ecb_cold
2990rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2991{ 2976{
2992 want_refresh = 1; 2977 want_refresh = 1;
2993 2978
2994 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3021/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3022#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3024#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3025 3010
3026void 3011void ecb_cold
3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3028{ 3013{
3029 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3030 row_col_t bound; 3015 row_col_t bound;
3031 text_t *stp; 3016 text_t *stp;
… …
3105 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3106 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3107 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3108 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3109 */ 3094 */
3110void 3095void ecb_cold
3111rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3112{ 3097{
3113 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3114 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3115 3100
… …
3141 3126
3142/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3143/* 3128/*
3144 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3145 */ 3130 */
3146void 3131void ecb_cold
3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3148{ 3133{
3149 row_col_t pos; 3134 row_col_t pos;
3150 enum { 3135 enum {
3151 LEFT, RIGHT 3136 LEFT, RIGHT
… …
3342 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3343#endif 3328#endif
3344} 3329}
3345 3330
3346#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3347void 3332void ecb_cold
3348rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3349{ 3334{
3350 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3351 text_t *stp; 3336 text_t *stp;
3352 3337
… …
3390/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3391/* 3376/*
3392 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3393 * EXT: button 3 double click 3378 * EXT: button 3 double click
3394 */ 3379 */
3395void 3380void ecb_cold
3396rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3397{ 3382{
3398 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3400} 3385}
… …
3402/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3403/* 3388/*
3404 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3405 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3406 */ 3391 */
3407void 3392void ecb_cold
3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3409{ 3394{
3410 Atom property = rq.property == None ? rq.target : rq.property; 3395 Atom property = rq.property == None ? rq.target : rq.property;
3411 XSelectionEvent ev; 3396 XSelectionEvent ev;
3412 3397
… …
3545 3530
3546 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3547} 3532}
3548 3533
3549/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3550#ifdef USE_XIM 3535#if USE_XIM
3551void 3536void ecb_cold
3552rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3553{ 3538{
3554 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3555 3540
3556 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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