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.330 by root, Tue Dec 29 04:18:10 2009 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 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 () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
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 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
192 if (!row_buf) 239 if (!prev_row_buf)
193 { 240 {
194 /* 241 /*
195 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 243 */
197 top_row = 0; 244 top_row = 0;
198 term_start = 0; 245 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 246
214 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 264 selection.text = NULL;
232 selection.len = 0; 265 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
235 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
236 } 271 }
237 else 272 else
238 { 273 {
239 /* 274 /*
240 * add or delete rows as appropriate 275 * add or delete rows as appropriate
241 */ 276 */
242 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
261 { 279 {
262 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 282
266 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
267 { 290 }
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 291
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
278 295
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 304
288 do 305 do
289 { 306 {
290 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 309 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 311
295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
296 { 313 {
297 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
298 315
299 plines++; 316 plines++;
300 llen += prev_ncol; 317 llen += prev_ncol;
… …
313 330
314 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
316 { 333 {
317 qline = row_buf + qrow; 334 qline = row_buf + qrow;
318 lalloc (*qline); 335 qline->alloc (); // redundant with next line
319 qline->l = ncol; 336 qline->l = ncol;
320 qline->is_longer (1); 337 qline->is_longer (1);
321 338
322 int qcol = 0; 339 int qcol = 0;
323 340
… …
338 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
339 // least. 356 // least.
340 if (prow == ocur.row) 357 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
342 359
343 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
344 361
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 363
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 386 {
370 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
371 388
372 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
373 { 390 {
374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
375 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
376 393
377 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
378 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = min (src.l, ncol);
399 dst.f = src.f;
379 } 400 }
380 401
381 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 404
386 term_start = 0; 405 term_start = 0;
387 } 406 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 407
393 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 410 }
396 411
412 for (int row = nrow; row--; )
413 {
414 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
415 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
417 }
418
419 chunk_free (prev_chunk, prev_chunk_size);
420
397 free (tabs); 421 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 422 tabs = (char *)rxvt_malloc (ncol);
399 423
400 for (int col = ncol; --col; ) 424 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 425 tabs [col] = col % TABSIZE == 0;
402 426
403 CLEAR_ALL_SELECTION (); 427 CLEAR_ALL_SELECTION ();
404 428
405 prev_nrow = nrow; 429 prev_nrow = nrow;
… …
408 tt_winch (); 432 tt_winch ();
409 433
410 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411} 435}
412 436
413/* ------------------------------------------------------------------------- */ 437void ecb_cold
414/*
415 * Free everything. That way malloc debugging can find leakage.
416 */
417void
418rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
419{ 439{
420 if (row_buf) 440 chunk_free (chunk, chunk_size);
421 { 441 chunk = 0;
422 delete talloc; talloc = 0; 442 row_buf = 0;
423 delete ralloc; ralloc = 0;
424 443
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); 444 free (tabs);
431 tabs = 0; 445 tabs = 0;
432 }
433} 446}
434 447
435/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
436/* 449/*
437 * Hard/Soft reset 450 * Hard/Soft reset
438 */ 451 */
439void 452void ecb_cold
440rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
441{ 454{
442 scr_release (); 455 scr_release ();
456
443 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 458 rvideo_mode = false;
445 scr_soft_reset (); 459 scr_soft_reset ();
446 scr_reset (); 460 scr_reset ();
447 461
448 scr_clear (true); 462 scr_clear (true);
449 scr_refresh (); 463 scr_refresh ();
450} 464}
451 465
452void 466void ecb_cold
453rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
454{ 468{
455 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
457 scr_overlay_off (); 471 scr_overlay_off ();
458#endif 472#endif
… …
513 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
515} 529}
516 530
517void 531void
518rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
519{ 533{
520 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
521 return; 535 return;
522 536
523 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
542 return; 556 return;
543 557
544 want_refresh = 1; 558 want_refresh = 1;
545 view_start = 0; 559 view_start = 0;
546 560
547 selection_check (2); /* check for boundary cross */ 561 /* check for boundary cross */
562 row_col_t pos;
563 pos.row = pos.col = 0;
564 if (ROWCOL_IS_BEFORE (selection.beg, pos)
565 && ROWCOL_IS_AFTER (selection.end, pos))
566 CLEAR_SELECTION ();
548 567
549 int i = current_screen; current_screen = scrn; scrn = i; 568 current_screen = scrn;
550 569
551#if NSCREENS 570#if NSCREENS
552 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
553 { 572 {
554 num_scr = 0; 573 num_scr = 0;
… …
618/* 637/*
619 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
620 * count positive ==> scroll up 639 * count positive ==> scroll up
621 * count negative ==> scroll down 640 * count negative ==> scroll down
622 */ 641 */
623int 642int ecb_hot
624rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
625{ 644{
626 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
627 return 0; 646 return 0;
628 647
… …
631 650
632 if (count > 0 651 if (count > 0
633 && row1 == 0 652 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 653 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 654 {
655 min_it (count, total_rows - (nrow - (row2 + 1)));
656
636 top_row = max (top_row - count, -saveLines); 657 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 658
641 // sever bottommost line 659 // sever bottommost line
642 { 660 {
643 line_t &l = ROW(row2 - count); 661 line_t &l = ROW(row2);
644 l.is_longer (0); 662 l.is_longer (0);
645 l.touch (); 663 l.touch ();
646 } 664 }
647 665
666 // scroll everything up 'count' lines
667 term_start = (term_start + count) % total_rows;
668
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
648 // erase newly scrolled-in lines 681 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 682 for (int i = count; i--; )
650 { 683 {
651 line_t &l = ROW(nrow - 1 - i); 684 line_t &l = ROW(row2 - i);
652 685
653 // optimize if already cleared, can be significant on slow machines 686 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 687 // 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))) 688 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 { 689 {
657 scr_blank_line (l, 0, l.l, rstyle); 690 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 691 l.l = 0;
… …
660 } 693 }
661 else 694 else
662 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
663 } 696 }
664 697
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 698 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
679 { 701 {
680 selection.beg.row -= count; 702 selection.beg.row -= count;
681 selection.end.row -= count; 703 selection.end.row -= count;
682 selection.mark.row -= count; 704 selection.mark.row -= count;
683 705
684 if (selection.beg.row < top_row 706 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 } 707 }
692 708
693 // finally move the view window, if desired 709 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 710 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 711 && view_start != 0
… …
725 } 741 }
726 742
727 // use a simple and robust scrolling algorithm, this 743 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 744 // part of scr_scroll_text is not time-critical.
729 745
746 // sever line above scroll region
747 if (row1)
748 {
749 line_t &l = ROW(row1 - 1);
750 l.is_longer (0);
751 l.touch ();
752 }
753
730 int rows = row2 - row1 + 1; 754 int rows = row2 - row1 + 1;
731 755
732 min_it (count, rows); 756 min_it (count, rows);
733 757
734 line_t *temp_buf = row_buf + total_rows; 758 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 759
736 for (int row = 0; row < rows; row++) 760 for (int row = 0; row < rows; row++)
737 { 761 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 762 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 763
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 765 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 766 }
743 767
744 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
745 ROW(row1 + row) = temp_buf [row]; 769 ROW(row1 + row) = temp_buf [row];
770
771 // sever bottommost line
772 {
773 line_t &l = ROW(row2);
774 l.is_longer (0);
775 l.touch ();
776 }
746 } 777 }
747 778
748 return count; 779 return count;
749} 780}
750 781
751/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
752/* 783/*
753 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
754 */ 785 */
755void 786void ecb_hot
756rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 787rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
757{ 788{
758 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
759 return; 790 return;
760 791
761 unsigned char checksel; 792 bool checksel;
762 unicode_t c; 793 unicode_t c;
763 int ncol = this->ncol; 794 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
765 796
766 want_refresh = 1; 797 want_refresh = 1;
… …
792 823
793 while (str < strend) 824 while (str < strend)
794 { 825 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 826 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 827
797 if (expect_false (c < 0x20)) 828 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 829 if (c == C0_LF)
799 { 830 {
800 max_it (line->l, screen.cur.col); 831 max_it (line->l, screen.cur.col);
801 832
802 screen.flags &= ~Screen_WrapNext; 833 screen.flags &= ~Screen_WrapNext;
… …
821 { 852 {
822 scr_tab (1, true); 853 scr_tab (1, true);
823 continue; 854 continue;
824 } 855 }
825 856
826 if (expect_false ( 857 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 858 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 861 ))
831 { 862 {
… …
836 * should be a similar check. 867 * should be a similar check.
837 */ 868 */
838 CLEAR_SELECTION (); 869 CLEAR_SELECTION ();
839 } 870 }
840 871
841 if (expect_false (screen.flags & Screen_WrapNext)) 872 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 873 {
843 scr_do_wrap (); 874 scr_do_wrap ();
844 875
845 line->l = ncol; 876 line->l = ncol;
846 line->is_longer (1); 877 line->is_longer (1);
… …
848 row = screen.cur.row; 879 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 880 line = &ROW(row); /* _must_ refresh */
850 } 881 }
851 882
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 883 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 884 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 885 c = 0xfffd;
855 886
856 // rely on wcwidth to tell us the character width, do wcwidth before 887 // rely on wcwidth to tell us the character width, do wcwidth before
857 // further replacements, as wcwidth might return -1 for the line 888 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 889 // drawing characters below as they might be invalid in the current
859 // locale. 890 // locale.
860 int width = WCWIDTH (c); 891 int width = WCWIDTH (c);
861 892
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 893 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 894 {
864 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 896 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 898 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 911 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 912 width = 1; // vt100 line drawing characters are always single-width
882 } 913 }
883 } 914 }
884 915
885 if (expect_false (screen.flags & Screen_Insert)) 916 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 917 scr_insdel_chars (width, INSERT);
887 918
888 if (width != 0) 919 if (width != 0)
889 { 920 {
890#if !UNICODE_3 921#if !UNICODE_3
… …
895# else 926# else
896 c = 0xfffd; 927 c = 0xfffd;
897# endif 928# endif
898#endif 929#endif
899 930
931 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
932
933 // if the character doesn't fit into the remaining columns...
934 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
935 {
936 if (screen.flags & Screen_Autowrap)
937 {
938 // ... artificially enlargen the previous one
939 c = NOCHAR;
940 // and try the same character next loop iteration
941 --str;
942 }
943 else
944 screen.cur.col = ncol - width;
945 }
946
900 // nuke the character at this position, if required 947 // nuke the character at this position, if required
901 if (expect_false ( 948 // due to wonderful coincidences everywhere else in this loop
949 // we never have to check for overwriting a wide char itself,
950 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 951 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); 952 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 953
919 line->touch (); 954 line->touch ();
920 955
921 do 956 do
922 { 957 {
923 line->t[screen.cur.col] = c; 958 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 959 line->r[screen.cur.col] = rend;
925 960
926 if (expect_true (screen.cur.col < ncol - 1)) 961 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 962 screen.cur.col++;
928 else 963 else
929 { 964 {
930 line->l = ncol; 965 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 966 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 967 screen.flags |= Screen_WrapNext;
933 break; 968
969 goto end_of_line;
934 } 970 }
935 971
936 c = NOCHAR; 972 c = NOCHAR;
937 } 973 }
938 while (expect_false (--width > 0)); 974 while (ecb_unlikely (--width > 0));
939 975
940 // pad with spaces when overwriting wide character with smaller one 976 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 977 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 978 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 979 line->t[c] = ' ';
948 line->r[c] = rend; 980 line->r[c] = rend;
949 }
950 } 981 }
982
983end_of_line:
984 ;
951 } 985 }
952#if ENABLE_COMBINING 986#if ENABLE_COMBINING
953 else // width == 0 987 else // width == 0
954 { 988 {
955 if (c != 0xfeff) // ignore BOM 989 if (c != 0xfeff) // ignore BOM
… …
1018 1052
1019 want_refresh = 1; 1053 want_refresh = 1;
1020#endif 1054#endif
1021 } 1055 }
1022 } 1056 }
1057 else if (screen.flags & Screen_WrapNext)
1058 screen.flags &= ~Screen_WrapNext;
1023 else 1059 else
1024 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1025} 1061}
1026 1062
1027/* ------------------------------------------------------------------------- */ 1063/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1108 */ 1144 */
1109#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1110void 1146void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1112{ 1148{
1113 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1151 else
… …
1122 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1125 */ 1161 */
1126#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1127void 1163void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1129{ 1165{
1130 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1168 else
… …
1283 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1284} 1320}
1285 1321
1286/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1287/* 1323/*
1288 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1328 */
1293void 1329void
… …
1302 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1303 1339
1304 switch (mode) 1340 switch (mode)
1305 { 1341 {
1306 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1343 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1345 num = nrow - row;
1311 break; 1346 break;
1312 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1348 scr_erase_line (1);
1315 row = 0; 1349 row = 0;
1316 num = screen.cur.row; 1350 num = screen.cur.row;
1317 break; 1351 break;
1318 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1353 row = 0;
1321 num = nrow; 1354 num = nrow;
1322 break; 1355 break;
1323 default: 1356 default:
1324 return; 1357 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1366 if (row >= nrow) /* Out Of Bounds */
1334 return; 1367 return;
1335 1368
1336 min_it (num, nrow - row); 1369 min_it (num, nrow - row);
1337 1370
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)) 1371 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1372 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1373 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1374 {
1345 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1346 1376
1347 if (mapped && !view_start) 1377 if (mapped)
1348 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1351 } 1381 }
1352 else 1382 else
1353 { 1383 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1385
1356 if (mapped && !view_start) 1386 if (mapped)
1357 { 1387 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1391 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1392 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1396 }
1367 } 1397 }
1368 1398
1369 for (; num--; row++) 1399 for (; num--; row++)
1370 { 1400 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1401 scr_blank_screen_mem (ROW(row), rstyle);
1372 1402
1373 if (!view_start) 1403 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1404 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1405 }
1376} 1406}
1377 1407
1378#if !ENABLE_MINIMAL 1408#if !ENABLE_MINIMAL
1379void 1409void
… …
1389/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1390/* 1420/*
1391 * Fill the screen with `E's 1421 * Fill the screen with `E's
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1423 */
1394void 1424void ecb_cold
1395rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1396{ 1426{
1397 rend_t fs; 1427 rend_t fs;
1398 1428
1399 want_refresh = 1; 1429 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1401 1431
1402 num_scr_allow = 0; 1432 num_scr_allow = 0;
1403 selection_check (3); 1433
1434 row_col_t pos;
1435 pos.row = pos.col = 0;
1436 if (ROWCOL_IS_AFTER (selection.end, pos))
1437 CLEAR_SELECTION ();
1404 1438
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1407 { 1441 {
1408 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1559/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1560/* 1594/*
1561 * Set the scrolling region 1595 * Set the scrolling region
1562 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563 */ 1597 */
1564void 1598void ecb_cold
1565rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566{ 1600{
1567 max_it (top, 0); 1601 max_it (top, 0);
1568 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1569 1603
… …
1579/* 1613/*
1580 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1581 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583 */ 1617 */
1584void 1618void ecb_cold
1585rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586{ 1620{
1587 want_refresh = 1; 1621 want_refresh = 1;
1588 1622
1589 if (mode) 1623 if (mode)
… …
1596/* 1630/*
1597 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1598 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600 */ 1634 */
1601void 1635void ecb_cold
1602rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1603{ 1637{
1604 if (mode) 1638 if (mode)
1605 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1606 else 1640 else
… …
1615 * Relative mode: line numbers are relative to top margin of scrolling region 1649 * Relative mode: line numbers are relative to top margin of scrolling region
1616 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1617 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619 */ 1653 */
1620void 1654void ecb_cold
1621rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1622{ 1656{
1623 if (mode) 1657 if (mode)
1624 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1625 else 1659 else
… …
1632/* 1666/*
1633 * Set insert/replace mode 1667 * Set insert/replace mode
1634 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636 */ 1670 */
1637void 1671void ecb_cold
1638rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1639{ 1673{
1640 if (mode) 1674 if (mode)
1641 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1642 else 1676 else
… …
1648 * Set/Unset tabs 1682 * Set/Unset tabs
1649 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1650 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652 */ 1686 */
1653void 1687void ecb_cold
1654rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1655{ 1689{
1656 if (mode < 0) 1690 if (mode < 0)
1657 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1658 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1677 if (rvideo_state != on) 1711 if (rvideo_state != on)
1678 { 1712 {
1679 rvideo_state = on; 1713 rvideo_state = on;
1680 1714
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1683 if (bgPixmap.pixmap == None) 1717 if (bg_img == 0)
1684#endif 1718#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1720
1687 XGCValues gcvalue; 1721 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1697/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1698/* 1732/*
1699 * Report current cursor position 1733 * Report current cursor position
1700 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1701 */ 1735 */
1702void 1736void ecb_cold
1703rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1704{ 1738{
1705 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1739 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1706} 1740}
1707 1741
… …
1710 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1711 1745
1712/* 1746/*
1713 * Set font style 1747 * Set font style
1714 */ 1748 */
1715void 1749void ecb_cold
1716rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1717{ 1751{
1718#if 0 1752#if 0
1719 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1720 { 1754 {
… …
1742 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1743 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1744 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1745 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1746 */ 1780 */
1747void 1781void ecb_cold
1748rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1749{ 1783{
1750 screen.charset = set; 1784 screen.charset = set;
1751 set_font_style (); 1785 set_font_style ();
1752} 1786}
… …
1773 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1774 1808
1775/* 1809/*
1776 * refresh matching text. 1810 * refresh matching text.
1777 */ 1811 */
1778bool 1812bool ecb_cold
1779rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1780{ 1814{
1781 bool found = false; 1815 bool found = false;
1782 1816
1783 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1802 PART_BEG = 0, 1836 PART_BEG = 0,
1803 PART_END, 1837 PART_END,
1804 RC_COUNT 1838 RC_COUNT
1805}; 1839};
1806 1840
1807void 1841void ecb_hot
1808rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1842rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1809{ 1843{
1810 int i; 1844 int i;
1811 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1812 1846
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1866 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1867 {
1834 min_it (rc[i].col, ncol - 1); 1868 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1869 min_it (rc[i].row, nrow - 1);
1836 } 1870 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1871
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1872 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); 1873 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1874
1841 num_scr_allow = 0; 1875 num_scr_allow = 0;
1842 1876
… …
1849 * Refresh the entire screen 1883 * Refresh the entire screen
1850 */ 1884 */
1851void 1885void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1853{ 1887{
1854 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1889}
1856 1890
1857/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1858/* 1892/*
1859 * Move the display so that the line represented by scrollbar value Y is at 1893 * Move the display so that the line represented by scrollbar value Y is at
… …
1915 1949
1916# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1919# endif 1953# endif
1920 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1921# endif 1955# endif
1922 1956
1923# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1959 set_urgency (1);
… …
1933 1967
1934 bell_ev.start (VISUAL_BELL_DURATION); 1968 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1969 }
1936 else 1970 else
1937 XBell (dpy, 0); 1971 XBell (dpy, 0);
1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1973#endif
1939} 1974}
1940 1975
1941/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1977void ecb_cold
1943void
1944rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1945{ 1979{
1946#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1947 int nrows, row_start; 1981 int nrows, row_start;
1948 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
1997/* 2031/*
1998 * Refresh the screen 2032 * Refresh the screen
1999 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2000 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2001 */ 2035 */
2002void 2036void ecb_hot
2003rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2004{ 2038{
2005 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2006 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2007 int i; /* tmp */ 2041 int i; /* tmp */
… …
2021 * A: set up vars 2055 * A: set up vars
2022 */ 2056 */
2023 refresh_count = 0; 2057 refresh_count = 0;
2024 2058
2025 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0; 2060 bool have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2028 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2029#endif 2063#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2031 2065
2032 /* 2066 /*
2033 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2039 scr_swap_overlay (); 2073 scr_swap_overlay ();
2040#endif 2074#endif
2041 2075
2042 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2043 2077
2044 /* 2078 /*
2045 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2046 */ 2080 */
2047 { 2081 {
2048 unsigned char setoldcursor; 2082 bool setoldcursor;
2049 2083
2050#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2085 if (hidden_cursor)
2052 showcursor = 0; 2086 showcursor = 0;
2053#endif 2087#endif
… …
2082 ccol2 = bgcolor_of (rstyle); 2116 ccol2 = bgcolor_of (rstyle);
2083#else 2117#else
2084 ccol2 = Color_bg; 2118 ccol2 = Color_bg;
2085#endif 2119#endif
2086 2120
2087 if (showcursor && focus) 2121 if (focus)
2088 { 2122 {
2089 if (option (Opt_cursorUnderline)) 2123 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2124 *crp ^= RS_Uline;
2091 else 2125 else
2092 { 2126 {
… …
2140 { 2174 {
2141 int16_t nits; 2175 int16_t nits;
2142 int i = num_scr; 2176 int i = num_scr;
2143 int j; 2177 int j;
2144 int len, wlen; 2178 int len, wlen;
2145 dLocal (int, num_scr);
2146 2179
2147 j = nrow; 2180 j = nrow;
2148 wlen = len = -1; 2181 wlen = len = -1;
2149 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2150 2183
… …
2225 continue; 2258 continue;
2226 2259
2227 // redraw one or more characters 2260 // redraw one or more characters
2228 2261
2229 // seek to the beginning of wide characters 2262 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2263 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2231 --col; 2264 --col;
2232 2265
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2267 text_t *text = stp + col;
2235 int count = 1; 2268 int count = 1;
2236 2269
2237 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2238 drp[col] = rend; 2271 drp[col] = rend;
… …
2273 2306
2274 col--; /* went one too far. move back */ 2307 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */ 2308 count -= i; /* dump any matching trailing chars */
2276 2309
2277 // sometimes we optimize away the trailing NOCHAR's, add them back 2310 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR)) 2311 while (ecb_unlikely (i && text[count] == NOCHAR))
2279 count++, i--; 2312 count++, i--;
2280 2313
2281 /* 2314 /*
2282 * Determine the attributes for the string 2315 * Determine the attributes for the string
2283 */ 2316 */
2284 int fore = fgcolor_of (rend); // desired foreground 2317 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2318 int back = bgcolor_of (rend); // desired background
2286 2319
2287 // only do special processing if any attributes are set, which is unlikely 2320 // 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))) 2321 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2322 {
2290 bool invert = rend & RS_RVid; 2323 bool invert = rend & RS_RVid;
2291 2324
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2325#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2326 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2345
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2346 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2347 fore = Color_UL;
2315#endif 2348#endif
2316 2349
2350#ifdef OPTION_HC
2351 if (rend & RS_Sel)
2352 {
2353 /* invert the column if no highlightColor is set or it is the
2354 * current cursor column */
2355 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2356 && ISSET_PIXCOLOR (Color_HC))
2357 {
2358 if (ISSET_PIXCOLOR (Color_HTC))
2359 fore = Color_HTC;
2360 // if invert is 0 reverse video is set so we use bg color as fg color
2361 else if (!invert)
2362 fore = back;
2363
2364 back = Color_HC;
2365 invert = 0;
2366 }
2367 }
2368#endif
2369
2317 if (invert) 2370 if (invert)
2318 { 2371 {
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); 2372 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2373
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2374#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) 2375 if (fore == back)
2337 { 2376 {
2338 fore = Color_bg; 2377 fore = Color_bg;
2339 back = Color_fg; 2378 back = Color_fg;
2340 } 2379 }
… …
2376 /* 2415 /*
2377 * Actually do the drawing of the string here 2416 * Actually do the drawing of the string here
2378 */ 2417 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2418 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380 2419
2381 if (expect_true (have_bg && back == Color_bg)) 2420 if (ecb_likely (have_bg && back == Color_bg))
2382 { 2421 {
2383 // this is very ugly, maybe push it into ->draw? 2422 // this is very ugly, maybe push it into ->draw?
2384 2423
2385 for (i = 0; i < count; i++) /* don't draw empty strings */ 2424 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ') 2425 if (text[i] != ' ')
… …
2393 did_clear: ; 2432 did_clear: ;
2394 } 2433 }
2395 else 2434 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2435 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397 2436
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2437 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2399 { 2438 {
2400#if ENABLE_FRILLS 2439#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline)) 2440 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2441 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2403 else 2442 else
… …
2449 2488
2450 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2451 Col2Pixel (col), 2490 Col2Pixel (col),
2452 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2453 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2455 } 2494 }
2456 } 2495 }
2457 2496
2458 /* 2497 /*
2459 * H: cleanup selection 2498 * H: cleanup selection
… …
2468 screen.flags = old_screen_flags; 2507 screen.flags = old_screen_flags;
2469 num_scr = 0; 2508 num_scr = 0;
2470 num_scr_allow = 1; 2509 num_scr_allow = 1;
2471} 2510}
2472 2511
2473void 2512void ecb_cold
2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475{ 2514{
2476 if (!l.t) 2515 if (!l.valid ())
2477 return; 2516 return;
2478 2517
2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2518 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2480 2519
2481 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2521 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2483} 2522}
2484 2523
2485void 2524void ecb_cold
2486rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2487{ 2526{
2488 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2489 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2490 2529
… …
2493 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2494 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2495 } 2534 }
2496} 2535}
2497 2536
2498void 2537void ecb_cold
2499rxvt_term::scr_recolour () NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2500{ 2539{
2501#ifdef HAVE_BG_PIXMAP 2540 bool transparent = false;
2502 bgPixmap.apply ();
2503#else
2504 2541
2542#ifdef HAVE_IMG
2543 if (bg_img != 0)
2544 {
2545# if ENABLE_TRANSPARENCY
2546 if (bg_flags & BG_IS_TRANSPARENT)
2547 {
2548 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2549 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2550
2551 transparent = true;
2552 }
2553 else
2554# endif
2555 {
2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2557 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2558 }
2559 }
2560 else
2561#endif
2562 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2563 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2564 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2565 }
2566
2567 XClearWindow (dpy, parent);
2508 2568
2509 if (scrollBar.win) 2569 if (scrollBar.win)
2510 { 2570 {
2571 if (transparent)
2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2573 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2512 scrollBar.state = STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2513 scrollBar.show (0); 2576 scrollBar.show (0);
2514 } 2577 }
2515 2578
2516#endif 2579 if (refresh)
2517 2580 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2581 scr_clear ();
2520 scr_touch (true); 2582 scr_touch (true);
2583 }
2521 want_refresh = 1; 2584 want_refresh = 1;
2522} 2585}
2523 2586
2524/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2525void 2588void
… …
2582 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2583 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2584} 2647}
2585 2648
2586/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2587void 2650void ecb_hot
2588rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2589{ 2652{
2590 if (selection.op 2653 if (selection.op
2591 && current_screen == selection.screen 2654 && current_screen == selection.screen
2592 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
2593 { 2656 {
2594#if !ENABLE_MINIMAL 2657#if !ENABLE_MINIMAL
2595 if (selection.rect) 2658 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2659 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2660 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2661 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2662 else
2600#endif 2663#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2664 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2665 selection.end.row, selection.end.col,
2603 RS_RVid); 2666 RS_Sel | RS_RVid);
2604 } 2667 }
2605} 2668}
2606 2669
2607/* ------------------------------------------------------------------------- */ 2670/* ------------------------------------------------------------------------- */
2608/* 2671/*
… …
2611 */ 2674 */
2612#if 0 2675#if 0
2613void 2676void
2614rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2678{
2616 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2617 unsigned int width, towrite; 2680 // 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} 2681}
2637#endif 2682#endif
2638 2683
2639/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2640 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2641 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2642void 2687void
2643rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2644{ 2689{
2645 row_col_t pos;
2646
2647 if (!selection.op) 2690 if (!selection.op)
2648 return; 2691 return;
2649 2692
2650 pos.row = pos.col = 0;
2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654 || (check_more == 1 2696 || (check_more == 1
2655 && current_screen == selection.screen 2697 && current_screen == selection.screen
2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && 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 (); 2700 CLEAR_ALL_SELECTION ();
2667} 2701}
2668 2702
2669/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2670/* 2704/*
2671 * Paste a selection direct to the command fd 2705 * Paste a selection direct to the command fd
2672 */ 2706 */
2673void 2707void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2708rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2709{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2710 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2713 data[i] = C0_CR;
2680 2714
2681 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2683 2717
2684 tt_write (data, len); 2718 tt_write (data, len);
2685 2719
2686 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2688} 2722}
2689 2723
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2724void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2726{
2698 if (prop == None) /* check for failed XConvertSelection */ 2727 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; 2728 return;
2873 2729
2874 selection_paste (win, prop, true); 2730 tt_paste (data, len);
2875} 2731}
2876 2732
2877/* ------------------------------------------------------------------------- */ 2733/* ------------------------------------------------------------------------- */
2878/* 2734/*
2879 * Request the current selection: 2735 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880 * Order: > internal selection if available 2736 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2737 * 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 2738 * EXT: button 2 release
2886 */ 2739 */
2887void 2740void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2741rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2742{
2890 if (selection.text && selnum == Sel_Primary) 2743 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 } 2744 {
2898 else 2745 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2746 selection_req->run ();
2899 { 2747 }
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} 2748}
2941 2749
2942/* ------------------------------------------------------------------------- */ 2750/* ------------------------------------------------------------------------- */
2943/* 2751/*
2944 * Clear all selected text 2752 * Clear all selected text
2945 * EXT: SelectionClear 2753 * EXT: SelectionClear
2946 */ 2754 */
2947void 2755void
2948rxvt_term::selection_clear () NOTHROW 2756rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2757{
2758 if (!clipboard)
2759 {
2950 want_refresh = 1; 2760 want_refresh = 1;
2951 free (selection.text); 2761 free (selection.text);
2952 selection.text = NULL; 2762 selection.text = NULL;
2953 selection.len = 0; 2763 selection.len = 0;
2954 CLEAR_SELECTION (); 2764 CLEAR_SELECTION ();
2955 2765
2956 if (display->selection_owner == this) 2766 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2767 display->selection_owner = 0;
2768 }
2769 else
2770 {
2771 free (selection.clip_text);
2772 selection.clip_text = NULL;
2773 selection.clip_len = 0;
2774
2775 if (display->clipboard_owner == this)
2776 display->clipboard_owner = 0;
2777 }
2958} 2778}
2959 2779
2960/* ------------------------------------------------------------------------- */ 2780/* ------------------------------------------------------------------------- */
2961/* 2781/*
2962 * Copy a selection into the cut buffer 2782 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2783 * EXT: button 1 or 3 release
2964 */ 2784 */
2965void 2785void
2966rxvt_term::selection_make (Time tm) 2786rxvt_term::selection_make (Time tm)
2967{ 2787{
2968 int i; 2788 int size;
2969 wchar_t *new_selection_text; 2789 wchar_t *new_selection_text;
2970 text_t *t; 2790 text_t *t;
2971 2791
2972 switch (selection.op) 2792 switch (selection.op)
2973 { 2793 {
… …
2989 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2990 2810
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2811 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return; 2812 return;
2993 2813
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2814 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2815 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996 2816
2997 int ofs = 0; 2817 int ofs = 0;
2998 int extra = 0; 2818 int extra = 0;
2999 2819
3000 int col = selection.beg.col; 2820 int col = selection.beg.col;
… …
3006 { 2826 {
3007#if !ENABLE_MINIMAL 2827#if !ENABLE_MINIMAL
3008 if (selection.rect) 2828 if (selection.rect)
3009 { 2829 {
3010 col = selection.beg.col; 2830 col = selection.beg.col;
3011 end_col = ncol + 1; 2831 end_col = selection.end.col;
3012 } 2832 }
3013 else 2833 else
3014#endif 2834#endif
3015 end_col = ROW(row).l; 2835 end_col = ROW(row).l;
3016 2836
3017 col = max (col, 0); 2837 col = max (col, 0);
3018 2838
3019 if (row == selection.end.row 2839 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2840 min_it (end_col, selection.end.col);
3025 2841
3026 t = ROW(row).t + col; 2842 t = ROW(row).t + col;
3027 2843
3028 for (; col < end_col; col++) 2844 for (; col < end_col; col++)
… …
3036 2852
3037 extra -= (len - 1); 2853 extra -= (len - 1);
3038 2854
3039 if (extra < 0) 2855 if (extra < 0)
3040 { 2856 {
3041 extra += i; 2857 extra += size;
3042 i += i; 2858 size += size;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2859 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044 } 2860 }
3045 2861
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2862 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2863 }
3048#endif 2864#endif
… …
3060 2876
3061 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3062 } 2878 }
3063 else 2879 else
3064#endif 2880#endif
3065 if (!ROW(row).is_longer () && row != selection.end.row) 2881 if (!ROW(row).is_longer ()
2882 && (row != selection.end.row || end_col != selection.end.col)
2883 && (row != selection.beg.row || selection.beg.col < ncol))
3066 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3067 } 2885 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2886
3072 new_selection_text[ofs] = 0; 2887 new_selection_text[ofs] = 0;
3073 2888
3074 if (ofs == 0) 2889 if (ofs == 0)
3075 { 2890 {
… …
3088 2903
3089 selection_grab (tm); 2904 selection_grab (tm);
3090} 2905}
3091 2906
3092bool 2907bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2908rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2909{
2910 Atom sel;
2911
2912 if (!clipboard)
2913 {
3095 selection_time = tm; 2914 selection_time = tm;
2915 sel = XA_PRIMARY;
2916 }
2917 else
2918 {
2919 clipboard_time = tm;
2920 sel = xa[XA_CLIPBOARD];
2921 }
3096 2922
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2923 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2924 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2925 {
3100 display->set_selection_owner (this); 2926 display->set_selection_owner (this, clipboard);
3101 return true; 2927 return true;
3102 } 2928 }
3103 else 2929 else
3104 { 2930 {
3105 selection_clear (); 2931 selection_clear (clipboard);
3106 return false; 2932 return false;
3107 } 2933 }
3108 2934
3109#if 0 2935#if 0
3110 XTextProperty ct; 2936 XTextProperty ct;
… …
3120/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
3121/* 2947/*
3122 * Mark or select text based upon number of clicks: 1, 2, or 3 2948 * Mark or select text based upon number of clicks: 1, 2, or 3
3123 * EXT: button 1 press 2949 * EXT: button 1 press
3124 */ 2950 */
3125void 2951void ecb_cold
3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3127{ 2953{
3128 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
3129 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
3130 2956
… …
3149 2975
3150/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
3151/* 2977/*
3152 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
3153 */ 2979 */
3154void 2980void ecb_cold
3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3156{ 2982{
3157 want_refresh = 1; 2983 want_refresh = 1;
3158 2984
3159 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3186/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3012/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3187#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3014 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3189#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3190 3016
3191void 3017void ecb_cold
3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3018rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3193{ 3019{
3194 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3195 row_col_t bound; 3021 row_col_t bound;
3196 text_t *stp; 3022 text_t *stp;
… …
3270 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3271 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3272 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3273 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3274 */ 3100 */
3275void 3101void ecb_cold
3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3277{ 3103{
3278 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3279 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3280 3106
… …
3306 3132
3307/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3308/* 3134/*
3309 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3310 */ 3136 */
3311void 3137void ecb_cold
3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3138rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3313{ 3139{
3314 row_col_t pos; 3140 row_col_t pos;
3315 enum { 3141 enum {
3316 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3507 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3508#endif 3334#endif
3509} 3335}
3510 3336
3511#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3512void 3338void ecb_cold
3513rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3514{ 3340{
3515 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3516 text_t *stp; 3342 text_t *stp;
3517 3343
… …
3555/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3556/* 3382/*
3557 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3558 * EXT: button 3 double click 3384 * EXT: button 3 double click
3559 */ 3385 */
3560void 3386void ecb_cold
3561rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3562{ 3388{
3563 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3565} 3391}
… …
3567/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3568/* 3394/*
3569 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3570 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3571 */ 3397 */
3572void 3398void ecb_cold
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3400{
3401 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3402 XSelectionEvent ev;
3576 3403
3577 ev.type = SelectionNotify; 3404 ev.type = SelectionNotify;
3578 ev.property = None; 3405 ev.property = None;
3579 ev.display = rq.display; 3406 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3421 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3422#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3423 *target++ = xa[XA_UTF8_STRING];
3597#endif 3424#endif
3598 3425
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3426 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3427 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3428 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3429 ev.property = property;
3603 } 3430 }
3604#if TODO // TODO 3431#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3432 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3433 {
3607 /* TODO: Handle MULTIPLE */ 3434 /* TODO: Handle MULTIPLE */
3608 } 3435 }
3609#endif 3436#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3438 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3440 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 ev.property = rq.property; 3441 ev.property = property;
3442 }
3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3444 {
3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3446 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3447 ev.property = property;
3615 } 3448 }
3616 else if (rq.target == XA_STRING 3449 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3450 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3451 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3452 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3484 {
3652 target = xa[XA_COMPOUND_TEXT]; 3485 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3486 style = enc_compound_text;
3654 } 3487 }
3655 3488
3656 if (selection.text) 3489 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3490 {
3658 cl = selection.text; 3491 cl = selection.text;
3659 selectlen = selection.len; 3492 selectlen = selection.len;
3493 }
3494 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3495 {
3496 cl = selection.clip_text;
3497 selectlen = selection.clip_len;
3660 } 3498 }
3661 else 3499 else
3662 { 3500 {
3663 cl = L""; 3501 cl = L"";
3664 selectlen = 0; 3502 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3523 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3524 ct.nitems = selectlen;
3687 ct.encoding = target; 3525 ct.encoding = target;
3688 } 3526 }
3689 3527
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3528 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3529 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3530 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3531 ev.property = property;
3694 3532
3695 if (freect) 3533 if (freect)
3696 XFree (ct.value); 3534 XFree (ct.value);
3697 } 3535 }
3698 3536
3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3700} 3538}
3701 3539
3702/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3703#ifdef USE_XIM 3541#if USE_XIM
3704void 3542void ecb_cold
3705rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3706{ 3544{
3707 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3708 3546
3709 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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