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.273 by ayin, Mon Aug 13 07:18:58 2007 UTC vs.
Revision 1.337 by root, Thu Apr 1 00:58:38 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_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/* ------------------------------------------------------------------------- */
… …
1648 rvideo_state = on; 1681 rvideo_state = on;
1649 1682
1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1651#ifdef HAVE_BG_PIXMAP 1684#ifdef HAVE_BG_PIXMAP
1652 if (bgPixmap.pixmap == None) 1685 if (bgPixmap.pixmap == None)
1653#endif
1654#if ENABLE_TRANSPARENCY
1655 if (!option (Opt_transparent) || am_transparent == 0)
1656#endif 1686#endif
1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1658 1688
1659 XGCValues gcvalue; 1689 XGCValues gcvalue;
1660 gcvalue.foreground = pix_colors[Color_fg]; 1690 gcvalue.foreground = pix_colors[Color_fg];
… …
1869 return true; 1899 return true;
1870} 1900}
1871 1901
1872#ifndef NO_BELL 1902#ifndef NO_BELL
1873void 1903void
1874rxvt_term::bell_cb (time_watcher &w) 1904rxvt_term::bell_cb (ev::timer &w, int revents)
1875{ 1905{
1876 rvideo_bell = false; 1906 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1908 refresh_check ();
1878} 1909}
1879#endif 1910#endif
1880 1911
1881/* ------------------------------------------------------------------------- */ 1912/* ------------------------------------------------------------------------- */
1882void 1913void
… …
1888# ifdef MAPALERT_OPTION 1919# ifdef MAPALERT_OPTION
1889 if (option (Opt_mapAlert)) 1920 if (option (Opt_mapAlert))
1890# endif 1921# endif
1891 XMapWindow (dpy, parent[0]); 1922 XMapWindow (dpy, parent[0]);
1892# endif 1923# endif
1924
1893# if ENABLE_FRILLS 1925# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell)) 1926 if (option (Opt_urgentOnBell))
1895 { 1927 set_urgency (1);
1896 XWMHints *h;
1897
1898 h = XGetWMHints(dpy, parent[0]);
1899 if (h != NULL)
1900 {
1901 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h);
1903 }
1904 }
1905# endif 1928# endif
1906 1929
1907 if (option (Opt_visualBell)) 1930 if (option (Opt_visualBell))
1908 { 1931 {
1909 rvideo_bell = true; 1932 rvideo_bell = true;
1910 scr_rvideo_mode (rvideo_mode); 1933 scr_rvideo_mode (rvideo_mode);
1911 display->flush (); 1934 flush ();
1912 1935
1913 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1937 }
1915 else 1938 else
1916 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1917#endif 1941#endif
1918} 1942}
1919 1943
1920/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1921/* ARGSUSED */ 1945/* ARGSUSED */
1922void 1946void
1923rxvt_term::scr_printscreen (int fullhist) NOTHROW 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1924{ 1948{
1925#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1926 int nrows, row_start; 1950 int nrows, row_start;
1927 FILE *fd; 1951 FILE *fd = popen_printer ();
1928 1952
1929 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1930 return; 1954 return;
1931 1955
1932 if (fullhist) 1956 if (fullhist)
1933 { 1957 {
1934 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1940 row_start = view_start; 1964 row_start = view_start;
1941 } 1965 }
1942 1966
1943 wctomb (0, 0); 1967 wctomb (0, 0);
1944 1968
1945 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1946 { 1970 {
1947 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1948 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1949 1973
1950 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
… …
1979 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1980 */ 2004 */
1981void 2005void
1982rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1983{ 2007{
1984 unsigned char have_bg,
1985 showcursor; /* show the cursor */
1986 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1987 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1988 int i; /* tmp */ 2010 int i; /* tmp */
1989#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1990 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
1999 return; 2021 return;
2000 2022
2001 /* 2023 /*
2002 * A: set up vars 2024 * A: set up vars
2003 */ 2025 */
2004 have_bg = 0;
2005 refresh_count = 0; 2026 refresh_count = 0;
2006 2027
2028 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0;
2007#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2008 have_bg |= bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2009#endif
2010#if ENABLE_TRANSPARENCY
2011 have_bg |= option (Opt_transparent) && am_transparent;
2012#endif 2032#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2034
2015 /* 2035 /*
2016 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2017 */ 2037 */
2018 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;
2019 2046
2020 /* 2047 /*
2021 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2022 */ 2049 */
2023 { 2050 {
2024 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2025 2052
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2054 if (hidden_cursor)
2029 showcursor = 0; 2055 showcursor = 0;
2030#endif 2056#endif
2031 2057
… …
2059 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2060#else 2086#else
2061 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2062#endif 2088#endif
2063 2089
2064 if (showcursor && focus) 2090 if (focus)
2065 { 2091 {
2066 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2068 else 2094 else
2069 { 2095 {
… …
2104 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2105 } 2131 }
2106 } 2132 }
2107 } 2133 }
2108 2134
2109 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110#if ENABLE_OVERLAY
2111 scr_swap_overlay ();
2112#endif
2113
2114#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2136 /*
2116 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2118 */ 2139 */
… …
2207 continue; 2228 continue;
2208 2229
2209 // redraw one or more characters 2230 // redraw one or more characters
2210 2231
2211 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2212 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2213 --col; 2234 --col;
2214 2235
2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2216 text_t *text = stp + col; 2237 text_t *text = stp + col;
2217 int count = 1; 2238 int count = 1;
… …
2224 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2225 { 2246 {
2226 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2227 { 2248 {
2228 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2229 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2230 count++; 2252 count++;
2231 i++; 2253 i++;
2232 2254
2233 continue; 2255 continue;
2234 } 2256 }
… …
2254 2276
2255 col--; /* went one too far. move back */ 2277 col--; /* went one too far. move back */
2256 count -= i; /* dump any matching trailing chars */ 2278 count -= i; /* dump any matching trailing chars */
2257 2279
2258 // sometimes we optimize away the trailing NOCHAR's, add them back 2280 // sometimes we optimize away the trailing NOCHAR's, add them back
2259 while (i && text[count] == NOCHAR) 2281 while (expect_false (i && text[count] == NOCHAR))
2260 count++, i--; 2282 count++, i--;
2261 2283
2262 /* 2284 /*
2263 * Determine the attributes for the string 2285 * Determine the attributes for the string
2264 */ 2286 */
2265 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2266 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2267 2289
2268 // 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
2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2270 { 2292 {
2271 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2272 2294
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold
2275 && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
2276 { 2297 {
2277 if (ISSET_PIXCOLOR (Color_BD)) 2298 if (ISSET_PIXCOLOR (Color_BD))
2278 fore = Color_BD; 2299 fore = Color_BD;
2279# if !ENABLE_STYLES 2300# if !ENABLE_STYLES
2280 else 2301 else
2281 invert = !invert; 2302 invert = !invert;
2282# endif 2303# endif
2283 } 2304 }
2284 2305
2285 if (rend & RS_Italic 2306 if (rend & RS_Italic && fore == Color_fg)
2286 && fore == Color_fg)
2287 { 2307 {
2288 if (ISSET_PIXCOLOR (Color_IT)) 2308 if (ISSET_PIXCOLOR (Color_IT))
2289 fore = Color_IT; 2309 fore = Color_IT;
2290# if !ENABLE_STYLES 2310# if !ENABLE_STYLES
2291 else 2311 else
… …
2325 } 2345 }
2326 2346
2327#ifdef TEXT_BLINK 2347#ifdef TEXT_BLINK
2328 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2348 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2329 { 2349 {
2330 if (!text_blink_ev.active) 2350 if (!text_blink_ev.is_active ())
2331 { 2351 {
2332 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2352 text_blink_ev.again ();
2333 hidden_text = 0; 2353 hidden_text = 0;
2334 } 2354 }
2335 else if (hidden_text) 2355 else if (hidden_text)
2336 fore = back; 2356 fore = back;
2337 } 2357 }
… …
2359 /* 2379 /*
2360 * Actually do the drawing of the string here 2380 * Actually do the drawing of the string here
2361 */ 2381 */
2362 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2363 2383
2364 if (have_bg && back == Color_bg) 2384 if (expect_true (have_bg && back == Color_bg))
2365 { 2385 {
2366 // this is very ugly, maybe push it into ->draw? 2386 // this is very ugly, maybe push it into ->draw?
2367 2387
2368 for (i = 0; i < count; i++) /* don't draw empty strings */ 2388 for (i = 0; i < count; i++) /* don't draw empty strings */
2369 if (text[i] != ' ') 2389 if (text[i] != ' ')
… …
2376 did_clear: ; 2396 did_clear: ;
2377 } 2397 }
2378 else 2398 else
2379 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2380 2400
2381 if (rend & RS_Uline && font->descent > 1 && fore != back) 2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2382 { 2402 {
2383#if ENABLE_FRILLS 2403#if ENABLE_FRILLS
2384 if (ISSET_PIXCOLOR (Color_underline)) 2404 if (ISSET_PIXCOLOR (Color_underline))
2385 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2405 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2386 else 2406 else
2387#endif 2407#endif
2388 XSetForeground (dpy, gc, pix_colors[fore]); 2408 XSetForeground (dpy, gc, pix_colors[fore]);
2389 2409
2390 XDrawLine (dpy, drawBuffer, gc, 2410 XDrawLine (dpy, vt, gc,
2391 xpixel, ypixel + font->ascent + 1, 2411 xpixel, ypixel + font->ascent + 1,
2392 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2412 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2393 } 2413 }
2394 } /* for (col....) */ 2414 } /* for (col....) */
2395 } /* for (row....) */ 2415 } /* for (row....) */
2396
2397#if ENABLE_OVERLAY
2398 scr_swap_overlay ();
2399#endif
2400 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2401 2416
2402 /* 2417 /*
2403 * G: cleanup cursor and display outline cursor if necessary 2418 * G: cleanup cursor and display outline cursor if necessary
2404 */ 2419 */
2405 if (showcursor) 2420 if (showcursor)
… …
2433 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2448 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434 else 2449 else
2435#endif 2450#endif
2436 XSetForeground (dpy, gc, pix_colors[ccol1]); 2451 XSetForeground (dpy, gc, pix_colors[ccol1]);
2437 2452
2438 XDrawRectangle (dpy, drawBuffer, gc, 2453 XDrawRectangle (dpy, vt, gc,
2439 Col2Pixel (col), 2454 Col2Pixel (col),
2440 Row2Pixel (oldcursor.row), 2455 Row2Pixel (oldcursor.row),
2441 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2456 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2442 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2457 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2443 } 2458 }
2444 } 2459 }
2445 2460
2446 /* 2461 /*
2447 * H: cleanup selection 2462 * H: cleanup selection
2448 */ 2463 */
2464#if ENABLE_OVERLAY
2465 scr_swap_overlay ();
2466#endif
2467 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2468
2449 scr_reverse_selection (); 2469 scr_reverse_selection ();
2450 2470
2471 screen.flags = old_screen_flags;
2451 num_scr = 0; 2472 num_scr = 0;
2452 num_scr_allow = 1; 2473 num_scr_allow = 1;
2453} 2474}
2454 2475
2455void 2476void
… …
2478} 2499}
2479 2500
2480void 2501void
2481rxvt_term::scr_recolour () NOTHROW 2502rxvt_term::scr_recolour () NOTHROW
2482{ 2503{
2483 if (1
2484#if ENABLE_TRANSPARENCY
2485 && !am_transparent
2486#endif
2487#ifdef HAVE_BG_PIXMAP 2504#ifdef HAVE_BG_PIXMAP
2488 && !bgPixmap.pixmap 2505 bgPixmap.apply ();
2489#endif 2506#else
2490 ) 2507
2491 {
2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2493 XClearWindow (dpy, parent[0]); 2509 XClearWindow (dpy, parent[0]);
2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2495#if HAVE_SCROLLBARS 2511
2496 if (scrollBar.win) 2512 if (scrollBar.win)
2497 { 2513 {
2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2499 scrollBar.setIdle (); 2515 scrollBar.state = STATE_IDLE;
2500 scrollbar_show (0); 2516 scrollBar.show (0);
2501 }
2502#endif
2503 } 2517 }
2504 2518
2519#endif
2520
2521 /* bgPixmap.apply () does not do the following : */
2505 scr_clear (); 2522 scr_clear ();
2506 scr_touch (true); 2523 scr_touch (true);
2507 want_refresh = 1; 2524 want_refresh = 1;
2508} 2525}
2509 2526
… …
2601{ 2618{
2602 int row, wrote; 2619 int row, wrote;
2603 unsigned int width, towrite; 2620 unsigned int width, towrite;
2604 char r1[] = "\n"; 2621 char r1[] = "\n";
2605 2622
2606 for (row = saveLines - nsaved; 2623 for (row = saveLines + top_row;
2607 row < saveLines + nrow - 1; row++) 2624 row < saveLines + nrow - 1; row++)
2608 { 2625 {
2609 width = row_buf[row].l >= 0 ? row_buf[row].l 2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2610 : ncol; 2627 : ncol;
2611 for (towrite = width; towrite; towrite -= wrote) 2628 for (towrite = width; towrite; towrite -= wrote)
… …
2662 /* convert normal newline chars into common keyboard Return key sequence */ 2679 /* convert normal newline chars into common keyboard Return key sequence */
2663 for (unsigned int i = 0; i < len; i++) 2680 for (unsigned int i = 0; i < len; i++)
2664 if (data[i] == C0_LF) 2681 if (data[i] == C0_LF)
2665 data[i] = C0_CR; 2682 data[i] = C0_CR;
2666 2683
2684 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~");
2686
2667 tt_write (data, len); 2687 tt_write (data, len);
2688
2689 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~");
2668} 2691}
2669 2692
2670/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2671/* 2694/*
2672 * Respond to a notification that a primary selection has been sent 2695 * Respond to a notification that a primary selection has been sent
… …
2747 if (!delete_prop) 2770 if (!delete_prop)
2748 XDeleteProperty (dpy, win, prop); 2771 XDeleteProperty (dpy, win, prop);
2749 2772
2750 selection_wait = Sel_incr; 2773 selection_wait = Sel_incr;
2751 incr_buf_fill = 0; 2774 incr_buf_fill = 0;
2752 incr_ev.start (NOW + 10); 2775 incr_ev.start (10);
2753 2776
2754 goto bailout; 2777 goto bailout;
2755 } 2778 }
2756 2779
2757 if (ct.nitems == 0) 2780 if (ct.nitems == 0)
… …
2766 ct.nitems = incr_buf_fill; 2789 ct.nitems = incr_buf_fill;
2767 incr_buf = 0; 2790 incr_buf = 0;
2768 incr_buf_size = 0; 2791 incr_buf_size = 0;
2769 incr_ev.stop (); 2792 incr_ev.stop ();
2770 } 2793 }
2771 else 2794 else
2772 { 2795 {
2773 if (selection_wait == Sel_normal 2796 if (selection_wait == Sel_normal
2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775 { 2798 {
2776 /* 2799 /*
… …
2783 goto bailout; 2806 goto bailout;
2784 } 2807 }
2785 } 2808 }
2786 else if (selection_wait == Sel_incr) 2809 else if (selection_wait == Sel_incr)
2787 { 2810 {
2788 incr_ev.start (NOW + 10); 2811 incr_ev.start (10);
2789 2812
2790 while (incr_buf_fill + ct.nitems > incr_buf_size) 2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2791 { 2814 {
2792 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2833 if (selection_wait == Sel_normal) 2856 if (selection_wait == Sel_normal)
2834 selection_wait = Sel_none; 2857 selection_wait = Sel_none;
2835} 2858}
2836 2859
2837void 2860void
2838rxvt_term::incr_cb (time_watcher &w) NOTHROW 2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839{ 2862{
2840 selection_wait = Sel_none; 2863 selection_wait = Sel_none;
2841 2864
2842 incr_buf_size = 0; 2865 incr_buf_size = 0;
2843 free (incr_buf); 2866 free (incr_buf);
… …
2854 selection_paste (win, prop, true); 2877 selection_paste (win, prop, true);
2855} 2878}
2856 2879
2857/* ------------------------------------------------------------------------- */ 2880/* ------------------------------------------------------------------------- */
2858/* 2881/*
2859 * Request the current selection: 2882 * Request the current selection:
2860 * Order: > internal selection if available 2883 * Order: > internal selection if available
2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2862 * > CUT_BUFFER0 2885 * > CUT_BUFFER0
2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864 * will auto fallback to CUT_BUFFER0 2887 * will auto fallback to CUT_BUFFER0
… …
2866 */ 2889 */
2867void 2890void
2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869{ 2892{
2870 if (selection.text && selnum == Sel_Primary) 2893 if (selection.text && selnum == Sel_Primary)
2894 {
2871 { /* internal selection */ 2895 /* internal selection */
2872 char *str = rxvt_wcstombs (selection.text, selection.len); 2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2873 paste (str, strlen (str)); 2897 paste (str, strlen (str));
2874 free (str); 2898 free (str);
2875 return; 2899 return;
2876 } 2900 }
… …
2922/* 2946/*
2923 * Clear all selected text 2947 * Clear all selected text
2924 * EXT: SelectionClear 2948 * EXT: SelectionClear
2925 */ 2949 */
2926void 2950void
2927rxvt_term::selection_clear () NOTHROW 2951rxvt_term::selection_clear (bool clipboard) NOTHROW
2928{ 2952{
2953 if (!clipboard)
2954 {
2929 want_refresh = 1; 2955 want_refresh = 1;
2930 free (selection.text); 2956 free (selection.text);
2931 selection.text = NULL; 2957 selection.text = NULL;
2932 selection.len = 0; 2958 selection.len = 0;
2933 CLEAR_SELECTION (); 2959 CLEAR_SELECTION ();
2934 2960
2935 if (display->selection_owner == this) 2961 if (display->selection_owner == this)
2936 display->selection_owner = 0; 2962 display->selection_owner = 0;
2963 }
2964 else
2965 {
2966 free (selection.clip_text);
2967 selection.clip_text = NULL;
2968 selection.clip_len = 0;
2969
2970 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0;
2972 }
2973}
2974
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2937} 2987}
2938 2988
2939/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
2940/* 2990/*
2941 * Copy a selection into the cut buffer 2991 * Copy a selection into the cut buffer
… …
3067 3117
3068 selection_grab (tm); 3118 selection_grab (tm);
3069} 3119}
3070 3120
3071bool 3121bool
3072rxvt_term::selection_grab (Time tm) NOTHROW 3122rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3073{ 3123{
3124 Atom sel;
3125
3126 if (!clipboard)
3127 {
3074 selection_time = tm; 3128 selection_time = tm;
3129 sel = XA_PRIMARY;
3130 }
3131 else
3132 {
3133 clipboard_time = tm;
3134 sel = xa[XA_CLIPBOARD];
3135 }
3075 3136
3076 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3137 XSetSelectionOwner (dpy, sel, vt, tm);
3077 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3138 if (XGetSelectionOwner (dpy, sel) == vt)
3078 { 3139 {
3079 display->set_selection_owner (this); 3140 display->set_selection_owner (this, clipboard);
3080 return true; 3141 return true;
3081 } 3142 }
3082 else 3143 else
3083 { 3144 {
3084 selection_clear (); 3145 selection_clear (clipboard);
3085 return false; 3146 return false;
3086 } 3147 }
3087 3148
3088#if 0 3149#if 0
3089 XTextProperty ct; 3150 XTextProperty ct;
… …
3142 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3203 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3143 3204
3144 while (selection.mark.col > 0 3205 while (selection.mark.col > 0
3145 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3206 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3146 --selection.mark.col; 3207 --selection.mark.col;
3147 3208
3148 if (selection.op) 3209 if (selection.op)
3210 {
3149 { /* clear the old selection */ 3211 /* clear the old selection */
3150 selection.beg.row = selection.end.row = selection.mark.row; 3212 selection.beg.row = selection.end.row = selection.mark.row;
3151 selection.beg.col = selection.end.col = selection.mark.col; 3213 selection.beg.col = selection.end.col = selection.mark.col;
3152 } 3214 }
3153 3215
3154 selection.op = SELECTION_INIT; 3216 selection.op = SELECTION_INIT;
… …
3343 * a point/word/line which is either the start or end of the selection 3405 * a point/word/line which is either the start or end of the selection
3344 * and it was decided by whichever point/word/line was `fixed' at the 3406 * and it was decided by whichever point/word/line was `fixed' at the
3345 * time of the most recent button3 press 3407 * time of the most recent button3 press
3346 */ 3408 */
3347 if (button3 && buttonpress) 3409 if (button3 && buttonpress)
3410 {
3348 { /* button3 press */ 3411 /* button3 press */
3349 /* 3412 /*
3350 * first determine which edge of the selection we are closest to 3413 * first determine which edge of the selection we are closest to
3351 */ 3414 */
3352 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3415 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3353 || (!ROWCOL_IS_AFTER (pos, selection.end) 3416 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3371 selection.mark.row = selection.beg.row; 3434 selection.mark.row = selection.beg.row;
3372 selection.mark.col = selection.beg.col; 3435 selection.mark.col = selection.beg.col;
3373 } 3436 }
3374 } 3437 }
3375 else 3438 else
3439 {
3376 { /* button1 drag or button3 drag */ 3440 /* button1 drag or button3 drag */
3377 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3441 if (ROWCOL_IS_AFTER (selection.mark, pos))
3378 { 3442 {
3379 if (selection.mark.row == selection.end.row 3443 if (selection.mark.row == selection.end.row
3380 && selection.mark.col == selection.end.col 3444 && selection.mark.col == selection.end.col
3381 && clickchange 3445 && clickchange
… …
3462 selection.end.row++; 3526 selection.end.row++;
3463 } 3527 }
3464 } 3528 }
3465 3529
3466 if (button3 && buttonpress) 3530 if (button3 && buttonpress)
3531 {
3467 { /* mark may need to be changed */ 3532 /* mark may need to be changed */
3468 if (closeto == LEFT) 3533 if (closeto == LEFT)
3469 { 3534 {
3470 selection.mark.row = selection.end.row; 3535 selection.mark.row = selection.end.row;
3471 selection.mark.col = selection.end.col - (selection.clicks == 2); 3536 selection.mark.col = selection.end.col - (selection.clicks == 2);
3472 } 3537 }
… …
3580 else if (rq.target == xa[XA_MULTIPLE]) 3645 else if (rq.target == xa[XA_MULTIPLE])
3581 { 3646 {
3582 /* TODO: Handle MULTIPLE */ 3647 /* TODO: Handle MULTIPLE */
3583 } 3648 }
3584#endif 3649#endif
3585 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3586 { 3651 {
3587 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3588 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3653 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property;
3655 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3589 ev.property = rq.property; 3660 ev.property = rq.property;
3590 } 3661 }
3591 else if (rq.target == XA_STRING 3662 else if (rq.target == XA_STRING
3592 || rq.target == xa[XA_TEXT] 3663 || rq.target == xa[XA_TEXT]
3593 || rq.target == xa[XA_COMPOUND_TEXT] 3664 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3626 { 3697 {
3627 target = xa[XA_COMPOUND_TEXT]; 3698 target = xa[XA_COMPOUND_TEXT];
3628 style = enc_compound_text; 3699 style = enc_compound_text;
3629 } 3700 }
3630 3701
3631 if (selection.text) 3702 if (rq.selection == XA_PRIMARY && selection.text)
3632 { 3703 {
3633 cl = selection.text; 3704 cl = selection.text;
3634 selectlen = selection.len; 3705 selectlen = selection.len;
3706 }
3707 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3708 {
3709 cl = selection.clip_text;
3710 selectlen = selection.clip_len;
3635 } 3711 }
3636 else 3712 else
3637 { 3713 {
3638 cl = L""; 3714 cl = L"";
3639 selectlen = 0; 3715 selectlen = 0;
… …
3671 XFree (ct.value); 3747 XFree (ct.value);
3672 } 3748 }
3673 3749
3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3675} 3751}
3676
3677/* ------------------------------------------------------------------------- *
3678 * MOUSE ROUTINES *
3679 * ------------------------------------------------------------------------- */
3680
3681/*
3682 * return col/row values corresponding to x/y pixel values
3683 */
3684void
3685rxvt_term::pixel_position (int *x, int *y) NOTHROW
3686{
3687 *x = Pixel2Col (*x);
3688 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3689 *y = Pixel2Row (*y);
3690 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3691}
3692 3752
3693/* ------------------------------------------------------------------------- */ 3753/* ------------------------------------------------------------------------- */
3694#ifdef USE_XIM 3754#ifdef USE_XIM
3695void 3755void
3696rxvt_term::im_set_position (XPoint &pos) NOTHROW 3756rxvt_term::im_set_position (XPoint &pos) NOTHROW
… …
3723 h += 2; min_it (h, nrow); 3783 h += 2; min_it (h, nrow);
3724 3784
3725 x -= 1; clamp_it (x, 0, ncol - w); 3785 x -= 1; clamp_it (x, 0, ncol - w);
3726 y -= 1; clamp_it (y, 0, nrow - h); 3786 y -= 1; clamp_it (y, 0, nrow - h);
3727 3787
3728 ov_x = x; ov_y = y; 3788 ov.x = x; ov.y = y;
3729 ov_w = w; ov_h = h; 3789 ov.w = w; ov.h = h;
3730 3790
3731 ov_text = new text_t *[h]; 3791 ov.text = new text_t *[h];
3732 ov_rend = new rend_t *[h]; 3792 ov.rend = new rend_t *[h];
3733 3793
3734 for (y = 0; y < h; y++) 3794 for (y = 0; y < h; y++)
3735 { 3795 {
3736 text_t *tp = ov_text[y] = new text_t[w]; 3796 text_t *tp = ov.text[y] = new text_t[w];
3737 rend_t *rp = ov_rend[y] = new rend_t[w]; 3797 rend_t *rp = ov.rend[y] = new rend_t[w];
3738 3798
3739 text_t t0, t1, t2; 3799 text_t t0, t1, t2;
3740 rend_t r = OVERLAY_RSTYLE; 3800 rend_t r = OVERLAY_RSTYLE;
3741 3801
3742 if (y == 0) 3802 if (y == 0)
… …
3761} 3821}
3762 3822
3763void 3823void
3764rxvt_term::scr_overlay_off () NOTHROW 3824rxvt_term::scr_overlay_off () NOTHROW
3765{ 3825{
3766 if (!ov_text) 3826 if (!ov.text)
3767 return; 3827 return;
3768 3828
3769 want_refresh = 1; 3829 want_refresh = 1;
3770 3830
3771 for (int y = 0; y < ov_h; y++) 3831 for (int y = 0; y < ov.h; y++)
3772 { 3832 {
3773 delete [] ov_text[y]; 3833 delete [] ov.text[y];
3774 delete [] ov_rend[y]; 3834 delete [] ov.rend[y];
3775 } 3835 }
3776 3836
3777 delete [] ov_text; ov_text = 0; 3837 delete [] ov.text; ov.text = 0;
3778 delete [] ov_rend; ov_rend = 0; 3838 delete [] ov.rend; ov.rend = 0;
3779} 3839}
3780 3840
3781void 3841void
3782rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3842rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3783{ 3843{
3784 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3844 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3785 return; 3845 return;
3786 3846
3787 x++, y++; 3847 x++, y++;
3788 3848
3789 ov_text[y][x] = text; 3849 ov.text[y][x] = text;
3790 ov_rend[y][x] = rend; 3850 ov.rend[y][x] = rend;
3791} 3851}
3792 3852
3793void 3853void
3794rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3854rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3795{ 3855{
… …
3814} 3874}
3815 3875
3816void 3876void
3817rxvt_term::scr_swap_overlay () NOTHROW 3877rxvt_term::scr_swap_overlay () NOTHROW
3818{ 3878{
3819 if (!ov_text) 3879 if (!ov.text)
3820 return; 3880 return;
3821 3881
3882 // hide cursor if it is within the overlay area
3883 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3884 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3885 screen.flags &= ~Screen_VisibleCursor;
3886
3822 // swap screen mem with overlay 3887 // swap screen mem with overlay
3823 for (int y = ov_h; y--; ) 3888 for (int y = ov.h; y--; )
3824 { 3889 {
3825 text_t *t1 = ov_text[y]; 3890 text_t *t1 = ov.text[y];
3826 rend_t *r1 = ov_rend[y]; 3891 rend_t *r1 = ov.rend[y];
3827 3892
3828 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3893 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3829 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3894 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3830 3895
3831 for (int x = ov_w; x--; ) 3896 for (int x = ov.w; x--; )
3832 { 3897 {
3833 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3898 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3834 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3899 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3835 } 3900 }
3836 } 3901 }

Diff Legend

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