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

Diff Legend

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