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.329 by root, Sat Dec 26 10:24:04 2009 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 seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_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
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 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
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 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
192 if (!row_buf) 238 if (!prev_row_buf)
193 { 239 {
194 /* 240 /*
195 * 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
196 */ 242 */
197 top_row = 0; 243 top_row = 0;
198 term_start = 0; 244 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 245
214 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 263 selection.text = NULL;
232 selection.len = 0; 264 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
235 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
236 } 270 }
237 else 271 else
238 { 272 {
239 /* 273 /*
240 * add or delete rows as appropriate 274 * add or delete rows as appropriate
241 */ 275 */
242 276
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259
260 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
261 { 278 {
262 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 281
266 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);
267 { 286 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 287
275 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
276 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
278 291
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 300
288 do 301 do
289 { 302 {
290 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 305 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 307
295 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 ())
296 { 309 {
297 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
298 311
299 plines++; 312 plines++;
300 llen += prev_ncol; 313 llen += prev_ncol;
… …
313 326
314 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
316 { 329 {
317 qline = row_buf + qrow; 330 qline = row_buf + qrow;
318 lalloc (*qline); 331 qline->alloc (); // redundant with next line
319 qline->l = ncol; 332 qline->l = ncol;
320 qline->is_longer (1); 333 qline->is_longer (1);
321 334
322 int qcol = 0; 335 int qcol = 0;
323 336
… …
338 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
339 // least. 352 // least.
340 if (prow == ocur.row) 353 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
342 355
343 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
344 357
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 359
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 382 {
370 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
371 384
372 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
373 { 386 {
374 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)];
375 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
376 389
377 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
378 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);
379 } 394 }
380 395
381 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 398
386 term_start = 0; 399 term_start = 0;
387 } 400 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 401
393 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 404 }
396 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
397 free (tabs); 415 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
399 417
400 for (int col = ncol; --col; ) 418 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
402 420
403 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
404 422
405 prev_nrow = nrow; 423 prev_nrow = nrow;
… …
415 * Free everything. That way malloc debugging can find leakage. 433 * Free everything. That way malloc debugging can find leakage.
416 */ 434 */
417void 435void
418rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
419{ 437{
420 if (row_buf) 438 free (chunk);
421 {
422 delete talloc; talloc = 0;
423 delete ralloc; ralloc = 0;
424
425 free (row_buf);
426 free (swap_buf);
427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
430 free (tabs); 439 free (tabs);
431 tabs = 0;
432 }
433} 440}
434 441
435/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
436/* 443/*
437 * Hard/Soft reset 444 * Hard/Soft reset
438 */ 445 */
439void 446void
440rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
441{ 448{
442 scr_release (); 449 scr_release ();
450
451 row_buf = 0;
452 tabs = 0;
443 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 454 rvideo_mode = false;
445 scr_soft_reset (); 455 scr_soft_reset ();
446 scr_reset (); 456 scr_reset ();
447 457
448 scr_clear (true); 458 scr_clear (true);
449 scr_refresh (); 459 scr_refresh ();
450} 460}
451 461
452void 462void
453rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
454{ 464{
455 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
457 scr_overlay_off (); 467 scr_overlay_off ();
458#endif 468#endif
… …
513 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
515} 525}
516 526
517void 527void
518rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
519{ 529{
520 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
521 return; 531 return;
522 532
523 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
542 return; 552 return;
543 553
544 want_refresh = 1; 554 want_refresh = 1;
545 view_start = 0; 555 view_start = 0;
546 556
547 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 ();
548 563
549 int i = current_screen; current_screen = scrn; scrn = i; 564 current_screen = scrn;
550 565
551#if NSCREENS 566#if NSCREENS
552 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
553 { 568 {
554 num_scr = 0; 569 num_scr = 0;
… …
631 646
632 if (count > 0 647 if (count > 0
633 && row1 == 0 648 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
636 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 654
641 // sever bottommost line 655 // sever bottommost line
642 { 656 {
643 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
644 l.is_longer (0); 658 l.is_longer (0);
645 l.touch (); 659 l.touch ();
646 } 660 }
647 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
648 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 678 for (int i = count; i--; )
650 { 679 {
651 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
652 681
653 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 683 // could be rolled into scr_blank_screen_mem
655 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)))
656 { 685 {
657 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 687 l.l = 0;
… …
660 } 689 }
661 else 690 else
662 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
663 } 692 }
664 693
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
677 // move and/or clear selection, if any 694 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
679 { 697 {
680 selection.beg.row -= count; 698 selection.beg.row -= count;
681 selection.end.row -= count; 699 selection.end.row -= count;
682 selection.mark.row -= count; 700 selection.mark.row -= count;
683 701
684 if (selection.beg.row < top_row 702 selection_check (0);
685 || selection.end.row < top_row
686 || selection.mark.row < top_row)
687 {
688 CLEAR_ALL_SELECTION ();
689 selection.op = SELECTION_CLEAR;
690 }
691 } 703 }
692 704
693 // finally move the view window, if desired 705 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 707 && view_start != 0
… …
725 } 737 }
726 738
727 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
729 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
730 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
731 751
732 min_it (count, rows); 752 min_it (count, rows);
733 753
734 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 755
736 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
737 { 757 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 759
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 762 }
743 763
744 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
745 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 }
746 } 773 }
747 774
748 return count; 775 return count;
749} 776}
750 777
… …
756rxvt_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
757{ 784{
758 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
759 return; 786 return;
760 787
761 unsigned char checksel; 788 bool checksel;
762 unicode_t c; 789 unicode_t c;
763 int ncol = this->ncol; 790 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
765 792
766 want_refresh = 1; 793 want_refresh = 1;
… …
792 819
793 while (str < strend) 820 while (str < strend)
794 { 821 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 823
797 if (expect_false (c < 0x20)) 824 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 825 if (c == C0_LF)
799 { 826 {
800 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
801 828
802 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
821 { 848 {
822 scr_tab (1, true); 849 scr_tab (1, true);
823 continue; 850 continue;
824 } 851 }
825 852
826 if (expect_false ( 853 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 857 ))
831 { 858 {
… …
836 * should be a similar check. 863 * should be a similar check.
837 */ 864 */
838 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
839 } 866 }
840 867
841 if (expect_false (screen.flags & Screen_WrapNext)) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 869 {
843 scr_do_wrap (); 870 scr_do_wrap ();
844 871
845 line->l = ncol; 872 line->l = ncol;
846 line->is_longer (1); 873 line->is_longer (1);
… …
848 row = screen.cur.row; 875 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
850 } 877 }
851 878
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 881 c = 0xfffd;
855 882
856 // 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
857 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
859 // locale. 886 // locale.
860 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
861 888
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 890 {
864 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 892 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
882 } 909 }
883 } 910 }
884 911
885 if (expect_false (screen.flags & Screen_Insert)) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
887 914
888 if (width != 0) 915 if (width != 0)
889 { 916 {
890#if !UNICODE_3 917#if !UNICODE_3
… …
895# else 922# else
896 c = 0xfffd; 923 c = 0xfffd;
897# endif 924# endif
898#endif 925#endif
899 926
927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
928
929 // if the character doesn't fit into the remaining columns...
930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
931 {
932 if (screen.flags & Screen_Autowrap)
933 {
934 // ... artificially enlargen the previous one
935 c = NOCHAR;
936 // and try the same character next loop iteration
937 --str;
938 }
939 else
940 screen.cur.col = ncol - width;
941 }
942
900 // nuke the character at this position, if required 943 // nuke the character at this position, if required
901 if (expect_false ( 944 // due to wonderful coincidences everywhere else in this loop
945 // we never have to check for overwriting a wide char itself,
946 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 948 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 949
919 line->touch (); 950 line->touch ();
920 951
921 do 952 do
922 { 953 {
923 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
925 956
926 if (expect_true (screen.cur.col < ncol - 1)) 957 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 958 screen.cur.col++;
928 else 959 else
929 { 960 {
930 line->l = ncol; 961 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 963 screen.flags |= Screen_WrapNext;
933 break; 964
965 goto end_of_line;
934 } 966 }
935 967
936 c = NOCHAR; 968 c = NOCHAR;
937 } 969 }
938 while (expect_false (--width > 0)); 970 while (ecb_unlikely (--width > 0));
939 971
940 // pad with spaces when overwriting wide character with smaller one 972 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 974 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 975 line->t[c] = ' ';
948 line->r[c] = rend; 976 line->r[c] = rend;
949 }
950 } 977 }
978
979end_of_line:
980 ;
951 } 981 }
952#if ENABLE_COMBINING 982#if ENABLE_COMBINING
953 else // width == 0 983 else // width == 0
954 { 984 {
955 if (c != 0xfeff) // ignore BOM 985 if (c != 0xfeff) // ignore BOM
… …
1018 1048
1019 want_refresh = 1; 1049 want_refresh = 1;
1020#endif 1050#endif
1021 } 1051 }
1022 } 1052 }
1053 else if (screen.flags & Screen_WrapNext)
1054 screen.flags &= ~Screen_WrapNext;
1023 else 1055 else
1024 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1025} 1057}
1026 1058
1027/* ------------------------------------------------------------------------- */ 1059/* ------------------------------------------------------------------------- */
… …
1283 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1284} 1316}
1285 1317
1286/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1287/* 1319/*
1288 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1324 */
1293void 1325void
… …
1302 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1303 1335
1304 switch (mode) 1336 switch (mode)
1305 { 1337 {
1306 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1339 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1341 num = nrow - row;
1311 break; 1342 break;
1312 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1344 scr_erase_line (1);
1315 row = 0; 1345 row = 0;
1316 num = screen.cur.row; 1346 num = screen.cur.row;
1317 break; 1347 break;
1318 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1349 row = 0;
1321 num = nrow; 1350 num = nrow;
1322 break; 1351 break;
1323 default: 1352 default:
1324 return; 1353 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1334 return; 1363 return;
1335 1364
1336 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1337 1366
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1370 {
1345 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1346 1372
1347 if (mapped && !view_start) 1373 if (mapped)
1348 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1351 } 1377 }
1352 else 1378 else
1353 { 1379 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1381
1356 if (mapped && !view_start) 1382 if (mapped)
1357 { 1383 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1388 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1392 }
1367 } 1393 }
1368 1394
1369 for (; num--; row++) 1395 for (; num--; row++)
1370 { 1396 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1372 1398
1373 if (!view_start) 1399 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1401 }
1376} 1402}
1377 1403
1378#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1379void 1405void
… …
1398 1424
1399 want_refresh = 1; 1425 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1401 1427
1402 num_scr_allow = 0; 1428 num_scr_allow = 0;
1403 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 ();
1404 1434
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1407 { 1437 {
1408 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1678 { 1708 {
1679 rvideo_state = on; 1709 rvideo_state = on;
1680 1710
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1713 if (bg_pixmap == None)
1684#endif 1714#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1716
1687 XGCValues gcvalue; 1717 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1862 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1863 {
1834 min_it (rc[i].col, ncol - 1); 1864 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1865 min_it (rc[i].row, nrow - 1);
1836 } 1866 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1867
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1868 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1869 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1870
1841 num_scr_allow = 0; 1871 num_scr_allow = 0;
1842 1872
… …
1849 * Refresh the entire screen 1879 * Refresh the entire screen
1850 */ 1880 */
1851void 1881void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1853{ 1883{
1854 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1885}
1856 1886
1857/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1858/* 1888/*
1859 * 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
… …
1915 1945
1916# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1919# endif 1949# endif
1920 XMapWindow (dpy, parent[0]); 1950 XMapWindow (dpy, parent);
1921# endif 1951# endif
1922 1952
1923# if ENABLE_FRILLS 1953# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1954 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1955 set_urgency (1);
… …
1933 1963
1934 bell_ev.start (VISUAL_BELL_DURATION); 1964 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1965 }
1936 else 1966 else
1937 XBell (dpy, 0); 1967 XBell (dpy, 0);
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1969#endif
1939} 1970}
1940 1971
1941/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */
1943void 1973void
1944rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1945{ 1975{
1946#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1947 int nrows, row_start; 1977 int nrows, row_start;
… …
1961 row_start = view_start; 1991 row_start = view_start;
1962 } 1992 }
1963 1993
1964 wctomb (0, 0); 1994 wctomb (0, 0);
1965 1995
1966 for (int r1 = 0; r1 < nrows; r1++) 1996 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 1997 {
1968 text_t *tp = ROW(r1).t; 1998 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 1999 int len = ROW(r1).l;
1970 2000
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2001 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2021 * A: set up vars 2051 * A: set up vars
2022 */ 2052 */
2023 refresh_count = 0; 2053 refresh_count = 0;
2024 2054
2025 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0; 2056 bool have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2028 have_bg = bgPixmap.pixmap != None; 2058 have_bg = bg_pixmap != None;
2029#endif 2059#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2031 2061
2032 /* 2062 /*
2033 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2039 scr_swap_overlay (); 2069 scr_swap_overlay ();
2040#endif 2070#endif
2041 2071
2042 char showcursor = screen.flags & Screen_VisibleCursor; 2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2043 2073
2044 /* 2074 /*
2045 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2046 */ 2076 */
2047 { 2077 {
2048 unsigned char setoldcursor; 2078 bool setoldcursor;
2049 2079
2050#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2081 if (hidden_cursor)
2052 showcursor = 0; 2082 showcursor = 0;
2053#endif 2083#endif
… …
2082 ccol2 = bgcolor_of (rstyle); 2112 ccol2 = bgcolor_of (rstyle);
2083#else 2113#else
2084 ccol2 = Color_bg; 2114 ccol2 = Color_bg;
2085#endif 2115#endif
2086 2116
2087 if (showcursor && focus) 2117 if (focus)
2088 { 2118 {
2089 if (option (Opt_cursorUnderline)) 2119 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2120 *crp ^= RS_Uline;
2091 else 2121 else
2092 { 2122 {
… …
2140 { 2170 {
2141 int16_t nits; 2171 int16_t nits;
2142 int i = num_scr; 2172 int i = num_scr;
2143 int j; 2173 int j;
2144 int len, wlen; 2174 int len, wlen;
2145 dLocal (int, num_scr);
2146 2175
2147 j = nrow; 2176 j = nrow;
2148 wlen = len = -1; 2177 wlen = len = -1;
2149 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2150 2179
… …
2225 continue; 2254 continue;
2226 2255
2227 // redraw one or more characters 2256 // redraw one or more characters
2228 2257
2229 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2231 --col; 2260 --col;
2232 2261
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2263 text_t *text = stp + col;
2235 int count = 1; 2264 int count = 1;
2236 2265
2237 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2238 drp[col] = rend; 2267 drp[col] = rend;
… …
2273 2302
2274 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2276 2305
2277 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR)) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2279 count++, i--; 2308 count++, i--;
2280 2309
2281 /* 2310 /*
2282 * Determine the attributes for the string 2311 * Determine the attributes for the string
2283 */ 2312 */
2284 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2286 2315
2287 // 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
2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2318 {
2290 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2291 2320
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2341
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2342 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2343 fore = Color_UL;
2315#endif 2344#endif
2316 2345
2346#ifdef OPTION_HC
2347 if (rend & RS_Sel)
2348 {
2349 /* invert the column if no highlightColor is set or it is the
2350 * current cursor column */
2351 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2352 && ISSET_PIXCOLOR (Color_HC))
2353 {
2354 if (ISSET_PIXCOLOR (Color_HTC))
2355 fore = Color_HTC;
2356 // if invert is 0 reverse video is set so we use bg color as fg color
2357 else if (!invert)
2358 fore = back;
2359
2360 back = Color_HC;
2361 invert = 0;
2362 }
2363 }
2364#endif
2365
2317 if (invert) 2366 if (invert)
2318 { 2367 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back); 2368 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2369
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2370#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back) 2371 if (fore == back)
2337 { 2372 {
2338 fore = Color_bg; 2373 fore = Color_bg;
2339 back = Color_fg; 2374 back = Color_fg;
2340 } 2375 }
… …
2376 /* 2411 /*
2377 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2378 */ 2413 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380 2415
2381 if (expect_true (have_bg && back == Color_bg)) 2416 if (ecb_likely (have_bg && back == Color_bg))
2382 { 2417 {
2383 // this is very ugly, maybe push it into ->draw? 2418 // this is very ugly, maybe push it into ->draw?
2384 2419
2385 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ') 2421 if (text[i] != ' ')
… …
2393 did_clear: ; 2428 did_clear: ;
2394 } 2429 }
2395 else 2430 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397 2432
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2399 { 2434 {
2400#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2403 else 2438 else
… …
2449 2484
2450 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2451 Col2Pixel (col), 2486 Col2Pixel (col),
2452 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2453 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2455 } 2490 }
2456 } 2491 }
2457 2492
2458 /* 2493 /*
2459 * H: cleanup selection 2494 * H: cleanup selection
… …
2471} 2506}
2472 2507
2473void 2508void
2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475{ 2510{
2476 if (!l.t) 2511 if (!l.valid ())
2477 return; 2512 return;
2478 2513
2479 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
2480 2515
2481 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
… …
2494 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2495 } 2530 }
2496} 2531}
2497 2532
2498void 2533void
2499rxvt_term::scr_recolour () NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2500{ 2535{
2536 bool transparent = false;
2537
2501#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply (); 2539 if (bg_pixmap != None)
2503#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);
2504 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 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 }
2562
2563 XClearWindow (dpy, parent);
2508 2564
2509 if (scrollBar.win) 2565 if (scrollBar.win)
2510 { 2566 {
2567 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2513 scrollBar.show (0); 2572 scrollBar.show (0);
2514 } 2573 }
2515 2574
2516#endif 2575 if (refresh)
2517 2576 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2577 scr_clear ();
2520 scr_touch (true); 2578 scr_touch (true);
2579 }
2521 want_refresh = 1; 2580 want_refresh = 1;
2522} 2581}
2523 2582
2524/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2525void 2584void
… …
2593 { 2652 {
2594#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2595 if (selection.rect) 2654 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2655 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2656 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2657 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2658 else
2600#endif 2659#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2660 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2661 selection.end.row, selection.end.col,
2603 RS_RVid); 2662 RS_Sel | RS_RVid);
2604 } 2663 }
2605} 2664}
2606 2665
2607/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2608/* 2667/*
… …
2611 */ 2670 */
2612#if 0 2671#if 0
2613void 2672void
2614rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2674{
2616 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2617 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2618 char r1[] = "\n";
2619
2620 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++)
2622 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l
2624 : ncol;
2625 for (towrite = width; towrite; towrite -= wrote)
2626 {
2627 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2628 towrite);
2629 if (wrote < 0)
2630 return; /* XXX: death, no report */
2631 }
2632 if (row_buf[row].l >= 0)
2633 if (write (fd, r1, 1) <= 0)
2634 return; /* XXX: death, no report */
2635 }
2636} 2677}
2637#endif 2678#endif
2638 2679
2639/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2640 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2641 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2642void 2683void
2643rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2644{ 2685{
2645 row_col_t pos;
2646
2647 if (!selection.op) 2686 if (!selection.op)
2648 return; 2687 return;
2649 2688
2650 pos.row = pos.col = 0;
2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654 || (check_more == 1 2692 || (check_more == 1
2655 && current_screen == selection.screen 2693 && current_screen == selection.screen
2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2658 || (check_more == 2
2659 && ROWCOL_IS_BEFORE (selection.beg, pos)
2660 && ROWCOL_IS_AFTER (selection.end, pos))
2661 || (check_more == 3
2662 && ROWCOL_IS_AFTER (selection.end, pos))
2663 || (check_more == 4 /* screen width change */
2664 && (selection.beg.row != selection.end.row
2665 || selection.end.col > ncol)))
2666 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2667} 2697}
2668 2698
2669/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2670/* 2700/*
2671 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2672 */ 2702 */
2673void 2703void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2705{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2709 data[i] = C0_CR;
2680 2710
2681 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2683 2713
2684 tt_write (data, len); 2714 tt_write (data, len);
2685 2715
2686 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2688} 2718}
2689 2719
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2720void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2722{
2698 if (prop == None) /* check for failed XConvertSelection */ 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699 {
2700 if ((selection_type & Sel_CompoundText))
2701 {
2702 int selnum = selection_type & Sel_whereMask;
2703
2704 selection_type = 0;
2705 if (selnum != Sel_direct)
2706 selection_request_other (XA_STRING, selnum);
2707 }
2708
2709 if ((selection_type & Sel_UTF8String))
2710 {
2711 int selnum = selection_type & Sel_whereMask;
2712
2713 selection_type = Sel_CompoundText;
2714 if (selnum != Sel_direct)
2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716 else
2717 selection_type = 0;
2718 }
2719
2720 return;
2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct2.encoding, &ct2.format,
2749 &ct2.nitems, &bytes_after,
2750 &ct2.value) != Success)
2751 goto bailout;
2752
2753 // realloc should be compatible to XFree, here, and elsewhere, too
2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756 ct.nitems += ct2.nitems;
2757
2758 XFree (ct2.value);
2759 }
2760
2761 if (ct.value == 0)
2762 goto bailout;
2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2790 }
2791 else
2792 {
2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795 {
2796 /*
2797 * pass through again trying CUT_BUFFER0 if we've come from
2798 * XConvertSelection () but nothing was presented
2799 */
2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2801 }
2802
2803 goto bailout;
2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2842 for (int i = 0; i < cr; i++)
2843 paste (cl[i], strlen (cl[i]));
2844
2845 XFreeStringList (cl);
2846 }
2847 else
2848 paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850bailout:
2851 XFree (ct.value);
2852
2853 if (selection_wait == Sel_normal)
2854 selection_wait = Sel_none;
2855}
2856
2857void
2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859{
2860 selection_wait = Sel_none;
2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866}
2867
2868void
2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870{
2871 if (prop == None || selection_wait != Sel_incr)
2872 return; 2724 return;
2873 2725
2874 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2875} 2727}
2876 2728
2877/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2878/* 2730/*
2879 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2882 * > CUT_BUFFER0
2883 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2884 * will auto fallback to CUT_BUFFER0
2885 * EXT: button 2 release 2734 * EXT: button 2 release
2886 */ 2735 */
2887void 2736void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2738{
2890 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2891 {
2892 /* internal selection */
2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2896 return;
2897 } 2740 {
2898 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2899 { 2743 }
2900 selection_request_time = tm;
2901 selection_wait = Sel_normal;
2902
2903#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return;
2907#else
2908 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return;
2911#endif
2912 }
2913
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2916}
2917
2918int
2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920{
2921 Atom sel;
2922
2923 selection_type |= selnum;
2924
2925 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY;
2927 else if (selnum == Sel_Secondary)
2928 sel = XA_SECONDARY;
2929 else
2930 sel = xa[XA_CLIPBOARD];
2931
2932 if (XGetSelectionOwner (dpy, sel) != None)
2933 {
2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935 vt, selection_request_time);
2936 return 1;
2937 }
2938
2939 return 0;
2940} 2744}
2941 2745
2942/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2943/* 2747/*
2944 * Clear all selected text 2748 * Clear all selected text
2945 * EXT: SelectionClear 2749 * EXT: SelectionClear
2946 */ 2750 */
2947void 2751void
2948rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2753{
2754 if (!clipboard)
2755 {
2950 want_refresh = 1; 2756 want_refresh = 1;
2951 free (selection.text); 2757 free (selection.text);
2952 selection.text = NULL; 2758 selection.text = NULL;
2953 selection.len = 0; 2759 selection.len = 0;
2954 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2955 2761
2956 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2958} 2774}
2959 2775
2960/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2961/* 2777/*
2962 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2964 */ 2780 */
2965void 2781void
2966rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2967{ 2783{
2968 int i; 2784 int size;
2969 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2970 text_t *t; 2786 text_t *t;
2971 2787
2972 switch (selection.op) 2788 switch (selection.op)
2973 { 2789 {
… …
2989 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2990 2806
2991 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)))
2992 return; 2808 return;
2993 2809
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 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));
2996 2812
2997 int ofs = 0; 2813 int ofs = 0;
2998 int extra = 0; 2814 int extra = 0;
2999 2815
3000 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
3006 { 2822 {
3007#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
3008 if (selection.rect) 2824 if (selection.rect)
3009 { 2825 {
3010 col = selection.beg.col; 2826 col = selection.beg.col;
3011 end_col = ncol + 1; 2827 end_col = selection.end.col;
3012 } 2828 }
3013 else 2829 else
3014#endif 2830#endif
3015 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
3016 2832
3017 col = max (col, 0); 2833 col = max (col, 0);
3018 2834
3019 if (row == selection.end.row 2835 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3025 2837
3026 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3027 2839
3028 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3036 2848
3037 extra -= (len - 1); 2849 extra -= (len - 1);
3038 2850
3039 if (extra < 0) 2851 if (extra < 0)
3040 { 2852 {
3041 extra += i; 2853 extra += size;
3042 i += i; 2854 size += size;
3043 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));
3044 } 2856 }
3045 2857
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2859 }
3048#endif 2860#endif
… …
3060 2872
3061 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3062 } 2874 }
3063 else 2875 else
3064#endif 2876#endif
3065 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))
3066 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3067 } 2881 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2882
3072 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3073 2884
3074 if (ofs == 0) 2885 if (ofs == 0)
3075 { 2886 {
… …
3088 2899
3089 selection_grab (tm); 2900 selection_grab (tm);
3090} 2901}
3091 2902
3092bool 2903bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3095 selection_time = tm; 2910 selection_time = tm;
2911 sel = XA_PRIMARY;
2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
3096 2918
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2919 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2920 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2921 {
3100 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3101 return true; 2923 return true;
3102 } 2924 }
3103 else 2925 else
3104 { 2926 {
3105 selection_clear (); 2927 selection_clear (clipboard);
3106 return false; 2928 return false;
3107 } 2929 }
3108 2930
3109#if 0 2931#if 0
3110 XTextProperty ct; 2932 XTextProperty ct;
… …
3570 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3571 */ 3393 */
3572void 3394void
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3398 XSelectionEvent ev;
3576 3399
3577 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3578 ev.property = None; 3401 ev.property = None;
3579 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3597#endif 3420#endif
3598 3421
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3423 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3425 ev.property = property;
3603 } 3426 }
3604#if TODO // TODO 3427#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3429 {
3607 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3608 } 3431 }
3609#endif 3432#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3434 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3615 } 3444 }
3616 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3480 {
3652 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3482 style = enc_compound_text;
3654 } 3483 }
3655 3484
3656 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3486 {
3658 cl = selection.text; 3487 cl = selection.text;
3659 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3660 } 3494 }
3661 else 3495 else
3662 { 3496 {
3663 cl = L""; 3497 cl = L"";
3664 selectlen = 0; 3498 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3687 ct.encoding = target; 3521 ct.encoding = target;
3688 } 3522 }
3689 3523
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3527 ev.property = property;
3694 3528
3695 if (freect) 3529 if (freect)
3696 XFree (ct.value); 3530 XFree (ct.value);
3697 } 3531 }
3698 3532

Diff Legend

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