ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.320 by root, Tue Nov 4 23:20:17 2008 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 2013 UTC

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

Diff Legend

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