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.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.376 by root, Mon Feb 21 07:41:03 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++;
… …
231 selection.text = NULL; 232 selection.text = NULL;
232 selection.len = 0; 233 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
235 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
236 } 239 }
237 else 240 else
238 { 241 {
239 /* 242 /*
240 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 290
288 do 291 do
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 295 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 297
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 299 {
… …
397 } 398 }
398 399
399 free (tabs); 400 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
401 402
402 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
510 } 511 }
511 512
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
518#endif
519} 518}
520 519
521void 520void
522rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
523{ 522{
… …
548 want_refresh = 1; 547 want_refresh = 1;
549 view_start = 0; 548 view_start = 0;
550 549
551 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
552 551
553 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
554 553
555#if NSCREENS 554#if NSCREENS
556 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
557 { 556 {
558 num_scr = 0; 557 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
785 } 784 }
786 } 785 }
787 786
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 790 int row = screen.cur.row;
794 791
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 793
797 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
901# else 898# else
902 c = 0xfffd; 899 c = 0xfffd;
903# endif 900# endif
904#endif 901#endif
905 902
906 // nuke the character at this position, if required
907 if (expect_false (
908 line->t[screen.cur.col] == NOCHAR
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 904
916 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
919 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
920 c = NOCHAR; 911 c = NOCHAR;
921 // and try the same character next loop iteration 912 // and try the same character next loop iteration
922 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
923 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
924 925
925 line->touch (); 926 line->touch ();
926 927
927 do 928 do
928 { 929 {
… …
934 else 935 else
935 { 936 {
936 line->l = ncol; 937 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
939 break; 940
941 goto end_of_line;
940 } 942 }
941 943
942 c = NOCHAR; 944 c = NOCHAR;
943 } 945 }
944 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
945 947
946 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 950 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 951 line->t[c] = ' ';
954 line->r[c] = rend; 952 line->r[c] = rend;
955 }
956 } 953 }
954
955end_of_line:
956 ;
957 } 957 }
958#if ENABLE_COMBINING 958#if ENABLE_COMBINING
959 else // width == 0 959 else // width == 0
960 { 960 {
961 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1001#endif
1002 } 1002 }
1003 1003
1004 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1005 1005
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1008#endif
1009} 1007}
1010 1008
1011/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1012/* 1010/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1024
1027 want_refresh = 1; 1025 want_refresh = 1;
1028#endif 1026#endif
1029 } 1027 }
1030 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else 1031 else
1032 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1342 return; 1342 return;
1343 1343
1344 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1345 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1349 {
1353 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1354 1351
1355 if (mapped && !view_start) 1352 if (mapped)
1356 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1359 } 1356 }
1360 else 1357 else
1361 { 1358 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1360
1364 if (mapped && !view_start) 1361 if (mapped)
1365 { 1362 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1376 1373
1377 for (; num--; row++) 1374 for (; num--; row++)
1378 { 1375 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1380 1377
1381 if (!view_start) 1378 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1380 }
1384} 1381}
1385 1382
1386#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1387void 1384void
… …
1686 { 1683 {
1687 rvideo_state = on; 1684 rvideo_state = on;
1688 1685
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1692#endif 1689#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1691
1695 XGCValues gcvalue; 1692 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1838 {
1842 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1844 } 1841 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1845
1849 num_scr_allow = 0; 1846 num_scr_allow = 0;
1850 1847
… …
1941 1938
1942 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1940 }
1944 else 1941 else
1945 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1944#endif
1947} 1945}
1948 1946
1949/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1948/* ARGSUSED */
… …
1969 row_start = view_start; 1967 row_start = view_start;
1970 } 1968 }
1971 1969
1972 wctomb (0, 0); 1970 wctomb (0, 0);
1973 1971
1974 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1973 {
1976 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1978 1976
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2007 */
2010void 2008void
2011rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
2012{ 2010{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2013 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2026 /*
2031 * A: set up vars 2027 * A: set up vars
2032 */ 2028 */
2033 refresh_count = 0; 2029 refresh_count = 0;
2034 2030
2031 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2032 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2038#endif 2035#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2037
2041 /* 2038 /*
2042 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2043 */ 2040 */
2044 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2049
2046 /* 2050 /*
2047 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2048 */ 2052 */
2049 { 2053 {
2050 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2051 2055
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2057 if (hidden_cursor)
2055 showcursor = 0; 2058 showcursor = 0;
2056#endif 2059#endif
2057 2060
… …
2085 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2086#else 2089#else
2087 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2088#endif 2091#endif
2089 2092
2090 if (showcursor && focus) 2093 if (focus)
2091 { 2094 {
2092 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2094 else 2097 else
2095 { 2098 {
… …
2130 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2131 } 2134 }
2132 } 2135 }
2133 } 2136 }
2134 2137
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2139 /*
2142 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2144 */ 2142 */
… …
2236 2234
2237 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2237 --col;
2240 2238
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2240 text_t *text = stp + col;
2243 int count = 1; 2241 int count = 1;
2244 2242
2245 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2246 drp[col] = rend; 2244 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2251 { 2249 {
2252 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2253 { 2251 {
2254 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2255 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2256 count++; 2255 count++;
2257 i++; 2256 i++;
2258 2257
2259 continue; 2258 continue;
2260 } 2259 }
… …
2290 */ 2289 */
2291 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2293 2292
2294 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2295 {
2297 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2298 2297
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2318
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2320 fore = Color_UL;
2322#endif 2321#endif
2323 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2324 if (invert) 2343 if (invert)
2325 { 2344 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2345 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2346
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2348 if (fore == back)
2344 { 2349 {
2345 fore = Color_bg; 2350 fore = Color_bg;
2346 back = Color_fg; 2351 back = Color_fg;
2347 } 2352 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2422 }
2418 } /* for (col....) */ 2423 } /* for (col....) */
2419 } /* for (row....) */ 2424 } /* for (row....) */
2420 2425
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2426 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2428 */
2429 if (showcursor) 2429 if (showcursor)
2430 { 2430 {
… …
2468 } 2468 }
2469 2469
2470 /* 2470 /*
2471 * H: cleanup selection 2471 * H: cleanup selection
2472 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2473 scr_reverse_selection (); 2478 scr_reverse_selection ();
2474 2479
2480 screen.flags = old_screen_flags;
2475 num_scr = 0; 2481 num_scr = 0;
2476 num_scr_allow = 1; 2482 num_scr_allow = 1;
2477} 2483}
2478 2484
2479void 2485void
… …
2500 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2501 } 2507 }
2502} 2508}
2503 2509
2504void 2510void
2505rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2512{
2513 bool transparent = false;
2514
2507#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2508 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2509#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2510 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2512 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2514 2541
2515 if (scrollBar.win) 2542 if (scrollBar.win)
2516 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2518 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2519 scrollBar.show (0); 2549 scrollBar.show (0);
2520 } 2550 }
2521 2551
2522#endif 2552 if (refresh)
2523 2553 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2554 scr_clear ();
2526 scr_touch (true); 2555 scr_touch (true);
2556 }
2527 want_refresh = 1; 2557 want_refresh = 1;
2528} 2558}
2529 2559
2530/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2531void 2561void
… …
2599 { 2629 {
2600#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2601 if (selection.rect) 2631 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2635 else
2606#endif 2636#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2609 RS_RVid); 2639 RS_Sel | RS_RVid);
2610 } 2640 }
2611} 2641}
2612 2642
2613/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2614/* 2644/*
… …
2619void 2649void
2620rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2651{
2622 int row, wrote; 2652 int row, wrote;
2623 unsigned int width, towrite; 2653 unsigned int width, towrite;
2624 char r1[] = "\n"; 2654 const char r1[] = "\n";
2625 2655
2626 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2628 { 2658 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2675/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2676/* 2706/*
2677 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2678 */ 2708 */
2679void 2709void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2711{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2691 2721
2692 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2694} 2724}
2695 2725
2696/* ------------------------------------------------------------------------- */
2697/*
2698 * Respond to a notification that a primary selection has been sent
2699 * EXT: SelectionNotify
2700 */
2701void 2726void
2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2703{ 2728{
2704 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2705 {
2706 if ((selection_type & Sel_CompoundText))
2707 {
2708 int selnum = selection_type & Sel_whereMask;
2709
2710 selection_type = 0;
2711 if (selnum != Sel_direct)
2712 selection_request_other (XA_STRING, selnum);
2713 }
2714
2715 if ((selection_type & Sel_UTF8String))
2716 {
2717 int selnum = selection_type & Sel_whereMask;
2718
2719 selection_type = Sel_CompoundText;
2720 if (selnum != Sel_direct)
2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2722 else
2723 selection_type = 0;
2724 }
2725
2726 return;
2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (dpy, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct2.encoding, &ct2.format,
2755 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success)
2757 goto bailout;
2758
2759 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems;
2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2770 if (ct.encoding == xa[XA_INCR])
2771 {
2772 // INCR selection, start handshake
2773 if (!delete_prop)
2774 XDeleteProperty (dpy, win, prop);
2775
2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2778 incr_ev.start (10);
2779
2780 goto bailout;
2781 }
2782
2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2796 }
2797 else
2798 {
2799 if (selection_wait == Sel_normal
2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2801 {
2802 /*
2803 * pass through again trying CUT_BUFFER0 if we've come from
2804 * XConvertSelection () but nothing was presented
2805 */
2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2807 }
2808
2809 goto bailout;
2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems;
2824
2825 goto bailout;
2826 }
2827
2828 char **cl;
2829 int cr;
2830
2831#if !ENABLE_MINIMAL
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste (s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2846 && cl)
2847 {
2848 for (int i = 0; i < cr; i++)
2849 paste (cl[i], strlen (cl[i]));
2850
2851 XFreeStringList (cl);
2852 }
2853 else
2854 paste ((char *)ct.value, ct.nitems); // paste raw
2855
2856bailout:
2857 XFree (ct.value);
2858
2859 if (selection_wait == Sel_normal)
2860 selection_wait = Sel_none;
2861}
2862
2863void
2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2865{
2866 selection_wait = Sel_none;
2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2872}
2873
2874void
2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2876{
2877 if (prop == None || selection_wait != Sel_incr)
2878 return; 2730 return;
2879 2731
2880 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2881} 2733}
2882 2734
2883/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2884/* 2736/*
2885 * Request the current selection: 2737 * Request the current selection:
… …
2899 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2900 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2901 free (str); 2753 free (str);
2902 return; 2754 return;
2903 } 2755 }
2904 else 2756 else if (!selection_req)
2905 {
2906 selection_request_time = tm;
2907 selection_wait = Sel_normal;
2908
2909#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return;
2913#else
2914 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return;
2917#endif
2918 } 2757 {
2919 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2922}
2923
2924int
2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2926{
2927 Atom sel;
2928
2929 selection_type |= selnum;
2930
2931 if (selnum == Sel_Primary)
2932 sel = XA_PRIMARY;
2933 else if (selnum == Sel_Secondary)
2934 sel = XA_SECONDARY;
2935 else
2936 sel = xa[XA_CLIPBOARD];
2937
2938 if (XGetSelectionOwner (dpy, sel) != None)
2939 { 2760 }
2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2941 vt, selection_request_time);
2942 return 1;
2943 }
2944
2945 return 0;
2946} 2761}
2947 2762
2948/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2949/* 2764/*
2950 * Clear all selected text 2765 * Clear all selected text
2951 * EXT: SelectionClear 2766 * EXT: SelectionClear
2952 */ 2767 */
2953void 2768void
2954rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2770{
2771 if (!clipboard)
2772 {
2956 want_refresh = 1; 2773 want_refresh = 1;
2957 free (selection.text); 2774 free (selection.text);
2958 selection.text = NULL; 2775 selection.text = NULL;
2959 selection.len = 0; 2776 selection.len = 0;
2960 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2961 2778
2962 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2964} 2791}
2965 2792
2966/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2967/* 2794/*
2968 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2970 */ 2797 */
2971void 2798void
2972rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2973{ 2800{
2974 int i; 2801 int size;
2975 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2976 text_t *t; 2803 text_t *t;
2977 2804
2978 switch (selection.op) 2805 switch (selection.op)
2979 { 2806 {
… …
2995 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2996 2823
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 2825 return;
2999 2826
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 2829
3003 int ofs = 0; 2830 int ofs = 0;
3004 int extra = 0; 2831 int extra = 0;
3005 2832
3006 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3012 { 2839 {
3013#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3014 if (selection.rect) 2841 if (selection.rect)
3015 { 2842 {
3016 col = selection.beg.col; 2843 col = selection.beg.col;
3017 end_col = ncol + 1; 2844 end_col = selection.end.col;
3018 } 2845 }
3019 else 2846 else
3020#endif 2847#endif
3021 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3022 2849
3023 col = max (col, 0); 2850 col = max (col, 0);
3024 2851
3025 if (row == selection.end.row 2852 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3031 2854
3032 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3033 2856
3034 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3042 2865
3043 extra -= (len - 1); 2866 extra -= (len - 1);
3044 2867
3045 if (extra < 0) 2868 if (extra < 0)
3046 { 2869 {
3047 extra += i; 2870 extra += size;
3048 i += i; 2871 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 2873 }
3051 2874
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 2876 }
3054#endif 2877#endif
… …
3066 2889
3067 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3068 } 2891 }
3069 else 2892 else
3070#endif 2893#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3073 } 2898 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 2899
3078 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3079 2901
3080 if (ofs == 0) 2902 if (ofs == 0)
3081 { 2903 {
… …
3094 2916
3095 selection_grab (tm); 2917 selection_grab (tm);
3096} 2918}
3097 2919
3098bool 2920bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3101 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3102 2935
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 2938 {
3106 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3107 return true; 2940 return true;
3108 } 2941 }
3109 else 2942 else
3110 { 2943 {
3111 selection_clear (); 2944 selection_clear (clipboard);
3112 return false; 2945 return false;
3113 } 2946 }
3114 2947
3115#if 0 2948#if 0
3116 XTextProperty ct; 2949 XTextProperty ct;
… …
3611 else if (rq.target == xa[XA_MULTIPLE]) 3444 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3445 {
3613 /* TODO: Handle MULTIPLE */ 3446 /* TODO: Handle MULTIPLE */
3614 } 3447 }
3615#endif 3448#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3450 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3452 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3453 ev.property = rq.property;
3454 }
3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3456 {
3457 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3620 ev.property = rq.property; 3459 ev.property = rq.property;
3621 } 3460 }
3622 else if (rq.target == XA_STRING 3461 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3462 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3463 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3657 { 3496 {
3658 target = xa[XA_COMPOUND_TEXT]; 3497 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3498 style = enc_compound_text;
3660 } 3499 }
3661 3500
3662 if (selection.text) 3501 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3502 {
3664 cl = selection.text; 3503 cl = selection.text;
3665 selectlen = selection.len; 3504 selectlen = selection.len;
3505 }
3506 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3507 {
3508 cl = selection.clip_text;
3509 selectlen = selection.clip_len;
3666 } 3510 }
3667 else 3511 else
3668 { 3512 {
3669 cl = L""; 3513 cl = L"";
3670 selectlen = 0; 3514 selectlen = 0;
… …
3738 h += 2; min_it (h, nrow); 3582 h += 2; min_it (h, nrow);
3739 3583
3740 x -= 1; clamp_it (x, 0, ncol - w); 3584 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3585 y -= 1; clamp_it (y, 0, nrow - h);
3742 3586
3743 ov_x = x; ov_y = y; 3587 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3588 ov.w = w; ov.h = h;
3745 3589
3746 ov_text = new text_t *[h]; 3590 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3591 ov.rend = new rend_t *[h];
3748 3592
3749 for (y = 0; y < h; y++) 3593 for (y = 0; y < h; y++)
3750 { 3594 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3595 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3596 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3597
3754 text_t t0, t1, t2; 3598 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3599 rend_t r = OVERLAY_RSTYLE;
3756 3600
3757 if (y == 0) 3601 if (y == 0)
… …
3776} 3620}
3777 3621
3778void 3622void
3779rxvt_term::scr_overlay_off () NOTHROW 3623rxvt_term::scr_overlay_off () NOTHROW
3780{ 3624{
3781 if (!ov_text) 3625 if (!ov.text)
3782 return; 3626 return;
3783 3627
3784 want_refresh = 1; 3628 want_refresh = 1;
3785 3629
3786 for (int y = 0; y < ov_h; y++) 3630 for (int y = 0; y < ov.h; y++)
3787 { 3631 {
3788 delete [] ov_text[y]; 3632 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3633 delete [] ov.rend[y];
3790 } 3634 }
3791 3635
3792 delete [] ov_text; ov_text = 0; 3636 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3637 delete [] ov.rend; ov.rend = 0;
3794} 3638}
3795 3639
3796void 3640void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3642{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3643 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3644 return;
3801 3645
3802 x++, y++; 3646 x++, y++;
3803 3647
3804 ov_text[y][x] = text; 3648 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3649 ov.rend[y][x] = rend;
3806} 3650}
3807 3651
3808void 3652void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3653rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3654{
… …
3829} 3673}
3830 3674
3831void 3675void
3832rxvt_term::scr_swap_overlay () NOTHROW 3676rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3677{
3834 if (!ov_text) 3678 if (!ov.text)
3835 return; 3679 return;
3836 3680
3681 // hide cursor if it is within the overlay area
3682 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3683 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3684 screen.flags &= ~Screen_VisibleCursor;
3685
3837 // swap screen mem with overlay 3686 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3687 for (int y = ov.h; y--; )
3839 { 3688 {
3840 text_t *t1 = ov_text[y]; 3689 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3690 rend_t *r1 = ov.rend[y];
3842 3691
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3692 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3693 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3694
3846 for (int x = ov_w; x--; ) 3695 for (int x = ov.w; x--; )
3847 { 3696 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3697 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3698 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3699 }
3851 } 3700 }

Diff Legend

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