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

Diff Legend

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