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

Diff Legend

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