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

Diff Legend

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