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.272 by root, Fri Aug 10 23:52:12 2007 UTC vs.
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 87
89/* 88/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 90 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 92 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 96
114/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
117 100
… …
150 133
151 l.l = 0; 134 l.l = 0;
152 l.f = 0; 135 l.f = 0;
153} 136}
154 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
155/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
158 162
159void 163void
160rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
161{ 165{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 rvideo_mode = false;
167 view_start = 0; 166 view_start = 0;
168 num_scr = 0; 167 num_scr = 0;
169 168
170 if (ncol == 0) 169 if (ncol == 0)
171 ncol = 80; 170 ncol = 80;
… …
173 if (nrow == 0) 172 if (nrow == 0)
174 nrow = 24; 173 nrow = 24;
175 174
176 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
177 return; 176 return;
178
179 if (current_screen != PRIMARY)
180 scr_swap_screen ();
181 177
182 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
183 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
184 { 180 {
185 //TODO//FIXME 181 //TODO//FIXME
… …
238 selection.text = NULL; 234 selection.text = NULL;
239 selection.len = 0; 235 selection.len = 0;
240 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
241 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
242 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 275 }
278 276
279 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 279
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
285 283
286 if (top_row) 284 if (top_row)
287 { 285 {
288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
290 289
291 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 292
294 do 293 do
295 { 294 {
296 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 297 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 299
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 301 {
… …
330 int qcol = 0; 327 int qcol = 0;
331 328
332 // see below for cursor adjustment rationale 329 // see below for cursor adjustment rationale
333 if (p == ocur.row) 330 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 331 screen.cur.row = q - (total_rows - nrow);
335 332
336 // fill a single destination line 333 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
338 { 335 {
339 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
366 } 363 }
367 while (p != pend && q > 0); 364 while (p != pend && q > 0);
368 365
369 term_start = total_rows - nrow; 366 term_start = total_rows - nrow;
370 top_row = q - term_start; 367 top_row = q - term_start;
371 368
372 // make sure all terminal lines exist 369 // make sure all terminal lines exist
373 while (top_row > 0) 370 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 372 }
376 else 373 else
377 { 374 {
378 // if no scrollback exists (yet), wing, instead of wrap 375 // if no scrollback exists (yet), wing, instead of wrap
379 376
380 for (int row = min (nrow, prev_nrow); row--; ) 377 for (int row = min (nrow, prev_nrow); row--; )
381 { 378 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 380 line_t &qline = row_buf [row];
384 381
… …
398 delete old_ta; 395 delete old_ta;
399 delete old_ra; 396 delete old_ra;
400 397
401 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
402 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
403 401
404 free (tabs); 402 free (tabs);
405 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
406 407
407 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
408 409
409 prev_nrow = nrow; 410 prev_nrow = nrow;
410 prev_ncol = ncol; 411 prev_ncol = ncol;
411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413
414 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0;
416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419 412
420 tt_winch (); 413 tt_winch ();
421 414
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 416}
… …
435 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
436 429
437 free (row_buf); 430 free (row_buf);
438 free (swap_buf); 431 free (swap_buf);
439 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
440 free (tabs); 435 free (tabs);
441 436 tabs = 0;
442 row_buf = 0; // signal that we freed all the arrays
443 } 437 }
444} 438}
445 439
446/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
447/* 441/*
448 * Hard reset 442 * Hard/Soft reset
449 */ 443 */
450void 444void
451rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
452{ 446{
453 scr_release (); 447 scr_release ();
454 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
455 scr_reset (); 451 scr_reset ();
456 452
457 scr_clear (true); 453 scr_clear (true);
458 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
459} 471}
460 472
461/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
501 } 513 }
502 514
503 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
504 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
505 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
506#ifdef DEBUG_STRICT
507 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
509#endif
510} 520}
511 521
512void 522void
513rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
514{ 524{
… …
539 want_refresh = 1; 549 want_refresh = 1;
540 view_start = 0; 550 view_start = 0;
541 551
542 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
543 553
544 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
545 555
546#if NSCREENS 556#if NSCREENS
547 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
548 { 558 {
549 num_scr = 0; 559 num_scr = 0;
… …
598/* 608/*
599 * Change the rendition style for following text 609 * Change the rendition style for following text
600 */ 610 */
601void 611void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 612rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 613{
604 if (set) 614 if (set)
605 rstyle |= style; 615 rstyle |= style;
606 else if (style == ~RS_None) 616 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 617 rstyle = DEFAULT_RSTYLE;
608 else 618 else
609 rstyle &= ~style; 619 rstyle &= ~style;
610 } 620}
611 621
612/* ------------------------------------------------------------------------- */ 622/* ------------------------------------------------------------------------- */
613/* 623/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 624 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 625 * count positive ==> scroll up
… …
666 line_t &l2 = ROW(i); 676 line_t &l2 = ROW(i);
667 677
668 ::swap (l1, l2); 678 ::swap (l1, l2);
669 l2.touch (); 679 l2.touch ();
670 } 680 }
671 681
672 // move and/or clear selection, if any 682 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 683 if (selection.op && current_screen == selection.screen)
674 { 684 {
675 selection.beg.row -= count; 685 selection.beg.row -= count;
676 selection.end.row -= count; 686 selection.end.row -= count;
… …
712 { 722 {
713 /* move selected region too */ 723 /* move selected region too */
714 selection.beg.row -= count; 724 selection.beg.row -= count;
715 selection.end.row -= count; 725 selection.end.row -= count;
716 selection.mark.row -= count; 726 selection.mark.row -= count;
717 727
718 selection_check (0); 728 selection_check (0);
719 } 729 }
720 } 730 }
721 731
722 // use a simple and robust scrolling algorithm, this 732 // use a simple and robust scrolling algorithm, this
… …
774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
775 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
776 } 786 }
777 } 787 }
778 788
779#ifdef DEBUG_STRICT
780 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
781 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
782 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
783#endif
784 int row = screen.cur.row; 792 int row = screen.cur.row;
785 793
786 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
787 795
788 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
789 797
790 while (str < strend) 798 while (str < strend)
791 { 799 {
792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 800 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
793 801
794 if (c < 0x20) 802 if (expect_false (c < 0x20))
795 if (c == C0_LF) 803 if (c == C0_LF)
796 { 804 {
797 max_it (line->l, screen.cur.col); 805 max_it (line->l, screen.cur.col);
798 806
799 screen.flags &= ~Screen_WrapNext; 807 screen.flags &= ~Screen_WrapNext;
… …
818 { 826 {
819 scr_tab (1, true); 827 scr_tab (1, true);
820 continue; 828 continue;
821 } 829 }
822 830
831 if (expect_false (
823 if (checksel /* see if we're writing within selection */ 832 checksel /* see if we're writing within selection */
824 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 833 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
825 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 834 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
835 ))
826 { 836 {
827 checksel = 0; 837 checksel = 0;
828 /* 838 /*
829 * If we wrote anywhere in the selected area, kill the selection 839 * If we wrote anywhere in the selected area, kill the selection
830 * XXX: should we kill the mark too? Possibly, but maybe that 840 * XXX: should we kill the mark too? Possibly, but maybe that
831 * should be a similar check. 841 * should be a similar check.
832 */ 842 */
833 CLEAR_SELECTION (); 843 CLEAR_SELECTION ();
834 } 844 }
835 845
836 if (screen.flags & Screen_WrapNext) 846 if (expect_false (screen.flags & Screen_WrapNext))
837 { 847 {
838 scr_do_wrap (); 848 scr_do_wrap ();
839 849
840 line->l = ncol; 850 line->l = ncol;
841 line->is_longer (1); 851 line->is_longer (1);
842 852
843 row = screen.cur.row; 853 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 854 line = &ROW(row); /* _must_ refresh */
845 } 855 }
846 856
847 // some utf-8 decoders "decode" surrogate characters: let's fix this. 857 // some utf-8 decoders "decode" surrogate characters: let's fix this.
848 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 858 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
849 c = 0xfffd; 859 c = 0xfffd;
850 860
851 // rely on wcwidth to tell us the character width, do wcwidth before 861 // rely on wcwidth to tell us the character width, do wcwidth before
852 // further replacements, as wcwidth might return -1 for the line 862 // further replacements, as wcwidth might return -1 for the line
853 // drawing characters below as they might be invalid in the current 863 // drawing characters below as they might be invalid in the current
854 // locale. 864 // locale.
855 int width = WCWIDTH (c); 865 int width = WCWIDTH (c);
856 866
857 if (charsets [screen.charset] == '0') // DEC SPECIAL 867 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
858 { 868 {
859 // vt100 special graphics and line drawing 869 // vt100 special graphics and line drawing
860 // 5f-7e standard vt100 870 // 5f-7e standard vt100
861 // 40-5e rxvt extension for extra curses acs chars 871 // 40-5e rxvt extension for extra curses acs chars
862 static uint16_t vt100_0[62] = { // 41 .. 7e 872 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
875 c = vt100_0[c - 0x41]; 885 c = vt100_0[c - 0x41];
876 width = 1; // vt100 line drawing characters are always single-width 886 width = 1; // vt100 line drawing characters are always single-width
877 } 887 }
878 } 888 }
879 889
880 if (screen.flags & Screen_Insert) 890 if (expect_false (screen.flags & Screen_Insert))
881 scr_insdel_chars (width, INSERT); 891 scr_insdel_chars (width, INSERT);
882 892
883 if (width != 0) 893 if (width != 0)
884 { 894 {
885#if !UNICODE_3 895#if !UNICODE_3
… …
890# else 900# else
891 c = 0xfffd; 901 c = 0xfffd;
892# endif 902# endif
893#endif 903#endif
894 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
895 // nuke the character at this position, if required 921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
896 if (line->t[screen.cur.col] == NOCHAR 925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
897 || (screen.cur.col < ncol - 1 926 scr_kill_char (*line, screen.cur.col);
898 && line->t[screen.cur.col + 1] == NOCHAR))
899 {
900 int col = screen.cur.col;
901
902 // find begin
903 while (col > 0 && line->t[col] == NOCHAR)
904 col--;
905
906 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
907
908 // found begin, nuke
909 do {
910 line->t[col] = ' ';
911 line->r[col] = rend;
912 col++;
913 } while (col < ncol && line->t[col] == NOCHAR);
914 }
915
916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
917
918 // if the character doesn't fit into the remaining columns...
919 if (screen.cur.col > ncol - width && ncol >= width)
920 {
921 // ...output spaces
922 c = ' ';
923 // and try the same character next loop iteration
924 --str;
925 }
926 927
927 line->touch (); 928 line->touch ();
928 929
929 do 930 do
930 { 931 {
931 line->t[screen.cur.col] = c; 932 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 933 line->r[screen.cur.col] = rend;
933 934
934 if (screen.cur.col < ncol - 1) 935 if (expect_true (screen.cur.col < ncol - 1))
935 screen.cur.col++; 936 screen.cur.col++;
936 else 937 else
937 { 938 {
938 line->l = ncol; 939 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
941 break; 942
943 goto end_of_line;
942 } 944 }
943 945
944 c = NOCHAR; 946 c = NOCHAR;
945 } 947 }
946 while (--width > 0); 948 while (expect_false (--width > 0));
947 949
948 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
949 if (!width) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 952 {
951 line->touch (); 953 line->t[c] = ' ';
954 line->r[c] = rend;
955 }
952 956
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 957end_of_line:
958 ;
959 }
960#if ENABLE_COMBINING
961 else // width == 0
962 {
963 if (c != 0xfeff) // ignore BOM
964 {
965 // handle combining characters
966 // we just tag the accent on the previous on-screen character.
967 // this is arguably not correct, but also arguably not wrong.
968 // we don't handle double-width characters nicely yet.
969 line_t *linep;
970 text_t *tp;
971 rend_t *rp;
972
973 if (screen.cur.col > 0)
954 { 974 {
955 line->t[c] = ' ';
956 line->r[c] = rend; 975 linep = line;
976 tp = line->t + screen.cur.col - 1;
977 rp = line->r + screen.cur.col - 1;
957 } 978 }
979 else if (screen.cur.row > 0
980 && ROW(screen.cur.row - 1).is_longer ())
981 {
982 linep = &ROW(screen.cur.row - 1);
983 tp = line->t + ncol - 1;
984 rp = line->r + ncol - 1;
985 }
986 else
987 continue;
988
989 linep->touch ();
990
991 while (*tp == NOCHAR && tp > linep->t)
992 tp--, rp--;
993
994 // first try to find a precomposed character
995 unicode_t n = rxvt_compose (*tp, c);
996 if (n == NOCHAR)
997 n = rxvt_composite.compose (*tp, c);
998
999 *tp = n;
1000 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
958 } 1001 }
959 } 1002 }
960 else // width == 0
961 {
962#if ENABLE_COMBINING
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999#endif 1003#endif
1000 }
1001 } 1004 }
1002 1005
1003 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1004 1007
1005#ifdef DEBUG_STRICT
1006 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1007#endif
1008} 1009}
1009 1010
1010/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1011/* 1012/*
1012 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
1013 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
1014 */ 1015 */
1015void 1016void
1016rxvt_term::scr_backspace () NOTHROW 1017rxvt_term::scr_backspace () NOTHROW
1017{ 1018{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1021 { 1020 {
1022 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1023 { 1022 {
1024#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1025 --screen.cur.row;
1027 return; 1026
1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1035}
1036 1036
1037/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1038/* 1038/*
1039 * Process Horizontal Tab 1039 * Process Horizontal Tab
… …
1062 x = i; 1062 x = i;
1063 1063
1064 if (!--count) 1064 if (!--count)
1065 break; 1065 break;
1066 } 1066 }
1067 else 1067 else
1068 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1069 && RS_SAME (l.r[i], base_rend);
1070 1070
1071 if (count) 1071 if (count)
1072 x = ncol - 1; 1072 x = ncol - 1;
… …
1188 } 1188 }
1189 } 1189 }
1190 else 1190 else
1191 { 1191 {
1192 if (screen.flags & Screen_Relative) 1192 if (screen.flags & Screen_Relative)
1193 {
1193 { /* relative origin mode */ 1194 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1195 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1196 min_it (screen.cur.row, screen.bscroll);
1196 } 1197 }
1197 else 1198 else
1198 screen.cur.row = row; 1199 screen.cur.row = row;
… …
1231/* 1232/*
1232 * Erase part or whole of a line 1233 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1234 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1235 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1236 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1237 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1238 */
1237void 1239void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1240rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1241{
1240 unsigned int col, num; 1242 unsigned int col, num;
… …
1249 line.touch (); 1251 line.touch ();
1250 line.is_longer (0); 1252 line.is_longer (0);
1251 1253
1252 switch (mode) 1254 switch (mode)
1253 { 1255 {
1256 case 3:
1257 if (screen.flags & Screen_WrapNext)
1258 return;
1259
1260 /* fall through */
1261
1254 case 0: /* erase to end of line */ 1262 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1263 col = screen.cur.col;
1256 num = ncol - col; 1264 num = ncol - col;
1257 min_it (line.l, col); 1265 min_it (line.l, col);
1266
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1267 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1268 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1269 CLEAR_SELECTION ();
1261 break; 1270 break;
1271
1262 case 1: /* erase to beginning of line */ 1272 case 1: /* erase to beginning of line */
1263 col = 0; 1273 col = 0;
1264 num = screen.cur.col + 1; 1274 num = screen.cur.col + 1;
1275
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1276 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1277 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1278 CLEAR_SELECTION ();
1268 break; 1279 break;
1280
1269 case 2: /* erase whole line */ 1281 case 2: /* erase whole line */
1270 col = 0; 1282 col = 0;
1271 num = ncol; 1283 num = ncol;
1272 line.l = 0; 1284 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1285 if (selection.beg.row <= screen.cur.row
… …
1331 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1332 return; 1344 return;
1333 1345
1334 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1335 1347
1336 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1337 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1338 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1339 { 1351 {
1340 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1341 CLEAR_ROWS (row, num); 1353
1354 if (mapped)
1355 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False);
1342 } 1358 }
1343 else 1359 else
1344 { 1360 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1362
1363 if (mapped)
1364 {
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num));
1349 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1351 } 1374 }
1352 1375
1353 for (; num--; row++) 1376 for (; num--; row++)
1354 { 1377 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1357 } 1382 }
1358} 1383}
1359 1384
1360#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1361void 1386void
… …
1435 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1436 */ 1461 */
1437void 1462void
1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1439{ 1464{
1440 int col, row;
1441 rend_t tr;
1442
1443 want_refresh = 1; 1465 want_refresh = 1;
1444 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1445 1467
1446 if (count <= 0) 1468 if (count <= 0)
1447 return; 1469 return;
… …
1449 scr_do_wrap (); 1471 scr_do_wrap ();
1450 1472
1451 selection_check (1); 1473 selection_check (1);
1452 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1453 1475
1454 row = screen.cur.row; 1476 int row = screen.cur.row;
1455 1477
1456 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1457 1479
1458 line->touch (); 1480 line->touch ();
1459 line->is_longer (0); 1481 line->is_longer (0);
1460 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1461 switch (insdel) 1487 switch (insdel)
1462 { 1488 {
1463 case INSERT: 1489 case INSERT:
1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1465 { 1496 {
1466 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1467 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1468 } 1499 }
1469
1470 line->l = min (line->l + count, ncol);
1471 1500
1472 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1474 { 1503 {
1475 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1505 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1506 CLEAR_SELECTION ();
1478 else 1507 else
1508 {
1479 { /* shift selection */ 1509 /* shift selection */
1480 selection.beg.col += count; 1510 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1511 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1512 selection.end.col += count;
1483 } 1513 }
1484 } 1514 }
… …
1489 case ERASE: 1519 case ERASE:
1490 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1491 selection_check (1); 1521 selection_check (1);
1492 screen.cur.col -= count; 1522 screen.cur.col -= count;
1493 1523
1494 line->l = max (line->l - count, 0); 1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1495 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1496 break; 1529 break;
1497 1530
1498 case DELETE: 1531 case DELETE:
1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1500 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1501 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1502 { 1539 {
1503 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1504 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1505 } 1542 }
1506 1543
1507 line->l = max (line->l - count, 0);
1508 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1509 1545
1510 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1512 { 1548 {
1513 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1623 */ 1659 */
1624void 1660void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1661rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1662{
1627 if (mode < 0) 1663 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1664 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1665 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1666 tabs [screen.cur.col] = !!mode;
1631} 1667}
1632 1668
1633/* ------------------------------------------------------------------------- */ 1669/* ------------------------------------------------------------------------- */
… …
1650 rvideo_state = on; 1686 rvideo_state = on;
1651 1687
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1690 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1691#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1693
1661 XGCValues gcvalue; 1694 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1871 return true; 1904 return true;
1872} 1905}
1873 1906
1874#ifndef NO_BELL 1907#ifndef NO_BELL
1875void 1908void
1876rxvt_term::bell_cb (time_watcher &w) 1909rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1910{
1878 rvideo_bell = false; 1911 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1912 scr_rvideo_mode (rvideo_mode);
1913 refresh_check ();
1880} 1914}
1881#endif 1915#endif
1882 1916
1883/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1884void 1918void
… …
1890# ifdef MAPALERT_OPTION 1924# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1925 if (option (Opt_mapAlert))
1892# endif 1926# endif
1893 XMapWindow (dpy, parent[0]); 1927 XMapWindow (dpy, parent[0]);
1894# endif 1928# endif
1929
1895# if ENABLE_FRILLS 1930# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1931 if (option (Opt_urgentOnBell))
1897 { 1932 set_urgency (1);
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]);
1901 if (h != NULL)
1902 {
1903 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h);
1905 }
1906 }
1907# endif 1933# endif
1908 1934
1909 if (option (Opt_visualBell)) 1935 if (option (Opt_visualBell))
1910 { 1936 {
1911 rvideo_bell = true; 1937 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1938 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1939 flush ();
1914 1940
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1942 }
1917 else 1943 else
1918 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1919#endif 1946#endif
1920} 1947}
1921 1948
1922/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1923/* ARGSUSED */ 1950/* ARGSUSED */
1924void 1951void
1925rxvt_term::scr_printscreen (int fullhist) NOTHROW 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1926{ 1953{
1927#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1928 int nrows, row_start; 1955 int nrows, row_start;
1929 FILE *fd; 1956 FILE *fd = popen_printer ();
1930 1957
1931 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1932 return; 1959 return;
1933 1960
1934 if (fullhist) 1961 if (fullhist)
1935 { 1962 {
1936 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1942 row_start = view_start; 1969 row_start = view_start;
1943 } 1970 }
1944 1971
1945 wctomb (0, 0); 1972 wctomb (0, 0);
1946 1973
1947 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1948 { 1975 {
1949 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1950 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1951 1978
1952 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1981 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1982 */ 2009 */
1983void 2010void
1984rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1985{ 2012{
1986 unsigned char have_bg,
1987 showcursor; /* show the cursor */
1988 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1989 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1990 int i; /* tmp */ 2015 int i; /* tmp */
1991#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1992 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2001 return; 2026 return;
2002 2027
2003 /* 2028 /*
2004 * A: set up vars 2029 * A: set up vars
2005 */ 2030 */
2006 have_bg = 0;
2007 refresh_count = 0; 2031 refresh_count = 0;
2008 2032
2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0;
2009#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2010 have_bg |= bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2011#endif
2012#if ENABLE_TRANSPARENCY
2013 have_bg |= option (Opt_transparent) && am_transparent;
2014#endif 2037#endif
2015 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2016 2039
2017 /* 2040 /*
2018 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2019 */ 2042 */
2020 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2021 2051
2022 /* 2052 /*
2023 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2024 */ 2054 */
2025 { 2055 {
2026 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2027 2057
2028 showcursor = (screen.flags & Screen_VisibleCursor);
2029#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2030 if (hidden_cursor) 2059 if (hidden_cursor)
2031 showcursor = 0; 2060 showcursor = 0;
2032#endif 2061#endif
2033 2062
… …
2061 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2062#else 2091#else
2063 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2064#endif 2093#endif
2065 2094
2066 if (showcursor && focus) 2095 if (focus)
2067 { 2096 {
2068 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2069 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2070 else 2099 else
2071 { 2100 {
… …
2106 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2107 } 2136 }
2108 } 2137 }
2109 } 2138 }
2110 2139
2111 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2112#if ENABLE_OVERLAY
2113 scr_swap_overlay ();
2114#endif
2115
2116#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2117 /* 2141 /*
2118 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2119 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2120 */ 2144 */
… …
2209 continue; 2233 continue;
2210 2234
2211 // redraw one or more characters 2235 // redraw one or more characters
2212 2236
2213 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2214 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2215 --col; 2239 --col;
2216 2240
2217 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2218 text_t *text = stp + col; 2242 text_t *text = stp + col;
2219 int count = 1; 2243 int count = 1;
2220 2244
2221 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2222 drp[col] = rend; 2246 drp[col] = rend;
… …
2226 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2227 { 2251 {
2228 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2229 { 2253 {
2230 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2231 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2232 count++; 2257 count++;
2233 i++; 2258 i++;
2234 2259
2235 continue; 2260 continue;
2236 } 2261 }
… …
2256 2281
2257 col--; /* went one too far. move back */ 2282 col--; /* went one too far. move back */
2258 count -= i; /* dump any matching trailing chars */ 2283 count -= i; /* dump any matching trailing chars */
2259 2284
2260 // sometimes we optimize away the trailing NOCHAR's, add them back 2285 // sometimes we optimize away the trailing NOCHAR's, add them back
2261 while (i && text[count] == NOCHAR) 2286 while (expect_false (i && text[count] == NOCHAR))
2262 count++, i--; 2287 count++, i--;
2263 2288
2264 /* 2289 /*
2265 * Determine the attributes for the string 2290 * Determine the attributes for the string
2266 */ 2291 */
2267 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2268 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2269 2294
2270 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2271 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2272 { 2297 {
2273 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2274 2299
2275#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2276 if (rend & RS_Bold
2277 && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
2278 { 2302 {
2279 if (ISSET_PIXCOLOR (Color_BD)) 2303 if (ISSET_PIXCOLOR (Color_BD))
2280 fore = Color_BD; 2304 fore = Color_BD;
2281# if !ENABLE_STYLES 2305# if !ENABLE_STYLES
2282 else 2306 else
2283 invert = !invert; 2307 invert = !invert;
2284# endif 2308# endif
2285 } 2309 }
2286 2310
2287 if (rend & RS_Italic 2311 if (rend & RS_Italic && fore == Color_fg)
2288 && fore == Color_fg)
2289 { 2312 {
2290 if (ISSET_PIXCOLOR (Color_IT)) 2313 if (ISSET_PIXCOLOR (Color_IT))
2291 fore = Color_IT; 2314 fore = Color_IT;
2292# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2293 else 2316 else
… …
2297 2320
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2322 fore = Color_UL;
2300#endif 2323#endif
2301 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2302 if (invert) 2345 if (invert)
2303 { 2346 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2310 ::swap (fore, back); 2347 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2348
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2318 if (ISSET_PIXCOLOR (Color_RV))
2319 back = Color_RV;
2320# endif
2321 if (fore == back) 2350 if (fore == back)
2322 { 2351 {
2323 fore = Color_bg; 2352 fore = Color_bg;
2324 back = Color_fg; 2353 back = Color_fg;
2325 } 2354 }
… …
2327 } 2356 }
2328 2357
2329#ifdef TEXT_BLINK 2358#ifdef TEXT_BLINK
2330 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2359 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2331 { 2360 {
2332 if (!text_blink_ev.active) 2361 if (!text_blink_ev.is_active ())
2333 { 2362 {
2334 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2363 text_blink_ev.again ();
2335 hidden_text = 0; 2364 hidden_text = 0;
2336 } 2365 }
2337 else if (hidden_text) 2366 else if (hidden_text)
2338 fore = back; 2367 fore = back;
2339 } 2368 }
… …
2361 /* 2390 /*
2362 * Actually do the drawing of the string here 2391 * Actually do the drawing of the string here
2363 */ 2392 */
2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2365 2394
2366 if (have_bg && back == Color_bg) 2395 if (expect_true (have_bg && back == Color_bg))
2367 { 2396 {
2368 // this is very ugly, maybe push it into ->draw? 2397 // this is very ugly, maybe push it into ->draw?
2369 2398
2370 for (i = 0; i < count; i++) /* don't draw empty strings */ 2399 for (i = 0; i < count; i++) /* don't draw empty strings */
2371 if (text[i] != ' ') 2400 if (text[i] != ' ')
… …
2378 did_clear: ; 2407 did_clear: ;
2379 } 2408 }
2380 else 2409 else
2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2382 2411
2383 if (rend & RS_Uline && font->descent > 1 && fore != back) 2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2384 { 2413 {
2385#if ENABLE_FRILLS 2414#if ENABLE_FRILLS
2386 if (ISSET_PIXCOLOR (Color_underline)) 2415 if (ISSET_PIXCOLOR (Color_underline))
2387 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2416 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2388 else 2417 else
2389#endif 2418#endif
2390 XSetForeground (dpy, gc, pix_colors[fore]); 2419 XSetForeground (dpy, gc, pix_colors[fore]);
2391 2420
2392 XDrawLine (dpy, drawBuffer, gc, 2421 XDrawLine (dpy, vt, gc,
2393 xpixel, ypixel + font->ascent + 1, 2422 xpixel, ypixel + font->ascent + 1,
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2424 }
2396 } /* for (col....) */ 2425 } /* for (col....) */
2397 } /* for (row....) */ 2426 } /* for (row....) */
2398
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403 2427
2404 /* 2428 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2430 */
2407 if (showcursor) 2431 if (showcursor)
… …
2435 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2436 else 2460 else
2437#endif 2461#endif
2438 XSetForeground (dpy, gc, pix_colors[ccol1]); 2462 XSetForeground (dpy, gc, pix_colors[ccol1]);
2439 2463
2440 XDrawRectangle (dpy, drawBuffer, gc, 2464 XDrawRectangle (dpy, vt, gc,
2441 Col2Pixel (col), 2465 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2466 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2467 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2445 } 2469 }
2446 } 2470 }
2447 2471
2448 /* 2472 /*
2449 * H: cleanup selection 2473 * H: cleanup selection
2450 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2451 scr_reverse_selection (); 2480 scr_reverse_selection ();
2452 2481
2482 screen.flags = old_screen_flags;
2453 num_scr = 0; 2483 num_scr = 0;
2454 num_scr_allow = 1; 2484 num_scr_allow = 1;
2455} 2485}
2456 2486
2457void 2487void
… …
2480} 2510}
2481 2511
2482void 2512void
2483rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour () NOTHROW
2484{ 2514{
2485 if (1
2486#if ENABLE_TRANSPARENCY
2487 && !am_transparent
2488#endif
2489#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2490 && !bgPixmap.pixmap 2516 bgPixmap.apply ();
2491#endif 2517#else
2492 ) 2518
2493 {
2494 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2495 XClearWindow (dpy, parent[0]); 2520 XClearWindow (dpy, parent[0]);
2496 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2497#if HAVE_SCROLLBARS 2522
2498 if (scrollBar.win) 2523 if (scrollBar.win)
2499 { 2524 {
2500 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2501 scrollBar.setIdle (); 2526 scrollBar.state = STATE_IDLE;
2502 scrollbar_show (0); 2527 scrollBar.show (0);
2503 }
2504#endif
2505 } 2528 }
2506 2529
2530#endif
2531
2532 /* bgPixmap.apply () does not do the following : */
2507 scr_clear (); 2533 scr_clear ();
2508 scr_touch (true); 2534 scr_touch (true);
2509 want_refresh = 1; 2535 want_refresh = 1;
2510} 2536}
2511 2537
… …
2581 { 2607 {
2582#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2583 if (selection.rect) 2609 if (selection.rect)
2584 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2586 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2587 else 2613 else
2588#endif 2614#endif
2589 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2590 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2591 RS_RVid); 2617 RS_Sel | RS_RVid);
2592 } 2618 }
2593} 2619}
2594 2620
2595/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2596/* 2622/*
… …
2601void 2627void
2602rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2603{ 2629{
2604 int row, wrote; 2630 int row, wrote;
2605 unsigned int width, towrite; 2631 unsigned int width, towrite;
2606 char r1[] = "\n"; 2632 const char r1[] = "\n";
2607 2633
2608 for (row = saveLines - nsaved; 2634 for (row = saveLines + top_row;
2609 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2610 { 2636 {
2611 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2612 : ncol; 2638 : ncol;
2613 for (towrite = width; towrite; towrite -= wrote) 2639 for (towrite = width; towrite; towrite -= wrote)
… …
2657/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2658/* 2684/*
2659 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2660 */ 2686 */
2661void 2687void
2662rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2663{ 2689{
2664 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2665 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2666 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2667 data[i] = C0_CR; 2693 data[i] = C0_CR;
2668 2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~");
2697
2669 tt_write (data, len); 2698 tt_write (data, len);
2699
2700 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2670} 2711}
2671 2712
2672/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2673/* 2714/*
2674 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2749 if (!delete_prop) 2790 if (!delete_prop)
2750 XDeleteProperty (dpy, win, prop); 2791 XDeleteProperty (dpy, win, prop);
2751 2792
2752 selection_wait = Sel_incr; 2793 selection_wait = Sel_incr;
2753 incr_buf_fill = 0; 2794 incr_buf_fill = 0;
2754 incr_ev.start (NOW + 10); 2795 incr_ev.start (10);
2755 2796
2756 goto bailout; 2797 goto bailout;
2757 } 2798 }
2758 2799
2759 if (ct.nitems == 0) 2800 if (ct.nitems == 0)
… …
2768 ct.nitems = incr_buf_fill; 2809 ct.nitems = incr_buf_fill;
2769 incr_buf = 0; 2810 incr_buf = 0;
2770 incr_buf_size = 0; 2811 incr_buf_size = 0;
2771 incr_ev.stop (); 2812 incr_ev.stop ();
2772 } 2813 }
2773 else 2814 else
2774 { 2815 {
2775 if (selection_wait == Sel_normal 2816 if (selection_wait == Sel_normal
2776 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2777 { 2818 {
2778 /* 2819 /*
… …
2785 goto bailout; 2826 goto bailout;
2786 } 2827 }
2787 } 2828 }
2788 else if (selection_wait == Sel_incr) 2829 else if (selection_wait == Sel_incr)
2789 { 2830 {
2790 incr_ev.start (NOW + 10); 2831 incr_ev.start (10);
2791 2832
2792 while (incr_buf_fill + ct.nitems > incr_buf_size) 2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2793 { 2834 {
2794 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2795 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2835 if (selection_wait == Sel_normal) 2876 if (selection_wait == Sel_normal)
2836 selection_wait = Sel_none; 2877 selection_wait = Sel_none;
2837} 2878}
2838 2879
2839void 2880void
2840rxvt_term::incr_cb (time_watcher &w) NOTHROW 2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2841{ 2882{
2842 selection_wait = Sel_none; 2883 selection_wait = Sel_none;
2843 2884
2844 incr_buf_size = 0; 2885 incr_buf_size = 0;
2845 free (incr_buf); 2886 free (incr_buf);
… …
2856 selection_paste (win, prop, true); 2897 selection_paste (win, prop, true);
2857} 2898}
2858 2899
2859/* ------------------------------------------------------------------------- */ 2900/* ------------------------------------------------------------------------- */
2860/* 2901/*
2861 * Request the current selection: 2902 * Request the current selection:
2862 * Order: > internal selection if available 2903 * Order: > internal selection if available
2863 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2864 * > CUT_BUFFER0 2905 * > CUT_BUFFER0
2865 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2866 * will auto fallback to CUT_BUFFER0 2907 * will auto fallback to CUT_BUFFER0
… …
2868 */ 2909 */
2869void 2910void
2870rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2871{ 2912{
2872 if (selection.text && selnum == Sel_Primary) 2913 if (selection.text && selnum == Sel_Primary)
2914 {
2873 { /* internal selection */ 2915 /* internal selection */
2874 char *str = rxvt_wcstombs (selection.text, selection.len); 2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2875 paste (str, strlen (str)); 2917 paste (str, strlen (str));
2876 free (str); 2918 free (str);
2877 return; 2919 return;
2878 } 2920 }
… …
2882 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2883 2925
2884#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2885 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2886 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2887 return; 2929 return;
2888#else 2930#else
2889 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2890 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2891 return; 2933 return;
2892#endif 2934#endif
2893 } 2935 }
2894 2936
2895 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2896 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2924/* 2966/*
2925 * Clear all selected text 2967 * Clear all selected text
2926 * EXT: SelectionClear 2968 * EXT: SelectionClear
2927 */ 2969 */
2928void 2970void
2929rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2930{ 2972{
2973 if (!clipboard)
2974 {
2931 want_refresh = 1; 2975 want_refresh = 1;
2932 free (selection.text); 2976 free (selection.text);
2933 selection.text = NULL; 2977 selection.text = NULL;
2934 selection.len = 0; 2978 selection.len = 0;
2935 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2936 2980
2937 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2938 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2939} 2993}
2940 2994
2941/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2942/* 2996/*
2943 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2944 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2945 */ 2999 */
2946void 3000void
2947rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2948{ 3002{
2949 int i; 3003 int size;
2950 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2951 text_t *t; 3005 text_t *t;
2952 3006
2953 switch (selection.op) 3007 switch (selection.op)
2954 { 3008 {
… …
2970 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2971 3025
2972 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2973 return; 3027 return;
2974 3028
2975 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2976 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2977 3031
2978 int ofs = 0; 3032 int ofs = 0;
2979 int extra = 0; 3033 int extra = 0;
2980 3034
2981 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
2987 { 3041 {
2988#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
2989 if (selection.rect) 3043 if (selection.rect)
2990 { 3044 {
2991 col = selection.beg.col; 3045 col = selection.beg.col;
2992 end_col = ncol + 1; 3046 end_col = selection.end.col;
2993 } 3047 }
2994 else 3048 else
2995#endif 3049#endif
2996 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
2997 3051
2998 col = max (col, 0); 3052 col = max (col, 0);
2999 3053
3000 if (row == selection.end.row 3054 if (row == selection.end.row)
3001#if !ENABLE_MINIMAL
3002 || selection.rect
3003#endif
3004 )
3005 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3006 3056
3007 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3008 3058
3009 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3017 3067
3018 extra -= (len - 1); 3068 extra -= (len - 1);
3019 3069
3020 if (extra < 0) 3070 if (extra < 0)
3021 { 3071 {
3022 extra += i; 3072 extra += size;
3023 i += i; 3073 size += size;
3024 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3025 } 3075 }
3026 3076
3027 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3028 } 3078 }
3029#endif 3079#endif
… …
3041 3091
3042 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3043 } 3093 }
3044 else 3094 else
3045#endif 3095#endif
3046 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer () && row != selection.end.row
3097 && (row != selection.beg.row || selection.beg.col < ncol))
3047 new_selection_text[ofs++] = C0_LF; 3098 new_selection_text[ofs++] = C0_LF;
3048 } 3099 }
3049 3100
3050 if (end_col != selection.end.col) 3101 if (end_col != selection.end.col)
3051 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
… …
3069 3120
3070 selection_grab (tm); 3121 selection_grab (tm);
3071} 3122}
3072 3123
3073bool 3124bool
3074rxvt_term::selection_grab (Time tm) NOTHROW 3125rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3075{ 3126{
3127 Atom sel;
3128
3129 if (!clipboard)
3130 {
3076 selection_time = tm; 3131 selection_time = tm;
3132 sel = XA_PRIMARY;
3133 }
3134 else
3135 {
3136 clipboard_time = tm;
3137 sel = xa[XA_CLIPBOARD];
3138 }
3077 3139
3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3140 XSetSelectionOwner (dpy, sel, vt, tm);
3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3141 if (XGetSelectionOwner (dpy, sel) == vt)
3080 { 3142 {
3081 display->set_selection_owner (this); 3143 display->set_selection_owner (this, clipboard);
3082 return true; 3144 return true;
3083 } 3145 }
3084 else 3146 else
3085 { 3147 {
3086 selection_clear (); 3148 selection_clear (clipboard);
3087 return false; 3149 return false;
3088 } 3150 }
3089 3151
3090#if 0 3152#if 0
3091 XTextProperty ct; 3153 XTextProperty ct;
… …
3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3206 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3145 3207
3146 while (selection.mark.col > 0 3208 while (selection.mark.col > 0
3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3209 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3148 --selection.mark.col; 3210 --selection.mark.col;
3149 3211
3150 if (selection.op) 3212 if (selection.op)
3213 {
3151 { /* clear the old selection */ 3214 /* clear the old selection */
3152 selection.beg.row = selection.end.row = selection.mark.row; 3215 selection.beg.row = selection.end.row = selection.mark.row;
3153 selection.beg.col = selection.end.col = selection.mark.col; 3216 selection.beg.col = selection.end.col = selection.mark.col;
3154 } 3217 }
3155 3218
3156 selection.op = SELECTION_INIT; 3219 selection.op = SELECTION_INIT;
… …
3345 * a point/word/line which is either the start or end of the selection 3408 * a point/word/line which is either the start or end of the selection
3346 * and it was decided by whichever point/word/line was `fixed' at the 3409 * and it was decided by whichever point/word/line was `fixed' at the
3347 * time of the most recent button3 press 3410 * time of the most recent button3 press
3348 */ 3411 */
3349 if (button3 && buttonpress) 3412 if (button3 && buttonpress)
3413 {
3350 { /* button3 press */ 3414 /* button3 press */
3351 /* 3415 /*
3352 * first determine which edge of the selection we are closest to 3416 * first determine which edge of the selection we are closest to
3353 */ 3417 */
3354 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3418 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3355 || (!ROWCOL_IS_AFTER (pos, selection.end) 3419 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3373 selection.mark.row = selection.beg.row; 3437 selection.mark.row = selection.beg.row;
3374 selection.mark.col = selection.beg.col; 3438 selection.mark.col = selection.beg.col;
3375 } 3439 }
3376 } 3440 }
3377 else 3441 else
3442 {
3378 { /* button1 drag or button3 drag */ 3443 /* button1 drag or button3 drag */
3379 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3444 if (ROWCOL_IS_AFTER (selection.mark, pos))
3380 { 3445 {
3381 if (selection.mark.row == selection.end.row 3446 if (selection.mark.row == selection.end.row
3382 && selection.mark.col == selection.end.col 3447 && selection.mark.col == selection.end.col
3383 && clickchange 3448 && clickchange
… …
3464 selection.end.row++; 3529 selection.end.row++;
3465 } 3530 }
3466 } 3531 }
3467 3532
3468 if (button3 && buttonpress) 3533 if (button3 && buttonpress)
3534 {
3469 { /* mark may need to be changed */ 3535 /* mark may need to be changed */
3470 if (closeto == LEFT) 3536 if (closeto == LEFT)
3471 { 3537 {
3472 selection.mark.row = selection.end.row; 3538 selection.mark.row = selection.end.row;
3473 selection.mark.col = selection.end.col - (selection.clicks == 2); 3539 selection.mark.col = selection.end.col - (selection.clicks == 2);
3474 } 3540 }
… …
3582 else if (rq.target == xa[XA_MULTIPLE]) 3648 else if (rq.target == xa[XA_MULTIPLE])
3583 { 3649 {
3584 /* TODO: Handle MULTIPLE */ 3650 /* TODO: Handle MULTIPLE */
3585 } 3651 }
3586#endif 3652#endif
3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3653 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3588 { 3654 {
3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3655 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3590 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3656 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657 ev.property = rq.property;
3658 }
3659 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3660 {
3661 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3662 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3591 ev.property = rq.property; 3663 ev.property = rq.property;
3592 } 3664 }
3593 else if (rq.target == XA_STRING 3665 else if (rq.target == XA_STRING
3594 || rq.target == xa[XA_TEXT] 3666 || rq.target == xa[XA_TEXT]
3595 || rq.target == xa[XA_COMPOUND_TEXT] 3667 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3628 { 3700 {
3629 target = xa[XA_COMPOUND_TEXT]; 3701 target = xa[XA_COMPOUND_TEXT];
3630 style = enc_compound_text; 3702 style = enc_compound_text;
3631 } 3703 }
3632 3704
3633 if (selection.text) 3705 if (rq.selection == XA_PRIMARY && selection.text)
3634 { 3706 {
3635 cl = selection.text; 3707 cl = selection.text;
3636 selectlen = selection.len; 3708 selectlen = selection.len;
3709 }
3710 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3711 {
3712 cl = selection.clip_text;
3713 selectlen = selection.clip_len;
3637 } 3714 }
3638 else 3715 else
3639 { 3716 {
3640 cl = L""; 3717 cl = L"";
3641 selectlen = 0; 3718 selectlen = 0;
… …
3673 XFree (ct.value); 3750 XFree (ct.value);
3674 } 3751 }
3675 3752
3676 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3753 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3677} 3754}
3678
3679/* ------------------------------------------------------------------------- *
3680 * MOUSE ROUTINES *
3681 * ------------------------------------------------------------------------- */
3682
3683/*
3684 * return col/row values corresponding to x/y pixel values
3685 */
3686void
3687rxvt_term::pixel_position (int *x, int *y) NOTHROW
3688{
3689 *x = Pixel2Col (*x);
3690 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3691 *y = Pixel2Row (*y);
3692 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3693}
3694 3755
3695/* ------------------------------------------------------------------------- */ 3756/* ------------------------------------------------------------------------- */
3696#ifdef USE_XIM 3757#ifdef USE_XIM
3697void 3758void
3698rxvt_term::im_set_position (XPoint &pos) NOTHROW 3759rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3725 h += 2; min_it (h, nrow); 3786 h += 2; min_it (h, nrow);
3726 3787
3727 x -= 1; clamp_it (x, 0, ncol - w); 3788 x -= 1; clamp_it (x, 0, ncol - w);
3728 y -= 1; clamp_it (y, 0, nrow - h); 3789 y -= 1; clamp_it (y, 0, nrow - h);
3729 3790
3730 ov_x = x; ov_y = y; 3791 ov.x = x; ov.y = y;
3731 ov_w = w; ov_h = h; 3792 ov.w = w; ov.h = h;
3732 3793
3733 ov_text = new text_t *[h]; 3794 ov.text = new text_t *[h];
3734 ov_rend = new rend_t *[h]; 3795 ov.rend = new rend_t *[h];
3735 3796
3736 for (y = 0; y < h; y++) 3797 for (y = 0; y < h; y++)
3737 { 3798 {
3738 text_t *tp = ov_text[y] = new text_t[w]; 3799 text_t *tp = ov.text[y] = new text_t[w];
3739 rend_t *rp = ov_rend[y] = new rend_t[w]; 3800 rend_t *rp = ov.rend[y] = new rend_t[w];
3740 3801
3741 text_t t0, t1, t2; 3802 text_t t0, t1, t2;
3742 rend_t r = OVERLAY_RSTYLE; 3803 rend_t r = OVERLAY_RSTYLE;
3743 3804
3744 if (y == 0) 3805 if (y == 0)
… …
3763} 3824}
3764 3825
3765void 3826void
3766rxvt_term::scr_overlay_off () NOTHROW 3827rxvt_term::scr_overlay_off () NOTHROW
3767{ 3828{
3768 if (!ov_text) 3829 if (!ov.text)
3769 return; 3830 return;
3770 3831
3771 want_refresh = 1; 3832 want_refresh = 1;
3772 3833
3773 for (int y = 0; y < ov_h; y++) 3834 for (int y = 0; y < ov.h; y++)
3774 { 3835 {
3775 delete [] ov_text[y]; 3836 delete [] ov.text[y];
3776 delete [] ov_rend[y]; 3837 delete [] ov.rend[y];
3777 } 3838 }
3778 3839
3779 delete [] ov_text; ov_text = 0; 3840 delete [] ov.text; ov.text = 0;
3780 delete [] ov_rend; ov_rend = 0; 3841 delete [] ov.rend; ov.rend = 0;
3781} 3842}
3782 3843
3783void 3844void
3784rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3845rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3785{ 3846{
3786 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3847 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3787 return; 3848 return;
3788 3849
3789 x++, y++; 3850 x++, y++;
3790 3851
3791 ov_text[y][x] = text; 3852 ov.text[y][x] = text;
3792 ov_rend[y][x] = rend; 3853 ov.rend[y][x] = rend;
3793} 3854}
3794 3855
3795void 3856void
3796rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3857rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3797{ 3858{
… …
3816} 3877}
3817 3878
3818void 3879void
3819rxvt_term::scr_swap_overlay () NOTHROW 3880rxvt_term::scr_swap_overlay () NOTHROW
3820{ 3881{
3821 if (!ov_text) 3882 if (!ov.text)
3822 return; 3883 return;
3823 3884
3885 // hide cursor if it is within the overlay area
3886 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3887 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3888 screen.flags &= ~Screen_VisibleCursor;
3889
3824 // swap screen mem with overlay 3890 // swap screen mem with overlay
3825 for (int y = ov_h; y--; ) 3891 for (int y = ov.h; y--; )
3826 { 3892 {
3827 text_t *t1 = ov_text[y]; 3893 text_t *t1 = ov.text[y];
3828 rend_t *r1 = ov_rend[y]; 3894 rend_t *r1 = ov.rend[y];
3829 3895
3830 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3896 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3831 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3897 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3832 3898
3833 for (int x = ov_w; x--; ) 3899 for (int x = ov.w; x--; )
3834 { 3900 {
3835 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3901 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3836 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3902 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3837 } 3903 }
3838 } 3904 }

Diff Legend

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