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

Diff Legend

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