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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.384 by sf-exg, Mon May 30 18:39:04 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
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.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
162{ 163{
163#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
164 scr_overlay_off (); 165 scr_overlay_off ();
165#endif 166#endif
166 167
167 rvideo_mode = false;
168 view_start = 0; 168 view_start = 0;
169 num_scr = 0; 169 num_scr = 0;
170 170
171 if (ncol == 0) 171 if (ncol == 0)
172 ncol = 80; 172 ncol = 80;
… …
174 if (nrow == 0) 174 if (nrow == 0)
175 nrow = 24; 175 nrow = 24;
176 176
177 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 178 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 179
183 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
185 { 182 {
186 //TODO//FIXME 183 //TODO//FIXME
… …
239 selection.text = NULL; 236 selection.text = NULL;
240 selection.len = 0; 237 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
243 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
244 } 243 }
245 else 244 else
246 { 245 {
247 /* 246 /*
248 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
286 285
287 if (top_row) 286 if (top_row)
288 { 287 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
291 291
292 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 294
295 do 295 do
296 { 296 {
297 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 299 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 301
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 303 {
… …
399 delete old_ta; 397 delete old_ta;
400 delete old_ra; 398 delete old_ra;
401 399
402 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
404 403
405 free (tabs); 404 free (tabs);
406 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 414
421 tt_winch (); 415 tt_winch ();
422 416
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 418}
… …
436 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
437 431
438 free (row_buf); 432 free (row_buf);
439 free (swap_buf); 433 free (swap_buf);
440 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
441 free (tabs); 437 free (tabs);
442 438 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 439 }
445} 440}
446 441
447/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
448/* 443/*
449 * Hard reset 444 * Hard/Soft reset
450 */ 445 */
451void 446void
452rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
453{ 448{
454 scr_release (); 449 scr_release ();
455 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
456 scr_reset (); 453 scr_reset ();
457 454
458 scr_clear (true); 455 scr_clear (true);
459 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
460} 473}
461 474
462/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
502 } 515 }
503 516
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
510#endif
511} 522}
512 523
513void 524void
514rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
515{ 526{
… …
540 want_refresh = 1; 551 want_refresh = 1;
541 view_start = 0; 552 view_start = 0;
542 553
543 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
544 555
545 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
546 557
547#if NSCREENS 558#if NSCREENS
548 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
549 { 560 {
550 num_scr = 0; 561 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
777 } 788 }
778 } 789 }
779 790
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 794 int row = screen.cur.row;
786 795
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 797
789 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
790 799
791 while (str < strend) 800 while (str < strend)
792 { 801 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 803
795 if (expect_false (c < 0x20)) 804 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 805 if (c == C0_LF)
797 { 806 {
798 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
799 808
800 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
819 { 828 {
820 scr_tab (1, true); 829 scr_tab (1, true);
821 continue; 830 continue;
822 } 831 }
823 832
824 if (expect_false ( 833 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 837 ))
829 { 838 {
… …
834 * should be a similar check. 843 * should be a similar check.
835 */ 844 */
836 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
837 } 846 }
838 847
839 if (expect_false (screen.flags & Screen_WrapNext)) 848 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 849 {
841 scr_do_wrap (); 850 scr_do_wrap ();
842 851
843 line->l = ncol; 852 line->l = ncol;
844 line->is_longer (1); 853 line->is_longer (1);
… …
846 row = screen.cur.row; 855 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
848 } 857 }
849 858
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 860 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 861 c = 0xfffd;
853 862
854 // rely on wcwidth to tell us the character width, do wcwidth before 863 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 864 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
857 // locale. 866 // locale.
858 int width = WCWIDTH (c); 867 int width = WCWIDTH (c);
859 868
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 869 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 870 {
862 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 872 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
880 } 889 }
881 } 890 }
882 891
883 if (expect_false (screen.flags & Screen_Insert)) 892 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
885 894
886 if (width != 0) 895 if (width != 0)
887 { 896 {
888#if !UNICODE_3 897#if !UNICODE_3
… …
893# else 902# else
894 c = 0xfffd; 903 c = 0xfffd;
895# endif 904# endif
896#endif 905#endif
897 906
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908
909 // if the character doesn't fit into the remaining columns...
910 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
911 {
912 if (screen.flags & Screen_Autowrap)
913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
916 // and try the same character next loop iteration
917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
921 }
922
898 // nuke the character at this position, if required 923 // nuke the character at this position, if required
899 if (expect_false ( 924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 927 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 928 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 929
917 line->touch (); 930 line->touch ();
918 931
919 do 932 do
920 { 933 {
921 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
923 936
924 if (expect_true (screen.cur.col < ncol - 1)) 937 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 938 screen.cur.col++;
926 else 939 else
927 { 940 {
928 line->l = ncol; 941 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
931 break; 944
945 goto end_of_line;
932 } 946 }
933 947
934 c = NOCHAR; 948 c = NOCHAR;
935 } 949 }
936 while (expect_false (--width > 0)); 950 while (ecb_unlikely (--width > 0));
937 951
938 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 953 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 954 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 955 line->t[c] = ' ';
946 line->r[c] = rend; 956 line->r[c] = rend;
947 }
948 } 957 }
958
959end_of_line:
960 ;
949 } 961 }
950#if ENABLE_COMBINING 962#if ENABLE_COMBINING
951 else // width == 0 963 else // width == 0
952 { 964 {
953 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
993#endif 1005#endif
994 } 1006 }
995 1007
996 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
997 1009
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
1000#endif
1001} 1011}
1002 1012
1003/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1004/* 1014/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1028
1019 want_refresh = 1; 1029 want_refresh = 1;
1020#endif 1030#endif
1021 } 1031 }
1022 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1023 else 1035 else
1024 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1025} 1037}
1026 1038
1027/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1334 return; 1346 return;
1335 1347
1336 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1337 1349
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1353 {
1343 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1344 1355
1345 if (mapped) 1356 if (mapped)
1346 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1349 } 1360 }
1350 else 1361 else
1351 { 1362 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1364
1365 if (mapped)
1366 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1371 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1362 } 1376 }
1363 1377
1364 for (; num--; row++) 1378 for (; num--; row++)
1365 { 1379 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1384 }
1369} 1385}
1370 1386
1371#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1372void 1388void
… …
1525 { 1541 {
1526 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1528 } 1544 }
1529 1545
1530 scr_blank_line (*line, ncol - count, count, 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1547
1533 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1550 {
1536 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1672 { 1687 {
1673 rvideo_state = on; 1688 rvideo_state = on;
1674 1689
1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1676#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1677 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1678#endif 1693#endif
1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1680 1695
1681 XGCValues gcvalue; 1696 XGCValues gcvalue;
1682 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1842 {
1828 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1830 } 1845 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1834 1849
1835 num_scr_allow = 0; 1850 num_scr_allow = 0;
1836 1851
… …
1909 1924
1910# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1911# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1912 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1913# endif 1928# endif
1914 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1915# endif 1930# endif
1916 1931
1917# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1918 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1919 set_urgency (1); 1934 set_urgency (1);
… …
1927 1942
1928 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1944 }
1930 else 1945 else
1931 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1948#endif
1933} 1949}
1934 1950
1935/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */
1937void 1952void
1938rxvt_term::scr_printscreen (int fullhist) NOTHROW 1953rxvt_term::scr_printscreen (int fullhist) NOTHROW
1939{ 1954{
1940#ifdef PRINTPIPE 1955#ifdef PRINTPIPE
1941 int nrows, row_start; 1956 int nrows, row_start;
… …
1955 row_start = view_start; 1970 row_start = view_start;
1956 } 1971 }
1957 1972
1958 wctomb (0, 0); 1973 wctomb (0, 0);
1959 1974
1960 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1976 {
1962 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1964 1979
1965 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1980 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1994 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2010 */
1996void 2011void
1997rxvt_term::scr_refresh () NOTHROW 2012rxvt_term::scr_refresh () NOTHROW
1998{ 2013{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2016 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
… …
2016 /* 2029 /*
2017 * A: set up vars 2030 * A: set up vars
2018 */ 2031 */
2019 refresh_count = 0; 2032 refresh_count = 0;
2020 2033
2034 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2035 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bg_pixmap != None;
2024#endif 2038#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2040
2027 /* 2041 /*
2028 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
2029 */ 2043 */
2030 scr_reverse_selection (); 2044 scr_reverse_selection ();
2045
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY
2048 scr_swap_overlay ();
2049#endif
2050
2051 char showcursor = screen.flags & Screen_VisibleCursor;
2031 2052
2032 /* 2053 /*
2033 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
2034 */ 2055 */
2035 { 2056 {
2036 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
2037 2058
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2060 if (hidden_cursor)
2041 showcursor = 0; 2061 showcursor = 0;
2042#endif 2062#endif
2043 2063
… …
2071 ccol2 = bgcolor_of (rstyle); 2091 ccol2 = bgcolor_of (rstyle);
2072#else 2092#else
2073 ccol2 = Color_bg; 2093 ccol2 = Color_bg;
2074#endif 2094#endif
2075 2095
2076 if (showcursor && focus) 2096 if (focus)
2077 { 2097 {
2078 if (option (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2080 else 2100 else
2081 { 2101 {
… …
2116 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2117 } 2137 }
2118 } 2138 }
2119 } 2139 }
2120 2140
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2141#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2142 /*
2128 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2130 */ 2145 */
… …
2219 continue; 2234 continue;
2220 2235
2221 // redraw one or more characters 2236 // redraw one or more characters
2222 2237
2223 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2239 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2225 --col; 2240 --col;
2226 2241
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2243 text_t *text = stp + col;
2229 int count = 1; 2244 int count = 1;
2230 2245
2231 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2232 drp[col] = rend; 2247 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2237 { 2252 {
2238 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2239 { 2254 {
2240 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2241 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2242 count++; 2258 count++;
2243 i++; 2259 i++;
2244 2260
2245 continue; 2261 continue;
2246 } 2262 }
… …
2266 2282
2267 col--; /* went one too far. move back */ 2283 col--; /* went one too far. move back */
2268 count -= i; /* dump any matching trailing chars */ 2284 count -= i; /* dump any matching trailing chars */
2269 2285
2270 // sometimes we optimize away the trailing NOCHAR's, add them back 2286 // sometimes we optimize away the trailing NOCHAR's, add them back
2271 while (expect_false (i && text[count] == NOCHAR)) 2287 while (ecb_unlikely (i && text[count] == NOCHAR))
2272 count++, i--; 2288 count++, i--;
2273 2289
2274 /* 2290 /*
2275 * Determine the attributes for the string 2291 * Determine the attributes for the string
2276 */ 2292 */
2277 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2279 2295
2280 // only do special processing if any attributes are set, which is unlikely 2296 // only do special processing if any attributes are set, which is unlikely
2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2297 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2282 { 2298 {
2283 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2284 2300
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2321
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2323 fore = Color_UL;
2308#endif 2324#endif
2309 2325
2326#ifdef OPTION_HC
2327 if (rend & RS_Sel)
2328 {
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2332 && ISSET_PIXCOLOR (Color_HC))
2333 {
2334 if (ISSET_PIXCOLOR (Color_HTC))
2335 fore = Color_HTC;
2336 // if invert is 0 reverse video is set so we use bg color as fg color
2337 else if (!invert)
2338 fore = back;
2339
2340 back = Color_HC;
2341 invert = 0;
2342 }
2343 }
2344#endif
2345
2310 if (invert) 2346 if (invert)
2311 { 2347 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2348 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2349
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2351 if (fore == back)
2330 { 2352 {
2331 fore = Color_bg; 2353 fore = Color_bg;
2332 back = Color_fg; 2354 back = Color_fg;
2333 } 2355 }
… …
2369 /* 2391 /*
2370 * Actually do the drawing of the string here 2392 * Actually do the drawing of the string here
2371 */ 2393 */
2372 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2394 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2373 2395
2374 if (expect_true (have_bg && back == Color_bg)) 2396 if (ecb_likely (have_bg && back == Color_bg))
2375 { 2397 {
2376 // this is very ugly, maybe push it into ->draw? 2398 // this is very ugly, maybe push it into ->draw?
2377 2399
2378 for (i = 0; i < count; i++) /* don't draw empty strings */ 2400 for (i = 0; i < count; i++) /* don't draw empty strings */
2379 if (text[i] != ' ') 2401 if (text[i] != ' ')
… …
2386 did_clear: ; 2408 did_clear: ;
2387 } 2409 }
2388 else 2410 else
2389 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2411 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2390 2412
2391 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2413 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2392 { 2414 {
2393#if ENABLE_FRILLS 2415#if ENABLE_FRILLS
2394 if (ISSET_PIXCOLOR (Color_underline)) 2416 if (ISSET_PIXCOLOR (Color_underline))
2395 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2417 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2396 else 2418 else
… …
2401 xpixel, ypixel + font->ascent + 1, 2423 xpixel, ypixel + font->ascent + 1,
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2425 }
2404 } /* for (col....) */ 2426 } /* for (col....) */
2405 } /* for (row....) */ 2427 } /* for (row....) */
2406
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411 2428
2412 /* 2429 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2431 */
2415 if (showcursor) 2432 if (showcursor)
… …
2454 } 2471 }
2455 2472
2456 /* 2473 /*
2457 * H: cleanup selection 2474 * H: cleanup selection
2458 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2459 scr_reverse_selection (); 2481 scr_reverse_selection ();
2460 2482
2483 screen.flags = old_screen_flags;
2461 num_scr = 0; 2484 num_scr = 0;
2462 num_scr_allow = 1; 2485 num_scr_allow = 1;
2463} 2486}
2464 2487
2465void 2488void
… …
2486 scr_remap_chars (swap_buf [i]); 2509 scr_remap_chars (swap_buf [i]);
2487 } 2510 }
2488} 2511}
2489 2512
2490void 2513void
2491rxvt_term::scr_recolour () NOTHROW 2514rxvt_term::scr_recolour (bool refresh) NOTHROW
2492{ 2515{
2516 bool transparent = false;
2517
2493#ifdef HAVE_BG_PIXMAP 2518#ifdef HAVE_BG_PIXMAP
2494 bgPixmap.apply (); 2519 if (bg_pixmap != None)
2495#else 2520 {
2521# ifdef ENABLE_TRANSPARENCY
2522 if (bg_flags & BG_IS_TRANSPARENT)
2523 {
2524 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2525 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2496 2526
2527 transparent = true;
2528 }
2529 else
2530# endif
2531 {
2532 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2533 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2534 }
2535 }
2536 else
2537#endif
2538 {
2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2539 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2498 XClearWindow (dpy, parent[0]);
2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2540 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2541 }
2542
2543 XClearWindow (dpy, parent);
2500 2544
2501 if (scrollBar.win) 2545 if (scrollBar.win)
2502 { 2546 {
2547 if (transparent)
2548 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2549 else
2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2504 scrollBar.state = STATE_IDLE; 2551 scrollBar.state = STATE_IDLE;
2505 scrollBar.show (0); 2552 scrollBar.show (0);
2506 } 2553 }
2507 2554
2508#endif 2555 if (refresh)
2509 2556 {
2510 /* bgPixmap.apply () does not do the following : */
2511 scr_clear (); 2557 scr_clear ();
2512 scr_touch (true); 2558 scr_touch (true);
2559 }
2513 want_refresh = 1; 2560 want_refresh = 1;
2514} 2561}
2515 2562
2516/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2517void 2564void
… …
2585 { 2632 {
2586#if !ENABLE_MINIMAL 2633#if !ENABLE_MINIMAL
2587 if (selection.rect) 2634 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2635 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2636 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2637 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2638 else
2592#endif 2639#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2640 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2641 selection.end.row, selection.end.col,
2595 RS_RVid); 2642 RS_Sel | RS_RVid);
2596 } 2643 }
2597} 2644}
2598 2645
2599/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2600/* 2647/*
… …
2605void 2652void
2606rxvt_term::scr_dump (int fd) NOTHROW 2653rxvt_term::scr_dump (int fd) NOTHROW
2607{ 2654{
2608 int row, wrote; 2655 int row, wrote;
2609 unsigned int width, towrite; 2656 unsigned int width, towrite;
2610 char r1[] = "\n"; 2657 const char r1[] = "\n";
2611 2658
2612 for (row = saveLines + top_row; 2659 for (row = saveLines + top_row;
2613 row < saveLines + nrow - 1; row++) 2660 row < saveLines + nrow - 1; row++)
2614 { 2661 {
2615 width = row_buf[row].l >= 0 ? row_buf[row].l 2662 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2661/* ------------------------------------------------------------------------- */ 2708/* ------------------------------------------------------------------------- */
2662/* 2709/*
2663 * Paste a selection direct to the command fd 2710 * Paste a selection direct to the command fd
2664 */ 2711 */
2665void 2712void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2713rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2714{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2715 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2716 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2717 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2718 data[i] = C0_CR;
… …
2677 2724
2678 if (priv_modes & PrivMode_BracketPaste) 2725 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~"); 2726 tt_printf ("\e[201~");
2680} 2727}
2681 2728
2682/* ------------------------------------------------------------------------- */
2683/*
2684 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify
2686 */
2687void 2729void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2730rxvt_term::paste (char *data, unsigned int len) NOTHROW
2689{ 2731{
2690 if (prop == None) /* check for failed XConvertSelection */ 2732 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2691 {
2692 if ((selection_type & Sel_CompoundText))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = 0;
2697 if (selnum != Sel_direct)
2698 selection_request_other (XA_STRING, selnum);
2699 }
2700
2701 if ((selection_type & Sel_UTF8String))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = Sel_CompoundText;
2706 if (selnum != Sel_direct)
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else
2709 selection_type = 0;
2710 }
2711
2712 return;
2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2737 if (XGetWindowProperty (dpy, win, prop,
2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2740 &ct2.encoding, &ct2.format,
2741 &ct2.nitems, &bytes_after,
2742 &ct2.value) != Success)
2743 goto bailout;
2744
2745 // realloc should be compatible to XFree, here, and elsewhere, too
2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (dpy, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (10);
2765
2766 goto bailout;
2767 }
2768
2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2782 }
2783 else
2784 {
2785 if (selection_wait == Sel_normal
2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2787 {
2788 /*
2789 * pass through again trying CUT_BUFFER0 if we've come from
2790 * XConvertSelection () but nothing was presented
2791 */
2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2793 }
2794
2795 goto bailout;
2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2809 incr_buf_fill += ct.nitems;
2810
2811 goto bailout;
2812 }
2813
2814 char **cl;
2815 int cr;
2816
2817#if !ENABLE_MINIMAL
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste (s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2832 && cl)
2833 {
2834 for (int i = 0; i < cr; i++)
2835 paste (cl[i], strlen (cl[i]));
2836
2837 XFreeStringList (cl);
2838 }
2839 else
2840 paste ((char *)ct.value, ct.nitems); // paste raw
2841
2842bailout:
2843 XFree (ct.value);
2844
2845 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none;
2847}
2848
2849void
2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2851{
2852 selection_wait = Sel_none;
2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858}
2859
2860void
2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{
2863 if (prop == None || selection_wait != Sel_incr)
2864 return; 2733 return;
2865 2734
2866 selection_paste (win, prop, true); 2735 tt_paste (data, len);
2867} 2736}
2868 2737
2869/* ------------------------------------------------------------------------- */ 2738/* ------------------------------------------------------------------------- */
2870/* 2739/*
2871 * Request the current selection: 2740 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2872 * Order: > internal selection if available 2741 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2873 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2742 * as fallback
2874 * > CUT_BUFFER0
2875 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2876 * will auto fallback to CUT_BUFFER0
2877 * EXT: button 2 release 2743 * EXT: button 2 release
2878 */ 2744 */
2879void 2745void
2880rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2881{ 2747{
2882 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2883 {
2884 /* internal selection */
2885 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste (str, strlen (str));
2887 free (str);
2888 return;
2889 } 2749 {
2890 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2891 { 2752 }
2892 selection_request_time = tm;
2893 selection_wait = Sel_normal;
2894
2895#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return;
2899#else
2900 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return;
2903#endif
2904 }
2905
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2908}
2909
2910int
2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2912{
2913 Atom sel;
2914
2915 selection_type |= selnum;
2916
2917 if (selnum == Sel_Primary)
2918 sel = XA_PRIMARY;
2919 else if (selnum == Sel_Secondary)
2920 sel = XA_SECONDARY;
2921 else
2922 sel = xa[XA_CLIPBOARD];
2923
2924 if (XGetSelectionOwner (dpy, sel) != None)
2925 {
2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2927 vt, selection_request_time);
2928 return 1;
2929 }
2930
2931 return 0;
2932} 2753}
2933 2754
2934/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2935/* 2756/*
2936 * Clear all selected text 2757 * Clear all selected text
2937 * EXT: SelectionClear 2758 * EXT: SelectionClear
2938 */ 2759 */
2939void 2760void
2940rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2762{
2763 if (!clipboard)
2764 {
2942 want_refresh = 1; 2765 want_refresh = 1;
2943 free (selection.text); 2766 free (selection.text);
2944 selection.text = NULL; 2767 selection.text = NULL;
2945 selection.len = 0; 2768 selection.len = 0;
2946 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2947 2770
2948 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2949 display->selection_owner = 0; 2772 display->selection_owner = 0;
2773 }
2774 else
2775 {
2776 free (selection.clip_text);
2777 selection.clip_text = NULL;
2778 selection.clip_len = 0;
2779
2780 if (display->clipboard_owner == this)
2781 display->clipboard_owner = 0;
2782 }
2950} 2783}
2951 2784
2952/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2953/* 2786/*
2954 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2955 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2956 */ 2789 */
2957void 2790void
2958rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2959{ 2792{
2960 int i; 2793 int size;
2961 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2962 text_t *t; 2795 text_t *t;
2963 2796
2964 switch (selection.op) 2797 switch (selection.op)
2965 { 2798 {
… …
2981 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2982 2815
2983 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2984 return; 2817 return;
2985 2818
2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2988 2821
2989 int ofs = 0; 2822 int ofs = 0;
2990 int extra = 0; 2823 int extra = 0;
2991 2824
2992 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
2998 { 2831 {
2999#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
3000 if (selection.rect) 2833 if (selection.rect)
3001 { 2834 {
3002 col = selection.beg.col; 2835 col = selection.beg.col;
3003 end_col = ncol + 1; 2836 end_col = selection.end.col;
3004 } 2837 }
3005 else 2838 else
3006#endif 2839#endif
3007 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
3008 2841
3009 col = max (col, 0); 2842 col = max (col, 0);
3010 2843
3011 if (row == selection.end.row 2844 if (row == selection.end.row)
3012#if !ENABLE_MINIMAL
3013 || selection.rect
3014#endif
3015 )
3016 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3017 2846
3018 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3019 2848
3020 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3028 2857
3029 extra -= (len - 1); 2858 extra -= (len - 1);
3030 2859
3031 if (extra < 0) 2860 if (extra < 0)
3032 { 2861 {
3033 extra += i; 2862 extra += size;
3034 i += i; 2863 size += size;
3035 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3036 } 2865 }
3037 2866
3038 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3039 } 2868 }
3040#endif 2869#endif
… …
3052 2881
3053 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3054 } 2883 }
3055 else 2884 else
3056#endif 2885#endif
3057 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3058 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3059 } 2890 }
3060
3061 if (end_col != selection.end.col)
3062 new_selection_text[ofs++] = C0_LF;
3063 2891
3064 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3065 2893
3066 if (ofs == 0) 2894 if (ofs == 0)
3067 { 2895 {
… …
3080 2908
3081 selection_grab (tm); 2909 selection_grab (tm);
3082} 2910}
3083 2911
3084bool 2912bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3087 selection_time = tm; 2919 selection_time = tm;
2920 sel = XA_PRIMARY;
2921 }
2922 else
2923 {
2924 clipboard_time = tm;
2925 sel = xa[XA_CLIPBOARD];
2926 }
3088 2927
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 2930 {
3092 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3093 return true; 2932 return true;
3094 } 2933 }
3095 else 2934 else
3096 { 2935 {
3097 selection_clear (); 2936 selection_clear (clipboard);
3098 return false; 2937 return false;
3099 } 2938 }
3100 2939
3101#if 0 2940#if 0
3102 XTextProperty ct; 2941 XTextProperty ct;
… …
3562 * EXT: SelectionRequest 3401 * EXT: SelectionRequest
3563 */ 3402 */
3564void 3403void
3565rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3404rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3566{ 3405{
3406 Atom property = rq.property == None ? rq.target : rq.property;
3567 XSelectionEvent ev; 3407 XSelectionEvent ev;
3568 3408
3569 ev.type = SelectionNotify; 3409 ev.type = SelectionNotify;
3570 ev.property = None; 3410 ev.property = None;
3571 ev.display = rq.display; 3411 ev.display = rq.display;
… …
3586 *target++ = xa[XA_COMPOUND_TEXT]; 3426 *target++ = xa[XA_COMPOUND_TEXT];
3587#if X_HAVE_UTF8_STRING 3427#if X_HAVE_UTF8_STRING
3588 *target++ = xa[XA_UTF8_STRING]; 3428 *target++ = xa[XA_UTF8_STRING];
3589#endif 3429#endif
3590 3430
3591 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3431 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3592 32, PropModeReplace, 3432 32, PropModeReplace,
3593 (unsigned char *)target_list, target - target_list); 3433 (unsigned char *)target_list, target - target_list);
3594 ev.property = rq.property; 3434 ev.property = property;
3595 } 3435 }
3596#if TODO // TODO 3436#if TODO // TODO
3597 else if (rq.target == xa[XA_MULTIPLE]) 3437 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3438 {
3599 /* TODO: Handle MULTIPLE */ 3439 /* TODO: Handle MULTIPLE */
3600 } 3440 }
3601#endif 3441#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3443 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3605 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3445 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3606 ev.property = rq.property; 3446 ev.property = property;
3447 }
3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3449 {
3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3451 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3452 ev.property = property;
3607 } 3453 }
3608 else if (rq.target == XA_STRING 3454 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3455 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3456 || rq.target == xa[XA_COMPOUND_TEXT]
3611 || rq.target == xa[XA_UTF8_STRING] 3457 || rq.target == xa[XA_UTF8_STRING]
… …
3643 { 3489 {
3644 target = xa[XA_COMPOUND_TEXT]; 3490 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3491 style = enc_compound_text;
3646 } 3492 }
3647 3493
3648 if (selection.text) 3494 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3495 {
3650 cl = selection.text; 3496 cl = selection.text;
3651 selectlen = selection.len; 3497 selectlen = selection.len;
3498 }
3499 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3500 {
3501 cl = selection.clip_text;
3502 selectlen = selection.clip_len;
3652 } 3503 }
3653 else 3504 else
3654 { 3505 {
3655 cl = L""; 3506 cl = L"";
3656 selectlen = 0; 3507 selectlen = 0;
… …
3677 ct.value = (unsigned char *)cl; 3528 ct.value = (unsigned char *)cl;
3678 ct.nitems = selectlen; 3529 ct.nitems = selectlen;
3679 ct.encoding = target; 3530 ct.encoding = target;
3680 } 3531 }
3681 3532
3682 XChangeProperty (dpy, rq.requestor, rq.property, 3533 XChangeProperty (dpy, rq.requestor, property,
3683 ct.encoding, 8, PropModeReplace, 3534 ct.encoding, 8, PropModeReplace,
3684 ct.value, (int)ct.nitems); 3535 ct.value, (int)ct.nitems);
3685 ev.property = rq.property; 3536 ev.property = property;
3686 3537
3687 if (freect) 3538 if (freect)
3688 XFree (ct.value); 3539 XFree (ct.value);
3689 } 3540 }
3690 3541
… …
3724 h += 2; min_it (h, nrow); 3575 h += 2; min_it (h, nrow);
3725 3576
3726 x -= 1; clamp_it (x, 0, ncol - w); 3577 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3578 y -= 1; clamp_it (y, 0, nrow - h);
3728 3579
3729 ov_x = x; ov_y = y; 3580 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3581 ov.w = w; ov.h = h;
3731 3582
3732 ov_text = new text_t *[h]; 3583 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3584 ov.rend = new rend_t *[h];
3734 3585
3735 for (y = 0; y < h; y++) 3586 for (y = 0; y < h; y++)
3736 { 3587 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3588 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3589 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3590
3740 text_t t0, t1, t2; 3591 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3592 rend_t r = OVERLAY_RSTYLE;
3742 3593
3743 if (y == 0) 3594 if (y == 0)
… …
3762} 3613}
3763 3614
3764void 3615void
3765rxvt_term::scr_overlay_off () NOTHROW 3616rxvt_term::scr_overlay_off () NOTHROW
3766{ 3617{
3767 if (!ov_text) 3618 if (!ov.text)
3768 return; 3619 return;
3769 3620
3770 want_refresh = 1; 3621 want_refresh = 1;
3771 3622
3772 for (int y = 0; y < ov_h; y++) 3623 for (int y = 0; y < ov.h; y++)
3773 { 3624 {
3774 delete [] ov_text[y]; 3625 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3626 delete [] ov.rend[y];
3776 } 3627 }
3777 3628
3778 delete [] ov_text; ov_text = 0; 3629 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3630 delete [] ov.rend; ov.rend = 0;
3780} 3631}
3781 3632
3782void 3633void
3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3634rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3784{ 3635{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3636 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3637 return;
3787 3638
3788 x++, y++; 3639 x++, y++;
3789 3640
3790 ov_text[y][x] = text; 3641 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3642 ov.rend[y][x] = rend;
3792} 3643}
3793 3644
3794void 3645void
3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3646rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3796{ 3647{
… …
3815} 3666}
3816 3667
3817void 3668void
3818rxvt_term::scr_swap_overlay () NOTHROW 3669rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3670{
3820 if (!ov_text) 3671 if (!ov.text)
3821 return; 3672 return;
3822 3673
3674 // hide cursor if it is within the overlay area
3675 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3676 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3677 screen.flags &= ~Screen_VisibleCursor;
3678
3823 // swap screen mem with overlay 3679 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3680 for (int y = ov.h; y--; )
3825 { 3681 {
3826 text_t *t1 = ov_text[y]; 3682 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3683 rend_t *r1 = ov.rend[y];
3828 3684
3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3685 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3686 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3831 3687
3832 for (int x = ov_w; x--; ) 3688 for (int x = ov.w; x--; )
3833 { 3689 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3690 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3691 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3836 } 3692 }
3837 } 3693 }

Diff Legend

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