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

Diff Legend

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