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.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.437 by sf-exg, Mon Mar 25 12:28:04 2013 UTC

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

Diff Legend

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