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.307 by root, Fri Jun 27 00:44:32 2008 UTC vs.
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
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);
135} 153}
136 154
137/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
140 158
141void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
142rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
143{ 195{
144#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
145 scr_overlay_off (); 197 scr_overlay_off ();
146#endif 198#endif
147 199
148 rvideo_mode = false;
149 view_start = 0; 200 view_start = 0;
150 num_scr = 0; 201 num_scr = 0;
151 202
152 if (ncol == 0) 203 if (ncol == 0)
153 ncol = 80; 204 ncol = 80;
… …
155 if (nrow == 0) 206 if (nrow == 0)
156 nrow = 24; 207 nrow = 24;
157 208
158 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 210 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 211
164 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
166 { 214 {
167 //TODO//FIXME 215 //TODO//FIXME
… …
176 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
177 225
178 screen.tscroll = 0; 226 screen.tscroll = 0;
179 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
180 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
181 if (!row_buf) 238 if (!prev_row_buf)
182 { 239 {
183 /* 240 /*
184 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
185 */ 242 */
186 top_row = 0; 243 top_row = 0;
187 term_start = 0; 244 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 245
203 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
204 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
205 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
206 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
220 selection.text = NULL; 263 selection.text = NULL;
221 selection.len = 0; 264 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
224 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
225 } 270 }
226 else 271 else
227 { 272 {
228 /* 273 /*
229 * add or delete rows as appropriate 274 * add or delete rows as appropriate
230 */ 275 */
231 276
232 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
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
249 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
250 { 278 {
251 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
252 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
253 }
254 281
255 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
256 { 286 }
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 287
264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
265 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
266 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
267 291
268 if (top_row) 292 if (top_row)
269 { 293 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
272 297
273 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 300
276 do 301 do
277 { 302 {
278 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 305 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
284 307
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 309 {
287 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
288 311
289 plines++; 312 plines++;
290 llen += prev_ncol; 313 llen += prev_ncol;
… …
303 326
304 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
305 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
306 { 329 {
307 qline = row_buf + qrow; 330 qline = row_buf + qrow;
308 lalloc (*qline); 331 qline->alloc (); // redundant with next line
309 qline->l = ncol; 332 qline->l = ncol;
310 qline->is_longer (1); 333 qline->is_longer (1);
311 334
312 int qcol = 0; 335 int qcol = 0;
313 336
… …
328 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
329 // least. 352 // least.
330 if (prow == ocur.row) 353 if (prow == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
332 355
333 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
334 357
335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
336 359
337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
359 { 382 {
360 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
361 384
362 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
363 { 386 {
364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
365 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
366 389
367 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
368 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
369 } 394 }
370 395
371 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
372 {
373 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
374 }
375 398
376 term_start = 0; 399 term_start = 0;
377 } 400 }
378
379 free (old_buf);
380 delete old_ta;
381 delete old_ra;
382 401
383 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
404 }
385 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
386 free (tabs); 415 free (tabs);
387 } 416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
388 420
389 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
390 422
391 prev_nrow = nrow; 423 prev_nrow = nrow;
392 prev_ncol = ncol; 424 prev_ncol = ncol;
393 425
394 tabs = (char *)rxvt_malloc (ncol); 426 tt_winch ();
395 427
396 for (int col = ncol; --col; ) 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
397 tabs [col] = col % TABSIZE == 0; 429}
430
431void ecb_cold
432rxvt_term::scr_release () NOTHROW
433{
434 free (chunk); chunk = 0; row_buf = 0;
435 free (tabs); tabs = 0;
436}
437
438/* ------------------------------------------------------------------------- */
439/*
440 * Hard/Soft reset
441 */
442void ecb_cold
443rxvt_term::scr_poweron ()
444{
445 scr_release ();
446
447 prev_nrow = prev_ncol = 0;
448 rvideo_mode = false;
449 scr_soft_reset ();
450 scr_reset ();
451
452 scr_clear (true);
453 scr_refresh ();
454}
455
456void ecb_cold
457rxvt_term::scr_soft_reset () NOTHROW
458{
459 /* only affects modes, nothing drastic such as clearing the screen */
460#if ENABLE_OVERLAY
461 scr_overlay_off ();
462#endif
398 463
399 if (current_screen != PRIMARY) 464 if (current_screen != PRIMARY)
400 scr_swap_screen (); 465 scr_swap_screen ();
401 466
402 tt_winch (); 467 scr_scroll_region (0, MAX_ROWS - 1);
403 468 scr_rendition (0, ~RS_None);
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 469 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} 470}
442 471
443/* ------------------------------------------------------------------------- * 472/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 473 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 474 * ------------------------------------------------------------------------- */
… …
483 } 512 }
484 513
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 514 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 515 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 516 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
491#endif
492} 519}
493 520
494void 521void
495rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
496{ 523{
497 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
498 return; 525 return;
499 526
500 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
519 return; 546 return;
520 547
521 want_refresh = 1; 548 want_refresh = 1;
522 view_start = 0; 549 view_start = 0;
523 550
524 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
525 557
526 int i = current_screen; current_screen = scrn; scrn = i; 558 current_screen = scrn;
527 559
528#if NSCREENS 560#if NSCREENS
529 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
530 { 562 {
531 num_scr = 0; 563 num_scr = 0;
… …
595/* 627/*
596 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
597 * count positive ==> scroll up 629 * count positive ==> scroll up
598 * count negative ==> scroll down 630 * count negative ==> scroll down
599 */ 631 */
600int 632int ecb_hot
601rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
602{ 634{
603 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
604 return 0; 636 return 0;
605 637
… …
608 640
609 if (count > 0 641 if (count > 0
610 && row1 == 0 642 && row1 == 0
611 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
612 { 644 {
645 min_it (count, total_rows - (nrow - (row2 + 1)));
646
613 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
614
615 // scroll everything up 'count' lines
616 term_start = (term_start + count) % total_rows;
617 648
618 // sever bottommost line 649 // sever bottommost line
619 { 650 {
620 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
621 l.is_longer (0); 652 l.is_longer (0);
622 l.touch (); 653 l.touch ();
623 } 654 }
624 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
625 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
626 for (int i = count; i--; ) 672 for (int i = count; i--; )
627 { 673 {
628 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
629 675
630 // optimize if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem 677 // 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))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 { 679 {
634 scr_blank_line (l, 0, l.l, rstyle); 680 scr_blank_line (l, 0, l.l, rstyle);
635 l.l = 0; 681 l.l = 0;
… …
637 } 683 }
638 else 684 else
639 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
640 } 686 }
641 687
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 688 // move and/or clear selection, if any
655 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
656 { 691 {
657 selection.beg.row -= count; 692 selection.beg.row -= count;
658 selection.end.row -= count; 693 selection.end.row -= count;
659 selection.mark.row -= count; 694 selection.mark.row -= count;
660 695
661 if (selection.beg.row < top_row 696 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 } 697 }
669 698
670 // finally move the view window, if desired 699 // finally move the view window, if desired
671 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
672 && view_start != 0 701 && view_start != 0
… …
702 } 731 }
703 732
704 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
705 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
706 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
707 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
708 745
709 min_it (count, rows); 746 min_it (count, rows);
710 747
711 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
712 749
713 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
714 { 751 {
715 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
716 753
… …
718 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
719 } 756 }
720 757
721 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
722 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
723 } 767 }
724 768
725 return count; 769 return count;
726} 770}
727 771
728/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
729/* 773/*
730 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
731 */ 775 */
732void 776void ecb_hot
733rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
734{ 778{
735 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
736 return; 780 return;
737 781
738 unsigned char checksel; 782 bool checksel;
739 unicode_t c; 783 unicode_t c;
740 int ncol = this->ncol; 784 int ncol = this->ncol;
741 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
742 786
743 want_refresh = 1; 787 want_refresh = 1;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 800 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 801 screen.cur.row -= minlines;
758 } 802 }
759 } 803 }
760 804
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 805 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 806 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 807 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 808 int row = screen.cur.row;
767 809
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 810 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 811
770 line_t *line = &ROW(row); 812 line_t *line = &ROW(row);
771 813
772 while (str < strend) 814 while (str < strend)
773 { 815 {
774 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 816 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
775 817
776 if (c < 0x20) 818 if (ecb_unlikely (c < 0x20))
777 if (c == C0_LF) 819 if (c == C0_LF)
778 { 820 {
779 max_it (line->l, screen.cur.col); 821 max_it (line->l, screen.cur.col);
780 822
781 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
… …
800 { 842 {
801 scr_tab (1, true); 843 scr_tab (1, true);
802 continue; 844 continue;
803 } 845 }
804 846
847 if (ecb_unlikely (
805 if (checksel /* see if we're writing within selection */ 848 checksel /* see if we're writing within selection */
806 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
807 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
851 ))
808 { 852 {
809 checksel = 0; 853 checksel = 0;
810 /* 854 /*
811 * If we wrote anywhere in the selected area, kill the selection 855 * If we wrote anywhere in the selected area, kill the selection
812 * XXX: should we kill the mark too? Possibly, but maybe that 856 * XXX: should we kill the mark too? Possibly, but maybe that
813 * should be a similar check. 857 * should be a similar check.
814 */ 858 */
815 CLEAR_SELECTION (); 859 CLEAR_SELECTION ();
816 } 860 }
817 861
818 if (screen.flags & Screen_WrapNext) 862 if (ecb_unlikely (screen.flags & Screen_WrapNext))
819 { 863 {
820 scr_do_wrap (); 864 scr_do_wrap ();
821 865
822 line->l = ncol; 866 line->l = ncol;
823 line->is_longer (1); 867 line->is_longer (1);
… …
825 row = screen.cur.row; 869 row = screen.cur.row;
826 line = &ROW(row); /* _must_ refresh */ 870 line = &ROW(row); /* _must_ refresh */
827 } 871 }
828 872
829 // some utf-8 decoders "decode" surrogate characters: let's fix this. 873 // some utf-8 decoders "decode" surrogate characters: let's fix this.
830 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 874 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
831 c = 0xfffd; 875 c = 0xfffd;
832 876
833 // rely on wcwidth to tell us the character width, do wcwidth before 877 // rely on wcwidth to tell us the character width, do wcwidth before
834 // further replacements, as wcwidth might return -1 for the line 878 // further replacements, as wcwidth might return -1 for the line
835 // drawing characters below as they might be invalid in the current 879 // drawing characters below as they might be invalid in the current
836 // locale. 880 // locale.
837 int width = WCWIDTH (c); 881 int width = WCWIDTH (c);
838 882
839 if (charsets [screen.charset] == '0') // DEC SPECIAL 883 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
840 { 884 {
841 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
842 // 5f-7e standard vt100 886 // 5f-7e standard vt100
843 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
844 static uint16_t vt100_0[62] = { // 41 .. 7e 888 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
857 c = vt100_0[c - 0x41]; 901 c = vt100_0[c - 0x41];
858 width = 1; // vt100 line drawing characters are always single-width 902 width = 1; // vt100 line drawing characters are always single-width
859 } 903 }
860 } 904 }
861 905
862 if (screen.flags & Screen_Insert) 906 if (ecb_unlikely (screen.flags & Screen_Insert))
863 scr_insdel_chars (width, INSERT); 907 scr_insdel_chars (width, INSERT);
864 908
865 if (width != 0) 909 if (width != 0)
866 { 910 {
867#if !UNICODE_3 911#if !UNICODE_3
… …
872# else 916# else
873 c = 0xfffd; 917 c = 0xfffd;
874# endif 918# endif
875#endif 919#endif
876 920
921 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922
923 // if the character doesn't fit into the remaining columns...
924 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
925 {
926 if (screen.flags & Screen_Autowrap)
927 {
928 // ... artificially enlargen the previous one
929 c = NOCHAR;
930 // and try the same character next loop iteration
931 --str;
932 }
933 else
934 screen.cur.col = ncol - width;
935 }
936
877 // nuke the character at this position, if required 937 // nuke the character at this position, if required
938 // due to wonderful coincidences everywhere else in this loop
939 // we never have to check for overwriting a wide char itself,
940 // only its tail.
878 if (line->t[screen.cur.col] == NOCHAR 941 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
879 || (screen.cur.col < ncol - 1 942 scr_kill_char (*line, screen.cur.col);
880 && line->t[screen.cur.col + 1] == NOCHAR))
881 {
882 int col = screen.cur.col;
883
884 // find begin
885 while (col > 0 && line->t[col] == NOCHAR)
886 col--;
887
888 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
889
890 // found begin, nuke
891 do {
892 line->t[col] = ' ';
893 line->r[col] = rend;
894 col++;
895 } while (col < ncol && line->t[col] == NOCHAR);
896 }
897
898 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
899
900 // if the character doesn't fit into the remaining columns...
901 if (screen.cur.col > ncol - width && ncol >= width)
902 {
903 // ...output spaces
904 c = ' ';
905 // and try the same character next loop iteration
906 --str;
907 }
908 943
909 line->touch (); 944 line->touch ();
910 945
911 do 946 do
912 { 947 {
913 line->t[screen.cur.col] = c; 948 line->t[screen.cur.col] = c;
914 line->r[screen.cur.col] = rend; 949 line->r[screen.cur.col] = rend;
915 950
916 if (screen.cur.col < ncol - 1) 951 if (ecb_likely (screen.cur.col < ncol - 1))
917 screen.cur.col++; 952 screen.cur.col++;
918 else 953 else
919 { 954 {
920 line->l = ncol; 955 line->l = ncol;
921 if (screen.flags & Screen_Autowrap) 956 if (screen.flags & Screen_Autowrap)
922 screen.flags |= Screen_WrapNext; 957 screen.flags |= Screen_WrapNext;
923 break; 958
959 goto end_of_line;
924 } 960 }
925 961
926 c = NOCHAR; 962 c = NOCHAR;
927 } 963 }
928 while (--width > 0); 964 while (ecb_unlikely (--width > 0));
929 965
930 // pad with spaces when overwriting wide character with smaller one 966 // pad with spaces when overwriting wide character with smaller one
931 if (!width) 967 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
932 { 968 {
933 line->touch (); 969 line->t[c] = ' ';
970 line->r[c] = rend;
971 }
934 972
935 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 973end_of_line:
974 ;
975 }
976#if ENABLE_COMBINING
977 else // width == 0
978 {
979 if (c != 0xfeff) // ignore BOM
980 {
981 // handle combining characters
982 // we just tag the accent on the previous on-screen character.
983 // this is arguably not correct, but also arguably not wrong.
984 // we don't handle double-width characters nicely yet.
985 line_t *linep;
986 text_t *tp;
987 rend_t *rp;
988
989 if (screen.cur.col > 0)
936 { 990 {
937 line->t[c] = ' ';
938 line->r[c] = rend; 991 linep = line;
992 tp = line->t + screen.cur.col - 1;
993 rp = line->r + screen.cur.col - 1;
939 } 994 }
995 else if (screen.cur.row > 0
996 && ROW(screen.cur.row - 1).is_longer ())
997 {
998 linep = &ROW(screen.cur.row - 1);
999 tp = line->t + ncol - 1;
1000 rp = line->r + ncol - 1;
1001 }
1002 else
1003 continue;
1004
1005 linep->touch ();
1006
1007 while (*tp == NOCHAR && tp > linep->t)
1008 tp--, rp--;
1009
1010 // first try to find a precomposed character
1011 unicode_t n = rxvt_compose (*tp, c);
1012 if (n == NOCHAR)
1013 n = rxvt_composite.compose (*tp, c);
1014
1015 *tp = n;
1016 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
940 } 1017 }
941 } 1018 }
942 else // width == 0
943 {
944#if ENABLE_COMBINING
945 // handle combining characters
946 // we just tag the accent on the previous on-screen character.
947 // this is arguably not correct, but also arguably not wrong.
948 // we don't handle double-width characters nicely yet.
949 line_t *linep;
950 text_t *tp;
951 rend_t *rp;
952
953 if (screen.cur.col > 0)
954 {
955 linep = line;
956 tp = line->t + screen.cur.col - 1;
957 rp = line->r + screen.cur.col - 1;
958 }
959 else if (screen.cur.row > 0
960 && ROW(screen.cur.row - 1).is_longer ())
961 {
962 linep = &ROW(screen.cur.row - 1);
963 tp = line->t + ncol - 1;
964 rp = line->r + ncol - 1;
965 }
966 else
967 continue;
968
969 linep->touch ();
970
971 while (*tp == NOCHAR && tp > linep->t)
972 tp--, rp--;
973
974 // first try to find a precomposed character
975 unicode_t n = rxvt_compose (*tp, c);
976 if (n == NOCHAR)
977 n = rxvt_composite.compose (*tp, c);
978
979 *tp = n;
980 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
981#endif 1019#endif
982 }
983 } 1020 }
984 1021
985 max_it (line->l, screen.cur.col); 1022 max_it (line->l, screen.cur.col);
986 1023
987#ifdef DEBUG_STRICT
988 assert (screen.cur.row >= 0); 1024 assert (screen.cur.row >= 0);
989#endif
990} 1025}
991 1026
992/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
993/* 1028/*
994 * Process Backspace. Move back the cursor back a position, wrap if have to 1029 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1007 1042
1008 want_refresh = 1; 1043 want_refresh = 1;
1009#endif 1044#endif
1010 } 1045 }
1011 } 1046 }
1047 else if (screen.flags & Screen_WrapNext)
1048 screen.flags &= ~Screen_WrapNext;
1012 else 1049 else
1013 scr_gotorc (0, -1, RELATIVE); 1050 scr_gotorc (0, -1, RELATIVE);
1014} 1051}
1015 1052
1016/* ------------------------------------------------------------------------- */ 1053/* ------------------------------------------------------------------------- */
… …
1094 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1095 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1096 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1097 */ 1134 */
1098#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1099void 1136void ecb_cold
1100rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1101{ 1138{
1102 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1103 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1104 else 1141 else
… …
1111 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1112 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1113 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1114 */ 1151 */
1115#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1116void 1153void ecb_cold
1117rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1118{ 1155{
1119 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1120 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1121 else 1158 else
… …
1272 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1273} 1310}
1274 1311
1275/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1276/* 1313/*
1277 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1278 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1279 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1280 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1281 */ 1318 */
1282void 1319void
… …
1291 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1292 1329
1293 switch (mode) 1330 switch (mode)
1294 { 1331 {
1295 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1296 selection_check (1);
1297 scr_erase_line (0); 1333 scr_erase_line (0);
1298 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1299 num = nrow - row; 1335 num = nrow - row;
1300 break; 1336 break;
1301 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1302 selection_check (3);
1303 scr_erase_line (1); 1338 scr_erase_line (1);
1304 row = 0; 1339 row = 0;
1305 num = screen.cur.row; 1340 num = screen.cur.row;
1306 break; 1341 break;
1307 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1308 selection_check (3);
1309 row = 0; 1343 row = 0;
1310 num = nrow; 1344 num = nrow;
1311 break; 1345 break;
1312 default: 1346 default:
1313 return; 1347 return;
… …
1322 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1323 return; 1357 return;
1324 1358
1325 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1326 1360
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1328 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1329 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1330 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1331 { 1364 {
1332 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1333 1366
1334 if (mapped) 1367 if (mapped)
1335 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1337 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1338 } 1371 }
1339 else 1372 else
1340 { 1373 {
1341 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1342 1375
1376 if (mapped)
1377 {
1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1344 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1345 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row), 1381 0, Row2Pixel (row - view_start),
1347 (unsigned int)width, 1382 (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1351 } 1387 }
1352 1388
1353 for (; num--; row++) 1389 for (; num--; row++)
1354 { 1390 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1395 }
1358} 1396}
1359 1397
1360#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1361void 1399void
… …
1371/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1372/* 1410/*
1373 * Fill the screen with `E's 1411 * Fill the screen with `E's
1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1375 */ 1413 */
1376void 1414void ecb_cold
1377rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1378{ 1416{
1379 rend_t fs; 1417 rend_t fs;
1380 1418
1381 want_refresh = 1; 1419 want_refresh = 1;
1382 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1383 1421
1384 num_scr_allow = 0; 1422 num_scr_allow = 0;
1385 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1386 1428
1387 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1388 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1389 { 1431 {
1390 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1435 * Insert/Delete <count> characters from the current position 1477 * Insert/Delete <count> characters from the current position
1436 */ 1478 */
1437void 1479void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1480rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1481{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1482 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1483 ZERO_SCROLLBACK ();
1445 1484
1446 if (count <= 0) 1485 if (count <= 0)
1447 return; 1486 return;
… …
1449 scr_do_wrap (); 1488 scr_do_wrap ();
1450 1489
1451 selection_check (1); 1490 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1491 min_it (count, ncol - screen.cur.col);
1453 1492
1454 row = screen.cur.row; 1493 int row = screen.cur.row;
1455 1494
1456 line_t *line = &ROW(row); 1495 line_t *line = &ROW(row);
1457 1496
1458 line->touch (); 1497 line->touch ();
1459 line->is_longer (0); 1498 line->is_longer (0);
1460 1499
1500 // nuke wide spanning the start
1501 if (line->t[screen.cur.col] == NOCHAR)
1502 scr_kill_char (*line, screen.cur.col);
1503
1461 switch (insdel) 1504 switch (insdel)
1462 { 1505 {
1463 case INSERT: 1506 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1507 line->l = min (line->l + count, ncol);
1508
1509 if (line->t[screen.cur.col] == NOCHAR)
1510 scr_kill_char (*line, screen.cur.col);
1511
1512 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1513 {
1466 line->t[col] = line->t[col - count]; 1514 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1515 line->r[col] = line->r[col - count];
1468 } 1516 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1517
1472 if (selection.op && current_screen == selection.screen 1518 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1520 {
1475 if (selection.end.row != screen.cur.row 1521 if (selection.end.row != screen.cur.row
… …
1490 case ERASE: 1536 case ERASE:
1491 screen.cur.col += count; /* don't worry if > ncol */ 1537 screen.cur.col += count; /* don't worry if > ncol */
1492 selection_check (1); 1538 selection_check (1);
1493 screen.cur.col -= count; 1539 screen.cur.col -= count;
1494 1540
1495 line->l = max (line->l - count, 0); 1541 // nuke wide char after the end
1542 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1543 scr_kill_char (*line, screen.cur.col + count);
1544
1496 scr_blank_line (*line, screen.cur.col, count, rstyle); 1545 scr_blank_line (*line, screen.cur.col, count, rstyle);
1497 break; 1546 break;
1498 1547
1499 case DELETE: 1548 case DELETE:
1500 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1549 line->l = max (line->l - count, 0);
1501 1550
1551 // nuke wide char spanning the end
1552 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1553 scr_kill_char (*line, screen.cur.col + count);
1554
1502 for (col = screen.cur.col; (col + count) < ncol; col++) 1555 for (int col = screen.cur.col; (col + count) < ncol; col++)
1503 { 1556 {
1504 line->t[col] = line->t[col + count]; 1557 line->t[col] = line->t[col + count];
1505 line->r[col] = line->r[col + count]; 1558 line->r[col] = line->r[col + count];
1506 } 1559 }
1507 1560
1508 line->l = max (line->l - count, 0);
1509 scr_blank_line (*line, ncol - count, count, tr); 1561 scr_blank_line (*line, ncol - count, count, rstyle);
1510 1562
1511 if (selection.op && current_screen == selection.screen 1563 if (selection.op && current_screen == selection.screen
1512 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1564 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1513 { 1565 {
1514 if (selection.end.row != screen.cur.row 1566 if (selection.end.row != screen.cur.row
… …
1531/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1532/* 1584/*
1533 * Set the scrolling region 1585 * Set the scrolling region
1534 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1535 */ 1587 */
1536void 1588void ecb_cold
1537rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1538{ 1590{
1539 max_it (top, 0); 1591 max_it (top, 0);
1540 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1541 1593
… …
1551/* 1603/*
1552 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1553 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1554 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1555 */ 1607 */
1556void 1608void ecb_cold
1557rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1558{ 1610{
1559 want_refresh = 1; 1611 want_refresh = 1;
1560 1612
1561 if (mode) 1613 if (mode)
… …
1568/* 1620/*
1569 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1570 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1571 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1572 */ 1624 */
1573void 1625void ecb_cold
1574rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1575{ 1627{
1576 if (mode) 1628 if (mode)
1577 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1578 else 1630 else
… …
1587 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1588 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1589 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1590 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1591 */ 1643 */
1592void 1644void ecb_cold
1593rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1594{ 1646{
1595 if (mode) 1647 if (mode)
1596 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1597 else 1649 else
… …
1604/* 1656/*
1605 * Set insert/replace mode 1657 * Set insert/replace mode
1606 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1607 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1608 */ 1660 */
1609void 1661void ecb_cold
1610rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1611{ 1663{
1612 if (mode) 1664 if (mode)
1613 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1614 else 1666 else
… …
1620 * Set/Unset tabs 1672 * Set/Unset tabs
1621 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1622 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1623 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1624 */ 1676 */
1625void 1677void ecb_cold
1626rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1627{ 1679{
1628 if (mode < 0) 1680 if (mode < 0)
1629 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1630 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1650 { 1702 {
1651 rvideo_state = on; 1703 rvideo_state = on;
1652 1704
1653 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1654#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1655 if (bgPixmap.pixmap == None) 1707 if (bg_img == 0)
1656#endif 1708#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1710
1659 XGCValues gcvalue; 1711 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1712 gcvalue.foreground = pix_colors[Color_fg];
… …
1669/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1670/* 1722/*
1671 * Report current cursor position 1723 * Report current cursor position
1672 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1673 */ 1725 */
1674void 1726void ecb_cold
1675rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1676{ 1728{
1677 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1678} 1730}
1679 1731
… …
1682 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1683 1735
1684/* 1736/*
1685 * Set font style 1737 * Set font style
1686 */ 1738 */
1687void 1739void ecb_cold
1688rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1689{ 1741{
1690#if 0 1742#if 0
1691 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1692 { 1744 {
… …
1714 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1715 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1716 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1717 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1718 */ 1770 */
1719void 1771void ecb_cold
1720rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1721{ 1773{
1722 screen.charset = set; 1774 screen.charset = set;
1723 set_font_style (); 1775 set_font_style ();
1724} 1776}
… …
1745 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1746 1798
1747/* 1799/*
1748 * refresh matching text. 1800 * refresh matching text.
1749 */ 1801 */
1750bool 1802bool ecb_cold
1751rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1752{ 1804{
1753 bool found = false; 1805 bool found = false;
1754 1806
1755 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1774 PART_BEG = 0, 1826 PART_BEG = 0,
1775 PART_END, 1827 PART_END,
1776 RC_COUNT 1828 RC_COUNT
1777}; 1829};
1778 1830
1779void 1831void ecb_hot
1780rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1781{ 1833{
1782 int i; 1834 int i;
1783 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1784 1836
… …
1804 for (i = PART_BEG; i < RC_COUNT; i++) 1856 for (i = PART_BEG; i < RC_COUNT; i++)
1805 { 1857 {
1806 min_it (rc[i].col, ncol - 1); 1858 min_it (rc[i].col, ncol - 1);
1807 min_it (rc[i].row, nrow - 1); 1859 min_it (rc[i].row, nrow - 1);
1808 } 1860 }
1809// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1861
1810 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1862 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1863 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1812 1864
1813 num_scr_allow = 0; 1865 num_scr_allow = 0;
1814 1866
… …
1821 * Refresh the entire screen 1873 * Refresh the entire screen
1822 */ 1874 */
1823void 1875void
1824rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1825{ 1877{
1826 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1827} 1879}
1828 1880
1829/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1830/* 1882/*
1831 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1887 1939
1888# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1889# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1890 if (option (Opt_mapAlert)) 1942 if (option (Opt_mapAlert))
1891# endif 1943# endif
1892 XMapWindow (dpy, parent[0]); 1944 XMapWindow (dpy, parent);
1893# endif 1945# endif
1894 1946
1895# if ENABLE_FRILLS 1947# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1948 if (option (Opt_urgentOnBell))
1897 { 1949 set_urgency (1);
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1903 }
1904# endif 1950# endif
1905 1951
1906 if (option (Opt_visualBell)) 1952 if (option (Opt_visualBell))
1907 { 1953 {
1908 rvideo_bell = true; 1954 rvideo_bell = true;
… …
1911 1957
1912 bell_ev.start (VISUAL_BELL_DURATION); 1958 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1959 }
1914 else 1960 else
1915 XBell (dpy, 0); 1961 XBell (dpy, 0);
1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1963#endif
1917} 1964}
1918 1965
1919/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1967void ecb_cold
1921void
1922rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1923{ 1969{
1924#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1925 int nrows, row_start; 1971 int nrows, row_start;
1926 FILE *fd; 1972 FILE *fd = popen_printer ();
1927 1973
1928 if ((fd = popen_printer ()) == NULL) 1974 if (!fd)
1929 return; 1975 return;
1930 1976
1931 if (fullhist) 1977 if (fullhist)
1932 { 1978 {
1933 nrows = nrow - top_row; 1979 nrows = nrow - top_row;
… …
1939 row_start = view_start; 1985 row_start = view_start;
1940 } 1986 }
1941 1987
1942 wctomb (0, 0); 1988 wctomb (0, 0);
1943 1989
1944 for (int r1 = 0; r1 < nrows; r1++) 1990 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1991 {
1946 text_t *tp = ROW(r1).t; 1992 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1993 int len = ROW(r1).l;
1948 1994
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1995 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1975/* 2021/*
1976 * Refresh the screen 2022 * Refresh the screen
1977 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
1978 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2025 */
1980void 2026void ecb_hot
1981rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
1982{ 2028{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2031 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2032#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2033 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2044 /*
2001 * A: set up vars 2045 * A: set up vars
2002 */ 2046 */
2003 refresh_count = 0; 2047 refresh_count = 0;
2004 2048
2049 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2050 bool have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2052 have_bg = bg_img != 0;
2008#endif 2053#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2055
2011 /* 2056 /*
2012 * B: reverse any characters which are selected 2057 * B: reverse any characters which are selected
2013 */ 2058 */
2014 scr_reverse_selection (); 2059 scr_reverse_selection ();
2015 2060
2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2062#if ENABLE_OVERLAY
2063 scr_swap_overlay ();
2064#endif
2065
2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2067
2016 /* 2068 /*
2017 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2018 */ 2070 */
2019 { 2071 {
2020 unsigned char setoldcursor; 2072 bool setoldcursor;
2021 2073
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2075 if (hidden_cursor)
2025 showcursor = 0; 2076 showcursor = 0;
2026#endif 2077#endif
2027 2078
… …
2055 ccol2 = bgcolor_of (rstyle); 2106 ccol2 = bgcolor_of (rstyle);
2056#else 2107#else
2057 ccol2 = Color_bg; 2108 ccol2 = Color_bg;
2058#endif 2109#endif
2059 2110
2060 if (showcursor && focus) 2111 if (focus)
2061 { 2112 {
2062 if (option (Opt_cursorUnderline)) 2113 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2114 *crp ^= RS_Uline;
2064 else 2115 else
2065 { 2116 {
… …
2100 oldcursor.col = screen.cur.col; 2151 oldcursor.col = screen.cur.col;
2101 } 2152 }
2102 } 2153 }
2103 } 2154 }
2104 2155
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 2156#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2157 /*
2112 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2114 */ 2160 */
… …
2118 { 2164 {
2119 int16_t nits; 2165 int16_t nits;
2120 int i = num_scr; 2166 int i = num_scr;
2121 int j; 2167 int j;
2122 int len, wlen; 2168 int len, wlen;
2123 dLocal (int, num_scr);
2124 2169
2125 j = nrow; 2170 j = nrow;
2126 wlen = len = -1; 2171 wlen = len = -1;
2127 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2128 2173
… …
2203 continue; 2248 continue;
2204 2249
2205 // redraw one or more characters 2250 // redraw one or more characters
2206 2251
2207 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
2208 while (stp[col] == NOCHAR && col > 0) 2253 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2209 --col; 2254 --col;
2210 2255
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2256 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2257 text_t *text = stp + col;
2213 int count = 1; 2258 int count = 1;
2214 2259
2215 dtp[col] = stp[col]; 2260 dtp[col] = stp[col];
2216 drp[col] = rend; 2261 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2265 for (i = 0; ++col < ncol; )
2221 { 2266 {
2222 if (stp[col] == NOCHAR) 2267 if (stp[col] == NOCHAR)
2223 { 2268 {
2224 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2225 drp[col] = rend; 2270 drp[col] = srp[col];
2271
2226 count++; 2272 count++;
2227 i++; 2273 i++;
2228 2274
2229 continue; 2275 continue;
2230 } 2276 }
… …
2250 2296
2251 col--; /* went one too far. move back */ 2297 col--; /* went one too far. move back */
2252 count -= i; /* dump any matching trailing chars */ 2298 count -= i; /* dump any matching trailing chars */
2253 2299
2254 // sometimes we optimize away the trailing NOCHAR's, add them back 2300 // sometimes we optimize away the trailing NOCHAR's, add them back
2255 while (i && text[count] == NOCHAR) 2301 while (ecb_unlikely (i && text[count] == NOCHAR))
2256 count++, i--; 2302 count++, i--;
2257 2303
2258 /* 2304 /*
2259 * Determine the attributes for the string 2305 * Determine the attributes for the string
2260 */ 2306 */
2261 int fore = fgcolor_of (rend); // desired foreground 2307 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2308 int back = bgcolor_of (rend); // desired background
2263 2309
2264 // only do special processing if any attributes are set, which is unlikely 2310 // only do special processing if any attributes are set, which is unlikely
2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2311 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2312 {
2267 bool invert = rend & RS_RVid; 2313 bool invert = rend & RS_RVid;
2268 2314
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2335
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2336 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2337 fore = Color_UL;
2292#endif 2338#endif
2293 2339
2340#ifdef OPTION_HC
2341 if (rend & RS_Sel)
2342 {
2343 /* invert the column if no highlightColor is set or it is the
2344 * current cursor column */
2345 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2346 && ISSET_PIXCOLOR (Color_HC))
2347 {
2348 if (ISSET_PIXCOLOR (Color_HTC))
2349 fore = Color_HTC;
2350 // if invert is 0 reverse video is set so we use bg color as fg color
2351 else if (!invert)
2352 fore = back;
2353
2354 back = Color_HC;
2355 invert = 0;
2356 }
2357 }
2358#endif
2359
2294 if (invert) 2360 if (invert)
2295 { 2361 {
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); 2362 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2363
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2364#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) 2365 if (fore == back)
2314 { 2366 {
2315 fore = Color_bg; 2367 fore = Color_bg;
2316 back = Color_fg; 2368 back = Color_fg;
2317 } 2369 }
… …
2353 /* 2405 /*
2354 * Actually do the drawing of the string here 2406 * Actually do the drawing of the string here
2355 */ 2407 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2408 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2409
2358 if (have_bg && back == Color_bg) 2410 if (ecb_likely (have_bg && back == Color_bg))
2359 { 2411 {
2360 // this is very ugly, maybe push it into ->draw? 2412 // this is very ugly, maybe push it into ->draw?
2361 2413
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2414 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2415 if (text[i] != ' ')
… …
2370 did_clear: ; 2422 did_clear: ;
2371 } 2423 }
2372 else 2424 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2426
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2428 {
2377#if ENABLE_FRILLS 2429#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2430 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2431 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2432 else
… …
2385 xpixel, ypixel + font->ascent + 1, 2437 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2438 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2439 }
2388 } /* for (col....) */ 2440 } /* for (col....) */
2389 } /* for (row....) */ 2441 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2442
2396 /* 2443 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2444 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2445 */
2399 if (showcursor) 2446 if (showcursor)
… …
2431 2478
2432 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2480 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2437 } 2484 }
2438 } 2485 }
2439 2486
2440 /* 2487 /*
2441 * H: cleanup selection 2488 * H: cleanup selection
2442 */ 2489 */
2490#if ENABLE_OVERLAY
2491 scr_swap_overlay ();
2492#endif
2493 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2494
2443 scr_reverse_selection (); 2495 scr_reverse_selection ();
2444 2496
2497 screen.flags = old_screen_flags;
2445 num_scr = 0; 2498 num_scr = 0;
2446 num_scr_allow = 1; 2499 num_scr_allow = 1;
2447} 2500}
2448 2501
2449void 2502void ecb_cold
2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2451{ 2504{
2452 if (!l.t) 2505 if (!l.valid ())
2453 return; 2506 return;
2454 2507
2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2456 2509
2457 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2459} 2512}
2460 2513
2461void 2514void ecb_cold
2462rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2463{ 2516{
2464 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2465 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2466 2519
… …
2469 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2470 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2471 } 2524 }
2472} 2525}
2473 2526
2474void 2527void ecb_cold
2475rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2529{
2530 bool transparent = false;
2531
2477#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2533 if (bg_img != 0)
2479#else 2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480 2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2549 }
2550 else
2551#endif
2552 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2482 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2556
2557 XClearWindow (dpy, parent);
2484 2558
2485 if (scrollBar.win) 2559 if (scrollBar.win)
2486 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2489 scrollBar.show (0); 2566 scrollBar.show (0);
2490 } 2567 }
2491 2568
2492#endif 2569 if (refresh)
2493 2570 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2571 scr_clear ();
2496 scr_touch (true); 2572 scr_touch (true);
2573 }
2497 want_refresh = 1; 2574 want_refresh = 1;
2498} 2575}
2499 2576
2500/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2501void 2578void
… …
2558 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2559 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2560} 2637}
2561 2638
2562/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2563void 2640void ecb_hot
2564rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2565{ 2642{
2566 if (selection.op 2643 if (selection.op
2567 && current_screen == selection.screen 2644 && current_screen == selection.screen
2568 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2569 { 2646 {
2570#if !ENABLE_MINIMAL 2647#if !ENABLE_MINIMAL
2571 if (selection.rect) 2648 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2652 else
2576#endif 2653#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2579 RS_RVid); 2656 RS_Sel | RS_RVid);
2580 } 2657 }
2581} 2658}
2582 2659
2583/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2584/* 2661/*
… …
2587 */ 2664 */
2588#if 0 2665#if 0
2589void 2666void
2590rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2668{
2592 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2593 unsigned int width, towrite; 2670 // 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} 2671}
2613#endif 2672#endif
2614 2673
2615/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2616 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2617 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2618void 2677void
2619rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2620{ 2679{
2621 row_col_t pos;
2622
2623 if (!selection.op) 2680 if (!selection.op)
2624 return; 2681 return;
2625 2682
2626 pos.row = pos.col = 0;
2627 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2628 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2629 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2630 || (check_more == 1 2686 || (check_more == 1
2631 && current_screen == selection.screen 2687 && current_screen == selection.screen
2632 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2633 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && 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 (); 2690 CLEAR_ALL_SELECTION ();
2643} 2691}
2644 2692
2645/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2646/* 2694/*
2647 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
2648 */ 2696 */
2649void 2697void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2699{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2700 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2703 data[i] = C0_CR;
2656 2704
2657 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2659 2707
2660 tt_write (data, len); 2708 tt_write (data, len);
2661 2709
2662 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2664} 2712}
2665 2713
2666/* ------------------------------------------------------------------------- */
2667/*
2668 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify
2670 */
2671void 2714void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2673{ 2716{
2674 if (prop == None) /* check for failed XConvertSelection */ 2717 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; 2718 return;
2849 2719
2850 selection_paste (win, prop, true); 2720 tt_paste (data, len);
2851} 2721}
2852 2722
2853/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2854/* 2724/*
2855 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2856 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * 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 2728 * EXT: button 2 release
2862 */ 2729 */
2863void 2730void
2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2865{ 2732{
2866 if (selection.text && selnum == Sel_Primary) 2733 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 } 2734 {
2874 else 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run ();
2875 { 2737 }
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} 2738}
2917 2739
2918/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2919/* 2741/*
2920 * Clear all selected text 2742 * Clear all selected text
2921 * EXT: SelectionClear 2743 * EXT: SelectionClear
2922 */ 2744 */
2923void 2745void
2924rxvt_term::selection_clear () NOTHROW 2746rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2747{
2748 if (!clipboard)
2749 {
2926 want_refresh = 1; 2750 want_refresh = 1;
2927 free (selection.text); 2751 free (selection.text);
2928 selection.text = NULL; 2752 selection.text = NULL;
2929 selection.len = 0; 2753 selection.len = 0;
2930 CLEAR_SELECTION (); 2754 CLEAR_SELECTION ();
2931 2755
2932 if (display->selection_owner == this) 2756 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2757 display->selection_owner = 0;
2758 }
2759 else
2760 {
2761 free (selection.clip_text);
2762 selection.clip_text = NULL;
2763 selection.clip_len = 0;
2764
2765 if (display->clipboard_owner == this)
2766 display->clipboard_owner = 0;
2767 }
2934} 2768}
2935 2769
2936/* ------------------------------------------------------------------------- */ 2770/* ------------------------------------------------------------------------- */
2937/* 2771/*
2938 * Copy a selection into the cut buffer 2772 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 2773 * EXT: button 1 or 3 release
2940 */ 2774 */
2941void 2775void
2942rxvt_term::selection_make (Time tm) 2776rxvt_term::selection_make (Time tm)
2943{ 2777{
2944 int i; 2778 int size;
2945 wchar_t *new_selection_text; 2779 wchar_t *new_selection_text;
2946 text_t *t; 2780 text_t *t;
2947 2781
2948 switch (selection.op) 2782 switch (selection.op)
2949 { 2783 {
… …
2965 return; /* nothing selected, go away */ 2799 return; /* nothing selected, go away */
2966 2800
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2801 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 2802 return;
2969 2803
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2804 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2805 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 2806
2973 int ofs = 0; 2807 int ofs = 0;
2974 int extra = 0; 2808 int extra = 0;
2975 2809
2976 int col = selection.beg.col; 2810 int col = selection.beg.col;
… …
2982 { 2816 {
2983#if !ENABLE_MINIMAL 2817#if !ENABLE_MINIMAL
2984 if (selection.rect) 2818 if (selection.rect)
2985 { 2819 {
2986 col = selection.beg.col; 2820 col = selection.beg.col;
2987 end_col = ncol + 1; 2821 end_col = selection.end.col;
2988 } 2822 }
2989 else 2823 else
2990#endif 2824#endif
2991 end_col = ROW(row).l; 2825 end_col = ROW(row).l;
2992 2826
2993 col = max (col, 0); 2827 col = max (col, 0);
2994 2828
2995 if (row == selection.end.row 2829 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 2830 min_it (end_col, selection.end.col);
3001 2831
3002 t = ROW(row).t + col; 2832 t = ROW(row).t + col;
3003 2833
3004 for (; col < end_col; col++) 2834 for (; col < end_col; col++)
… …
3012 2842
3013 extra -= (len - 1); 2843 extra -= (len - 1);
3014 2844
3015 if (extra < 0) 2845 if (extra < 0)
3016 { 2846 {
3017 extra += i; 2847 extra += size;
3018 i += i; 2848 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2849 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 2850 }
3021 2851
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2852 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 2853 }
3024#endif 2854#endif
… …
3036 2866
3037 new_selection_text[ofs++] = C0_LF; 2867 new_selection_text[ofs++] = C0_LF;
3038 } 2868 }
3039 else 2869 else
3040#endif 2870#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 2871 if (!ROW(row).is_longer ()
2872 && (row != selection.end.row || end_col != selection.end.col)
2873 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3043 } 2875 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 2876
3048 new_selection_text[ofs] = 0; 2877 new_selection_text[ofs] = 0;
3049 2878
3050 if (ofs == 0) 2879 if (ofs == 0)
3051 { 2880 {
… …
3064 2893
3065 selection_grab (tm); 2894 selection_grab (tm);
3066} 2895}
3067 2896
3068bool 2897bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 2899{
2900 Atom sel;
2901
2902 if (!clipboard)
2903 {
3071 selection_time = tm; 2904 selection_time = tm;
2905 sel = XA_PRIMARY;
2906 }
2907 else
2908 {
2909 clipboard_time = tm;
2910 sel = xa[XA_CLIPBOARD];
2911 }
3072 2912
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2913 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2914 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 2915 {
3076 display->set_selection_owner (this); 2916 display->set_selection_owner (this, clipboard);
3077 return true; 2917 return true;
3078 } 2918 }
3079 else 2919 else
3080 { 2920 {
3081 selection_clear (); 2921 selection_clear (clipboard);
3082 return false; 2922 return false;
3083 } 2923 }
3084 2924
3085#if 0 2925#if 0
3086 XTextProperty ct; 2926 XTextProperty ct;
… …
3096/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
3097/* 2937/*
3098 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
3099 * EXT: button 1 press 2939 * EXT: button 1 press
3100 */ 2940 */
3101void 2941void ecb_cold
3102rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3103{ 2943{
3104 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
3105 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
3106 2946
… …
3125 2965
3126/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
3127/* 2967/*
3128 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
3129 */ 2969 */
3130void 2970void ecb_cold
3131rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3132{ 2972{
3133 want_refresh = 1; 2973 want_refresh = 1;
3134 2974
3135 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3162/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3163#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3164 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3165#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3166 3006
3167void 3007void ecb_cold
3168rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3169{ 3009{
3170 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3171 row_col_t bound; 3011 row_col_t bound;
3172 text_t *stp; 3012 text_t *stp;
… …
3246 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3247 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3248 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3249 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3250 */ 3090 */
3251void 3091void ecb_cold
3252rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3253{ 3093{
3254 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3255 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3256 3096
… …
3282 3122
3283/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3284/* 3124/*
3285 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3286 */ 3126 */
3287void 3127void ecb_cold
3288rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3289{ 3129{
3290 row_col_t pos; 3130 row_col_t pos;
3291 enum { 3131 enum {
3292 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3483 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3484#endif 3324#endif
3485} 3325}
3486 3326
3487#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3488void 3328void ecb_cold
3489rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3490{ 3330{
3491 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3492 text_t *stp; 3332 text_t *stp;
3493 3333
… …
3531/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3532/* 3372/*
3533 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3534 * EXT: button 3 double click 3374 * EXT: button 3 double click
3535 */ 3375 */
3536void 3376void ecb_cold
3537rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3538{ 3378{
3539 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3540 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3541} 3381}
… …
3543/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3544/* 3384/*
3545 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3546 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3547 */ 3387 */
3548void 3388void ecb_cold
3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3550{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3551 XSelectionEvent ev; 3392 XSelectionEvent ev;
3552 3393
3553 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3554 ev.property = None; 3395 ev.property = None;
3555 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3570 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3571#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3572 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3573#endif 3414#endif
3574 3415
3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3576 32, PropModeReplace, 3417 32, PropModeReplace,
3577 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3578 ev.property = rq.property; 3419 ev.property = property;
3579 } 3420 }
3580#if TODO // TODO 3421#if TODO // TODO
3581 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3423 {
3583 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3584 } 3425 }
3585#endif 3426#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3428 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3590 ev.property = rq.property; 3431 ev.property = property;
3432 }
3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3434 {
3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3436 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3437 ev.property = property;
3591 } 3438 }
3592 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3595 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3627 { 3474 {
3628 target = xa[XA_COMPOUND_TEXT]; 3475 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3476 style = enc_compound_text;
3630 } 3477 }
3631 3478
3632 if (selection.text) 3479 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3480 {
3634 cl = selection.text; 3481 cl = selection.text;
3635 selectlen = selection.len; 3482 selectlen = selection.len;
3483 }
3484 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3485 {
3486 cl = selection.clip_text;
3487 selectlen = selection.clip_len;
3636 } 3488 }
3637 else 3489 else
3638 { 3490 {
3639 cl = L""; 3491 cl = L"";
3640 selectlen = 0; 3492 selectlen = 0;
… …
3661 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3662 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3663 ct.encoding = target; 3515 ct.encoding = target;
3664 } 3516 }
3665 3517
3666 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3667 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3668 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3669 ev.property = rq.property; 3521 ev.property = property;
3670 3522
3671 if (freect) 3523 if (freect)
3672 XFree (ct.value); 3524 XFree (ct.value);
3673 } 3525 }
3674 3526
3675 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3676} 3528}
3677 3529
3678/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3679#ifdef USE_XIM 3531#if USE_XIM
3680void 3532void ecb_cold
3681rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3682{ 3534{
3683 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3684 3536
3685 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);
… …
3708 h += 2; min_it (h, nrow); 3560 h += 2; min_it (h, nrow);
3709 3561
3710 x -= 1; clamp_it (x, 0, ncol - w); 3562 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3563 y -= 1; clamp_it (y, 0, nrow - h);
3712 3564
3713 ov_x = x; ov_y = y; 3565 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3566 ov.w = w; ov.h = h;
3715 3567
3716 ov_text = new text_t *[h]; 3568 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3569 ov.rend = new rend_t *[h];
3718 3570
3719 for (y = 0; y < h; y++) 3571 for (y = 0; y < h; y++)
3720 { 3572 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3573 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3574 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3575
3724 text_t t0, t1, t2; 3576 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3577 rend_t r = OVERLAY_RSTYLE;
3726 3578
3727 if (y == 0) 3579 if (y == 0)
… …
3746} 3598}
3747 3599
3748void 3600void
3749rxvt_term::scr_overlay_off () NOTHROW 3601rxvt_term::scr_overlay_off () NOTHROW
3750{ 3602{
3751 if (!ov_text) 3603 if (!ov.text)
3752 return; 3604 return;
3753 3605
3754 want_refresh = 1; 3606 want_refresh = 1;
3755 3607
3756 for (int y = 0; y < ov_h; y++) 3608 for (int y = 0; y < ov.h; y++)
3757 { 3609 {
3758 delete [] ov_text[y]; 3610 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3611 delete [] ov.rend[y];
3760 } 3612 }
3761 3613
3762 delete [] ov_text; ov_text = 0; 3614 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3615 delete [] ov.rend; ov.rend = 0;
3764} 3616}
3765 3617
3766void 3618void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3619rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3620{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3622 return;
3771 3623
3772 x++, y++; 3624 x++, y++;
3773 3625
3774 ov_text[y][x] = text; 3626 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3627 ov.rend[y][x] = rend;
3776} 3628}
3777 3629
3778void 3630void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3631rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3632{
… …
3799} 3651}
3800 3652
3801void 3653void
3802rxvt_term::scr_swap_overlay () NOTHROW 3654rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3655{
3804 if (!ov_text) 3656 if (!ov.text)
3805 return; 3657 return;
3806 3658
3659 // hide cursor if it is within the overlay area
3660 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3661 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3662 screen.flags &= ~Screen_VisibleCursor;
3663
3807 // swap screen mem with overlay 3664 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3665 for (int y = ov.h; y--; )
3809 { 3666 {
3810 text_t *t1 = ov_text[y]; 3667 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3668 rend_t *r1 = ov.rend[y];
3812 3669
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3670 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; 3671 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3672
3816 for (int x = ov_w; x--; ) 3673 for (int x = ov.w; x--; )
3817 { 3674 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3675 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3676 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3677 }
3821 } 3678 }

Diff Legend

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