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.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 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 ();
… …
159/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
160 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
161 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
162 158
163void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
164rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
165{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
166 view_start = 0; 200 view_start = 0;
167 num_scr = 0; 201 num_scr = 0;
168 202
169 if (ncol == 0) 203 if (ncol == 0)
170 ncol = 80; 204 ncol = 80;
… …
190 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
191 225
192 screen.tscroll = 0; 226 screen.tscroll = 0;
193 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
194 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
195 if (!row_buf) 239 if (!prev_row_buf)
196 { 240 {
197 /* 241 /*
198 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
199 */ 243 */
200 top_row = 0; 244 top_row = 0;
201 term_start = 0; 245 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 246
217 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
218 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
219 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
220 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
243 { 273 {
244 /* 274 /*
245 * add or delete rows as appropriate 275 * add or delete rows as appropriate
246 */ 276 */
247 277
248 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
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
265 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
266 { 279 {
267 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
268 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 }
270 282
271 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l;
272 { 289 }
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 290
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 291 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
283 294
… …
291 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 302 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
292 303
293 do 304 do
294 { 305 {
295 p = MOD (p - 1, prev_total_rows); 306 p = MOD (p - 1, prev_total_rows);
296 assert (old_buf [MOD (p, prev_total_rows)].t); 307 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
297 int plines = 1; 308 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 309 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
299 310
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 311 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 312 {
302 p = MOD (p - 1, prev_total_rows); 313 p = MOD (p - 1, prev_total_rows);
303 314
304 plines++; 315 plines++;
305 llen += prev_ncol; 316 llen += prev_ncol;
… …
318 329
319 // re-assemble the full line by destination lines 330 // re-assemble the full line by destination lines
320 for (int qrow = q; qlines--; qrow++) 331 for (int qrow = q; qlines--; qrow++)
321 { 332 {
322 qline = row_buf + qrow; 333 qline = row_buf + qrow;
323 lalloc (*qline); 334 qline->alloc (); // redundant with next line
324 qline->l = ncol; 335 qline->l = ncol;
325 qline->is_longer (1); 336 qline->is_longer (1);
326 337
327 int qcol = 0; 338 int qcol = 0;
328 339
… …
343 // this seems to upset applications/shells/readline 354 // this seems to upset applications/shells/readline
344 // least. 355 // least.
345 if (prow == ocur.row) 356 if (prow == ocur.row)
346 screen.cur.row = q - (total_rows - nrow); 357 screen.cur.row = q - (total_rows - nrow);
347 358
348 line_t &pline = old_buf [prow]; 359 line_t &pline = prev_row_buf [prow];
349 360
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 361 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 362
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 363 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 364 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
374 { 385 {
375 // if no scrollback exists (yet), wing, instead of wrap 386 // if no scrollback exists (yet), wing, instead of wrap
376 387
377 for (int row = min (nrow, prev_nrow); row--; ) 388 for (int row = min (nrow, prev_nrow); row--; )
378 { 389 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 390 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 391 line_t &dst = row_buf [row];
381 392
382 qline = pline; 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
383 lresize (qline); 394
395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
384 } 398 }
385 399
386 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
387 {
388 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
389 }
390 402
391 term_start = 0; 403 term_start = 0;
392 } 404 }
393
394 free (old_buf);
395 delete old_ta;
396 delete old_ra;
397 405
398 clamp_it (screen.cur.row, 0, nrow - 1); 406 clamp_it (screen.cur.row, 0, nrow - 1);
399 clamp_it (screen.cur.col, 0, ncol - 1); 407 clamp_it (screen.cur.col, 0, ncol - 1);
400 } 408 }
401 409
410 for (int row = nrow; row--; )
411 {
412 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
413 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
414 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
415 }
416
417 chunk_free (prev_chunk, prev_chunk_size);
418
402 free (tabs); 419 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 420 tabs = (char *)rxvt_malloc (ncol);
404 421
405 for (int col = ncol; col--; ) 422 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 423 tabs [col] = col % TABSIZE == 0;
… …
413 tt_winch (); 430 tt_winch ();
414 431
415 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 432 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416} 433}
417 434
418/* ------------------------------------------------------------------------- */ 435void ecb_cold
419/*
420 * Free everything. That way malloc debugging can find leakage.
421 */
422void
423rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
424{ 437{
425 if (row_buf) 438 chunk_free (chunk, chunk_size);
426 { 439 chunk = 0;
427 delete talloc; talloc = 0; 440 row_buf = 0;
428 delete ralloc; ralloc = 0;
429 441
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); 442 free (tabs);
436 tabs = 0; 443 tabs = 0;
437 }
438} 444}
439 445
440/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
441/* 447/*
442 * Hard/Soft reset 448 * Hard/Soft reset
443 */ 449 */
444void 450void ecb_cold
445rxvt_term::scr_poweron () 451rxvt_term::scr_poweron ()
446{ 452{
447 scr_release (); 453 scr_release ();
454
448 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false; 456 rvideo_mode = false;
450 scr_soft_reset (); 457 scr_soft_reset ();
451 scr_reset (); 458 scr_reset ();
452 459
453 scr_clear (true); 460 scr_clear (true);
454 scr_refresh (); 461 scr_refresh ();
455} 462}
456 463
457void 464void ecb_cold
458rxvt_term::scr_soft_reset () 465rxvt_term::scr_soft_reset () NOTHROW
459{ 466{
460 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
462 scr_overlay_off (); 469 scr_overlay_off ();
463#endif 470#endif
… …
518 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
519 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
520} 527}
521 528
522void 529void
523rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
524{ 531{
525 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
526 return; 533 return;
527 534
528 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
547 return; 554 return;
548 555
549 want_refresh = 1; 556 want_refresh = 1;
550 view_start = 0; 557 view_start = 0;
551 558
552 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
553 565
554 current_screen = scrn; 566 current_screen = scrn;
555 567
556#if NSCREENS 568#if NSCREENS
557 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
… …
623/* 635/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 637 * count positive ==> scroll up
626 * count negative ==> scroll down 638 * count negative ==> scroll down
627 */ 639 */
628int 640int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 642{
631 if (count == 0 || (row1 > row2)) 643 if (count == 0 || (row1 > row2))
632 return 0; 644 return 0;
633 645
… …
636 648
637 if (count > 0 649 if (count > 0
638 && row1 == 0 650 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
641 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 656
646 // sever bottommost line 657 // sever bottommost line
647 { 658 {
648 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
649 l.is_longer (0); 660 l.is_longer (0);
650 l.touch (); 661 l.touch ();
651 } 662 }
652 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
653 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 680 for (int i = count; i--; )
655 { 681 {
656 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
657 683
658 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 685 // 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))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 687 {
662 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 689 l.l = 0;
… …
665 } 691 }
666 else 692 else
667 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
668 } 694 }
669 695
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 696 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
684 { 699 {
685 selection.beg.row -= count; 700 selection.beg.row -= count;
686 selection.end.row -= count; 701 selection.end.row -= count;
687 selection.mark.row -= count; 702 selection.mark.row -= count;
688 703
689 if (selection.beg.row < top_row 704 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 } 705 }
697 706
698 // finally move the view window, if desired 707 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 709 && view_start != 0
… …
730 } 739 }
731 740
732 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
734 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
735 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
736 753
737 min_it (count, rows); 754 min_it (count, rows);
738 755
739 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 757
741 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
742 { 759 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 761
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 764 }
748 765
749 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
751 } 775 }
752 776
753 return count; 777 return count;
754} 778}
755 779
756/* ------------------------------------------------------------------------- */ 780/* ------------------------------------------------------------------------- */
757/* 781/*
758 * Add text given in <str> of length <len> to screen struct 782 * Add text given in <str> of length <len> to screen struct
759 */ 783 */
760void 784void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 786{
763 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
764 return; 788 return;
765 789
766 unsigned char checksel; 790 bool checksel;
767 unicode_t c; 791 unicode_t c;
768 int ncol = this->ncol; 792 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
770 794
771 want_refresh = 1; 795 want_refresh = 1;
… …
797 821
798 while (str < strend) 822 while (str < strend)
799 { 823 {
800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
801 825
802 if (expect_false (c < 0x20)) 826 if (ecb_unlikely (c < 0x20))
803 if (c == C0_LF) 827 if (c == C0_LF)
804 { 828 {
805 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
806 830
807 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
826 { 850 {
827 scr_tab (1, true); 851 scr_tab (1, true);
828 continue; 852 continue;
829 } 853 }
830 854
831 if (expect_false ( 855 if (ecb_unlikely (
832 checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
834 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 )) 859 ))
836 { 860 {
… …
841 * should be a similar check. 865 * should be a similar check.
842 */ 866 */
843 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
844 } 868 }
845 869
846 if (expect_false (screen.flags & Screen_WrapNext)) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
847 { 871 {
848 scr_do_wrap (); 872 scr_do_wrap ();
849 873
850 line->l = ncol; 874 line->l = ncol;
851 line->is_longer (1); 875 line->is_longer (1);
… …
853 row = screen.cur.row; 877 row = screen.cur.row;
854 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
855 } 879 }
856 880
857 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
859 c = 0xfffd; 883 c = 0xfffd;
860 884
861 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
862 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
863 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
864 // locale. 888 // locale.
865 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
866 890
867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
868 { 892 {
869 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
870 // 5f-7e standard vt100 894 // 5f-7e standard vt100
871 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
872 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
885 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
886 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
887 } 911 }
888 } 912 }
889 913
890 if (expect_false (screen.flags & Screen_Insert)) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
891 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
892 916
893 if (width != 0) 917 if (width != 0)
894 { 918 {
895#if !UNICODE_3 919#if !UNICODE_3
… …
903#endif 927#endif
904 928
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906 930
907 // if the character doesn't fit into the remaining columns... 931 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
909 { 933 {
910 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
911 { 935 {
912 // ... artificially enlargen the previous one 936 // ... artificially enlargen the previous one
913 c = NOCHAR; 937 c = NOCHAR;
… …
920 944
921 // nuke the character at this position, if required 945 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop 946 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself, 947 // we never have to check for overwriting a wide char itself,
924 // only its tail. 948 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 949 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col); 950 scr_kill_char (*line, screen.cur.col);
927 951
928 line->touch (); 952 line->touch ();
929 953
930 do 954 do
931 { 955 {
932 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
934 958
935 if (expect_true (screen.cur.col < ncol - 1)) 959 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 960 screen.cur.col++;
937 else 961 else
938 { 962 {
939 line->l = ncol; 963 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
… …
943 goto end_of_line; 967 goto end_of_line;
944 } 968 }
945 969
946 c = NOCHAR; 970 c = NOCHAR;
947 } 971 }
948 while (expect_false (--width > 0)); 972 while (ecb_unlikely (--width > 0));
949 973
950 // pad with spaces when overwriting wide character with smaller one 974 // 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++) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
952 { 976 {
953 line->t[c] = ' '; 977 line->t[c] = ' ';
954 line->r[c] = rend; 978 line->r[c] = rend;
955 } 979 }
956 980
… …
1115 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1118 */ 1142 */
1119#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1120void 1144void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1122{ 1146{
1123 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1149 else
… …
1132 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1135 */ 1159 */
1136#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1137void 1161void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1139{ 1163{
1140 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1166 else
… …
1293 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1294} 1318}
1295 1319
1296/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1297/* 1321/*
1298 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1326 */
1303void 1327void
… …
1312 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1313 1337
1314 switch (mode) 1338 switch (mode)
1315 { 1339 {
1316 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1341 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1343 num = nrow - row;
1321 break; 1344 break;
1322 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1346 scr_erase_line (1);
1325 row = 0; 1347 row = 0;
1326 num = screen.cur.row; 1348 num = screen.cur.row;
1327 break; 1349 break;
1328 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1351 row = 0;
1331 num = nrow; 1352 num = nrow;
1332 break; 1353 break;
1333 default: 1354 default:
1334 return; 1355 return;
… …
1351 { 1372 {
1352 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1353 1374
1354 if (mapped) 1375 if (mapped)
1355 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1358 } 1379 }
1359 else 1380 else
1360 { 1381 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1385 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1389 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1390 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1394 }
1374 } 1395 }
… …
1396/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1397/* 1418/*
1398 * Fill the screen with `E's 1419 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1421 */
1401void 1422void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1403{ 1424{
1404 rend_t fs; 1425 rend_t fs;
1405 1426
1406 want_refresh = 1; 1427 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1408 1429
1409 num_scr_allow = 0; 1430 num_scr_allow = 0;
1410 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1411 1436
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1414 { 1439 {
1415 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1566/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1567/* 1592/*
1568 * Set the scrolling region 1593 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1595 */
1571void 1596void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1598{
1574 max_it (top, 0); 1599 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1576 1601
… …
1586/* 1611/*
1587 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1615 */
1591void 1616void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1618{
1594 want_refresh = 1; 1619 want_refresh = 1;
1595 1620
1596 if (mode) 1621 if (mode)
… …
1603/* 1628/*
1604 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1632 */
1608void 1633void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1635{
1611 if (mode) 1636 if (mode)
1612 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1613 else 1638 else
… …
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1647 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1651 */
1627void 1652void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1654{
1630 if (mode) 1655 if (mode)
1631 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1632 else 1657 else
… …
1639/* 1664/*
1640 * Set insert/replace mode 1665 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1668 */
1644void 1669void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1671{
1647 if (mode) 1672 if (mode)
1648 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1649 else 1674 else
… …
1655 * Set/Unset tabs 1680 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1684 */
1660void 1685void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1687{
1663 if (mode < 0) 1688 if (mode < 0)
1664 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
… …
1684 if (rvideo_state != on) 1709 if (rvideo_state != on)
1685 { 1710 {
1686 rvideo_state = on; 1711 rvideo_state = on;
1687 1712
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1715 if (bg_img == 0)
1691#endif 1716#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1718
1694 XGCValues gcvalue; 1719 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1704/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1705/* 1730/*
1706 * Report current cursor position 1731 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1733 */
1709void 1734void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1711{ 1736{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1738}
1714 1739
… …
1717 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1718 1743
1719/* 1744/*
1720 * Set font style 1745 * Set font style
1721 */ 1746 */
1722void 1747void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1724{ 1749{
1725#if 0 1750#if 0
1726 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1727 { 1752 {
… …
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1778 */
1754void 1779void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1781{
1757 screen.charset = set; 1782 screen.charset = set;
1758 set_font_style (); 1783 set_font_style ();
1759} 1784}
… …
1780 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1781 1806
1782/* 1807/*
1783 * refresh matching text. 1808 * refresh matching text.
1784 */ 1809 */
1785bool 1810bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1812{
1788 bool found = false; 1813 bool found = false;
1789 1814
1790 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
… …
1809 PART_BEG = 0, 1834 PART_BEG = 0,
1810 PART_END, 1835 PART_END,
1811 RC_COUNT 1836 RC_COUNT
1812}; 1837};
1813 1838
1814void 1839void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1841{
1817 int i; 1842 int i;
1818 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1819 1844
… …
1856 * Refresh the entire screen 1881 * Refresh the entire screen
1857 */ 1882 */
1858void 1883void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1885{
1861 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1887}
1863 1888
1864/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1865/* 1890/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1922 1947
1923# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1926# endif 1951# endif
1927 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1928# endif 1953# endif
1929 1954
1930# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1957 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1971#endif
1947} 1972}
1948 1973
1949/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1975void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1977{
1954#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1955 int nrows, row_start; 1979 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1980 FILE *fd = popen_printer ();
… …
2005/* 2029/*
2006 * Refresh the screen 2030 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2033 */
2010void 2034void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2012{ 2036{
2013 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2039 int i; /* tmp */
… …
2029 * A: set up vars 2053 * A: set up vars
2030 */ 2054 */
2031 refresh_count = 0; 2055 refresh_count = 0;
2032 2056
2033 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2058 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_img != 0;
2037#endif 2061#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2063
2040 /* 2064 /*
2041 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2071 scr_swap_overlay ();
2048#endif 2072#endif
2049 2073
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2075
2052 /* 2076 /*
2053 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2054 */ 2078 */
2055 { 2079 {
2056 unsigned char setoldcursor; 2080 bool setoldcursor;
2057 2081
2058#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2083 if (hidden_cursor)
2060 showcursor = 0; 2084 showcursor = 0;
2061#endif 2085#endif
… …
2148 { 2172 {
2149 int16_t nits; 2173 int16_t nits;
2150 int i = num_scr; 2174 int i = num_scr;
2151 int j; 2175 int j;
2152 int len, wlen; 2176 int len, wlen;
2153 dLocal (int, num_scr);
2154 2177
2155 j = nrow; 2178 j = nrow;
2156 wlen = len = -1; 2179 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2158 2181
… …
2233 continue; 2256 continue;
2234 2257
2235 // redraw one or more characters 2258 // redraw one or more characters
2236 2259
2237 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2262 --col;
2240 2263
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2265 text_t *text = stp + col;
2243 int count = 1; 2266 int count = 1;
… …
2281 2304
2282 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2284 2307
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2310 count++, i--;
2288 2311
2289 /* 2312 /*
2290 * Determine the attributes for the string 2313 * Determine the attributes for the string
2291 */ 2314 */
2292 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2294 2317
2295 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2320 {
2298 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2299 2322
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2413 /*
2391 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2392 */ 2415 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2417
2395 if (expect_true (have_bg && back == Color_bg)) 2418 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2419 {
2397 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2398 2421
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2407 did_clear: ; 2430 did_clear: ;
2408 } 2431 }
2409 else 2432 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2434
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2436 {
2414#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2440 else
… …
2463 2486
2464 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2488 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2492 }
2470 } 2493 }
2471 2494
2472 /* 2495 /*
2473 * H: cleanup selection 2496 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2505 screen.flags = old_screen_flags;
2483 num_scr = 0; 2506 num_scr = 0;
2484 num_scr_allow = 1; 2507 num_scr_allow = 1;
2485} 2508}
2486 2509
2487void 2510void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2512{
2490 if (!l.t) 2513 if (!l.valid ())
2491 return; 2514 return;
2492 2515
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2517
2495 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2520}
2498 2521
2499void 2522void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2501{ 2524{
2502 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2504 2527
… …
2507 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2509 } 2532 }
2510} 2533}
2511 2534
2512void 2535void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2537{
2515 bool transparent = false; 2538 bool transparent = false;
2516 2539
2517#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_IMG
2518 if (bgPixmap.pixmap != None) 2541 if (bg_img != 0)
2519 { 2542 {
2520# ifdef ENABLE_TRANSPARENCY 2543# if ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent) 2544 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2545 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap); 2546 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2548
2526 transparent = true; 2549 transparent = true;
2527 } 2550 }
2528 else 2551 else
2529# endif 2552# endif
2530 { 2553 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap); 2555 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533 } 2556 }
2534 } 2557 }
2535 else 2558 else
2536#endif 2559#endif
2537 { 2560 {
2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 } 2563 }
2541 2564
2542 XClearWindow (dpy, parent[0]); 2565 XClearWindow (dpy, parent);
2543 2566
2544 if (scrollBar.win) 2567 if (scrollBar.win)
2545 { 2568 {
2546 if (transparent) 2569 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else 2571 else
2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2551 scrollBar.show (0); 2574 scrollBar.show (0);
2552 } 2575 }
2553 2576
2554 if (refresh) 2577 if (refresh)
2555 { 2578 {
… …
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2622} 2645}
2623 2646
2624/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2625void 2648void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2627{ 2650{
2628 if (selection.op 2651 if (selection.op
2629 && current_screen == selection.screen 2652 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
… …
2649 */ 2672 */
2650#if 0 2673#if 0
2651void 2674void
2652rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2653{ 2676{
2654 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2678 // 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} 2679}
2675#endif 2680#endif
2676 2681
2677/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2679 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2680void 2685void
2681rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2682{ 2687{
2683 row_col_t pos;
2684
2685 if (!selection.op) 2688 if (!selection.op)
2686 return; 2689 return;
2687 2690
2688 pos.row = pos.col = 0;
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2694 || (check_more == 1
2693 && current_screen == selection.screen 2695 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && 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 (); 2698 CLEAR_ALL_SELECTION ();
2705} 2699}
2706 2700
2707/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2708/* 2702/*
2709 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
2715 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2716 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2717 data[i] = C0_CR; 2711 data[i] = C0_CR;
2718 2712
2719 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2721 2715
2722 tt_write (data, len); 2716 tt_write (data, len);
2723 2717
2724 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2726} 2720}
2727 2721
2728void 2722void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{ 2724{
… …
2734 tt_paste (data, len); 2728 tt_paste (data, len);
2735} 2729}
2736 2730
2737/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2738/* 2732/*
2739 * Respond to a notification that a primary selection has been sent 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2740 * EXT: SelectionNotify 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2741 */ 2735 * 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 if ((selection_type & Sel_CompoundText))
2748 {
2749 int selnum = selection_type & Sel_whereMask;
2750
2751 selection_type = 0;
2752 if (selnum != Sel_direct)
2753 selection_request_other (XA_STRING, selnum);
2754 }
2755
2756 if ((selection_type & Sel_UTF8String))
2757 {
2758 int selnum = selection_type & Sel_whereMask;
2759
2760 selection_type = Sel_CompoundText;
2761 if (selnum != Sel_direct)
2762 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2763 else
2764 selection_type = 0;
2765 }
2766
2767 return;
2768 }
2769
2770 unsigned long bytes_after;
2771 XTextProperty ct;
2772
2773 if (XGetWindowProperty (dpy, win, prop,
2774 0, PROP_SIZE / 4,
2775 delete_prop, AnyPropertyType,
2776 &ct.encoding, &ct.format,
2777 &ct.nitems, &bytes_after,
2778 &ct.value) != Success)
2779 {
2780 ct.value = 0;
2781 goto bailout;
2782 }
2783
2784 if (ct.encoding == None)
2785 goto bailout;
2786
2787 if (bytes_after)
2788 {
2789 // fetch and append remaining data
2790 XTextProperty ct2;
2791
2792 if (XGetWindowProperty (dpy, win, prop,
2793 ct.nitems / 4, (bytes_after + 3) / 4,
2794 delete_prop, AnyPropertyType,
2795 &ct2.encoding, &ct2.format,
2796 &ct2.nitems, &bytes_after,
2797 &ct2.value) != Success)
2798 goto bailout;
2799
2800 // realloc should be compatible to XFree, here, and elsewhere, too
2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2803 ct.nitems += ct2.nitems;
2804
2805 XFree (ct2.value);
2806 }
2807
2808 if (ct.value == 0)
2809 goto bailout;
2810
2811 if (ct.encoding == xa[XA_INCR])
2812 {
2813 // INCR selection, start handshake
2814 if (!delete_prop)
2815 XDeleteProperty (dpy, win, prop);
2816
2817 selection_wait = Sel_incr;
2818 incr_buf_fill = 0;
2819 incr_ev.start (10);
2820
2821 goto bailout;
2822 }
2823
2824 if (ct.nitems == 0)
2825 {
2826 if (selection_wait == Sel_incr)
2827 {
2828 XFree (ct.value);
2829
2830 // finally complete, now paste the whole thing
2831 selection_wait = Sel_normal;
2832 ct.value = (unsigned char *)incr_buf;
2833 ct.nitems = incr_buf_fill;
2834 incr_buf = 0;
2835 incr_buf_size = 0;
2836 incr_ev.stop ();
2837 }
2838 else
2839 {
2840 if (selection_wait == Sel_normal
2841 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2842 {
2843 /*
2844 * pass through again trying CUT_BUFFER0 if we've come from
2845 * XConvertSelection () but nothing was presented
2846 */
2847 selection_paste (display->root, XA_CUT_BUFFER0, False);
2848 }
2849
2850 goto bailout;
2851 }
2852 }
2853 else if (selection_wait == Sel_incr)
2854 {
2855 incr_ev.start (10);
2856
2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2858 {
2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2861 }
2862
2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2864 incr_buf_fill += ct.nitems;
2865
2866 goto bailout;
2867 }
2868
2869 char **cl;
2870 int cr;
2871
2872#if !ENABLE_MINIMAL
2873 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2874 // so recode it manually
2875 if (ct.encoding == xa[XA_UTF8_STRING])
2876 {
2877 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2878 char *s = rxvt_wcstombs (w);
2879 free (w);
2880 // TODO: strlen == only the first element will be converted. well...
2881 paste (s, strlen (s));
2882 free (s);
2883 }
2884 else
2885#endif
2886 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2887 && cl)
2888 {
2889 for (int i = 0; i < cr; i++)
2890 paste (cl[i], strlen (cl[i]));
2891
2892 XFreeStringList (cl);
2893 }
2894 else
2895 paste ((char *)ct.value, ct.nitems); // paste raw
2896
2897bailout:
2898 XFree (ct.value);
2899
2900 if (selection_wait == Sel_normal)
2901 selection_wait = Sel_none;
2902}
2903
2904void
2905rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2906{
2907 selection_wait = Sel_none;
2908
2909 incr_buf_size = 0;
2910 free (incr_buf);
2911
2912 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2913}
2914
2915void
2916rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2917{
2918 if (prop == None || selection_wait != Sel_incr)
2919 return;
2920
2921 selection_paste (win, prop, true);
2922}
2923
2924/* ------------------------------------------------------------------------- */
2925/*
2926 * Request the current selection:
2927 * Order: > internal selection if available
2928 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2929 * > CUT_BUFFER0
2930 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2931 * will auto fallback to CUT_BUFFER0
2932 * EXT: button 2 release 2736 * EXT: button 2 release
2933 */ 2737 */
2934void 2738void
2935rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2936{ 2740{
2937 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2938 {
2939 /* internal selection */
2940 char *str = rxvt_wcstombs (selection.text, selection.len);
2941 paste (str, strlen (str));
2942 free (str);
2943 return;
2944 } 2742 {
2945 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2946 { 2745 }
2947 selection_request_time = tm;
2948 selection_wait = Sel_normal;
2949
2950#if X_HAVE_UTF8_STRING
2951 selection_type = Sel_UTF8String;
2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2953 return;
2954#else
2955 selection_type = Sel_CompoundText;
2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2957 return;
2958#endif
2959 }
2960
2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
2963}
2964
2965int
2966rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2967{
2968 Atom sel;
2969
2970 selection_type |= selnum;
2971
2972 if (selnum == Sel_Primary)
2973 sel = XA_PRIMARY;
2974 else if (selnum == Sel_Secondary)
2975 sel = XA_SECONDARY;
2976 else
2977 sel = xa[XA_CLIPBOARD];
2978
2979 if (XGetSelectionOwner (dpy, sel) != None)
2980 {
2981 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2982 vt, selection_request_time);
2983 return 1;
2984 }
2985
2986 return 0;
2987} 2746}
2988 2747
2989/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2990/* 2749/*
2991 * Clear all selected text 2750 * Clear all selected text
… …
3185/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
3186/* 2945/*
3187 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
3188 * EXT: button 1 press 2947 * EXT: button 1 press
3189 */ 2948 */
3190void 2949void ecb_cold
3191rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3192{ 2951{
3193 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
3194 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
3195 2954
… …
3214 2973
3215/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
3216/* 2975/*
3217 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
3218 */ 2977 */
3219void 2978void ecb_cold
3220rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3221{ 2980{
3222 want_refresh = 1; 2981 want_refresh = 1;
3223 2982
3224 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3251/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3252#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3253 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3254#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3255 3014
3256void 3015void ecb_cold
3257rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3258{ 3017{
3259 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3260 row_col_t bound; 3019 row_col_t bound;
3261 text_t *stp; 3020 text_t *stp;
… …
3335 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3336 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3337 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3338 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3339 */ 3098 */
3340void 3099void ecb_cold
3341rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3342{ 3101{
3343 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3344 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3345 3104
… …
3371 3130
3372/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3373/* 3132/*
3374 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3375 */ 3134 */
3376void 3135void ecb_cold
3377rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3378{ 3137{
3379 row_col_t pos; 3138 row_col_t pos;
3380 enum { 3139 enum {
3381 LEFT, RIGHT 3140 LEFT, RIGHT
… …
3572 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3573#endif 3332#endif
3574} 3333}
3575 3334
3576#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3577void 3336void ecb_cold
3578rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3579{ 3338{
3580 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3581 text_t *stp; 3340 text_t *stp;
3582 3341
… …
3620/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3621/* 3380/*
3622 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3623 * EXT: button 3 double click 3382 * EXT: button 3 double click
3624 */ 3383 */
3625void 3384void ecb_cold
3626rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3627{ 3386{
3628 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3629 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3630} 3389}
… …
3632/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3633/* 3392/*
3634 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3635 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3636 */ 3395 */
3637void 3396void ecb_cold
3638rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3639{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3640 XSelectionEvent ev; 3400 XSelectionEvent ev;
3641 3401
3642 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3643 ev.property = None; 3403 ev.property = None;
3644 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3659 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3660#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3661 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3662#endif 3422#endif
3663 3423
3664 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3665 32, PropModeReplace, 3425 32, PropModeReplace,
3666 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3667 ev.property = rq.property; 3427 ev.property = property;
3668 } 3428 }
3669#if TODO // TODO 3429#if TODO // TODO
3670 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3671 { 3431 {
3672 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3673 } 3433 }
3674#endif 3434#endif
3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3676 { 3436 {
3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3678 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property; 3439 ev.property = property;
3680 } 3440 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 { 3442 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3685 ev.property = rq.property; 3445 ev.property = property;
3686 } 3446 }
3687 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3688 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3689 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3690 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3761 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3762 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3763 ct.encoding = target; 3523 ct.encoding = target;
3764 } 3524 }
3765 3525
3766 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3767 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3768 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3769 ev.property = rq.property; 3529 ev.property = property;
3770 3530
3771 if (freect) 3531 if (freect)
3772 XFree (ct.value); 3532 XFree (ct.value);
3773 } 3533 }
3774 3534
3775 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3776} 3536}
3777 3537
3778/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3779#ifdef USE_XIM 3539#if USE_XIM
3780void 3540void ecb_cold
3781rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3782{ 3542{
3783 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3784 3544
3785 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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