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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 2013 UTC

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

Diff Legend

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