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.377 by root, Mon Mar 21 13:46:17 2011 UTC vs.
Revision 1.419 by root, Fri Jun 1 08:12:09 2012 UTC

… …
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 = rxvt_malloc (chunk_size);
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 free (chunk); chunk = 0; row_buf = 0;
424 { 435 free (tabs); tabs = 0;
425 delete talloc; talloc = 0;
426 delete ralloc; ralloc = 0;
427
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);
434 tabs = 0;
435 }
436} 436}
437 437
438/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
439/* 439/*
440 * Hard/Soft reset 440 * Hard/Soft reset
441 */ 441 */
442void 442void ecb_cold
443rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
444{ 444{
445 scr_release (); 445 scr_release ();
446
446 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 448 rvideo_mode = false;
448 scr_soft_reset (); 449 scr_soft_reset ();
449 scr_reset (); 450 scr_reset ();
450 451
451 scr_clear (true); 452 scr_clear (true);
452 scr_refresh (); 453 scr_refresh ();
453} 454}
454 455
455void 456void ecb_cold
456rxvt_term::scr_soft_reset () 457rxvt_term::scr_soft_reset () NOTHROW
457{ 458{
458 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
460 scr_overlay_off (); 461 scr_overlay_off ();
461#endif 462#endif
… …
516 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
518} 519}
519 520
520void 521void
521rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
522{ 523{
523 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
524 return; 525 return;
525 526
526 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
545 return; 546 return;
546 547
547 want_refresh = 1; 548 want_refresh = 1;
548 view_start = 0; 549 view_start = 0;
549 550
550 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
551 557
552 current_screen = scrn; 558 current_screen = scrn;
553 559
554#if NSCREENS 560#if NSCREENS
555 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
… …
621/* 627/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 629 * count positive ==> scroll up
624 * count negative ==> scroll down 630 * count negative ==> scroll down
625 */ 631 */
626int 632int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 634{
629 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
630 return 0; 636 return 0;
631 637
… …
634 640
635 if (count > 0 641 if (count > 0
636 && row1 == 0 642 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 644 {
645 min_it (count, total_rows - (nrow - (row2 + 1)));
646
639 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 648
644 // sever bottommost line 649 // sever bottommost line
645 { 650 {
646 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
647 l.is_longer (0); 652 l.is_longer (0);
648 l.touch (); 653 l.touch ();
649 } 654 }
650 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
651 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 672 for (int i = count; i--; )
653 { 673 {
654 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
655 675
656 // optimize if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 677 // 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))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 679 {
660 scr_blank_line (l, 0, l.l, rstyle); 680 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 681 l.l = 0;
… …
663 } 683 }
664 else 684 else
665 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
666 } 686 }
667 687
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 688 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
682 { 691 {
683 selection.beg.row -= count; 692 selection.beg.row -= count;
684 selection.end.row -= count; 693 selection.end.row -= count;
685 selection.mark.row -= count; 694 selection.mark.row -= count;
686 695
687 if (selection.beg.row < top_row 696 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 } 697 }
695 698
696 // finally move the view window, if desired 699 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 701 && view_start != 0
… …
728 } 731 }
729 732
730 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
732 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
733 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
734 745
735 min_it (count, rows); 746 min_it (count, rows);
736 747
737 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 749
739 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
740 { 751 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 753
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 756 }
746 757
747 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
749 } 767 }
750 768
751 return count; 769 return count;
752} 770}
753 771
754/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
755/* 773/*
756 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
757 */ 775 */
758void 776void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 778{
761 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
762 return; 780 return;
763 781
764 unsigned char checksel; 782 bool checksel;
765 unicode_t c; 783 unicode_t c;
766 int ncol = this->ncol; 784 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
768 786
769 want_refresh = 1; 787 want_refresh = 1;
… …
795 813
796 while (str < strend) 814 while (str < strend)
797 { 815 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 816 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 817
800 if (expect_false (c < 0x20)) 818 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 819 if (c == C0_LF)
802 { 820 {
803 max_it (line->l, screen.cur.col); 821 max_it (line->l, screen.cur.col);
804 822
805 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
… …
824 { 842 {
825 scr_tab (1, true); 843 scr_tab (1, true);
826 continue; 844 continue;
827 } 845 }
828 846
829 if (expect_false ( 847 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 848 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 851 ))
834 { 852 {
… …
839 * should be a similar check. 857 * should be a similar check.
840 */ 858 */
841 CLEAR_SELECTION (); 859 CLEAR_SELECTION ();
842 } 860 }
843 861
844 if (expect_false (screen.flags & Screen_WrapNext)) 862 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 863 {
846 scr_do_wrap (); 864 scr_do_wrap ();
847 865
848 line->l = ncol; 866 line->l = ncol;
849 line->is_longer (1); 867 line->is_longer (1);
… …
851 row = screen.cur.row; 869 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 870 line = &ROW(row); /* _must_ refresh */
853 } 871 }
854 872
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 873 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 874 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 875 c = 0xfffd;
858 876
859 // rely on wcwidth to tell us the character width, do wcwidth before 877 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 878 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 879 // drawing characters below as they might be invalid in the current
862 // locale. 880 // locale.
863 int width = WCWIDTH (c); 881 int width = WCWIDTH (c);
864 882
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 883 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 884 {
867 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 886 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 888 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 901 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 902 width = 1; // vt100 line drawing characters are always single-width
885 } 903 }
886 } 904 }
887 905
888 if (expect_false (screen.flags & Screen_Insert)) 906 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 907 scr_insdel_chars (width, INSERT);
890 908
891 if (width != 0) 909 if (width != 0)
892 { 910 {
893#if !UNICODE_3 911#if !UNICODE_3
… …
901#endif 919#endif
902 920
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 921 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 922
905 // if the character doesn't fit into the remaining columns... 923 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 924 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 925 {
908 if (screen.flags & Screen_Autowrap) 926 if (screen.flags & Screen_Autowrap)
909 { 927 {
910 // ... artificially enlargen the previous one 928 // ... artificially enlargen the previous one
911 c = NOCHAR; 929 c = NOCHAR;
… …
918 936
919 // nuke the character at this position, if required 937 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop 938 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself, 939 // we never have to check for overwriting a wide char itself,
922 // only its tail. 940 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 941 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col); 942 scr_kill_char (*line, screen.cur.col);
925 943
926 line->touch (); 944 line->touch ();
927 945
928 do 946 do
929 { 947 {
930 line->t[screen.cur.col] = c; 948 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 949 line->r[screen.cur.col] = rend;
932 950
933 if (expect_true (screen.cur.col < ncol - 1)) 951 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 952 screen.cur.col++;
935 else 953 else
936 { 954 {
937 line->l = ncol; 955 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 956 if (screen.flags & Screen_Autowrap)
… …
941 goto end_of_line; 959 goto end_of_line;
942 } 960 }
943 961
944 c = NOCHAR; 962 c = NOCHAR;
945 } 963 }
946 while (expect_false (--width > 0)); 964 while (ecb_unlikely (--width > 0));
947 965
948 // pad with spaces when overwriting wide character with smaller one 966 // 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++) 967 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 968 {
951 line->t[c] = ' '; 969 line->t[c] = ' ';
952 line->r[c] = rend; 970 line->r[c] = rend;
953 } 971 }
954 972
… …
1113 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1116 */ 1134 */
1117#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1118void 1136void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1120{ 1138{
1121 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1141 else
… …
1130 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1133 */ 1151 */
1134#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1135void 1153void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1137{ 1155{
1138 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1158 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1292} 1310}
1293 1311
1294/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1295/* 1313/*
1296 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1318 */
1301void 1319void
… …
1310 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1311 1329
1312 switch (mode) 1330 switch (mode)
1313 { 1331 {
1314 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1333 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1335 num = nrow - row;
1319 break; 1336 break;
1320 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1338 scr_erase_line (1);
1323 row = 0; 1339 row = 0;
1324 num = screen.cur.row; 1340 num = screen.cur.row;
1325 break; 1341 break;
1326 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1343 row = 0;
1329 num = nrow; 1344 num = nrow;
1330 break; 1345 break;
1331 default: 1346 default:
1332 return; 1347 return;
… …
1349 { 1364 {
1350 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1351 1366
1352 if (mapped) 1367 if (mapped)
1353 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1355 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1356 } 1371 }
1357 else 1372 else
1358 { 1373 {
1359 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1362 { 1377 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start), 1381 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1382 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 } 1386 }
1372 } 1387 }
… …
1394/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1395/* 1410/*
1396 * Fill the screen with `E's 1411 * Fill the screen with `E's
1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1398 */ 1413 */
1399void 1414void ecb_cold
1400rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1401{ 1416{
1402 rend_t fs; 1417 rend_t fs;
1403 1418
1404 want_refresh = 1; 1419 want_refresh = 1;
1405 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1406 1421
1407 num_scr_allow = 0; 1422 num_scr_allow = 0;
1408 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1409 1428
1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1411 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1412 { 1431 {
1413 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1564/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1565/* 1584/*
1566 * Set the scrolling region 1585 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1587 */
1569void 1588void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571{ 1590{
1572 max_it (top, 0); 1591 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1574 1593
… …
1584/* 1603/*
1585 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1607 */
1589void 1608void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591{ 1610{
1592 want_refresh = 1; 1611 want_refresh = 1;
1593 1612
1594 if (mode) 1613 if (mode)
… …
1601/* 1620/*
1602 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1624 */
1606void 1625void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1608{ 1627{
1609 if (mode) 1628 if (mode)
1610 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1611 else 1630 else
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1643 */
1625void 1644void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1627{ 1646{
1628 if (mode) 1647 if (mode)
1629 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1630 else 1649 else
… …
1637/* 1656/*
1638 * Set insert/replace mode 1657 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1660 */
1642void 1661void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1644{ 1663{
1645 if (mode) 1664 if (mode)
1646 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1647 else 1666 else
… …
1653 * Set/Unset tabs 1672 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1676 */
1658void 1677void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1660{ 1679{
1661 if (mode < 0) 1680 if (mode < 0)
1662 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1702/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1703/* 1722/*
1704 * Report current cursor position 1723 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1725 */
1707void 1726void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1709{ 1728{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1730}
1712 1731
… …
1715 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1716 1735
1717/* 1736/*
1718 * Set font style 1737 * Set font style
1719 */ 1738 */
1720void 1739void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1722{ 1741{
1723#if 0 1742#if 0
1724 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1725 { 1744 {
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1770 */
1752void 1771void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1754{ 1773{
1755 screen.charset = set; 1774 screen.charset = set;
1756 set_font_style (); 1775 set_font_style ();
1757} 1776}
… …
1778 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1779 1798
1780/* 1799/*
1781 * refresh matching text. 1800 * refresh matching text.
1782 */ 1801 */
1783bool 1802bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785{ 1804{
1786 bool found = false; 1805 bool found = false;
1787 1806
1788 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1807 PART_BEG = 0, 1826 PART_BEG = 0,
1808 PART_END, 1827 PART_END,
1809 RC_COUNT 1828 RC_COUNT
1810}; 1829};
1811 1830
1812void 1831void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1814{ 1833{
1815 int i; 1834 int i;
1816 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1817 1836
… …
1854 * Refresh the entire screen 1873 * Refresh the entire screen
1855 */ 1874 */
1856void 1875void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1877{
1859 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1879}
1861 1880
1862/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1863/* 1882/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1920 1939
1921# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1942 if (option (Opt_mapAlert))
1924# endif 1943# endif
1925 XMapWindow (dpy, parent[0]); 1944 XMapWindow (dpy, parent);
1926# endif 1945# endif
1927 1946
1928# if ENABLE_FRILLS 1947# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1948 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1949 set_urgency (1);
… …
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1944#endif 1963#endif
1945} 1964}
1946 1965
1947/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1948/* ARGSUSED */ 1967void ecb_cold
1949void
1950rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1951{ 1969{
1952#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1953 int nrows, row_start; 1971 int nrows, row_start;
1954 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
2003/* 2021/*
2004 * Refresh the screen 2022 * Refresh the screen
2005 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2006 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2007 */ 2025 */
2008void 2026void ecb_hot
2009rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2010{ 2028{
2011 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2012 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2013 int i; /* tmp */ 2031 int i; /* tmp */
… …
2027 * A: set up vars 2045 * A: set up vars
2028 */ 2046 */
2029 refresh_count = 0; 2047 refresh_count = 0;
2030 2048
2031 unsigned int old_screen_flags = screen.flags; 2049 unsigned int old_screen_flags = screen.flags;
2032 char have_bg = 0; 2050 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2034 have_bg = bg_pixmap != None; 2052 have_bg = bg_pixmap != None;
2035#endif 2053#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2055
… …
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2062#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2063 scr_swap_overlay ();
2046#endif 2064#endif
2047 2065
2048 char showcursor = screen.flags & Screen_VisibleCursor; 2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2049 2067
2050 /* 2068 /*
2051 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2052 */ 2070 */
2053 { 2071 {
2054 unsigned char setoldcursor; 2072 bool setoldcursor;
2055 2073
2056#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2057 if (hidden_cursor) 2075 if (hidden_cursor)
2058 showcursor = 0; 2076 showcursor = 0;
2059#endif 2077#endif
… …
2146 { 2164 {
2147 int16_t nits; 2165 int16_t nits;
2148 int i = num_scr; 2166 int i = num_scr;
2149 int j; 2167 int j;
2150 int len, wlen; 2168 int len, wlen;
2151 dLocal (int, num_scr);
2152 2169
2153 j = nrow; 2170 j = nrow;
2154 wlen = len = -1; 2171 wlen = len = -1;
2155 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2156 2173
… …
2231 continue; 2248 continue;
2232 2249
2233 // redraw one or more characters 2250 // redraw one or more characters
2234 2251
2235 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
2236 while (expect_false (stp[col] == NOCHAR && col > 0)) 2253 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2237 --col; 2254 --col;
2238 2255
2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2256 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2240 text_t *text = stp + col; 2257 text_t *text = stp + col;
2241 int count = 1; 2258 int count = 1;
… …
2279 2296
2280 col--; /* went one too far. move back */ 2297 col--; /* went one too far. move back */
2281 count -= i; /* dump any matching trailing chars */ 2298 count -= i; /* dump any matching trailing chars */
2282 2299
2283 // sometimes we optimize away the trailing NOCHAR's, add them back 2300 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR)) 2301 while (ecb_unlikely (i && text[count] == NOCHAR))
2285 count++, i--; 2302 count++, i--;
2286 2303
2287 /* 2304 /*
2288 * Determine the attributes for the string 2305 * Determine the attributes for the string
2289 */ 2306 */
2290 int fore = fgcolor_of (rend); // desired foreground 2307 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2308 int back = bgcolor_of (rend); // desired background
2292 2309
2293 // only do special processing if any attributes are set, which is unlikely 2310 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2311 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2312 {
2296 bool invert = rend & RS_RVid; 2313 bool invert = rend & RS_RVid;
2297 2314
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold && fore == Color_fg)
… …
2388 /* 2405 /*
2389 * Actually do the drawing of the string here 2406 * Actually do the drawing of the string here
2390 */ 2407 */
2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2408 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2392 2409
2393 if (expect_true (have_bg && back == Color_bg)) 2410 if (ecb_likely (have_bg && back == Color_bg))
2394 { 2411 {
2395 // this is very ugly, maybe push it into ->draw? 2412 // this is very ugly, maybe push it into ->draw?
2396 2413
2397 for (i = 0; i < count; i++) /* don't draw empty strings */ 2414 for (i = 0; i < count; i++) /* don't draw empty strings */
2398 if (text[i] != ' ') 2415 if (text[i] != ' ')
… …
2405 did_clear: ; 2422 did_clear: ;
2406 } 2423 }
2407 else 2424 else
2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2409 2426
2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2411 { 2428 {
2412#if ENABLE_FRILLS 2429#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline)) 2430 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2431 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else 2432 else
… …
2461 2478
2462 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2463 Col2Pixel (col), 2480 Col2Pixel (col),
2464 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2465 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2467 } 2484 }
2468 } 2485 }
2469 2486
2470 /* 2487 /*
2471 * H: cleanup selection 2488 * H: cleanup selection
… …
2480 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2481 num_scr = 0; 2498 num_scr = 0;
2482 num_scr_allow = 1; 2499 num_scr_allow = 1;
2483} 2500}
2484 2501
2485void 2502void ecb_cold
2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2487{ 2504{
2488 if (!l.t) 2505 if (!l.valid ())
2489 return; 2506 return;
2490 2507
2491 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2492 2509
2493 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495} 2512}
2496 2513
2497void 2514void ecb_cold
2498rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2499{ 2516{
2500 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2501 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2502 2519
… …
2505 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2507 } 2524 }
2508} 2525}
2509 2526
2510void 2527void ecb_cold
2511rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{ 2529{
2513 bool transparent = false; 2530 bool transparent = false;
2514 2531
2515#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2516 if (bg_pixmap != None) 2533 if (bg_pixmap != None)
2517 { 2534 {
2518# ifdef ENABLE_TRANSPARENCY 2535# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT) 2536 if (bg_flags & BG_IS_TRANSPARENT)
2520 { 2537 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap); 2538 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523 2540
2524 transparent = true; 2541 transparent = true;
2525 } 2542 }
2526 else 2543 else
2527# endif 2544# endif
2528 { 2545 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 } 2548 }
2532 } 2549 }
2533 else 2550 else
2534#endif 2551#endif
2535 { 2552 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 } 2555 }
2539 2556
2540 XClearWindow (dpy, parent[0]); 2557 XClearWindow (dpy, parent);
2541 2558
2542 if (scrollBar.win) 2559 if (scrollBar.win)
2543 { 2560 {
2544 if (transparent) 2561 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else 2563 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2548 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2549 scrollBar.show (0); 2566 scrollBar.show (0);
2550 } 2567 }
2551 2568
2552 if (refresh) 2569 if (refresh)
2553 { 2570 {
… …
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2620} 2637}
2621 2638
2622/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2623void 2640void ecb_hot
2624rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2625{ 2642{
2626 if (selection.op 2643 if (selection.op
2627 && current_screen == selection.screen 2644 && current_screen == selection.screen
2628 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2647 */ 2664 */
2648#if 0 2665#if 0
2649void 2666void
2650rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2651{ 2668{
2652 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2653 unsigned int width, towrite; 2670 // 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} 2671}
2673#endif 2672#endif
2674 2673
2675/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2676 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2677 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2678void 2677void
2679rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2680{ 2679{
2681 row_col_t pos;
2682
2683 if (!selection.op) 2680 if (!selection.op)
2684 return; 2681 return;
2685 2682
2686 pos.row = pos.col = 0;
2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2690 || (check_more == 1 2686 || (check_more == 1
2691 && current_screen == selection.screen 2687 && current_screen == selection.screen
2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && 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 (); 2690 CLEAR_ALL_SELECTION ();
2703} 2691}
2704 2692
2705/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2706/* 2694/*
2707 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
… …
2713 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2714 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2715 data[i] = C0_CR; 2703 data[i] = C0_CR;
2716 2704
2717 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2718 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2719 2707
2720 tt_write (data, len); 2708 tt_write (data, len);
2721 2709
2722 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2724} 2712}
2725 2713
2726void 2714void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{ 2716{
… …
2732 tt_paste (data, len); 2720 tt_paste (data, len);
2733} 2721}
2734 2722
2735/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2736/* 2724/*
2737 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2738 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * 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 2728 * EXT: button 2 release
2744 */ 2729 */
2745void 2730void
2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2747{ 2732{
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 }
2755 else if (!selection_req) 2733 if (!selection_req)
2756 { 2734 {
2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2758 selection_req->run (); 2736 selection_req->run ();
2759 } 2737 }
2760} 2738}
… …
2958/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2959/* 2937/*
2960 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2961 * EXT: button 1 press 2939 * EXT: button 1 press
2962 */ 2940 */
2963void 2941void ecb_cold
2964rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2965{ 2943{
2966 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2967 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2968 2946
… …
2987 2965
2988/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2989/* 2967/*
2990 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2991 */ 2969 */
2992void 2970void ecb_cold
2993rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2994{ 2972{
2995 want_refresh = 1; 2973 want_refresh = 1;
2996 2974
2997 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3024/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3025#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3026 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3027#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3028 3006
3029void 3007void ecb_cold
3030rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3031{ 3009{
3032 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3033 row_col_t bound; 3011 row_col_t bound;
3034 text_t *stp; 3012 text_t *stp;
… …
3108 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3109 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3110 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3111 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3112 */ 3090 */
3113void 3091void ecb_cold
3114rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3115{ 3093{
3116 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3117 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3118 3096
… …
3144 3122
3145/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3146/* 3124/*
3147 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3148 */ 3126 */
3149void 3127void ecb_cold
3150rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3151{ 3129{
3152 row_col_t pos; 3130 row_col_t pos;
3153 enum { 3131 enum {
3154 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3345 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3346#endif 3324#endif
3347} 3325}
3348 3326
3349#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3350void 3328void ecb_cold
3351rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3352{ 3330{
3353 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3354 text_t *stp; 3332 text_t *stp;
3355 3333
… …
3393/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3394/* 3372/*
3395 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3396 * EXT: button 3 double click 3374 * EXT: button 3 double click
3397 */ 3375 */
3398void 3376void ecb_cold
3399rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3400{ 3378{
3401 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3402 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3403} 3381}
… …
3405/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3406/* 3384/*
3407 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3408 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3409 */ 3387 */
3410void 3388void ecb_cold
3411rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3412{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3413 XSelectionEvent ev; 3392 XSelectionEvent ev;
3414 3393
3415 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3416 ev.property = None; 3395 ev.property = None;
3417 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3432 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3433#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3434 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3435#endif 3414#endif
3436 3415
3437 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3438 32, PropModeReplace, 3417 32, PropModeReplace,
3439 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3440 ev.property = rq.property; 3419 ev.property = property;
3441 } 3420 }
3442#if TODO // TODO 3421#if TODO // TODO
3443 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3444 { 3423 {
3445 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3446 } 3425 }
3447#endif 3426#endif
3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3449 { 3428 {
3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3451 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property; 3431 ev.property = property;
3453 } 3432 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 { 3434 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3436 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3458 ev.property = rq.property; 3437 ev.property = property;
3459 } 3438 }
3460 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3461 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3462 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3463 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3534 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3535 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3536 ct.encoding = target; 3515 ct.encoding = target;
3537 } 3516 }
3538 3517
3539 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3540 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3541 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3542 ev.property = rq.property; 3521 ev.property = property;
3543 3522
3544 if (freect) 3523 if (freect)
3545 XFree (ct.value); 3524 XFree (ct.value);
3546 } 3525 }
3547 3526
3548 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3549} 3528}
3550 3529
3551/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3552#ifdef USE_XIM 3531#ifdef USE_XIM
3553void 3532void ecb_cold
3554rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3555{ 3534{
3556 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3557 3536
3558 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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