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

Diff Legend

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