ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 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! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
99 98
100/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
101void 100void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 102{
104 if (!l.t) 103 if (!l.valid ())
105 { 104 {
106 lalloc (l); 105 l.alloc ();
107 col = 0; 106 col = 0;
108 width = ncol; 107 width = ncol;
109 } 108 }
110 109
111 l.touch (); 110 l.touch ();
142 while (col > 0 && l.t[col] == NOCHAR) 141 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
147 148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
156/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
161rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
162{ 197{
198#if ENABLE_OVERLAY
199 scr_overlay_off ();
200#endif
201
163 view_start = 0; 202 view_start = 0;
164 num_scr = 0; 203 num_scr = 0;
165 204
166 if (ncol == 0) 205 if (ncol == 0)
167 ncol = 80; 206 ncol = 80;
187 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
188 227
189 screen.tscroll = 0; 228 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
191 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
192 if (!row_buf) 240 if (!prev_row_buf)
193 { 241 {
194 /* 242 /*
195 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
196 */ 244 */
197 top_row = 0; 245 top_row = 0;
198 term_start = 0; 246 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 247
214 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
231 selection.text = NULL; 265 selection.text = NULL;
232 selection.len = 0; 266 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 267 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 268 selection.screen = PRIMARY;
235 selection.clicks = 0; 269 selection.clicks = 0;
270 selection.clip_text = NULL;
271 selection.clip_len = 0;
236 } 272 }
237 else 273 else
238 { 274 {
239 /* 275 /*
240 * add or delete rows as appropriate 276 * add or delete rows as appropriate
241 */ 277 */
242 278
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--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
261 { 280 {
262 lresize (drawn_buf[row]); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 283
266 for (int row = prev_nrow; row < nrow; row++) 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267 { 288 }
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 289
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
278 293
279 if (top_row) 294 if (top_row)
280 { 295 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 296 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 297 // to come up with a lean and mean algorithm.
298 // TODO: maybe optimise when width didn't change
283 299
284 row_col_t ocur = screen.cur; 300 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 302
287 do 303 do
288 { 304 {
289 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 307 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
295 309
296 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297 { 311 {
298 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
299 313
300 plines++; 314 plines++;
301 llen += prev_ncol; 315 llen += prev_ncol;
314 328
315 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
316 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
317 { 331 {
318 qline = row_buf + qrow; 332 qline = row_buf + qrow;
319 lalloc (*qline); 333 qline->alloc (); // redundant with next line
320 qline->l = ncol; 334 qline->l = ncol;
321 qline->is_longer (1); 335 qline->is_longer (1);
322 336
323 int qcol = 0; 337 int qcol = 0;
324 338
339 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
340 // least. 354 // least.
341 if (prow == ocur.row) 355 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
343 357
344 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
345 359
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 361
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
370 { 384 {
371 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
372 386
373 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
374 { 388 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
377 391
378 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
379 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
380 } 396 }
381 397
382 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386 400
387 term_start = 0; 401 term_start = 0;
388 } 402 }
389
390 free (old_buf);
391 delete old_ta;
392 delete old_ra;
393 403
394 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 406 }
397 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
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
410 * Free everything. That way malloc debugging can find leakage. 435 * Free everything. That way malloc debugging can find leakage.
411 */ 436 */
412void 437void
413rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
414{ 439{
415 if (row_buf) 440 free (chunk);
416 {
417 delete talloc; talloc = 0;
418 delete ralloc; ralloc = 0;
419
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); 441 free (tabs);
426 tabs = 0;
427 }
428} 442}
429 443
430/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
431/* 445/*
432 * Hard/Soft reset 446 * Hard/Soft reset
433 */ 447 */
434void 448void
435rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
436{ 450{
437 scr_release (); 451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
438 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false;
439 scr_soft_reset (); 457 scr_soft_reset ();
440 scr_reset (); 458 scr_reset ();
441 459
442 scr_clear (true); 460 scr_clear (true);
443 scr_refresh (); 461 scr_refresh ();
444} 462}
445 463
446void 464void
447rxvt_term::scr_soft_reset () 465rxvt_term::scr_soft_reset () NOTHROW
448{ 466{
449 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
451 scr_overlay_off (); 469 scr_overlay_off ();
452#endif 470#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464 471
465 if (current_screen != PRIMARY) 472 if (current_screen != PRIMARY)
466 scr_swap_screen (); 473 scr_swap_screen ();
467 474
468 scr_scroll_region (0, MAX_ROWS - 1); 475 scr_scroll_region (0, MAX_ROWS - 1);
513 } 520 }
514 521
515 /* boundary check in case screen size changed between SAVE and RESTORE */ 522 /* boundary check in case screen size changed between SAVE and RESTORE */
516 min_it (s->cur.row, nrow - 1); 523 min_it (s->cur.row, nrow - 1);
517 min_it (s->cur.col, ncol - 1); 524 min_it (s->cur.col, ncol - 1);
518#ifdef DEBUG_STRICT
519 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
521#endif
522} 527}
523 528
524void 529void
525rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
526{ 531{
527 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
528 return; 533 return;
529 534
530 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
549 return; 554 return;
550 555
551 want_refresh = 1; 556 want_refresh = 1;
552 view_start = 0; 557 view_start = 0;
553 558
554 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
555 565
556 int i = current_screen; current_screen = scrn; scrn = i; 566 current_screen = scrn;
557 567
558#if NSCREENS 568#if NSCREENS
559 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
560 { 570 {
561 num_scr = 0; 571 num_scr = 0;
638 648
639 if (count > 0 649 if (count > 0
640 && row1 == 0 650 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
643 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 656
648 // sever bottommost line 657 // sever bottommost line
649 { 658 {
650 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
651 l.is_longer (0); 660 l.is_longer (0);
652 l.touch (); 661 l.touch ();
653 } 662 }
654 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
655 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 680 for (int i = count; i--; )
657 { 681 {
658 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
659 683
660 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 685 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 687 {
664 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 689 l.l = 0;
667 } 691 }
668 else 692 else
669 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
670 } 694 }
671 695
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 696 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
686 { 699 {
687 selection.beg.row -= count; 700 selection.beg.row -= count;
688 selection.end.row -= count; 701 selection.end.row -= count;
689 selection.mark.row -= count; 702 selection.mark.row -= count;
690 703
691 if (selection.beg.row < top_row 704 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 705 }
699 706
700 // finally move the view window, if desired 707 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 709 && view_start != 0
732 } 739 }
733 740
734 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
736 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
737 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
738 753
739 min_it (count, rows); 754 min_it (count, rows);
740 755
741 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 757
743 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
744 { 759 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 761
748 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 764 }
750 765
751 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
753 } 775 }
754 776
755 return count; 777 return count;
756} 778}
757 779
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 786{
765 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
766 return; 788 return;
767 789
768 unsigned char checksel; 790 bool checksel;
769 unicode_t c; 791 unicode_t c;
770 int ncol = this->ncol; 792 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
772 794
773 want_refresh = 1; 795 want_refresh = 1;
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 808 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 809 screen.cur.row -= minlines;
788 } 810 }
789 } 811 }
790 812
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 813 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 814 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 815 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 816 int row = screen.cur.row;
797 817
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 818 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 819
800 line_t *line = &ROW(row); 820 line_t *line = &ROW(row);
801 821
802 while (str < strend) 822 while (str < strend)
803 { 823 {
804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805 825
806 if (expect_false (c < 0x20)) 826 if (ecb_unlikely (c < 0x20))
807 if (c == C0_LF) 827 if (c == C0_LF)
808 { 828 {
809 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
810 830
811 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
830 { 850 {
831 scr_tab (1, true); 851 scr_tab (1, true);
832 continue; 852 continue;
833 } 853 }
834 854
835 if (expect_false ( 855 if (ecb_unlikely (
836 checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 )) 859 ))
840 { 860 {
845 * should be a similar check. 865 * should be a similar check.
846 */ 866 */
847 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
848 } 868 }
849 869
850 if (expect_false (screen.flags & Screen_WrapNext)) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
851 { 871 {
852 scr_do_wrap (); 872 scr_do_wrap ();
853 873
854 line->l = ncol; 874 line->l = ncol;
855 line->is_longer (1); 875 line->is_longer (1);
857 row = screen.cur.row; 877 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
859 } 879 }
860 880
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863 c = 0xfffd; 883 c = 0xfffd;
864 884
865 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
866 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
867 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
868 // locale. 888 // locale.
869 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
870 890
871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872 { 892 {
873 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 894 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
889 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
890 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
891 } 911 }
892 } 912 }
893 913
894 if (expect_false (screen.flags & Screen_Insert)) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
895 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
896 916
897 if (width != 0) 917 if (width != 0)
898 { 918 {
899#if !UNICODE_3 919#if !UNICODE_3
904# else 924# else
905 c = 0xfffd; 925 c = 0xfffd;
906# endif 926# endif
907#endif 927#endif
908 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
909 // nuke the character at this position, if required 945 // nuke the character at this position, if required
910 if (expect_false ( 946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
911 line->t[screen.cur.col] == NOCHAR 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
912 || (screen.cur.col < ncol - 1
913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col); 950 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921 {
922 // ... artificially enlargen the previous one
923 c = NOCHAR;
924 // and try the same character next loop iteration
925 --str;
926 }
927 951
928 line->touch (); 952 line->touch ();
929 953
930 do 954 do
931 { 955 {
932 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
934 958
935 if (expect_true (screen.cur.col < ncol - 1)) 959 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 960 screen.cur.col++;
937 else 961 else
938 { 962 {
939 line->l = ncol; 963 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
942 break; 966
967 goto end_of_line;
943 } 968 }
944 969
945 c = NOCHAR; 970 c = NOCHAR;
946 } 971 }
947 while (expect_false (--width > 0)); 972 while (ecb_unlikely (--width > 0));
948 973
949 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951 { 976 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 977 line->t[c] = ' ';
957 line->r[c] = rend; 978 line->r[c] = rend;
958 }
959 } 979 }
980
981end_of_line:
982 ;
960 } 983 }
961#if ENABLE_COMBINING 984#if ENABLE_COMBINING
962 else // width == 0 985 else // width == 0
963 { 986 {
964 if (c != 0xfeff) // ignore BOM 987 if (c != 0xfeff) // ignore BOM
1004#endif 1027#endif
1005 } 1028 }
1006 1029
1007 max_it (line->l, screen.cur.col); 1030 max_it (line->l, screen.cur.col);
1008 1031
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1032 assert (screen.cur.row >= 0);
1011#endif
1012} 1033}
1013 1034
1014/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1015/* 1036/*
1016 * Process Backspace. Move back the cursor back a position, wrap if have to 1037 * Process Backspace. Move back the cursor back a position, wrap if have to
1029 1050
1030 want_refresh = 1; 1051 want_refresh = 1;
1031#endif 1052#endif
1032 } 1053 }
1033 } 1054 }
1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1034 else 1057 else
1035 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1036} 1059}
1037 1060
1038/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
1294 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1295} 1318}
1296 1319
1297/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1298/* 1321/*
1299 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1326 */
1304void 1327void
1313 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1314 1337
1315 switch (mode) 1338 switch (mode)
1316 { 1339 {
1317 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1341 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1343 num = nrow - row;
1322 break; 1344 break;
1323 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1346 scr_erase_line (1);
1326 row = 0; 1347 row = 0;
1327 num = screen.cur.row; 1348 num = screen.cur.row;
1328 break; 1349 break;
1329 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1351 row = 0;
1332 num = nrow; 1352 num = nrow;
1333 break; 1353 break;
1334 default: 1354 default:
1335 return; 1355 return;
1344 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1345 return; 1365 return;
1346 1366
1347 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1348 1368
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1372 {
1354 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1355 1374
1356 if (mapped) 1375 if (mapped)
1357 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1360 } 1379 }
1361 else 1380 else
1362 { 1381 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1383
1384 if (mapped)
1385 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1389 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1390 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1394 }
1373 } 1395 }
1374 1396
1375 for (; num--; row++) 1397 for (; num--; row++)
1376 { 1398 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1400
1401 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1403 }
1380} 1404}
1381 1405
1382#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1383void 1407void
1402 1426
1403 want_refresh = 1; 1427 want_refresh = 1;
1404 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1405 1429
1406 num_scr_allow = 0; 1430 num_scr_allow = 0;
1407 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1408 1436
1409 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1410 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1411 { 1439 {
1412 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
1536 { 1564 {
1537 line->t[col] = line->t[col + count]; 1565 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1566 line->r[col] = line->r[col + count];
1539 } 1567 }
1540 1568
1541 scr_blank_line (*line, ncol - count, count, 1569 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1570
1544 if (selection.op && current_screen == selection.screen 1571 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1572 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1573 {
1547 if (selection.end.row != screen.cur.row 1574 if (selection.end.row != screen.cur.row
1683 { 1710 {
1684 rvideo_state = on; 1711 rvideo_state = on;
1685 1712
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1689#endif 1716#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1718
1692 XGCValues gcvalue; 1719 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1864 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1865 {
1839 min_it (rc[i].col, ncol - 1); 1866 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1867 min_it (rc[i].row, nrow - 1);
1841 } 1868 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1869
1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1870 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1871 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1845 1872
1846 num_scr_allow = 0; 1873 num_scr_allow = 0;
1847 1874
1854 * Refresh the entire screen 1881 * Refresh the entire screen
1855 */ 1882 */
1856void 1883void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1885{
1859 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1887}
1861 1888
1862/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1863/* 1890/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
1920 1947
1921# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1924# endif 1951# endif
1925 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1926# endif 1953# endif
1927 1954
1928# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1957 set_urgency (1);
1938 1965
1939 bell_ev.start (VISUAL_BELL_DURATION); 1966 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1967 }
1941 else 1968 else
1942 XBell (dpy, 0); 1969 XBell (dpy, 0);
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1971#endif
1944} 1972}
1945 1973
1946/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */
1948void 1975void
1949rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950{ 1977{
1951#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1952 int nrows, row_start; 1979 int nrows, row_start;
1966 row_start = view_start; 1993 row_start = view_start;
1967 } 1994 }
1968 1995
1969 wctomb (0, 0); 1996 wctomb (0, 0);
1970 1997
1971 for (int r1 = 0; r1 < nrows; r1++) 1998 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1999 {
1973 text_t *tp = ROW(r1).t; 2000 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 2001 int len = ROW(r1).l;
1975 2002
1976 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2003 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
2005 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2033 */
2007void 2034void
2008rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2009{ 2036{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2039 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2040#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2041 rend_t cc1; /* store colours at cursor position (s) */
2027 /* 2052 /*
2028 * A: set up vars 2053 * A: set up vars
2029 */ 2054 */
2030 refresh_count = 0; 2055 refresh_count = 0;
2031 2056
2057 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2058 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
2035#endif 2061#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2063
2038 /* 2064 /*
2039 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2040 */ 2066 */
2041 scr_reverse_selection (); 2067 scr_reverse_selection ();
2042 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
2043 /* 2076 /*
2044 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2045 */ 2078 */
2046 { 2079 {
2047 unsigned char setoldcursor; 2080 bool setoldcursor;
2048 2081
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2083 if (hidden_cursor)
2052 showcursor = 0; 2084 showcursor = 0;
2053#endif 2085#endif
2054 2086
2082 ccol2 = bgcolor_of (rstyle); 2114 ccol2 = bgcolor_of (rstyle);
2083#else 2115#else
2084 ccol2 = Color_bg; 2116 ccol2 = Color_bg;
2085#endif 2117#endif
2086 2118
2087 if (showcursor && focus) 2119 if (focus)
2088 { 2120 {
2089 if (option (Opt_cursorUnderline)) 2121 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2122 *crp ^= RS_Uline;
2091 else 2123 else
2092 { 2124 {
2127 oldcursor.col = screen.cur.col; 2159 oldcursor.col = screen.cur.col;
2128 } 2160 }
2129 } 2161 }
2130 } 2162 }
2131 2163
2132 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133#if ENABLE_OVERLAY
2134 scr_swap_overlay ();
2135#endif
2136
2137#ifndef NO_SLOW_LINK_SUPPORT 2164#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2165 /*
2139 * D: CopyArea pass - very useful for slower links 2166 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2167 * This has been deliberately kept simple.
2141 */ 2168 */
2145 { 2172 {
2146 int16_t nits; 2173 int16_t nits;
2147 int i = num_scr; 2174 int i = num_scr;
2148 int j; 2175 int j;
2149 int len, wlen; 2176 int len, wlen;
2150 dLocal (int, num_scr);
2151 2177
2152 j = nrow; 2178 j = nrow;
2153 wlen = len = -1; 2179 wlen = len = -1;
2154 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2155 2181
2230 continue; 2256 continue;
2231 2257
2232 // redraw one or more characters 2258 // redraw one or more characters
2233 2259
2234 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236 --col; 2262 --col;
2237 2263
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2265 text_t *text = stp + col;
2240 int count = 1; 2266 int count = 1;
2241 2267
2242 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2243 drp[col] = rend; 2269 drp[col] = rend;
2247 for (i = 0; ++col < ncol; ) 2273 for (i = 0; ++col < ncol; )
2248 { 2274 {
2249 if (stp[col] == NOCHAR) 2275 if (stp[col] == NOCHAR)
2250 { 2276 {
2251 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2252 drp[col] = rend; 2278 drp[col] = srp[col];
2279
2253 count++; 2280 count++;
2254 i++; 2281 i++;
2255 2282
2256 continue; 2283 continue;
2257 } 2284 }
2277 2304
2278 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2280 2307
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2310 count++, i--;
2284 2311
2285 /* 2312 /*
2286 * Determine the attributes for the string 2313 * Determine the attributes for the string
2287 */ 2314 */
2288 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2290 2317
2291 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2292 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2320 {
2294 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2295 2322
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
2316 2343
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2344 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2345 fore = Color_UL;
2319#endif 2346#endif
2320 2347
2348#ifdef OPTION_HC
2349 if (rend & RS_Sel)
2350 {
2351 /* invert the column if no highlightColor is set or it is the
2352 * current cursor column */
2353 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2354 && ISSET_PIXCOLOR (Color_HC))
2355 {
2356 if (ISSET_PIXCOLOR (Color_HTC))
2357 fore = Color_HTC;
2358 // if invert is 0 reverse video is set so we use bg color as fg color
2359 else if (!invert)
2360 fore = back;
2361
2362 back = Color_HC;
2363 invert = 0;
2364 }
2365 }
2366#endif
2367
2321 if (invert) 2368 if (invert)
2322 { 2369 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2329 ::swap (fore, back); 2370 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2371
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2372#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2337 if (ISSET_PIXCOLOR (Color_RV))
2338 back = Color_RV;
2339# endif
2340 if (fore == back) 2373 if (fore == back)
2341 { 2374 {
2342 fore = Color_bg; 2375 fore = Color_bg;
2343 back = Color_fg; 2376 back = Color_fg;
2344 } 2377 }
2380 /* 2413 /*
2381 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2382 */ 2415 */
2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2417
2385 if (expect_true (have_bg && back == Color_bg)) 2418 if (ecb_likely (have_bg && back == Color_bg))
2386 { 2419 {
2387 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2388 2421
2389 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2390 if (text[i] != ' ') 2423 if (text[i] != ' ')
2397 did_clear: ; 2430 did_clear: ;
2398 } 2431 }
2399 else 2432 else
2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401 2434
2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403 { 2436 {
2404#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2405 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2406 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407 else 2440 else
2412 xpixel, ypixel + font->ascent + 1, 2445 xpixel, ypixel + font->ascent + 1,
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2446 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2447 }
2415 } /* for (col....) */ 2448 } /* for (col....) */
2416 } /* for (row....) */ 2449 } /* for (row....) */
2417
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2450
2423 /* 2451 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2452 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2453 */
2426 if (showcursor) 2454 if (showcursor)
2458 2486
2459 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2460 Col2Pixel (col), 2488 Col2Pixel (col),
2461 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2462 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2464 } 2492 }
2465 } 2493 }
2466 2494
2467 /* 2495 /*
2468 * H: cleanup selection 2496 * H: cleanup selection
2469 */ 2497 */
2498#if ENABLE_OVERLAY
2499 scr_swap_overlay ();
2500#endif
2501 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2502
2470 scr_reverse_selection (); 2503 scr_reverse_selection ();
2471 2504
2505 screen.flags = old_screen_flags;
2472 num_scr = 0; 2506 num_scr = 0;
2473 num_scr_allow = 1; 2507 num_scr_allow = 1;
2474} 2508}
2475 2509
2476void 2510void
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2478{ 2512{
2479 if (!l.t) 2513 if (!l.valid ())
2480 return; 2514 return;
2481 2515
2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2483 2517
2484 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2497 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2498 } 2532 }
2499} 2533}
2500 2534
2501void 2535void
2502rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2537{
2538 bool transparent = false;
2539
2504#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2541 if (bg_pixmap != None)
2506#else 2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2557 }
2558 else
2559#endif
2560 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2564
2565 XClearWindow (dpy, parent);
2511 2566
2512 if (scrollBar.win) 2567 if (scrollBar.win)
2513 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2574 scrollBar.show (0);
2517 } 2575 }
2518 2576
2519#endif 2577 if (refresh)
2520 2578 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2579 scr_clear ();
2523 scr_touch (true); 2580 scr_touch (true);
2581 }
2524 want_refresh = 1; 2582 want_refresh = 1;
2525} 2583}
2526 2584
2527/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2528void 2586void
2596 { 2654 {
2597#if !ENABLE_MINIMAL 2655#if !ENABLE_MINIMAL
2598 if (selection.rect) 2656 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2657 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2658 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2659 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2660 else
2603#endif 2661#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2662 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2663 selection.end.row, selection.end.col,
2606 RS_RVid); 2664 RS_Sel | RS_RVid);
2607 } 2665 }
2608} 2666}
2609 2667
2610/* ------------------------------------------------------------------------- */ 2668/* ------------------------------------------------------------------------- */
2611/* 2669/*
2614 */ 2672 */
2615#if 0 2673#if 0
2616void 2674void
2617rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2676{
2619 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2621 char r1[] = "\n";
2622
2623 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++)
2625 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2627 : ncol;
2628 for (towrite = width; towrite; towrite -= wrote)
2629 {
2630 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631 towrite);
2632 if (wrote < 0)
2633 return; /* XXX: death, no report */
2634 }
2635 if (row_buf[row].l >= 0)
2636 if (write (fd, r1, 1) <= 0)
2637 return; /* XXX: death, no report */
2638 }
2639} 2679}
2640#endif 2680#endif
2641 2681
2642/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2645void 2685void
2646rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2687{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2688 if (!selection.op)
2651 return; 2689 return;
2652 2690
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2694 || (check_more == 1
2658 && current_screen == selection.screen 2695 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2670} 2699}
2671 2700
2672/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2673/* 2702/*
2674 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2675 */ 2704 */
2676void 2705void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2707{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2711 data[i] = C0_CR;
2683 2712
2684 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2686 2715
2687 tt_write (data, len); 2716 tt_write (data, len);
2688 2717
2689 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2691} 2720}
2692 2721
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2722void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2724{
2701 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2726 return;
2876 2727
2877 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2878} 2729}
2879 2730
2880/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2881/* 2732/*
2882 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2736 * EXT: button 2 release
2889 */ 2737 */
2890void 2738void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2740{
2893 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2742 {
2901 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2902 { 2745 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2746}
2944 2747
2945/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2946/* 2749/*
2947 * Clear all selected text 2750 * Clear all selected text
2948 * EXT: SelectionClear 2751 * EXT: SelectionClear
2949 */ 2752 */
2950void 2753void
2951rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2755{
2756 if (!clipboard)
2757 {
2953 want_refresh = 1; 2758 want_refresh = 1;
2954 free (selection.text); 2759 free (selection.text);
2955 selection.text = NULL; 2760 selection.text = NULL;
2956 selection.len = 0; 2761 selection.len = 0;
2957 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2958 2763
2959 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2960 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2961} 2776}
2962 2777
2963/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2964/* 2779/*
2965 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2966 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2967 */ 2782 */
2968void 2783void
2969rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2970{ 2785{
2971 int i; 2786 int size;
2972 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2973 text_t *t; 2788 text_t *t;
2974 2789
2975 switch (selection.op) 2790 switch (selection.op)
2976 { 2791 {
2992 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2993 2808
2994 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995 return; 2810 return;
2996 2811
2997 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999 2814
3000 int ofs = 0; 2815 int ofs = 0;
3001 int extra = 0; 2816 int extra = 0;
3002 2817
3003 int col = selection.beg.col; 2818 int col = selection.beg.col;
3009 { 2824 {
3010#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3011 if (selection.rect) 2826 if (selection.rect)
3012 { 2827 {
3013 col = selection.beg.col; 2828 col = selection.beg.col;
3014 end_col = ncol + 1; 2829 end_col = selection.end.col;
3015 } 2830 }
3016 else 2831 else
3017#endif 2832#endif
3018 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3019 2834
3020 col = max (col, 0); 2835 col = max (col, 0);
3021 2836
3022 if (row == selection.end.row 2837 if (row == selection.end.row)
3023#if !ENABLE_MINIMAL
3024 || selection.rect
3025#endif
3026 )
3027 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3028 2839
3029 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3030 2841
3031 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
3039 2850
3040 extra -= (len - 1); 2851 extra -= (len - 1);
3041 2852
3042 if (extra < 0) 2853 if (extra < 0)
3043 { 2854 {
3044 extra += i; 2855 extra += size;
3045 i += i; 2856 size += size;
3046 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047 } 2858 }
3048 2859
3049 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050 } 2861 }
3051#endif 2862#endif
3063 2874
3064 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3065 } 2876 }
3066 else 2877 else
3067#endif 2878#endif
3068 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3069 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3070 } 2883 }
3071
3072 if (end_col != selection.end.col)
3073 new_selection_text[ofs++] = C0_LF;
3074 2884
3075 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3076 2886
3077 if (ofs == 0) 2887 if (ofs == 0)
3078 { 2888 {
3091 2901
3092 selection_grab (tm); 2902 selection_grab (tm);
3093} 2903}
3094 2904
3095bool 2905bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3098 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3099 2920
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 2923 {
3103 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3104 return true; 2925 return true;
3105 } 2926 }
3106 else 2927 else
3107 { 2928 {
3108 selection_clear (); 2929 selection_clear (clipboard);
3109 return false; 2930 return false;
3110 } 2931 }
3111 2932
3112#if 0 2933#if 0
3113 XTextProperty ct; 2934 XTextProperty ct;
3573 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3574 */ 3395 */
3575void 3396void
3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3578 XSelectionEvent ev; 3400 XSelectionEvent ev;
3579 3401
3580 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3581 ev.property = None; 3403 ev.property = None;
3582 ev.display = rq.display; 3404 ev.display = rq.display;
3597 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3598#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3599 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3600#endif 3422#endif
3601 3423
3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603 32, PropModeReplace, 3425 32, PropModeReplace,
3604 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3605 ev.property = rq.property; 3427 ev.property = property;
3606 } 3428 }
3607#if TODO // TODO 3429#if TODO // TODO
3608 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3431 {
3610 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3611 } 3433 }
3612#endif 3434#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3436 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3618 } 3446 }
3619 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3622 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
3654 { 3482 {
3655 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3484 style = enc_compound_text;
3657 } 3485 }
3658 3486
3659 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3488 {
3661 cl = selection.text; 3489 cl = selection.text;
3662 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3663 } 3496 }
3664 else 3497 else
3665 { 3498 {
3666 cl = L""; 3499 cl = L"";
3667 selectlen = 0; 3500 selectlen = 0;
3688 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3689 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3690 ct.encoding = target; 3523 ct.encoding = target;
3691 } 3524 }
3692 3525
3693 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3694 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3695 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3696 ev.property = rq.property; 3529 ev.property = property;
3697 3530
3698 if (freect) 3531 if (freect)
3699 XFree (ct.value); 3532 XFree (ct.value);
3700 } 3533 }
3701 3534
3735 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3736 3569
3737 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3739 3572
3740 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3742 3575
3743 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3745 3578
3746 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3747 { 3580 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3583
3751 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3753 3586
3754 if (y == 0) 3587 if (y == 0)
3773} 3606}
3774 3607
3775void 3608void
3776rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3777{ 3610{
3778 if (!ov_text) 3611 if (!ov.text)
3779 return; 3612 return;
3780 3613
3781 want_refresh = 1; 3614 want_refresh = 1;
3782 3615
3783 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3784 { 3617 {
3785 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3787 } 3620 }
3788 3621
3789 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3791} 3624}
3792 3625
3793void 3626void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3628{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3630 return;
3798 3631
3799 x++, y++; 3632 x++, y++;
3800 3633
3801 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3803} 3636}
3804 3637
3805void 3638void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3640{
3826} 3659}
3827 3660
3828void 3661void
3829rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3663{
3831 if (!ov_text) 3664 if (!ov.text)
3832 return; 3665 return;
3833 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3834 // swap screen mem with overlay 3672 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3836 { 3674 {
3837 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3839 3677
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3680
3843 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3844 { 3682 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3685 }
3848 } 3686 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines