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.353 by root, Fri Oct 15 21:13:44 2010 UTC vs.
Revision 1.416 by root, Mon May 28 14:26:11 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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
40} 38}
41 39
42/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
46 42
47/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
100 96
101/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
102void 98void
103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
104{ 100{
105 if (!l.t) 101 if (!l.valid ())
106 { 102 {
107 lalloc (l); 103 l.alloc ();
108 col = 0; 104 col = 0;
109 width = ncol; 105 width = ncol;
110 } 106 }
111 107
112 l.touch (); 108 l.touch ();
… …
159/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
162 158
163void 159void
160rxvt_term::scr_alloc ()
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void
164rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
165{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
166 view_start = 0; 200 view_start = 0;
167 num_scr = 0; 201 num_scr = 0;
168 202
169 if (ncol == 0) 203 if (ncol == 0)
170 ncol = 80; 204 ncol = 80;
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
195 if (!row_buf) 238 if (!prev_row_buf)
196 { 239 {
197 /* 240 /*
198 * first time called so just malloc everything: don't rely on realloc 241 * first time called so just malloc everything: don't rely on realloc
199 */ 242 */
200 top_row = 0; 243 top_row = 0;
201 term_start = 0; 244 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 245
217 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
243 { 272 {
244 /* 273 /*
245 * add or delete rows as appropriate 274 * add or delete rows as appropriate
246 */ 275 */
247 276
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--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
266 { 278 {
267 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 281
271 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
272 { 286 }
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 287
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
283 291
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 300
293 do 301 do
294 { 302 {
295 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 305 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 307
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 309 {
302 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
303 311
304 plines++; 312 plines++;
305 llen += prev_ncol; 313 llen += prev_ncol;
… …
318 326
319 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
321 { 329 {
322 qline = row_buf + qrow; 330 qline = row_buf + qrow;
323 lalloc (*qline); 331 qline->alloc (); // redundant with next line
324 qline->l = ncol; 332 qline->l = ncol;
325 qline->is_longer (1); 333 qline->is_longer (1);
326 334
327 int qcol = 0; 335 int qcol = 0;
328 336
… …
343 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
344 // least. 352 // least.
345 if (prow == ocur.row) 353 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
347 355
348 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
349 357
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 359
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 382 {
375 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
376 384
377 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
378 { 386 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
381 389
382 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
384 } 394 }
385 395
386 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 398
391 term_start = 0; 399 term_start = 0;
392 } 400 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 401
398 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 404 }
401 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
402 free (tabs); 415 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
404 417
405 for (int col = ncol; --col; ) 418 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
407 420
408 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
409 422
410 prev_nrow = nrow; 423 prev_nrow = nrow;
… …
420 * Free everything. That way malloc debugging can find leakage. 433 * Free everything. That way malloc debugging can find leakage.
421 */ 434 */
422void 435void
423rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
424{ 437{
425 if (row_buf) 438 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); 439 free (tabs);
436 tabs = 0;
437 }
438} 440}
439 441
440/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
441/* 443/*
442 * Hard/Soft reset 444 * Hard/Soft reset
443 */ 445 */
444void 446void
445rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
446{ 448{
447 scr_release (); 449 scr_release ();
450
451 row_buf = 0;
452 tabs = 0;
448 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 454 rvideo_mode = false;
450 scr_soft_reset (); 455 scr_soft_reset ();
451 scr_reset (); 456 scr_reset ();
452 457
453 scr_clear (true); 458 scr_clear (true);
454 scr_refresh (); 459 scr_refresh ();
455} 460}
456 461
457void 462void
458rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
459{ 464{
460 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
462 scr_overlay_off (); 467 scr_overlay_off ();
463#endif 468#endif
… …
518 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
520} 525}
521 526
522void 527void
523rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
524{ 529{
525 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
526 return; 531 return;
527 532
528 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
547 return; 552 return;
548 553
549 want_refresh = 1; 554 want_refresh = 1;
550 view_start = 0; 555 view_start = 0;
551 556
552 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
553 563
554 current_screen = scrn; 564 current_screen = scrn;
555 565
556#if NSCREENS 566#if NSCREENS
557 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
636 646
637 if (count > 0 647 if (count > 0
638 && row1 == 0 648 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
641 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 654
646 // sever bottommost line 655 // sever bottommost line
647 { 656 {
648 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
649 l.is_longer (0); 658 l.is_longer (0);
650 l.touch (); 659 l.touch ();
651 } 660 }
652 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
653 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 678 for (int i = count; i--; )
655 { 679 {
656 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
657 681
658 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 683 // 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))) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 685 {
662 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 687 l.l = 0;
… …
665 } 689 }
666 else 690 else
667 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
668 } 692 }
669 693
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 694 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
684 { 697 {
685 selection.beg.row -= count; 698 selection.beg.row -= count;
686 selection.end.row -= count; 699 selection.end.row -= count;
687 selection.mark.row -= count; 700 selection.mark.row -= count;
688 701
689 if (selection.beg.row < top_row 702 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 } 703 }
697 704
698 // finally move the view window, if desired 705 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 707 && view_start != 0
… …
730 } 737 }
731 738
732 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
734 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
735 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
736 751
737 min_it (count, rows); 752 min_it (count, rows);
738 753
739 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 755
741 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
742 { 757 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 759
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 762 }
748 763
749 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
751 } 773 }
752 774
753 return count; 775 return count;
754} 776}
755 777
… …
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 784{
763 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
764 return; 786 return;
765 787
766 unsigned char checksel; 788 bool checksel;
767 unicode_t c; 789 unicode_t c;
768 int ncol = this->ncol; 790 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
770 792
771 want_refresh = 1; 793 want_refresh = 1;
… …
797 819
798 while (str < strend) 820 while (str < strend)
799 { 821 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 823
802 if (expect_false (c < 0x20)) 824 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 825 if (c == C0_LF)
804 { 826 {
805 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
806 828
807 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
826 { 848 {
827 scr_tab (1, true); 849 scr_tab (1, true);
828 continue; 850 continue;
829 } 851 }
830 852
831 if (expect_false ( 853 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 857 ))
836 { 858 {
… …
841 * should be a similar check. 863 * should be a similar check.
842 */ 864 */
843 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
844 } 866 }
845 867
846 if (expect_false (screen.flags & Screen_WrapNext)) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 869 {
848 scr_do_wrap (); 870 scr_do_wrap ();
849 871
850 line->l = ncol; 872 line->l = ncol;
851 line->is_longer (1); 873 line->is_longer (1);
… …
853 row = screen.cur.row; 875 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
855 } 877 }
856 878
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 881 c = 0xfffd;
860 882
861 // rely on wcwidth to tell us the character width, do wcwidth before 883 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
864 // locale. 886 // locale.
865 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
866 888
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 890 {
869 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 892 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
887 } 909 }
888 } 910 }
889 911
890 if (expect_false (screen.flags & Screen_Insert)) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
892 914
893 if (width != 0) 915 if (width != 0)
894 { 916 {
895#if !UNICODE_3 917#if !UNICODE_3
… …
903#endif 925#endif
904 926
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 928
907 // if the character doesn't fit into the remaining columns... 929 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 931 {
910 if (screen.flags & Screen_Autowrap) 932 if (screen.flags & Screen_Autowrap)
911 { 933 {
912 // ... artificially enlargen the previous one 934 // ... artificially enlargen the previous one
913 c = NOCHAR; 935 c = NOCHAR;
… …
917 else 939 else
918 screen.cur.col = ncol - width; 940 screen.cur.col = ncol - width;
919 } 941 }
920 942
921 // nuke the character at this position, if required 943 // nuke the character at this position, if required
922 // due to wonderful coincidents everywehere else in this loop 944 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 945 // we never have to check for overwriting a wide char itself,
924 // only it's tail. 946 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 948 scr_kill_char (*line, screen.cur.col);
927 949
928 line->touch (); 950 line->touch ();
929 951
930 do 952 do
931 { 953 {
932 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
934 956
935 if (expect_true (screen.cur.col < ncol - 1)) 957 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 958 screen.cur.col++;
937 else 959 else
938 { 960 {
939 line->l = ncol; 961 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 965 goto end_of_line;
944 } 966 }
945 967
946 c = NOCHAR; 968 c = NOCHAR;
947 } 969 }
948 while (expect_false (--width > 0)); 970 while (ecb_unlikely (--width > 0));
949 971
950 // pad with spaces when overwriting wide character with smaller one 972 // 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++) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 974 {
953 line->t[c] = ' '; 975 line->t[c] = ' ';
954 line->r[c] = rend; 976 line->r[c] = rend;
955 } 977 }
956 978
… …
1293 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1294} 1316}
1295 1317
1296/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1297/* 1319/*
1298 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1324 */
1303void 1325void
… …
1312 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1313 1335
1314 switch (mode) 1336 switch (mode)
1315 { 1337 {
1316 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1339 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1341 num = nrow - row;
1321 break; 1342 break;
1322 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1344 scr_erase_line (1);
1325 row = 0; 1345 row = 0;
1326 num = screen.cur.row; 1346 num = screen.cur.row;
1327 break; 1347 break;
1328 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1349 row = 0;
1331 num = nrow; 1350 num = nrow;
1332 break; 1351 break;
1333 default: 1352 default:
1334 return; 1353 return;
… …
1351 { 1370 {
1352 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1353 1372
1354 if (mapped) 1373 if (mapped)
1355 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1358 } 1377 }
1359 else 1378 else
1360 { 1379 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1383 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1388 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1392 }
1374 } 1393 }
… …
1405 1424
1406 want_refresh = 1; 1425 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1408 1427
1409 num_scr_allow = 0; 1428 num_scr_allow = 0;
1410 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1411 1434
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1414 { 1437 {
1415 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1685 { 1708 {
1686 rvideo_state = on; 1709 rvideo_state = on;
1687 1710
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1713 if (bg_pixmap == None)
1691#endif 1714#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1716
1694 XGCValues gcvalue; 1717 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1856 * Refresh the entire screen 1879 * Refresh the entire screen
1857 */ 1880 */
1858void 1881void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1883{
1861 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1885}
1863 1886
1864/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1865/* 1888/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1922 1945
1923# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1926# endif 1949# endif
1927 XMapWindow (dpy, parent[0]); 1950 XMapWindow (dpy, parent);
1928# endif 1951# endif
1929 1952
1930# if ENABLE_FRILLS 1953# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1954 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1955 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1969#endif
1947} 1970}
1948 1971
1949/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */
1951void 1973void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1975{
1954#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1955 int nrows, row_start; 1977 int nrows, row_start;
… …
2029 * A: set up vars 2051 * A: set up vars
2030 */ 2052 */
2031 refresh_count = 0; 2053 refresh_count = 0;
2032 2054
2033 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2056 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2058 have_bg = bg_pixmap != None;
2037#endif 2059#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2061
2040 /* 2062 /*
2041 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2069 scr_swap_overlay ();
2048#endif 2070#endif
2049 2071
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2073
2052 /* 2074 /*
2053 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2054 */ 2076 */
2055 { 2077 {
2056 unsigned char setoldcursor; 2078 bool setoldcursor;
2057 2079
2058#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2081 if (hidden_cursor)
2060 showcursor = 0; 2082 showcursor = 0;
2061#endif 2083#endif
… …
2148 { 2170 {
2149 int16_t nits; 2171 int16_t nits;
2150 int i = num_scr; 2172 int i = num_scr;
2151 int j; 2173 int j;
2152 int len, wlen; 2174 int len, wlen;
2153 dLocal (int, num_scr);
2154 2175
2155 j = nrow; 2176 j = nrow;
2156 wlen = len = -1; 2177 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2158 2179
… …
2233 continue; 2254 continue;
2234 2255
2235 // redraw one or more characters 2256 // redraw one or more characters
2236 2257
2237 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2260 --col;
2240 2261
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2263 text_t *text = stp + col;
2243 int count = 1; 2264 int count = 1;
… …
2281 2302
2282 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2284 2305
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2308 count++, i--;
2288 2309
2289 /* 2310 /*
2290 * Determine the attributes for the string 2311 * Determine the attributes for the string
2291 */ 2312 */
2292 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2294 2315
2295 // only do special processing if any attributes are set, which is unlikely 2316 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2318 {
2298 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2299 2320
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2411 /*
2391 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2392 */ 2413 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2415
2395 if (expect_true (have_bg && back == Color_bg)) 2416 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2417 {
2397 // this is very ugly, maybe push it into ->draw? 2418 // this is very ugly, maybe push it into ->draw?
2398 2419
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2421 if (text[i] != ' ')
… …
2407 did_clear: ; 2428 did_clear: ;
2408 } 2429 }
2409 else 2430 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2432
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2434 {
2414#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2438 else
… …
2463 2484
2464 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2486 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2490 }
2470 } 2491 }
2471 2492
2472 /* 2493 /*
2473 * H: cleanup selection 2494 * H: cleanup selection
… …
2485} 2506}
2486 2507
2487void 2508void
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2510{
2490 if (!l.t) 2511 if (!l.valid ())
2491 return; 2512 return;
2492 2513
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2515
2495 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
… …
2508 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2509 } 2530 }
2510} 2531}
2511 2532
2512void 2533void
2513rxvt_term::scr_recolour () NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2535{
2536 bool transparent = false;
2537
2515#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2539 if (bg_pixmap != None)
2517#else 2540 {
2541# ifdef ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT)
2543 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2518 2546
2547 transparent = true;
2548 }
2549 else
2550# endif
2551 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2554 }
2555 }
2556 else
2557#endif
2558 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 }
2562
2563 XClearWindow (dpy, parent);
2522 2564
2523 if (scrollBar.win) 2565 if (scrollBar.win)
2524 { 2566 {
2567 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2572 scrollBar.show (0);
2528 } 2573 }
2529 2574
2530#endif 2575 if (refresh)
2531 2576 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2577 scr_clear ();
2534 scr_touch (true); 2578 scr_touch (true);
2579 }
2535 want_refresh = 1; 2580 want_refresh = 1;
2536} 2581}
2537 2582
2538/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2539void 2584void
… …
2625 */ 2670 */
2626#if 0 2671#if 0
2627void 2672void
2628rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2674{
2630 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2632 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} 2677}
2651#endif 2678#endif
2652 2679
2653/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2656void 2683void
2657rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2658{ 2685{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2686 if (!selection.op)
2662 return; 2687 return;
2663 2688
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2692 || (check_more == 1
2669 && current_screen == selection.screen 2693 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && 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 (); 2696 CLEAR_ALL_SELECTION ();
2681} 2697}
2682 2698
2683/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2684/* 2700/*
2685 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2691 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2709 data[i] = C0_CR;
2694 2710
2695 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2697 2713
2698 tt_write (data, len); 2714 tt_write (data, len);
2699 2715
2700 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2702} 2718}
2703 2719
2704void 2720void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2722{
… …
2710 tt_paste (data, len); 2726 tt_paste (data, len);
2711} 2727}
2712 2728
2713/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2714/* 2730/*
2715 * Respond to a notification that a primary selection has been sent 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2733 * 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 2734 * EXT: button 2 release
2909 */ 2735 */
2910void 2736void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2738{
2913 if (selection.text && selnum == Sel_Primary) 2739 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 } 2740 {
2921 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2922 { 2743 }
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} 2744}
2964 2745
2965/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2966/* 2747/*
2967 * Clear all selected text 2748 * Clear all selected text
… …
2998 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2999 */ 2780 */
3000void 2781void
3001rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
3002{ 2783{
3003 int i; 2784 int size;
3004 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
3005 text_t *t; 2786 text_t *t;
3006 2787
3007 switch (selection.op) 2788 switch (selection.op)
3008 { 2789 {
… …
3024 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
3025 2806
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2808 return;
3028 2809
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2812
3032 int ofs = 0; 2813 int ofs = 0;
3033 int extra = 0; 2814 int extra = 0;
3034 2815
3035 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
3041 { 2822 {
3042#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
3043 if (selection.rect) 2824 if (selection.rect)
3044 { 2825 {
3045 col = selection.beg.col; 2826 col = selection.beg.col;
3046 end_col = ncol + 1; 2827 end_col = selection.end.col;
3047 } 2828 }
3048 else 2829 else
3049#endif 2830#endif
3050 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
3051 2832
3052 col = max (col, 0); 2833 col = max (col, 0);
3053 2834
3054 if (row == selection.end.row 2835 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3060 2837
3061 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3062 2839
3063 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3071 2848
3072 extra -= (len - 1); 2849 extra -= (len - 1);
3073 2850
3074 if (extra < 0) 2851 if (extra < 0)
3075 { 2852 {
3076 extra += i; 2853 extra += size;
3077 i += i; 2854 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2856 }
3080 2857
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2859 }
3083#endif 2860#endif
… …
3095 2872
3096 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3097 } 2874 }
3098 else 2875 else
3099#endif 2876#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3102 } 2881 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2882
3107 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3108 2884
3109 if (ofs == 0) 2885 if (ofs == 0)
3110 { 2886 {
… …
3616 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3617 */ 3393 */
3618void 3394void
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3398 XSelectionEvent ev;
3622 3399
3623 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3624 ev.property = None; 3401 ev.property = None;
3625 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3643#endif 3420#endif
3644 3421
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3423 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3425 ev.property = property;
3649 } 3426 }
3650#if TODO // TODO 3427#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3429 {
3653 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3654 } 3431 }
3655#endif 3432#endif
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3657 { 3434 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3437 ev.property = property;
3661 } 3438 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 { 3440 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3443 ev.property = property;
3667 } 3444 }
3668 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3742 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3744 ct.encoding = target; 3521 ct.encoding = target;
3745 } 3522 }
3746 3523
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3527 ev.property = property;
3751 3528
3752 if (freect) 3529 if (freect)
3753 XFree (ct.value); 3530 XFree (ct.value);
3754 } 3531 }
3755 3532

Diff Legend

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