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.275 by sasha, Wed Aug 15 22:41:52 2007 UTC vs.
Revision 1.342 by root, Thu Jul 1 20:02:43 2010 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.
… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
36{ 36{
37 while (len--) 37 while (len--)
38 *start++ = value; 38 *start++ = value;
39} 39}
40 40
… …
83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
86 86
87/* 87/*
88 * CLEAR_ROWS : clear <num> rows starting from row <row>
89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
91 */ 89 */
92#define drawBuffer vt
93
94#define CLEAR_ROWS(row, num) \
95 if (mapped) \
96 XClearArea (dpy, drawBuffer, 0, \
97 Row2Pixel (row), (unsigned int)width, \
98 (unsigned int)Height2Pixel (num), False)
99
100#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
101 if (mapped) \ 91 if (mapped) \
102 XClearArea (dpy, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
103 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
104 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
105
106#define ERASE_ROWS(row, num) \
107 XFillRectangle (dpy, drawBuffer, gc, \
108 0, Row2Pixel (row), \
109 (unsigned int)width, \
110 (unsigned int)Height2Pixel (num))
111 95
112/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
113 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
114 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
115 99
… …
148 132
149 l.l = 0; 133 l.l = 0;
150 l.f = 0; 134 l.f = 0;
151} 135}
152 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
153/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
154 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
155 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
156 159
157void 160void
158rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
159{ 162{
160#if ENABLE_OVERLAY
161 scr_overlay_off ();
162#endif
163
164 rvideo_mode = false;
165 view_start = 0; 163 view_start = 0;
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
… …
171 if (nrow == 0) 169 if (nrow == 0)
172 nrow = 24; 170 nrow = 24;
173 171
174 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 173 return;
176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179 174
180 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
181 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
182 { 177 {
183 //TODO//FIXME 178 //TODO//FIXME
… …
236 selection.text = NULL; 231 selection.text = NULL;
237 selection.len = 0; 232 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
240 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
241 } 238 }
242 else 239 else
243 { 240 {
244 /* 241 /*
245 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 272 }
276 273
277 line_t *old_buf = row_buf; 274 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 276
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 278 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 279 int q = total_rows; // rewrapped row
283 280
284 if (top_row) 281 if (top_row)
285 { 282 {
286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
288 286
289 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 289
292 do 290 do
293 { 291 {
294 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
295#ifdef DEBUG_STRICT
296 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
297#endif
298 int plines = 1; 294 int plines = 1;
299 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
300 296
301 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
302 { 298 {
… …
328 int qcol = 0; 324 int qcol = 0;
329 325
330 // see below for cursor adjustment rationale 326 // see below for cursor adjustment rationale
331 if (p == ocur.row) 327 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow); 328 screen.cur.row = q - (total_rows - nrow);
333 329
334 // fill a single destination line 330 // fill a single destination line
335 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
336 { 332 {
337 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
338 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
364 } 360 }
365 while (p != pend && q > 0); 361 while (p != pend && q > 0);
366 362
367 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
368 top_row = q - term_start; 364 top_row = q - term_start;
369 365
370 // make sure all terminal lines exist 366 // make sure all terminal lines exist
371 while (top_row > 0) 367 while (top_row > 0)
372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
373 } 369 }
374 else 370 else
375 { 371 {
376 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
377 373
378 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
379 { 375 {
380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
381 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
382 378
… …
396 delete old_ta; 392 delete old_ta;
397 delete old_ra; 393 delete old_ra;
398 394
399 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
400 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
401 398
402 free (tabs); 399 free (tabs);
403 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
404 404
405 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
406 406
407 prev_nrow = nrow; 407 prev_nrow = nrow;
408 prev_ncol = ncol; 408 prev_ncol = ncol;
409
410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
411
412 for (int col = ncol; --col; )
413 tabs [col] = col % TABSIZE == 0;
414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417 409
418 tt_winch (); 410 tt_winch ();
419 411
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 413}
… …
433 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
434 426
435 free (row_buf); 427 free (row_buf);
436 free (swap_buf); 428 free (swap_buf);
437 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
438 free (tabs); 432 free (tabs);
439 433 tabs = 0;
440 row_buf = 0; // signal that we freed all the arrays
441 } 434 }
442} 435}
443 436
444/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
445/* 438/*
446 * Hard reset 439 * Hard/Soft reset
447 */ 440 */
448void 441void
449rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
450{ 443{
451 scr_release (); 444 scr_release ();
452 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
453 scr_reset (); 448 scr_reset ();
454 449
455 scr_clear (true); 450 scr_clear (true);
456 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
457} 468}
458 469
459/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
499 } 510 }
500 511
501 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
502 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
503 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
504#ifdef DEBUG_STRICT
505 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
507#endif
508} 517}
509 518
510void 519void
511rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
512{ 521{
… …
537 want_refresh = 1; 546 want_refresh = 1;
538 view_start = 0; 547 view_start = 0;
539 548
540 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
541 550
542 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
543 552
544#if NSCREENS 553#if NSCREENS
545 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
546 { 555 {
547 num_scr = 0; 556 num_scr = 0;
… …
596/* 605/*
597 * Change the rendition style for following text 606 * Change the rendition style for following text
598 */ 607 */
599void 608void
600rxvt_term::scr_rendition (int set, int style) NOTHROW 609rxvt_term::scr_rendition (int set, int style) NOTHROW
601 { 610{
602 if (set) 611 if (set)
603 rstyle |= style; 612 rstyle |= style;
604 else if (style == ~RS_None) 613 else if (style == ~RS_None)
605 rstyle = DEFAULT_RSTYLE; 614 rstyle = DEFAULT_RSTYLE;
606 else 615 else
607 rstyle &= ~style; 616 rstyle &= ~style;
608 } 617}
609 618
610/* ------------------------------------------------------------------------- */ 619/* ------------------------------------------------------------------------- */
611/* 620/*
612 * Scroll text between <row1> and <row2> inclusive, by <count> lines 621 * Scroll text between <row1> and <row2> inclusive, by <count> lines
613 * count positive ==> scroll up 622 * count positive ==> scroll up
… …
664 line_t &l2 = ROW(i); 673 line_t &l2 = ROW(i);
665 674
666 ::swap (l1, l2); 675 ::swap (l1, l2);
667 l2.touch (); 676 l2.touch ();
668 } 677 }
669 678
670 // move and/or clear selection, if any 679 // move and/or clear selection, if any
671 if (selection.op && current_screen == selection.screen) 680 if (selection.op && current_screen == selection.screen)
672 { 681 {
673 selection.beg.row -= count; 682 selection.beg.row -= count;
674 selection.end.row -= count; 683 selection.end.row -= count;
… …
710 { 719 {
711 /* move selected region too */ 720 /* move selected region too */
712 selection.beg.row -= count; 721 selection.beg.row -= count;
713 selection.end.row -= count; 722 selection.end.row -= count;
714 selection.mark.row -= count; 723 selection.mark.row -= count;
715 724
716 selection_check (0); 725 selection_check (0);
717 } 726 }
718 } 727 }
719 728
720 // use a simple and robust scrolling algorithm, this 729 // use a simple and robust scrolling algorithm, this
… …
772 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
773 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
774 } 783 }
775 } 784 }
776 785
777#ifdef DEBUG_STRICT
778 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
779 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
780 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
781#endif
782 int row = screen.cur.row; 789 int row = screen.cur.row;
783 790
784 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
785 792
786 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
787 794
788 while (str < strend) 795 while (str < strend)
789 { 796 {
790 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
791 798
792 if (c < 0x20) 799 if (expect_false (c < 0x20))
793 if (c == C0_LF) 800 if (c == C0_LF)
794 { 801 {
795 max_it (line->l, screen.cur.col); 802 max_it (line->l, screen.cur.col);
796 803
797 screen.flags &= ~Screen_WrapNext; 804 screen.flags &= ~Screen_WrapNext;
… …
816 { 823 {
817 scr_tab (1, true); 824 scr_tab (1, true);
818 continue; 825 continue;
819 } 826 }
820 827
828 if (expect_false (
821 if (checksel /* see if we're writing within selection */ 829 checksel /* see if we're writing within selection */
822 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
823 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 831 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 ))
824 { 833 {
825 checksel = 0; 834 checksel = 0;
826 /* 835 /*
827 * If we wrote anywhere in the selected area, kill the selection 836 * If we wrote anywhere in the selected area, kill the selection
828 * XXX: should we kill the mark too? Possibly, but maybe that 837 * XXX: should we kill the mark too? Possibly, but maybe that
829 * should be a similar check. 838 * should be a similar check.
830 */ 839 */
831 CLEAR_SELECTION (); 840 CLEAR_SELECTION ();
832 } 841 }
833 842
834 if (screen.flags & Screen_WrapNext) 843 if (expect_false (screen.flags & Screen_WrapNext))
835 { 844 {
836 scr_do_wrap (); 845 scr_do_wrap ();
837 846
838 line->l = ncol; 847 line->l = ncol;
839 line->is_longer (1); 848 line->is_longer (1);
840 849
841 row = screen.cur.row; 850 row = screen.cur.row;
842 line = &ROW(row); /* _must_ refresh */ 851 line = &ROW(row); /* _must_ refresh */
843 } 852 }
844 853
845 // some utf-8 decoders "decode" surrogate characters: let's fix this. 854 // some utf-8 decoders "decode" surrogate characters: let's fix this.
846 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
847 c = 0xfffd; 856 c = 0xfffd;
848 857
849 // rely on wcwidth to tell us the character width, do wcwidth before 858 // rely on wcwidth to tell us the character width, do wcwidth before
850 // further replacements, as wcwidth might return -1 for the line 859 // further replacements, as wcwidth might return -1 for the line
851 // drawing characters below as they might be invalid in the current 860 // drawing characters below as they might be invalid in the current
852 // locale. 861 // locale.
853 int width = WCWIDTH (c); 862 int width = WCWIDTH (c);
854 863
855 if (charsets [screen.charset] == '0') // DEC SPECIAL 864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
856 { 865 {
857 // vt100 special graphics and line drawing 866 // vt100 special graphics and line drawing
858 // 5f-7e standard vt100 867 // 5f-7e standard vt100
859 // 40-5e rxvt extension for extra curses acs chars 868 // 40-5e rxvt extension for extra curses acs chars
860 static uint16_t vt100_0[62] = { // 41 .. 7e 869 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 c = vt100_0[c - 0x41]; 882 c = vt100_0[c - 0x41];
874 width = 1; // vt100 line drawing characters are always single-width 883 width = 1; // vt100 line drawing characters are always single-width
875 } 884 }
876 } 885 }
877 886
878 if (screen.flags & Screen_Insert) 887 if (expect_false (screen.flags & Screen_Insert))
879 scr_insdel_chars (width, INSERT); 888 scr_insdel_chars (width, INSERT);
880 889
881 if (width != 0) 890 if (width != 0)
882 { 891 {
883#if !UNICODE_3 892#if !UNICODE_3
… …
889 c = 0xfffd; 898 c = 0xfffd;
890# endif 899# endif
891#endif 900#endif
892 901
893 // nuke the character at this position, if required 902 // nuke the character at this position, if required
903 if (expect_false (
894 if (line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
895 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
896 && line->t[screen.cur.col + 1] == NOCHAR)) 906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
897 { 914 {
898 int col = screen.cur.col; 915 // ... artificially enlargen the previous one
899
900 // find begin
901 while (col > 0 && line->t[col] == NOCHAR)
902 col--;
903
904 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
905
906 // found begin, nuke
907 do {
908 line->t[col] = ' ';
909 line->r[col] = rend;
910 col++;
911 } while (col < ncol && line->t[col] == NOCHAR);
912 }
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (screen.cur.col > ncol - width && ncol >= width)
918 {
919 // ...output spaces
920 c = ' '; 916 c = NOCHAR;
921 // and try the same character next loop iteration 917 // and try the same character next loop iteration
922 --str; 918 --str;
923 } 919 }
924 920
925 line->touch (); 921 line->touch ();
… …
927 do 923 do
928 { 924 {
929 line->t[screen.cur.col] = c; 925 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 926 line->r[screen.cur.col] = rend;
931 927
932 if (screen.cur.col < ncol - 1) 928 if (expect_true (screen.cur.col < ncol - 1))
933 screen.cur.col++; 929 screen.cur.col++;
934 else 930 else
935 { 931 {
936 line->l = ncol; 932 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 933 if (screen.flags & Screen_Autowrap)
… …
939 break; 935 break;
940 } 936 }
941 937
942 c = NOCHAR; 938 c = NOCHAR;
943 } 939 }
944 while (--width > 0); 940 while (expect_false (--width > 0));
945 941
946 // pad with spaces when overwriting wide character with smaller one 942 // pad with spaces when overwriting wide character with smaller one
947 if (!width) 943 if (expect_false (!width))
948 { 944 {
949 line->touch (); 945 line->touch ();
950 946
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 { 948 {
953 line->t[c] = ' '; 949 line->t[c] = ' ';
954 line->r[c] = rend; 950 line->r[c] = rend;
955 } 951 }
956 } 952 }
957 } 953 }
954#if ENABLE_COMBINING
958 else // width == 0 955 else // width == 0
959 { 956 {
960#if ENABLE_COMBINING 957 if (c != 0xfeff) // ignore BOM
961 // handle combining characters
962 // we just tag the accent on the previous on-screen character.
963 // this is arguably not correct, but also arguably not wrong.
964 // we don't handle double-width characters nicely yet.
965 line_t *linep;
966 text_t *tp;
967 rend_t *rp;
968
969 if (screen.cur.col > 0)
970 { 958 {
959 // handle combining characters
960 // we just tag the accent on the previous on-screen character.
961 // this is arguably not correct, but also arguably not wrong.
962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
964 text_t *tp;
965 rend_t *rp;
966
967 if (screen.cur.col > 0)
968 {
971 linep = line; 969 linep = line;
972 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
973 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
972 }
973 else if (screen.cur.row > 0
974 && ROW(screen.cur.row - 1).is_longer ())
975 {
976 linep = &ROW(screen.cur.row - 1);
977 tp = line->t + ncol - 1;
978 rp = line->r + ncol - 1;
979 }
980 else
981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
987
988 // first try to find a precomposed character
989 unicode_t n = rxvt_compose (*tp, c);
990 if (n == NOCHAR)
991 n = rxvt_composite.compose (*tp, c);
992
993 *tp = n;
994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
974 } 995 }
975 else if (screen.cur.row > 0
976 && ROW(screen.cur.row - 1).is_longer ())
977 {
978 linep = &ROW(screen.cur.row - 1);
979 tp = line->t + ncol - 1;
980 rp = line->r + ncol - 1;
981 } 996 }
982 else
983 continue;
984
985 linep->touch ();
986
987 while (*tp == NOCHAR && tp > linep->t)
988 tp--, rp--;
989
990 // first try to find a precomposed character
991 unicode_t n = rxvt_compose (*tp, c);
992 if (n == NOCHAR)
993 n = rxvt_composite.compose (*tp, c);
994
995 *tp = n;
996 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
997#endif 997#endif
998 }
999 } 998 }
1000 999
1001 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
1002 1001
1003#ifdef DEBUG_STRICT
1004 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1005#endif
1006} 1003}
1007 1004
1008/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1009/* 1006/*
1010 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
1011 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
1012 */ 1009 */
1013void 1010void
1014rxvt_term::scr_backspace () NOTHROW 1011rxvt_term::scr_backspace () NOTHROW
1015{ 1012{
1016 want_refresh = 1;
1017
1018 if (screen.cur.col == 0) 1013 if (screen.cur.col == 0)
1019 { 1014 {
1020 if (screen.cur.row > 0) 1015 if (screen.cur.row > 0)
1021 { 1016 {
1022#ifdef TERMCAP_HAS_BW 1017#ifdef TERMCAP_HAS_BW
1023 screen.cur.col = ncol - 1; 1018 screen.cur.col = ncol - 1;
1024 screen.cur.row--; 1019 --screen.cur.row;
1025 return; 1020
1021 want_refresh = 1;
1026#endif 1022#endif
1027 } 1023 }
1028 } 1024 }
1029 else if (!(screen.flags & Screen_WrapNext)) 1025 else
1030 scr_gotorc (0, -1, RELATIVE); 1026 scr_gotorc (0, -1, RELATIVE);
1031
1032 screen.flags &= ~Screen_WrapNext;
1033} 1027}
1034 1028
1035/* ------------------------------------------------------------------------- */ 1029/* ------------------------------------------------------------------------- */
1036/* 1030/*
1037 * Process Horizontal Tab 1031 * Process Horizontal Tab
… …
1060 x = i; 1054 x = i;
1061 1055
1062 if (!--count) 1056 if (!--count)
1063 break; 1057 break;
1064 } 1058 }
1065 else 1059 else
1066 ht &= l.t[i] == ' ' 1060 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend); 1061 && RS_SAME (l.r[i], base_rend);
1068 1062
1069 if (count) 1063 if (count)
1070 x = ncol - 1; 1064 x = ncol - 1;
… …
1186 } 1180 }
1187 } 1181 }
1188 else 1182 else
1189 { 1183 {
1190 if (screen.flags & Screen_Relative) 1184 if (screen.flags & Screen_Relative)
1185 {
1191 { /* relative origin mode */ 1186 /* relative origin mode */
1192 screen.cur.row = row + screen.tscroll; 1187 screen.cur.row = row + screen.tscroll;
1193 min_it (screen.cur.row, screen.bscroll); 1188 min_it (screen.cur.row, screen.bscroll);
1194 } 1189 }
1195 else 1190 else
1196 screen.cur.row = row; 1191 screen.cur.row = row;
… …
1229/* 1224/*
1230 * Erase part or whole of a line 1225 * Erase part or whole of a line
1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1226 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1227 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1228 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1229 * extension: clear to right unless wrapped: ESC [ 3 K
1234 */ 1230 */
1235void 1231void
1236rxvt_term::scr_erase_line (int mode) NOTHROW 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1237{ 1233{
1238 unsigned int col, num; 1234 unsigned int col, num;
… …
1247 line.touch (); 1243 line.touch ();
1248 line.is_longer (0); 1244 line.is_longer (0);
1249 1245
1250 switch (mode) 1246 switch (mode)
1251 { 1247 {
1248 case 3:
1249 if (screen.flags & Screen_WrapNext)
1250 return;
1251
1252 /* fall through */
1253
1252 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1253 col = screen.cur.col; 1255 col = screen.cur.col;
1254 num = ncol - col; 1256 num = ncol - col;
1255 min_it (line.l, col); 1257 min_it (line.l, col);
1258
1256 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1259 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1257 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1260 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1258 CLEAR_SELECTION (); 1261 CLEAR_SELECTION ();
1259 break; 1262 break;
1263
1260 case 1: /* erase to beginning of line */ 1264 case 1: /* erase to beginning of line */
1261 col = 0; 1265 col = 0;
1262 num = screen.cur.col + 1; 1266 num = screen.cur.col + 1;
1267
1263 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1268 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1264 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1269 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1265 CLEAR_SELECTION (); 1270 CLEAR_SELECTION ();
1266 break; 1271 break;
1272
1267 case 2: /* erase whole line */ 1273 case 2: /* erase whole line */
1268 col = 0; 1274 col = 0;
1269 num = ncol; 1275 num = ncol;
1270 line.l = 0; 1276 line.l = 0;
1271 if (selection.beg.row <= screen.cur.row 1277 if (selection.beg.row <= screen.cur.row
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1330 return; 1336 return;
1331 1337
1332 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1333 1339
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1334 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1335 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1336 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1337 { 1346 {
1338 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1339 CLEAR_ROWS (row, num); 1348
1349 if (mapped && !view_start)
1350 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False);
1340 } 1353 }
1341 else 1354 else
1342 { 1355 {
1343 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1357
1358 if (mapped && !view_start)
1359 {
1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1345 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 ERASE_ROWS (row, num); 1362 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start),
1364 (unsigned int)width,
1365 (unsigned int)Height2Pixel (num));
1347 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1348 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1349 } 1369 }
1350 1370
1351 for (; num--; row++) 1371 for (; num--; row++)
1352 { 1372 {
1353 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1354 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1355 } 1377 }
1356} 1378}
1357 1379
1358#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1359void 1381void
… …
1433 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1434 */ 1456 */
1435void 1457void
1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1437{ 1459{
1438 int col, row;
1439 rend_t tr;
1440
1441 want_refresh = 1; 1460 want_refresh = 1;
1442 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1443 1462
1444 if (count <= 0) 1463 if (count <= 0)
1445 return; 1464 return;
… …
1447 scr_do_wrap (); 1466 scr_do_wrap ();
1448 1467
1449 selection_check (1); 1468 selection_check (1);
1450 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1451 1470
1452 row = screen.cur.row; 1471 int row = screen.cur.row;
1453 1472
1454 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1455 1474
1456 line->touch (); 1475 line->touch ();
1457 line->is_longer (0); 1476 line->is_longer (0);
1458 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1459 switch (insdel) 1482 switch (insdel)
1460 { 1483 {
1461 case INSERT: 1484 case INSERT:
1462 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1463 { 1491 {
1464 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1465 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1466 } 1494 }
1467
1468 line->l = min (line->l + count, ncol);
1469 1495
1470 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1471 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1472 { 1498 {
1473 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1474 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1475 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1476 else 1502 else
1503 {
1477 { /* shift selection */ 1504 /* shift selection */
1478 selection.beg.col += count; 1505 selection.beg.col += count;
1479 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1480 selection.end.col += count; 1507 selection.end.col += count;
1481 } 1508 }
1482 } 1509 }
… …
1487 case ERASE: 1514 case ERASE:
1488 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1489 selection_check (1); 1516 selection_check (1);
1490 screen.cur.col -= count; 1517 screen.cur.col -= count;
1491 1518
1492 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1493 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1494 break; 1524 break;
1495 1525
1496 case DELETE: 1526 case DELETE:
1497 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1498 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1499 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1500 { 1534 {
1501 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1502 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1503 } 1537 }
1504 1538
1505 line->l = max (line->l - count, 0);
1506 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1507 1540
1508 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1509 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1510 { 1543 {
1511 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1621 */ 1654 */
1622void 1655void
1623rxvt_term::scr_set_tab (int mode) NOTHROW 1656rxvt_term::scr_set_tab (int mode) NOTHROW
1624{ 1657{
1625 if (mode < 0) 1658 if (mode < 0)
1626 memset (tabs, 0, ncol * sizeof (char)); 1659 memset (tabs, 0, ncol);
1627 else if (screen.cur.col < ncol) 1660 else if (screen.cur.col < ncol)
1628 tabs [screen.cur.col] = !!mode; 1661 tabs [screen.cur.col] = !!mode;
1629} 1662}
1630 1663
1631/* ------------------------------------------------------------------------- */ 1664/* ------------------------------------------------------------------------- */
… …
1801 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1802 { 1835 {
1803 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1804 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1805 } 1838 }
1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1809 1842
1810 num_scr_allow = 0; 1843 num_scr_allow = 0;
1811 1844
… …
1866 return true; 1899 return true;
1867} 1900}
1868 1901
1869#ifndef NO_BELL 1902#ifndef NO_BELL
1870void 1903void
1871rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1872{ 1905{
1873 rvideo_bell = false; 1906 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1875} 1909}
1876#endif 1910#endif
1877 1911
1878/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1879void 1913void
… …
1885# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1886 if (option (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1887# endif 1921# endif
1888 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1889# endif 1923# endif
1924
1890# if ENABLE_FRILLS 1925# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell)) 1926 if (option (Opt_urgentOnBell))
1892 { 1927 set_urgency (1);
1893 XWMHints *h;
1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif 1928# endif
1903 1929
1904 if (option (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1905 { 1931 {
1906 rvideo_bell = true; 1932 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1908 display->flush (); 1934 flush ();
1909 1935
1910 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1911 } 1937 }
1912 else 1938 else
1913 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1914#endif 1941#endif
1915} 1942}
1916 1943
1917/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1918/* ARGSUSED */ 1945/* ARGSUSED */
1919void 1946void
1920rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1921{ 1948{
1922#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1923 int nrows, row_start; 1950 int nrows, row_start;
1924 FILE *fd; 1951 FILE *fd = popen_printer ();
1925 1952
1926 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1927 return; 1954 return;
1928 1955
1929 if (fullhist) 1956 if (fullhist)
1930 { 1957 {
1931 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1937 row_start = view_start; 1964 row_start = view_start;
1938 } 1965 }
1939 1966
1940 wctomb (0, 0); 1967 wctomb (0, 0);
1941 1968
1942 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1943 { 1970 {
1944 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1945 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1946 1973
1947 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1976 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1977 */ 2004 */
1978void 2005void
1979rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1980{ 2007{
1981 unsigned char have_bg,
1982 showcursor; /* show the cursor */
1983 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1984 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1985 int i; /* tmp */ 2010 int i; /* tmp */
1986#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1987 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
1996 return; 2021 return;
1997 2022
1998 /* 2023 /*
1999 * A: set up vars 2024 * A: set up vars
2000 */ 2025 */
2001 have_bg = 0;
2002 refresh_count = 0; 2026 refresh_count = 0;
2003 2027
2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2004#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2005 have_bg |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2006#endif 2032#endif
2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2008 2034
2009 /* 2035 /*
2010 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2011 */ 2037 */
2012 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2013 2046
2014 /* 2047 /*
2015 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2016 */ 2049 */
2017 { 2050 {
2018 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2019 2052
2020 showcursor = (screen.flags & Screen_VisibleCursor);
2021#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2022 if (hidden_cursor) 2054 if (hidden_cursor)
2023 showcursor = 0; 2055 showcursor = 0;
2024#endif 2056#endif
2025 2057
… …
2053 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2054#else 2086#else
2055 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2056#endif 2088#endif
2057 2089
2058 if (showcursor && focus) 2090 if (focus)
2059 { 2091 {
2060 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2061 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2062 else 2094 else
2063 { 2095 {
… …
2098 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2099 } 2131 }
2100 } 2132 }
2101 } 2133 }
2102 2134
2103 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2104#if ENABLE_OVERLAY
2105 scr_swap_overlay ();
2106#endif
2107
2108#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2109 /* 2136 /*
2110 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2111 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2112 */ 2139 */
… …
2201 continue; 2228 continue;
2202 2229
2203 // redraw one or more characters 2230 // redraw one or more characters
2204 2231
2205 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2206 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2207 --col; 2234 --col;
2208 2235
2209 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2210 text_t *text = stp + col; 2237 text_t *text = stp + col;
2211 int count = 1; 2238 int count = 1;
2212 2239
2213 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2214 drp[col] = rend; 2241 drp[col] = rend;
… …
2218 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2219 { 2246 {
2220 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2221 { 2248 {
2222 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2223 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2224 count++; 2252 count++;
2225 i++; 2253 i++;
2226 2254
2227 continue; 2255 continue;
2228 } 2256 }
… …
2248 2276
2249 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2250 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2251 2279
2252 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2253 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2254 count++, i--; 2282 count++, i--;
2255 2283
2256 /* 2284 /*
2257 * Determine the attributes for the string 2285 * Determine the attributes for the string
2258 */ 2286 */
2259 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2260 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2261 2289
2262 // only do special processing if any attributes are set, which is unlikely 2290 // only do special processing if any attributes are set, which is unlikely
2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2264 { 2292 {
2265 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2266 2294
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (rend & RS_Bold
2269 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2270 { 2297 {
2271 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2272 fore = Color_BD; 2299 fore = Color_BD;
2273# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2274 else 2301 else
2275 invert = !invert; 2302 invert = !invert;
2276# endif 2303# endif
2277 } 2304 }
2278 2305
2279 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2280 && fore == Color_fg)
2281 { 2307 {
2282 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2283 fore = Color_IT; 2309 fore = Color_IT;
2284# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2285 else 2311 else
… …
2289 2315
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2317 fore = Color_UL;
2292#endif 2318#endif
2293 2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333
2334 back = Color_HC;
2335 invert = 0;
2336 }
2337 }
2338#endif
2339
2294 if (invert) 2340 if (invert)
2295 { 2341 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2342 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2343
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2344#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2345 if (fore == back)
2314 { 2346 {
2315 fore = Color_bg; 2347 fore = Color_bg;
2316 back = Color_fg; 2348 back = Color_fg;
2317 } 2349 }
… …
2319 } 2351 }
2320 2352
2321#ifdef TEXT_BLINK 2353#ifdef TEXT_BLINK
2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2354 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2323 { 2355 {
2324 if (!text_blink_ev.active) 2356 if (!text_blink_ev.is_active ())
2325 { 2357 {
2326 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2358 text_blink_ev.again ();
2327 hidden_text = 0; 2359 hidden_text = 0;
2328 } 2360 }
2329 else if (hidden_text) 2361 else if (hidden_text)
2330 fore = back; 2362 fore = back;
2331 } 2363 }
… …
2353 /* 2385 /*
2354 * Actually do the drawing of the string here 2386 * Actually do the drawing of the string here
2355 */ 2387 */
2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2388 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2357 2389
2358 if (have_bg && back == Color_bg) 2390 if (expect_true (have_bg && back == Color_bg))
2359 { 2391 {
2360 // this is very ugly, maybe push it into ->draw? 2392 // this is very ugly, maybe push it into ->draw?
2361 2393
2362 for (i = 0; i < count; i++) /* don't draw empty strings */ 2394 for (i = 0; i < count; i++) /* don't draw empty strings */
2363 if (text[i] != ' ') 2395 if (text[i] != ' ')
… …
2370 did_clear: ; 2402 did_clear: ;
2371 } 2403 }
2372 else 2404 else
2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2405 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2374 2406
2375 if (rend & RS_Uline && font->descent > 1 && fore != back) 2407 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2376 { 2408 {
2377#if ENABLE_FRILLS 2409#if ENABLE_FRILLS
2378 if (ISSET_PIXCOLOR (Color_underline)) 2410 if (ISSET_PIXCOLOR (Color_underline))
2379 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2411 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2380 else 2412 else
2381#endif 2413#endif
2382 XSetForeground (dpy, gc, pix_colors[fore]); 2414 XSetForeground (dpy, gc, pix_colors[fore]);
2383 2415
2384 XDrawLine (dpy, drawBuffer, gc, 2416 XDrawLine (dpy, vt, gc,
2385 xpixel, ypixel + font->ascent + 1, 2417 xpixel, ypixel + font->ascent + 1,
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2419 }
2388 } /* for (col....) */ 2420 } /* for (col....) */
2389 } /* for (row....) */ 2421 } /* for (row....) */
2390
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395 2422
2396 /* 2423 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2425 */
2399 if (showcursor) 2426 if (showcursor)
… …
2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2454 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else 2455 else
2429#endif 2456#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]); 2457 XSetForeground (dpy, gc, pix_colors[ccol1]);
2431 2458
2432 XDrawRectangle (dpy, drawBuffer, gc, 2459 XDrawRectangle (dpy, vt, gc,
2433 Col2Pixel (col), 2460 Col2Pixel (col),
2434 Row2Pixel (oldcursor.row), 2461 Row2Pixel (oldcursor.row),
2435 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2462 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2437 } 2464 }
2438 } 2465 }
2439 2466
2440 /* 2467 /*
2441 * H: cleanup selection 2468 * H: cleanup selection
2442 */ 2469 */
2470#if ENABLE_OVERLAY
2471 scr_swap_overlay ();
2472#endif
2473 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2474
2443 scr_reverse_selection (); 2475 scr_reverse_selection ();
2444 2476
2477 screen.flags = old_screen_flags;
2445 num_scr = 0; 2478 num_scr = 0;
2446 num_scr_allow = 1; 2479 num_scr_allow = 1;
2447} 2480}
2448 2481
2449void 2482void
… …
2475rxvt_term::scr_recolour () NOTHROW 2508rxvt_term::scr_recolour () NOTHROW
2476{ 2509{
2477#ifdef HAVE_BG_PIXMAP 2510#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2511 bgPixmap.apply ();
2479#else 2512#else
2513
2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2481 XClearWindow (dpy, parent[0]); 2515 XClearWindow (dpy, parent[0]);
2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2516 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483# if HAVE_SCROLLBARS 2517
2484 if (scrollBar.win) 2518 if (scrollBar.win)
2485 { 2519 {
2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2520 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2487 scrollBar.setIdle (); 2521 scrollBar.state = STATE_IDLE;
2488 scrollbar_show (0); 2522 scrollBar.show (0);
2489 } 2523 }
2524
2490# endif 2525#endif
2491#endif 2526
2492 2527 /* bgPixmap.apply () does not do the following : */
2493 scr_clear (); 2528 scr_clear ();
2494 scr_touch (true); 2529 scr_touch (true);
2495 want_refresh = 1; 2530 want_refresh = 1;
2496} 2531}
2497 2532
… …
2567 { 2602 {
2568#if !ENABLE_MINIMAL 2603#if !ENABLE_MINIMAL
2569 if (selection.rect) 2604 if (selection.rect)
2570 scr_xor_rect (selection.beg.row, selection.beg.col, 2605 scr_xor_rect (selection.beg.row, selection.beg.col,
2571 selection.end.row, selection.end.col, 2606 selection.end.row, selection.end.col,
2572 RS_RVid, RS_RVid | RS_Uline); 2607 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2573 else 2608 else
2574#endif 2609#endif
2575 scr_xor_span (selection.beg.row, selection.beg.col, 2610 scr_xor_span (selection.beg.row, selection.beg.col,
2576 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2577 RS_RVid); 2612 RS_Sel | RS_RVid);
2578 } 2613 }
2579} 2614}
2580 2615
2581/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2582/* 2617/*
… …
2589{ 2624{
2590 int row, wrote; 2625 int row, wrote;
2591 unsigned int width, towrite; 2626 unsigned int width, towrite;
2592 char r1[] = "\n"; 2627 char r1[] = "\n";
2593 2628
2594 for (row = saveLines - nsaved; 2629 for (row = saveLines + top_row;
2595 row < saveLines + nrow - 1; row++) 2630 row < saveLines + nrow - 1; row++)
2596 { 2631 {
2597 width = row_buf[row].l >= 0 ? row_buf[row].l 2632 width = row_buf[row].l >= 0 ? row_buf[row].l
2598 : ncol; 2633 : ncol;
2599 for (towrite = width; towrite; towrite -= wrote) 2634 for (towrite = width; towrite; towrite -= wrote)
… …
2650 /* convert normal newline chars into common keyboard Return key sequence */ 2685 /* convert normal newline chars into common keyboard Return key sequence */
2651 for (unsigned int i = 0; i < len; i++) 2686 for (unsigned int i = 0; i < len; i++)
2652 if (data[i] == C0_LF) 2687 if (data[i] == C0_LF)
2653 data[i] = C0_CR; 2688 data[i] = C0_CR;
2654 2689
2690 if (priv_modes & PrivMode_BracketPaste)
2691 tt_printf ("\e[200~");
2692
2655 tt_write (data, len); 2693 tt_write (data, len);
2694
2695 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[201~");
2656} 2697}
2657 2698
2658/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2659/* 2700/*
2660 * Respond to a notification that a primary selection has been sent 2701 * Respond to a notification that a primary selection has been sent
… …
2735 if (!delete_prop) 2776 if (!delete_prop)
2736 XDeleteProperty (dpy, win, prop); 2777 XDeleteProperty (dpy, win, prop);
2737 2778
2738 selection_wait = Sel_incr; 2779 selection_wait = Sel_incr;
2739 incr_buf_fill = 0; 2780 incr_buf_fill = 0;
2740 incr_ev.start (NOW + 10); 2781 incr_ev.start (10);
2741 2782
2742 goto bailout; 2783 goto bailout;
2743 } 2784 }
2744 2785
2745 if (ct.nitems == 0) 2786 if (ct.nitems == 0)
… …
2754 ct.nitems = incr_buf_fill; 2795 ct.nitems = incr_buf_fill;
2755 incr_buf = 0; 2796 incr_buf = 0;
2756 incr_buf_size = 0; 2797 incr_buf_size = 0;
2757 incr_ev.stop (); 2798 incr_ev.stop ();
2758 } 2799 }
2759 else 2800 else
2760 { 2801 {
2761 if (selection_wait == Sel_normal 2802 if (selection_wait == Sel_normal
2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2803 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2763 { 2804 {
2764 /* 2805 /*
… …
2771 goto bailout; 2812 goto bailout;
2772 } 2813 }
2773 } 2814 }
2774 else if (selection_wait == Sel_incr) 2815 else if (selection_wait == Sel_incr)
2775 { 2816 {
2776 incr_ev.start (NOW + 10); 2817 incr_ev.start (10);
2777 2818
2778 while (incr_buf_fill + ct.nitems > incr_buf_size) 2819 while (incr_buf_fill + ct.nitems > incr_buf_size)
2779 { 2820 {
2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2821 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2822 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2821 if (selection_wait == Sel_normal) 2862 if (selection_wait == Sel_normal)
2822 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2823} 2864}
2824 2865
2825void 2866void
2826rxvt_term::incr_cb (time_watcher &w) NOTHROW 2867rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2827{ 2868{
2828 selection_wait = Sel_none; 2869 selection_wait = Sel_none;
2829 2870
2830 incr_buf_size = 0; 2871 incr_buf_size = 0;
2831 free (incr_buf); 2872 free (incr_buf);
… …
2842 selection_paste (win, prop, true); 2883 selection_paste (win, prop, true);
2843} 2884}
2844 2885
2845/* ------------------------------------------------------------------------- */ 2886/* ------------------------------------------------------------------------- */
2846/* 2887/*
2847 * Request the current selection: 2888 * Request the current selection:
2848 * Order: > internal selection if available 2889 * Order: > internal selection if available
2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2890 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2850 * > CUT_BUFFER0 2891 * > CUT_BUFFER0
2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2892 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2852 * will auto fallback to CUT_BUFFER0 2893 * will auto fallback to CUT_BUFFER0
… …
2854 */ 2895 */
2855void 2896void
2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2897rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2857{ 2898{
2858 if (selection.text && selnum == Sel_Primary) 2899 if (selection.text && selnum == Sel_Primary)
2900 {
2859 { /* internal selection */ 2901 /* internal selection */
2860 char *str = rxvt_wcstombs (selection.text, selection.len); 2902 char *str = rxvt_wcstombs (selection.text, selection.len);
2861 paste (str, strlen (str)); 2903 paste (str, strlen (str));
2862 free (str); 2904 free (str);
2863 return; 2905 return;
2864 } 2906 }
… …
2868 selection_wait = Sel_normal; 2910 selection_wait = Sel_normal;
2869 2911
2870#if X_HAVE_UTF8_STRING 2912#if X_HAVE_UTF8_STRING
2871 selection_type = Sel_UTF8String; 2913 selection_type = Sel_UTF8String;
2872 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2873 return; 2915 return;
2874#else 2916#else
2875 selection_type = Sel_CompoundText; 2917 selection_type = Sel_CompoundText;
2876 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2877 return; 2919 return;
2878#endif 2920#endif
2879 } 2921 }
2880 2922
2881 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2882 selection_paste (display->root, XA_CUT_BUFFER0, false); 2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2910/* 2952/*
2911 * Clear all selected text 2953 * Clear all selected text
2912 * EXT: SelectionClear 2954 * EXT: SelectionClear
2913 */ 2955 */
2914void 2956void
2915rxvt_term::selection_clear () NOTHROW 2957rxvt_term::selection_clear (bool clipboard) NOTHROW
2916{ 2958{
2959 if (!clipboard)
2960 {
2917 want_refresh = 1; 2961 want_refresh = 1;
2918 free (selection.text); 2962 free (selection.text);
2919 selection.text = NULL; 2963 selection.text = NULL;
2920 selection.len = 0; 2964 selection.len = 0;
2921 CLEAR_SELECTION (); 2965 CLEAR_SELECTION ();
2922 2966
2923 if (display->selection_owner == this) 2967 if (display->selection_owner == this)
2924 display->selection_owner = 0; 2968 display->selection_owner = 0;
2969 }
2970 else
2971 {
2972 free (selection.clip_text);
2973 selection.clip_text = NULL;
2974 selection.clip_len = 0;
2975
2976 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0;
2978 }
2979}
2980
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2925} 2993}
2926 2994
2927/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2928/* 2996/*
2929 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3055 3123
3056 selection_grab (tm); 3124 selection_grab (tm);
3057} 3125}
3058 3126
3059bool 3127bool
3060rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3061{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3062 selection_time = tm; 3134 selection_time = tm;
3135 sel = XA_PRIMARY;
3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3063 3142
3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3066 { 3145 {
3067 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3068 return true; 3147 return true;
3069 } 3148 }
3070 else 3149 else
3071 { 3150 {
3072 selection_clear (); 3151 selection_clear (clipboard);
3073 return false; 3152 return false;
3074 } 3153 }
3075 3154
3076#if 0 3155#if 0
3077 XTextProperty ct; 3156 XTextProperty ct;
… …
3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3209 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3131 3210
3132 while (selection.mark.col > 0 3211 while (selection.mark.col > 0
3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3212 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3134 --selection.mark.col; 3213 --selection.mark.col;
3135 3214
3136 if (selection.op) 3215 if (selection.op)
3216 {
3137 { /* clear the old selection */ 3217 /* clear the old selection */
3138 selection.beg.row = selection.end.row = selection.mark.row; 3218 selection.beg.row = selection.end.row = selection.mark.row;
3139 selection.beg.col = selection.end.col = selection.mark.col; 3219 selection.beg.col = selection.end.col = selection.mark.col;
3140 } 3220 }
3141 3221
3142 selection.op = SELECTION_INIT; 3222 selection.op = SELECTION_INIT;
… …
3331 * a point/word/line which is either the start or end of the selection 3411 * a point/word/line which is either the start or end of the selection
3332 * and it was decided by whichever point/word/line was `fixed' at the 3412 * and it was decided by whichever point/word/line was `fixed' at the
3333 * time of the most recent button3 press 3413 * time of the most recent button3 press
3334 */ 3414 */
3335 if (button3 && buttonpress) 3415 if (button3 && buttonpress)
3416 {
3336 { /* button3 press */ 3417 /* button3 press */
3337 /* 3418 /*
3338 * first determine which edge of the selection we are closest to 3419 * first determine which edge of the selection we are closest to
3339 */ 3420 */
3340 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3421 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3341 || (!ROWCOL_IS_AFTER (pos, selection.end) 3422 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3359 selection.mark.row = selection.beg.row; 3440 selection.mark.row = selection.beg.row;
3360 selection.mark.col = selection.beg.col; 3441 selection.mark.col = selection.beg.col;
3361 } 3442 }
3362 } 3443 }
3363 else 3444 else
3445 {
3364 { /* button1 drag or button3 drag */ 3446 /* button1 drag or button3 drag */
3365 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3447 if (ROWCOL_IS_AFTER (selection.mark, pos))
3366 { 3448 {
3367 if (selection.mark.row == selection.end.row 3449 if (selection.mark.row == selection.end.row
3368 && selection.mark.col == selection.end.col 3450 && selection.mark.col == selection.end.col
3369 && clickchange 3451 && clickchange
… …
3450 selection.end.row++; 3532 selection.end.row++;
3451 } 3533 }
3452 } 3534 }
3453 3535
3454 if (button3 && buttonpress) 3536 if (button3 && buttonpress)
3537 {
3455 { /* mark may need to be changed */ 3538 /* mark may need to be changed */
3456 if (closeto == LEFT) 3539 if (closeto == LEFT)
3457 { 3540 {
3458 selection.mark.row = selection.end.row; 3541 selection.mark.row = selection.end.row;
3459 selection.mark.col = selection.end.col - (selection.clicks == 2); 3542 selection.mark.col = selection.end.col - (selection.clicks == 2);
3460 } 3543 }
… …
3568 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3569 { 3652 {
3570 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3571 } 3654 }
3572#endif 3655#endif
3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3574 { 3657 {
3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3576 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3577 ev.property = rq.property; 3666 ev.property = rq.property;
3578 } 3667 }
3579 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3580 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3581 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3614 { 3703 {
3615 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3616 style = enc_compound_text; 3705 style = enc_compound_text;
3617 } 3706 }
3618 3707
3619 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3620 { 3709 {
3621 cl = selection.text; 3710 cl = selection.text;
3622 selectlen = selection.len; 3711 selectlen = selection.len;
3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3623 } 3717 }
3624 else 3718 else
3625 { 3719 {
3626 cl = L""; 3720 cl = L"";
3627 selectlen = 0; 3721 selectlen = 0;
… …
3659 XFree (ct.value); 3753 XFree (ct.value);
3660 } 3754 }
3661 3755
3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3663} 3757}
3664
3665/* ------------------------------------------------------------------------- *
3666 * MOUSE ROUTINES *
3667 * ------------------------------------------------------------------------- */
3668
3669/*
3670 * return col/row values corresponding to x/y pixel values
3671 */
3672void
3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3674{
3675 *x = Pixel2Col (*x);
3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3677 *y = Pixel2Row (*y);
3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3679}
3680 3758
3681/* ------------------------------------------------------------------------- */ 3759/* ------------------------------------------------------------------------- */
3682#ifdef USE_XIM 3760#ifdef USE_XIM
3683void 3761void
3684rxvt_term::im_set_position (XPoint &pos) NOTHROW 3762rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3711 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3712 3790
3713 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3714 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3715 3793
3716 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3717 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3718 3796
3719 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3720 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3721 3799
3722 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3723 { 3801 {
3724 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3725 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3726 3804
3727 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3728 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3729 3807
3730 if (y == 0) 3808 if (y == 0)
… …
3749} 3827}
3750 3828
3751void 3829void
3752rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3753{ 3831{
3754 if (!ov_text) 3832 if (!ov.text)
3755 return; 3833 return;
3756 3834
3757 want_refresh = 1; 3835 want_refresh = 1;
3758 3836
3759 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3760 { 3838 {
3761 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3762 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3763 } 3841 }
3764 3842
3765 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3766 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3767} 3845}
3768 3846
3769void 3847void
3770rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3771{ 3849{
3772 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3773 return; 3851 return;
3774 3852
3775 x++, y++; 3853 x++, y++;
3776 3854
3777 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3778 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3779} 3857}
3780 3858
3781void 3859void
3782rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3783{ 3861{
… …
3802} 3880}
3803 3881
3804void 3882void
3805rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3806{ 3884{
3807 if (!ov_text) 3885 if (!ov.text)
3808 return; 3886 return;
3809 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3810 // swap screen mem with overlay 3893 // swap screen mem with overlay
3811 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3812 { 3895 {
3813 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3814 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3815 3898
3816 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3817 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3818 3901
3819 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3820 { 3903 {
3821 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3822 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3823 } 3906 }
3824 } 3907 }

Diff Legend

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