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

Diff Legend

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