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.325 by root, Wed Nov 5 12:28:15 2008 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#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 309 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 311
297 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 ())
298 { 313 {
299 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
300 315
301 plines++; 316 plines++;
302 llen += prev_ncol; 317 llen += prev_ncol;
… …
315 330
316 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
318 { 333 {
319 qline = row_buf + qrow; 334 qline = row_buf + qrow;
320 lalloc (*qline); 335 qline->alloc (); // redundant with next line
321 qline->l = ncol; 336 qline->l = ncol;
322 qline->is_longer (1); 337 qline->is_longer (1);
323 338
324 int qcol = 0; 339 int qcol = 0;
325 340
… …
340 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
341 // least. 356 // least.
342 if (prow == ocur.row) 357 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
344 359
345 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
346 361
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 363
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 386 {
372 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
373 388
374 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
375 { 390 {
376 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)];
377 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
378 393
379 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
380 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;
381 } 400 }
382 401
383 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 404
388 term_start = 0; 405 term_start = 0;
389 } 406 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 407
395 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 410 }
398 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
421 free (tabs);
422 tabs = (char *)rxvt_malloc (ncol);
423
424 for (int col = ncol; col--; )
425 tabs [col] = col % TABSIZE == 0;
426
399 CLEAR_ALL_SELECTION (); 427 CLEAR_ALL_SELECTION ();
400 428
401 prev_nrow = nrow; 429 prev_nrow = nrow;
402 prev_ncol = ncol; 430 prev_ncol = ncol;
403 431
404 tt_winch (); 432 tt_winch ();
405 433
406 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
407} 435}
408 436
409/* ------------------------------------------------------------------------- */ 437void ecb_cold
410/*
411 * Free everything. That way malloc debugging can find leakage.
412 */
413void
414rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
415{ 439{
416 if (row_buf) 440 chunk_free (chunk, chunk_size);
417 { 441 chunk = 0;
418 delete talloc; talloc = 0; 442 row_buf = 0;
419 delete ralloc; ralloc = 0;
420 443
421 free (row_buf);
422 free (swap_buf);
423 free (drawn_buf);
424 row_buf = 0; // signal that we freed all the arrays above
425
426 free (tabs); 444 free (tabs);
427 tabs = 0; 445 tabs = 0;
428 }
429} 446}
430 447
431/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
432/* 449/*
433 * Hard/Soft reset 450 * Hard/Soft reset
434 */ 451 */
435void 452void ecb_cold
436rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
437{ 454{
438 scr_release (); 455 scr_release ();
456
439 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
440 rvideo_mode = false; 458 rvideo_mode = false;
441 scr_soft_reset (); 459 scr_soft_reset ();
442 scr_reset (); 460 scr_reset ();
443 461
444 scr_clear (true); 462 scr_clear (true);
445 scr_refresh (); 463 scr_refresh ();
446} 464}
447 465
448void 466void ecb_cold
449rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
450{ 468{
451 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
452#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
453 scr_overlay_off (); 471 scr_overlay_off ();
454#endif 472#endif
455 473
456 if (current_screen != PRIMARY) 474 if (current_screen != PRIMARY)
457 scr_swap_screen (); 475 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464 476
465 scr_scroll_region (0, MAX_ROWS - 1); 477 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None); 478 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0); 479 scr_insert_mode (0);
468} 480}
… …
510 } 522 }
511 523
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 524 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 525 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 526 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
518#endif
519} 529}
520 530
521void 531void
522rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
523{ 533{
524 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
525 return; 535 return;
526 536
527 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
546 return; 556 return;
547 557
548 want_refresh = 1; 558 want_refresh = 1;
549 view_start = 0; 559 view_start = 0;
550 560
551 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 ();
552 567
553 int i = current_screen; current_screen = scrn; scrn = i; 568 current_screen = scrn;
554 569
555#if NSCREENS 570#if NSCREENS
556 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
557 { 572 {
558 num_scr = 0; 573 num_scr = 0;
… …
622/* 637/*
623 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
624 * count positive ==> scroll up 639 * count positive ==> scroll up
625 * count negative ==> scroll down 640 * count negative ==> scroll down
626 */ 641 */
627int 642int ecb_hot
628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
629{ 644{
630 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
631 return 0; 646 return 0;
632 647
… …
635 650
636 if (count > 0 651 if (count > 0
637 && row1 == 0 652 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 653 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 654 {
655 min_it (count, total_rows - (nrow - (row2 + 1)));
656
640 top_row = max (top_row - count, -saveLines); 657 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 658
645 // sever bottommost line 659 // sever bottommost line
646 { 660 {
647 line_t &l = ROW(row2 - count); 661 line_t &l = ROW(row2);
648 l.is_longer (0); 662 l.is_longer (0);
649 l.touch (); 663 l.touch ();
650 } 664 }
651 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
652 // erase newly scrolled-in lines 681 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 682 for (int i = count; i--; )
654 { 683 {
655 line_t &l = ROW(nrow - 1 - i); 684 line_t &l = ROW(row2 - i);
656 685
657 // optimize if already cleared, can be significant on slow machines 686 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 687 // could be rolled into scr_blank_screen_mem
659 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)))
660 { 689 {
661 scr_blank_line (l, 0, l.l, rstyle); 690 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 691 l.l = 0;
… …
664 } 693 }
665 else 694 else
666 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
667 } 696 }
668 697
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
681 // move and/or clear selection, if any 698 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
683 { 701 {
684 selection.beg.row -= count; 702 selection.beg.row -= count;
685 selection.end.row -= count; 703 selection.end.row -= count;
686 selection.mark.row -= count; 704 selection.mark.row -= count;
687 705
688 if (selection.beg.row < top_row 706 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 707 }
696 708
697 // finally move the view window, if desired 709 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 710 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 711 && view_start != 0
… …
729 } 741 }
730 742
731 // use a simple and robust scrolling algorithm, this 743 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 744 // part of scr_scroll_text is not time-critical.
733 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
734 int rows = row2 - row1 + 1; 754 int rows = row2 - row1 + 1;
735 755
736 min_it (count, rows); 756 min_it (count, rows);
737 757
738 line_t *temp_buf = row_buf + total_rows; 758 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 759
740 for (int row = 0; row < rows; row++) 760 for (int row = 0; row < rows; row++)
741 { 761 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 762 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 763
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 765 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 766 }
747 767
748 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
749 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 }
750 } 777 }
751 778
752 return count; 779 return count;
753} 780}
754 781
755/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
756/* 783/*
757 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
758 */ 785 */
759void 786void ecb_hot
760rxvt_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
761{ 788{
762 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
763 return; 790 return;
764 791
765 unsigned char checksel; 792 bool checksel;
766 unicode_t c; 793 unicode_t c;
767 int ncol = this->ncol; 794 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
769 796
770 want_refresh = 1; 797 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 810 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 811 screen.cur.row -= minlines;
785 } 812 }
786 } 813 }
787 814
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 815 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 816 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 817 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 818 int row = screen.cur.row;
794 819
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 820 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 821
797 line_t *line = &ROW(row); 822 line_t *line = &ROW(row);
798 823
799 while (str < strend) 824 while (str < strend)
800 { 825 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 826 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 827
803 if (expect_false (c < 0x20)) 828 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 829 if (c == C0_LF)
805 { 830 {
806 max_it (line->l, screen.cur.col); 831 max_it (line->l, screen.cur.col);
807 832
808 screen.flags &= ~Screen_WrapNext; 833 screen.flags &= ~Screen_WrapNext;
… …
827 { 852 {
828 scr_tab (1, true); 853 scr_tab (1, true);
829 continue; 854 continue;
830 } 855 }
831 856
832 if (expect_false ( 857 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 858 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 861 ))
837 { 862 {
… …
842 * should be a similar check. 867 * should be a similar check.
843 */ 868 */
844 CLEAR_SELECTION (); 869 CLEAR_SELECTION ();
845 } 870 }
846 871
847 if (expect_false (screen.flags & Screen_WrapNext)) 872 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 873 {
849 scr_do_wrap (); 874 scr_do_wrap ();
850 875
851 line->l = ncol; 876 line->l = ncol;
852 line->is_longer (1); 877 line->is_longer (1);
… …
854 row = screen.cur.row; 879 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 880 line = &ROW(row); /* _must_ refresh */
856 } 881 }
857 882
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 883 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 884 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 885 c = 0xfffd;
861 886
862 // 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
863 // further replacements, as wcwidth might return -1 for the line 888 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 889 // drawing characters below as they might be invalid in the current
865 // locale. 890 // locale.
866 int width = WCWIDTH (c); 891 int width = WCWIDTH (c);
867 892
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 893 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 894 {
870 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 896 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 898 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 911 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 912 width = 1; // vt100 line drawing characters are always single-width
888 } 913 }
889 } 914 }
890 915
891 if (expect_false (screen.flags & Screen_Insert)) 916 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 917 scr_insdel_chars (width, INSERT);
893 918
894 if (width != 0) 919 if (width != 0)
895 { 920 {
896#if !UNICODE_3 921#if !UNICODE_3
… …
901# else 926# else
902 c = 0xfffd; 927 c = 0xfffd;
903# endif 928# endif
904#endif 929#endif
905 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
906 // nuke the character at this position, if required 947 // nuke the character at this position, if required
907 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.
908 line->t[screen.cur.col] == NOCHAR 951 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 952 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 953
925 line->touch (); 954 line->touch ();
926 955
927 do 956 do
928 { 957 {
929 line->t[screen.cur.col] = c; 958 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 959 line->r[screen.cur.col] = rend;
931 960
932 if (expect_true (screen.cur.col < ncol - 1)) 961 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 962 screen.cur.col++;
934 else 963 else
935 { 964 {
936 line->l = ncol; 965 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 966 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 967 screen.flags |= Screen_WrapNext;
939 break; 968
969 goto end_of_line;
940 } 970 }
941 971
942 c = NOCHAR; 972 c = NOCHAR;
943 } 973 }
944 while (expect_false (--width > 0)); 974 while (ecb_unlikely (--width > 0));
945 975
946 // pad with spaces when overwriting wide character with smaller one 976 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 977 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 978 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 979 line->t[c] = ' ';
954 line->r[c] = rend; 980 line->r[c] = rend;
955 }
956 } 981 }
982
983end_of_line:
984 ;
957 } 985 }
958#if ENABLE_COMBINING 986#if ENABLE_COMBINING
959 else // width == 0 987 else // width == 0
960 { 988 {
961 if (c != 0xfeff) // ignore BOM 989 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1029#endif
1002 } 1030 }
1003 1031
1004 max_it (line->l, screen.cur.col); 1032 max_it (line->l, screen.cur.col);
1005 1033
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1034 assert (screen.cur.row >= 0);
1008#endif
1009} 1035}
1010 1036
1011/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1012/* 1038/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1039 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1052
1027 want_refresh = 1; 1053 want_refresh = 1;
1028#endif 1054#endif
1029 } 1055 }
1030 } 1056 }
1057 else if (screen.flags & Screen_WrapNext)
1058 screen.flags &= ~Screen_WrapNext;
1031 else 1059 else
1032 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1033} 1061}
1034 1062
1035/* ------------------------------------------------------------------------- */ 1063/* ------------------------------------------------------------------------- */
… …
1113 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1114 * 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
1115 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1116 */ 1144 */
1117#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1118void 1146void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1120{ 1148{
1121 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1151 else
… …
1130 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1131 * 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
1132 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1133 */ 1161 */
1134#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1135void 1163void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1137{ 1165{
1138 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1168 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1292} 1320}
1293 1321
1294/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1295/* 1323/*
1296 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1328 */
1301void 1329void
… …
1310 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1311 1339
1312 switch (mode) 1340 switch (mode)
1313 { 1341 {
1314 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1343 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1345 num = nrow - row;
1319 break; 1346 break;
1320 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1348 scr_erase_line (1);
1323 row = 0; 1349 row = 0;
1324 num = screen.cur.row; 1350 num = screen.cur.row;
1325 break; 1351 break;
1326 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1353 row = 0;
1329 num = nrow; 1354 num = nrow;
1330 break; 1355 break;
1331 default: 1356 default:
1332 return; 1357 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1366 if (row >= nrow) /* Out Of Bounds */
1342 return; 1367 return;
1343 1368
1344 min_it (num, nrow - row); 1369 min_it (num, nrow - row);
1345 1370
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1371 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1372 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1373 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1374 {
1353 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1354 1376
1355 if (mapped && !view_start) 1377 if (mapped)
1356 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1359 } 1381 }
1360 else 1382 else
1361 { 1383 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1385
1364 if (mapped && !view_start) 1386 if (mapped)
1365 { 1387 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1391 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1392 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1396 }
1375 } 1397 }
1376 1398
1377 for (; num--; row++) 1399 for (; num--; row++)
1378 { 1400 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1401 scr_blank_screen_mem (ROW(row), rstyle);
1380 1402
1381 if (!view_start) 1403 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1404 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1405 }
1384} 1406}
1385 1407
1386#if !ENABLE_MINIMAL 1408#if !ENABLE_MINIMAL
1387void 1409void
… …
1397/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1398/* 1420/*
1399 * Fill the screen with `E's 1421 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1423 */
1402void 1424void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1404{ 1426{
1405 rend_t fs; 1427 rend_t fs;
1406 1428
1407 want_refresh = 1; 1429 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1409 1431
1410 num_scr_allow = 0; 1432 num_scr_allow = 0;
1411 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 ();
1412 1438
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1415 { 1441 {
1416 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1568/* 1594/*
1569 * Set the scrolling region 1595 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1597 */
1572void 1598void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1600{
1575 max_it (top, 0); 1601 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1577 1603
… …
1587/* 1613/*
1588 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1617 */
1592void 1618void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1620{
1595 want_refresh = 1; 1621 want_refresh = 1;
1596 1622
1597 if (mode) 1623 if (mode)
… …
1604/* 1630/*
1605 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1634 */
1609void 1635void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1637{
1612 if (mode) 1638 if (mode)
1613 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1614 else 1640 else
… …
1623 * 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
1624 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1653 */
1628void 1654void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1656{
1631 if (mode) 1657 if (mode)
1632 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1633 else 1659 else
… …
1640/* 1666/*
1641 * Set insert/replace mode 1667 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1670 */
1645void 1671void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1673{
1648 if (mode) 1674 if (mode)
1649 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1650 else 1676 else
… …
1656 * Set/Unset tabs 1682 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1686 */
1661void 1687void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1689{
1664 if (mode < 0) 1690 if (mode < 0)
1665 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1711 if (rvideo_state != on)
1686 { 1712 {
1687 rvideo_state = on; 1713 rvideo_state = on;
1688 1714
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1691 if (bgPixmap.pixmap == None) 1717 if (bg_img == 0)
1692#endif 1718#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1720
1695 XGCValues gcvalue; 1721 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1706/* 1732/*
1707 * Report current cursor position 1733 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1735 */
1710void 1736void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1712{ 1738{
1713 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);
1714} 1740}
1715 1741
… …
1718 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1719 1745
1720/* 1746/*
1721 * Set font style 1747 * Set font style
1722 */ 1748 */
1723void 1749void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1725{ 1751{
1726#if 0 1752#if 0
1727 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1728 { 1754 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1780 */
1755void 1781void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1783{
1758 screen.charset = set; 1784 screen.charset = set;
1759 set_font_style (); 1785 set_font_style ();
1760} 1786}
… …
1781 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1782 1808
1783/* 1809/*
1784 * refresh matching text. 1810 * refresh matching text.
1785 */ 1811 */
1786bool 1812bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1814{
1789 bool found = false; 1815 bool found = false;
1790 1816
1791 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1836 PART_BEG = 0,
1811 PART_END, 1837 PART_END,
1812 RC_COUNT 1838 RC_COUNT
1813}; 1839};
1814 1840
1815void 1841void ecb_hot
1816rxvt_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
1817{ 1843{
1818 int i; 1844 int i;
1819 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1820 1846
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1866 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1867 {
1842 min_it (rc[i].col, ncol - 1); 1868 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1869 min_it (rc[i].row, nrow - 1);
1844 } 1870 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1871
1846 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++)
1847 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);
1848 1874
1849 num_scr_allow = 0; 1875 num_scr_allow = 0;
1850 1876
… …
1857 * Refresh the entire screen 1883 * Refresh the entire screen
1858 */ 1884 */
1859void 1885void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1887{
1862 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1889}
1864 1890
1865/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1866/* 1892/*
1867 * 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
… …
1923 1949
1924# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1927# endif 1953# endif
1928 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1929# endif 1955# endif
1930 1956
1931# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1959 set_urgency (1);
… …
1941 1967
1942 bell_ev.start (VISUAL_BELL_DURATION); 1968 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1969 }
1944 else 1970 else
1945 XBell (dpy, 0); 1971 XBell (dpy, 0);
1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1973#endif
1947} 1974}
1948 1975
1949/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1977void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1979{
1954#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1955 int nrows, row_start; 1981 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
1969 row_start = view_start; 1995 row_start = view_start;
1970 } 1996 }
1971 1997
1972 wctomb (0, 0); 1998 wctomb (0, 0);
1973 1999
1974 for (int r1 = 0; r1 < nrows; r1++) 2000 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 2001 {
1976 text_t *tp = ROW(r1).t; 2002 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 2003 int len = ROW(r1).l;
1978 2004
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2005 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2005/* 2031/*
2006 * Refresh the screen 2032 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2035 */
2010void 2036void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2012{ 2038{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2041 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2042#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2043 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2054 /*
2031 * A: set up vars 2055 * A: set up vars
2032 */ 2056 */
2033 refresh_count = 0; 2057 refresh_count = 0;
2034 2058
2059 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2060 bool have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2037 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2038#endif 2063#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2065
2041 /* 2066 /*
2042 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
2043 */ 2068 */
2044 scr_reverse_selection (); 2069 scr_reverse_selection ();
2045 2070
2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2072#if ENABLE_OVERLAY
2073 scr_swap_overlay ();
2074#endif
2075
2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2077
2046 /* 2078 /*
2047 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2048 */ 2080 */
2049 { 2081 {
2050 unsigned char setoldcursor; 2082 bool setoldcursor;
2051 2083
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2085 if (hidden_cursor)
2055 showcursor = 0; 2086 showcursor = 0;
2056#endif 2087#endif
2057 2088
… …
2085 ccol2 = bgcolor_of (rstyle); 2116 ccol2 = bgcolor_of (rstyle);
2086#else 2117#else
2087 ccol2 = Color_bg; 2118 ccol2 = Color_bg;
2088#endif 2119#endif
2089 2120
2090 if (showcursor && focus) 2121 if (focus)
2091 { 2122 {
2092 if (option (Opt_cursorUnderline)) 2123 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2124 *crp ^= RS_Uline;
2094 else 2125 else
2095 { 2126 {
… …
2130 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2131 } 2162 }
2132 } 2163 }
2133 } 2164 }
2134 2165
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2166#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2167 /*
2142 * D: CopyArea pass - very useful for slower links 2168 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2169 * This has been deliberately kept simple.
2144 */ 2170 */
… …
2148 { 2174 {
2149 int16_t nits; 2175 int16_t nits;
2150 int i = num_scr; 2176 int i = num_scr;
2151 int j; 2177 int j;
2152 int len, wlen; 2178 int len, wlen;
2153 dLocal (int, num_scr);
2154 2179
2155 j = nrow; 2180 j = nrow;
2156 wlen = len = -1; 2181 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2158 2183
… …
2233 continue; 2258 continue;
2234 2259
2235 // redraw one or more characters 2260 // redraw one or more characters
2236 2261
2237 // seek to the beginning of wide characters 2262 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2263 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2264 --col;
2240 2265
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2267 text_t *text = stp + col;
2243 int count = 1; 2268 int count = 1;
2244 2269
2245 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2246 drp[col] = rend; 2271 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2275 for (i = 0; ++col < ncol; )
2251 { 2276 {
2252 if (stp[col] == NOCHAR) 2277 if (stp[col] == NOCHAR)
2253 { 2278 {
2254 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
2255 drp[col] = rend; 2280 drp[col] = srp[col];
2281
2256 count++; 2282 count++;
2257 i++; 2283 i++;
2258 2284
2259 continue; 2285 continue;
2260 } 2286 }
… …
2280 2306
2281 col--; /* went one too far. move back */ 2307 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2308 count -= i; /* dump any matching trailing chars */
2283 2309
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2310 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2311 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2312 count++, i--;
2287 2313
2288 /* 2314 /*
2289 * Determine the attributes for the string 2315 * Determine the attributes for the string
2290 */ 2316 */
2291 int fore = fgcolor_of (rend); // desired foreground 2317 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2318 int back = bgcolor_of (rend); // desired background
2293 2319
2294 // 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
2295 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)))
2296 { 2322 {
2297 bool invert = rend & RS_RVid; 2323 bool invert = rend & RS_RVid;
2298 2324
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2325#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2326 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2345
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2346 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2347 fore = Color_UL;
2322#endif 2348#endif
2323 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
2324 if (invert) 2370 if (invert)
2325 { 2371 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2372 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2373
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2374#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2375 if (fore == back)
2344 { 2376 {
2345 fore = Color_bg; 2377 fore = Color_bg;
2346 back = Color_fg; 2378 back = Color_fg;
2347 } 2379 }
… …
2383 /* 2415 /*
2384 * Actually do the drawing of the string here 2416 * Actually do the drawing of the string here
2385 */ 2417 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2418 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2419
2388 if (expect_true (have_bg && back == Color_bg)) 2420 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2421 {
2390 // this is very ugly, maybe push it into ->draw? 2422 // this is very ugly, maybe push it into ->draw?
2391 2423
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2424 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2425 if (text[i] != ' ')
… …
2400 did_clear: ; 2432 did_clear: ;
2401 } 2433 }
2402 else 2434 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2435 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2436
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2437 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2438 {
2407#if ENABLE_FRILLS 2439#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2440 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2441 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2442 else
… …
2415 xpixel, ypixel + font->ascent + 1, 2447 xpixel, ypixel + font->ascent + 1,
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2448 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2449 }
2418 } /* for (col....) */ 2450 } /* for (col....) */
2419 } /* for (row....) */ 2451 } /* for (row....) */
2420
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425 2452
2426 /* 2453 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2454 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2455 */
2429 if (showcursor) 2456 if (showcursor)
… …
2461 2488
2462 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2490 Col2Pixel (col),
2464 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2494 }
2468 } 2495 }
2469 2496
2470 /* 2497 /*
2471 * H: cleanup selection 2498 * H: cleanup selection
2472 */ 2499 */
2500#if ENABLE_OVERLAY
2501 scr_swap_overlay ();
2502#endif
2503 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2504
2473 scr_reverse_selection (); 2505 scr_reverse_selection ();
2474 2506
2507 screen.flags = old_screen_flags;
2475 num_scr = 0; 2508 num_scr = 0;
2476 num_scr_allow = 1; 2509 num_scr_allow = 1;
2477} 2510}
2478 2511
2479void 2512void ecb_cold
2480rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2481{ 2514{
2482 if (!l.t) 2515 if (!l.valid ())
2483 return; 2516 return;
2484 2517
2485 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
2486 2519
2487 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2488 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]));
2489} 2522}
2490 2523
2491void 2524void ecb_cold
2492rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2493{ 2526{
2494 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2495 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2496 2529
… …
2499 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2500 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2501 } 2534 }
2502} 2535}
2503 2536
2504void 2537void ecb_cold
2505rxvt_term::scr_recolour () NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2539{
2507#ifdef HAVE_BG_PIXMAP 2540 bool transparent = false;
2508 bgPixmap.apply ();
2509#else
2510 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 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2563 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2512 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2564 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2565 }
2566
2567 XClearWindow (dpy, parent);
2514 2568
2515 if (scrollBar.win) 2569 if (scrollBar.win)
2516 { 2570 {
2571 if (transparent)
2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2573 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2518 scrollBar.state = STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2519 scrollBar.show (0); 2576 scrollBar.show (0);
2520 } 2577 }
2521 2578
2522#endif 2579 if (refresh)
2523 2580 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2581 scr_clear ();
2526 scr_touch (true); 2582 scr_touch (true);
2583 }
2527 want_refresh = 1; 2584 want_refresh = 1;
2528} 2585}
2529 2586
2530/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2531void 2588void
… …
2588 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2589 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2590} 2647}
2591 2648
2592/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2593void 2650void ecb_hot
2594rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2595{ 2652{
2596 if (selection.op 2653 if (selection.op
2597 && current_screen == selection.screen 2654 && current_screen == selection.screen
2598 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
2599 { 2656 {
2600#if !ENABLE_MINIMAL 2657#if !ENABLE_MINIMAL
2601 if (selection.rect) 2658 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2659 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2660 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2661 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2662 else
2606#endif 2663#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2664 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2665 selection.end.row, selection.end.col,
2609 RS_RVid); 2666 RS_Sel | RS_RVid);
2610 } 2667 }
2611} 2668}
2612 2669
2613/* ------------------------------------------------------------------------- */ 2670/* ------------------------------------------------------------------------- */
2614/* 2671/*
… …
2617 */ 2674 */
2618#if 0 2675#if 0
2619void 2676void
2620rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2678{
2622 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2623 unsigned int width, towrite; 2680 // relevant code in scr_printscreen
2624 char r1[] = "\n";
2625
2626 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++)
2628 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2630 : ncol;
2631 for (towrite = width; towrite; towrite -= wrote)
2632 {
2633 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2634 towrite);
2635 if (wrote < 0)
2636 return; /* XXX: death, no report */
2637 }
2638 if (row_buf[row].l >= 0)
2639 if (write (fd, r1, 1) <= 0)
2640 return; /* XXX: death, no report */
2641 }
2642} 2681}
2643#endif 2682#endif
2644 2683
2645/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2646 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2647 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2648void 2687void
2649rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2650{ 2689{
2651 row_col_t pos;
2652
2653 if (!selection.op) 2690 if (!selection.op)
2654 return; 2691 return;
2655 2692
2656 pos.row = pos.col = 0;
2657 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2658 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2660 || (check_more == 1 2696 || (check_more == 1
2661 && current_screen == selection.screen 2697 && current_screen == selection.screen
2662 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2663 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2664 || (check_more == 2
2665 && ROWCOL_IS_BEFORE (selection.beg, pos)
2666 && ROWCOL_IS_AFTER (selection.end, pos))
2667 || (check_more == 3
2668 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 4 /* screen width change */
2670 && (selection.beg.row != selection.end.row
2671 || selection.end.col > ncol)))
2672 CLEAR_SELECTION (); 2700 CLEAR_ALL_SELECTION ();
2673} 2701}
2674 2702
2675/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2676/* 2704/*
2677 * Paste a selection direct to the command fd 2705 * Paste a selection direct to the command fd
2678 */ 2706 */
2679void 2707void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2708rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2709{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2710 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2713 data[i] = C0_CR;
2686 2714
2687 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2689 2717
2690 tt_write (data, len); 2718 tt_write (data, len);
2691 2719
2692 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2694} 2722}
2695 2723
2696/* ------------------------------------------------------------------------- */
2697/*
2698 * Respond to a notification that a primary selection has been sent
2699 * EXT: SelectionNotify
2700 */
2701void 2724void
2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2703{ 2726{
2704 if (prop == None) /* check for failed XConvertSelection */ 2727 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2705 {
2706 if ((selection_type & Sel_CompoundText))
2707 {
2708 int selnum = selection_type & Sel_whereMask;
2709
2710 selection_type = 0;
2711 if (selnum != Sel_direct)
2712 selection_request_other (XA_STRING, selnum);
2713 }
2714
2715 if ((selection_type & Sel_UTF8String))
2716 {
2717 int selnum = selection_type & Sel_whereMask;
2718
2719 selection_type = Sel_CompoundText;
2720 if (selnum != Sel_direct)
2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2722 else
2723 selection_type = 0;
2724 }
2725
2726 return;
2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (dpy, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct2.encoding, &ct2.format,
2755 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success)
2757 goto bailout;
2758
2759 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems;
2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2770 if (ct.encoding == xa[XA_INCR])
2771 {
2772 // INCR selection, start handshake
2773 if (!delete_prop)
2774 XDeleteProperty (dpy, win, prop);
2775
2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2778 incr_ev.start (10);
2779
2780 goto bailout;
2781 }
2782
2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2796 }
2797 else
2798 {
2799 if (selection_wait == Sel_normal
2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2801 {
2802 /*
2803 * pass through again trying CUT_BUFFER0 if we've come from
2804 * XConvertSelection () but nothing was presented
2805 */
2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2807 }
2808
2809 goto bailout;
2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems;
2824
2825 goto bailout;
2826 }
2827
2828 char **cl;
2829 int cr;
2830
2831#if !ENABLE_MINIMAL
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste (s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2846 && cl)
2847 {
2848 for (int i = 0; i < cr; i++)
2849 paste (cl[i], strlen (cl[i]));
2850
2851 XFreeStringList (cl);
2852 }
2853 else
2854 paste ((char *)ct.value, ct.nitems); // paste raw
2855
2856bailout:
2857 XFree (ct.value);
2858
2859 if (selection_wait == Sel_normal)
2860 selection_wait = Sel_none;
2861}
2862
2863void
2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2865{
2866 selection_wait = Sel_none;
2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2872}
2873
2874void
2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2876{
2877 if (prop == None || selection_wait != Sel_incr)
2878 return; 2728 return;
2879 2729
2880 selection_paste (win, prop, true); 2730 tt_paste (data, len);
2881} 2731}
2882 2732
2883/* ------------------------------------------------------------------------- */ 2733/* ------------------------------------------------------------------------- */
2884/* 2734/*
2885 * Request the current selection: 2735 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2886 * Order: > internal selection if available 2736 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2887 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2737 * as fallback
2888 * > CUT_BUFFER0
2889 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2890 * will auto fallback to CUT_BUFFER0
2891 * EXT: button 2 release 2738 * EXT: button 2 release
2892 */ 2739 */
2893void 2740void
2894rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2741rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2895{ 2742{
2896 if (selection.text && selnum == Sel_Primary) 2743 if (!selection_req)
2897 {
2898 /* internal selection */
2899 char *str = rxvt_wcstombs (selection.text, selection.len);
2900 paste (str, strlen (str));
2901 free (str);
2902 return;
2903 } 2744 {
2904 else 2745 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2746 selection_req->run ();
2905 { 2747 }
2906 selection_request_time = tm;
2907 selection_wait = Sel_normal;
2908
2909#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return;
2913#else
2914 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return;
2917#endif
2918 }
2919
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2922}
2923
2924int
2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2926{
2927 Atom sel;
2928
2929 selection_type |= selnum;
2930
2931 if (selnum == Sel_Primary)
2932 sel = XA_PRIMARY;
2933 else if (selnum == Sel_Secondary)
2934 sel = XA_SECONDARY;
2935 else
2936 sel = xa[XA_CLIPBOARD];
2937
2938 if (XGetSelectionOwner (dpy, sel) != None)
2939 {
2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2941 vt, selection_request_time);
2942 return 1;
2943 }
2944
2945 return 0;
2946} 2748}
2947 2749
2948/* ------------------------------------------------------------------------- */ 2750/* ------------------------------------------------------------------------- */
2949/* 2751/*
2950 * Clear all selected text 2752 * Clear all selected text
2951 * EXT: SelectionClear 2753 * EXT: SelectionClear
2952 */ 2754 */
2953void 2755void
2954rxvt_term::selection_clear () NOTHROW 2756rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2757{
2758 if (!clipboard)
2759 {
2956 want_refresh = 1; 2760 want_refresh = 1;
2957 free (selection.text); 2761 free (selection.text);
2958 selection.text = NULL; 2762 selection.text = NULL;
2959 selection.len = 0; 2763 selection.len = 0;
2960 CLEAR_SELECTION (); 2764 CLEAR_SELECTION ();
2961 2765
2962 if (display->selection_owner == this) 2766 if (display->selection_owner == this)
2963 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 }
2964} 2778}
2965 2779
2966/* ------------------------------------------------------------------------- */ 2780/* ------------------------------------------------------------------------- */
2967/* 2781/*
2968 * Copy a selection into the cut buffer 2782 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2783 * EXT: button 1 or 3 release
2970 */ 2784 */
2971void 2785void
2972rxvt_term::selection_make (Time tm) 2786rxvt_term::selection_make (Time tm)
2973{ 2787{
2974 int i; 2788 int size;
2975 wchar_t *new_selection_text; 2789 wchar_t *new_selection_text;
2976 text_t *t; 2790 text_t *t;
2977 2791
2978 switch (selection.op) 2792 switch (selection.op)
2979 { 2793 {
… …
2995 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2996 2810
2997 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)))
2998 return; 2812 return;
2999 2813
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2814 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 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));
3002 2816
3003 int ofs = 0; 2817 int ofs = 0;
3004 int extra = 0; 2818 int extra = 0;
3005 2819
3006 int col = selection.beg.col; 2820 int col = selection.beg.col;
… …
3012 { 2826 {
3013#if !ENABLE_MINIMAL 2827#if !ENABLE_MINIMAL
3014 if (selection.rect) 2828 if (selection.rect)
3015 { 2829 {
3016 col = selection.beg.col; 2830 col = selection.beg.col;
3017 end_col = ncol + 1; 2831 end_col = selection.end.col;
3018 } 2832 }
3019 else 2833 else
3020#endif 2834#endif
3021 end_col = ROW(row).l; 2835 end_col = ROW(row).l;
3022 2836
3023 col = max (col, 0); 2837 col = max (col, 0);
3024 2838
3025 if (row == selection.end.row 2839 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 2840 min_it (end_col, selection.end.col);
3031 2841
3032 t = ROW(row).t + col; 2842 t = ROW(row).t + col;
3033 2843
3034 for (; col < end_col; col++) 2844 for (; col < end_col; col++)
… …
3042 2852
3043 extra -= (len - 1); 2853 extra -= (len - 1);
3044 2854
3045 if (extra < 0) 2855 if (extra < 0)
3046 { 2856 {
3047 extra += i; 2857 extra += size;
3048 i += i; 2858 size += size;
3049 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));
3050 } 2860 }
3051 2861
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2862 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 2863 }
3054#endif 2864#endif
… …
3066 2876
3067 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3068 } 2878 }
3069 else 2879 else
3070#endif 2880#endif
3071 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))
3072 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3073 } 2885 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 2886
3078 new_selection_text[ofs] = 0; 2887 new_selection_text[ofs] = 0;
3079 2888
3080 if (ofs == 0) 2889 if (ofs == 0)
3081 { 2890 {
… …
3094 2903
3095 selection_grab (tm); 2904 selection_grab (tm);
3096} 2905}
3097 2906
3098bool 2907bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 2908rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 2909{
2910 Atom sel;
2911
2912 if (!clipboard)
2913 {
3101 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 }
3102 2922
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2923 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2924 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 2925 {
3106 display->set_selection_owner (this); 2926 display->set_selection_owner (this, clipboard);
3107 return true; 2927 return true;
3108 } 2928 }
3109 else 2929 else
3110 { 2930 {
3111 selection_clear (); 2931 selection_clear (clipboard);
3112 return false; 2932 return false;
3113 } 2933 }
3114 2934
3115#if 0 2935#if 0
3116 XTextProperty ct; 2936 XTextProperty ct;
… …
3126/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
3127/* 2947/*
3128 * 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
3129 * EXT: button 1 press 2949 * EXT: button 1 press
3130 */ 2950 */
3131void 2951void ecb_cold
3132rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3133{ 2953{
3134 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
3135 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
3136 2956
… …
3155 2975
3156/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
3157/* 2977/*
3158 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
3159 */ 2979 */
3160void 2980void ecb_cold
3161rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3162{ 2982{
3163 want_refresh = 1; 2983 want_refresh = 1;
3164 2984
3165 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3192/* 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 */
3193#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3194 (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)))
3195#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3196 3016
3197void 3017void ecb_cold
3198rxvt_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
3199{ 3019{
3200 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3201 row_col_t bound; 3021 row_col_t bound;
3202 text_t *stp; 3022 text_t *stp;
… …
3276 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3277 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3278 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3279 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3280 */ 3100 */
3281void 3101void ecb_cold
3282rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3283{ 3103{
3284 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3285 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3286 3106
… …
3312 3132
3313/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3314/* 3134/*
3315 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3316 */ 3136 */
3317void 3137void ecb_cold
3318rxvt_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
3319{ 3139{
3320 row_col_t pos; 3140 row_col_t pos;
3321 enum { 3141 enum {
3322 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3513 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3514#endif 3334#endif
3515} 3335}
3516 3336
3517#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3518void 3338void ecb_cold
3519rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3520{ 3340{
3521 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3522 text_t *stp; 3342 text_t *stp;
3523 3343
… …
3561/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3562/* 3382/*
3563 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3564 * EXT: button 3 double click 3384 * EXT: button 3 double click
3565 */ 3385 */
3566void 3386void ecb_cold
3567rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3568{ 3388{
3569 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3570 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3571} 3391}
… …
3573/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3574/* 3394/*
3575 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3576 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3577 */ 3397 */
3578void 3398void ecb_cold
3579rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3580{ 3400{
3401 Atom property = rq.property == None ? rq.target : rq.property;
3581 XSelectionEvent ev; 3402 XSelectionEvent ev;
3582 3403
3583 ev.type = SelectionNotify; 3404 ev.type = SelectionNotify;
3584 ev.property = None; 3405 ev.property = None;
3585 ev.display = rq.display; 3406 ev.display = rq.display;
… …
3600 *target++ = xa[XA_COMPOUND_TEXT]; 3421 *target++ = xa[XA_COMPOUND_TEXT];
3601#if X_HAVE_UTF8_STRING 3422#if X_HAVE_UTF8_STRING
3602 *target++ = xa[XA_UTF8_STRING]; 3423 *target++ = xa[XA_UTF8_STRING];
3603#endif 3424#endif
3604 3425
3605 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3426 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3606 32, PropModeReplace, 3427 32, PropModeReplace,
3607 (unsigned char *)target_list, target - target_list); 3428 (unsigned char *)target_list, target - target_list);
3608 ev.property = rq.property; 3429 ev.property = property;
3609 } 3430 }
3610#if TODO // TODO 3431#if TODO // TODO
3611 else if (rq.target == xa[XA_MULTIPLE]) 3432 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3433 {
3613 /* TODO: Handle MULTIPLE */ 3434 /* TODO: Handle MULTIPLE */
3614 } 3435 }
3615#endif 3436#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3438 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3440 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3620 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;
3621 } 3448 }
3622 else if (rq.target == XA_STRING 3449 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3450 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3451 || rq.target == xa[XA_COMPOUND_TEXT]
3625 || rq.target == xa[XA_UTF8_STRING] 3452 || rq.target == xa[XA_UTF8_STRING]
… …
3657 { 3484 {
3658 target = xa[XA_COMPOUND_TEXT]; 3485 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3486 style = enc_compound_text;
3660 } 3487 }
3661 3488
3662 if (selection.text) 3489 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3490 {
3664 cl = selection.text; 3491 cl = selection.text;
3665 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;
3666 } 3498 }
3667 else 3499 else
3668 { 3500 {
3669 cl = L""; 3501 cl = L"";
3670 selectlen = 0; 3502 selectlen = 0;
… …
3691 ct.value = (unsigned char *)cl; 3523 ct.value = (unsigned char *)cl;
3692 ct.nitems = selectlen; 3524 ct.nitems = selectlen;
3693 ct.encoding = target; 3525 ct.encoding = target;
3694 } 3526 }
3695 3527
3696 XChangeProperty (dpy, rq.requestor, rq.property, 3528 XChangeProperty (dpy, rq.requestor, property,
3697 ct.encoding, 8, PropModeReplace, 3529 ct.encoding, 8, PropModeReplace,
3698 ct.value, (int)ct.nitems); 3530 ct.value, (int)ct.nitems);
3699 ev.property = rq.property; 3531 ev.property = property;
3700 3532
3701 if (freect) 3533 if (freect)
3702 XFree (ct.value); 3534 XFree (ct.value);
3703 } 3535 }
3704 3536
3705 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3706} 3538}
3707 3539
3708/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3709#ifdef USE_XIM 3541#if USE_XIM
3710void 3542void ecb_cold
3711rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3712{ 3544{
3713 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3714 3546
3715 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);
… …
3738 h += 2; min_it (h, nrow); 3570 h += 2; min_it (h, nrow);
3739 3571
3740 x -= 1; clamp_it (x, 0, ncol - w); 3572 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3573 y -= 1; clamp_it (y, 0, nrow - h);
3742 3574
3743 ov_x = x; ov_y = y; 3575 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3576 ov.w = w; ov.h = h;
3745 3577
3746 ov_text = new text_t *[h]; 3578 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3579 ov.rend = new rend_t *[h];
3748 3580
3749 for (y = 0; y < h; y++) 3581 for (y = 0; y < h; y++)
3750 { 3582 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3583 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3584 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3585
3754 text_t t0, t1, t2; 3586 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3587 rend_t r = OVERLAY_RSTYLE;
3756 3588
3757 if (y == 0) 3589 if (y == 0)
… …
3776} 3608}
3777 3609
3778void 3610void
3779rxvt_term::scr_overlay_off () NOTHROW 3611rxvt_term::scr_overlay_off () NOTHROW
3780{ 3612{
3781 if (!ov_text) 3613 if (!ov.text)
3782 return; 3614 return;
3783 3615
3784 want_refresh = 1; 3616 want_refresh = 1;
3785 3617
3786 for (int y = 0; y < ov_h; y++) 3618 for (int y = 0; y < ov.h; y++)
3787 { 3619 {
3788 delete [] ov_text[y]; 3620 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3621 delete [] ov.rend[y];
3790 } 3622 }
3791 3623
3792 delete [] ov_text; ov_text = 0; 3624 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3625 delete [] ov.rend; ov.rend = 0;
3794} 3626}
3795 3627
3796void 3628void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3629rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3630{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3631 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3632 return;
3801 3633
3802 x++, y++; 3634 x++, y++;
3803 3635
3804 ov_text[y][x] = text; 3636 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3637 ov.rend[y][x] = rend;
3806} 3638}
3807 3639
3808void 3640void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3642{
… …
3829} 3661}
3830 3662
3831void 3663void
3832rxvt_term::scr_swap_overlay () NOTHROW 3664rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3665{
3834 if (!ov_text) 3666 if (!ov.text)
3835 return; 3667 return;
3836 3668
3669 // hide cursor if it is within the overlay area
3670 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3671 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3672 screen.flags &= ~Screen_VisibleCursor;
3673
3837 // swap screen mem with overlay 3674 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3675 for (int y = ov.h; y--; )
3839 { 3676 {
3840 text_t *t1 = ov_text[y]; 3677 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3678 rend_t *r1 = ov.rend[y];
3842 3679
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3680 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3681 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3682
3846 for (int x = ov_w; x--; ) 3683 for (int x = ov.w; x--; )
3847 { 3684 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3685 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3686 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3687 }
3851 } 3688 }

Diff Legend

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