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.317 by root, Tue Nov 4 15:09:51 2008 UTC vs.
Revision 1.443 by sf-exg, Sun Mar 31 22:31:45 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
154} 153}
155 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
156/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
159 168
160void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
161rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
162{ 215{
163#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
164 scr_overlay_off (); 217 scr_overlay_off ();
165#endif 218#endif
166 219
167 rvideo_mode = false;
168 view_start = 0; 220 view_start = 0;
169 num_scr = 0; 221 num_scr = 0;
170 222
171 if (ncol == 0) 223 if (ncol == 0)
172 ncol = 80; 224 ncol = 80;
… …
174 if (nrow == 0) 226 if (nrow == 0)
175 nrow = 24; 227 nrow = 24;
176 228
177 if (ncol == prev_ncol && nrow == prev_nrow) 229 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 230 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 231
183 // we need at least two lines for wrapping to work correctly 232 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 233 while (nrow + saveLines < 2)
185 { 234 {
186 //TODO//FIXME 235 //TODO//FIXME
… …
195 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
196 245
197 screen.tscroll = 0; 246 screen.tscroll = 0;
198 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
199 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
200 if (!row_buf) 257 if (!prev_row_buf)
201 { 258 {
202 /*
203 * first time called so just malloc everything: don't rely on realloc
204 */
205 top_row = 0; 259 top_row = 0;
206 term_start = 0; 260 term_start = 0;
207
208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210
211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214
215 for (int row = nrow; row--; )
216 {
217 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
218 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
219 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
220 }
221 261
222 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
223 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
224 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
225 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
239 selection.text = NULL; 279 selection.text = NULL;
240 selection.len = 0; 280 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 281 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 282 selection.screen = PRIMARY;
243 selection.clicks = 0; 283 selection.clicks = 0;
284 selection.clip_text = NULL;
285 selection.clip_len = 0;
244 } 286 }
245 else 287 else
246 { 288 {
247 /* 289 /*
248 * add or delete rows as appropriate 290 * add or delete rows as appropriate
249 */ 291 */
250 292
251 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
252 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
253
254#if 0
255 if (nrow < prev_nrow)
256 {
257 for (int row = nrow; row < prev_nrow; row++)
258 {
259 lfree (swap_buf [row]);
260 lfree (drawn_buf[row]);
261 }
262 }
263#endif
264
265 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 294
268 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
269 { 296 {
270 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
271 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
272 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
273 300
274 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
275 { 302 }
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
282 303
283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
284 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
286 307
287 if (top_row) 308 if (top_row)
288 { 309 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 310 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 311 // to come up with a lean and mean algorithm.
312 // TODO: maybe optimise when width didn't change
291 313
292 row_col_t ocur = screen.cur; 314 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 316
295 do 317 do
296 { 318 {
297 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 321 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
303 323
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 325 {
306 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
307 327
308 plines++; 328 plines++;
309 llen += prev_ncol; 329 llen += prev_ncol;
… …
322 342
323 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
324 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
325 { 345 {
326 qline = row_buf + qrow; 346 qline = row_buf + qrow;
327 lalloc (*qline); 347 qline->alloc (); // redundant with next line
328 qline->l = ncol; 348 qline->l = ncol;
329 qline->is_longer (1); 349 qline->is_longer (1);
330 350
331 int qcol = 0; 351 int qcol = 0;
332 352
… …
347 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
348 // least. 368 // least.
349 if (prow == ocur.row) 369 if (prow == ocur.row)
350 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
351 371
352 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
353 373
354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
355 375
356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
378 { 398 {
379 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
380 400
381 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
382 { 402 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
385 405
386 qline = pline; 406 copy_line (dst, src);
387 lresize (qline);
388 } 407 }
389 408
390 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394 411
395 term_start = 0; 412 term_start = 0;
396 } 413 }
397
398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
401 414
402 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
417 }
404 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
405 free (tabs); 428 free (tabs);
406 } 429 tabs = (char *)rxvt_malloc (ncol);
430
431 for (int col = ncol; col--; )
432 tabs [col] = col % TABSIZE == 0;
407 433
408 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
409 435
410 prev_nrow = nrow; 436 prev_nrow = nrow;
411 prev_ncol = ncol; 437 prev_ncol = ncol;
412 438
413 tabs = (char *)rxvt_malloc (ncol); 439 tt_winch ();
414 440
415 for (int col = ncol; --col; ) 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416 tabs [col] = col % TABSIZE == 0; 442}
443
444void ecb_cold
445rxvt_term::scr_release () NOTHROW
446{
447 chunk_free (chunk, chunk_size);
448 chunk = 0;
449 row_buf = 0;
450
451 free (tabs);
452 tabs = 0;
453}
454
455/* ------------------------------------------------------------------------- */
456/*
457 * Hard/Soft reset
458 */
459void ecb_cold
460rxvt_term::scr_poweron ()
461{
462 scr_release ();
463
464 prev_nrow = prev_ncol = 0;
465 rvideo_mode = false;
466 scr_soft_reset ();
467 scr_reset ();
468
469 scr_clear (true);
470 scr_refresh ();
471}
472
473void ecb_cold
474rxvt_term::scr_soft_reset () NOTHROW
475{
476 /* only affects modes, nothing drastic such as clearing the screen */
477#if ENABLE_OVERLAY
478 scr_overlay_off ();
479#endif
417 480
418 if (current_screen != PRIMARY) 481 if (current_screen != PRIMARY)
419 scr_swap_screen (); 482 scr_swap_screen ();
420 483
421 tt_winch (); 484 scr_scroll_region (0, MAX_ROWS - 1);
422 485 scr_rendition (0, ~RS_None);
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 486 scr_insert_mode (0);
424}
425
426/* ------------------------------------------------------------------------- */
427/*
428 * Free everything. That way malloc debugging can find leakage.
429 */
430void
431rxvt_term::scr_release () NOTHROW
432{
433 if (row_buf)
434 {
435 delete talloc; talloc = 0;
436 delete ralloc; ralloc = 0;
437
438 free (row_buf);
439 free (swap_buf);
440 free (drawn_buf);
441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
444 }
445}
446
447/* ------------------------------------------------------------------------- */
448/*
449 * Hard reset
450 */
451void
452rxvt_term::scr_poweron ()
453{
454 scr_release ();
455 prev_nrow = prev_ncol = 0;
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460} 487}
461 488
462/* ------------------------------------------------------------------------- * 489/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 490 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 491 * ------------------------------------------------------------------------- */
… …
502 } 529 }
503 530
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 531 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 532 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 533 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
510#endif
511} 536}
512 537
513void 538void
514rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
515{ 540{
516 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
517 return; 542 return;
518 543
519 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
538 return; 563 return;
539 564
540 want_refresh = 1; 565 want_refresh = 1;
541 view_start = 0; 566 view_start = 0;
542 567
543 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
544 574
545 int i = current_screen; current_screen = scrn; scrn = i; 575 current_screen = scrn;
546 576
547#if NSCREENS 577#if NSCREENS
548 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
549 { 579 {
550 num_scr = 0; 580 num_scr = 0;
… …
614/* 644/*
615 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
616 * count positive ==> scroll up 646 * count positive ==> scroll up
617 * count negative ==> scroll down 647 * count negative ==> scroll down
618 */ 648 */
619int 649int ecb_hot
620rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
621{ 651{
622 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
623 return 0; 653 return 0;
624 654
… …
627 657
628 if (count > 0 658 if (count > 0
629 && row1 == 0 659 && row1 == 0
630 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
632 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
633
634 // scroll everything up 'count' lines
635 term_start = (term_start + count) % total_rows;
636 665
637 // sever bottommost line 666 // sever bottommost line
638 { 667 {
639 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
640 l.is_longer (0); 669 l.is_longer (0);
641 l.touch (); 670 l.touch ();
642 } 671 }
643 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
644 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
645 for (int i = count; i--; ) 689 for (int i = count; i--; )
646 { 690 {
647 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
648 692
649 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 { 696 {
653 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0; 698 l.l = 0;
… …
656 } 700 }
657 else 701 else
658 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
659 } 703 }
660 704
661 // now copy lines below the scroll region bottom to the
662 // bottom of the screen again, so they look as if they
663 // hadn't moved.
664 for (int i = nrow; --i > row2; )
665 {
666 line_t &l1 = ROW(i - count);
667 line_t &l2 = ROW(i);
668
669 ::swap (l1, l2);
670 l2.touch ();
671 }
672
673 // move and/or clear selection, if any 705 // move and/or clear selection, if any
674 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
675 { 708 {
676 selection.beg.row -= count; 709 selection.beg.row -= count;
677 selection.end.row -= count; 710 selection.end.row -= count;
678 selection.mark.row -= count; 711 selection.mark.row -= count;
679 712
680 if (selection.beg.row < top_row 713 selection_check (0);
681 || selection.end.row < top_row
682 || selection.mark.row < top_row)
683 {
684 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR;
686 }
687 } 714 }
688 715
689 // finally move the view window, if desired 716 // finally move the view window, if desired
690 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
691 && view_start != 0 718 && view_start != 0
692 && view_start != -saveLines) 719 && view_start != -saveLines)
693 scr_page (UP, count); 720 scr_page (count);
694 721
695 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
696 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
697 } 724 }
698 else 725 else
… …
721 } 748 }
722 749
723 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
724 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
725 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
726 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
727 762
728 min_it (count, rows); 763 min_it (count, rows);
729 764
730 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731 766
732 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
733 { 768 {
734 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 770
… …
737 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
738 } 773 }
739 774
740 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
741 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
742 } 784 }
743 785
744 return count; 786 return count;
745} 787}
746 788
747/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
748/* 790/*
749 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
750 */ 792 */
751void 793void ecb_hot
752rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
753{ 795{
754 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
755 return; 797 return;
756 798
757 unsigned char checksel; 799 bool checksel;
758 unicode_t c; 800 unicode_t c;
759 int ncol = this->ncol; 801 int ncol = this->ncol;
760 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
761 803
762 want_refresh = 1; 804 want_refresh = 1;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 817 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 818 screen.cur.row -= minlines;
777 } 819 }
778 } 820 }
779 821
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 822 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 823 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 824 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 825 int row = screen.cur.row;
786 826
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 827 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 828
789 line_t *line = &ROW(row); 829 line_t *line = &ROW(row);
790 830
791 while (str < strend) 831 while (str < strend)
792 { 832 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 834
795 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 836 if (c == C0_LF)
797 { 837 {
798 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
799 839
800 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
819 { 859 {
820 scr_tab (1, true); 860 scr_tab (1, true);
821 continue; 861 continue;
822 } 862 }
823 863
824 if (expect_false ( 864 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 868 ))
829 { 869 {
… …
834 * should be a similar check. 874 * should be a similar check.
835 */ 875 */
836 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
837 } 877 }
838 878
839 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 880 {
841 scr_do_wrap (); 881 scr_do_wrap ();
842 882
843 line->l = ncol; 883 line->l = ncol;
844 line->is_longer (1); 884 line->is_longer (1);
… …
846 row = screen.cur.row; 886 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
848 } 888 }
849 889
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 892 c = 0xfffd;
853 893
854 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
857 // locale. 897 // locale.
858 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
859 899
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 901 {
862 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 903 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
880 } 920 }
881 } 921 }
882 922
883 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
885 925
886 if (width != 0) 926 if (width != 0)
887 { 927 {
888#if !UNICODE_3 928#if !UNICODE_3
… …
893# else 933# else
894 c = 0xfffd; 934 c = 0xfffd;
895# endif 935# endif
896#endif 936#endif
897 937
938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
939
940 // if the character doesn't fit into the remaining columns...
941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
942 {
943 if (screen.flags & Screen_Autowrap)
944 {
945 // ... artificially enlargen the previous one
946 c = NOCHAR;
947 // and try the same character next loop iteration
948 --str;
949 }
950 else
951 screen.cur.col = ncol - width;
952 }
953
898 // nuke the character at this position, if required 954 // nuke the character at this position, if required
899 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ... artificially enlargen the previous one
912 c = NOCHAR;
913 // and try the same character next loop iteration
914 --str;
915 }
916 960
917 line->touch (); 961 line->touch ();
918 962
919 do 963 do
920 { 964 {
921 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
923 967
924 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 969 screen.cur.col++;
926 else 970 else
927 { 971 {
928 line->l = ncol; 972 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
931 break; 975
976 goto end_of_line;
932 } 977 }
933 978
934 c = NOCHAR; 979 c = NOCHAR;
935 } 980 }
936 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
937 982
938 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 985 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 986 line->t[c] = ' ';
946 line->r[c] = rend; 987 line->r[c] = rend;
947 }
948 } 988 }
989
990end_of_line:
991 ;
949 } 992 }
950#if ENABLE_COMBINING 993#if ENABLE_COMBINING
951 else // width == 0 994 else // width == 0
952 { 995 {
953 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
993#endif 1036#endif
994 } 1037 }
995 1038
996 max_it (line->l, screen.cur.col); 1039 max_it (line->l, screen.cur.col);
997 1040
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1041 assert (screen.cur.row >= 0);
1000#endif
1001} 1042}
1002 1043
1003/* ------------------------------------------------------------------------- */ 1044/* ------------------------------------------------------------------------- */
1004/* 1045/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1046 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1059
1019 want_refresh = 1; 1060 want_refresh = 1;
1020#endif 1061#endif
1021 } 1062 }
1022 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1023 else 1066 else
1024 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1025} 1068}
1026 1069
1027/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1108 */ 1151 */
1109#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1110void 1153void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1112{ 1155{
1113 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1158 else
… …
1122 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1125 */ 1168 */
1126#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1127void 1170void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1129{ 1172{
1130 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1175 else
… …
1197 * direction should be UP or DN 1240 * direction should be UP or DN
1198 */ 1241 */
1199void 1242void
1200rxvt_term::scr_index (enum page_dirn direction) NOTHROW 1243rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1201{ 1244{
1202 int dirn;
1203
1204 want_refresh = 1; 1245 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1246 ZERO_SCROLLBACK ();
1206 1247
1207 dirn = ((direction == UP) ? 1 : -1);
1208
1209 screen.flags &= ~Screen_WrapNext; 1248 screen.flags &= ~Screen_WrapNext;
1210 1249
1211 if ((screen.cur.row == screen.bscroll && direction == UP) 1250 if ((screen.cur.row == screen.bscroll && direction == UP)
1212 || (screen.cur.row == screen.tscroll && direction == DN)) 1251 || (screen.cur.row == screen.tscroll && direction == DN))
1213 scr_scroll_text (screen.tscroll, screen.bscroll, dirn); 1252 scr_scroll_text (screen.tscroll, screen.bscroll, direction);
1214 else 1253 else
1215 screen.cur.row += dirn; 1254 screen.cur.row += direction;
1216 1255
1217 clamp_it (screen.cur.row, 0, nrow - 1); 1256 clamp_it (screen.cur.row, 0, nrow - 1);
1218 selection_check (0); 1257 selection_check (0);
1219} 1258}
1220 1259
… …
1283 scr_blank_line (line, col, num, rstyle); 1322 scr_blank_line (line, col, num, rstyle);
1284} 1323}
1285 1324
1286/* ------------------------------------------------------------------------- */ 1325/* ------------------------------------------------------------------------- */
1287/* 1326/*
1288 * Erase part of whole of the screen 1327 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1328 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1329 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1330 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1331 */
1293void 1332void
… …
1302 ZERO_SCROLLBACK (); 1341 ZERO_SCROLLBACK ();
1303 1342
1304 switch (mode) 1343 switch (mode)
1305 { 1344 {
1306 case 0: /* erase to end of screen */ 1345 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1346 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1347 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1348 num = nrow - row;
1311 break; 1349 break;
1312 case 1: /* erase to beginning of screen */ 1350 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1351 scr_erase_line (1);
1315 row = 0; 1352 row = 0;
1316 num = screen.cur.row; 1353 num = screen.cur.row;
1317 break; 1354 break;
1318 case 2: /* erase whole screen */ 1355 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1356 row = 0;
1321 num = nrow; 1357 num = nrow;
1322 break; 1358 break;
1323 default: 1359 default:
1324 return; 1360 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1369 if (row >= nrow) /* Out Of Bounds */
1334 return; 1370 return;
1335 1371
1336 min_it (num, nrow - row); 1372 min_it (num, nrow - row);
1337 1373
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1374 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1375 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1376 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1377 {
1343 ren = DEFAULT_RSTYLE; 1378 ren = DEFAULT_RSTYLE;
1344 1379
1345 if (mapped) 1380 if (mapped)
1346 XClearArea (dpy, vt, 0, 1381 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1382 Row2Pixel (row - view_start), (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num), False); 1383 (unsigned int)Height2Pixel (num), False);
1349 } 1384 }
1350 else 1385 else
1351 { 1386 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1387 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1388
1389 if (mapped)
1390 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1391 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1392 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1393 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1394 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1395 (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num)); 1396 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1397 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1398 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1399 }
1362 } 1400 }
1363 1401
1364 for (; num--; row++) 1402 for (; num--; row++)
1365 { 1403 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1404 scr_blank_screen_mem (ROW(row), rstyle);
1405
1406 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1407 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1408 }
1369} 1409}
1370 1410
1371#if !ENABLE_MINIMAL 1411#if !ENABLE_MINIMAL
1372void 1412void
… …
1382/* ------------------------------------------------------------------------- */ 1422/* ------------------------------------------------------------------------- */
1383/* 1423/*
1384 * Fill the screen with `E's 1424 * Fill the screen with `E's
1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1425 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1386 */ 1426 */
1387void 1427void ecb_cold
1388rxvt_term::scr_E () NOTHROW 1428rxvt_term::scr_E () NOTHROW
1389{ 1429{
1390 rend_t fs; 1430 rend_t fs;
1391 1431
1392 want_refresh = 1; 1432 want_refresh = 1;
1393 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1394 1434
1395 num_scr_allow = 0; 1435 num_scr_allow = 0;
1396 selection_check (3); 1436
1437 row_col_t pos;
1438 pos.row = pos.col = 0;
1439 if (ROWCOL_IS_AFTER (selection.end, pos))
1440 CLEAR_SELECTION ();
1397 1441
1398 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1442 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1399 for (int row = nrow; row--; ) 1443 for (int row = nrow; row--; )
1400 { 1444 {
1401 line_t &line = ROW(row); 1445 line_t &line = ROW(row);
… …
1525 { 1569 {
1526 line->t[col] = line->t[col + count]; 1570 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1571 line->r[col] = line->r[col + count];
1528 } 1572 }
1529 1573
1530 scr_blank_line (*line, ncol - count, count, 1574 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1575
1533 if (selection.op && current_screen == selection.screen 1576 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1577 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1578 {
1536 if (selection.end.row != screen.cur.row 1579 if (selection.end.row != screen.cur.row
… …
1553/* ------------------------------------------------------------------------- */ 1596/* ------------------------------------------------------------------------- */
1554/* 1597/*
1555 * Set the scrolling region 1598 * Set the scrolling region
1556 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1599 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1557 */ 1600 */
1558void 1601void ecb_cold
1559rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1602rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1560{ 1603{
1561 max_it (top, 0); 1604 max_it (top, 0);
1562 min_it (bot, nrow - 1); 1605 min_it (bot, nrow - 1);
1563 1606
… …
1573/* 1616/*
1574 * Make the cursor visible/invisible 1617 * Make the cursor visible/invisible
1575 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1618 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1576 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1619 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1577 */ 1620 */
1578void 1621void ecb_cold
1579rxvt_term::scr_cursor_visible (int mode) NOTHROW 1622rxvt_term::scr_cursor_visible (int mode) NOTHROW
1580{ 1623{
1581 want_refresh = 1; 1624 want_refresh = 1;
1582 1625
1583 if (mode) 1626 if (mode)
… …
1590/* 1633/*
1591 * Set/unset automatic wrapping 1634 * Set/unset automatic wrapping
1592 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1635 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1593 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1636 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1594 */ 1637 */
1595void 1638void ecb_cold
1596rxvt_term::scr_autowrap (int mode) NOTHROW 1639rxvt_term::scr_autowrap (int mode) NOTHROW
1597{ 1640{
1598 if (mode) 1641 if (mode)
1599 screen.flags |= Screen_Autowrap; 1642 screen.flags |= Screen_Autowrap;
1600 else 1643 else
… …
1609 * Relative mode: line numbers are relative to top margin of scrolling region 1652 * Relative mode: line numbers are relative to top margin of scrolling region
1610 * and the cursor cannot be moved outside. 1653 * and the cursor cannot be moved outside.
1611 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1654 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1612 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1655 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1613 */ 1656 */
1614void 1657void ecb_cold
1615rxvt_term::scr_relative_origin (int mode) NOTHROW 1658rxvt_term::scr_relative_origin (int mode) NOTHROW
1616{ 1659{
1617 if (mode) 1660 if (mode)
1618 screen.flags |= Screen_Relative; 1661 screen.flags |= Screen_Relative;
1619 else 1662 else
… …
1626/* 1669/*
1627 * Set insert/replace mode 1670 * Set insert/replace mode
1628 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1671 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1629 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1672 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1630 */ 1673 */
1631void 1674void ecb_cold
1632rxvt_term::scr_insert_mode (int mode) NOTHROW 1675rxvt_term::scr_insert_mode (int mode) NOTHROW
1633{ 1676{
1634 if (mode) 1677 if (mode)
1635 screen.flags |= Screen_Insert; 1678 screen.flags |= Screen_Insert;
1636 else 1679 else
… …
1642 * Set/Unset tabs 1685 * Set/Unset tabs
1643 * XTERM_SEQ: Set tab at current column : ESC H 1686 * XTERM_SEQ: Set tab at current column : ESC H
1644 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1687 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1645 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1688 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1646 */ 1689 */
1647void 1690void ecb_cold
1648rxvt_term::scr_set_tab (int mode) NOTHROW 1691rxvt_term::scr_set_tab (int mode) NOTHROW
1649{ 1692{
1650 if (mode < 0) 1693 if (mode < 0)
1651 memset (tabs, 0, ncol); 1694 memset (tabs, 0, ncol);
1652 else if (screen.cur.col < ncol) 1695 else if (screen.cur.col < ncol)
… …
1671 if (rvideo_state != on) 1714 if (rvideo_state != on)
1672 { 1715 {
1673 rvideo_state = on; 1716 rvideo_state = on;
1674 1717
1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1718 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1676#ifdef HAVE_BG_PIXMAP 1719#ifdef HAVE_IMG
1677 if (bgPixmap.pixmap == None) 1720 if (bg_img == 0)
1678#endif 1721#endif
1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1722 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1680 1723
1681 XGCValues gcvalue; 1724 XGCValues gcvalue;
1682 gcvalue.foreground = pix_colors[Color_fg]; 1725 gcvalue.foreground = pix_colors[Color_fg];
… …
1691/* ------------------------------------------------------------------------- */ 1734/* ------------------------------------------------------------------------- */
1692/* 1735/*
1693 * Report current cursor position 1736 * Report current cursor position
1694 * XTERM_SEQ: Report position: ESC [ 6 n 1737 * XTERM_SEQ: Report position: ESC [ 6 n
1695 */ 1738 */
1696void 1739void ecb_cold
1697rxvt_term::scr_report_position () NOTHROW 1740rxvt_term::scr_report_position () NOTHROW
1698{ 1741{
1699 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1742 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1700} 1743}
1701 1744
… …
1704 * ------------------------------------------------------------------------- */ 1747 * ------------------------------------------------------------------------- */
1705 1748
1706/* 1749/*
1707 * Set font style 1750 * Set font style
1708 */ 1751 */
1709void 1752void ecb_cold
1710rxvt_term::set_font_style () NOTHROW 1753rxvt_term::set_font_style () NOTHROW
1711{ 1754{
1712#if 0 1755#if 0
1713 switch (charsets [screen.charset]) 1756 switch (charsets [screen.charset])
1714 { 1757 {
… …
1736 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1779 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1737 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1780 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1738 * XTERM_SEQ: Invoke G2 character set: ESC N 1781 * XTERM_SEQ: Invoke G2 character set: ESC N
1739 * XTERM_SEQ: Invoke G3 character set: ESC O 1782 * XTERM_SEQ: Invoke G3 character set: ESC O
1740 */ 1783 */
1741void 1784void ecb_cold
1742rxvt_term::scr_charset_choose (int set) NOTHROW 1785rxvt_term::scr_charset_choose (int set) NOTHROW
1743{ 1786{
1744 screen.charset = set; 1787 screen.charset = set;
1745 set_font_style (); 1788 set_font_style ();
1746} 1789}
… …
1767 * ------------------------------------------------------------------------- */ 1810 * ------------------------------------------------------------------------- */
1768 1811
1769/* 1812/*
1770 * refresh matching text. 1813 * refresh matching text.
1771 */ 1814 */
1772bool 1815bool ecb_cold
1773rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1816rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1774{ 1817{
1775 bool found = false; 1818 bool found = false;
1776 1819
1777 for (int i = 0; i < nrow; i++) 1820 for (int i = 0; i < nrow; i++)
… …
1796 PART_BEG = 0, 1839 PART_BEG = 0,
1797 PART_END, 1840 PART_END,
1798 RC_COUNT 1841 RC_COUNT
1799}; 1842};
1800 1843
1801void 1844void ecb_hot
1802rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1845rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1803{ 1846{
1804 int i; 1847 int i;
1805 row_col_t rc[RC_COUNT]; 1848 row_col_t rc[RC_COUNT];
1806 1849
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1869 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1870 {
1828 min_it (rc[i].col, ncol - 1); 1871 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1872 min_it (rc[i].row, nrow - 1);
1830 } 1873 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1874
1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1875 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1876 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1834 1877
1835 num_scr_allow = 0; 1878 num_scr_allow = 0;
1836 1879
… …
1843 * Refresh the entire screen 1886 * Refresh the entire screen
1844 */ 1887 */
1845void 1888void
1846rxvt_term::scr_touch (bool refresh) NOTHROW 1889rxvt_term::scr_touch (bool refresh) NOTHROW
1847{ 1890{
1848 scr_expose (0, 0, width, height, refresh); 1891 scr_expose (0, 0, vt_width, vt_height, refresh);
1849} 1892}
1850 1893
1851/* ------------------------------------------------------------------------- */ 1894/* ------------------------------------------------------------------------- */
1852/* 1895/*
1853 * Move the display so that the line represented by scrollbar value Y is at 1896 * Move the display so that the line represented by scrollbar value Y is at
… …
1863/* 1906/*
1864 * Page the screen up/down nlines 1907 * Page the screen up/down nlines
1865 * direction should be UP or DN 1908 * direction should be UP or DN
1866 */ 1909 */
1867bool 1910bool
1868rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW 1911rxvt_term::scr_page (int nlines) NOTHROW
1869{ 1912{
1870 int new_view_start =
1871 direction == UP ? view_start - nlines
1872 : view_start + nlines;
1873
1874 return scr_changeview (new_view_start); 1913 return scr_changeview (view_start - nlines);
1875} 1914}
1876 1915
1877bool 1916bool
1878rxvt_term::scr_changeview (int new_view_start) NOTHROW 1917rxvt_term::scr_changeview (int new_view_start) NOTHROW
1879{ 1918{
… …
1909 1948
1910# ifndef NO_MAPALERT 1949# ifndef NO_MAPALERT
1911# ifdef MAPALERT_OPTION 1950# ifdef MAPALERT_OPTION
1912 if (option (Opt_mapAlert)) 1951 if (option (Opt_mapAlert))
1913# endif 1952# endif
1914 XMapWindow (dpy, parent[0]); 1953 XMapWindow (dpy, parent);
1915# endif 1954# endif
1916 1955
1917# if ENABLE_FRILLS 1956# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell)) 1957 if (option (Opt_urgentOnBell))
1919 set_urgency (1); 1958 set_urgency (1);
… …
1927 1966
1928 bell_ev.start (VISUAL_BELL_DURATION); 1967 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1968 }
1930 else 1969 else
1931 XBell (dpy, 0); 1970 XBell (dpy, 0);
1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1972#endif
1933} 1973}
1934 1974
1935/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */ 1976void ecb_cold
1937void
1938rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1939{ 1978{
1940#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1941 int nrows, row_start; 1980 int nrows, row_start;
1942 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
1955 row_start = view_start; 1994 row_start = view_start;
1956 } 1995 }
1957 1996
1958 wctomb (0, 0); 1997 wctomb (0, 0);
1959 1998
1960 for (int r1 = 0; r1 < nrows; r1++) 1999 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 2000 {
1962 text_t *tp = ROW(r1).t; 2001 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 2002 int len = ROW(r1).l;
1964 2003
1965 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2004 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1991/* 2030/*
1992 * Refresh the screen 2031 * Refresh the screen
1993 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
1994 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2034 */
1996void 2035void ecb_hot
1997rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
1998{ 2037{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2040 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */
2006#endif
2007 rend_t *crp; // cursor rendition pointer
2008 rend_t ccol1, /* Cursor colour */ 2041 rend_t ccol1, /* Cursor colour */
2009 ccol2; /* Cursor colour2 */ 2042 ccol2; /* Cursor colour2 */
2043 rend_t cur_rend;
2044 int cur_col;
2045 int cursorwidth;
2010 2046
2011 want_refresh = 0; /* screen is current */ 2047 want_refresh = 0; /* screen is current */
2012 2048
2013 if (refresh_type == NO_REFRESH || !mapped) 2049 if (refresh_type == NO_REFRESH || !mapped)
2014 return; 2050 return;
… …
2016 /* 2052 /*
2017 * A: set up vars 2053 * A: set up vars
2018 */ 2054 */
2019 refresh_count = 0; 2055 refresh_count = 0;
2020 2056
2057 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2058 bool have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2023 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_img != 0;
2024#endif 2061#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2063
2027 /* 2064 /*
2028 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
2029 */ 2066 */
2030 scr_reverse_selection (); 2067 scr_reverse_selection ();
2031 2068
2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2070#if ENABLE_OVERLAY
2071 scr_swap_overlay ();
2072#endif
2073
2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2075
2032 /* 2076 /*
2033 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2034 */ 2078 */
2035 { 2079 {
2036 unsigned char setoldcursor;
2037
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2081 if (hidden_cursor)
2041 showcursor = 0; 2082 showcursor = 0;
2042#endif 2083#endif
2043 2084
… …
2046 int col = screen.cur.col; 2087 int col = screen.cur.col;
2047 2088
2048 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2049 col--; 2090 col--;
2050 2091
2092 cursorwidth = 1;
2093 while (col + cursorwidth < ncol
2094 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2095 cursorwidth++;
2096
2051 crp = &ROW(screen.cur.row).r[col]; 2097 cur_rend = ROW(screen.cur.row).r[col];
2098 cur_col = col;
2052 2099
2053#ifndef NO_CURSORCOLOR 2100#ifndef NO_CURSORCOLOR
2054 cc1 = *crp & (RS_fgMask | RS_bgMask);
2055 if (ISSET_PIXCOLOR (Color_cursor)) 2101 if (ISSET_PIXCOLOR (Color_cursor))
2056 ccol1 = Color_cursor; 2102 ccol1 = Color_cursor;
2057 else 2103 else
2058#endif 2104#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2105#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2071 ccol2 = bgcolor_of (rstyle); 2117 ccol2 = bgcolor_of (rstyle);
2072#else 2118#else
2073 ccol2 = Color_bg; 2119 ccol2 = Color_bg;
2074#endif 2120#endif
2075 2121
2076 if (showcursor && focus) 2122 if (focus)
2077 { 2123 {
2124 rend_t rend = cur_rend;
2125
2078 if (option (Opt_cursorUnderline)) 2126 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2127 rend ^= RS_Uline;
2080 else 2128 else
2081 { 2129 {
2082 *crp ^= RS_RVid; 2130 rend ^= RS_RVid;
2083 *crp = SET_FGCOLOR (*crp, ccol1); 2131 rend = SET_FGCOLOR (rend, ccol1);
2084 *crp = SET_BGCOLOR (*crp, ccol2); 2132 rend = SET_BGCOLOR (rend, ccol2);
2085 } 2133 }
2134
2135 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2086 } 2136 }
2087 } 2137 }
2088 2138
2089 /* make sure no outline cursor is left around */ 2139 /* make sure no outline cursor is left around */
2090 setoldcursor = 0;
2091 if (ocrow != -1) 2140 if (ocrow != -1)
2092 { 2141 {
2093 if (screen.cur.row - view_start != ocrow 2142 if (screen.cur.row - view_start != ocrow
2094 || screen.cur.col != oldcursor.col) 2143 || screen.cur.col != oldcursor.col)
2095 { 2144 {
2096 if (ocrow < nrow 2145 if (ocrow < nrow
2097 && oldcursor.col < ncol) 2146 && oldcursor.col < ncol)
2098 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2147 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2099
2100 if (focus || !showcursor)
2101 oldcursor.row = -1;
2102 else
2103 setoldcursor = 1;
2104 } 2148 }
2105 } 2149 }
2106 else if (!focus)
2107 setoldcursor = 1;
2108 2150
2109 if (setoldcursor) 2151 // save the current cursor coordinates if the cursor is visible
2152 // and the window is unfocused, so as to clear the outline cursor
2153 // in the next refresh if the cursor moves
2154 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2110 { 2155 {
2111 if (screen.cur.row - view_start >= nrow)
2112 oldcursor.row = -1;
2113 else
2114 {
2115 oldcursor.row = screen.cur.row - view_start; 2156 oldcursor.row = screen.cur.row - view_start;
2116 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2117 }
2118 } 2158 }
2159 else
2160 oldcursor.row = -1;
2119 } 2161 }
2120
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125 2162
2126#ifndef NO_SLOW_LINK_SUPPORT 2163#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2164 /*
2128 * D: CopyArea pass - very useful for slower links 2165 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2166 * This has been deliberately kept simple.
… …
2134 { 2171 {
2135 int16_t nits; 2172 int16_t nits;
2136 int i = num_scr; 2173 int i = num_scr;
2137 int j; 2174 int j;
2138 int len, wlen; 2175 int len, wlen;
2139 dLocal (int, num_scr);
2140 2176
2141 j = nrow; 2177 j = nrow;
2142 wlen = len = -1; 2178 wlen = len = -1;
2143 row = i > 0 ? 0 : j - 1; 2179 row = i > 0 ? 0 : j - 1;
2144 2180
… …
2219 continue; 2255 continue;
2220 2256
2221 // redraw one or more characters 2257 // redraw one or more characters
2222 2258
2223 // seek to the beginning of wide characters 2259 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2260 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2225 --col; 2261 --col;
2226 2262
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2263 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2264 text_t *text = stp + col;
2229 int count = 1; 2265 int count = 1;
2230 2266
2231 dtp[col] = stp[col]; 2267 dtp[col] = stp[col];
2232 drp[col] = rend; 2268 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2272 for (i = 0; ++col < ncol; )
2237 { 2273 {
2238 if (stp[col] == NOCHAR) 2274 if (stp[col] == NOCHAR)
2239 { 2275 {
2240 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2241 drp[col] = rend; 2277 drp[col] = srp[col];
2278
2242 count++; 2279 count++;
2243 i++; 2280 i++;
2244 2281
2245 continue; 2282 continue;
2246 } 2283 }
… …
2266 2303
2267 col--; /* went one too far. move back */ 2304 col--; /* went one too far. move back */
2268 count -= i; /* dump any matching trailing chars */ 2305 count -= i; /* dump any matching trailing chars */
2269 2306
2270 // sometimes we optimize away the trailing NOCHAR's, add them back 2307 // sometimes we optimize away the trailing NOCHAR's, add them back
2271 while (expect_false (i && text[count] == NOCHAR)) 2308 while (ecb_unlikely (i && text[count] == NOCHAR))
2272 count++, i--; 2309 count++, i--;
2273 2310
2274 /* 2311 /*
2275 * Determine the attributes for the string 2312 * Determine the attributes for the string
2276 */ 2313 */
2277 int fore = fgcolor_of (rend); // desired foreground 2314 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2315 int back = bgcolor_of (rend); // desired background
2279 2316
2280 // only do special processing if any attributes are set, which is unlikely 2317 // only do special processing if any attributes are set, which is unlikely
2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2318 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2282 { 2319 {
2283 bool invert = rend & RS_RVid; 2320 bool invert = rend & RS_RVid;
2284 2321
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2322#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2323 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2342
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2343 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2344 fore = Color_UL;
2308#endif 2345#endif
2309 2346
2347#ifdef OPTION_HC
2348 if (rend & RS_Sel)
2349 {
2350 /* invert the column if no highlightColor is set or it is the
2351 * current cursor column */
2352 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2353 && ISSET_PIXCOLOR (Color_HC))
2354 {
2355 if (ISSET_PIXCOLOR (Color_HTC))
2356 fore = Color_HTC;
2357 // if invert is 0 reverse video is set so we use bg color as fg color
2358 else if (!invert)
2359 fore = back;
2360
2361 back = Color_HC;
2362 invert = 0;
2363 }
2364 }
2365#endif
2366
2310 if (invert) 2367 if (invert)
2311 { 2368 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2369 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2370
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2371#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2372 if (fore == back)
2330 { 2373 {
2331 fore = Color_bg; 2374 fore = Color_bg;
2332 back = Color_fg; 2375 back = Color_fg;
2333 } 2376 }
… …
2369 /* 2412 /*
2370 * Actually do the drawing of the string here 2413 * Actually do the drawing of the string here
2371 */ 2414 */
2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2415 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2373 2416
2374 if (expect_true (have_bg && back == Color_bg)) 2417 if (ecb_likely (have_bg && back == Color_bg))
2375 { 2418 {
2376 // this is very ugly, maybe push it into ->draw? 2419 // this is very ugly, maybe push it into ->draw?
2377 2420
2378 for (i = 0; i < count; i++) /* don't draw empty strings */ 2421 for (i = 0; i < count; i++) /* don't draw empty strings */
2379 if (text[i] != ' ') 2422 if (text[i] != ' ')
… …
2386 did_clear: ; 2429 did_clear: ;
2387 } 2430 }
2388 else 2431 else
2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2432 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2390 2433
2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2434 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2392 { 2435 {
2436 if (showcursor && focus && row == screen.cur.row
2437 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2438 XSetForeground (dpy, gc, pix_colors[ccol1]);
2439 else
2393#if ENABLE_FRILLS 2440#if ENABLE_FRILLS
2394 if (ISSET_PIXCOLOR (Color_underline)) 2441 if (ISSET_PIXCOLOR (Color_underline))
2395 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2442 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2396 else 2443 else
2397#endif 2444#endif
… …
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2449 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2450 }
2404 } /* for (col....) */ 2451 } /* for (col....) */
2405 } /* for (row....) */ 2452 } /* for (row....) */
2406 2453
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411
2412 /* 2454 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2455 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2456 */
2415 if (showcursor) 2457 if (showcursor)
2416 { 2458 {
2417 if (focus) 2459 if (focus)
2418 { 2460 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2419 if (option (Opt_cursorUnderline))
2420 *crp ^= RS_Uline;
2421 else
2422 {
2423 *crp ^= RS_RVid;
2424#ifndef NO_CURSORCOLOR
2425 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2426#endif
2427 }
2428 }
2429 else if (oldcursor.row >= 0) 2461 else if (oldcursor.row >= 0)
2430 { 2462 {
2431 int cursorwidth = 1;
2432 int col = oldcursor.col;
2433
2434 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2435 col--;
2436
2437 while (col + cursorwidth < ncol
2438 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2439 cursorwidth++;
2440
2441#ifndef NO_CURSORCOLOR
2442 if (ISSET_PIXCOLOR (Color_cursor))
2443 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2444 else
2445#endif
2446 XSetForeground (dpy, gc, pix_colors[ccol1]); 2463 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 2464
2448 XDrawRectangle (dpy, vt, gc, 2465 XDrawRectangle (dpy, vt, gc,
2449 Col2Pixel (col), 2466 Col2Pixel (cur_col),
2450 Row2Pixel (oldcursor.row), 2467 Row2Pixel (oldcursor.row),
2451 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2468 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2452 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2469 (unsigned int) (Height2Pixel (1) - 1));
2453 } 2470 }
2454 } 2471 }
2455 2472
2456 /* 2473 /*
2457 * H: cleanup selection 2474 * H: cleanup selection
2458 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2459 scr_reverse_selection (); 2481 scr_reverse_selection ();
2460 2482
2483 screen.flags = old_screen_flags;
2461 num_scr = 0; 2484 num_scr = 0;
2462 num_scr_allow = 1; 2485 num_scr_allow = 1;
2463} 2486}
2464 2487
2465void 2488void ecb_cold
2466rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2489rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2467{ 2490{
2468 if (!l.t) 2491 if (!l.valid ())
2469 return; 2492 return;
2470 2493
2471 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2494 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2472 2495
2473 for (int i = ncol; i--; ) 2496 for (int i = ncol; i--; )
2474 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2497 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2475} 2498}
2476 2499
2477void 2500void ecb_cold
2478rxvt_term::scr_remap_chars () NOTHROW 2501rxvt_term::scr_remap_chars () NOTHROW
2479{ 2502{
2480 for (int i = total_rows; i--; ) 2503 for (int i = total_rows; i--; )
2481 scr_remap_chars (row_buf [i]); 2504 scr_remap_chars (row_buf [i]);
2482 2505
… …
2485 scr_remap_chars (drawn_buf [i]); 2508 scr_remap_chars (drawn_buf [i]);
2486 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2487 } 2510 }
2488} 2511}
2489 2512
2490void 2513void ecb_cold
2491rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2492{ 2515{
2493#ifdef HAVE_BG_PIXMAP 2516 bool transparent = false;
2494 bgPixmap.apply ();
2495#else
2496 2517
2518#ifdef HAVE_IMG
2519 if (bg_img != 0)
2520 {
2521# if ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2534 }
2535 }
2536 else
2537#endif
2538 {
2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2498 XClearWindow (dpy, parent[0]);
2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2500 2544
2501 if (scrollBar.win) 2545 if (scrollBar.win)
2502 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2504 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = SB_STATE_IDLE;
2505 scrollBar.show (0); 2552 scrollBar.show (0);
2506 } 2553 }
2507 2554
2508#endif 2555 if (refresh)
2509 2556 {
2510 /* bgPixmap.apply () does not do the following : */
2511 scr_clear (); 2557 scr_clear ();
2512 scr_touch (true); 2558 scr_touch (true);
2559 }
2513 want_refresh = 1; 2560 want_refresh = 1;
2514} 2561}
2515 2562
2516/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2517void 2564void
… …
2574 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2621 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2575 srp[col] ^= rstyle; 2622 srp[col] ^= rstyle;
2576} 2623}
2577 2624
2578/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2579void 2626void ecb_hot
2580rxvt_term::scr_reverse_selection () NOTHROW 2627rxvt_term::scr_reverse_selection () NOTHROW
2581{ 2628{
2582 if (selection.op 2629 if (selection.op
2583 && current_screen == selection.screen 2630 && current_screen == selection.screen
2584 && selection.end.row >= view_start) 2631 && selection.end.row >= view_start)
2585 { 2632 {
2586#if !ENABLE_MINIMAL 2633#if !ENABLE_MINIMAL
2587 if (selection.rect) 2634 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2635 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2636 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2637 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2638 else
2592#endif 2639#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2640 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2595 RS_RVid); 2642 RS_Sel | RS_RVid);
2596 } 2643 }
2597} 2644}
2598 2645
2599/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2600/* 2647/*
… …
2603 */ 2650 */
2604#if 0 2651#if 0
2605void 2652void
2606rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2607{ 2654{
2608 int row, wrote; 2655 // if this method is needed, it can be implemented by factoring the
2609 unsigned int width, towrite; 2656 // relevant code in scr_printscreen
2610 char r1[] = "\n";
2611
2612 for (row = saveLines + top_row;
2613 row < saveLines + nrow - 1; row++)
2614 {
2615 width = row_buf[row].l >= 0 ? row_buf[row].l
2616 : ncol;
2617 for (towrite = width; towrite; towrite -= wrote)
2618 {
2619 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2620 towrite);
2621 if (wrote < 0)
2622 return; /* XXX: death, no report */
2623 }
2624 if (row_buf[row].l >= 0)
2625 if (write (fd, r1, 1) <= 0)
2626 return; /* XXX: death, no report */
2627 }
2628} 2657}
2629#endif 2658#endif
2630 2659
2631/* ------------------------------------------------------------------------- * 2660/* ------------------------------------------------------------------------- *
2632 * CHARACTER SELECTION * 2661 * CHARACTER SELECTION *
2633 * ------------------------------------------------------------------------- */ 2662 * ------------------------------------------------------------------------- */
2634void 2663void
2635rxvt_term::selection_check (int check_more) NOTHROW 2664rxvt_term::selection_check (int check_more) NOTHROW
2636{ 2665{
2637 row_col_t pos;
2638
2639 if (!selection.op) 2666 if (!selection.op)
2640 return; 2667 return;
2641 2668
2642 pos.row = pos.col = 0;
2643 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2669 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2644 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2670 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2645 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2671 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2646 || (check_more == 1 2672 || (check_more == 1
2647 && current_screen == selection.screen 2673 && current_screen == selection.screen
2648 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2674 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2649 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2675 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2650 || (check_more == 2
2651 && ROWCOL_IS_BEFORE (selection.beg, pos)
2652 && ROWCOL_IS_AFTER (selection.end, pos))
2653 || (check_more == 3
2654 && ROWCOL_IS_AFTER (selection.end, pos))
2655 || (check_more == 4 /* screen width change */
2656 && (selection.beg.row != selection.end.row
2657 || selection.end.col > ncol)))
2658 CLEAR_SELECTION (); 2676 CLEAR_ALL_SELECTION ();
2677}
2678
2679void
2680rxvt_term::selection_changed () NOTHROW
2681{
2682 line_t &r1 = ROW (selection.beg.row);
2683 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2684 --selection.beg.col;
2685
2686 line_t &r2 = ROW (selection.end.row);
2687 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2688 ++selection.end.col;
2689
2690 want_refresh = 1;
2659} 2691}
2660 2692
2661/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2662/* 2694/*
2663 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
2664 */ 2696 */
2665void 2697void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2699{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2700 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2703 data[i] = C0_CR;
2672 2704
2673 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2674 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2675 2707
2676 tt_write (data, len); 2708 tt_write (data, len);
2677 2709
2678 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2680} 2712}
2681 2713
2682/* ------------------------------------------------------------------------- */
2683/*
2684 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify
2686 */
2687void 2714void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2689{ 2716{
2690 if (prop == None) /* check for failed XConvertSelection */ 2717 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2691 {
2692 if ((selection_type & Sel_CompoundText))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = 0;
2697 if (selnum != Sel_direct)
2698 selection_request_other (XA_STRING, selnum);
2699 }
2700
2701 if ((selection_type & Sel_UTF8String))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = Sel_CompoundText;
2706 if (selnum != Sel_direct)
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else
2709 selection_type = 0;
2710 }
2711
2712 return;
2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2737 if (XGetWindowProperty (dpy, win, prop,
2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2740 &ct2.encoding, &ct2.format,
2741 &ct2.nitems, &bytes_after,
2742 &ct2.value) != Success)
2743 goto bailout;
2744
2745 // realloc should be compatible to XFree, here, and elsewhere, too
2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (dpy, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (10);
2765
2766 goto bailout;
2767 }
2768
2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2782 }
2783 else
2784 {
2785 if (selection_wait == Sel_normal
2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2787 {
2788 /*
2789 * pass through again trying CUT_BUFFER0 if we've come from
2790 * XConvertSelection () but nothing was presented
2791 */
2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2793 }
2794
2795 goto bailout;
2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2809 incr_buf_fill += ct.nitems;
2810
2811 goto bailout;
2812 }
2813
2814 char **cl;
2815 int cr;
2816
2817#if !ENABLE_MINIMAL
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste (s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2832 && cl)
2833 {
2834 for (int i = 0; i < cr; i++)
2835 paste (cl[i], strlen (cl[i]));
2836
2837 XFreeStringList (cl);
2838 }
2839 else
2840 paste ((char *)ct.value, ct.nitems); // paste raw
2841
2842bailout:
2843 XFree (ct.value);
2844
2845 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none;
2847}
2848
2849void
2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2851{
2852 selection_wait = Sel_none;
2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858}
2859
2860void
2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{
2863 if (prop == None || selection_wait != Sel_incr)
2864 return; 2718 return;
2865 2719
2866 selection_paste (win, prop, true); 2720 tt_paste (data, len);
2867} 2721}
2868 2722
2869/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2870/* 2724/*
2871 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2872 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * as fallback
2874 * > CUT_BUFFER0
2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2876 * will auto fallback to CUT_BUFFER0
2877 * EXT: button 2 release 2728 * EXT: button 2 release
2878 */ 2729 */
2879void 2730void
2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2881{ 2732{
2882 if (selection.text && selnum == Sel_Primary) 2733 if (!selection_req)
2883 {
2884 /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste (str, strlen (str));
2887 free (str);
2888 return;
2889 } 2734 {
2890 else 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run ();
2891 { 2737 }
2892 selection_request_time = tm;
2893 selection_wait = Sel_normal;
2894
2895#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return;
2899#else
2900 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return;
2903#endif
2904 }
2905
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2908}
2909
2910int
2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2912{
2913 Atom sel;
2914
2915 selection_type |= selnum;
2916
2917 if (selnum == Sel_Primary)
2918 sel = XA_PRIMARY;
2919 else if (selnum == Sel_Secondary)
2920 sel = XA_SECONDARY;
2921 else
2922 sel = xa[XA_CLIPBOARD];
2923
2924 if (XGetSelectionOwner (dpy, sel) != None)
2925 {
2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2927 vt, selection_request_time);
2928 return 1;
2929 }
2930
2931 return 0;
2932} 2738}
2933 2739
2934/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2935/* 2741/*
2936 * Clear all selected text 2742 * Clear all selected text
2937 * EXT: SelectionClear 2743 * EXT: SelectionClear
2938 */ 2744 */
2939void 2745void
2940rxvt_term::selection_clear () NOTHROW 2746rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2747{
2748 if (!clipboard)
2749 {
2942 want_refresh = 1; 2750 want_refresh = 1;
2943 free (selection.text); 2751 free (selection.text);
2944 selection.text = NULL; 2752 selection.text = NULL;
2945 selection.len = 0; 2753 selection.len = 0;
2946 CLEAR_SELECTION (); 2754 CLEAR_SELECTION ();
2947 2755
2948 if (display->selection_owner == this) 2756 if (display->selection_owner == this)
2949 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 }
2950} 2768}
2951 2769
2952/* ------------------------------------------------------------------------- */ 2770/* ------------------------------------------------------------------------- */
2953/* 2771/*
2954 * Copy a selection into the cut buffer 2772 * Copy a selection into the cut buffer
2955 * EXT: button 1 or 3 release 2773 * EXT: button 1 or 3 release
2956 */ 2774 */
2957void 2775void
2958rxvt_term::selection_make (Time tm) 2776rxvt_term::selection_make (Time tm)
2959{ 2777{
2960 int i; 2778 int size;
2961 wchar_t *new_selection_text; 2779 wchar_t *new_selection_text;
2962 text_t *t; 2780 text_t *t;
2963 2781
2964 switch (selection.op) 2782 switch (selection.op)
2965 { 2783 {
… …
2981 return; /* nothing selected, go away */ 2799 return; /* nothing selected, go away */
2982 2800
2983 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)))
2984 return; 2802 return;
2985 2803
2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2804 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2987 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));
2988 2806
2989 int ofs = 0; 2807 int ofs = 0;
2990 int extra = 0; 2808 int extra = 0;
2991 2809
2992 int col = selection.beg.col; 2810 int col = selection.beg.col;
… …
2998 { 2816 {
2999#if !ENABLE_MINIMAL 2817#if !ENABLE_MINIMAL
3000 if (selection.rect) 2818 if (selection.rect)
3001 { 2819 {
3002 col = selection.beg.col; 2820 col = selection.beg.col;
3003 end_col = ncol + 1; 2821 end_col = selection.end.col;
3004 } 2822 }
3005 else 2823 else
3006#endif 2824#endif
3007 end_col = ROW(row).l; 2825 end_col = ROW(row).l;
3008 2826
3009 col = max (col, 0); 2827 col = max (col, 0);
3010 2828
3011 if (row == selection.end.row 2829 if (row == selection.end.row)
3012#if !ENABLE_MINIMAL
3013 || selection.rect
3014#endif
3015 )
3016 min_it (end_col, selection.end.col); 2830 min_it (end_col, selection.end.col);
3017 2831
3018 t = ROW(row).t + col; 2832 t = ROW(row).t + col;
3019 2833
3020 for (; col < end_col; col++) 2834 for (; col < end_col; col++)
… …
3028 2842
3029 extra -= (len - 1); 2843 extra -= (len - 1);
3030 2844
3031 if (extra < 0) 2845 if (extra < 0)
3032 { 2846 {
3033 extra += i; 2847 extra += size;
3034 i += i; 2848 size += size;
3035 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));
3036 } 2850 }
3037 2851
3038 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2852 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3039 } 2853 }
3040#endif 2854#endif
… …
3052 2866
3053 new_selection_text[ofs++] = C0_LF; 2867 new_selection_text[ofs++] = C0_LF;
3054 } 2868 }
3055 else 2869 else
3056#endif 2870#endif
3057 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))
3058 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3059 } 2875 }
3060
3061 if (end_col != selection.end.col)
3062 new_selection_text[ofs++] = C0_LF;
3063 2876
3064 new_selection_text[ofs] = 0; 2877 new_selection_text[ofs] = 0;
3065 2878
3066 if (ofs == 0) 2879 if (ofs == 0)
3067 { 2880 {
… …
3080 2893
3081 selection_grab (tm); 2894 selection_grab (tm);
3082} 2895}
3083 2896
3084bool 2897bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 2899{
2900 Atom sel;
2901
2902 if (!clipboard)
2903 {
3087 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 }
3088 2912
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2913 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2914 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 2915 {
3092 display->set_selection_owner (this); 2916 display->set_selection_owner (this, clipboard);
3093 return true; 2917 return true;
3094 } 2918 }
3095 else 2919 else
3096 { 2920 {
3097 selection_clear (); 2921 selection_clear (clipboard);
3098 return false; 2922 return false;
3099 } 2923 }
3100 2924
3101#if 0 2925#if 0
3102 XTextProperty ct; 2926 XTextProperty ct;
… …
3112/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
3113/* 2937/*
3114 * 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
3115 * EXT: button 1 press 2939 * EXT: button 1 press
3116 */ 2940 */
3117void 2941void ecb_cold
3118rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3119{ 2943{
3120 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
3121 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
3122 2946
… …
3141 2965
3142/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
3143/* 2967/*
3144 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
3145 */ 2969 */
3146void 2970void ecb_cold
3147rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3148{ 2972{
3149 want_refresh = 1; 2973 want_refresh = 1;
3150 2974
3151 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3174 * Word select: select text for 2 clicks 2998 * Word select: select text for 2 clicks
3175 * We now only find out the boundary in one direction 2999 * We now only find out the boundary in one direction
3176 */ 3000 */
3177 3001
3178/* 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 */
3179#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3180 (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)))
3181#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3182 3006
3183void 3007void ecb_cold
3184rxvt_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
3185{ 3009{
3186 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3187 row_col_t bound; 3011 row_col_t bound;
3188 text_t *stp; 3012 text_t *stp;
… …
3262 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3263 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3264 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3265 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3266 */ 3090 */
3267void 3091void ecb_cold
3268rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3269{ 3093{
3270 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3271 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3272 3096
… …
3298 3122
3299/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3300/* 3124/*
3301 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3302 */ 3126 */
3303void 3127void ecb_cold
3304rxvt_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
3305{ 3129{
3306 row_col_t pos; 3130 row_col_t pos;
3307 enum { 3131 enum {
3308 LEFT, RIGHT 3132 LEFT, RIGHT
3309 } closeto = RIGHT; 3133 } closeto = RIGHT;
3310
3311 want_refresh = 1;
3312 3134
3313 switch (selection.op) 3135 switch (selection.op)
3314 { 3136 {
3315 case SELECTION_INIT: 3137 case SELECTION_INIT:
3316 CLEAR_SELECTION (); 3138 CLEAR_SELECTION ();
… …
3496 3318
3497#if !ENABLE_MINIMAL 3319#if !ENABLE_MINIMAL
3498 if (selection.rect && selection.beg.col > selection.end.col) 3320 if (selection.rect && selection.beg.col > selection.end.col)
3499 ::swap (selection.beg.col, selection.end.col); 3321 ::swap (selection.beg.col, selection.end.col);
3500#endif 3322#endif
3323
3324 selection_changed ();
3501} 3325}
3502 3326
3503#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3504void 3328void ecb_cold
3505rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3506{ 3330{
3507 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3508 text_t *stp; 3332 text_t *stp;
3509 3333
… …
3547/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3548/* 3372/*
3549 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3550 * EXT: button 3 double click 3374 * EXT: button 3 double click
3551 */ 3375 */
3552void 3376void ecb_cold
3553rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3554{ 3378{
3555 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3556 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3557} 3381}
… …
3559/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3560/* 3384/*
3561 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3562 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3563 */ 3387 */
3564void 3388void ecb_cold
3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3566{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3567 XSelectionEvent ev; 3392 XSelectionEvent ev;
3568 3393
3569 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3570 ev.property = None; 3395 ev.property = None;
3571 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3586 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3587#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3588 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3589#endif 3414#endif
3590 3415
3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3592 32, PropModeReplace, 3417 32, PropModeReplace,
3593 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3594 ev.property = rq.property; 3419 ev.property = property;
3595 } 3420 }
3596#if TODO // TODO 3421#if TODO // TODO
3597 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3423 {
3599 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3600 } 3425 }
3601#endif 3426#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3428 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3605 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3606 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;
3607 } 3438 }
3608 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3611 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3643 { 3474 {
3644 target = xa[XA_COMPOUND_TEXT]; 3475 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3476 style = enc_compound_text;
3646 } 3477 }
3647 3478
3648 if (selection.text) 3479 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3480 {
3650 cl = selection.text; 3481 cl = selection.text;
3651 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;
3652 } 3488 }
3653 else 3489 else
3654 { 3490 {
3655 cl = L""; 3491 cl = L"";
3656 selectlen = 0; 3492 selectlen = 0;
… …
3677 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3678 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3679 ct.encoding = target; 3515 ct.encoding = target;
3680 } 3516 }
3681 3517
3682 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3683 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3684 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3685 ev.property = rq.property; 3521 ev.property = property;
3686 3522
3687 if (freect) 3523 if (freect)
3688 XFree (ct.value); 3524 XFree (ct.value);
3689 } 3525 }
3690 3526
3691 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3692} 3528}
3693 3529
3694/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3695#ifdef USE_XIM 3531#if USE_XIM
3696void 3532void ecb_cold
3697rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3698{ 3534{
3699 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3700 3536
3701 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);
… …
3724 h += 2; min_it (h, nrow); 3560 h += 2; min_it (h, nrow);
3725 3561
3726 x -= 1; clamp_it (x, 0, ncol - w); 3562 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3563 y -= 1; clamp_it (y, 0, nrow - h);
3728 3564
3729 ov_x = x; ov_y = y; 3565 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3566 ov.w = w; ov.h = h;
3731 3567
3732 ov_text = new text_t *[h]; 3568 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3569 ov.rend = new rend_t *[h];
3734 3570
3735 for (y = 0; y < h; y++) 3571 for (y = 0; y < h; y++)
3736 { 3572 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3573 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3574 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3575
3740 text_t t0, t1, t2; 3576 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3577 rend_t r = OVERLAY_RSTYLE;
3742 3578
3743 if (y == 0) 3579 if (y == 0)
… …
3762} 3598}
3763 3599
3764void 3600void
3765rxvt_term::scr_overlay_off () NOTHROW 3601rxvt_term::scr_overlay_off () NOTHROW
3766{ 3602{
3767 if (!ov_text) 3603 if (!ov.text)
3768 return; 3604 return;
3769 3605
3770 want_refresh = 1; 3606 want_refresh = 1;
3771 3607
3772 for (int y = 0; y < ov_h; y++) 3608 for (int y = 0; y < ov.h; y++)
3773 { 3609 {
3774 delete [] ov_text[y]; 3610 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3611 delete [] ov.rend[y];
3776 } 3612 }
3777 3613
3778 delete [] ov_text; ov_text = 0; 3614 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3615 delete [] ov.rend; ov.rend = 0;
3780} 3616}
3781 3617
3782void 3618void
3783rxvt_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
3784{ 3620{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3622 return;
3787 3623
3788 x++, y++; 3624 x++, y++;
3789 3625
3790 ov_text[y][x] = text; 3626 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3627 ov.rend[y][x] = rend;
3792} 3628}
3793 3629
3794void 3630void
3795rxvt_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
3796{ 3632{
… …
3815} 3651}
3816 3652
3817void 3653void
3818rxvt_term::scr_swap_overlay () NOTHROW 3654rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3655{
3820 if (!ov_text) 3656 if (!ov.text)
3821 return; 3657 return;
3822 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
3823 // swap screen mem with overlay 3664 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3665 for (int y = ov.h; y--; )
3825 { 3666 {
3826 text_t *t1 = ov_text[y]; 3667 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3668 rend_t *r1 = ov.rend[y];
3828 3669
3829 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;
3830 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;
3831 3672
3832 for (int x = ov_w; x--; ) 3673 for (int x = ov.w; x--; )
3833 { 3674 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3675 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 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));
3836 } 3677 }
3837 } 3678 }

Diff Legend

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