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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.425 by root, Fri Jun 29 22:10:18 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () 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 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267 { 287 }
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 288
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
278 292
279 if (top_row) 293 if (top_row)
280 { 294 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 295 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 296 // to come up with a lean and mean algorithm.
297 // TODO: maybe optimise when width didn't change
283 298
284 row_col_t ocur = screen.cur; 299 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 301
287 do 302 do
288 { 303 {
289 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 306 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
295 308
296 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297 { 310 {
298 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
299 312
300 plines++; 313 plines++;
301 llen += prev_ncol; 314 llen += prev_ncol;
… …
314 327
315 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
316 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
317 { 330 {
318 qline = row_buf + qrow; 331 qline = row_buf + qrow;
319 lalloc (*qline); 332 qline->alloc (); // redundant with next line
320 qline->l = ncol; 333 qline->l = ncol;
321 qline->is_longer (1); 334 qline->is_longer (1);
322 335
323 int qcol = 0; 336 int qcol = 0;
324 337
… …
339 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
340 // least. 353 // least.
341 if (prow == ocur.row) 354 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
343 356
344 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
345 358
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 360
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
370 { 383 {
371 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
372 385
373 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
374 { 387 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
377 390
378 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
379 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
380 } 395 }
381 396
382 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386 399
387 term_start = 0; 400 term_start = 0;
388 } 401 }
389
390 free (old_buf);
391 delete old_ta;
392 delete old_ra;
393 402
394 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 405 }
397 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 chunk_free (prev_chunk, prev_chunk_size);
415
416 free (tabs);
417 tabs = (char *)rxvt_malloc (ncol);
418
419 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0;
421
398 CLEAR_ALL_SELECTION (); 422 CLEAR_ALL_SELECTION ();
399 423
400 prev_nrow = nrow; 424 prev_nrow = nrow;
401 prev_ncol = ncol; 425 prev_ncol = ncol;
402 426
403 tt_winch (); 427 tt_winch ();
404 428
405 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
406} 430}
407 431
408/* ------------------------------------------------------------------------- */ 432void ecb_cold
409/*
410 * Free everything. That way malloc debugging can find leakage.
411 */
412void
413rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
414{ 434{
415 if (row_buf) 435 chunk_free (chunk, chunk_size);
416 { 436 chunk = 0;
417 delete talloc; talloc = 0; 437 row_buf = 0;
418 delete ralloc; ralloc = 0;
419 438
420 free (row_buf);
421 free (swap_buf);
422 free (drawn_buf);
423 row_buf = 0; // signal that we freed all the arrays above
424
425 free (tabs); 439 free (tabs);
426 tabs = 0; 440 tabs = 0;
427 }
428} 441}
429 442
430/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
431/* 444/*
432 * Hard/Soft reset 445 * Hard/Soft reset
433 */ 446 */
434void 447void ecb_cold
435rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
436{ 449{
437 scr_release (); 450 scr_release ();
451
438 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
453 rvideo_mode = false;
439 scr_soft_reset (); 454 scr_soft_reset ();
440 scr_reset (); 455 scr_reset ();
441 456
442 scr_clear (true); 457 scr_clear (true);
443 scr_refresh (); 458 scr_refresh ();
444} 459}
445 460
446void 461void ecb_cold
447rxvt_term::scr_soft_reset () 462rxvt_term::scr_soft_reset () NOTHROW
448{ 463{
449 /* only affects modes, nothing drastic such as clearing the screen */ 464 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 465#if ENABLE_OVERLAY
451 scr_overlay_off (); 466 scr_overlay_off ();
452#endif 467#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 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 468
465 if (current_screen != PRIMARY) 469 if (current_screen != PRIMARY)
466 scr_swap_screen (); 470 scr_swap_screen ();
467 471
468 scr_scroll_region (0, MAX_ROWS - 1); 472 scr_scroll_region (0, MAX_ROWS - 1);
… …
513 } 517 }
514 518
515 /* boundary check in case screen size changed between SAVE and RESTORE */ 519 /* boundary check in case screen size changed between SAVE and RESTORE */
516 min_it (s->cur.row, nrow - 1); 520 min_it (s->cur.row, nrow - 1);
517 min_it (s->cur.col, ncol - 1); 521 min_it (s->cur.col, ncol - 1);
518#ifdef DEBUG_STRICT
519 assert (s->cur.row >= 0); 522 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 523 assert (s->cur.col >= 0);
521#endif
522} 524}
523 525
524void 526void
525rxvt_term::scr_swap_screen () 527rxvt_term::scr_swap_screen () NOTHROW
526{ 528{
527 if (!option (Opt_secondaryScreen)) 529 if (!option (Opt_secondaryScreen))
528 return; 530 return;
529 531
530 for (int i = prev_nrow; i--; ) 532 for (int i = prev_nrow; i--; )
… …
549 return; 551 return;
550 552
551 want_refresh = 1; 553 want_refresh = 1;
552 view_start = 0; 554 view_start = 0;
553 555
554 selection_check (2); /* check for boundary cross */ 556 /* check for boundary cross */
557 row_col_t pos;
558 pos.row = pos.col = 0;
559 if (ROWCOL_IS_BEFORE (selection.beg, pos)
560 && ROWCOL_IS_AFTER (selection.end, pos))
561 CLEAR_SELECTION ();
555 562
556 int i = current_screen; current_screen = scrn; scrn = i; 563 current_screen = scrn;
557 564
558#if NSCREENS 565#if NSCREENS
559 if (option (Opt_secondaryScreen)) 566 if (option (Opt_secondaryScreen))
560 { 567 {
561 num_scr = 0; 568 num_scr = 0;
… …
625/* 632/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 633 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 634 * count positive ==> scroll up
628 * count negative ==> scroll down 635 * count negative ==> scroll down
629 */ 636 */
630int 637int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 638rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 639{
633 if (count == 0 || (row1 > row2)) 640 if (count == 0 || (row1 > row2))
634 return 0; 641 return 0;
635 642
… …
638 645
639 if (count > 0 646 if (count > 0
640 && row1 == 0 647 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 648 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 649 {
650 min_it (count, total_rows - (nrow - (row2 + 1)));
651
643 top_row = max (top_row - count, -saveLines); 652 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 653
648 // sever bottommost line 654 // sever bottommost line
649 { 655 {
650 line_t &l = ROW(row2 - count); 656 line_t &l = ROW(row2);
651 l.is_longer (0); 657 l.is_longer (0);
652 l.touch (); 658 l.touch ();
653 } 659 }
654 660
661 // scroll everything up 'count' lines
662 term_start = (term_start + count) % total_rows;
663
664 // now copy lines below the scroll region bottom to the
665 // bottom of the screen again, so they look as if they
666 // hadn't moved.
667 for (int i = nrow; --i > row2; )
668 {
669 line_t &l1 = ROW(i - count);
670 line_t &l2 = ROW(i);
671
672 ::swap (l1, l2);
673 l2.touch ();
674 }
675
655 // erase newly scrolled-in lines 676 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 677 for (int i = count; i--; )
657 { 678 {
658 line_t &l = ROW(nrow - 1 - i); 679 line_t &l = ROW(row2 - i);
659 680
660 // optimize if already cleared, can be significant on slow machines 681 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 682 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 683 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 684 {
664 scr_blank_line (l, 0, l.l, rstyle); 685 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 686 l.l = 0;
… …
667 } 688 }
668 else 689 else
669 scr_blank_screen_mem (l, rstyle); 690 scr_blank_screen_mem (l, rstyle);
670 } 691 }
671 692
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 693 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 694 if (selection.op && current_screen == selection.screen
695 && selection.beg.row <= row2)
686 { 696 {
687 selection.beg.row -= count; 697 selection.beg.row -= count;
688 selection.end.row -= count; 698 selection.end.row -= count;
689 selection.mark.row -= count; 699 selection.mark.row -= count;
690 700
691 if (selection.beg.row < top_row 701 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 702 }
699 703
700 // finally move the view window, if desired 704 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 705 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 706 && view_start != 0
… …
732 } 736 }
733 737
734 // use a simple and robust scrolling algorithm, this 738 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 739 // part of scr_scroll_text is not time-critical.
736 740
741 // sever line above scroll region
742 if (row1)
743 {
744 line_t &l = ROW(row1 - 1);
745 l.is_longer (0);
746 l.touch ();
747 }
748
737 int rows = row2 - row1 + 1; 749 int rows = row2 - row1 + 1;
738 750
739 min_it (count, rows); 751 min_it (count, rows);
740 752
741 line_t *temp_buf = row_buf + total_rows; 753 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 754
743 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
744 { 756 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 757 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 758
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 760 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 761 }
750 762
751 for (int row = 0; row < rows; row++) 763 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 764 ROW(row1 + row) = temp_buf [row];
765
766 // sever bottommost line
767 {
768 line_t &l = ROW(row2);
769 l.is_longer (0);
770 l.touch ();
771 }
753 } 772 }
754 773
755 return count; 774 return count;
756} 775}
757 776
758/* ------------------------------------------------------------------------- */ 777/* ------------------------------------------------------------------------- */
759/* 778/*
760 * Add text given in <str> of length <len> to screen struct 779 * Add text given in <str> of length <len> to screen struct
761 */ 780 */
762void 781void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 782rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 783{
765 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
766 return; 785 return;
767 786
768 unsigned char checksel; 787 bool checksel;
769 unicode_t c; 788 unicode_t c;
770 int ncol = this->ncol; 789 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 790 const wchar_t *strend = str + len;
772 791
773 want_refresh = 1; 792 want_refresh = 1;
… …
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 805 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 806 screen.cur.row -= minlines;
788 } 807 }
789 } 808 }
790 809
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 810 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 811 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 812 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 813 int row = screen.cur.row;
797 814
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 815 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 816
800 line_t *line = &ROW(row); 817 line_t *line = &ROW(row);
801 818
802 while (str < strend) 819 while (str < strend)
803 { 820 {
804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 821 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805 822
806 if (expect_false (c < 0x20)) 823 if (ecb_unlikely (c < 0x20))
807 if (c == C0_LF) 824 if (c == C0_LF)
808 { 825 {
809 max_it (line->l, screen.cur.col); 826 max_it (line->l, screen.cur.col);
810 827
811 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
… …
830 { 847 {
831 scr_tab (1, true); 848 scr_tab (1, true);
832 continue; 849 continue;
833 } 850 }
834 851
835 if (expect_false ( 852 if (ecb_unlikely (
836 checksel /* see if we're writing within selection */ 853 checksel /* see if we're writing within selection */
837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 854 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 855 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 )) 856 ))
840 { 857 {
… …
845 * should be a similar check. 862 * should be a similar check.
846 */ 863 */
847 CLEAR_SELECTION (); 864 CLEAR_SELECTION ();
848 } 865 }
849 866
850 if (expect_false (screen.flags & Screen_WrapNext)) 867 if (ecb_unlikely (screen.flags & Screen_WrapNext))
851 { 868 {
852 scr_do_wrap (); 869 scr_do_wrap ();
853 870
854 line->l = ncol; 871 line->l = ncol;
855 line->is_longer (1); 872 line->is_longer (1);
… …
857 row = screen.cur.row; 874 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 875 line = &ROW(row); /* _must_ refresh */
859 } 876 }
860 877
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 878 // some utf-8 decoders "decode" surrogate characters: let's fix this.
862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 879 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863 c = 0xfffd; 880 c = 0xfffd;
864 881
865 // rely on wcwidth to tell us the character width, do wcwidth before 882 // rely on wcwidth to tell us the character width, do wcwidth before
866 // further replacements, as wcwidth might return -1 for the line 883 // further replacements, as wcwidth might return -1 for the line
867 // drawing characters below as they might be invalid in the current 884 // drawing characters below as they might be invalid in the current
868 // locale. 885 // locale.
869 int width = WCWIDTH (c); 886 int width = WCWIDTH (c);
870 887
871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 888 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872 { 889 {
873 // vt100 special graphics and line drawing 890 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 891 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 892 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 893 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 c = vt100_0[c - 0x41]; 906 c = vt100_0[c - 0x41];
890 width = 1; // vt100 line drawing characters are always single-width 907 width = 1; // vt100 line drawing characters are always single-width
891 } 908 }
892 } 909 }
893 910
894 if (expect_false (screen.flags & Screen_Insert)) 911 if (ecb_unlikely (screen.flags & Screen_Insert))
895 scr_insdel_chars (width, INSERT); 912 scr_insdel_chars (width, INSERT);
896 913
897 if (width != 0) 914 if (width != 0)
898 { 915 {
899#if !UNICODE_3 916#if !UNICODE_3
… …
904# else 921# else
905 c = 0xfffd; 922 c = 0xfffd;
906# endif 923# endif
907#endif 924#endif
908 925
926 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
927
928 // if the character doesn't fit into the remaining columns...
929 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
930 {
931 if (screen.flags & Screen_Autowrap)
932 {
933 // ... artificially enlargen the previous one
934 c = NOCHAR;
935 // and try the same character next loop iteration
936 --str;
937 }
938 else
939 screen.cur.col = ncol - width;
940 }
941
909 // nuke the character at this position, if required 942 // nuke the character at this position, if required
910 if (expect_false ( 943 // due to wonderful coincidences everywhere else in this loop
944 // we never have to check for overwriting a wide char itself,
945 // only its tail.
911 line->t[screen.cur.col] == NOCHAR 946 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
912 || (screen.cur.col < ncol - 1
913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col); 947 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921 {
922 // ... artificially enlargen the previous one
923 c = NOCHAR;
924 // and try the same character next loop iteration
925 --str;
926 }
927 948
928 line->touch (); 949 line->touch ();
929 950
930 do 951 do
931 { 952 {
932 line->t[screen.cur.col] = c; 953 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 954 line->r[screen.cur.col] = rend;
934 955
935 if (expect_true (screen.cur.col < ncol - 1)) 956 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 957 screen.cur.col++;
937 else 958 else
938 { 959 {
939 line->l = ncol; 960 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 961 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 962 screen.flags |= Screen_WrapNext;
942 break; 963
964 goto end_of_line;
943 } 965 }
944 966
945 c = NOCHAR; 967 c = NOCHAR;
946 } 968 }
947 while (expect_false (--width > 0)); 969 while (ecb_unlikely (--width > 0));
948 970
949 // pad with spaces when overwriting wide character with smaller one 971 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 972 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951 { 973 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 974 line->t[c] = ' ';
957 line->r[c] = rend; 975 line->r[c] = rend;
958 }
959 } 976 }
977
978end_of_line:
979 ;
960 } 980 }
961#if ENABLE_COMBINING 981#if ENABLE_COMBINING
962 else // width == 0 982 else // width == 0
963 { 983 {
964 if (c != 0xfeff) // ignore BOM 984 if (c != 0xfeff) // ignore BOM
… …
1004#endif 1024#endif
1005 } 1025 }
1006 1026
1007 max_it (line->l, screen.cur.col); 1027 max_it (line->l, screen.cur.col);
1008 1028
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1029 assert (screen.cur.row >= 0);
1011#endif
1012} 1030}
1013 1031
1014/* ------------------------------------------------------------------------- */ 1032/* ------------------------------------------------------------------------- */
1015/* 1033/*
1016 * Process Backspace. Move back the cursor back a position, wrap if have to 1034 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1029 1047
1030 want_refresh = 1; 1048 want_refresh = 1;
1031#endif 1049#endif
1032 } 1050 }
1033 } 1051 }
1052 else if (screen.flags & Screen_WrapNext)
1053 screen.flags &= ~Screen_WrapNext;
1034 else 1054 else
1035 scr_gotorc (0, -1, RELATIVE); 1055 scr_gotorc (0, -1, RELATIVE);
1036} 1056}
1037 1057
1038/* ------------------------------------------------------------------------- */ 1058/* ------------------------------------------------------------------------- */
… …
1116 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1117 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1118 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1119 */ 1139 */
1120#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1121void 1141void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1123{ 1143{
1124 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1146 else
… …
1133 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1134 * Move cursor right in row. If we're at the right boundary, shift everything 1154 * Move cursor right in row. If we're at the right boundary, shift everything
1135 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1136 */ 1156 */
1137#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1138void 1158void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1140{ 1160{
1141 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1163 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1314 scr_blank_line (line, col, num, rstyle);
1295} 1315}
1296 1316
1297/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
1298/* 1318/*
1299 * Erase part of whole of the screen 1319 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1323 */
1304void 1324void
… …
1313 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1314 1334
1315 switch (mode) 1335 switch (mode)
1316 { 1336 {
1317 case 0: /* erase to end of screen */ 1337 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1338 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1339 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1340 num = nrow - row;
1322 break; 1341 break;
1323 case 1: /* erase to beginning of screen */ 1342 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1343 scr_erase_line (1);
1326 row = 0; 1344 row = 0;
1327 num = screen.cur.row; 1345 num = screen.cur.row;
1328 break; 1346 break;
1329 case 2: /* erase whole screen */ 1347 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1348 row = 0;
1332 num = nrow; 1349 num = nrow;
1333 break; 1350 break;
1334 default: 1351 default:
1335 return; 1352 return;
… …
1344 if (row >= nrow) /* Out Of Bounds */ 1361 if (row >= nrow) /* Out Of Bounds */
1345 return; 1362 return;
1346 1363
1347 min_it (num, nrow - row); 1364 min_it (num, nrow - row);
1348 1365
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1366 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1367 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1368 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1369 {
1354 ren = DEFAULT_RSTYLE; 1370 ren = DEFAULT_RSTYLE;
1355 1371
1356 if (mapped) 1372 if (mapped)
1357 XClearArea (dpy, vt, 0, 1373 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1374 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1375 (unsigned int)Height2Pixel (num), False);
1360 } 1376 }
1361 else 1377 else
1362 { 1378 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1380
1381 if (mapped)
1382 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1383 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1384 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1385 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1386 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1387 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1388 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1389 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1390 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1391 }
1373 } 1392 }
1374 1393
1375 for (; num--; row++) 1394 for (; num--; row++)
1376 { 1395 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1396 scr_blank_screen_mem (ROW(row), rstyle);
1397
1398 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1399 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1400 }
1380} 1401}
1381 1402
1382#if !ENABLE_MINIMAL 1403#if !ENABLE_MINIMAL
1383void 1404void
… …
1393/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1394/* 1415/*
1395 * Fill the screen with `E's 1416 * Fill the screen with `E's
1396 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1397 */ 1418 */
1398void 1419void ecb_cold
1399rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1400{ 1421{
1401 rend_t fs; 1422 rend_t fs;
1402 1423
1403 want_refresh = 1; 1424 want_refresh = 1;
1404 ZERO_SCROLLBACK (); 1425 ZERO_SCROLLBACK ();
1405 1426
1406 num_scr_allow = 0; 1427 num_scr_allow = 0;
1407 selection_check (3); 1428
1429 row_col_t pos;
1430 pos.row = pos.col = 0;
1431 if (ROWCOL_IS_AFTER (selection.end, pos))
1432 CLEAR_SELECTION ();
1408 1433
1409 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1410 for (int row = nrow; row--; ) 1435 for (int row = nrow; row--; )
1411 { 1436 {
1412 line_t &line = ROW(row); 1437 line_t &line = ROW(row);
… …
1536 { 1561 {
1537 line->t[col] = line->t[col + count]; 1562 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1563 line->r[col] = line->r[col + count];
1539 } 1564 }
1540 1565
1541 scr_blank_line (*line, ncol - count, count, 1566 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1567
1544 if (selection.op && current_screen == selection.screen 1568 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1569 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1570 {
1547 if (selection.end.row != screen.cur.row 1571 if (selection.end.row != screen.cur.row
… …
1564/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1565/* 1589/*
1566 * Set the scrolling region 1590 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1592 */
1569void 1593void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571{ 1595{
1572 max_it (top, 0); 1596 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1574 1598
… …
1584/* 1608/*
1585 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1612 */
1589void 1613void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591{ 1615{
1592 want_refresh = 1; 1616 want_refresh = 1;
1593 1617
1594 if (mode) 1618 if (mode)
… …
1601/* 1625/*
1602 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1629 */
1606void 1630void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1608{ 1632{
1609 if (mode) 1633 if (mode)
1610 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1611 else 1635 else
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1644 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1648 */
1625void 1649void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1627{ 1651{
1628 if (mode) 1652 if (mode)
1629 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1630 else 1654 else
… …
1637/* 1661/*
1638 * Set insert/replace mode 1662 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1665 */
1642void 1666void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1644{ 1668{
1645 if (mode) 1669 if (mode)
1646 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1647 else 1671 else
… …
1653 * Set/Unset tabs 1677 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1681 */
1658void 1682void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1660{ 1684{
1661 if (mode < 0) 1685 if (mode < 0)
1662 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1683 { 1707 {
1684 rvideo_state = on; 1708 rvideo_state = on;
1685 1709
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1712 if (bg_img == 0)
1689#endif 1713#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1715
1692 XGCValues gcvalue; 1716 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1703/* 1727/*
1704 * Report current cursor position 1728 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1730 */
1707void 1731void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1709{ 1733{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1734 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1735}
1712 1736
… …
1715 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1716 1740
1717/* 1741/*
1718 * Set font style 1742 * Set font style
1719 */ 1743 */
1720void 1744void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1722{ 1746{
1723#if 0 1747#if 0
1724 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1725 { 1749 {
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1775 */
1752void 1776void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1754{ 1778{
1755 screen.charset = set; 1779 screen.charset = set;
1756 set_font_style (); 1780 set_font_style ();
1757} 1781}
… …
1778 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1779 1803
1780/* 1804/*
1781 * refresh matching text. 1805 * refresh matching text.
1782 */ 1806 */
1783bool 1807bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785{ 1809{
1786 bool found = false; 1810 bool found = false;
1787 1811
1788 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1807 PART_BEG = 0, 1831 PART_BEG = 0,
1808 PART_END, 1832 PART_END,
1809 RC_COUNT 1833 RC_COUNT
1810}; 1834};
1811 1835
1812void 1836void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1837rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1814{ 1838{
1815 int i; 1839 int i;
1816 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1817 1841
… …
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1861 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1862 {
1839 min_it (rc[i].col, ncol - 1); 1863 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1864 min_it (rc[i].row, nrow - 1);
1841 } 1865 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1866
1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1868 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1845 1869
1846 num_scr_allow = 0; 1870 num_scr_allow = 0;
1847 1871
… …
1854 * Refresh the entire screen 1878 * Refresh the entire screen
1855 */ 1879 */
1856void 1880void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1881rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1882{
1859 scr_expose (0, 0, width, height, refresh); 1883 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1884}
1861 1885
1862/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1863/* 1887/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1888 * Move the display so that the line represented by scrollbar value Y is at
… …
1920 1944
1921# ifndef NO_MAPALERT 1945# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1946# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1947 if (option (Opt_mapAlert))
1924# endif 1948# endif
1925 XMapWindow (dpy, parent[0]); 1949 XMapWindow (dpy, parent);
1926# endif 1950# endif
1927 1951
1928# if ENABLE_FRILLS 1952# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1953 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1954 set_urgency (1);
… …
1938 1962
1939 bell_ev.start (VISUAL_BELL_DURATION); 1963 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1964 }
1941 else 1965 else
1942 XBell (dpy, 0); 1966 XBell (dpy, 0);
1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1968#endif
1944} 1969}
1945 1970
1946/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */ 1972void ecb_cold
1948void
1949rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950{ 1974{
1951#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1952 int nrows, row_start; 1976 int nrows, row_start;
1953 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
1966 row_start = view_start; 1990 row_start = view_start;
1967 } 1991 }
1968 1992
1969 wctomb (0, 0); 1993 wctomb (0, 0);
1970 1994
1971 for (int r1 = 0; r1 < nrows; r1++) 1995 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1996 {
1973 text_t *tp = ROW(r1).t; 1997 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 1998 int len = ROW(r1).l;
1975 1999
1976 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2000 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2002/* 2026/*
2003 * Refresh the screen 2027 * Refresh the screen
2004 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2005 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2030 */
2007void 2031void ecb_hot
2008rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2009{ 2033{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2036 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2037#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2038 rend_t cc1; /* store colours at cursor position (s) */
… …
2027 /* 2049 /*
2028 * A: set up vars 2050 * A: set up vars
2029 */ 2051 */
2030 refresh_count = 0; 2052 refresh_count = 0;
2031 2053
2054 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2055 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2057 have_bg = bg_img != 0;
2035#endif 2058#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2060
2038 /* 2061 /*
2039 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
2040 */ 2063 */
2041 scr_reverse_selection (); 2064 scr_reverse_selection ();
2042 2065
2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2067#if ENABLE_OVERLAY
2068 scr_swap_overlay ();
2069#endif
2070
2071 bool showcursor = screen.flags & Screen_VisibleCursor;
2072
2043 /* 2073 /*
2044 * C: set the cursor character (s) 2074 * C: set the cursor character (s)
2045 */ 2075 */
2046 { 2076 {
2047 unsigned char setoldcursor; 2077 bool setoldcursor;
2048 2078
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2079#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2080 if (hidden_cursor)
2052 showcursor = 0; 2081 showcursor = 0;
2053#endif 2082#endif
2054 2083
… …
2082 ccol2 = bgcolor_of (rstyle); 2111 ccol2 = bgcolor_of (rstyle);
2083#else 2112#else
2084 ccol2 = Color_bg; 2113 ccol2 = Color_bg;
2085#endif 2114#endif
2086 2115
2087 if (showcursor && focus) 2116 if (focus)
2088 { 2117 {
2089 if (option (Opt_cursorUnderline)) 2118 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2119 *crp ^= RS_Uline;
2091 else 2120 else
2092 { 2121 {
… …
2127 oldcursor.col = screen.cur.col; 2156 oldcursor.col = screen.cur.col;
2128 } 2157 }
2129 } 2158 }
2130 } 2159 }
2131 2160
2132 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133#if ENABLE_OVERLAY
2134 scr_swap_overlay ();
2135#endif
2136
2137#ifndef NO_SLOW_LINK_SUPPORT 2161#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2162 /*
2139 * D: CopyArea pass - very useful for slower links 2163 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2164 * This has been deliberately kept simple.
2141 */ 2165 */
… …
2145 { 2169 {
2146 int16_t nits; 2170 int16_t nits;
2147 int i = num_scr; 2171 int i = num_scr;
2148 int j; 2172 int j;
2149 int len, wlen; 2173 int len, wlen;
2150 dLocal (int, num_scr);
2151 2174
2152 j = nrow; 2175 j = nrow;
2153 wlen = len = -1; 2176 wlen = len = -1;
2154 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2155 2178
… …
2230 continue; 2253 continue;
2231 2254
2232 // redraw one or more characters 2255 // redraw one or more characters
2233 2256
2234 // seek to the beginning of wide characters 2257 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2258 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236 --col; 2259 --col;
2237 2260
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2261 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2262 text_t *text = stp + col;
2240 int count = 1; 2263 int count = 1;
2241 2264
2242 dtp[col] = stp[col]; 2265 dtp[col] = stp[col];
2243 drp[col] = rend; 2266 drp[col] = rend;
… …
2247 for (i = 0; ++col < ncol; ) 2270 for (i = 0; ++col < ncol; )
2248 { 2271 {
2249 if (stp[col] == NOCHAR) 2272 if (stp[col] == NOCHAR)
2250 { 2273 {
2251 dtp[col] = stp[col]; 2274 dtp[col] = stp[col];
2252 drp[col] = rend; 2275 drp[col] = srp[col];
2276
2253 count++; 2277 count++;
2254 i++; 2278 i++;
2255 2279
2256 continue; 2280 continue;
2257 } 2281 }
… …
2277 2301
2278 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2303 count -= i; /* dump any matching trailing chars */
2280 2304
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2306 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2307 count++, i--;
2284 2308
2285 /* 2309 /*
2286 * Determine the attributes for the string 2310 * Determine the attributes for the string
2287 */ 2311 */
2288 int fore = fgcolor_of (rend); // desired foreground 2312 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2313 int back = bgcolor_of (rend); // desired background
2290 2314
2291 // only do special processing if any attributes are set, which is unlikely 2315 // only do special processing if any attributes are set, which is unlikely
2292 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2316 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2317 {
2294 bool invert = rend & RS_RVid; 2318 bool invert = rend & RS_RVid;
2295 2319
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2321 if (rend & RS_Bold && fore == Color_fg)
… …
2316 2340
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2341 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2342 fore = Color_UL;
2319#endif 2343#endif
2320 2344
2345#ifdef OPTION_HC
2346 if (rend & RS_Sel)
2347 {
2348 /* invert the column if no highlightColor is set or it is the
2349 * current cursor column */
2350 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2351 && ISSET_PIXCOLOR (Color_HC))
2352 {
2353 if (ISSET_PIXCOLOR (Color_HTC))
2354 fore = Color_HTC;
2355 // if invert is 0 reverse video is set so we use bg color as fg color
2356 else if (!invert)
2357 fore = back;
2358
2359 back = Color_HC;
2360 invert = 0;
2361 }
2362 }
2363#endif
2364
2321 if (invert) 2365 if (invert)
2322 { 2366 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2329 ::swap (fore, back); 2367 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2368
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2369#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2337 if (ISSET_PIXCOLOR (Color_RV))
2338 back = Color_RV;
2339# endif
2340 if (fore == back) 2370 if (fore == back)
2341 { 2371 {
2342 fore = Color_bg; 2372 fore = Color_bg;
2343 back = Color_fg; 2373 back = Color_fg;
2344 } 2374 }
… …
2380 /* 2410 /*
2381 * Actually do the drawing of the string here 2411 * Actually do the drawing of the string here
2382 */ 2412 */
2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2413 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2414
2385 if (expect_true (have_bg && back == Color_bg)) 2415 if (ecb_likely (have_bg && back == Color_bg))
2386 { 2416 {
2387 // this is very ugly, maybe push it into ->draw? 2417 // this is very ugly, maybe push it into ->draw?
2388 2418
2389 for (i = 0; i < count; i++) /* don't draw empty strings */ 2419 for (i = 0; i < count; i++) /* don't draw empty strings */
2390 if (text[i] != ' ') 2420 if (text[i] != ' ')
… …
2397 did_clear: ; 2427 did_clear: ;
2398 } 2428 }
2399 else 2429 else
2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2430 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401 2431
2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2432 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403 { 2433 {
2404#if ENABLE_FRILLS 2434#if ENABLE_FRILLS
2405 if (ISSET_PIXCOLOR (Color_underline)) 2435 if (ISSET_PIXCOLOR (Color_underline))
2406 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2436 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407 else 2437 else
… …
2412 xpixel, ypixel + font->ascent + 1, 2442 xpixel, ypixel + font->ascent + 1,
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2443 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2444 }
2415 } /* for (col....) */ 2445 } /* for (col....) */
2416 } /* for (row....) */ 2446 } /* for (row....) */
2417
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2447
2423 /* 2448 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2449 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2450 */
2426 if (showcursor) 2451 if (showcursor)
… …
2458 2483
2459 XDrawRectangle (dpy, vt, gc, 2484 XDrawRectangle (dpy, vt, gc,
2460 Col2Pixel (col), 2485 Col2Pixel (col),
2461 Row2Pixel (oldcursor.row), 2486 Row2Pixel (oldcursor.row),
2462 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2487 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2488 (unsigned int) (Height2Pixel (1) - 1));
2464 } 2489 }
2465 } 2490 }
2466 2491
2467 /* 2492 /*
2468 * H: cleanup selection 2493 * H: cleanup selection
2469 */ 2494 */
2495#if ENABLE_OVERLAY
2496 scr_swap_overlay ();
2497#endif
2498 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2499
2470 scr_reverse_selection (); 2500 scr_reverse_selection ();
2471 2501
2502 screen.flags = old_screen_flags;
2472 num_scr = 0; 2503 num_scr = 0;
2473 num_scr_allow = 1; 2504 num_scr_allow = 1;
2474} 2505}
2475 2506
2476void 2507void ecb_cold
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2478{ 2509{
2479 if (!l.t) 2510 if (!l.valid ())
2480 return; 2511 return;
2481 2512
2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2513 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2483 2514
2484 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2485 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2516 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2486} 2517}
2487 2518
2488void 2519void ecb_cold
2489rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2490{ 2521{
2491 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2492 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2493 2524
… …
2496 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2497 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2498 } 2529 }
2499} 2530}
2500 2531
2501void 2532void ecb_cold
2502rxvt_term::scr_recolour () NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2534{
2535 bool transparent = false;
2536
2504#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2538 if (bg_img != 0)
2506#else 2539 {
2540# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT)
2542 {
2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2545
2546 transparent = true;
2547 }
2548 else
2549# endif
2550 {
2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2553 }
2554 }
2555 else
2556#endif
2557 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2559 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2560 }
2561
2562 XClearWindow (dpy, parent);
2511 2563
2512 if (scrollBar.win) 2564 if (scrollBar.win)
2513 { 2565 {
2566 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2571 scrollBar.show (0);
2517 } 2572 }
2518 2573
2519#endif 2574 if (refresh)
2520 2575 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2576 scr_clear ();
2523 scr_touch (true); 2577 scr_touch (true);
2578 }
2524 want_refresh = 1; 2579 want_refresh = 1;
2525} 2580}
2526 2581
2527/* ------------------------------------------------------------------------- */ 2582/* ------------------------------------------------------------------------- */
2528void 2583void
… …
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2587} 2642}
2588 2643
2589/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2590void 2645void ecb_hot
2591rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2592{ 2647{
2593 if (selection.op 2648 if (selection.op
2594 && current_screen == selection.screen 2649 && current_screen == selection.screen
2595 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
2596 { 2651 {
2597#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2598 if (selection.rect) 2653 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2654 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2656 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2657 else
2603#endif 2658#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2659 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2660 selection.end.row, selection.end.col,
2606 RS_RVid); 2661 RS_Sel | RS_RVid);
2607 } 2662 }
2608} 2663}
2609 2664
2610/* ------------------------------------------------------------------------- */ 2665/* ------------------------------------------------------------------------- */
2611/* 2666/*
… …
2614 */ 2669 */
2615#if 0 2670#if 0
2616void 2671void
2617rxvt_term::scr_dump (int fd) NOTHROW 2672rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2673{
2619 int row, wrote; 2674 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2675 // relevant code in scr_printscreen
2621 char r1[] = "\n";
2622
2623 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++)
2625 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2627 : ncol;
2628 for (towrite = width; towrite; towrite -= wrote)
2629 {
2630 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631 towrite);
2632 if (wrote < 0)
2633 return; /* XXX: death, no report */
2634 }
2635 if (row_buf[row].l >= 0)
2636 if (write (fd, r1, 1) <= 0)
2637 return; /* XXX: death, no report */
2638 }
2639} 2676}
2640#endif 2677#endif
2641 2678
2642/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2645void 2682void
2646rxvt_term::selection_check (int check_more) NOTHROW 2683rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2684{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2685 if (!selection.op)
2651 return; 2686 return;
2652 2687
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2688 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2691 || (check_more == 1
2658 && current_screen == selection.screen 2692 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2695 CLEAR_ALL_SELECTION ();
2670} 2696}
2671 2697
2672/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2673/* 2699/*
2674 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
2675 */ 2701 */
2676void 2702void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2703rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2704{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2705 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2708 data[i] = C0_CR;
2683 2709
2684 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2686 2712
2687 tt_write (data, len); 2713 tt_write (data, len);
2688 2714
2689 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2691} 2717}
2692 2718
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2719void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2721{
2701 if (prop == None) /* check for failed XConvertSelection */ 2722 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2723 return;
2876 2724
2877 selection_paste (win, prop, true); 2725 tt_paste (data, len);
2878} 2726}
2879 2727
2880/* ------------------------------------------------------------------------- */ 2728/* ------------------------------------------------------------------------- */
2881/* 2729/*
2882 * Request the current selection: 2730 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2731 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2732 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2733 * EXT: button 2 release
2889 */ 2734 */
2890void 2735void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2736rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2737{
2893 if (selection.text && selnum == Sel_Primary) 2738 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2739 {
2901 else 2740 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2741 selection_req->run ();
2902 { 2742 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2743}
2944 2744
2945/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2946/* 2746/*
2947 * Clear all selected text 2747 * Clear all selected text
2948 * EXT: SelectionClear 2748 * EXT: SelectionClear
2949 */ 2749 */
2950void 2750void
2951rxvt_term::selection_clear () NOTHROW 2751rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2752{
2753 if (!clipboard)
2754 {
2953 want_refresh = 1; 2755 want_refresh = 1;
2954 free (selection.text); 2756 free (selection.text);
2955 selection.text = NULL; 2757 selection.text = NULL;
2956 selection.len = 0; 2758 selection.len = 0;
2957 CLEAR_SELECTION (); 2759 CLEAR_SELECTION ();
2958 2760
2959 if (display->selection_owner == this) 2761 if (display->selection_owner == this)
2960 display->selection_owner = 0; 2762 display->selection_owner = 0;
2763 }
2764 else
2765 {
2766 free (selection.clip_text);
2767 selection.clip_text = NULL;
2768 selection.clip_len = 0;
2769
2770 if (display->clipboard_owner == this)
2771 display->clipboard_owner = 0;
2772 }
2961} 2773}
2962 2774
2963/* ------------------------------------------------------------------------- */ 2775/* ------------------------------------------------------------------------- */
2964/* 2776/*
2965 * Copy a selection into the cut buffer 2777 * Copy a selection into the cut buffer
2966 * EXT: button 1 or 3 release 2778 * EXT: button 1 or 3 release
2967 */ 2779 */
2968void 2780void
2969rxvt_term::selection_make (Time tm) 2781rxvt_term::selection_make (Time tm)
2970{ 2782{
2971 int i; 2783 int size;
2972 wchar_t *new_selection_text; 2784 wchar_t *new_selection_text;
2973 text_t *t; 2785 text_t *t;
2974 2786
2975 switch (selection.op) 2787 switch (selection.op)
2976 { 2788 {
… …
2992 return; /* nothing selected, go away */ 2804 return; /* nothing selected, go away */
2993 2805
2994 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2806 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995 return; 2807 return;
2996 2808
2997 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2809 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2810 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999 2811
3000 int ofs = 0; 2812 int ofs = 0;
3001 int extra = 0; 2813 int extra = 0;
3002 2814
3003 int col = selection.beg.col; 2815 int col = selection.beg.col;
… …
3009 { 2821 {
3010#if !ENABLE_MINIMAL 2822#if !ENABLE_MINIMAL
3011 if (selection.rect) 2823 if (selection.rect)
3012 { 2824 {
3013 col = selection.beg.col; 2825 col = selection.beg.col;
3014 end_col = ncol + 1; 2826 end_col = selection.end.col;
3015 } 2827 }
3016 else 2828 else
3017#endif 2829#endif
3018 end_col = ROW(row).l; 2830 end_col = ROW(row).l;
3019 2831
3020 col = max (col, 0); 2832 col = max (col, 0);
3021 2833
3022 if (row == selection.end.row 2834 if (row == selection.end.row)
3023#if !ENABLE_MINIMAL
3024 || selection.rect
3025#endif
3026 )
3027 min_it (end_col, selection.end.col); 2835 min_it (end_col, selection.end.col);
3028 2836
3029 t = ROW(row).t + col; 2837 t = ROW(row).t + col;
3030 2838
3031 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
… …
3039 2847
3040 extra -= (len - 1); 2848 extra -= (len - 1);
3041 2849
3042 if (extra < 0) 2850 if (extra < 0)
3043 { 2851 {
3044 extra += i; 2852 extra += size;
3045 i += i; 2853 size += size;
3046 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2854 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047 } 2855 }
3048 2856
3049 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2857 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050 } 2858 }
3051#endif 2859#endif
… …
3063 2871
3064 new_selection_text[ofs++] = C0_LF; 2872 new_selection_text[ofs++] = C0_LF;
3065 } 2873 }
3066 else 2874 else
3067#endif 2875#endif
3068 if (!ROW(row).is_longer () && row != selection.end.row) 2876 if (!ROW(row).is_longer ()
2877 && (row != selection.end.row || end_col != selection.end.col)
2878 && (row != selection.beg.row || selection.beg.col < ncol))
3069 new_selection_text[ofs++] = C0_LF; 2879 new_selection_text[ofs++] = C0_LF;
3070 } 2880 }
3071
3072 if (end_col != selection.end.col)
3073 new_selection_text[ofs++] = C0_LF;
3074 2881
3075 new_selection_text[ofs] = 0; 2882 new_selection_text[ofs] = 0;
3076 2883
3077 if (ofs == 0) 2884 if (ofs == 0)
3078 { 2885 {
… …
3091 2898
3092 selection_grab (tm); 2899 selection_grab (tm);
3093} 2900}
3094 2901
3095bool 2902bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 2903rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 2904{
2905 Atom sel;
2906
2907 if (!clipboard)
2908 {
3098 selection_time = tm; 2909 selection_time = tm;
2910 sel = XA_PRIMARY;
2911 }
2912 else
2913 {
2914 clipboard_time = tm;
2915 sel = xa[XA_CLIPBOARD];
2916 }
3099 2917
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2918 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2919 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 2920 {
3103 display->set_selection_owner (this); 2921 display->set_selection_owner (this, clipboard);
3104 return true; 2922 return true;
3105 } 2923 }
3106 else 2924 else
3107 { 2925 {
3108 selection_clear (); 2926 selection_clear (clipboard);
3109 return false; 2927 return false;
3110 } 2928 }
3111 2929
3112#if 0 2930#if 0
3113 XTextProperty ct; 2931 XTextProperty ct;
… …
3123/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
3124/* 2942/*
3125 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
3126 * EXT: button 1 press 2944 * EXT: button 1 press
3127 */ 2945 */
3128void 2946void ecb_cold
3129rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3130{ 2948{
3131 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
3132 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
3133 2951
… …
3152 2970
3153/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3154/* 2972/*
3155 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3156 */ 2974 */
3157void 2975void ecb_cold
3158rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3159{ 2977{
3160 want_refresh = 1; 2978 want_refresh = 1;
3161 2979
3162 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3189/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3190#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3191 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3192#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3193 3011
3194void 3012void ecb_cold
3195rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3196{ 3014{
3197 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3198 row_col_t bound; 3016 row_col_t bound;
3199 text_t *stp; 3017 text_t *stp;
… …
3273 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3274 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3275 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3276 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3277 */ 3095 */
3278void 3096void ecb_cold
3279rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3280{ 3098{
3281 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3282 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3283 3101
… …
3309 3127
3310/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3311/* 3129/*
3312 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3313 */ 3131 */
3314void 3132void ecb_cold
3315rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3316{ 3134{
3317 row_col_t pos; 3135 row_col_t pos;
3318 enum { 3136 enum {
3319 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3510 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3511#endif 3329#endif
3512} 3330}
3513 3331
3514#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3515void 3333void ecb_cold
3516rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3517{ 3335{
3518 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3519 text_t *stp; 3337 text_t *stp;
3520 3338
… …
3558/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3559/* 3377/*
3560 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3561 * EXT: button 3 double click 3379 * EXT: button 3 double click
3562 */ 3380 */
3563void 3381void ecb_cold
3564rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3565{ 3383{
3566 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3567 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3568} 3386}
… …
3570/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3571/* 3389/*
3572 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3573 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3574 */ 3392 */
3575void 3393void ecb_cold
3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577{ 3395{
3396 Atom property = rq.property == None ? rq.target : rq.property;
3578 XSelectionEvent ev; 3397 XSelectionEvent ev;
3579 3398
3580 ev.type = SelectionNotify; 3399 ev.type = SelectionNotify;
3581 ev.property = None; 3400 ev.property = None;
3582 ev.display = rq.display; 3401 ev.display = rq.display;
… …
3597 *target++ = xa[XA_COMPOUND_TEXT]; 3416 *target++ = xa[XA_COMPOUND_TEXT];
3598#if X_HAVE_UTF8_STRING 3417#if X_HAVE_UTF8_STRING
3599 *target++ = xa[XA_UTF8_STRING]; 3418 *target++ = xa[XA_UTF8_STRING];
3600#endif 3419#endif
3601 3420
3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3421 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603 32, PropModeReplace, 3422 32, PropModeReplace,
3604 (unsigned char *)target_list, target - target_list); 3423 (unsigned char *)target_list, target - target_list);
3605 ev.property = rq.property; 3424 ev.property = property;
3606 } 3425 }
3607#if TODO // TODO 3426#if TODO // TODO
3608 else if (rq.target == xa[XA_MULTIPLE]) 3427 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3428 {
3610 /* TODO: Handle MULTIPLE */ 3429 /* TODO: Handle MULTIPLE */
3611 } 3430 }
3612#endif 3431#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3432 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3433 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3434 XChangeProperty (dpy, rq.requestor, property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3435 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617 ev.property = rq.property; 3436 ev.property = property;
3437 }
3438 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3439 {
3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3441 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3442 ev.property = property;
3618 } 3443 }
3619 else if (rq.target == XA_STRING 3444 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3445 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3446 || rq.target == xa[XA_COMPOUND_TEXT]
3622 || rq.target == xa[XA_UTF8_STRING] 3447 || rq.target == xa[XA_UTF8_STRING]
… …
3654 { 3479 {
3655 target = xa[XA_COMPOUND_TEXT]; 3480 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3481 style = enc_compound_text;
3657 } 3482 }
3658 3483
3659 if (selection.text) 3484 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3485 {
3661 cl = selection.text; 3486 cl = selection.text;
3662 selectlen = selection.len; 3487 selectlen = selection.len;
3488 }
3489 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3490 {
3491 cl = selection.clip_text;
3492 selectlen = selection.clip_len;
3663 } 3493 }
3664 else 3494 else
3665 { 3495 {
3666 cl = L""; 3496 cl = L"";
3667 selectlen = 0; 3497 selectlen = 0;
… …
3688 ct.value = (unsigned char *)cl; 3518 ct.value = (unsigned char *)cl;
3689 ct.nitems = selectlen; 3519 ct.nitems = selectlen;
3690 ct.encoding = target; 3520 ct.encoding = target;
3691 } 3521 }
3692 3522
3693 XChangeProperty (dpy, rq.requestor, rq.property, 3523 XChangeProperty (dpy, rq.requestor, property,
3694 ct.encoding, 8, PropModeReplace, 3524 ct.encoding, 8, PropModeReplace,
3695 ct.value, (int)ct.nitems); 3525 ct.value, (int)ct.nitems);
3696 ev.property = rq.property; 3526 ev.property = property;
3697 3527
3698 if (freect) 3528 if (freect)
3699 XFree (ct.value); 3529 XFree (ct.value);
3700 } 3530 }
3701 3531
3702 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3703} 3533}
3704 3534
3705/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3706#ifdef USE_XIM 3536#if USE_XIM
3707void 3537void ecb_cold
3708rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3709{ 3539{
3710 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3711 3541
3712 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);
… …
3735 h += 2; min_it (h, nrow); 3565 h += 2; min_it (h, nrow);
3736 3566
3737 x -= 1; clamp_it (x, 0, ncol - w); 3567 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3568 y -= 1; clamp_it (y, 0, nrow - h);
3739 3569
3740 ov_x = x; ov_y = y; 3570 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3571 ov.w = w; ov.h = h;
3742 3572
3743 ov_text = new text_t *[h]; 3573 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3574 ov.rend = new rend_t *[h];
3745 3575
3746 for (y = 0; y < h; y++) 3576 for (y = 0; y < h; y++)
3747 { 3577 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3578 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3579 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3580
3751 text_t t0, t1, t2; 3581 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3582 rend_t r = OVERLAY_RSTYLE;
3753 3583
3754 if (y == 0) 3584 if (y == 0)
… …
3773} 3603}
3774 3604
3775void 3605void
3776rxvt_term::scr_overlay_off () NOTHROW 3606rxvt_term::scr_overlay_off () NOTHROW
3777{ 3607{
3778 if (!ov_text) 3608 if (!ov.text)
3779 return; 3609 return;
3780 3610
3781 want_refresh = 1; 3611 want_refresh = 1;
3782 3612
3783 for (int y = 0; y < ov_h; y++) 3613 for (int y = 0; y < ov.h; y++)
3784 { 3614 {
3785 delete [] ov_text[y]; 3615 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3616 delete [] ov.rend[y];
3787 } 3617 }
3788 3618
3789 delete [] ov_text; ov_text = 0; 3619 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3620 delete [] ov.rend; ov.rend = 0;
3791} 3621}
3792 3622
3793void 3623void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3624rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3625{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3626 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3627 return;
3798 3628
3799 x++, y++; 3629 x++, y++;
3800 3630
3801 ov_text[y][x] = text; 3631 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3632 ov.rend[y][x] = rend;
3803} 3633}
3804 3634
3805void 3635void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3636rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3637{
… …
3826} 3656}
3827 3657
3828void 3658void
3829rxvt_term::scr_swap_overlay () NOTHROW 3659rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3660{
3831 if (!ov_text) 3661 if (!ov.text)
3832 return; 3662 return;
3833 3663
3664 // hide cursor if it is within the overlay area
3665 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3666 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3667 screen.flags &= ~Screen_VisibleCursor;
3668
3834 // swap screen mem with overlay 3669 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3670 for (int y = ov.h; y--; )
3836 { 3671 {
3837 text_t *t1 = ov_text[y]; 3672 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3673 rend_t *r1 = ov.rend[y];
3839 3674
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3675 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3676 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3677
3843 for (int x = ov_w; x--; ) 3678 for (int x = ov.w; x--; )
3844 { 3679 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3680 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3681 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3682 }
3848 } 3683 }

Diff Legend

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