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

Diff Legend

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