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

Diff Legend

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