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.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 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 ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 259 top_row = 0;
203 term_start = 0; 260 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 261
219 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
245 { 288 {
246 /* 289 /*
247 * add or delete rows as appropriate 290 * add or delete rows as appropriate
248 */ 291 */
249 292
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
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 294
267 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
268 { 296 {
269 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 300
273 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 302 }
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 303
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
285 307
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 316
295 do 317 do
296 { 318 {
297 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 321 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 323
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 325 {
304 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
305 327
306 plines++; 328 plines++;
307 llen += prev_ncol; 329 llen += prev_ncol;
… …
320 342
321 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
323 { 345 {
324 qline = row_buf + qrow; 346 qline = row_buf + qrow;
325 lalloc (*qline); 347 qline->alloc (); // redundant with next line
326 qline->l = ncol; 348 qline->l = ncol;
327 qline->is_longer (1); 349 qline->is_longer (1);
328 350
329 int qcol = 0; 351 int qcol = 0;
330 352
… …
345 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
346 // least. 368 // least.
347 if (prow == ocur.row) 369 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
349 371
350 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
351 373
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 375
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 398 {
377 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
378 400
379 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
380 { 402 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
383 405
384 qline = pline; 406 copy_line (dst, src);
385 lresize (qline);
386 } 407 }
387 408
388 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 411
393 term_start = 0; 412 term_start = 0;
394 } 413 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 414
400 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 417 }
403 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
404 free (tabs); 428 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
406 430
407 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 439 tt_winch ();
416 440
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 442}
419 443
420/* ------------------------------------------------------------------------- */ 444void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
426{ 446{
427 if (row_buf) 447 chunk_free (chunk, chunk_size);
428 { 448 chunk = 0;
429 delete talloc; talloc = 0; 449 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 450
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); 451 free (tabs);
438 tabs = 0; 452 tabs = 0;
439 }
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
463
450 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 465 rvideo_mode = false;
452 scr_soft_reset (); 466 scr_soft_reset ();
453 scr_reset (); 467 scr_reset ();
454 468
455 scr_clear (true); 469 scr_clear (true);
456 scr_refresh (); 470 scr_refresh ();
457} 471}
458 472
459void 473void ecb_cold
460rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
461{ 475{
462 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
464 scr_overlay_off (); 478 scr_overlay_off ();
465#endif 479#endif
… …
520 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
522} 536}
523 537
524void 538void
525rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
526{ 540{
527 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
528 return; 542 return;
529 543
530 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
549 return; 563 return;
550 564
551 want_refresh = 1; 565 want_refresh = 1;
552 view_start = 0; 566 view_start = 0;
553 567
554 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
555 574
556 current_screen = scrn; 575 current_screen = scrn;
557 576
558#if NSCREENS 577#if NSCREENS
559 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
625/* 644/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 646 * count positive ==> scroll up
628 * count negative ==> scroll down 647 * count negative ==> scroll down
629 */ 648 */
630int 649int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 651{
633 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
634 return 0; 653 return 0;
635 654
… …
638 657
639 if (count > 0 658 if (count > 0
640 && row1 == 0 659 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
643 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 665
648 // sever bottommost line 666 // sever bottommost line
649 { 667 {
650 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
651 l.is_longer (0); 669 l.is_longer (0);
652 l.touch (); 670 l.touch ();
653 } 671 }
654 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
655 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 689 for (int i = count; i--; )
657 { 690 {
658 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
659 692
660 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 694 // 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))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 696 {
664 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 698 l.l = 0;
… …
667 } 700 }
668 else 701 else
669 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
670 } 703 }
671 704
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 705 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
686 { 708 {
687 selection.beg.row -= count; 709 selection.beg.row -= count;
688 selection.end.row -= count; 710 selection.end.row -= count;
689 selection.mark.row -= count; 711 selection.mark.row -= count;
690 712
691 if (selection.beg.row < top_row 713 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 } 714 }
699 715
700 // finally move the view window, if desired 716 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 718 && view_start != 0
… …
732 } 748 }
733 749
734 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
736 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
737 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
738 762
739 min_it (count, rows); 763 min_it (count, rows);
740 764
741 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 766
743 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
744 { 768 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 770
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 773 }
750 774
751 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
753 } 784 }
754 785
755 return count; 786 return count;
756} 787}
757 788
758/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
759/* 790/*
760 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
761 */ 792 */
762void 793void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 795{
765 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
766 return; 797 return;
767 798
768 unsigned char checksel; 799 bool checksel;
769 unicode_t c; 800 unicode_t c;
770 int ncol = this->ncol; 801 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
772 803
773 want_refresh = 1; 804 want_refresh = 1;
… …
799 830
800 while (str < strend) 831 while (str < strend)
801 { 832 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 834
804 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 836 if (c == C0_LF)
806 { 837 {
807 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
808 839
809 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
828 { 859 {
829 scr_tab (1, true); 860 scr_tab (1, true);
830 continue; 861 continue;
831 } 862 }
832 863
833 if (expect_false ( 864 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 868 ))
838 { 869 {
… …
843 * should be a similar check. 874 * should be a similar check.
844 */ 875 */
845 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
846 } 877 }
847 878
848 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 880 {
850 scr_do_wrap (); 881 scr_do_wrap ();
851 882
852 line->l = ncol; 883 line->l = ncol;
853 line->is_longer (1); 884 line->is_longer (1);
… …
855 row = screen.cur.row; 886 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
857 } 888 }
858 889
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 892 c = 0xfffd;
862 893
863 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
866 // locale. 897 // locale.
867 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
868 899
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 901 {
871 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 903 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
889 } 920 }
890 } 921 }
891 922
892 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
894 925
895 if (width != 0) 926 if (width != 0)
896 { 927 {
897#if !UNICODE_3 928#if !UNICODE_3
… …
905#endif 936#endif
906 937
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908 939
909 // if the character doesn't fit into the remaining columns... 940 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 { 942 {
912 if (screen.flags & Screen_Autowrap) 943 if (screen.flags & Screen_Autowrap)
913 { 944 {
914 // ... artificially enlargen the previous one 945 // ... artificially enlargen the previous one
915 c = NOCHAR; 946 c = NOCHAR;
… …
922 953
923 // nuke the character at this position, if required 954 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop 955 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself, 956 // we never have to check for overwriting a wide char itself,
926 // only its tail. 957 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR)) 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
929 960
930 line->touch (); 961 line->touch ();
931 962
932 do 963 do
933 { 964 {
934 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
935 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
936 967
937 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
938 screen.cur.col++; 969 screen.cur.col++;
939 else 970 else
940 { 971 {
941 line->l = ncol; 972 line->l = ncol;
942 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
… …
945 goto end_of_line; 976 goto end_of_line;
946 } 977 }
947 978
948 c = NOCHAR; 979 c = NOCHAR;
949 } 980 }
950 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
951 982
952 // pad with spaces when overwriting wide character with smaller one 983 // 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++) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
954 { 985 {
955 line->t[c] = ' '; 986 line->t[c] = ' ';
956 line->r[c] = rend; 987 line->r[c] = rend;
957 } 988 }
958 989
… …
1117 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1118 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1119 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1120 */ 1151 */
1121#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1122void 1153void ecb_cold
1123rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1124{ 1155{
1125 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1127 else 1158 else
… …
1134 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1135 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1136 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1137 */ 1168 */
1138#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1139void 1170void ecb_cold
1140rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1141{ 1172{
1142 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1144 else 1175 else
… …
1295 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1296} 1327}
1297 1328
1298/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1299/* 1330/*
1300 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1304 */ 1335 */
1305void 1336void
… …
1314 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1315 1346
1316 switch (mode) 1347 switch (mode)
1317 { 1348 {
1318 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1319 selection_check (1);
1320 scr_erase_line (0); 1350 scr_erase_line (0);
1321 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1322 num = nrow - row; 1352 num = nrow - row;
1323 break; 1353 break;
1324 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1325 selection_check (3);
1326 scr_erase_line (1); 1355 scr_erase_line (1);
1327 row = 0; 1356 row = 0;
1328 num = screen.cur.row; 1357 num = screen.cur.row;
1329 break; 1358 break;
1330 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1331 selection_check (3);
1332 row = 0; 1360 row = 0;
1333 num = nrow; 1361 num = nrow;
1334 break; 1362 break;
1335 default: 1363 default:
1336 return; 1364 return;
… …
1353 { 1381 {
1354 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1355 1383
1356 if (mapped) 1384 if (mapped)
1357 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1360 } 1388 }
1361 else 1389 else
1362 { 1390 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1366 { 1394 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1371 (unsigned int)width, 1399 (unsigned int)vt_width,
1372 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1373 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1374 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 } 1403 }
1376 } 1404 }
… …
1398/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1399/* 1427/*
1400 * Fill the screen with `E's 1428 * Fill the screen with `E's
1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1402 */ 1430 */
1403void 1431void ecb_cold
1404rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1405{ 1433{
1406 rend_t fs; 1434 rend_t fs;
1407 1435
1408 want_refresh = 1; 1436 want_refresh = 1;
1409 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1410 1438
1411 num_scr_allow = 0; 1439 num_scr_allow = 0;
1412 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1413 1445
1414 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1415 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1416 { 1448 {
1417 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1568/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1569/* 1601/*
1570 * Set the scrolling region 1602 * Set the scrolling region
1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1572 */ 1604 */
1573void 1605void ecb_cold
1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1575{ 1607{
1576 max_it (top, 0); 1608 max_it (top, 0);
1577 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1578 1610
… …
1588/* 1620/*
1589 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1592 */ 1624 */
1593void 1625void ecb_cold
1594rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1595{ 1627{
1596 want_refresh = 1; 1628 want_refresh = 1;
1597 1629
1598 if (mode) 1630 if (mode)
… …
1605/* 1637/*
1606 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1609 */ 1641 */
1610void 1642void ecb_cold
1611rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1612{ 1644{
1613 if (mode) 1645 if (mode)
1614 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1615 else 1647 else
… …
1624 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1625 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1628 */ 1660 */
1629void 1661void ecb_cold
1630rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1631{ 1663{
1632 if (mode) 1664 if (mode)
1633 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1634 else 1666 else
… …
1641/* 1673/*
1642 * Set insert/replace mode 1674 * Set insert/replace mode
1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1645 */ 1677 */
1646void 1678void ecb_cold
1647rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1648{ 1680{
1649 if (mode) 1681 if (mode)
1650 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1651 else 1683 else
… …
1657 * Set/Unset tabs 1689 * Set/Unset tabs
1658 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1661 */ 1693 */
1662void 1694void ecb_cold
1663rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1664{ 1696{
1665 if (mode < 0) 1697 if (mode < 0)
1666 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1667 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1686 if (rvideo_state != on) 1718 if (rvideo_state != on)
1687 { 1719 {
1688 rvideo_state = on; 1720 rvideo_state = on;
1689 1721
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1692 if (bg_pixmap == None) 1724 if (bg_img == 0)
1693#endif 1725#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1727
1696 XGCValues gcvalue; 1728 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1706/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1707/* 1739/*
1708 * Report current cursor position 1740 * Report current cursor position
1709 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1710 */ 1742 */
1711void 1743void ecb_cold
1712rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1713{ 1745{
1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1715} 1747}
1716 1748
… …
1719 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1720 1752
1721/* 1753/*
1722 * Set font style 1754 * Set font style
1723 */ 1755 */
1724void 1756void ecb_cold
1725rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1726{ 1758{
1727#if 0 1759#if 0
1728 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1729 { 1761 {
… …
1751 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1753 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1754 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1755 */ 1787 */
1756void 1788void ecb_cold
1757rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1758{ 1790{
1759 screen.charset = set; 1791 screen.charset = set;
1760 set_font_style (); 1792 set_font_style ();
1761} 1793}
… …
1782 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1783 1815
1784/* 1816/*
1785 * refresh matching text. 1817 * refresh matching text.
1786 */ 1818 */
1787bool 1819bool ecb_cold
1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1789{ 1821{
1790 bool found = false; 1822 bool found = false;
1791 1823
1792 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1811 PART_BEG = 0, 1843 PART_BEG = 0,
1812 PART_END, 1844 PART_END,
1813 RC_COUNT 1845 RC_COUNT
1814}; 1846};
1815 1847
1816void 1848void ecb_hot
1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1818{ 1850{
1819 int i; 1851 int i;
1820 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1821 1853
… …
1858 * Refresh the entire screen 1890 * Refresh the entire screen
1859 */ 1891 */
1860void 1892void
1861rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1862{ 1894{
1863 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1864} 1896}
1865 1897
1866/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1867/* 1899/*
1868 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1980#endif
1949} 1981}
1950 1982
1951/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1984void ecb_cold
1953void
1954rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1955{ 1986{
1956#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1957 int nrows, row_start; 1988 int nrows, row_start;
1958 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2007/* 2038/*
2008 * Refresh the screen 2039 * Refresh the screen
2009 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2010 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2042 */
2012void 2043void ecb_hot
2013rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2014{ 2045{
2015 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2048 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */
2020#endif
2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2024 2053
2025 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2026 2055
2027 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2028 return; 2057 return;
… …
2031 * A: set up vars 2060 * A: set up vars
2032 */ 2061 */
2033 refresh_count = 0; 2062 refresh_count = 0;
2034 2063
2035 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2065 bool have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2038 have_bg = bg_pixmap != None; 2067 have_bg = bg_img != 0;
2039#endif 2068#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2070
2042 /* 2071 /*
2043 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
… …
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY 2077#if ENABLE_OVERLAY
2049 scr_swap_overlay (); 2078 scr_swap_overlay ();
2050#endif 2079#endif
2051 2080
2052 char showcursor = screen.flags & Screen_VisibleCursor; 2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2053 2082
2054 /* 2083 /*
2055 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
2056 */ 2085 */
2057 { 2086 {
2058 unsigned char setoldcursor; 2087 bool setoldcursor;
2059 2088
2060#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
2061 if (hidden_cursor) 2090 if (hidden_cursor)
2062 showcursor = 0; 2091 showcursor = 0;
2063#endif 2092#endif
… …
2067 int col = screen.cur.col; 2096 int col = screen.cur.col;
2068 2097
2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2070 col--; 2099 col--;
2071 2100
2072 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2073 2103
2074#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2078 else 2107 else
2079#endif 2108#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2094 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2095#endif 2124#endif
2096 2125
2097 if (focus) 2126 if (focus)
2098 { 2127 {
2128 rend_t rend = cur_rend;
2129
2099 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2100 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2101 else 2132 else
2102 { 2133 {
2103 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2104 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2105 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2106 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2107 } 2140 }
2108 } 2141 }
2109 2142
2110 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2111 setoldcursor = 0; 2144 setoldcursor = 0;
… …
2150 { 2183 {
2151 int16_t nits; 2184 int16_t nits;
2152 int i = num_scr; 2185 int i = num_scr;
2153 int j; 2186 int j;
2154 int len, wlen; 2187 int len, wlen;
2155 dLocal (int, num_scr);
2156 2188
2157 j = nrow; 2189 j = nrow;
2158 wlen = len = -1; 2190 wlen = len = -1;
2159 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2160 2192
… …
2235 continue; 2267 continue;
2236 2268
2237 // redraw one or more characters 2269 // redraw one or more characters
2238 2270
2239 // seek to the beginning of wide characters 2271 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2272 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2241 --col; 2273 --col;
2242 2274
2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2275 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2276 text_t *text = stp + col;
2245 int count = 1; 2277 int count = 1;
… …
2283 2315
2284 col--; /* went one too far. move back */ 2316 col--; /* went one too far. move back */
2285 count -= i; /* dump any matching trailing chars */ 2317 count -= i; /* dump any matching trailing chars */
2286 2318
2287 // sometimes we optimize away the trailing NOCHAR's, add them back 2319 // sometimes we optimize away the trailing NOCHAR's, add them back
2288 while (expect_false (i && text[count] == NOCHAR)) 2320 while (ecb_unlikely (i && text[count] == NOCHAR))
2289 count++, i--; 2321 count++, i--;
2290 2322
2291 /* 2323 /*
2292 * Determine the attributes for the string 2324 * Determine the attributes for the string
2293 */ 2325 */
2294 int fore = fgcolor_of (rend); // desired foreground 2326 int fore = fgcolor_of (rend); // desired foreground
2295 int back = bgcolor_of (rend); // desired background 2327 int back = bgcolor_of (rend); // desired background
2296 2328
2297 // only do special processing if any attributes are set, which is unlikely 2329 // only do special processing if any attributes are set, which is unlikely
2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2330 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2299 { 2331 {
2300 bool invert = rend & RS_RVid; 2332 bool invert = rend & RS_RVid;
2301 2333
2302#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2303 if (rend & RS_Bold && fore == Color_fg) 2335 if (rend & RS_Bold && fore == Color_fg)
… …
2392 /* 2424 /*
2393 * Actually do the drawing of the string here 2425 * Actually do the drawing of the string here
2394 */ 2426 */
2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2427 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2396 2428
2397 if (expect_true (have_bg && back == Color_bg)) 2429 if (ecb_likely (have_bg && back == Color_bg))
2398 { 2430 {
2399 // this is very ugly, maybe push it into ->draw? 2431 // this is very ugly, maybe push it into ->draw?
2400 2432
2401 for (i = 0; i < count; i++) /* don't draw empty strings */ 2433 for (i = 0; i < count; i++) /* don't draw empty strings */
2402 if (text[i] != ' ') 2434 if (text[i] != ' ')
… …
2409 did_clear: ; 2441 did_clear: ;
2410 } 2442 }
2411 else 2443 else
2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2413 2445
2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2415 { 2447 {
2416#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2417 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2418 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2419 else 2451 else
… …
2431 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2432 */ 2464 */
2433 if (showcursor) 2465 if (showcursor)
2434 { 2466 {
2435 if (focus) 2467 if (focus)
2436 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2437 if (option (Opt_cursorUnderline))
2438 *crp ^= RS_Uline;
2439 else
2440 {
2441 *crp ^= RS_RVid;
2442#ifndef NO_CURSORCOLOR
2443 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2444#endif
2445 }
2446 }
2447 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2448 { 2470 {
2449 int cursorwidth = 1; 2471 int cursorwidth = 1;
2450 int col = oldcursor.col; 2472 int col = oldcursor.col;
2451 2473
… …
2465 2487
2466 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2467 Col2Pixel (col), 2489 Col2Pixel (col),
2468 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2469 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2471 } 2493 }
2472 } 2494 }
2473 2495
2474 /* 2496 /*
2475 * H: cleanup selection 2497 * H: cleanup selection
… …
2484 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2485 num_scr = 0; 2507 num_scr = 0;
2486 num_scr_allow = 1; 2508 num_scr_allow = 1;
2487} 2509}
2488 2510
2489void 2511void ecb_cold
2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2491{ 2513{
2492 if (!l.t) 2514 if (!l.valid ())
2493 return; 2515 return;
2494 2516
2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2496 2518
2497 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2498 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2499} 2521}
2500 2522
2501void 2523void ecb_cold
2502rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2503{ 2525{
2504 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2505 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2506 2528
… …
2509 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2510 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2511 } 2533 }
2512} 2534}
2513 2535
2514void 2536void ecb_cold
2515rxvt_term::scr_recolour (bool refresh) NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2538{
2517 bool transparent = false; 2539 bool transparent = false;
2518 2540
2519#ifdef HAVE_BG_PIXMAP 2541#ifdef HAVE_IMG
2520 if (bg_pixmap != None) 2542 if (bg_img != 0)
2521 { 2543 {
2522# ifdef ENABLE_TRANSPARENCY 2544# if ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT) 2545 if (bg_flags & BG_IS_TRANSPARENT)
2524 { 2546 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527 2549
2528 transparent = true; 2550 transparent = true;
2529 } 2551 }
2530 else 2552 else
2531# endif 2553# endif
2532 { 2554 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2535 } 2557 }
2536 } 2558 }
2537 else 2559 else
2538#endif 2560#endif
2539 { 2561 {
… …
2546 if (scrollBar.win) 2568 if (scrollBar.win)
2547 { 2569 {
2548 if (transparent) 2570 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else 2572 else
2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2552 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2553 scrollBar.show (0); 2575 scrollBar.show (0);
2554 } 2576 }
2555 2577
2556 if (refresh) 2578 if (refresh)
2557 { 2579 {
… …
2622 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2623 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2624} 2646}
2625 2647
2626/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2627void 2649void ecb_hot
2628rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2629{ 2651{
2630 if (selection.op 2652 if (selection.op
2631 && current_screen == selection.screen 2653 && current_screen == selection.screen
2632 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2651 */ 2673 */
2652#if 0 2674#if 0
2653void 2675void
2654rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2655{ 2677{
2656 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2657 unsigned int width, towrite; 2679 // 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} 2680}
2677#endif 2681#endif
2678 2682
2679/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2680 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2681 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2682void 2686void
2683rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2684{ 2688{
2685 row_col_t pos;
2686
2687 if (!selection.op) 2689 if (!selection.op)
2688 return; 2690 return;
2689 2691
2690 pos.row = pos.col = 0;
2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2694 || (check_more == 1 2695 || (check_more == 1
2695 && current_screen == selection.screen 2696 && current_screen == selection.screen
2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && 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 (); 2699 CLEAR_ALL_SELECTION ();
2700}
2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2707} 2714}
2708 2715
2709/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2710/* 2717/*
2711 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
… …
2717 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2718 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2719 data[i] = C0_CR; 2726 data[i] = C0_CR;
2720 2727
2721 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~"); 2729 tt_printf ("\x1b[200~");
2723 2730
2724 tt_write (data, len); 2731 tt_write (data, len);
2725 2732
2726 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[201~"); 2734 tt_printf ("\x1b[201~");
2728} 2735}
2729 2736
2730void 2737void
2731rxvt_term::paste (char *data, unsigned int len) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2732{ 2739{
… …
2952/* ------------------------------------------------------------------------- */ 2959/* ------------------------------------------------------------------------- */
2953/* 2960/*
2954 * Mark or select text based upon number of clicks: 1, 2, or 3 2961 * Mark or select text based upon number of clicks: 1, 2, or 3
2955 * EXT: button 1 press 2962 * EXT: button 1 press
2956 */ 2963 */
2957void 2964void ecb_cold
2958rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2959{ 2966{
2960 clicks = ((clicks - 1) % 3) + 1; 2967 clicks = ((clicks - 1) % 3) + 1;
2961 selection.clicks = clicks; /* save clicks so extend will work */ 2968 selection.clicks = clicks; /* save clicks so extend will work */
2962 2969
… …
2981 2988
2982/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
2983/* 2990/*
2984 * Mark a selection at the specified col/row 2991 * Mark a selection at the specified col/row
2985 */ 2992 */
2986void 2993void ecb_cold
2987rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2988{ 2995{
2989 want_refresh = 1; 2996 want_refresh = 1;
2990 2997
2991 selection.mark.row = row + view_start; 2998 selection.mark.row = row + view_start;
… …
3014 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3015 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3016 */ 3023 */
3017 3024
3018/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3019#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3020 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3021#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3022 3029
3023void 3030void ecb_cold
3024rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3025{ 3032{
3026 int col, row, dirnadd, tcol, trow, w1, w2; 3033 int col, row, dirnadd, tcol, trow, w1, w2;
3027 row_col_t bound; 3034 row_col_t bound;
3028 text_t *stp; 3035 text_t *stp;
… …
3102 * EXT: button 3 press; button 1 or 3 drag 3109 * EXT: button 3 press; button 1 or 3 drag
3103 * flag == 0 ==> button 1 3110 * flag == 0 ==> button 1
3104 * flag == 1 ==> button 3 press 3111 * flag == 1 ==> button 3 press
3105 * flag == 2 ==> button 3 motion 3112 * flag == 2 ==> button 3 motion
3106 */ 3113 */
3107void 3114void ecb_cold
3108rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3109{ 3116{
3110 int col = clamp (Pixel2Col (x), 0, ncol); 3117 int col = clamp (Pixel2Col (x), 0, ncol);
3111 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3118 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3112 3119
… …
3138 3145
3139/* ------------------------------------------------------------------------- */ 3146/* ------------------------------------------------------------------------- */
3140/* 3147/*
3141 * Extend the selection to the specified col/row 3148 * Extend the selection to the specified col/row
3142 */ 3149 */
3143void 3150void ecb_cold
3144rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3145{ 3152{
3146 row_col_t pos; 3153 row_col_t pos;
3147 enum { 3154 enum {
3148 LEFT, RIGHT 3155 LEFT, RIGHT
3149 } closeto = RIGHT; 3156 } closeto = RIGHT;
3150
3151 want_refresh = 1;
3152 3157
3153 switch (selection.op) 3158 switch (selection.op)
3154 { 3159 {
3155 case SELECTION_INIT: 3160 case SELECTION_INIT:
3156 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3336 3341
3337#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3338 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3339 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3340#endif 3345#endif
3346
3347 selection_changed ();
3341} 3348}
3342 3349
3343#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3344void 3351void ecb_cold
3345rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW
3346{ 3353{
3347 int32_t end_col, end_row; 3354 int32_t end_col, end_row;
3348 text_t *stp; 3355 text_t *stp;
3349 3356
… …
3387/* ------------------------------------------------------------------------- */ 3394/* ------------------------------------------------------------------------- */
3388/* 3395/*
3389 * Double click on button 3 when already selected 3396 * Double click on button 3 when already selected
3390 * EXT: button 3 double click 3397 * EXT: button 3 double click
3391 */ 3398 */
3392void 3399void ecb_cold
3393rxvt_term::selection_rotate (int x, int y) NOTHROW 3400rxvt_term::selection_rotate (int x, int y) NOTHROW
3394{ 3401{
3395 selection.clicks = selection.clicks % 3 + 1; 3402 selection.clicks = selection.clicks % 3 + 1;
3396 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3397} 3404}
… …
3399/* ------------------------------------------------------------------------- */ 3406/* ------------------------------------------------------------------------- */
3400/* 3407/*
3401 * Respond to a request for our current selection 3408 * Respond to a request for our current selection
3402 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3403 */ 3410 */
3404void 3411void ecb_cold
3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3406{ 3413{
3407 Atom property = rq.property == None ? rq.target : rq.property; 3414 Atom property = rq.property == None ? rq.target : rq.property;
3408 XSelectionEvent ev; 3415 XSelectionEvent ev;
3409 3416
… …
3542 3549
3543 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3544} 3551}
3545 3552
3546/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3547#ifdef USE_XIM 3554#if USE_XIM
3548void 3555void ecb_cold
3549rxvt_term::im_set_position (XPoint &pos) NOTHROW 3556rxvt_term::im_set_position (XPoint &pos) NOTHROW
3550{ 3557{
3551 XWindowAttributes xwa; 3558 XWindowAttributes xwa;
3552 3559
3553 XGetWindowAttributes (dpy, vt, &xwa); 3560 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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