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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
130{ 127{
131 scr_blank_line (l, 0, ncol, efs); 128 scr_blank_line (l, 0, ncol, efs);
132 129
133 l.l = 0; 130 l.l = 0;
134 l.f = 0; 131 l.f = 0;
132}
133
134// nuke a single wide character at the given column
135void
136rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
137{
138 // find begin
139 while (col > 0 && l.t[col] == NOCHAR)
140 col--;
141
142 rend_t rend = l.r[col] & ~RS_baseattrMask;
143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
146
147 // found start, nuke
148 do {
149 l.t[col] = ' ';
150 l.r[col] = rend;
151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR);
153}
154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
135} 163}
136 164
137/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
140 168
141void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
142rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
143{ 215{
144#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
145 scr_overlay_off (); 217 scr_overlay_off ();
146#endif 218#endif
147 219
148 rvideo_mode = false;
149 view_start = 0; 220 view_start = 0;
150 num_scr = 0; 221 num_scr = 0;
151 222
152 if (ncol == 0) 223 if (ncol == 0)
153 ncol = 80; 224 ncol = 80;
… …
155 if (nrow == 0) 226 if (nrow == 0)
156 nrow = 24; 227 nrow = 24;
157 228
158 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 230 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 231
164 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
166 { 234 {
167 //TODO//FIXME 235 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
177 245
178 screen.tscroll = 0; 246 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
180 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
181 if (!row_buf) 257 if (!prev_row_buf)
182 { 258 {
183 /* 259 /*
184 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 261 */
186 top_row = 0; 262 top_row = 0;
187 term_start = 0; 263 term_start = 0;
188
189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
191
192 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
193 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
195
196 for (int row = nrow; row--; )
197 {
198 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
199 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
200 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
201 }
202 264
203 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 282 selection.text = NULL;
221 selection.len = 0; 283 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 284 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 285 selection.screen = PRIMARY;
224 selection.clicks = 0; 286 selection.clicks = 0;
287 selection.clip_text = NULL;
288 selection.clip_len = 0;
225 } 289 }
226 else 290 else
227 { 291 {
228 /* 292 /*
229 * add or delete rows as appropriate 293 * add or delete rows as appropriate
230 */ 294 */
231 295
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 296 int common_col = min (prev_ncol, ncol);
233 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
234
235#if 0
236 if (nrow < prev_nrow)
237 {
238 for (int row = nrow; row < prev_nrow; row++)
239 {
240 lfree (swap_buf [row]);
241 lfree (drawn_buf[row]);
242 }
243 }
244#endif
245
246 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
247 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
248 297
249 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
250 { 299 {
251 lresize (drawn_buf[row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
253 } 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
254 303
255 for (int row = prev_nrow; row < nrow; row++) 304 copy_line (swap_buf [row], prev_swap_buf [row]);
256 { 305 }
257 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
259 }
260
261 line_t *old_buf = row_buf;
262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
263 306
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
267 310
268 if (top_row) 311 if (top_row)
269 { 312 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 313 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 314 // to come up with a lean and mean algorithm.
315 // TODO: maybe optimise when width didn't change
272 316
273 row_col_t ocur = screen.cur; 317 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 319
276 do 320 do
277 { 321 {
278 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 324 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 326
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 328 {
287 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
288 330
289 plines++; 331 plines++;
290 llen += prev_ncol; 332 llen += prev_ncol;
… …
303 345
304 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
306 { 348 {
307 qline = row_buf + qrow; 349 qline = row_buf + qrow;
308 lalloc (*qline); 350 qline->alloc (); // redundant with next line
309 qline->l = ncol; 351 qline->l = ncol;
310 qline->is_longer (1); 352 qline->is_longer (1);
311 353
312 int qcol = 0; 354 int qcol = 0;
313 355
… …
328 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
329 // least. 371 // least.
330 if (prow == ocur.row) 372 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
332 374
333 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
334 376
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 378
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 401 {
360 // if no scrollback exists (yet), wing, instead of wrap 402 // if no scrollback exists (yet), wing, instead of wrap
361 403
362 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
363 { 405 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 407 line_t &dst = row_buf [row];
366 408
367 qline = pline; 409 copy_line (dst, src);
368 lresize (qline);
369 } 410 }
370 411
371 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 414
376 term_start = 0; 415 term_start = 0;
377 } 416 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 417
383 clamp_it (screen.cur.row, 0, nrow - 1); 418 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 419 clamp_it (screen.cur.col, 0, ncol - 1);
420 }
385 421
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
386 free (tabs); 431 free (tabs);
387 } 432 tabs = (char *)rxvt_malloc (ncol);
433
434 for (int col = ncol; col--; )
435 tabs [col] = col % TABSIZE == 0;
388 436
389 CLEAR_ALL_SELECTION (); 437 CLEAR_ALL_SELECTION ();
390 438
391 prev_nrow = nrow; 439 prev_nrow = nrow;
392 prev_ncol = ncol; 440 prev_ncol = ncol;
393 441
394 tabs = (char *)rxvt_malloc (ncol); 442 tt_winch ();
395 443
396 for (int col = ncol; --col; ) 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 445}
446
447void ecb_cold
448rxvt_term::scr_release () NOTHROW
449{
450 chunk_free (chunk, chunk_size);
451 chunk = 0;
452 row_buf = 0;
453
454 free (tabs);
455 tabs = 0;
456}
457
458/* ------------------------------------------------------------------------- */
459/*
460 * Hard/Soft reset
461 */
462void ecb_cold
463rxvt_term::scr_poweron ()
464{
465 scr_release ();
466
467 prev_nrow = prev_ncol = 0;
468 rvideo_mode = false;
469 scr_soft_reset ();
470 scr_reset ();
471
472 scr_clear (true);
473 scr_refresh ();
474}
475
476void ecb_cold
477rxvt_term::scr_soft_reset () NOTHROW
478{
479 /* only affects modes, nothing drastic such as clearing the screen */
480#if ENABLE_OVERLAY
481 scr_overlay_off ();
482#endif
398 483
399 if (current_screen != PRIMARY) 484 if (current_screen != PRIMARY)
400 scr_swap_screen (); 485 scr_swap_screen ();
401 486
402 tt_winch (); 487 scr_scroll_region (0, MAX_ROWS - 1);
403 488 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 489 scr_insert_mode (0);
405}
406
407/* ------------------------------------------------------------------------- */
408/*
409 * Free everything. That way malloc debugging can find leakage.
410 */
411void
412rxvt_term::scr_release () NOTHROW
413{
414 if (row_buf)
415 {
416 delete talloc; talloc = 0;
417 delete ralloc; ralloc = 0;
418
419 free (row_buf);
420 free (swap_buf);
421 free (drawn_buf);
422 free (tabs);
423
424 row_buf = 0; // signal that we freed all the arrays
425 }
426}
427
428/* ------------------------------------------------------------------------- */
429/*
430 * Hard reset
431 */
432void
433rxvt_term::scr_poweron ()
434{
435 scr_release ();
436 prev_nrow = prev_ncol = 0;
437 scr_reset ();
438
439 scr_clear (true);
440 scr_refresh ();
441} 490}
442 491
443/* ------------------------------------------------------------------------- * 492/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 493 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 494 * ------------------------------------------------------------------------- */
… …
483 } 532 }
484 533
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 534 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 535 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 536 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
491#endif
492} 539}
493 540
494void 541void
495rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () NOTHROW
496{ 543{
497 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
498 return; 545 return;
499 546
500 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
519 return; 566 return;
520 567
521 want_refresh = 1; 568 want_refresh = 1;
522 view_start = 0; 569 view_start = 0;
523 570
524 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
525 577
526 int i = current_screen; current_screen = scrn; scrn = i; 578 current_screen = scrn;
527 579
528#if NSCREENS 580#if NSCREENS
529 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
530 { 582 {
531 num_scr = 0; 583 num_scr = 0;
… …
595/* 647/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 649 * count positive ==> scroll up
598 * count negative ==> scroll down 650 * count negative ==> scroll down
599 */ 651 */
600int 652int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 654{
603 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
604 return 0; 656 return 0;
605 657
… …
608 660
609 if (count > 0 661 if (count > 0
610 && row1 == 0 662 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
613 top_row = max (top_row - count, -saveLines); 667 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 668
618 // sever bottommost line 669 // sever bottommost line
619 { 670 {
620 line_t &l = ROW(row2 - count); 671 line_t &l = ROW(row2);
621 l.is_longer (0); 672 l.is_longer (0);
622 l.touch (); 673 l.touch ();
623 } 674 }
624 675
676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
625 // erase newly scrolled-in lines 691 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 692 for (int i = count; i--; )
627 { 693 {
628 line_t &l = ROW(nrow - 1 - i); 694 line_t &l = ROW(row2 - i);
629 695
630 // optimize if already cleared, can be significant on slow machines 696 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 697 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 699 {
634 scr_blank_line (l, 0, l.l, rstyle); 700 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 701 l.l = 0;
… …
637 } 703 }
638 else 704 else
639 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
640 } 706 }
641 707
642 // now copy lines below the scroll region bottom to the
643 // bottom of the screen again, so they look as if they
644 // hadn't moved.
645 for (int i = nrow; --i > row2; )
646 {
647 line_t &l1 = ROW(i - count);
648 line_t &l2 = ROW(i);
649
650 ::swap (l1, l2);
651 l2.touch ();
652 }
653
654 // move and/or clear selection, if any 708 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
656 { 711 {
657 selection.beg.row -= count; 712 selection.beg.row -= count;
658 selection.end.row -= count; 713 selection.end.row -= count;
659 selection.mark.row -= count; 714 selection.mark.row -= count;
660 715
661 if (selection.beg.row < top_row 716 selection_check (0);
662 || selection.end.row < top_row
663 || selection.mark.row < top_row)
664 {
665 CLEAR_ALL_SELECTION ();
666 selection.op = SELECTION_CLEAR;
667 }
668 } 717 }
669 718
670 // finally move the view window, if desired 719 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 721 && view_start != 0
… …
702 } 751 }
703 752
704 // use a simple and robust scrolling algorithm, this 753 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 754 // part of scr_scroll_text is not time-critical.
706 755
756 // sever line above scroll region
757 if (row1)
758 {
759 line_t &l = ROW(row1 - 1);
760 l.is_longer (0);
761 l.touch ();
762 }
763
707 int rows = row2 - row1 + 1; 764 int rows = row2 - row1 + 1;
708 765
709 min_it (count, rows); 766 min_it (count, rows);
710 767
711 line_t *temp_buf = row_buf + total_rows; 768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 769
713 for (int row = 0; row < rows; row++) 770 for (int row = 0; row < rows; row++)
714 { 771 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 773
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 775 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 776 }
720 777
721 for (int row = 0; row < rows; row++) 778 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
786 }
723 } 787 }
724 788
725 return count; 789 return count;
726} 790}
727 791
728/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
729/* 793/*
730 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
731 */ 795 */
732void 796void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 798{
735 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
736 return; 800 return;
737 801
738 unsigned char checksel; 802 bool checksel;
739 unicode_t c; 803 unicode_t c;
740 int ncol = this->ncol; 804 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
742 806
743 want_refresh = 1; 807 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 820 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 821 screen.cur.row -= minlines;
758 } 822 }
759 } 823 }
760 824
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 825 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 826 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 827 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 828 int row = screen.cur.row;
767 829
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 830 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 831
770 line_t *line = &ROW(row); 832 line_t *line = &ROW(row);
771 833
772 while (str < strend) 834 while (str < strend)
773 { 835 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 837
776 if (expect_false (c < 0x20)) 838 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 839 if (c == C0_LF)
778 { 840 {
779 max_it (line->l, screen.cur.col); 841 max_it (line->l, screen.cur.col);
780 842
781 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
… …
800 { 862 {
801 scr_tab (1, true); 863 scr_tab (1, true);
802 continue; 864 continue;
803 } 865 }
804 866
805 if (expect_false ( 867 if (ecb_unlikely (
806 checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
809 )) 871 ))
810 { 872 {
… …
815 * should be a similar check. 877 * should be a similar check.
816 */ 878 */
817 CLEAR_SELECTION (); 879 CLEAR_SELECTION ();
818 } 880 }
819 881
820 if (expect_false (screen.flags & Screen_WrapNext)) 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
821 { 883 {
822 scr_do_wrap (); 884 scr_do_wrap ();
823 885
824 line->l = ncol; 886 line->l = ncol;
825 line->is_longer (1); 887 line->is_longer (1);
… …
827 row = screen.cur.row; 889 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 890 line = &ROW(row); /* _must_ refresh */
829 } 891 }
830 892
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
833 c = 0xfffd; 895 c = 0xfffd;
834 896
835 // rely on wcwidth to tell us the character width, do wcwidth before 897 // rely on wcwidth to tell us the character width, do wcwidth before
836 // further replacements, as wcwidth might return -1 for the line 898 // further replacements, as wcwidth might return -1 for the line
837 // drawing characters below as they might be invalid in the current 899 // drawing characters below as they might be invalid in the current
838 // locale. 900 // locale.
839 int width = WCWIDTH (c); 901 int width = WCWIDTH (c);
840 902
841 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
842 { 904 {
843 // vt100 special graphics and line drawing 905 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 906 // 5f-7e standard vt100
845 // 40-5e rxvt extension for extra curses acs chars 907 // 40-5e rxvt extension for extra curses acs chars
846 static uint16_t vt100_0[62] = { // 41 .. 7e 908 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
859 c = vt100_0[c - 0x41]; 921 c = vt100_0[c - 0x41];
860 width = 1; // vt100 line drawing characters are always single-width 922 width = 1; // vt100 line drawing characters are always single-width
861 } 923 }
862 } 924 }
863 925
864 if (expect_false (screen.flags & Screen_Insert)) 926 if (ecb_unlikely (screen.flags & Screen_Insert))
865 scr_insdel_chars (width, INSERT); 927 scr_insdel_chars (width, INSERT);
866 928
867 if (width != 0) 929 if (width != 0)
868 { 930 {
869#if !UNICODE_3 931#if !UNICODE_3
… …
874# else 936# else
875 c = 0xfffd; 937 c = 0xfffd;
876# endif 938# endif
877#endif 939#endif
878 940
941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
942
943 // if the character doesn't fit into the remaining columns...
944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
945 {
946 if (screen.flags & Screen_Autowrap)
947 {
948 // ... artificially enlargen the previous one
949 c = NOCHAR;
950 // and try the same character next loop iteration
951 --str;
952 }
953 else
954 screen.cur.col = ncol - width;
955 }
956
879 // nuke the character at this position, if required 957 // nuke the character at this position, if required
880 if (expect_false ( 958 // due to wonderful coincidences everywhere else in this loop
959 // we never have to check for overwriting a wide char itself,
960 // only its tail.
881 line->t[screen.cur.col] == NOCHAR 961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 962 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 963
913 line->touch (); 964 line->touch ();
914 965
915 do 966 do
916 { 967 {
917 line->t[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
919 970
920 if (expect_true (screen.cur.col < ncol - 1)) 971 if (ecb_likely (screen.cur.col < ncol - 1))
921 screen.cur.col++; 972 screen.cur.col++;
922 else 973 else
923 { 974 {
924 line->l = ncol; 975 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 977 screen.flags |= Screen_WrapNext;
927 break; 978
979 goto end_of_line;
928 } 980 }
929 981
930 c = NOCHAR; 982 c = NOCHAR;
931 } 983 }
932 while (expect_false (--width > 0)); 984 while (ecb_unlikely (--width > 0));
933 985
934 // pad with spaces when overwriting wide character with smaller one 986 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
936 { 988 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 989 line->t[c] = ' ';
942 line->r[c] = rend; 990 line->r[c] = rend;
943 }
944 } 991 }
992
993end_of_line:
994 ;
945 } 995 }
946#if ENABLE_COMBINING 996#if ENABLE_COMBINING
947 else // width == 0 997 else // width == 0
948 { 998 {
949 if (c != 0xfeff) // ignore BOM 999 if (c != 0xfeff) // ignore BOM
… …
989#endif 1039#endif
990 } 1040 }
991 1041
992 max_it (line->l, screen.cur.col); 1042 max_it (line->l, screen.cur.col);
993 1043
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1044 assert (screen.cur.row >= 0);
996#endif
997} 1045}
998 1046
999/* ------------------------------------------------------------------------- */ 1047/* ------------------------------------------------------------------------- */
1000/* 1048/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1049 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1062
1015 want_refresh = 1; 1063 want_refresh = 1;
1016#endif 1064#endif
1017 } 1065 }
1018 } 1066 }
1067 else if (screen.flags & Screen_WrapNext)
1068 screen.flags &= ~Screen_WrapNext;
1019 else 1069 else
1020 scr_gotorc (0, -1, RELATIVE); 1070 scr_gotorc (0, -1, RELATIVE);
1021} 1071}
1022 1072
1023/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
… …
1101 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1104 */ 1154 */
1105#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1106void 1156void ecb_cold
1107rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1108{ 1158{
1109 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1111 else 1161 else
… …
1118 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1121 */ 1171 */
1122#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1123void 1173void ecb_cold
1124rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1125{ 1175{
1126 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1128 else 1178 else
… …
1279 scr_blank_line (line, col, num, rstyle); 1329 scr_blank_line (line, col, num, rstyle);
1280} 1330}
1281 1331
1282/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1283/* 1333/*
1284 * Erase part of whole of the screen 1334 * Erase part or whole of the screen
1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1288 */ 1338 */
1289void 1339void
… …
1298 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1299 1349
1300 switch (mode) 1350 switch (mode)
1301 { 1351 {
1302 case 0: /* erase to end of screen */ 1352 case 0: /* erase to end of screen */
1303 selection_check (1);
1304 scr_erase_line (0); 1353 scr_erase_line (0);
1305 row = screen.cur.row + 1; /* possible OOB */ 1354 row = screen.cur.row + 1; /* possible OOB */
1306 num = nrow - row; 1355 num = nrow - row;
1307 break; 1356 break;
1308 case 1: /* erase to beginning of screen */ 1357 case 1: /* erase to beginning of screen */
1309 selection_check (3);
1310 scr_erase_line (1); 1358 scr_erase_line (1);
1311 row = 0; 1359 row = 0;
1312 num = screen.cur.row; 1360 num = screen.cur.row;
1313 break; 1361 break;
1314 case 2: /* erase whole screen */ 1362 case 2: /* erase whole screen */
1315 selection_check (3);
1316 row = 0; 1363 row = 0;
1317 num = nrow; 1364 num = nrow;
1318 break; 1365 break;
1319 default: 1366 default:
1320 return; 1367 return;
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1376 if (row >= nrow) /* Out Of Bounds */
1330 return; 1377 return;
1331 1378
1332 min_it (num, nrow - row); 1379 min_it (num, nrow - row);
1333 1380
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1381 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1382 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1383 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1384 {
1339 ren = DEFAULT_RSTYLE; 1385 ren = DEFAULT_RSTYLE;
1340 1386
1341 if (mapped) 1387 if (mapped)
1342 XClearArea (dpy, vt, 0, 1388 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1389 Row2Pixel (row - view_start), (unsigned int)vt_width,
1344 (unsigned int)Height2Pixel (num), False); 1390 (unsigned int)Height2Pixel (num), False);
1345 } 1391 }
1346 else 1392 else
1347 { 1393 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1394 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1395
1396 if (mapped)
1397 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1398 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1400 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1401 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1402 (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num)); 1403 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1404 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1405 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1406 }
1358 } 1407 }
1359 1408
1360 for (; num--; row++) 1409 for (; num--; row++)
1361 { 1410 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1411 scr_blank_screen_mem (ROW(row), rstyle);
1412
1413 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1414 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1415 }
1365} 1416}
1366 1417
1367#if !ENABLE_MINIMAL 1418#if !ENABLE_MINIMAL
1368void 1419void
… …
1378/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1379/* 1430/*
1380 * Fill the screen with `E's 1431 * Fill the screen with `E's
1381 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1382 */ 1433 */
1383void 1434void ecb_cold
1384rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1385{ 1436{
1386 rend_t fs; 1437 rend_t fs;
1387 1438
1388 want_refresh = 1; 1439 want_refresh = 1;
1389 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1390 1441
1391 num_scr_allow = 0; 1442 num_scr_allow = 0;
1392 selection_check (3); 1443
1444 row_col_t pos;
1445 pos.row = pos.col = 0;
1446 if (ROWCOL_IS_AFTER (selection.end, pos))
1447 CLEAR_SELECTION ();
1393 1448
1394 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1449 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1395 for (int row = nrow; row--; ) 1450 for (int row = nrow; row--; )
1396 { 1451 {
1397 line_t &line = ROW(row); 1452 line_t &line = ROW(row);
… …
1442 * Insert/Delete <count> characters from the current position 1497 * Insert/Delete <count> characters from the current position
1443 */ 1498 */
1444void 1499void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1500rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1501{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1502 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1503 ZERO_SCROLLBACK ();
1452 1504
1453 if (count <= 0) 1505 if (count <= 0)
1454 return; 1506 return;
… …
1456 scr_do_wrap (); 1508 scr_do_wrap ();
1457 1509
1458 selection_check (1); 1510 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1511 min_it (count, ncol - screen.cur.col);
1460 1512
1461 row = screen.cur.row; 1513 int row = screen.cur.row;
1462 1514
1463 line_t *line = &ROW(row); 1515 line_t *line = &ROW(row);
1464 1516
1465 line->touch (); 1517 line->touch ();
1466 line->is_longer (0); 1518 line->is_longer (0);
1467 1519
1520 // nuke wide spanning the start
1521 if (line->t[screen.cur.col] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col);
1523
1468 switch (insdel) 1524 switch (insdel)
1469 { 1525 {
1470 case INSERT: 1526 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1527 line->l = min (line->l + count, ncol);
1528
1529 if (line->t[screen.cur.col] == NOCHAR)
1530 scr_kill_char (*line, screen.cur.col);
1531
1532 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1533 {
1473 line->t[col] = line->t[col - count]; 1534 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1535 line->r[col] = line->r[col - count];
1475 } 1536 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1537
1479 if (selection.op && current_screen == selection.screen 1538 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1539 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1540 {
1482 if (selection.end.row != screen.cur.row 1541 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1556 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1557 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1558 selection_check (1);
1500 screen.cur.col -= count; 1559 screen.cur.col -= count;
1501 1560
1561 // nuke wide char after the end
1562 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1563 scr_kill_char (*line, screen.cur.col + count);
1564
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1565 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1566 break;
1504 1567
1505 case DELETE: 1568 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1569 line->l = max (line->l - count, 0);
1507 1570
1571 // nuke wide char spanning the end
1572 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1573 scr_kill_char (*line, screen.cur.col + count);
1574
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1575 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1576 {
1510 line->t[col] = line->t[col + count]; 1577 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1578 line->r[col] = line->r[col + count];
1512 } 1579 }
1513 1580
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1581 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1582
1517 if (selection.op && current_screen == selection.screen 1583 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1584 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1585 {
1520 if (selection.end.row != screen.cur.row 1586 if (selection.end.row != screen.cur.row
… …
1537/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1538/* 1604/*
1539 * Set the scrolling region 1605 * Set the scrolling region
1540 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1541 */ 1607 */
1542void 1608void ecb_cold
1543rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1544{ 1610{
1545 max_it (top, 0); 1611 max_it (top, 0);
1546 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1547 1613
… …
1557/* 1623/*
1558 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1559 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1560 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1561 */ 1627 */
1562void 1628void ecb_cold
1563rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1564{ 1630{
1565 want_refresh = 1; 1631 want_refresh = 1;
1566 1632
1567 if (mode) 1633 if (mode)
… …
1574/* 1640/*
1575 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1576 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1577 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1578 */ 1644 */
1579void 1645void ecb_cold
1580rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1581{ 1647{
1582 if (mode) 1648 if (mode)
1583 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1584 else 1650 else
… …
1593 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1594 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1595 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1596 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1597 */ 1663 */
1598void 1664void ecb_cold
1599rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1600{ 1666{
1601 if (mode) 1667 if (mode)
1602 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1603 else 1669 else
… …
1610/* 1676/*
1611 * Set insert/replace mode 1677 * Set insert/replace mode
1612 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1613 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1614 */ 1680 */
1615void 1681void ecb_cold
1616rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1617{ 1683{
1618 if (mode) 1684 if (mode)
1619 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1620 else 1686 else
… …
1626 * Set/Unset tabs 1692 * Set/Unset tabs
1627 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1628 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1629 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1630 */ 1696 */
1631void 1697void ecb_cold
1632rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1633{ 1699{
1634 if (mode < 0) 1700 if (mode < 0)
1635 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1636 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1655 if (rvideo_state != on) 1721 if (rvideo_state != on)
1656 { 1722 {
1657 rvideo_state = on; 1723 rvideo_state = on;
1658 1724
1659 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1660#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1661 if (bgPixmap.pixmap == None) 1727 if (bg_img == 0)
1662#endif 1728#endif
1663 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1664 1730
1665 XGCValues gcvalue; 1731 XGCValues gcvalue;
1666 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1675/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1676/* 1742/*
1677 * Report current cursor position 1743 * Report current cursor position
1678 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1679 */ 1745 */
1680void 1746void ecb_cold
1681rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1682{ 1748{
1683 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1684} 1750}
1685 1751
… …
1688 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1689 1755
1690/* 1756/*
1691 * Set font style 1757 * Set font style
1692 */ 1758 */
1693void 1759void ecb_cold
1694rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1695{ 1761{
1696#if 0 1762#if 0
1697 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1698 { 1764 {
… …
1720 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1721 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1722 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1723 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1724 */ 1790 */
1725void 1791void ecb_cold
1726rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1727{ 1793{
1728 screen.charset = set; 1794 screen.charset = set;
1729 set_font_style (); 1795 set_font_style ();
1730} 1796}
… …
1751 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1752 1818
1753/* 1819/*
1754 * refresh matching text. 1820 * refresh matching text.
1755 */ 1821 */
1756bool 1822bool ecb_cold
1757rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1758{ 1824{
1759 bool found = false; 1825 bool found = false;
1760 1826
1761 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1780 PART_BEG = 0, 1846 PART_BEG = 0,
1781 PART_END, 1847 PART_END,
1782 RC_COUNT 1848 RC_COUNT
1783}; 1849};
1784 1850
1785void 1851void ecb_hot
1786rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1787{ 1853{
1788 int i; 1854 int i;
1789 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1790 1856
… …
1810 for (i = PART_BEG; i < RC_COUNT; i++) 1876 for (i = PART_BEG; i < RC_COUNT; i++)
1811 { 1877 {
1812 min_it (rc[i].col, ncol - 1); 1878 min_it (rc[i].col, ncol - 1);
1813 min_it (rc[i].row, nrow - 1); 1879 min_it (rc[i].row, nrow - 1);
1814 } 1880 }
1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1881
1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1882 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1883 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1818 1884
1819 num_scr_allow = 0; 1885 num_scr_allow = 0;
1820 1886
… …
1827 * Refresh the entire screen 1893 * Refresh the entire screen
1828 */ 1894 */
1829void 1895void
1830rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) NOTHROW
1831{ 1897{
1832 scr_expose (0, 0, width, height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1833} 1899}
1834 1900
1835/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1836/* 1902/*
1837 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
… …
1893 1959
1894# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1895# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1896 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1897# endif 1963# endif
1898 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1899# endif 1965# endif
1900 1966
1901# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1902 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1903 set_urgency (1); 1969 set_urgency (1);
… …
1911 1977
1912 bell_ev.start (VISUAL_BELL_DURATION); 1978 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1979 }
1914 else 1980 else
1915 XBell (dpy, 0); 1981 XBell (dpy, 0);
1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1983#endif
1917} 1984}
1918 1985
1919/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1987void ecb_cold
1921void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1989{
1924#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1925 int nrows, row_start; 1991 int nrows, row_start;
1926 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
… …
1939 row_start = view_start; 2005 row_start = view_start;
1940 } 2006 }
1941 2007
1942 wctomb (0, 0); 2008 wctomb (0, 0);
1943 2009
1944 for (int r1 = 0; r1 < nrows; r1++) 2010 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 2011 {
1946 text_t *tp = ROW(r1).t; 2012 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 2013 int len = ROW(r1).l;
1948 2014
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2015 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1975/* 2041/*
1976 * Refresh the screen 2042 * Refresh the screen
1977 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
1978 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2045 */
1980void 2046void ecb_hot
1981rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
1982{ 2048{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2051 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */
1990#endif
1991 rend_t *crp; // cursor rendition pointer
1992 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
1993 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
1994 2056
1995 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
1996 2058
1997 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
1998 return; 2060 return;
… …
2000 /* 2062 /*
2001 * A: set up vars 2063 * A: set up vars
2002 */ 2064 */
2003 refresh_count = 0; 2065 refresh_count = 0;
2004 2066
2067 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2068 bool have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2007 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2008#endif 2071#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2073
2011 /* 2074 /*
2012 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
2013 */ 2076 */
2014 scr_reverse_selection (); 2077 scr_reverse_selection ();
2015 2078
2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2080#if ENABLE_OVERLAY
2081 scr_swap_overlay ();
2082#endif
2083
2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2085
2016 /* 2086 /*
2017 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2018 */ 2088 */
2019 { 2089 {
2020 unsigned char setoldcursor; 2090 bool setoldcursor;
2021 2091
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2093 if (hidden_cursor)
2025 showcursor = 0; 2094 showcursor = 0;
2026#endif 2095#endif
2027 2096
… …
2030 int col = screen.cur.col; 2099 int col = screen.cur.col;
2031 2100
2032 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2033 col--; 2102 col--;
2034 2103
2035 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2036 2106
2037#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2038 cc1 = *crp & (RS_fgMask | RS_bgMask);
2039 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2040 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2041 else 2110 else
2042#endif 2111#endif
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2055 ccol2 = bgcolor_of (rstyle); 2124 ccol2 = bgcolor_of (rstyle);
2056#else 2125#else
2057 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2058#endif 2127#endif
2059 2128
2060 if (showcursor && focus) 2129 if (focus)
2061 { 2130 {
2131 rend_t rend = cur_rend;
2132
2062 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2064 else 2135 else
2065 { 2136 {
2066 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2067 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2068 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2069 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2070 } 2143 }
2071 } 2144 }
2072 2145
2073 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2074 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2100 oldcursor.col = screen.cur.col; 2173 oldcursor.col = screen.cur.col;
2101 } 2174 }
2102 } 2175 }
2103 } 2176 }
2104 2177
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2178#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2179 /*
2112 * D: CopyArea pass - very useful for slower links 2180 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2181 * This has been deliberately kept simple.
2114 */ 2182 */
… …
2118 { 2186 {
2119 int16_t nits; 2187 int16_t nits;
2120 int i = num_scr; 2188 int i = num_scr;
2121 int j; 2189 int j;
2122 int len, wlen; 2190 int len, wlen;
2123 dLocal (int, num_scr);
2124 2191
2125 j = nrow; 2192 j = nrow;
2126 wlen = len = -1; 2193 wlen = len = -1;
2127 row = i > 0 ? 0 : j - 1; 2194 row = i > 0 ? 0 : j - 1;
2128 2195
… …
2203 continue; 2270 continue;
2204 2271
2205 // redraw one or more characters 2272 // redraw one or more characters
2206 2273
2207 // seek to the beginning of wide characters 2274 // seek to the beginning of wide characters
2208 while (expect_false (stp[col] == NOCHAR && col > 0)) 2275 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2276 --col;
2210 2277
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2278 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2279 text_t *text = stp + col;
2213 int count = 1; 2280 int count = 1;
2214 2281
2215 dtp[col] = stp[col]; 2282 dtp[col] = stp[col];
2216 drp[col] = rend; 2283 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2287 for (i = 0; ++col < ncol; )
2221 { 2288 {
2222 if (stp[col] == NOCHAR) 2289 if (stp[col] == NOCHAR)
2223 { 2290 {
2224 dtp[col] = stp[col]; 2291 dtp[col] = stp[col];
2225 drp[col] = rend; 2292 drp[col] = srp[col];
2293
2226 count++; 2294 count++;
2227 i++; 2295 i++;
2228 2296
2229 continue; 2297 continue;
2230 } 2298 }
… …
2250 2318
2251 col--; /* went one too far. move back */ 2319 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2320 count -= i; /* dump any matching trailing chars */
2253 2321
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2322 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (expect_false (i && text[count] == NOCHAR)) 2323 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2324 count++, i--;
2257 2325
2258 /* 2326 /*
2259 * Determine the attributes for the string 2327 * Determine the attributes for the string
2260 */ 2328 */
2261 int fore = fgcolor_of (rend); // desired foreground 2329 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2330 int back = bgcolor_of (rend); // desired background
2263 2331
2264 // only do special processing if any attributes are set, which is unlikely 2332 // only do special processing if any attributes are set, which is unlikely
2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2333 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2334 {
2267 bool invert = rend & RS_RVid; 2335 bool invert = rend & RS_RVid;
2268 2336
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2338 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2357
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2358 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2359 fore = Color_UL;
2292#endif 2360#endif
2293 2361
2362#ifdef OPTION_HC
2363 if (rend & RS_Sel)
2364 {
2365 /* invert the column if no highlightColor is set or it is the
2366 * current cursor column */
2367 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2368 && ISSET_PIXCOLOR (Color_HC))
2369 {
2370 if (ISSET_PIXCOLOR (Color_HTC))
2371 fore = Color_HTC;
2372 // if invert is 0 reverse video is set so we use bg color as fg color
2373 else if (!invert)
2374 fore = back;
2375
2376 back = Color_HC;
2377 invert = 0;
2378 }
2379 }
2380#endif
2381
2294 if (invert) 2382 if (invert)
2295 { 2383 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2384 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2385
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2386#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2387 if (fore == back)
2314 { 2388 {
2315 fore = Color_bg; 2389 fore = Color_bg;
2316 back = Color_fg; 2390 back = Color_fg;
2317 } 2391 }
… …
2353 /* 2427 /*
2354 * Actually do the drawing of the string here 2428 * Actually do the drawing of the string here
2355 */ 2429 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2430 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2431
2358 if (expect_true (have_bg && back == Color_bg)) 2432 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2433 {
2360 // this is very ugly, maybe push it into ->draw? 2434 // this is very ugly, maybe push it into ->draw?
2361 2435
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2436 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2437 if (text[i] != ' ')
… …
2370 did_clear: ; 2444 did_clear: ;
2371 } 2445 }
2372 else 2446 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2447 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2448
2375 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2449 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2450 {
2377#if ENABLE_FRILLS 2451#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2452 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2453 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2454 else
… …
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2460 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2461 }
2388 } /* for (col....) */ 2462 } /* for (col....) */
2389 } /* for (row....) */ 2463 } /* for (row....) */
2390 2464
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395
2396 /* 2465 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2467 */
2399 if (showcursor) 2468 if (showcursor)
2400 { 2469 {
2401 if (focus) 2470 if (focus)
2402 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2403 if (option (Opt_cursorUnderline))
2404 *crp ^= RS_Uline;
2405 else
2406 {
2407 *crp ^= RS_RVid;
2408#ifndef NO_CURSORCOLOR
2409 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2410#endif
2411 }
2412 }
2413 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2414 { 2473 {
2415 int cursorwidth = 1; 2474 int cursorwidth = 1;
2416 int col = oldcursor.col; 2475 int col = oldcursor.col;
2417 2476
… …
2431 2490
2432 XDrawRectangle (dpy, vt, gc, 2491 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2492 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2493 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2494 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2495 (unsigned int) (Height2Pixel (1) - 1));
2437 } 2496 }
2438 } 2497 }
2439 2498
2440 /* 2499 /*
2441 * H: cleanup selection 2500 * H: cleanup selection
2442 */ 2501 */
2502#if ENABLE_OVERLAY
2503 scr_swap_overlay ();
2504#endif
2505 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2506
2443 scr_reverse_selection (); 2507 scr_reverse_selection ();
2444 2508
2509 screen.flags = old_screen_flags;
2445 num_scr = 0; 2510 num_scr = 0;
2446 num_scr_allow = 1; 2511 num_scr_allow = 1;
2447} 2512}
2448 2513
2449void 2514void ecb_cold
2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2451{ 2516{
2452 if (!l.t) 2517 if (!l.valid ())
2453 return; 2518 return;
2454 2519
2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2456 2521
2457 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2459} 2524}
2460 2525
2461void 2526void ecb_cold
2462rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2463{ 2528{
2464 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2465 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2466 2531
… …
2469 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2470 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2471 } 2536 }
2472} 2537}
2473 2538
2474void 2539void ecb_cold
2475rxvt_term::scr_recolour () NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2541{
2477#ifdef HAVE_BG_PIXMAP 2542 bool transparent = false;
2478 bgPixmap.apply ();
2479#else
2480 2543
2544#ifdef HAVE_IMG
2545 if (bg_img != 0)
2546 {
2547# if ENABLE_TRANSPARENCY
2548 if (bg_flags & BG_IS_TRANSPARENT)
2549 {
2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2552
2553 transparent = true;
2554 }
2555 else
2556# endif
2557 {
2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2560 }
2561 }
2562 else
2563#endif
2564 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2566 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2567 }
2568
2569 XClearWindow (dpy, parent);
2484 2570
2485 if (scrollBar.win) 2571 if (scrollBar.win)
2486 { 2572 {
2573 if (transparent)
2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2575 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2488 scrollBar.state = STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2489 scrollBar.show (0); 2578 scrollBar.show (0);
2490 } 2579 }
2491 2580
2492#endif 2581 if (refresh)
2493 2582 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2583 scr_clear ();
2496 scr_touch (true); 2584 scr_touch (true);
2585 }
2497 want_refresh = 1; 2586 want_refresh = 1;
2498} 2587}
2499 2588
2500/* ------------------------------------------------------------------------- */ 2589/* ------------------------------------------------------------------------- */
2501void 2590void
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2560} 2649}
2561 2650
2562/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2563void 2652void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2654{
2566 if (selection.op 2655 if (selection.op
2567 && current_screen == selection.screen 2656 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
2569 { 2658 {
2570#if !ENABLE_MINIMAL 2659#if !ENABLE_MINIMAL
2571 if (selection.rect) 2660 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2661 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2663 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2664 else
2576#endif 2665#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2666 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2667 selection.end.row, selection.end.col,
2579 RS_RVid); 2668 RS_Sel | RS_RVid);
2580 } 2669 }
2581} 2670}
2582 2671
2583/* ------------------------------------------------------------------------- */ 2672/* ------------------------------------------------------------------------- */
2584/* 2673/*
… …
2587 */ 2676 */
2588#if 0 2677#if 0
2589void 2678void
2590rxvt_term::scr_dump (int fd) NOTHROW 2679rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2680{
2592 int row, wrote; 2681 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2682 // relevant code in scr_printscreen
2594 char r1[] = "\n";
2595
2596 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++)
2598 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2600 : ncol;
2601 for (towrite = width; towrite; towrite -= wrote)
2602 {
2603 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2604 towrite);
2605 if (wrote < 0)
2606 return; /* XXX: death, no report */
2607 }
2608 if (row_buf[row].l >= 0)
2609 if (write (fd, r1, 1) <= 0)
2610 return; /* XXX: death, no report */
2611 }
2612} 2683}
2613#endif 2684#endif
2614 2685
2615/* ------------------------------------------------------------------------- * 2686/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2687 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2688 * ------------------------------------------------------------------------- */
2618void 2689void
2619rxvt_term::selection_check (int check_more) NOTHROW 2690rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2691{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2692 if (!selection.op)
2624 return; 2693 return;
2625 2694
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2696 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2697 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2698 || (check_more == 1
2631 && current_screen == selection.screen 2699 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2634 || (check_more == 2
2635 && ROWCOL_IS_BEFORE (selection.beg, pos)
2636 && ROWCOL_IS_AFTER (selection.end, pos))
2637 || (check_more == 3
2638 && ROWCOL_IS_AFTER (selection.end, pos))
2639 || (check_more == 4 /* screen width change */
2640 && (selection.beg.row != selection.end.row
2641 || selection.end.col > ncol)))
2642 CLEAR_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2643} 2717}
2644 2718
2645/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2646/* 2720/*
2647 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2648 */ 2722 */
2649void 2723void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2725{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2729 data[i] = C0_CR;
2656 2730
2657 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~"); 2732 tt_printf ("\x1b[200~");
2659 2733
2660 tt_write (data, len); 2734 tt_write (data, len);
2661 2735
2662 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2737 tt_printf ("\x1b[201~");
2664} 2738}
2665 2739
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2740void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2742{
2674 if (prop == None) /* check for failed XConvertSelection */ 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2675 {
2676 if ((selection_type & Sel_CompoundText))
2677 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum);
2683 }
2684
2685 if ((selection_type & Sel_UTF8String))
2686 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 }
2695
2696 return;
2697 }
2698
2699 unsigned long bytes_after;
2700 XTextProperty ct;
2701
2702 if (XGetWindowProperty (dpy, win, prop,
2703 0, PROP_SIZE / 4,
2704 delete_prop, AnyPropertyType,
2705 &ct.encoding, &ct.format,
2706 &ct.nitems, &bytes_after,
2707 &ct.value) != Success)
2708 {
2709 ct.value = 0;
2710 goto bailout;
2711 }
2712
2713 if (ct.encoding == None)
2714 goto bailout;
2715
2716 if (bytes_after)
2717 {
2718 // fetch and append remaining data
2719 XTextProperty ct2;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 ct.nitems / 4, (bytes_after + 3) / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct2.encoding, &ct2.format,
2725 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success)
2727 goto bailout;
2728
2729 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems;
2733
2734 XFree (ct2.value);
2735 }
2736
2737 if (ct.value == 0)
2738 goto bailout;
2739
2740 if (ct.encoding == xa[XA_INCR])
2741 {
2742 // INCR selection, start handshake
2743 if (!delete_prop)
2744 XDeleteProperty (dpy, win, prop);
2745
2746 selection_wait = Sel_incr;
2747 incr_buf_fill = 0;
2748 incr_ev.start (10);
2749
2750 goto bailout;
2751 }
2752
2753 if (ct.nitems == 0)
2754 {
2755 if (selection_wait == Sel_incr)
2756 {
2757 XFree (ct.value);
2758
2759 // finally complete, now paste the whole thing
2760 selection_wait = Sel_normal;
2761 ct.value = (unsigned char *)incr_buf;
2762 ct.nitems = incr_buf_fill;
2763 incr_buf = 0;
2764 incr_buf_size = 0;
2765 incr_ev.stop ();
2766 }
2767 else
2768 {
2769 if (selection_wait == Sel_normal
2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2771 {
2772 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented
2775 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False);
2777 }
2778
2779 goto bailout;
2780 }
2781 }
2782 else if (selection_wait == Sel_incr)
2783 {
2784 incr_ev.start (10);
2785
2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2790 }
2791
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems;
2794
2795 goto bailout;
2796 }
2797
2798 char **cl;
2799 int cr;
2800
2801#if !ENABLE_MINIMAL
2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2803 // so recode it manually
2804 if (ct.encoding == xa[XA_UTF8_STRING])
2805 {
2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2807 char *s = rxvt_wcstombs (w);
2808 free (w);
2809 // TODO: strlen == only the first element will be converted. well...
2810 paste (s, strlen (s));
2811 free (s);
2812 }
2813 else
2814#endif
2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2816 && cl)
2817 {
2818 for (int i = 0; i < cr; i++)
2819 paste (cl[i], strlen (cl[i]));
2820
2821 XFreeStringList (cl);
2822 }
2823 else
2824 paste ((char *)ct.value, ct.nitems); // paste raw
2825
2826bailout:
2827 XFree (ct.value);
2828
2829 if (selection_wait == Sel_normal)
2830 selection_wait = Sel_none;
2831}
2832
2833void
2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2835{
2836 selection_wait = Sel_none;
2837
2838 incr_buf_size = 0;
2839 free (incr_buf);
2840
2841 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2842}
2843
2844void
2845rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2846{
2847 if (prop == None || selection_wait != Sel_incr)
2848 return; 2744 return;
2849 2745
2850 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2851} 2747}
2852 2748
2853/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2854/* 2750/*
2855 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2858 * > CUT_BUFFER0
2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2860 * will auto fallback to CUT_BUFFER0
2861 * EXT: button 2 release 2754 * EXT: button 2 release
2862 */ 2755 */
2863void 2756void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2758{
2866 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2867 {
2868 /* internal selection */
2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2870 paste (str, strlen (str));
2871 free (str);
2872 return;
2873 } 2760 {
2874 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2875 { 2763 }
2876 selection_request_time = tm;
2877 selection_wait = Sel_normal;
2878
2879#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return;
2883#else
2884 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return;
2887#endif
2888 }
2889
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false);
2892}
2893
2894int
2895rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2896{
2897 Atom sel;
2898
2899 selection_type |= selnum;
2900
2901 if (selnum == Sel_Primary)
2902 sel = XA_PRIMARY;
2903 else if (selnum == Sel_Secondary)
2904 sel = XA_SECONDARY;
2905 else
2906 sel = xa[XA_CLIPBOARD];
2907
2908 if (XGetSelectionOwner (dpy, sel) != None)
2909 {
2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2911 vt, selection_request_time);
2912 return 1;
2913 }
2914
2915 return 0;
2916} 2764}
2917 2765
2918/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2919/* 2767/*
2920 * Clear all selected text 2768 * Clear all selected text
2921 * EXT: SelectionClear 2769 * EXT: SelectionClear
2922 */ 2770 */
2923void 2771void
2924rxvt_term::selection_clear () NOTHROW 2772rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2773{
2774 if (!clipboard)
2775 {
2926 want_refresh = 1; 2776 want_refresh = 1;
2927 free (selection.text); 2777 free (selection.text);
2928 selection.text = NULL; 2778 selection.text = NULL;
2929 selection.len = 0; 2779 selection.len = 0;
2930 CLEAR_SELECTION (); 2780 CLEAR_SELECTION ();
2931 2781
2932 if (display->selection_owner == this) 2782 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2783 display->selection_owner = 0;
2784 }
2785 else
2786 {
2787 free (selection.clip_text);
2788 selection.clip_text = NULL;
2789 selection.clip_len = 0;
2790
2791 if (display->clipboard_owner == this)
2792 display->clipboard_owner = 0;
2793 }
2934} 2794}
2935 2795
2936/* ------------------------------------------------------------------------- */ 2796/* ------------------------------------------------------------------------- */
2937/* 2797/*
2938 * Copy a selection into the cut buffer 2798 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2940 */ 2800 */
2941void 2801void
2942rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2943{ 2803{
2944 int i; 2804 int size;
2945 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2946 text_t *t; 2806 text_t *t;
2947 2807
2948 switch (selection.op) 2808 switch (selection.op)
2949 { 2809 {
… …
2965 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
2966 2826
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2828 return;
2969 2829
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2832
2973 int ofs = 0; 2833 int ofs = 0;
2974 int extra = 0; 2834 int extra = 0;
2975 2835
2976 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
2982 { 2842 {
2983#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
2984 if (selection.rect) 2844 if (selection.rect)
2985 { 2845 {
2986 col = selection.beg.col; 2846 col = selection.beg.col;
2987 end_col = ncol + 1; 2847 end_col = selection.end.col;
2988 } 2848 }
2989 else 2849 else
2990#endif 2850#endif
2991 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
2992 2852
2993 col = max (col, 0); 2853 col = max (col, 0);
2994 2854
2995 if (row == selection.end.row 2855 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3001 2857
3002 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3003 2859
3004 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3012 2868
3013 extra -= (len - 1); 2869 extra -= (len - 1);
3014 2870
3015 if (extra < 0) 2871 if (extra < 0)
3016 { 2872 {
3017 extra += i; 2873 extra += size;
3018 i += i; 2874 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2876 }
3021 2877
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2879 }
3024#endif 2880#endif
… …
3036 2892
3037 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3038 } 2894 }
3039 else 2895 else
3040#endif 2896#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3043 } 2901 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2902
3048 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3049 2904
3050 if (ofs == 0) 2905 if (ofs == 0)
3051 { 2906 {
… …
3064 2919
3065 selection_grab (tm); 2920 selection_grab (tm);
3066} 2921}
3067 2922
3068bool 2923bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2924rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2925{
2926 Atom sel;
2927
2928 if (!clipboard)
2929 {
3071 selection_time = tm; 2930 selection_time = tm;
2931 sel = XA_PRIMARY;
2932 }
2933 else
2934 {
2935 clipboard_time = tm;
2936 sel = xa[XA_CLIPBOARD];
2937 }
3072 2938
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2939 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2940 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2941 {
3076 display->set_selection_owner (this); 2942 display->set_selection_owner (this, clipboard);
3077 return true; 2943 return true;
3078 } 2944 }
3079 else 2945 else
3080 { 2946 {
3081 selection_clear (); 2947 selection_clear (clipboard);
3082 return false; 2948 return false;
3083 } 2949 }
3084 2950
3085#if 0 2951#if 0
3086 XTextProperty ct; 2952 XTextProperty ct;
… …
3096/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
3097/* 2963/*
3098 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
3099 * EXT: button 1 press 2965 * EXT: button 1 press
3100 */ 2966 */
3101void 2967void ecb_cold
3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3103{ 2969{
3104 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
3105 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
3106 2972
… …
3125 2991
3126/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3127/* 2993/*
3128 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3129 */ 2995 */
3130void 2996void ecb_cold
3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3132{ 2998{
3133 want_refresh = 1; 2999 want_refresh = 1;
3134 3000
3135 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3158 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3159 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3160 */ 3026 */
3161 3027
3162/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3163#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3165#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3166 3032
3167void 3033void ecb_cold
3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3169{ 3035{
3170 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3171 row_col_t bound; 3037 row_col_t bound;
3172 text_t *stp; 3038 text_t *stp;
… …
3246 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3247 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3248 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3249 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3250 */ 3116 */
3251void 3117void ecb_cold
3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3253{ 3119{
3254 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3255 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3256 3122
… …
3282 3148
3283/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3284/* 3150/*
3285 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3286 */ 3152 */
3287void 3153void ecb_cold
3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3289{ 3155{
3290 row_col_t pos; 3156 row_col_t pos;
3291 enum { 3157 enum {
3292 LEFT, RIGHT 3158 LEFT, RIGHT
3293 } closeto = RIGHT; 3159 } closeto = RIGHT;
3294
3295 want_refresh = 1;
3296 3160
3297 switch (selection.op) 3161 switch (selection.op)
3298 { 3162 {
3299 case SELECTION_INIT: 3163 case SELECTION_INIT:
3300 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3480 3344
3481#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3482 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3483 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3484#endif 3348#endif
3349
3350 selection_changed ();
3485} 3351}
3486 3352
3487#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3488void 3354void ecb_cold
3489rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3490{ 3356{
3491 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3492 text_t *stp; 3358 text_t *stp;
3493 3359
… …
3531/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3532/* 3398/*
3533 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3534 * EXT: button 3 double click 3400 * EXT: button 3 double click
3535 */ 3401 */
3536void 3402void ecb_cold
3537rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3538{ 3404{
3539 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3541} 3407}
… …
3543/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3544/* 3410/*
3545 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3546 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3547 */ 3413 */
3548void 3414void ecb_cold
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3418 XSelectionEvent ev;
3552 3419
3553 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3554 ev.property = None; 3421 ev.property = None;
3555 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3573#endif 3440#endif
3574 3441
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3443 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3445 ev.property = property;
3579 } 3446 }
3580#if TODO // TODO 3447#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3449 {
3583 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3584 } 3451 }
3585#endif 3452#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3454 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3457 ev.property = property;
3458 }
3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3460 {
3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3463 ev.property = property;
3591 } 3464 }
3592 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3500 {
3628 target = xa[XA_COMPOUND_TEXT]; 3501 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3502 style = enc_compound_text;
3630 } 3503 }
3631 3504
3632 if (selection.text) 3505 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3506 {
3634 cl = selection.text; 3507 cl = selection.text;
3635 selectlen = selection.len; 3508 selectlen = selection.len;
3509 }
3510 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3511 {
3512 cl = selection.clip_text;
3513 selectlen = selection.clip_len;
3636 } 3514 }
3637 else 3515 else
3638 { 3516 {
3639 cl = L""; 3517 cl = L"";
3640 selectlen = 0; 3518 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3663 ct.encoding = target; 3541 ct.encoding = target;
3664 } 3542 }
3665 3543
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3547 ev.property = property;
3670 3548
3671 if (freect) 3549 if (freect)
3672 XFree (ct.value); 3550 XFree (ct.value);
3673 } 3551 }
3674 3552
3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3676} 3554}
3677 3555
3678/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3679#ifdef USE_XIM 3557#if USE_XIM
3680void 3558void ecb_cold
3681rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3682{ 3560{
3683 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3684 3562
3685 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);
… …
3708 h += 2; min_it (h, nrow); 3586 h += 2; min_it (h, nrow);
3709 3587
3710 x -= 1; clamp_it (x, 0, ncol - w); 3588 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3589 y -= 1; clamp_it (y, 0, nrow - h);
3712 3590
3713 ov_x = x; ov_y = y; 3591 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3592 ov.w = w; ov.h = h;
3715 3593
3716 ov_text = new text_t *[h]; 3594 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3595 ov.rend = new rend_t *[h];
3718 3596
3719 for (y = 0; y < h; y++) 3597 for (y = 0; y < h; y++)
3720 { 3598 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3599 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3600 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3601
3724 text_t t0, t1, t2; 3602 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3603 rend_t r = OVERLAY_RSTYLE;
3726 3604
3727 if (y == 0) 3605 if (y == 0)
… …
3746} 3624}
3747 3625
3748void 3626void
3749rxvt_term::scr_overlay_off () NOTHROW 3627rxvt_term::scr_overlay_off () NOTHROW
3750{ 3628{
3751 if (!ov_text) 3629 if (!ov.text)
3752 return; 3630 return;
3753 3631
3754 want_refresh = 1; 3632 want_refresh = 1;
3755 3633
3756 for (int y = 0; y < ov_h; y++) 3634 for (int y = 0; y < ov.h; y++)
3757 { 3635 {
3758 delete [] ov_text[y]; 3636 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3637 delete [] ov.rend[y];
3760 } 3638 }
3761 3639
3762 delete [] ov_text; ov_text = 0; 3640 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3641 delete [] ov.rend; ov.rend = 0;
3764} 3642}
3765 3643
3766void 3644void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3646{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3647 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3648 return;
3771 3649
3772 x++, y++; 3650 x++, y++;
3773 3651
3774 ov_text[y][x] = text; 3652 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3653 ov.rend[y][x] = rend;
3776} 3654}
3777 3655
3778void 3656void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3657rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3658{
… …
3799} 3677}
3800 3678
3801void 3679void
3802rxvt_term::scr_swap_overlay () NOTHROW 3680rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3681{
3804 if (!ov_text) 3682 if (!ov.text)
3805 return; 3683 return;
3806 3684
3685 // hide cursor if it is within the overlay area
3686 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3687 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3688 screen.flags &= ~Screen_VisibleCursor;
3689
3807 // swap screen mem with overlay 3690 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3691 for (int y = ov.h; y--; )
3809 { 3692 {
3810 text_t *t1 = ov_text[y]; 3693 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3694 rend_t *r1 = ov.rend[y];
3812 3695
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3696 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3697 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3698
3816 for (int x = ov_w; x--; ) 3699 for (int x = ov.w; x--; )
3817 { 3700 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3701 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3702 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3703 }
3821 } 3704 }

Diff Legend

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