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.373 by sf-exg, Sat Feb 12 00:30:01 2011 UTC vs.
Revision 1.428 by sf-exg, Sun Jan 13 17:42:24 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 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
270 { 287 }
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 288
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
281 292
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 301
291 do 302 do
292 { 303 {
293 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 306 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 308
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 310 {
300 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
301 312
302 plines++; 313 plines++;
303 llen += prev_ncol; 314 llen += prev_ncol;
… …
316 327
317 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
319 { 330 {
320 qline = row_buf + qrow; 331 qline = row_buf + qrow;
321 lalloc (*qline); 332 qline->alloc (); // redundant with next line
322 qline->l = ncol; 333 qline->l = ncol;
323 qline->is_longer (1); 334 qline->is_longer (1);
324 335
325 int qcol = 0; 336 int qcol = 0;
326 337
… …
341 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
342 // least. 353 // least.
343 if (prow == ocur.row) 354 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
345 356
346 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
347 358
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 360
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 383 {
373 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
374 385
375 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
376 { 387 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
379 390
380 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
395 dst.l = common_col;
382 } 396 }
383 397
384 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 400
389 term_start = 0; 401 term_start = 0;
390 } 402 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 403
396 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 406 }
399 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 chunk_free (prev_chunk, prev_chunk_size);
416
400 free (tabs); 417 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
402 419
403 for (int col = ncol; col--; ) 420 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
… …
411 tt_winch (); 428 tt_winch ();
412 429
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 431}
415 432
416/* ------------------------------------------------------------------------- */ 433void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 434rxvt_term::scr_release () NOTHROW
422{ 435{
423 if (row_buf) 436 chunk_free (chunk, chunk_size);
424 { 437 chunk = 0;
425 delete talloc; talloc = 0; 438 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 439
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); 440 free (tabs);
434 tabs = 0; 441 tabs = 0;
435 }
436} 442}
437 443
438/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
439/* 445/*
440 * Hard/Soft reset 446 * Hard/Soft reset
441 */ 447 */
442void 448void ecb_cold
443rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
444{ 450{
445 scr_release (); 451 scr_release ();
452
446 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 454 rvideo_mode = false;
448 scr_soft_reset (); 455 scr_soft_reset ();
449 scr_reset (); 456 scr_reset ();
450 457
451 scr_clear (true); 458 scr_clear (true);
452 scr_refresh (); 459 scr_refresh ();
453} 460}
454 461
455void 462void ecb_cold
456rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
457{ 464{
458 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
460 scr_overlay_off (); 467 scr_overlay_off ();
461#endif 468#endif
… …
516 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
518} 525}
519 526
520void 527void
521rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
522{ 529{
523 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
524 return; 531 return;
525 532
526 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
545 return; 552 return;
546 553
547 want_refresh = 1; 554 want_refresh = 1;
548 view_start = 0; 555 view_start = 0;
549 556
550 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
551 563
552 current_screen = scrn; 564 current_screen = scrn;
553 565
554#if NSCREENS 566#if NSCREENS
555 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
621/* 633/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 635 * count positive ==> scroll up
624 * count negative ==> scroll down 636 * count negative ==> scroll down
625 */ 637 */
626int 638int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 640{
629 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
630 return 0; 642 return 0;
631 643
… …
634 646
635 if (count > 0 647 if (count > 0
636 && row1 == 0 648 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
639 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 654
644 // sever bottommost line 655 // sever bottommost line
645 { 656 {
646 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
647 l.is_longer (0); 658 l.is_longer (0);
648 l.touch (); 659 l.touch ();
649 } 660 }
650 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
651 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 678 for (int i = count; i--; )
653 { 679 {
654 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
655 681
656 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 683 // 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))) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 685 {
660 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 687 l.l = 0;
… …
663 } 689 }
664 else 690 else
665 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
666 } 692 }
667 693
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 694 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
682 { 697 {
683 selection.beg.row -= count; 698 selection.beg.row -= count;
684 selection.end.row -= count; 699 selection.end.row -= count;
685 selection.mark.row -= count; 700 selection.mark.row -= count;
686 701
687 if (selection.beg.row < top_row 702 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 } 703 }
695 704
696 // finally move the view window, if desired 705 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 707 && view_start != 0
… …
728 } 737 }
729 738
730 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
732 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
733 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
734 751
735 min_it (count, rows); 752 min_it (count, rows);
736 753
737 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 755
739 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
740 { 757 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 759
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 762 }
746 763
747 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
749 } 773 }
750 774
751 return count; 775 return count;
752} 776}
753 777
754/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
755/* 779/*
756 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
757 */ 781 */
758void 782void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 784{
761 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
762 return; 786 return;
763 787
764 unsigned char checksel; 788 bool checksel;
765 unicode_t c; 789 unicode_t c;
766 int ncol = this->ncol; 790 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
768 792
769 want_refresh = 1; 793 want_refresh = 1;
… …
795 819
796 while (str < strend) 820 while (str < strend)
797 { 821 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 823
800 if (expect_false (c < 0x20)) 824 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 825 if (c == C0_LF)
802 { 826 {
803 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
804 828
805 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
824 { 848 {
825 scr_tab (1, true); 849 scr_tab (1, true);
826 continue; 850 continue;
827 } 851 }
828 852
829 if (expect_false ( 853 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 857 ))
834 { 858 {
… …
839 * should be a similar check. 863 * should be a similar check.
840 */ 864 */
841 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
842 } 866 }
843 867
844 if (expect_false (screen.flags & Screen_WrapNext)) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 869 {
846 scr_do_wrap (); 870 scr_do_wrap ();
847 871
848 line->l = ncol; 872 line->l = ncol;
849 line->is_longer (1); 873 line->is_longer (1);
… …
851 row = screen.cur.row; 875 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
853 } 877 }
854 878
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 881 c = 0xfffd;
858 882
859 // rely on wcwidth to tell us the character width, do wcwidth before 883 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
862 // locale. 886 // locale.
863 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
864 888
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 890 {
867 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 892 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
885 } 909 }
886 } 910 }
887 911
888 if (expect_false (screen.flags & Screen_Insert)) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
890 914
891 if (width != 0) 915 if (width != 0)
892 { 916 {
893#if !UNICODE_3 917#if !UNICODE_3
… …
901#endif 925#endif
902 926
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 928
905 // if the character doesn't fit into the remaining columns... 929 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 931 {
908 if (screen.flags & Screen_Autowrap) 932 if (screen.flags & Screen_Autowrap)
909 { 933 {
910 // ... artificially enlargen the previous one 934 // ... artificially enlargen the previous one
911 c = NOCHAR; 935 c = NOCHAR;
… …
918 942
919 // nuke the character at this position, if required 943 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 944 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 945 // we never have to check for overwriting a wide char itself,
922 // only its tail. 946 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 948 scr_kill_char (*line, screen.cur.col);
925 949
926 line->touch (); 950 line->touch ();
927 951
928 do 952 do
929 { 953 {
930 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
932 956
933 if (expect_true (screen.cur.col < ncol - 1)) 957 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 958 screen.cur.col++;
935 else 959 else
936 { 960 {
937 line->l = ncol; 961 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 965 goto end_of_line;
942 } 966 }
943 967
944 c = NOCHAR; 968 c = NOCHAR;
945 } 969 }
946 while (expect_false (--width > 0)); 970 while (ecb_unlikely (--width > 0));
947 971
948 // pad with spaces when overwriting wide character with smaller one 972 // 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++) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 974 {
951 line->t[c] = ' '; 975 line->t[c] = ' ';
952 line->r[c] = rend; 976 line->r[c] = rend;
953 } 977 }
954 978
… …
1113 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1116 */ 1140 */
1117#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1118void 1142void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1120{ 1144{
1121 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1147 else
… …
1130 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1133 */ 1157 */
1134#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1135void 1159void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1137{ 1161{
1138 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1164 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1292} 1316}
1293 1317
1294/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1295/* 1319/*
1296 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1324 */
1301void 1325void
… …
1310 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1311 1335
1312 switch (mode) 1336 switch (mode)
1313 { 1337 {
1314 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1339 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1341 num = nrow - row;
1319 break; 1342 break;
1320 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1344 scr_erase_line (1);
1323 row = 0; 1345 row = 0;
1324 num = screen.cur.row; 1346 num = screen.cur.row;
1325 break; 1347 break;
1326 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1349 row = 0;
1329 num = nrow; 1350 num = nrow;
1330 break; 1351 break;
1331 default: 1352 default:
1332 return; 1353 return;
… …
1349 { 1370 {
1350 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1351 1372
1352 if (mapped) 1373 if (mapped)
1353 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1356 } 1377 }
1357 else 1378 else
1358 { 1379 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1383 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1388 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1392 }
1372 } 1393 }
… …
1394/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1395/* 1416/*
1396 * Fill the screen with `E's 1417 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1419 */
1399void 1420void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1401{ 1422{
1402 rend_t fs; 1423 rend_t fs;
1403 1424
1404 want_refresh = 1; 1425 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1406 1427
1407 num_scr_allow = 0; 1428 num_scr_allow = 0;
1408 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1409 1434
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1412 { 1437 {
1413 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1564/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1565/* 1590/*
1566 * Set the scrolling region 1591 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1593 */
1569void 1594void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571{ 1596{
1572 max_it (top, 0); 1597 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1574 1599
… …
1584/* 1609/*
1585 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1613 */
1589void 1614void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591{ 1616{
1592 want_refresh = 1; 1617 want_refresh = 1;
1593 1618
1594 if (mode) 1619 if (mode)
… …
1601/* 1626/*
1602 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1630 */
1606void 1631void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1608{ 1633{
1609 if (mode) 1634 if (mode)
1610 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1611 else 1636 else
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1649 */
1625void 1650void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1627{ 1652{
1628 if (mode) 1653 if (mode)
1629 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1630 else 1655 else
… …
1637/* 1662/*
1638 * Set insert/replace mode 1663 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1666 */
1642void 1667void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1644{ 1669{
1645 if (mode) 1670 if (mode)
1646 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1647 else 1672 else
… …
1653 * Set/Unset tabs 1678 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1682 */
1658void 1683void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1660{ 1685{
1661 if (mode < 0) 1686 if (mode < 0)
1662 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1682 if (rvideo_state != on) 1707 if (rvideo_state != on)
1683 { 1708 {
1684 rvideo_state = on; 1709 rvideo_state = on;
1685 1710
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_IMG
1688 if (bg_pixmap == None) 1713 if (bg_img == 0)
1689#endif 1714#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1716
1692 XGCValues gcvalue; 1717 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1703/* 1728/*
1704 * Report current cursor position 1729 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1731 */
1707void 1732void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1709{ 1734{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1736}
1712 1737
… …
1715 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1716 1741
1717/* 1742/*
1718 * Set font style 1743 * Set font style
1719 */ 1744 */
1720void 1745void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1722{ 1747{
1723#if 0 1748#if 0
1724 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1725 { 1750 {
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1776 */
1752void 1777void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1754{ 1779{
1755 screen.charset = set; 1780 screen.charset = set;
1756 set_font_style (); 1781 set_font_style ();
1757} 1782}
… …
1778 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1779 1804
1780/* 1805/*
1781 * refresh matching text. 1806 * refresh matching text.
1782 */ 1807 */
1783bool 1808bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785{ 1810{
1786 bool found = false; 1811 bool found = false;
1787 1812
1788 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1807 PART_BEG = 0, 1832 PART_BEG = 0,
1808 PART_END, 1833 PART_END,
1809 RC_COUNT 1834 RC_COUNT
1810}; 1835};
1811 1836
1812void 1837void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1814{ 1839{
1815 int i; 1840 int i;
1816 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1817 1842
… …
1854 * Refresh the entire screen 1879 * Refresh the entire screen
1855 */ 1880 */
1856void 1881void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1883{
1859 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1885}
1861 1886
1862/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1863/* 1888/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1920 1945
1921# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1924# endif 1949# endif
1925 XMapWindow (dpy, parent[0]); 1950 XMapWindow (dpy, parent);
1926# endif 1951# endif
1927 1952
1928# if ENABLE_FRILLS 1953# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1954 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1955 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1969#endif
1945} 1970}
1946 1971
1947/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1973void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1975{
1952#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1953 int nrows, row_start; 1977 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
2003/* 2027/*
2004 * Refresh the screen 2028 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2031 */
2008void 2032void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
2010{ 2034{
2011 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2037 int i; /* tmp */
… …
2027 * A: set up vars 2051 * A: set up vars
2028 */ 2052 */
2029 refresh_count = 0; 2053 refresh_count = 0;
2030 2054
2031 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2056 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_IMG
2034 have_bg = bg_pixmap != None; 2058 have_bg = bg_img != 0;
2035#endif 2059#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2061
2038 /* 2062 /*
2039 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2069 scr_swap_overlay ();
2046#endif 2070#endif
2047 2071
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2073
2050 /* 2074 /*
2051 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2052 */ 2076 */
2053 { 2077 {
2054 unsigned char setoldcursor; 2078 bool setoldcursor;
2055 2079
2056#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2081 if (hidden_cursor)
2058 showcursor = 0; 2082 showcursor = 0;
2059#endif 2083#endif
… …
2146 { 2170 {
2147 int16_t nits; 2171 int16_t nits;
2148 int i = num_scr; 2172 int i = num_scr;
2149 int j; 2173 int j;
2150 int len, wlen; 2174 int len, wlen;
2151 dLocal (int, num_scr);
2152 2175
2153 j = nrow; 2176 j = nrow;
2154 wlen = len = -1; 2177 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2156 2179
… …
2231 continue; 2254 continue;
2232 2255
2233 // redraw one or more characters 2256 // redraw one or more characters
2234 2257
2235 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2260 --col;
2238 2261
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2263 text_t *text = stp + col;
2241 int count = 1; 2264 int count = 1;
… …
2279 2302
2280 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2282 2305
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2308 count++, i--;
2286 2309
2287 /* 2310 /*
2288 * Determine the attributes for the string 2311 * Determine the attributes for the string
2289 */ 2312 */
2290 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2292 2315
2293 // only do special processing if any attributes are set, which is unlikely 2316 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2318 {
2296 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2297 2320
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2411 /*
2389 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2390 */ 2413 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2415
2393 if (expect_true (have_bg && back == Color_bg)) 2416 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2417 {
2395 // this is very ugly, maybe push it into ->draw? 2418 // this is very ugly, maybe push it into ->draw?
2396 2419
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2421 if (text[i] != ' ')
… …
2405 did_clear: ; 2428 did_clear: ;
2406 } 2429 }
2407 else 2430 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2432
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2434 {
2412#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2438 else
… …
2461 2484
2462 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2486 Col2Pixel (col),
2464 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2490 }
2468 } 2491 }
2469 2492
2470 /* 2493 /*
2471 * H: cleanup selection 2494 * H: cleanup selection
… …
2480 screen.flags = old_screen_flags; 2503 screen.flags = old_screen_flags;
2481 num_scr = 0; 2504 num_scr = 0;
2482 num_scr_allow = 1; 2505 num_scr_allow = 1;
2483} 2506}
2484 2507
2485void 2508void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2487{ 2510{
2488 if (!l.t) 2511 if (!l.valid ())
2489 return; 2512 return;
2490 2513
2491 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492 2515
2493 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495} 2518}
2496 2519
2497void 2520void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2499{ 2522{
2500 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2502 2525
… …
2505 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2507 } 2530 }
2508} 2531}
2509 2532
2510void 2533void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{ 2535{
2513 bool transparent = false; 2536 bool transparent = false;
2514 2537
2515#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_IMG
2516 if (bg_pixmap != None) 2539 if (bg_img != 0)
2517 { 2540 {
2518# ifdef ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2543 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2546
2524 transparent = true; 2547 transparent = true;
2525 } 2548 }
2526 else 2549 else
2527# endif 2550# endif
2528 { 2551 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2531 } 2554 }
2532 } 2555 }
2533 else 2556 else
2534#endif 2557#endif
2535 { 2558 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2561 }
2539 2562
2540 XClearWindow (dpy, parent[0]); 2563 XClearWindow (dpy, parent);
2541 2564
2542 if (scrollBar.win) 2565 if (scrollBar.win)
2543 { 2566 {
2544 if (transparent) 2567 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2569 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2548 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2572 scrollBar.show (0);
2550 } 2573 }
2551 2574
2552 if (refresh) 2575 if (refresh)
2553 { 2576 {
… …
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2620} 2643}
2621 2644
2622/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2623void 2646void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2625{ 2648{
2626 if (selection.op 2649 if (selection.op
2627 && current_screen == selection.screen 2650 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
… …
2647 */ 2670 */
2648#if 0 2671#if 0
2649void 2672void
2650rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2651{ 2674{
2652 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2676 // 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} 2677}
2673#endif 2678#endif
2674 2679
2675/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2678void 2683void
2679rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2680{ 2685{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2686 if (!selection.op)
2684 return; 2687 return;
2685 2688
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2692 || (check_more == 1
2691 && current_screen == selection.screen 2693 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && 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 (); 2696 CLEAR_ALL_SELECTION ();
2703} 2697}
2704 2698
2705/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2706/* 2700/*
2707 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2713 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2709 data[i] = C0_CR;
2716 2710
2717 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2718 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2719 2713
2720 tt_write (data, len); 2714 tt_write (data, len);
2721 2715
2722 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2724} 2718}
2725 2719
2726void 2720void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{ 2722{
… …
2732 tt_paste (data, len); 2726 tt_paste (data, len);
2733} 2727}
2734 2728
2735/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2736/* 2730/*
2737 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2740 * > CUT_BUFFER0
2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2742 * will auto fallback to CUT_BUFFER0
2743 * EXT: button 2 release 2734 * EXT: button 2 release
2744 */ 2735 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs, void *ptr)
2748{
2749 rxvt_term *term = (rxvt_term *)ptr;
2750
2751 if (data)
2752 term->paste (data, len);
2753 delete rs;
2754 term->selection_req = 0;
2755}
2756
2757void 2736void
2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2759{ 2738{
2760 if (selection.text && selnum == Sel_Primary)
2761 {
2762 /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste (str, strlen (str));
2765 free (str);
2766 return;
2767 }
2768 else if (!selection_req) 2739 if (!selection_req)
2769 { 2740 {
2770 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this); 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2771 selection_req->run (); 2742 selection_req->run ();
2772 } 2743 }
2773} 2744}
2774 2745
2775/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
… …
2971/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2972/* 2943/*
2973 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
2974 * EXT: button 1 press 2945 * EXT: button 1 press
2975 */ 2946 */
2976void 2947void ecb_cold
2977rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2978{ 2949{
2979 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2980 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2981 2952
… …
3000 2971
3001/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3002/* 2973/*
3003 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3004 */ 2975 */
3005void 2976void ecb_cold
3006rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3007{ 2978{
3008 want_refresh = 1; 2979 want_refresh = 1;
3009 2980
3010 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3037/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3038#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3039 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3040#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3041 3012
3042void 3013void ecb_cold
3043rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3044{ 3015{
3045 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3046 row_col_t bound; 3017 row_col_t bound;
3047 text_t *stp; 3018 text_t *stp;
… …
3121 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3122 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3123 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3124 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3125 */ 3096 */
3126void 3097void ecb_cold
3127rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3128{ 3099{
3129 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3130 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3131 3102
… …
3157 3128
3158/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3159/* 3130/*
3160 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3161 */ 3132 */
3162void 3133void ecb_cold
3163rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3164{ 3135{
3165 row_col_t pos; 3136 row_col_t pos;
3166 enum { 3137 enum {
3167 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3358 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3359#endif 3330#endif
3360} 3331}
3361 3332
3362#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3363void 3334void ecb_cold
3364rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3365{ 3336{
3366 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3367 text_t *stp; 3338 text_t *stp;
3368 3339
… …
3406/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3407/* 3378/*
3408 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3409 * EXT: button 3 double click 3380 * EXT: button 3 double click
3410 */ 3381 */
3411void 3382void ecb_cold
3412rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3413{ 3384{
3414 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3415 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3416} 3387}
… …
3418/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3419/* 3390/*
3420 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3421 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3422 */ 3393 */
3423void 3394void ecb_cold
3424rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3425{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3426 XSelectionEvent ev; 3398 XSelectionEvent ev;
3427 3399
3428 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3429 ev.property = None; 3401 ev.property = None;
3430 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3445 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3446#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3447 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3448#endif 3420#endif
3449 3421
3450 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3451 32, PropModeReplace, 3423 32, PropModeReplace,
3452 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3453 ev.property = rq.property; 3425 ev.property = property;
3454 } 3426 }
3455#if TODO // TODO 3427#if TODO // TODO
3456 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3457 { 3429 {
3458 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3459 } 3431 }
3460#endif 3432#endif
3461 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3462 { 3434 {
3463 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3464 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465 ev.property = rq.property; 3437 ev.property = property;
3466 } 3438 }
3467 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3468 { 3440 {
3469 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3470 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3471 ev.property = rq.property; 3443 ev.property = property;
3472 } 3444 }
3473 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3476 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3547 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3548 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3549 ct.encoding = target; 3521 ct.encoding = target;
3550 } 3522 }
3551 3523
3552 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3553 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3554 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3555 ev.property = rq.property; 3527 ev.property = property;
3556 3528
3557 if (freect) 3529 if (freect)
3558 XFree (ct.value); 3530 XFree (ct.value);
3559 } 3531 }
3560 3532
3561 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3562} 3534}
3563 3535
3564/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3565#ifdef USE_XIM 3537#if USE_XIM
3566void 3538void ecb_cold
3567rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3568{ 3540{
3569 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3570 3542
3571 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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