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

Diff Legend

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