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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
100 98
101/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
102void 100void
103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104{ 102{
105 if (!l.t) 103 if (!l.valid ())
106 { 104 {
107 lalloc (l); 105 l.alloc ();
108 col = 0; 106 col = 0;
109 width = ncol; 107 width = ncol;
110 } 108 }
111 109
112 l.touch (); 110 l.touch ();
… …
143 while (col > 0 && l.t[col] == NOCHAR) 141 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148 148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
… …
157/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160 160
161void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
162rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
163{ 197{
198#if ENABLE_OVERLAY
199 scr_overlay_off ();
200#endif
201
164 view_start = 0; 202 view_start = 0;
165 num_scr = 0; 203 num_scr = 0;
166 204
167 if (ncol == 0) 205 if (ncol == 0)
168 ncol = 80; 206 ncol = 80;
… …
188 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
189 227
190 screen.tscroll = 0; 228 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
192 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
193 if (!row_buf) 240 if (!prev_row_buf)
194 { 241 {
195 /* 242 /*
196 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
197 */ 244 */
198 top_row = 0; 245 top_row = 0;
199 term_start = 0; 246 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 247
215 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
241 { 274 {
242 /* 275 /*
243 * add or delete rows as appropriate 276 * add or delete rows as appropriate
244 */ 277 */
245 278
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
264 { 280 {
265 lresize (drawn_buf[row]); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
267 }
268 283
269 for (int row = prev_nrow; row < nrow; row++) 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
270 { 288 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 289
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
281 293
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 302
291 do 303 do
292 { 304 {
293 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 307 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 309
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 311 {
300 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
301 313
302 plines++; 314 plines++;
303 llen += prev_ncol; 315 llen += prev_ncol;
… …
316 328
317 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
319 { 331 {
320 qline = row_buf + qrow; 332 qline = row_buf + qrow;
321 lalloc (*qline); 333 qline->alloc (); // redundant with next line
322 qline->l = ncol; 334 qline->l = ncol;
323 qline->is_longer (1); 335 qline->is_longer (1);
324 336
325 int qcol = 0; 337 int qcol = 0;
326 338
… …
341 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
342 // least. 354 // least.
343 if (prow == ocur.row) 355 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
345 357
346 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
347 359
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 361
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 384 {
373 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
374 386
375 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
376 { 388 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
379 391
380 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
382 } 396 }
383 397
384 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 400
389 term_start = 0; 401 term_start = 0;
390 } 402 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 403
396 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 406 }
399 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
416
400 free (tabs); 417 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
402 419
403 for (int col = ncol; --col; ) 420 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
405 422
406 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
407 424
408 prev_nrow = nrow; 425 prev_nrow = nrow;
… …
418 * Free everything. That way malloc debugging can find leakage. 435 * Free everything. That way malloc debugging can find leakage.
419 */ 436 */
420void 437void
421rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
422{ 439{
423 if (row_buf) 440 free (chunk);
424 {
425 delete talloc; talloc = 0;
426 delete ralloc; ralloc = 0;
427
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 441 free (tabs);
434 tabs = 0;
435 }
436} 442}
437 443
438/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
439/* 445/*
440 * Hard/Soft reset 446 * Hard/Soft reset
441 */ 447 */
442void 448void
443rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
444{ 450{
445 scr_release (); 451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
446 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 456 rvideo_mode = false;
448 scr_soft_reset (); 457 scr_soft_reset ();
449 scr_reset (); 458 scr_reset ();
450 459
451 scr_clear (true); 460 scr_clear (true);
452 scr_refresh (); 461 scr_refresh ();
453} 462}
454 463
455void 464void
456rxvt_term::scr_soft_reset () 465rxvt_term::scr_soft_reset () NOTHROW
457{ 466{
458 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
460 scr_overlay_off (); 469 scr_overlay_off ();
461#endif 470#endif
… …
516 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
518} 527}
519 528
520void 529void
521rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
522{ 531{
523 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
524 return; 533 return;
525 534
526 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
545 return; 554 return;
546 555
547 want_refresh = 1; 556 want_refresh = 1;
548 view_start = 0; 557 view_start = 0;
549 558
550 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
551 565
552 current_screen = scrn; 566 current_screen = scrn;
553 567
554#if NSCREENS 568#if NSCREENS
555 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
… …
634 648
635 if (count > 0 649 if (count > 0
636 && row1 == 0 650 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
639 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 656
644 // sever bottommost line 657 // sever bottommost line
645 { 658 {
646 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
647 l.is_longer (0); 660 l.is_longer (0);
648 l.touch (); 661 l.touch ();
649 } 662 }
650 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
651 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 680 for (int i = count; i--; )
653 { 681 {
654 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
655 683
656 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 687 {
660 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 689 l.l = 0;
… …
663 } 691 }
664 else 692 else
665 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
666 } 694 }
667 695
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 696 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
682 { 699 {
683 selection.beg.row -= count; 700 selection.beg.row -= count;
684 selection.end.row -= count; 701 selection.end.row -= count;
685 selection.mark.row -= count; 702 selection.mark.row -= count;
686 703
687 if (selection.beg.row < top_row 704 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 705 }
695 706
696 // finally move the view window, if desired 707 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 709 && view_start != 0
… …
728 } 739 }
729 740
730 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
732 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
733 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
734 753
735 min_it (count, rows); 754 min_it (count, rows);
736 755
737 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 757
739 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
740 { 759 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 761
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 764 }
746 765
747 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
749 } 775 }
750 776
751 return count; 777 return count;
752} 778}
753 779
… …
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 786{
761 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
762 return; 788 return;
763 789
764 unsigned char checksel; 790 bool checksel;
765 unicode_t c; 791 unicode_t c;
766 int ncol = this->ncol; 792 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
768 794
769 want_refresh = 1; 795 want_refresh = 1;
… …
795 821
796 while (str < strend) 822 while (str < strend)
797 { 823 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 825
800 if (expect_false (c < 0x20)) 826 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 827 if (c == C0_LF)
802 { 828 {
803 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
804 830
805 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
824 { 850 {
825 scr_tab (1, true); 851 scr_tab (1, true);
826 continue; 852 continue;
827 } 853 }
828 854
829 if (expect_false ( 855 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 859 ))
834 { 860 {
… …
839 * should be a similar check. 865 * should be a similar check.
840 */ 866 */
841 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
842 } 868 }
843 869
844 if (expect_false (screen.flags & Screen_WrapNext)) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 871 {
846 scr_do_wrap (); 872 scr_do_wrap ();
847 873
848 line->l = ncol; 874 line->l = ncol;
849 line->is_longer (1); 875 line->is_longer (1);
… …
851 row = screen.cur.row; 877 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
853 } 879 }
854 880
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 883 c = 0xfffd;
858 884
859 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
862 // locale. 888 // locale.
863 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
864 890
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 892 {
867 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 894 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
885 } 911 }
886 } 912 }
887 913
888 if (expect_false (screen.flags & Screen_Insert)) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
890 916
891 if (width != 0) 917 if (width != 0)
892 { 918 {
893#if !UNICODE_3 919#if !UNICODE_3
… …
898# else 924# else
899 c = 0xfffd; 925 c = 0xfffd;
900# endif 926# endif
901#endif 927#endif
902 928
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 930
913 // if the character doesn't fit into the remaining columns... 931 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
915 { 933 {
916 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
917 { 935 {
918 // ... artificially enlargen the previous one 936 // ... artificially enlargen the previous one
919 c = NOCHAR; 937 c = NOCHAR;
… …
922 } 940 }
923 else 941 else
924 screen.cur.col = ncol - width; 942 screen.cur.col = ncol - width;
925 } 943 }
926 944
945 // nuke the character at this position, if required
946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
950 scr_kill_char (*line, screen.cur.col);
951
927 line->touch (); 952 line->touch ();
928 953
929 do 954 do
930 { 955 {
931 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
933 958
934 if (expect_true (screen.cur.col < ncol - 1)) 959 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 960 screen.cur.col++;
936 else 961 else
937 { 962 {
938 line->l = ncol; 963 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
941 break; 966
967 goto end_of_line;
942 } 968 }
943 969
944 c = NOCHAR; 970 c = NOCHAR;
945 } 971 }
946 while (expect_false (--width > 0)); 972 while (ecb_unlikely (--width > 0));
947 973
948 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 976 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 977 line->t[c] = ' ';
956 line->r[c] = rend; 978 line->r[c] = rend;
957 }
958 } 979 }
980
981end_of_line:
982 ;
959 } 983 }
960#if ENABLE_COMBINING 984#if ENABLE_COMBINING
961 else // width == 0 985 else // width == 0
962 { 986 {
963 if (c != 0xfeff) // ignore BOM 987 if (c != 0xfeff) // ignore BOM
… …
1026 1050
1027 want_refresh = 1; 1051 want_refresh = 1;
1028#endif 1052#endif
1029 } 1053 }
1030 } 1054 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext) 1055 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext; 1056 screen.flags &= ~Screen_WrapNext;
1034#endif
1035 else 1057 else
1036 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1037} 1059}
1038 1060
1039/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
… …
1295 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1296} 1318}
1297 1319
1298/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1299/* 1321/*
1300 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1326 */
1305void 1327void
… …
1314 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1315 1337
1316 switch (mode) 1338 switch (mode)
1317 { 1339 {
1318 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1341 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1343 num = nrow - row;
1323 break; 1344 break;
1324 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1346 scr_erase_line (1);
1327 row = 0; 1347 row = 0;
1328 num = screen.cur.row; 1348 num = screen.cur.row;
1329 break; 1349 break;
1330 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1351 row = 0;
1333 num = nrow; 1352 num = nrow;
1334 break; 1353 break;
1335 default: 1354 default:
1336 return; 1355 return;
… …
1353 { 1372 {
1354 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1355 1374
1356 if (mapped) 1375 if (mapped)
1357 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1360 } 1379 }
1361 else 1380 else
1362 { 1381 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1385 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1389 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1390 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1394 }
1376 } 1395 }
… …
1407 1426
1408 want_refresh = 1; 1427 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1410 1429
1411 num_scr_allow = 0; 1430 num_scr_allow = 0;
1412 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1413 1436
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1416 { 1439 {
1417 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1687 { 1710 {
1688 rvideo_state = on; 1711 rvideo_state = on;
1689 1712
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_BG_PIXMAP
1692 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1693#endif 1716#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1718
1696 XGCValues gcvalue; 1719 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1858 * Refresh the entire screen 1881 * Refresh the entire screen
1859 */ 1882 */
1860void 1883void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1885{
1863 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1887}
1865 1888
1866/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1867/* 1890/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1924 1947
1925# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1926# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1927 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1928# endif 1951# endif
1929 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1930# endif 1953# endif
1931 1954
1932# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1934 set_urgency (1); 1957 set_urgency (1);
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1971#endif
1949} 1972}
1950 1973
1951/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */
1953void 1975void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1977{
1956#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1957 int nrows, row_start; 1979 int nrows, row_start;
… …
2031 * A: set up vars 2053 * A: set up vars
2032 */ 2054 */
2033 refresh_count = 0; 2055 refresh_count = 0;
2034 2056
2035 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2058 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_BG_PIXMAP
2038 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
2039#endif 2061#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2063
2042 /* 2064 /*
2043 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2071 scr_swap_overlay ();
2050#endif 2072#endif
2051 2073
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2075
2054 /* 2076 /*
2055 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2056 */ 2078 */
2057 { 2079 {
2058 unsigned char setoldcursor; 2080 bool setoldcursor;
2059 2081
2060#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2083 if (hidden_cursor)
2062 showcursor = 0; 2084 showcursor = 0;
2063#endif 2085#endif
… …
2150 { 2172 {
2151 int16_t nits; 2173 int16_t nits;
2152 int i = num_scr; 2174 int i = num_scr;
2153 int j; 2175 int j;
2154 int len, wlen; 2176 int len, wlen;
2155 dLocal (int, num_scr);
2156 2177
2157 j = nrow; 2178 j = nrow;
2158 wlen = len = -1; 2179 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2160 2181
… …
2235 continue; 2256 continue;
2236 2257
2237 // redraw one or more characters 2258 // redraw one or more characters
2238 2259
2239 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2262 --col;
2242 2263
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2265 text_t *text = stp + col;
2245 int count = 1; 2266 int count = 1;
… …
2283 2304
2284 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2286 2307
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2310 count++, i--;
2290 2311
2291 /* 2312 /*
2292 * Determine the attributes for the string 2313 * Determine the attributes for the string
2293 */ 2314 */
2294 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2296 2317
2297 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2320 {
2300 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2301 2322
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2413 /*
2393 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2394 */ 2415 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2417
2397 if (expect_true (have_bg && back == Color_bg)) 2418 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2419 {
2399 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2400 2421
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2409 did_clear: ; 2430 did_clear: ;
2410 } 2431 }
2411 else 2432 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2434
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 2436 {
2416#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2440 else
… …
2465 2486
2466 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2488 Col2Pixel (col),
2468 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2492 }
2472 } 2493 }
2473 2494
2474 /* 2495 /*
2475 * H: cleanup selection 2496 * H: cleanup selection
… …
2487} 2508}
2488 2509
2489void 2510void
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2512{
2492 if (!l.t) 2513 if (!l.valid ())
2493 return; 2514 return;
2494 2515
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2517
2497 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2510 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2511 } 2532 }
2512} 2533}
2513 2534
2514void 2535void
2515rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2537{
2538 bool transparent = false;
2539
2517#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_BG_PIXMAP
2518 bgPixmap.apply (); 2541 if (bg_pixmap != None)
2519#else 2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2520 2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2557 }
2558 else
2559#endif
2560 {
2521 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2522 XClearWindow (dpy, parent[0]);
2523 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2564
2565 XClearWindow (dpy, parent);
2524 2566
2525 if (scrollBar.win) 2567 if (scrollBar.win)
2526 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2527 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2528 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2529 scrollBar.show (0); 2574 scrollBar.show (0);
2530 } 2575 }
2531 2576
2532#endif 2577 if (refresh)
2533 2578 {
2534 /* bgPixmap.apply () does not do the following : */
2535 scr_clear (); 2579 scr_clear ();
2536 scr_touch (true); 2580 scr_touch (true);
2581 }
2537 want_refresh = 1; 2582 want_refresh = 1;
2538} 2583}
2539 2584
2540/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2541void 2586void
… …
2627 */ 2672 */
2628#if 0 2673#if 0
2629void 2674void
2630rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2631{ 2676{
2632 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2633 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2634 char r1[] = "\n";
2635
2636 for (row = saveLines + top_row;
2637 row < saveLines + nrow - 1; row++)
2638 {
2639 width = row_buf[row].l >= 0 ? row_buf[row].l
2640 : ncol;
2641 for (towrite = width; towrite; towrite -= wrote)
2642 {
2643 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2644 towrite);
2645 if (wrote < 0)
2646 return; /* XXX: death, no report */
2647 }
2648 if (row_buf[row].l >= 0)
2649 if (write (fd, r1, 1) <= 0)
2650 return; /* XXX: death, no report */
2651 }
2652} 2679}
2653#endif 2680#endif
2654 2681
2655/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2656 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2657 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2658void 2685void
2659rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2660{ 2687{
2661 row_col_t pos;
2662
2663 if (!selection.op) 2688 if (!selection.op)
2664 return; 2689 return;
2665 2690
2666 pos.row = pos.col = 0;
2667 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2668 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2669 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2670 || (check_more == 1 2694 || (check_more == 1
2671 && current_screen == selection.screen 2695 && current_screen == selection.screen
2672 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2673 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2674 || (check_more == 2
2675 && ROWCOL_IS_BEFORE (selection.beg, pos)
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 3
2678 && ROWCOL_IS_AFTER (selection.end, pos))
2679 || (check_more == 4 /* screen width change */
2680 && (selection.beg.row != selection.end.row
2681 || selection.end.col > ncol)))
2682 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2683} 2699}
2684 2700
2685/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2686/* 2702/*
2687 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
2693 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2694 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2695 data[i] = C0_CR; 2711 data[i] = C0_CR;
2696 2712
2697 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2698 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2699 2715
2700 tt_write (data, len); 2716 tt_write (data, len);
2701 2717
2702 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2703 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2704} 2720}
2705 2721
2706void 2722void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{ 2724{
… …
2712 tt_paste (data, len); 2728 tt_paste (data, len);
2713} 2729}
2714 2730
2715/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2716/* 2732/*
2717 * Respond to a notification that a primary selection has been sent 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2718 * EXT: SelectionNotify 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2719 */ 2735 * as fallback
2720void
2721rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2722{
2723 if (prop == None) /* check for failed XConvertSelection */
2724 {
2725 if ((selection_type & Sel_CompoundText))
2726 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = 0;
2730 if (selnum != Sel_direct)
2731 selection_request_other (XA_STRING, selnum);
2732 }
2733
2734 if ((selection_type & Sel_UTF8String))
2735 {
2736 int selnum = selection_type & Sel_whereMask;
2737
2738 selection_type = Sel_CompoundText;
2739 if (selnum != Sel_direct)
2740 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2741 else
2742 selection_type = 0;
2743 }
2744
2745 return;
2746 }
2747
2748 unsigned long bytes_after;
2749 XTextProperty ct;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 0, PROP_SIZE / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct.encoding, &ct.format,
2755 &ct.nitems, &bytes_after,
2756 &ct.value) != Success)
2757 {
2758 ct.value = 0;
2759 goto bailout;
2760 }
2761
2762 if (ct.encoding == None)
2763 goto bailout;
2764
2765 if (bytes_after)
2766 {
2767 // fetch and append remaining data
2768 XTextProperty ct2;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 ct.nitems / 4, (bytes_after + 3) / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct2.encoding, &ct2.format,
2774 &ct2.nitems, &bytes_after,
2775 &ct2.value) != Success)
2776 goto bailout;
2777
2778 // realloc should be compatible to XFree, here, and elsewhere, too
2779 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2780 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2781 ct.nitems += ct2.nitems;
2782
2783 XFree (ct2.value);
2784 }
2785
2786 if (ct.value == 0)
2787 goto bailout;
2788
2789 if (ct.encoding == xa[XA_INCR])
2790 {
2791 // INCR selection, start handshake
2792 if (!delete_prop)
2793 XDeleteProperty (dpy, win, prop);
2794
2795 selection_wait = Sel_incr;
2796 incr_buf_fill = 0;
2797 incr_ev.start (10);
2798
2799 goto bailout;
2800 }
2801
2802 if (ct.nitems == 0)
2803 {
2804 if (selection_wait == Sel_incr)
2805 {
2806 XFree (ct.value);
2807
2808 // finally complete, now paste the whole thing
2809 selection_wait = Sel_normal;
2810 ct.value = (unsigned char *)incr_buf;
2811 ct.nitems = incr_buf_fill;
2812 incr_buf = 0;
2813 incr_buf_size = 0;
2814 incr_ev.stop ();
2815 }
2816 else
2817 {
2818 if (selection_wait == Sel_normal
2819 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2820 {
2821 /*
2822 * pass through again trying CUT_BUFFER0 if we've come from
2823 * XConvertSelection () but nothing was presented
2824 */
2825 selection_paste (display->root, XA_CUT_BUFFER0, False);
2826 }
2827
2828 goto bailout;
2829 }
2830 }
2831 else if (selection_wait == Sel_incr)
2832 {
2833 incr_ev.start (10);
2834
2835 while (incr_buf_fill + ct.nitems > incr_buf_size)
2836 {
2837 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2838 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2839 }
2840
2841 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2842 incr_buf_fill += ct.nitems;
2843
2844 goto bailout;
2845 }
2846
2847 char **cl;
2848 int cr;
2849
2850#if !ENABLE_MINIMAL
2851 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2852 // so recode it manually
2853 if (ct.encoding == xa[XA_UTF8_STRING])
2854 {
2855 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2856 char *s = rxvt_wcstombs (w);
2857 free (w);
2858 // TODO: strlen == only the first element will be converted. well...
2859 paste (s, strlen (s));
2860 free (s);
2861 }
2862 else
2863#endif
2864 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2865 && cl)
2866 {
2867 for (int i = 0; i < cr; i++)
2868 paste (cl[i], strlen (cl[i]));
2869
2870 XFreeStringList (cl);
2871 }
2872 else
2873 paste ((char *)ct.value, ct.nitems); // paste raw
2874
2875bailout:
2876 XFree (ct.value);
2877
2878 if (selection_wait == Sel_normal)
2879 selection_wait = Sel_none;
2880}
2881
2882void
2883rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2884{
2885 selection_wait = Sel_none;
2886
2887 incr_buf_size = 0;
2888 free (incr_buf);
2889
2890 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2891}
2892
2893void
2894rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2895{
2896 if (prop == None || selection_wait != Sel_incr)
2897 return;
2898
2899 selection_paste (win, prop, true);
2900}
2901
2902/* ------------------------------------------------------------------------- */
2903/*
2904 * Request the current selection:
2905 * Order: > internal selection if available
2906 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2907 * > CUT_BUFFER0
2908 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2909 * will auto fallback to CUT_BUFFER0
2910 * EXT: button 2 release 2736 * EXT: button 2 release
2911 */ 2737 */
2912void 2738void
2913rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2914{ 2740{
2915 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2916 {
2917 /* internal selection */
2918 char *str = rxvt_wcstombs (selection.text, selection.len);
2919 paste (str, strlen (str));
2920 free (str);
2921 return;
2922 } 2742 {
2923 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2924 { 2745 }
2925 selection_request_time = tm;
2926 selection_wait = Sel_normal;
2927
2928#if X_HAVE_UTF8_STRING
2929 selection_type = Sel_UTF8String;
2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2931 return;
2932#else
2933 selection_type = Sel_CompoundText;
2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2935 return;
2936#endif
2937 }
2938
2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
2941}
2942
2943int
2944rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2945{
2946 Atom sel;
2947
2948 selection_type |= selnum;
2949
2950 if (selnum == Sel_Primary)
2951 sel = XA_PRIMARY;
2952 else if (selnum == Sel_Secondary)
2953 sel = XA_SECONDARY;
2954 else
2955 sel = xa[XA_CLIPBOARD];
2956
2957 if (XGetSelectionOwner (dpy, sel) != None)
2958 {
2959 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2960 vt, selection_request_time);
2961 return 1;
2962 }
2963
2964 return 0;
2965} 2746}
2966 2747
2967/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2968/* 2749/*
2969 * Clear all selected text 2750 * Clear all selected text
… …
3000 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
3001 */ 2782 */
3002void 2783void
3003rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
3004{ 2785{
3005 int i; 2786 int size;
3006 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
3007 text_t *t; 2788 text_t *t;
3008 2789
3009 switch (selection.op) 2790 switch (selection.op)
3010 { 2791 {
… …
3026 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
3027 2808
3028 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3029 return; 2810 return;
3030 2811
3031 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3033 2814
3034 int ofs = 0; 2815 int ofs = 0;
3035 int extra = 0; 2816 int extra = 0;
3036 2817
3037 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
3043 { 2824 {
3044#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3045 if (selection.rect) 2826 if (selection.rect)
3046 { 2827 {
3047 col = selection.beg.col; 2828 col = selection.beg.col;
3048 end_col = ncol + 1; 2829 end_col = selection.end.col;
3049 } 2830 }
3050 else 2831 else
3051#endif 2832#endif
3052 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3053 2834
3054 col = max (col, 0); 2835 col = max (col, 0);
3055 2836
3056 if (row == selection.end.row 2837 if (row == selection.end.row)
3057#if !ENABLE_MINIMAL
3058 || selection.rect
3059#endif
3060 )
3061 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3062 2839
3063 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3064 2841
3065 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3073 2850
3074 extra -= (len - 1); 2851 extra -= (len - 1);
3075 2852
3076 if (extra < 0) 2853 if (extra < 0)
3077 { 2854 {
3078 extra += i; 2855 extra += size;
3079 i += i; 2856 size += size;
3080 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3081 } 2858 }
3082 2859
3083 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084 } 2861 }
3085#endif 2862#endif
… …
3097 2874
3098 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3099 } 2876 }
3100 else 2877 else
3101#endif 2878#endif
3102 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3103 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3104 } 2883 }
3105
3106 if (end_col != selection.end.col)
3107 new_selection_text[ofs++] = C0_LF;
3108 2884
3109 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3110 2886
3111 if (ofs == 0) 2887 if (ofs == 0)
3112 { 2888 {
… …
3618 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3619 */ 3395 */
3620void 3396void
3621rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3622{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3623 XSelectionEvent ev; 3400 XSelectionEvent ev;
3624 3401
3625 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3626 ev.property = None; 3403 ev.property = None;
3627 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3642 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3643#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3644 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3645#endif 3422#endif
3646 3423
3647 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3648 32, PropModeReplace, 3425 32, PropModeReplace,
3649 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3650 ev.property = rq.property; 3427 ev.property = property;
3651 } 3428 }
3652#if TODO // TODO 3429#if TODO // TODO
3653 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3654 { 3431 {
3655 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3656 } 3433 }
3657#endif 3434#endif
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3659 { 3436 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property; 3439 ev.property = property;
3663 } 3440 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 { 3442 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3668 ev.property = rq.property; 3445 ev.property = property;
3669 } 3446 }
3670 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3671 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3672 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3673 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3744 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3745 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3746 ct.encoding = target; 3523 ct.encoding = target;
3747 } 3524 }
3748 3525
3749 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3750 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3751 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3752 ev.property = rq.property; 3529 ev.property = property;
3753 3530
3754 if (freect) 3531 if (freect)
3755 XFree (ct.value); 3532 XFree (ct.value);
3756 } 3533 }
3757 3534

Diff Legend

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