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.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
40} 38}
41 39
42/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
46 42
47/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
100 96
101/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
102void 98void
103rxvt_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
104{ 100{
105 if (!l.t) 101 if (!l.valid ())
106 { 102 {
107 lalloc (l); 103 l.alloc ();
108 col = 0; 104 col = 0;
109 width = ncol; 105 width = ncol;
110 } 106 }
111 107
112 l.touch (); 108 l.touch ();
154 l.r[col] = rend; 150 l.r[col] = rend;
155 col++; 151 col++;
156 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
157} 153}
158 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
159/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
162 168
163void 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
164rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
165{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
166 view_start = 0; 220 view_start = 0;
167 num_scr = 0; 221 num_scr = 0;
168 222
169 if (ncol == 0) 223 if (ncol == 0)
170 ncol = 80; 224 ncol = 80;
190 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
191 245
192 screen.tscroll = 0; 246 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
194 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
195 if (!row_buf) 257 if (!prev_row_buf)
196 { 258 {
197 /*
198 * first time called so just malloc everything: don't rely on realloc
199 */
200 top_row = 0; 259 top_row = 0;
201 term_start = 0; 260 term_start = 0;
202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209
210 for (int row = nrow; row--; )
211 {
212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
214 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
215 }
216 261
217 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
243 { 288 {
244 /* 289 /*
245 * add or delete rows as appropriate 290 * add or delete rows as appropriate
246 */ 291 */
247 292
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
249 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
250
251#if 0
252 if (nrow < prev_nrow)
253 {
254 for (int row = nrow; row < prev_nrow; row++)
255 {
256 lfree (swap_buf [row]);
257 lfree (drawn_buf[row]);
258 }
259 }
260#endif
261
262 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 294
265 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
266 { 296 {
267 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
269 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
270 300
271 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
272 { 302 }
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 }
276
277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 303
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
283 307
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 316
293 do 317 do
294 { 318 {
295 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 321 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 323
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 325 {
302 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
303 327
304 plines++; 328 plines++;
305 llen += prev_ncol; 329 llen += prev_ncol;
318 342
319 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
321 { 345 {
322 qline = row_buf + qrow; 346 qline = row_buf + qrow;
323 lalloc (*qline); 347 qline->alloc (); // redundant with next line
324 qline->l = ncol; 348 qline->l = ncol;
325 qline->is_longer (1); 349 qline->is_longer (1);
326 350
327 int qcol = 0; 351 int qcol = 0;
328 352
343 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
344 // least. 368 // least.
345 if (prow == ocur.row) 369 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
347 371
348 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
349 373
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 375
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
374 { 398 {
375 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
376 400
377 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
378 { 402 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
381 405
382 qline = pline; 406 copy_line (dst, src);
383 lresize (qline);
384 } 407 }
385 408
386 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 411
391 term_start = 0; 412 term_start = 0;
392 } 413 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 414
398 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 417 }
401 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
402 free (tabs); 428 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
404 430
405 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
413 tt_winch (); 439 tt_winch ();
414 440
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 442}
417 443
418/* ------------------------------------------------------------------------- */ 444void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
424{ 446{
425 if (row_buf) 447 chunk_free (chunk, chunk_size);
426 { 448 chunk = 0;
427 delete talloc; talloc = 0; 449 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 450
430 free (row_buf);
431 free (swap_buf);
432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
435 free (tabs); 451 free (tabs);
436 tabs = 0; 452 tabs = 0;
437 }
438} 453}
439 454
440/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
441/* 456/*
442 * Hard/Soft reset 457 * Hard/Soft reset
443 */ 458 */
444void 459void ecb_cold
445rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
446{ 461{
447 scr_release (); 462 scr_release ();
463
448 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 465 rvideo_mode = false;
450 scr_soft_reset (); 466 scr_soft_reset ();
451 scr_reset (); 467 scr_reset ();
452 468
453 scr_clear (true); 469 scr_clear (true);
454 scr_refresh (); 470 scr_refresh ();
455} 471}
456 472
457void 473void ecb_cold
458rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
459{ 475{
460 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
462 scr_overlay_off (); 478 scr_overlay_off ();
463#endif 479#endif
518 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
520} 536}
521 537
522void 538void
523rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
524{ 540{
525 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
526 return; 542 return;
527 543
528 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
547 return; 563 return;
548 564
549 want_refresh = 1; 565 want_refresh = 1;
550 view_start = 0; 566 view_start = 0;
551 567
552 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
553 574
554 current_screen = scrn; 575 current_screen = scrn;
555 576
556#if NSCREENS 577#if NSCREENS
557 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
623/* 644/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 646 * count positive ==> scroll up
626 * count negative ==> scroll down 647 * count negative ==> scroll down
627 */ 648 */
628int 649int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 651{
631 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
632 return 0; 653 return 0;
633 654
636 657
637 if (count > 0 658 if (count > 0
638 && row1 == 0 659 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
641 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 665
646 // sever bottommost line 666 // sever bottommost line
647 { 667 {
648 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
649 l.is_longer (0); 669 l.is_longer (0);
650 l.touch (); 670 l.touch ();
651 } 671 }
652 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
653 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 689 for (int i = count; i--; )
655 { 690 {
656 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
657 692
658 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
660 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 696 {
662 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 698 l.l = 0;
665 } 700 }
666 else 701 else
667 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
668 } 703 }
669 704
670 // now copy lines below the scroll region bottom to the
671 // bottom of the screen again, so they look as if they
672 // hadn't moved.
673 for (int i = nrow; --i > row2; )
674 {
675 line_t &l1 = ROW(i - count);
676 line_t &l2 = ROW(i);
677
678 ::swap (l1, l2);
679 l2.touch ();
680 }
681
682 // move and/or clear selection, if any 705 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
684 { 708 {
685 selection.beg.row -= count; 709 selection.beg.row -= count;
686 selection.end.row -= count; 710 selection.end.row -= count;
687 selection.mark.row -= count; 711 selection.mark.row -= count;
688 712
689 if (selection.beg.row < top_row 713 selection_check (0);
690 || selection.end.row < top_row
691 || selection.mark.row < top_row)
692 {
693 CLEAR_ALL_SELECTION ();
694 selection.op = SELECTION_CLEAR;
695 }
696 } 714 }
697 715
698 // finally move the view window, if desired 716 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 718 && view_start != 0
730 } 748 }
731 749
732 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
734 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
735 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
736 762
737 min_it (count, rows); 763 min_it (count, rows);
738 764
739 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 766
741 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
742 { 768 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 770
746 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 773 }
748 774
749 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
751 } 784 }
752 785
753 return count; 786 return count;
754} 787}
755 788
756/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
757/* 790/*
758 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
759 */ 792 */
760void 793void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 795{
763 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
764 return; 797 return;
765 798
766 unsigned char checksel; 799 bool checksel;
767 unicode_t c; 800 unicode_t c;
768 int ncol = this->ncol; 801 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
770 803
771 want_refresh = 1; 804 want_refresh = 1;
797 830
798 while (str < strend) 831 while (str < strend)
799 { 832 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 834
802 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 836 if (c == C0_LF)
804 { 837 {
805 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
806 839
807 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
826 { 859 {
827 scr_tab (1, true); 860 scr_tab (1, true);
828 continue; 861 continue;
829 } 862 }
830 863
831 if (expect_false ( 864 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 868 ))
836 { 869 {
841 * should be a similar check. 874 * should be a similar check.
842 */ 875 */
843 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
844 } 877 }
845 878
846 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 880 {
848 scr_do_wrap (); 881 scr_do_wrap ();
849 882
850 line->l = ncol; 883 line->l = ncol;
851 line->is_longer (1); 884 line->is_longer (1);
853 row = screen.cur.row; 886 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
855 } 888 }
856 889
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 892 c = 0xfffd;
860 893
861 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
864 // locale. 897 // locale.
865 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
866 899
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 901 {
869 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 903 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
885 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
887 } 920 }
888 } 921 }
889 922
890 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
892 925
893 if (width != 0) 926 if (width != 0)
894 { 927 {
895#if !UNICODE_3 928#if !UNICODE_3
903#endif 936#endif
904 937
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 939
907 // if the character doesn't fit into the remaining columns... 940 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 942 {
910 if (screen.flags & Screen_Autowrap) 943 if (screen.flags & Screen_Autowrap)
911 { 944 {
912 // ... artificially enlargen the previous one 945 // ... artificially enlargen the previous one
913 c = NOCHAR; 946 c = NOCHAR;
920 953
921 // nuke the character at this position, if required 954 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 955 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 956 // we never have to check for overwriting a wide char itself,
924 // only its tail. 957 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
927 960
928 line->touch (); 961 line->touch ();
929 962
930 do 963 do
931 { 964 {
932 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
934 967
935 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 969 screen.cur.col++;
937 else 970 else
938 { 971 {
939 line->l = ncol; 972 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
943 goto end_of_line; 976 goto end_of_line;
944 } 977 }
945 978
946 c = NOCHAR; 979 c = NOCHAR;
947 } 980 }
948 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
949 982
950 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 985 {
953 line->t[c] = ' '; 986 line->t[c] = ' ';
954 line->r[c] = rend; 987 line->r[c] = rend;
955 } 988 }
956 989
1115 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1118 */ 1151 */
1119#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1120void 1153void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1122{ 1155{
1123 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1158 else
1132 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1135 */ 1168 */
1136#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1137void 1170void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1139{ 1172{
1140 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1175 else
1293 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1294} 1327}
1295 1328
1296/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1297/* 1330/*
1298 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1335 */
1303void 1336void
1312 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1313 1346
1314 switch (mode) 1347 switch (mode)
1315 { 1348 {
1316 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1350 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1352 num = nrow - row;
1321 break; 1353 break;
1322 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1355 scr_erase_line (1);
1325 row = 0; 1356 row = 0;
1326 num = screen.cur.row; 1357 num = screen.cur.row;
1327 break; 1358 break;
1328 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1360 row = 0;
1331 num = nrow; 1361 num = nrow;
1332 break; 1362 break;
1333 default: 1363 default:
1334 return; 1364 return;
1351 { 1381 {
1352 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1353 1383
1354 if (mapped) 1384 if (mapped)
1355 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1358 } 1388 }
1359 else 1389 else
1360 { 1390 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 { 1394 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1399 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1403 }
1374 } 1404 }
1396/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1397/* 1427/*
1398 * Fill the screen with `E's 1428 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1430 */
1401void 1431void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1403{ 1433{
1404 rend_t fs; 1434 rend_t fs;
1405 1435
1406 want_refresh = 1; 1436 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1408 1438
1409 num_scr_allow = 0; 1439 num_scr_allow = 0;
1410 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1411 1445
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1414 { 1448 {
1415 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
1566/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1567/* 1601/*
1568 * Set the scrolling region 1602 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1604 */
1571void 1605void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1607{
1574 max_it (top, 0); 1608 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1576 1610
1586/* 1620/*
1587 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1624 */
1591void 1625void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1627{
1594 want_refresh = 1; 1628 want_refresh = 1;
1595 1629
1596 if (mode) 1630 if (mode)
1603/* 1637/*
1604 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1641 */
1608void 1642void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1644{
1611 if (mode) 1645 if (mode)
1612 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1613 else 1647 else
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1660 */
1627void 1661void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1663{
1630 if (mode) 1664 if (mode)
1631 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1632 else 1666 else
1639/* 1673/*
1640 * Set insert/replace mode 1674 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1677 */
1644void 1678void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1680{
1647 if (mode) 1681 if (mode)
1648 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1649 else 1683 else
1655 * Set/Unset tabs 1689 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1693 */
1660void 1694void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1696{
1663 if (mode < 0) 1697 if (mode < 0)
1664 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
1684 if (rvideo_state != on) 1718 if (rvideo_state != on)
1685 { 1719 {
1686 rvideo_state = on; 1720 rvideo_state = on;
1687 1721
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1690 if (bg_pixmap == None) 1724 if (bg_img == 0)
1691#endif 1725#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1727
1694 XGCValues gcvalue; 1728 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
1704/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1705/* 1739/*
1706 * Report current cursor position 1740 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1742 */
1709void 1743void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1711{ 1745{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1747}
1714 1748
1717 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1718 1752
1719/* 1753/*
1720 * Set font style 1754 * Set font style
1721 */ 1755 */
1722void 1756void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1724{ 1758{
1725#if 0 1759#if 0
1726 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1727 { 1761 {
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1787 */
1754void 1788void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1790{
1757 screen.charset = set; 1791 screen.charset = set;
1758 set_font_style (); 1792 set_font_style ();
1759} 1793}
1780 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1781 1815
1782/* 1816/*
1783 * refresh matching text. 1817 * refresh matching text.
1784 */ 1818 */
1785bool 1819bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1821{
1788 bool found = false; 1822 bool found = false;
1789 1823
1790 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
1809 PART_BEG = 0, 1843 PART_BEG = 0,
1810 PART_END, 1844 PART_END,
1811 RC_COUNT 1845 RC_COUNT
1812}; 1846};
1813 1847
1814void 1848void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1850{
1817 int i; 1851 int i;
1818 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1819 1853
1856 * Refresh the entire screen 1890 * Refresh the entire screen
1857 */ 1891 */
1858void 1892void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1894{
1861 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1896}
1863 1897
1864/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1865/* 1899/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
1922 1956
1923# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1926# endif 1960# endif
1927 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1928# endif 1962# endif
1929 1963
1930# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1966 set_urgency (1);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1980#endif
1947} 1981}
1948 1982
1949/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1984void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1986{
1954#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1955 int nrows, row_start; 1988 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
2005/* 2038/*
2006 * Refresh the screen 2039 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2042 */
2010void 2043void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2012{ 2045{
2013 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2048 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2022 2053
2023 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2024 2055
2025 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2057 return;
2029 * A: set up vars 2060 * A: set up vars
2030 */ 2061 */
2031 refresh_count = 0; 2062 refresh_count = 0;
2032 2063
2033 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2065 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2036 have_bg = bg_pixmap != None; 2067 have_bg = bg_img != 0;
2037#endif 2068#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2070
2040 /* 2071 /*
2041 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2077#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2078 scr_swap_overlay ();
2048#endif 2079#endif
2049 2080
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2082
2052 /* 2083 /*
2053 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
2054 */ 2085 */
2055 { 2086 {
2056 unsigned char setoldcursor; 2087 bool setoldcursor;
2057 2088
2058#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2090 if (hidden_cursor)
2060 showcursor = 0; 2091 showcursor = 0;
2061#endif 2092#endif
2065 int col = screen.cur.col; 2096 int col = screen.cur.col;
2066 2097
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2099 col--;
2069 2100
2070 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2071 2103
2072#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2076 else 2107 else
2077#endif 2108#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2093#endif 2124#endif
2094 2125
2095 if (focus) 2126 if (focus)
2096 { 2127 {
2128 rend_t rend = cur_rend;
2129
2097 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2099 else 2132 else
2100 { 2133 {
2101 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2140 }
2106 } 2141 }
2107 2142
2108 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2144 setoldcursor = 0;
2148 { 2183 {
2149 int16_t nits; 2184 int16_t nits;
2150 int i = num_scr; 2185 int i = num_scr;
2151 int j; 2186 int j;
2152 int len, wlen; 2187 int len, wlen;
2153 dLocal (int, num_scr);
2154 2188
2155 j = nrow; 2189 j = nrow;
2156 wlen = len = -1; 2190 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2158 2192
2233 continue; 2267 continue;
2234 2268
2235 // redraw one or more characters 2269 // redraw one or more characters
2236 2270
2237 // seek to the beginning of wide characters 2271 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2272 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2273 --col;
2240 2274
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2275 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2276 text_t *text = stp + col;
2243 int count = 1; 2277 int count = 1;
2281 2315
2282 col--; /* went one too far. move back */ 2316 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2317 count -= i; /* dump any matching trailing chars */
2284 2318
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2319 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2320 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2321 count++, i--;
2288 2322
2289 /* 2323 /*
2290 * Determine the attributes for the string 2324 * Determine the attributes for the string
2291 */ 2325 */
2292 int fore = fgcolor_of (rend); // desired foreground 2326 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2327 int back = bgcolor_of (rend); // desired background
2294 2328
2295 // only do special processing if any attributes are set, which is unlikely 2329 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2330 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2331 {
2298 bool invert = rend & RS_RVid; 2332 bool invert = rend & RS_RVid;
2299 2333
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2335 if (rend & RS_Bold && fore == Color_fg)
2390 /* 2424 /*
2391 * Actually do the drawing of the string here 2425 * Actually do the drawing of the string here
2392 */ 2426 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2427 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2428
2395 if (expect_true (have_bg && back == Color_bg)) 2429 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2430 {
2397 // this is very ugly, maybe push it into ->draw? 2431 // this is very ugly, maybe push it into ->draw?
2398 2432
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2433 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2434 if (text[i] != ' ')
2407 did_clear: ; 2441 did_clear: ;
2408 } 2442 }
2409 else 2443 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2445
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2447 {
2414#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2451 else
2429 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2464 */
2431 if (showcursor) 2465 if (showcursor)
2432 { 2466 {
2433 if (focus) 2467 if (focus)
2434 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 if (option (Opt_cursorUnderline))
2436 *crp ^= RS_Uline;
2437 else
2438 {
2439 *crp ^= RS_RVid;
2440#ifndef NO_CURSORCOLOR
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2442#endif
2443 }
2444 }
2445 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2446 { 2470 {
2447 int cursorwidth = 1; 2471 int cursorwidth = 1;
2448 int col = oldcursor.col; 2472 int col = oldcursor.col;
2449 2473
2463 2487
2464 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2489 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2493 }
2470 } 2494 }
2471 2495
2472 /* 2496 /*
2473 * H: cleanup selection 2497 * H: cleanup selection
2482 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2483 num_scr = 0; 2507 num_scr = 0;
2484 num_scr_allow = 1; 2508 num_scr_allow = 1;
2485} 2509}
2486 2510
2487void 2511void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2513{
2490 if (!l.t) 2514 if (!l.valid ())
2491 return; 2515 return;
2492 2516
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2518
2495 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2521}
2498 2522
2499void 2523void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2501{ 2525{
2502 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2504 2528
2507 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2509 } 2533 }
2510} 2534}
2511 2535
2512void 2536void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2538{
2515 bool transparent = false; 2539 bool transparent = false;
2516 2540
2517#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2518 if (bg_pixmap != None) 2542 if (bg_img != 0)
2519 { 2543 {
2520# ifdef ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2546 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2549
2526 transparent = true; 2550 transparent = true;
2527 } 2551 }
2528 else 2552 else
2529# endif 2553# endif
2530 { 2554 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533 } 2557 }
2534 } 2558 }
2535 else 2559 else
2536#endif 2560#endif
2537 { 2561 {
2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 } 2564 }
2541 2565
2542 XClearWindow (dpy, parent[0]); 2566 XClearWindow (dpy, parent);
2543 2567
2544 if (scrollBar.win) 2568 if (scrollBar.win)
2545 { 2569 {
2546 if (transparent) 2570 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else 2572 else
2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2551 scrollBar.show (0); 2575 scrollBar.show (0);
2552 } 2576 }
2553 2577
2554 if (refresh) 2578 if (refresh)
2555 { 2579 {
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2622} 2646}
2623 2647
2624/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2625void 2649void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2627{ 2651{
2628 if (selection.op 2652 if (selection.op
2629 && current_screen == selection.screen 2653 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
2649 */ 2673 */
2650#if 0 2674#if 0
2651void 2675void
2652rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2653{ 2677{
2654 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2656 const char r1[] = "\n";
2657
2658 for (row = saveLines + top_row;
2659 row < saveLines + nrow - 1; row++)
2660 {
2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2662 : ncol;
2663 for (towrite = width; towrite; towrite -= wrote)
2664 {
2665 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2666 towrite);
2667 if (wrote < 0)
2668 return; /* XXX: death, no report */
2669 }
2670 if (row_buf[row].l >= 0)
2671 if (write (fd, r1, 1) <= 0)
2672 return; /* XXX: death, no report */
2673 }
2674} 2680}
2675#endif 2681#endif
2676 2682
2677/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2679 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2680void 2686void
2681rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2682{ 2688{
2683 row_col_t pos;
2684
2685 if (!selection.op) 2689 if (!selection.op)
2686 return; 2690 return;
2687 2691
2688 pos.row = pos.col = 0;
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2695 || (check_more == 1
2693 && current_screen == selection.screen 2696 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 || (check_more == 2
2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 3
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 4 /* screen width change */
2702 && (selection.beg.row != selection.end.row
2703 || selection.end.col > ncol)))
2704 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2700}
2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2705} 2714}
2706 2715
2707/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2708/* 2717/*
2709 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
2715 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2716 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2717 data[i] = C0_CR; 2726 data[i] = C0_CR;
2718 2727
2719 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~"); 2729 tt_printf ("\x1b[200~");
2721 2730
2722 tt_write (data, len); 2731 tt_write (data, len);
2723 2732
2724 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~"); 2734 tt_printf ("\x1b[201~");
2726} 2735}
2727 2736
2728void 2737void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{ 2739{
2734 tt_paste (data, len); 2743 tt_paste (data, len);
2735} 2744}
2736 2745
2737/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2738/* 2747/*
2739 * Respond to a notification that a primary selection has been sent 2748 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2740 * EXT: SelectionNotify 2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2741 */ 2750 * as fallback
2742void
2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2744{
2745 if (prop == None) /* check for failed XConvertSelection */
2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2752 if ((selection_type & Sel_CompoundText))
2753 {
2754 selection_type = 0;
2755 selection_request_other (XA_STRING, selnum);
2756 }
2757
2758 if ((selection_type & Sel_UTF8String))
2759 {
2760 selection_type = Sel_CompoundText;
2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2762 }
2763
2764 return;
2765 }
2766
2767 unsigned long bytes_after;
2768 XTextProperty ct;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 0, PROP_SIZE / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct.encoding, &ct.format,
2774 &ct.nitems, &bytes_after,
2775 &ct.value) != Success)
2776 {
2777 ct.value = 0;
2778 goto bailout;
2779 }
2780
2781 if (ct.encoding == None)
2782 goto bailout;
2783
2784 if (bytes_after)
2785 {
2786 // fetch and append remaining data
2787 XTextProperty ct2;
2788
2789 if (XGetWindowProperty (dpy, win, prop,
2790 ct.nitems / 4, (bytes_after + 3) / 4,
2791 delete_prop, AnyPropertyType,
2792 &ct2.encoding, &ct2.format,
2793 &ct2.nitems, &bytes_after,
2794 &ct2.value) != Success)
2795 goto bailout;
2796
2797 // realloc should be compatible to XFree, here, and elsewhere, too
2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2800 ct.nitems += ct2.nitems;
2801
2802 XFree (ct2.value);
2803 }
2804
2805 if (ct.value == 0)
2806 goto bailout;
2807
2808 if (ct.encoding == xa[XA_INCR])
2809 {
2810 // INCR selection, start handshake
2811 if (!delete_prop)
2812 XDeleteProperty (dpy, win, prop);
2813
2814 selection_wait = Sel_incr;
2815 incr_buf_fill = 0;
2816 incr_ev.start (10);
2817
2818 goto bailout;
2819 }
2820
2821 if (ct.nitems == 0)
2822 {
2823 if (selection_wait == Sel_incr)
2824 {
2825 XFree (ct.value);
2826
2827 // finally complete, now paste the whole thing
2828 selection_wait = Sel_normal;
2829 ct.value = (unsigned char *)incr_buf;
2830 ct.nitems = incr_buf_fill;
2831 incr_buf = 0;
2832 incr_buf_size = 0;
2833 incr_ev.stop ();
2834 }
2835 else
2836 {
2837 if (selection_wait == Sel_normal
2838 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2839 {
2840 /*
2841 * pass through again trying CUT_BUFFER0 if we've come from
2842 * XConvertSelection () but nothing was presented
2843 */
2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2845 }
2846
2847 goto bailout;
2848 }
2849 }
2850 else if (selection_wait == Sel_incr)
2851 {
2852 incr_ev.start (10);
2853
2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2855 {
2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2858 }
2859
2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2861 incr_buf_fill += ct.nitems;
2862
2863 goto bailout;
2864 }
2865
2866 char **cl;
2867 int cr;
2868
2869#if !ENABLE_MINIMAL
2870 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2871 // so recode it manually
2872 if (ct.encoding == xa[XA_UTF8_STRING])
2873 {
2874 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2875 char *s = rxvt_wcstombs (w);
2876 free (w);
2877 // TODO: strlen == only the first element will be converted. well...
2878 paste (s, strlen (s));
2879 free (s);
2880 }
2881 else
2882#endif
2883 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2884 && cl)
2885 {
2886 for (int i = 0; i < cr; i++)
2887 paste (cl[i], strlen (cl[i]));
2888
2889 XFreeStringList (cl);
2890 }
2891 else
2892 paste ((char *)ct.value, ct.nitems); // paste raw
2893
2894bailout:
2895 XFree (ct.value);
2896
2897 if (selection_wait == Sel_normal)
2898 selection_wait = Sel_none;
2899}
2900
2901void
2902rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2903{
2904 selection_wait = Sel_none;
2905
2906 incr_buf_size = 0;
2907 free (incr_buf);
2908
2909 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2910}
2911
2912void
2913rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2914{
2915 if (prop == None || selection_wait != Sel_incr)
2916 return;
2917
2918 selection_paste (win, prop, true);
2919}
2920
2921/* ------------------------------------------------------------------------- */
2922/*
2923 * Request the current selection:
2924 * Order: > internal selection if available
2925 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2926 * > CUT_BUFFER0
2927 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2928 * will auto fallback to CUT_BUFFER0
2929 * EXT: button 2 release 2751 * EXT: button 2 release
2930 */ 2752 */
2931void 2753void
2932rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2933{ 2755{
2934 if (selection.text && selnum == Sel_Primary) 2756 if (!selection_req)
2935 {
2936 /* internal selection */
2937 char *str = rxvt_wcstombs (selection.text, selection.len);
2938 paste (str, strlen (str));
2939 free (str);
2940 return;
2941 } 2757 {
2942 else 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run ();
2943 { 2760 }
2944 selection_request_time = tm;
2945 selection_wait = Sel_normal;
2946
2947#if X_HAVE_UTF8_STRING
2948 selection_type = Sel_UTF8String;
2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2950 return;
2951#else
2952 selection_type = Sel_CompoundText;
2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2954 return;
2955#endif
2956 }
2957
2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
2960}
2961
2962int
2963rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2964{
2965 Atom sel;
2966
2967 selection_type |= selnum;
2968
2969 if (selnum == Sel_Primary)
2970 sel = XA_PRIMARY;
2971 else if (selnum == Sel_Secondary)
2972 sel = XA_SECONDARY;
2973 else
2974 sel = xa[XA_CLIPBOARD];
2975
2976 if (XGetSelectionOwner (dpy, sel) != None)
2977 {
2978 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2979 vt, selection_request_time);
2980 return 1;
2981 }
2982
2983 return 0;
2984} 2761}
2985 2762
2986/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2987/* 2764/*
2988 * Clear all selected text 2765 * Clear all selected text
3182/* ------------------------------------------------------------------------- */ 2959/* ------------------------------------------------------------------------- */
3183/* 2960/*
3184 * Mark or select text based upon number of clicks: 1, 2, or 3 2961 * Mark or select text based upon number of clicks: 1, 2, or 3
3185 * EXT: button 1 press 2962 * EXT: button 1 press
3186 */ 2963 */
3187void 2964void ecb_cold
3188rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3189{ 2966{
3190 clicks = ((clicks - 1) % 3) + 1; 2967 clicks = ((clicks - 1) % 3) + 1;
3191 selection.clicks = clicks; /* save clicks so extend will work */ 2968 selection.clicks = clicks; /* save clicks so extend will work */
3192 2969
3211 2988
3212/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
3213/* 2990/*
3214 * Mark a selection at the specified col/row 2991 * Mark a selection at the specified col/row
3215 */ 2992 */
3216void 2993void ecb_cold
3217rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3218{ 2995{
3219 want_refresh = 1; 2996 want_refresh = 1;
3220 2997
3221 selection.mark.row = row + view_start; 2998 selection.mark.row = row + view_start;
3244 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3245 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3246 */ 3023 */
3247 3024
3248/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3249#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3250 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3251#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3252 3029
3253void 3030void ecb_cold
3254rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3255{ 3032{
3256 int col, row, dirnadd, tcol, trow, w1, w2; 3033 int col, row, dirnadd, tcol, trow, w1, w2;
3257 row_col_t bound; 3034 row_col_t bound;
3258 text_t *stp; 3035 text_t *stp;
3332 * EXT: button 3 press; button 1 or 3 drag 3109 * EXT: button 3 press; button 1 or 3 drag
3333 * flag == 0 ==> button 1 3110 * flag == 0 ==> button 1
3334 * flag == 1 ==> button 3 press 3111 * flag == 1 ==> button 3 press
3335 * flag == 2 ==> button 3 motion 3112 * flag == 2 ==> button 3 motion
3336 */ 3113 */
3337void 3114void ecb_cold
3338rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3339{ 3116{
3340 int col = clamp (Pixel2Col (x), 0, ncol); 3117 int col = clamp (Pixel2Col (x), 0, ncol);
3341 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3118 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3342 3119
3368 3145
3369/* ------------------------------------------------------------------------- */ 3146/* ------------------------------------------------------------------------- */
3370/* 3147/*
3371 * Extend the selection to the specified col/row 3148 * Extend the selection to the specified col/row
3372 */ 3149 */
3373void 3150void ecb_cold
3374rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3375{ 3152{
3376 row_col_t pos; 3153 row_col_t pos;
3377 enum { 3154 enum {
3378 LEFT, RIGHT 3155 LEFT, RIGHT
3379 } closeto = RIGHT; 3156 } closeto = RIGHT;
3380
3381 want_refresh = 1;
3382 3157
3383 switch (selection.op) 3158 switch (selection.op)
3384 { 3159 {
3385 case SELECTION_INIT: 3160 case SELECTION_INIT:
3386 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
3566 3341
3567#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3568 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3569 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3570#endif 3345#endif
3346
3347 selection_changed ();
3571} 3348}
3572 3349
3573#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3574void 3351void ecb_cold
3575rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW
3576{ 3353{
3577 int32_t end_col, end_row; 3354 int32_t end_col, end_row;
3578 text_t *stp; 3355 text_t *stp;
3579 3356
3617/* ------------------------------------------------------------------------- */ 3394/* ------------------------------------------------------------------------- */
3618/* 3395/*
3619 * Double click on button 3 when already selected 3396 * Double click on button 3 when already selected
3620 * EXT: button 3 double click 3397 * EXT: button 3 double click
3621 */ 3398 */
3622void 3399void ecb_cold
3623rxvt_term::selection_rotate (int x, int y) NOTHROW 3400rxvt_term::selection_rotate (int x, int y) NOTHROW
3624{ 3401{
3625 selection.clicks = selection.clicks % 3 + 1; 3402 selection.clicks = selection.clicks % 3 + 1;
3626 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3627} 3404}
3629/* ------------------------------------------------------------------------- */ 3406/* ------------------------------------------------------------------------- */
3630/* 3407/*
3631 * Respond to a request for our current selection 3408 * Respond to a request for our current selection
3632 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3633 */ 3410 */
3634void 3411void ecb_cold
3635rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3636{ 3413{
3414 Atom property = rq.property == None ? rq.target : rq.property;
3637 XSelectionEvent ev; 3415 XSelectionEvent ev;
3638 3416
3639 ev.type = SelectionNotify; 3417 ev.type = SelectionNotify;
3640 ev.property = None; 3418 ev.property = None;
3641 ev.display = rq.display; 3419 ev.display = rq.display;
3656 *target++ = xa[XA_COMPOUND_TEXT]; 3434 *target++ = xa[XA_COMPOUND_TEXT];
3657#if X_HAVE_UTF8_STRING 3435#if X_HAVE_UTF8_STRING
3658 *target++ = xa[XA_UTF8_STRING]; 3436 *target++ = xa[XA_UTF8_STRING];
3659#endif 3437#endif
3660 3438
3661 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3439 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3662 32, PropModeReplace, 3440 32, PropModeReplace,
3663 (unsigned char *)target_list, target - target_list); 3441 (unsigned char *)target_list, target - target_list);
3664 ev.property = rq.property; 3442 ev.property = property;
3665 } 3443 }
3666#if TODO // TODO 3444#if TODO // TODO
3667 else if (rq.target == xa[XA_MULTIPLE]) 3445 else if (rq.target == xa[XA_MULTIPLE])
3668 { 3446 {
3669 /* TODO: Handle MULTIPLE */ 3447 /* TODO: Handle MULTIPLE */
3670 } 3448 }
3671#endif 3449#endif
3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3673 { 3451 {
3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3675 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3453 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property; 3454 ev.property = property;
3677 } 3455 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3456 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 { 3457 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3458 XChangeProperty (dpy, rq.requestor, property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3459 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3682 ev.property = rq.property; 3460 ev.property = property;
3683 } 3461 }
3684 else if (rq.target == XA_STRING 3462 else if (rq.target == XA_STRING
3685 || rq.target == xa[XA_TEXT] 3463 || rq.target == xa[XA_TEXT]
3686 || rq.target == xa[XA_COMPOUND_TEXT] 3464 || rq.target == xa[XA_COMPOUND_TEXT]
3687 || rq.target == xa[XA_UTF8_STRING] 3465 || rq.target == xa[XA_UTF8_STRING]
3758 ct.value = (unsigned char *)cl; 3536 ct.value = (unsigned char *)cl;
3759 ct.nitems = selectlen; 3537 ct.nitems = selectlen;
3760 ct.encoding = target; 3538 ct.encoding = target;
3761 } 3539 }
3762 3540
3763 XChangeProperty (dpy, rq.requestor, rq.property, 3541 XChangeProperty (dpy, rq.requestor, property,
3764 ct.encoding, 8, PropModeReplace, 3542 ct.encoding, 8, PropModeReplace,
3765 ct.value, (int)ct.nitems); 3543 ct.value, (int)ct.nitems);
3766 ev.property = rq.property; 3544 ev.property = property;
3767 3545
3768 if (freect) 3546 if (freect)
3769 XFree (ct.value); 3547 XFree (ct.value);
3770 } 3548 }
3771 3549
3772 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3773} 3551}
3774 3552
3775/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3776#ifdef USE_XIM 3554#if USE_XIM
3777void 3555void ecb_cold
3778rxvt_term::im_set_position (XPoint &pos) NOTHROW 3556rxvt_term::im_set_position (XPoint &pos) NOTHROW
3779{ 3557{
3780 XWindowAttributes xwa; 3558 XWindowAttributes xwa;
3781 3559
3782 XGetWindowAttributes (dpy, vt, &xwa); 3560 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines