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

Diff Legend

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