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

Diff Legend

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