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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
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);
… …
1464 line_t *line = &ROW(row); 1512 line_t *line = &ROW(row);
1465 1513
1466 line->touch (); 1514 line->touch ();
1467 line->is_longer (0); 1515 line->is_longer (0);
1468 1516
1469 // nuke wide char at beginning 1517 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1518 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1519 scr_kill_char (*line, screen.cur.col);
1472 1520
1473 switch (insdel) 1521 switch (insdel)
1474 { 1522 {
… …
1513 1561
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1562 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1563 break;
1516 1564
1517 case DELETE: 1565 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1566 line->l = max (line->l - count, 0);
1520 1567
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 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);
1522 1571
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1572 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1573 {
1525 line->t[col] = line->t[col + count]; 1574 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1575 line->r[col] = line->r[col + count];
1527 } 1576 }
1528 1577
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1578 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1579
1535 if (selection.op && current_screen == selection.screen 1580 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1581 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1582 {
1538 if (selection.end.row != screen.cur.row 1583 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1584 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1585 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1586 CLEAR_SELECTION ();
1542 else 1587 else
1543 { 1588 {
1544 /* shift selection */ 1589 /* shift selection */
1545 selection.beg.col -= count; 1590 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1591 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1592 selection.end.col -= count;
1548 } 1593 }
1549 }
1550 } 1594 }
1551 1595
1552 break; 1596 break;
1553 } 1597 }
1554} 1598}
… …
1556/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1557/* 1601/*
1558 * Set the scrolling region 1602 * Set the scrolling region
1559 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1560 */ 1604 */
1561void 1605void ecb_cold
1562rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1563{ 1607{
1564 max_it (top, 0); 1608 max_it (top, 0);
1565 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1566 1610
… …
1576/* 1620/*
1577 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1578 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1579 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1580 */ 1624 */
1581void 1625void ecb_cold
1582rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1583{ 1627{
1584 want_refresh = 1; 1628 want_refresh = 1;
1585 1629
1586 if (mode) 1630 if (mode)
… …
1593/* 1637/*
1594 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1595 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1596 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1597 */ 1641 */
1598void 1642void ecb_cold
1599rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1600{ 1644{
1601 if (mode) 1645 if (mode)
1602 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1603 else 1647 else
… …
1612 * 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
1613 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1614 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1615 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1616 */ 1660 */
1617void 1661void ecb_cold
1618rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1619{ 1663{
1620 if (mode) 1664 if (mode)
1621 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1622 else 1666 else
… …
1629/* 1673/*
1630 * Set insert/replace mode 1674 * Set insert/replace mode
1631 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1632 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1633 */ 1677 */
1634void 1678void ecb_cold
1635rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1636{ 1680{
1637 if (mode) 1681 if (mode)
1638 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1639 else 1683 else
… …
1645 * Set/Unset tabs 1689 * Set/Unset tabs
1646 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1647 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1648 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1649 */ 1693 */
1650void 1694void ecb_cold
1651rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1652{ 1696{
1653 if (mode < 0) 1697 if (mode < 0)
1654 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1655 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1674 if (rvideo_state != on) 1718 if (rvideo_state != on)
1675 { 1719 {
1676 rvideo_state = on; 1720 rvideo_state = on;
1677 1721
1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1680 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1681#endif 1725#endif
1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1683 1727
1684 XGCValues gcvalue; 1728 XGCValues gcvalue;
1685 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1694/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1695/* 1739/*
1696 * Report current cursor position 1740 * Report current cursor position
1697 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1698 */ 1742 */
1699void 1743void ecb_cold
1700rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1701{ 1745{
1702 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);
1703} 1747}
1704 1748
… …
1707 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1708 1752
1709/* 1753/*
1710 * Set font style 1754 * Set font style
1711 */ 1755 */
1712void 1756void ecb_cold
1713rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1714{ 1758{
1715#if 0 1759#if 0
1716 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1717 { 1761 {
… …
1739 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1740 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1741 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1742 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1743 */ 1787 */
1744void 1788void ecb_cold
1745rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1746{ 1790{
1747 screen.charset = set; 1791 screen.charset = set;
1748 set_font_style (); 1792 set_font_style ();
1749} 1793}
… …
1770 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1771 1815
1772/* 1816/*
1773 * refresh matching text. 1817 * refresh matching text.
1774 */ 1818 */
1775bool 1819bool ecb_cold
1776rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1777{ 1821{
1778 bool found = false; 1822 bool found = false;
1779 1823
1780 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1799 PART_BEG = 0, 1843 PART_BEG = 0,
1800 PART_END, 1844 PART_END,
1801 RC_COUNT 1845 RC_COUNT
1802}; 1846};
1803 1847
1804void 1848void ecb_hot
1805rxvt_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
1806{ 1850{
1807 int i; 1851 int i;
1808 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1809 1853
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1873 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1874 {
1831 min_it (rc[i].col, ncol - 1); 1875 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1876 min_it (rc[i].row, nrow - 1);
1833 } 1877 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1878
1835 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++)
1836 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);
1837 1881
1838 num_scr_allow = 0; 1882 num_scr_allow = 0;
1839 1883
… …
1846 * Refresh the entire screen 1890 * Refresh the entire screen
1847 */ 1891 */
1848void 1892void
1849rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1850{ 1894{
1851 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1852} 1896}
1853 1897
1854/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1855/* 1899/*
1856 * 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
… …
1912 1956
1913# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1914# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1915 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1916# endif 1960# endif
1917 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1918# endif 1962# endif
1919 1963
1920# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1921 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1922 set_urgency (1); 1966 set_urgency (1);
… …
1930 1974
1931 bell_ev.start (VISUAL_BELL_DURATION); 1975 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1976 }
1933 else 1977 else
1934 XBell (dpy, 0); 1978 XBell (dpy, 0);
1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1980#endif
1936} 1981}
1937 1982
1938/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1984void ecb_cold
1940void
1941rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1942{ 1986{
1943#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1944 int nrows, row_start; 1988 int nrows, row_start;
1945 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
1958 row_start = view_start; 2002 row_start = view_start;
1959 } 2003 }
1960 2004
1961 wctomb (0, 0); 2005 wctomb (0, 0);
1962 2006
1963 for (int r1 = 0; r1 < nrows; r1++) 2007 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 2008 {
1965 text_t *tp = ROW(r1).t; 2009 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 2010 int len = ROW(r1).l;
1967 2011
1968 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
… …
1994/* 2038/*
1995 * Refresh the screen 2039 * Refresh the screen
1996 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
1997 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2042 */
1999void 2043void ecb_hot
2000rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2001{ 2045{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2048 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */
2009#endif
2010 rend_t *crp; // cursor rendition pointer
2011 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2012 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2013 2054
2014 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2015 2056
2016 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2017 return; 2058 return;
… …
2019 /* 2060 /*
2020 * A: set up vars 2061 * A: set up vars
2021 */ 2062 */
2022 refresh_count = 0; 2063 refresh_count = 0;
2023 2064
2065 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2066 bool have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2026 have_bg = bgPixmap.pixmap != None; 2068 have_bg = bg_img != 0;
2027#endif 2069#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2071
2030 /* 2072 /*
2031 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
2032 */ 2074 */
2033 scr_reverse_selection (); 2075 scr_reverse_selection ();
2034 2076
2077 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2078#if ENABLE_OVERLAY
2079 scr_swap_overlay ();
2080#endif
2081
2082 bool showcursor = screen.flags & Screen_VisibleCursor;
2083
2035 /* 2084 /*
2036 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2037 */ 2086 */
2038 { 2087 {
2039 unsigned char setoldcursor;
2040
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2089 if (hidden_cursor)
2044 showcursor = 0; 2090 showcursor = 0;
2045#endif 2091#endif
2046 2092
… …
2049 int col = screen.cur.col; 2095 int col = screen.cur.col;
2050 2096
2051 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2052 col--; 2098 col--;
2053 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2054 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2055 2107
2056#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2057 cc1 = *crp & (RS_fgMask | RS_bgMask);
2058 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2059 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2060 else 2111 else
2061#endif 2112#endif
2062#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2074 ccol2 = bgcolor_of (rstyle); 2125 ccol2 = bgcolor_of (rstyle);
2075#else 2126#else
2076 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2077#endif 2128#endif
2078 2129
2079 if (showcursor && focus) 2130 if (focus)
2080 { 2131 {
2132 rend_t rend = cur_rend;
2133
2081 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2083 else 2136 else
2084 { 2137 {
2085 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2086 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2087 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2088 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2089 } 2144 }
2090 } 2145 }
2091 2146
2092 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2093 setoldcursor = 0;
2094 if (ocrow != -1) 2148 if (ocrow != -1)
2095 { 2149 {
2096 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2097 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2098 { 2152 {
2099 if (ocrow < nrow 2153 if (ocrow < nrow
2100 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2101 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2102
2103 if (focus || !showcursor)
2104 oldcursor.row = -1;
2105 else
2106 setoldcursor = 1;
2107 } 2156 }
2108 } 2157 }
2109 else if (!focus)
2110 setoldcursor = 1;
2111 2158
2112 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2113 { 2163 {
2114 if (screen.cur.row - view_start >= nrow)
2115 oldcursor.row = -1;
2116 else
2117 {
2118 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2119 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2120 }
2121 } 2166 }
2167 else
2168 oldcursor.row = -1;
2122 } 2169 }
2123
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128 2170
2129#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2172 /*
2131 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2174 * This has been deliberately kept simple.
… …
2137 { 2179 {
2138 int16_t nits; 2180 int16_t nits;
2139 int i = num_scr; 2181 int i = num_scr;
2140 int j; 2182 int j;
2141 int len, wlen; 2183 int len, wlen;
2142 dLocal (int, num_scr);
2143 2184
2144 j = nrow; 2185 j = nrow;
2145 wlen = len = -1; 2186 wlen = len = -1;
2146 row = i > 0 ? 0 : j - 1; 2187 row = i > 0 ? 0 : j - 1;
2147 2188
… …
2222 continue; 2263 continue;
2223 2264
2224 // redraw one or more characters 2265 // redraw one or more characters
2225 2266
2226 // seek to the beginning of wide characters 2267 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2268 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2228 --col; 2269 --col;
2229 2270
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2271 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2272 text_t *text = stp + col;
2232 int count = 1; 2273 int count = 1;
2233 2274
2234 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2235 drp[col] = rend; 2276 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2280 for (i = 0; ++col < ncol; )
2240 { 2281 {
2241 if (stp[col] == NOCHAR) 2282 if (stp[col] == NOCHAR)
2242 { 2283 {
2243 dtp[col] = stp[col]; 2284 dtp[col] = stp[col];
2244 drp[col] = rend; 2285 drp[col] = srp[col];
2286
2245 count++; 2287 count++;
2246 i++; 2288 i++;
2247 2289
2248 continue; 2290 continue;
2249 } 2291 }
… …
2269 2311
2270 col--; /* went one too far. move back */ 2312 col--; /* went one too far. move back */
2271 count -= i; /* dump any matching trailing chars */ 2313 count -= i; /* dump any matching trailing chars */
2272 2314
2273 // sometimes we optimize away the trailing NOCHAR's, add them back 2315 // sometimes we optimize away the trailing NOCHAR's, add them back
2274 while (expect_false (i && text[count] == NOCHAR)) 2316 while (ecb_unlikely (i && text[count] == NOCHAR))
2275 count++, i--; 2317 count++, i--;
2276 2318
2277 /* 2319 /*
2278 * Determine the attributes for the string 2320 * Determine the attributes for the string
2279 */ 2321 */
2280 int fore = fgcolor_of (rend); // desired foreground 2322 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2323 int back = bgcolor_of (rend); // desired background
2282 2324
2283 // only do special processing if any attributes are set, which is unlikely 2325 // only do special processing if any attributes are set, which is unlikely
2284 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2326 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2285 { 2327 {
2286 bool invert = rend & RS_RVid; 2328 bool invert = rend & RS_RVid;
2287 2329
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2330#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2331 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2350
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2351 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2352 fore = Color_UL;
2311#endif 2353#endif
2312 2354
2355#ifdef OPTION_HC
2356 if (rend & RS_Sel)
2357 {
2358 /* invert the column if no highlightColor is set or it is the
2359 * current cursor column */
2360 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2361 && ISSET_PIXCOLOR (Color_HC))
2362 {
2363 if (ISSET_PIXCOLOR (Color_HTC))
2364 fore = Color_HTC;
2365 // if invert is 0 reverse video is set so we use bg color as fg color
2366 else if (!invert)
2367 fore = back;
2368
2369 back = Color_HC;
2370 invert = 0;
2371 }
2372 }
2373#endif
2374
2313 if (invert) 2375 if (invert)
2314 { 2376 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2321 ::swap (fore, back); 2377 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2378
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2379#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2329 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV;
2331# endif
2332 if (fore == back) 2380 if (fore == back)
2333 { 2381 {
2334 fore = Color_bg; 2382 fore = Color_bg;
2335 back = Color_fg; 2383 back = Color_fg;
2336 } 2384 }
… …
2372 /* 2420 /*
2373 * Actually do the drawing of the string here 2421 * Actually do the drawing of the string here
2374 */ 2422 */
2375 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2423 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2376 2424
2377 if (expect_true (have_bg && back == Color_bg)) 2425 if (ecb_likely (have_bg && back == Color_bg))
2378 { 2426 {
2379 // this is very ugly, maybe push it into ->draw? 2427 // this is very ugly, maybe push it into ->draw?
2380 2428
2381 for (i = 0; i < count; i++) /* don't draw empty strings */ 2429 for (i = 0; i < count; i++) /* don't draw empty strings */
2382 if (text[i] != ' ') 2430 if (text[i] != ' ')
… …
2389 did_clear: ; 2437 did_clear: ;
2390 } 2438 }
2391 else 2439 else
2392 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2393 2441
2394 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2395 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2396#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2397 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2398 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2399 else 2451 else
2400#endif 2452#endif
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2457 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2458 }
2407 } /* for (col....) */ 2459 } /* for (col....) */
2408 } /* for (row....) */ 2460 } /* for (row....) */
2409 2461
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2462 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2464 */
2418 if (showcursor) 2465 if (showcursor)
2419 { 2466 {
2420 if (focus) 2467 if (focus)
2421 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2422 if (option (Opt_cursorUnderline))
2423 *crp ^= RS_Uline;
2424 else
2425 {
2426 *crp ^= RS_RVid;
2427#ifndef NO_CURSORCOLOR
2428 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2429#endif
2430 }
2431 }
2432 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2433 { 2470 {
2434 int cursorwidth = 1;
2435 int col = oldcursor.col;
2436
2437 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2438 col--;
2439
2440 while (col + cursorwidth < ncol
2441 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2442 cursorwidth++;
2443
2444#ifndef NO_CURSORCOLOR
2445 if (ISSET_PIXCOLOR (Color_cursor))
2446 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2447 else
2448#endif
2449 XSetForeground (dpy, gc, pix_colors[ccol1]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2450 2472
2451 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2452 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2453 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2456 } 2478 }
2457 } 2479 }
2458 2480
2459 /* 2481 /*
2460 * H: cleanup selection 2482 * H: cleanup selection
2461 */ 2483 */
2484#if ENABLE_OVERLAY
2485 scr_swap_overlay ();
2486#endif
2487 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2488
2462 scr_reverse_selection (); 2489 scr_reverse_selection ();
2463 2490
2491 screen.flags = old_screen_flags;
2464 num_scr = 0; 2492 num_scr = 0;
2465 num_scr_allow = 1; 2493 num_scr_allow = 1;
2466} 2494}
2467 2495
2468void 2496void ecb_cold
2469rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2497rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2470{ 2498{
2471 if (!l.t) 2499 if (!l.valid ())
2472 return; 2500 return;
2473 2501
2474 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2502 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2475 2503
2476 for (int i = ncol; i--; ) 2504 for (int i = ncol; i--; )
2477 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2505 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2478} 2506}
2479 2507
2480void 2508void ecb_cold
2481rxvt_term::scr_remap_chars () NOTHROW 2509rxvt_term::scr_remap_chars () NOTHROW
2482{ 2510{
2483 for (int i = total_rows; i--; ) 2511 for (int i = total_rows; i--; )
2484 scr_remap_chars (row_buf [i]); 2512 scr_remap_chars (row_buf [i]);
2485 2513
… …
2488 scr_remap_chars (drawn_buf [i]); 2516 scr_remap_chars (drawn_buf [i]);
2489 scr_remap_chars (swap_buf [i]); 2517 scr_remap_chars (swap_buf [i]);
2490 } 2518 }
2491} 2519}
2492 2520
2493void 2521void ecb_cold
2494rxvt_term::scr_recolour () NOTHROW 2522rxvt_term::scr_recolour (bool refresh) NOTHROW
2495{ 2523{
2496#ifdef HAVE_BG_PIXMAP 2524 bool transparent = false;
2497 bgPixmap.apply ();
2498#else
2499 2525
2526#ifdef HAVE_IMG
2527 if (bg_img != 0)
2528 {
2529# if ENABLE_TRANSPARENCY
2530 if (bg_flags & BG_IS_TRANSPARENT)
2531 {
2532 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2533 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2534
2535 transparent = true;
2536 }
2537 else
2538# endif
2539 {
2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2541 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2542 }
2543 }
2544 else
2545#endif
2546 {
2500 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2501 XClearWindow (dpy, parent[0]);
2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2548 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2549 }
2550
2551 XClearWindow (dpy, parent);
2503 2552
2504 if (scrollBar.win) 2553 if (scrollBar.win)
2505 { 2554 {
2555 if (transparent)
2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2557 else
2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2507 scrollBar.state = STATE_IDLE; 2559 scrollBar.state = SB_STATE_IDLE;
2508 scrollBar.show (0); 2560 scrollBar.show (0);
2509 } 2561 }
2510 2562
2511#endif 2563 if (refresh)
2512 2564 {
2513 /* bgPixmap.apply () does not do the following : */
2514 scr_clear (); 2565 scr_clear ();
2515 scr_touch (true); 2566 scr_touch (true);
2567 }
2516 want_refresh = 1; 2568 want_refresh = 1;
2517} 2569}
2518 2570
2519/* ------------------------------------------------------------------------- */ 2571/* ------------------------------------------------------------------------- */
2520void 2572void
… …
2577 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2629 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2578 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
2579} 2631}
2580 2632
2581/* ------------------------------------------------------------------------- */ 2633/* ------------------------------------------------------------------------- */
2582void 2634void ecb_hot
2583rxvt_term::scr_reverse_selection () NOTHROW 2635rxvt_term::scr_reverse_selection () NOTHROW
2584{ 2636{
2585 if (selection.op 2637 if (selection.op
2586 && current_screen == selection.screen 2638 && current_screen == selection.screen
2587 && selection.end.row >= view_start) 2639 && selection.end.row >= view_start)
2588 { 2640 {
2589#if !ENABLE_MINIMAL 2641#if !ENABLE_MINIMAL
2590 if (selection.rect) 2642 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2643 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2644 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2645 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2646 else
2595#endif 2647#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2648 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2649 selection.end.row, selection.end.col,
2598 RS_RVid); 2650 RS_Sel | RS_RVid);
2599 } 2651 }
2600} 2652}
2601 2653
2602/* ------------------------------------------------------------------------- */ 2654/* ------------------------------------------------------------------------- */
2603/* 2655/*
… …
2606 */ 2658 */
2607#if 0 2659#if 0
2608void 2660void
2609rxvt_term::scr_dump (int fd) NOTHROW 2661rxvt_term::scr_dump (int fd) NOTHROW
2610{ 2662{
2611 int row, wrote; 2663 // if this method is needed, it can be implemented by factoring the
2612 unsigned int width, towrite; 2664 // relevant code in scr_printscreen
2613 char r1[] = "\n";
2614
2615 for (row = saveLines + top_row;
2616 row < saveLines + nrow - 1; row++)
2617 {
2618 width = row_buf[row].l >= 0 ? row_buf[row].l
2619 : ncol;
2620 for (towrite = width; towrite; towrite -= wrote)
2621 {
2622 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2623 towrite);
2624 if (wrote < 0)
2625 return; /* XXX: death, no report */
2626 }
2627 if (row_buf[row].l >= 0)
2628 if (write (fd, r1, 1) <= 0)
2629 return; /* XXX: death, no report */
2630 }
2631} 2665}
2632#endif 2666#endif
2633 2667
2634/* ------------------------------------------------------------------------- * 2668/* ------------------------------------------------------------------------- *
2635 * CHARACTER SELECTION * 2669 * CHARACTER SELECTION *
2636 * ------------------------------------------------------------------------- */ 2670 * ------------------------------------------------------------------------- */
2637void 2671void
2638rxvt_term::selection_check (int check_more) NOTHROW 2672rxvt_term::selection_check (int check_more) NOTHROW
2639{ 2673{
2640 row_col_t pos;
2641
2642 if (!selection.op) 2674 if (!selection.op)
2643 return; 2675 return;
2644 2676
2645 pos.row = pos.col = 0;
2646 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2677 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2647 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2678 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2648 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2679 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2649 || (check_more == 1 2680 || (check_more == 1
2650 && current_screen == selection.screen 2681 && current_screen == selection.screen
2651 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2652 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2683 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2653 || (check_more == 2
2654 && ROWCOL_IS_BEFORE (selection.beg, pos)
2655 && ROWCOL_IS_AFTER (selection.end, pos))
2656 || (check_more == 3
2657 && ROWCOL_IS_AFTER (selection.end, pos))
2658 || (check_more == 4 /* screen width change */
2659 && (selection.beg.row != selection.end.row
2660 || selection.end.col > ncol)))
2661 CLEAR_SELECTION (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2662} 2699}
2663 2700
2664/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2665/* 2702/*
2666 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2667 */ 2704 */
2668void 2705void
2669rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670{ 2707{
2671 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2672 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2673 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2674 data[i] = C0_CR; 2711 data[i] = C0_CR;
2675 2712
2676 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2677 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2678 2715
2679 tt_write (data, len); 2716 tt_write (data, len);
2680 2717
2681 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2683} 2720}
2684 2721
2685/* ------------------------------------------------------------------------- */
2686/*
2687 * Respond to a notification that a primary selection has been sent
2688 * EXT: SelectionNotify
2689 */
2690void 2722void
2691rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2692{ 2724{
2693 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2694 {
2695 if ((selection_type & Sel_CompoundText))
2696 {
2697 int selnum = selection_type & Sel_whereMask;
2698
2699 selection_type = 0;
2700 if (selnum != Sel_direct)
2701 selection_request_other (XA_STRING, selnum);
2702 }
2703
2704 if ((selection_type & Sel_UTF8String))
2705 {
2706 int selnum = selection_type & Sel_whereMask;
2707
2708 selection_type = Sel_CompoundText;
2709 if (selnum != Sel_direct)
2710 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2711 else
2712 selection_type = 0;
2713 }
2714
2715 return;
2716 }
2717
2718 unsigned long bytes_after;
2719 XTextProperty ct;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 0, PROP_SIZE / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct.encoding, &ct.format,
2725 &ct.nitems, &bytes_after,
2726 &ct.value) != Success)
2727 {
2728 ct.value = 0;
2729 goto bailout;
2730 }
2731
2732 if (ct.encoding == None)
2733 goto bailout;
2734
2735 if (bytes_after)
2736 {
2737 // fetch and append remaining data
2738 XTextProperty ct2;
2739
2740 if (XGetWindowProperty (dpy, win, prop,
2741 ct.nitems / 4, (bytes_after + 3) / 4,
2742 delete_prop, AnyPropertyType,
2743 &ct2.encoding, &ct2.format,
2744 &ct2.nitems, &bytes_after,
2745 &ct2.value) != Success)
2746 goto bailout;
2747
2748 // realloc should be compatible to XFree, here, and elsewhere, too
2749 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2750 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2751 ct.nitems += ct2.nitems;
2752
2753 XFree (ct2.value);
2754 }
2755
2756 if (ct.value == 0)
2757 goto bailout;
2758
2759 if (ct.encoding == xa[XA_INCR])
2760 {
2761 // INCR selection, start handshake
2762 if (!delete_prop)
2763 XDeleteProperty (dpy, win, prop);
2764
2765 selection_wait = Sel_incr;
2766 incr_buf_fill = 0;
2767 incr_ev.start (10);
2768
2769 goto bailout;
2770 }
2771
2772 if (ct.nitems == 0)
2773 {
2774 if (selection_wait == Sel_incr)
2775 {
2776 XFree (ct.value);
2777
2778 // finally complete, now paste the whole thing
2779 selection_wait = Sel_normal;
2780 ct.value = (unsigned char *)incr_buf;
2781 ct.nitems = incr_buf_fill;
2782 incr_buf = 0;
2783 incr_buf_size = 0;
2784 incr_ev.stop ();
2785 }
2786 else
2787 {
2788 if (selection_wait == Sel_normal
2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2790 {
2791 /*
2792 * pass through again trying CUT_BUFFER0 if we've come from
2793 * XConvertSelection () but nothing was presented
2794 */
2795 selection_paste (display->root, XA_CUT_BUFFER0, False);
2796 }
2797
2798 goto bailout;
2799 }
2800 }
2801 else if (selection_wait == Sel_incr)
2802 {
2803 incr_ev.start (10);
2804
2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2806 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2809 }
2810
2811 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2812 incr_buf_fill += ct.nitems;
2813
2814 goto bailout;
2815 }
2816
2817 char **cl;
2818 int cr;
2819
2820#if !ENABLE_MINIMAL
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING])
2824 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w);
2827 free (w);
2828 // TODO: strlen == only the first element will be converted. well...
2829 paste (s, strlen (s));
2830 free (s);
2831 }
2832 else
2833#endif
2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2835 && cl)
2836 {
2837 for (int i = 0; i < cr; i++)
2838 paste (cl[i], strlen (cl[i]));
2839
2840 XFreeStringList (cl);
2841 }
2842 else
2843 paste ((char *)ct.value, ct.nitems); // paste raw
2844
2845bailout:
2846 XFree (ct.value);
2847
2848 if (selection_wait == Sel_normal)
2849 selection_wait = Sel_none;
2850}
2851
2852void
2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2854{
2855 selection_wait = Sel_none;
2856
2857 incr_buf_size = 0;
2858 free (incr_buf);
2859
2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2861}
2862
2863void
2864rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2865{
2866 if (prop == None || selection_wait != Sel_incr)
2867 return; 2726 return;
2868 2727
2869 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2870} 2729}
2871 2730
2872/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2873/* 2732/*
2874 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2875 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2876 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2877 * > CUT_BUFFER0
2878 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2879 * will auto fallback to CUT_BUFFER0
2880 * EXT: button 2 release 2736 * EXT: button 2 release
2881 */ 2737 */
2882void 2738void
2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2884{ 2740{
2885 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2886 {
2887 /* internal selection */
2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2889 paste (str, strlen (str));
2890 free (str);
2891 return;
2892 } 2742 {
2893 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2894 { 2745 }
2895 selection_request_time = tm;
2896 selection_wait = Sel_normal;
2897
2898#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return;
2902#else
2903 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return;
2906#endif
2907 }
2908
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false);
2911}
2912
2913int
2914rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2915{
2916 Atom sel;
2917
2918 selection_type |= selnum;
2919
2920 if (selnum == Sel_Primary)
2921 sel = XA_PRIMARY;
2922 else if (selnum == Sel_Secondary)
2923 sel = XA_SECONDARY;
2924 else
2925 sel = xa[XA_CLIPBOARD];
2926
2927 if (XGetSelectionOwner (dpy, sel) != None)
2928 {
2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2930 vt, selection_request_time);
2931 return 1;
2932 }
2933
2934 return 0;
2935} 2746}
2936 2747
2937/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2938/* 2749/*
2939 * Clear all selected text 2750 * Clear all selected text
2940 * EXT: SelectionClear 2751 * EXT: SelectionClear
2941 */ 2752 */
2942void 2753void
2943rxvt_term::selection_clear () NOTHROW 2754rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2755{
2756 if (!clipboard)
2757 {
2945 want_refresh = 1; 2758 want_refresh = 1;
2946 free (selection.text); 2759 free (selection.text);
2947 selection.text = NULL; 2760 selection.text = NULL;
2948 selection.len = 0; 2761 selection.len = 0;
2949 CLEAR_SELECTION (); 2762 CLEAR_SELECTION ();
2950 2763
2951 if (display->selection_owner == this) 2764 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2765 display->selection_owner = 0;
2766 }
2767 else
2768 {
2769 free (selection.clip_text);
2770 selection.clip_text = NULL;
2771 selection.clip_len = 0;
2772
2773 if (display->clipboard_owner == this)
2774 display->clipboard_owner = 0;
2775 }
2953} 2776}
2954 2777
2955/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2956/* 2779/*
2957 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2958 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2959 */ 2782 */
2960void 2783void
2961rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
2962{ 2785{
2963 int i; 2786 int size;
2964 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
2965 text_t *t; 2788 text_t *t;
2966 2789
2967 switch (selection.op) 2790 switch (selection.op)
2968 { 2791 {
… …
2984 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
2985 2808
2986 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2987 return; 2810 return;
2988 2811
2989 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2990 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2991 2814
2992 int ofs = 0; 2815 int ofs = 0;
2993 int extra = 0; 2816 int extra = 0;
2994 2817
2995 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
3001 { 2824 {
3002#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3003 if (selection.rect) 2826 if (selection.rect)
3004 { 2827 {
3005 col = selection.beg.col; 2828 col = selection.beg.col;
3006 end_col = ncol + 1; 2829 end_col = selection.end.col;
3007 } 2830 }
3008 else 2831 else
3009#endif 2832#endif
3010 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3011 2834
3012 col = max (col, 0); 2835 col = max (col, 0);
3013 2836
3014 if (row == selection.end.row 2837 if (row == selection.end.row)
3015#if !ENABLE_MINIMAL
3016 || selection.rect
3017#endif
3018 )
3019 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3020 2839
3021 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3022 2841
3023 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3031 2850
3032 extra -= (len - 1); 2851 extra -= (len - 1);
3033 2852
3034 if (extra < 0) 2853 if (extra < 0)
3035 { 2854 {
3036 extra += i; 2855 extra += size;
3037 i += i; 2856 size += size;
3038 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3039 } 2858 }
3040 2859
3041 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3042 } 2861 }
3043#endif 2862#endif
… …
3055 2874
3056 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3057 } 2876 }
3058 else 2877 else
3059#endif 2878#endif
3060 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3061 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3062 } 2883 }
3063
3064 if (end_col != selection.end.col)
3065 new_selection_text[ofs++] = C0_LF;
3066 2884
3067 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3068 2886
3069 if (ofs == 0) 2887 if (ofs == 0)
3070 { 2888 {
… …
3083 2901
3084 selection_grab (tm); 2902 selection_grab (tm);
3085} 2903}
3086 2904
3087bool 2905bool
3088rxvt_term::selection_grab (Time tm) NOTHROW 2906rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089{ 2907{
2908 Atom sel;
2909
2910 if (!clipboard)
2911 {
3090 selection_time = tm; 2912 selection_time = tm;
2913 sel = XA_PRIMARY;
2914 }
2915 else
2916 {
2917 clipboard_time = tm;
2918 sel = xa[XA_CLIPBOARD];
2919 }
3091 2920
3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2921 XSetSelectionOwner (dpy, sel, vt, tm);
3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2922 if (XGetSelectionOwner (dpy, sel) == vt)
3094 { 2923 {
3095 display->set_selection_owner (this); 2924 display->set_selection_owner (this, clipboard);
3096 return true; 2925 return true;
3097 } 2926 }
3098 else 2927 else
3099 { 2928 {
3100 selection_clear (); 2929 selection_clear (clipboard);
3101 return false; 2930 return false;
3102 } 2931 }
3103 2932
3104#if 0 2933#if 0
3105 XTextProperty ct; 2934 XTextProperty ct;
… …
3115/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3116/* 2945/*
3117 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
3118 * EXT: button 1 press 2947 * EXT: button 1 press
3119 */ 2948 */
3120void 2949void ecb_cold
3121rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3122{ 2951{
3123 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3124 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3125 2954
… …
3144 2973
3145/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3146/* 2975/*
3147 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3148 */ 2977 */
3149void 2978void ecb_cold
3150rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3151{ 2980{
3152 want_refresh = 1; 2981 want_refresh = 1;
3153 2982
3154 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3177 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3178 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3179 */ 3008 */
3180 3009
3181/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3182#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3183 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3184#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3185 3014
3186void 3015void ecb_cold
3187rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3188{ 3017{
3189 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3190 row_col_t bound; 3019 row_col_t bound;
3191 text_t *stp; 3020 text_t *stp;
… …
3265 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3266 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3267 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3268 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3269 */ 3098 */
3270void 3099void ecb_cold
3271rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3272{ 3101{
3273 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3274 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3275 3104
… …
3301 3130
3302/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3303/* 3132/*
3304 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3305 */ 3134 */
3306void 3135void ecb_cold
3307rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3308{ 3137{
3309 row_col_t pos; 3138 row_col_t pos;
3310 enum { 3139 enum {
3311 LEFT, RIGHT 3140 LEFT, RIGHT
3312 } closeto = RIGHT; 3141 } closeto = RIGHT;
3313
3314 want_refresh = 1;
3315 3142
3316 switch (selection.op) 3143 switch (selection.op)
3317 { 3144 {
3318 case SELECTION_INIT: 3145 case SELECTION_INIT:
3319 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3499 3326
3500#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3501 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3502 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3503#endif 3330#endif
3331
3332 selection_changed ();
3504} 3333}
3505 3334
3506#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3507void 3336void ecb_cold
3508rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3509{ 3338{
3510 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3511 text_t *stp; 3340 text_t *stp;
3512 3341
… …
3550/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3551/* 3380/*
3552 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3553 * EXT: button 3 double click 3382 * EXT: button 3 double click
3554 */ 3383 */
3555void 3384void ecb_cold
3556rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3557{ 3386{
3558 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3559 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3560} 3389}
… …
3562/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3563/* 3392/*
3564 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3565 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3566 */ 3395 */
3567void 3396void ecb_cold
3568rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3569{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3570 XSelectionEvent ev; 3400 XSelectionEvent ev;
3571 3401
3572 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3573 ev.property = None; 3403 ev.property = None;
3574 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3589 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3590#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3591 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3592#endif 3422#endif
3593 3423
3594 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3595 32, PropModeReplace, 3425 32, PropModeReplace,
3596 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3597 ev.property = rq.property; 3427 ev.property = property;
3598 } 3428 }
3599#if TODO // TODO 3429#if TODO // TODO
3600 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3601 { 3431 {
3602 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3603 } 3433 }
3604#endif 3434#endif
3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606 { 3436 {
3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3608 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3609 ev.property = rq.property; 3439 ev.property = property;
3440 }
3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3442 {
3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3445 ev.property = property;
3610 } 3446 }
3611 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3612 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3613 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3614 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3646 { 3482 {
3647 target = xa[XA_COMPOUND_TEXT]; 3483 target = xa[XA_COMPOUND_TEXT];
3648 style = enc_compound_text; 3484 style = enc_compound_text;
3649 } 3485 }
3650 3486
3651 if (selection.text) 3487 if (rq.selection == XA_PRIMARY && selection.text)
3652 { 3488 {
3653 cl = selection.text; 3489 cl = selection.text;
3654 selectlen = selection.len; 3490 selectlen = selection.len;
3491 }
3492 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3493 {
3494 cl = selection.clip_text;
3495 selectlen = selection.clip_len;
3655 } 3496 }
3656 else 3497 else
3657 { 3498 {
3658 cl = L""; 3499 cl = L"";
3659 selectlen = 0; 3500 selectlen = 0;
… …
3680 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3681 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3682 ct.encoding = target; 3523 ct.encoding = target;
3683 } 3524 }
3684 3525
3685 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3686 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3687 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3688 ev.property = rq.property; 3529 ev.property = property;
3689 3530
3690 if (freect) 3531 if (freect)
3691 XFree (ct.value); 3532 XFree (ct.value);
3692 } 3533 }
3693 3534
3694 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3695} 3536}
3696 3537
3697/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3698#ifdef USE_XIM 3539#if USE_XIM
3699void 3540void ecb_cold
3700rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3701{ 3542{
3702 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3703 3544
3704 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);
… …
3727 h += 2; min_it (h, nrow); 3568 h += 2; min_it (h, nrow);
3728 3569
3729 x -= 1; clamp_it (x, 0, ncol - w); 3570 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3571 y -= 1; clamp_it (y, 0, nrow - h);
3731 3572
3732 ov_x = x; ov_y = y; 3573 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3574 ov.w = w; ov.h = h;
3734 3575
3735 ov_text = new text_t *[h]; 3576 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3577 ov.rend = new rend_t *[h];
3737 3578
3738 for (y = 0; y < h; y++) 3579 for (y = 0; y < h; y++)
3739 { 3580 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3581 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3582 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3583
3743 text_t t0, t1, t2; 3584 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3585 rend_t r = OVERLAY_RSTYLE;
3745 3586
3746 if (y == 0) 3587 if (y == 0)
… …
3765} 3606}
3766 3607
3767void 3608void
3768rxvt_term::scr_overlay_off () NOTHROW 3609rxvt_term::scr_overlay_off () NOTHROW
3769{ 3610{
3770 if (!ov_text) 3611 if (!ov.text)
3771 return; 3612 return;
3772 3613
3773 want_refresh = 1; 3614 want_refresh = 1;
3774 3615
3775 for (int y = 0; y < ov_h; y++) 3616 for (int y = 0; y < ov.h; y++)
3776 { 3617 {
3777 delete [] ov_text[y]; 3618 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3619 delete [] ov.rend[y];
3779 } 3620 }
3780 3621
3781 delete [] ov_text; ov_text = 0; 3622 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3623 delete [] ov.rend; ov.rend = 0;
3783} 3624}
3784 3625
3785void 3626void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3627rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3628{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3629 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3630 return;
3790 3631
3791 x++, y++; 3632 x++, y++;
3792 3633
3793 ov_text[y][x] = text; 3634 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3635 ov.rend[y][x] = rend;
3795} 3636}
3796 3637
3797void 3638void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3639rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3640{
… …
3818} 3659}
3819 3660
3820void 3661void
3821rxvt_term::scr_swap_overlay () NOTHROW 3662rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3663{
3823 if (!ov_text) 3664 if (!ov.text)
3824 return; 3665 return;
3825 3666
3667 // hide cursor if it is within the overlay area
3668 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3669 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3670 screen.flags &= ~Screen_VisibleCursor;
3671
3826 // swap screen mem with overlay 3672 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3673 for (int y = ov.h; y--; )
3828 { 3674 {
3829 text_t *t1 = ov_text[y]; 3675 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3676 rend_t *r1 = ov.rend[y];
3831 3677
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3678 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3679 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3680
3835 for (int x = ov_w; x--; ) 3681 for (int x = ov.w; x--; )
3836 { 3682 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3683 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3684 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3685 }
3840 } 3686 }

Diff Legend

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