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.324 by root, Wed Nov 5 00:01:01 2008 UTC vs.
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC

… …
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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
158 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
159 162
160void 163void
161rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
162{ 165{
163 scr_soft_reset ();
164
165 view_start = 0; 166 view_start = 0;
166 num_scr = 0; 167 num_scr = 0;
167 168
168 if (ncol == 0) 169 if (ncol == 0)
169 ncol = 80; 170 ncol = 80;
… …
233 selection.text = NULL; 234 selection.text = NULL;
234 selection.len = 0; 235 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
237 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
238 } 241 }
239 else 242 else
240 { 243 {
241 /* 244 /*
242 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
280 283
281 if (top_row) 284 if (top_row)
282 { 285 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
285 289
286 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 292
289 do 293 do
290 { 294 {
291 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 297 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 299
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 301 {
… …
395 397
396 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 400 }
399 401
402 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
407
400 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
401 409
402 prev_nrow = nrow; 410 prev_nrow = nrow;
403 prev_ncol = ncol; 411 prev_ncol = ncol;
404 412
… …
436void 444void
437rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
438{ 446{
439 scr_release (); 447 scr_release ();
440 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
441 scr_reset (); 451 scr_reset ();
442 452
443 scr_clear (true); 453 scr_clear (true);
444 scr_refresh (); 454 scr_refresh ();
445} 455}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 460 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 461#if ENABLE_OVERLAY
452 scr_overlay_off (); 462 scr_overlay_off ();
453#endif 463#endif
454 464
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 465 if (current_screen != PRIMARY)
458 scr_swap_screen (); 466 scr_swap_screen ();
459
460 free (tabs);
461 tabs = (char *)rxvt_malloc (ncol);
462
463 for (int col = ncol; --col; )
464 tabs [col] = col % TABSIZE == 0;
465 467
466 scr_scroll_region (0, MAX_ROWS - 1); 468 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 469 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 470 scr_insert_mode (0);
469} 471}
… …
511 } 513 }
512 514
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
519#endif
520} 520}
521 521
522void 522void
523rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
524{ 524{
… …
549 want_refresh = 1; 549 want_refresh = 1;
550 view_start = 0; 550 view_start = 0;
551 551
552 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
553 553
554 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
555 555
556#if NSCREENS 556#if NSCREENS
557 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
558 { 558 {
559 num_scr = 0; 559 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
786 } 786 }
787 } 787 }
788 788
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 792 int row = screen.cur.row;
795 793
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 795
798 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
902# else 900# else
903 c = 0xfffd; 901 c = 0xfffd;
904# endif 902# endif
905#endif 903#endif
906 904
907 // nuke the character at this position, if required
908 if (expect_false (
909 line->t[screen.cur.col] == NOCHAR
910 || (screen.cur.col < ncol - 1
911 && line->t[screen.cur.col + 1] == NOCHAR)
912 ))
913 scr_kill_char (*line, screen.cur.col);
914
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916 906
917 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
920 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
921 c = NOCHAR; 913 c = NOCHAR;
922 // and try the same character next loop iteration 914 // and try the same character next loop iteration
923 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
924 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
925 927
926 line->touch (); 928 line->touch ();
927 929
928 do 930 do
929 { 931 {
… …
935 else 937 else
936 { 938 {
937 line->l = ncol; 939 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
940 break; 942
943 goto end_of_line;
941 } 944 }
942 945
943 c = NOCHAR; 946 c = NOCHAR;
944 } 947 }
945 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
946 949
947 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
949 { 952 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 953 line->t[c] = ' ';
955 line->r[c] = rend; 954 line->r[c] = rend;
956 }
957 } 955 }
956
957end_of_line:
958 ;
958 } 959 }
959#if ENABLE_COMBINING 960#if ENABLE_COMBINING
960 else // width == 0 961 else // width == 0
961 { 962 {
962 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1003#endif
1003 } 1004 }
1004 1005
1005 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1006 1007
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1009#endif
1010} 1009}
1011 1010
1012/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1013/* 1012/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1026
1028 want_refresh = 1; 1027 want_refresh = 1;
1029#endif 1028#endif
1030 } 1029 }
1031 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1032 else 1033 else
1033 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1034} 1035}
1035 1036
1036/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1343 return; 1344 return;
1344 1345
1345 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1346 1347
1347 // TODO: the code below does not work when view_start != 0
1348 // the workaround is to disable the clear and use a normal refresh
1349 // when view_start != 0. mysterious.
1350 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1351 {
1354 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1355 1353
1356 if (mapped && !view_start) 1354 if (mapped)
1357 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1360 } 1358 }
1361 else 1359 else
1362 { 1360 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1362
1365 if (mapped && !view_start) 1363 if (mapped)
1366 { 1364 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1377 1375
1378 for (; num--; row++) 1376 for (; num--; row++)
1379 { 1377 {
1380 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1381 1379
1382 if (!view_start) 1380 if (row - view_start < nrow)
1383 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1384 } 1382 }
1385} 1383}
1386 1384
1387#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1388void 1386void
… …
1541 { 1539 {
1542 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1543 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1544 } 1542 }
1545 1543
1546 scr_blank_line (*line, ncol - count, count, 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1548 1545
1549 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1548 {
1552 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1842 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1843 { 1840 {
1844 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1845 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1846 } 1843 }
1847// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1848 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1849 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1850 1847
1851 num_scr_allow = 0; 1848 num_scr_allow = 0;
1852 1849
… …
1943 1940
1944 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1945 } 1942 }
1946 else 1943 else
1947 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1946#endif
1949} 1947}
1950 1948
1951/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1950/* ARGSUSED */
… …
1971 row_start = view_start; 1969 row_start = view_start;
1972 } 1970 }
1973 1971
1974 wctomb (0, 0); 1972 wctomb (0, 0);
1975 1973
1976 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1977 { 1975 {
1978 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1979 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1980 1978
1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2010 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2009 */
2012void 2010void
2013rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2014{ 2012{
2015 unsigned char have_bg,
2016 showcursor; /* show the cursor */
2017 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2018 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2019 int i; /* tmp */ 2015 int i; /* tmp */
2020#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2021 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2032 /* 2028 /*
2033 * A: set up vars 2029 * A: set up vars
2034 */ 2030 */
2035 refresh_count = 0; 2031 refresh_count = 0;
2036 2032
2033 unsigned int old_screen_flags = screen.flags;
2037 have_bg = 0; 2034 char have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2039 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2040#endif 2037#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2039
2043 /* 2040 /*
2044 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2045 */ 2042 */
2046 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2047 2051
2048 /* 2052 /*
2049 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2050 */ 2054 */
2051 { 2055 {
2052 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2053 2057
2054 showcursor = (screen.flags & Screen_VisibleCursor);
2055#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2056 if (hidden_cursor) 2059 if (hidden_cursor)
2057 showcursor = 0; 2060 showcursor = 0;
2058#endif 2061#endif
2059 2062
… …
2087 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2088#else 2091#else
2089 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2090#endif 2093#endif
2091 2094
2092 if (showcursor && focus) 2095 if (focus)
2093 { 2096 {
2094 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2095 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2096 else 2099 else
2097 { 2100 {
… …
2132 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2133 } 2136 }
2134 } 2137 }
2135 } 2138 }
2136 2139
2137 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2138#if ENABLE_OVERLAY
2139 scr_swap_overlay ();
2140#endif
2141
2142#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2141 /*
2144 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2145 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2146 */ 2144 */
… …
2238 2236
2239 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2241 --col; 2239 --col;
2242 2240
2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2242 text_t *text = stp + col;
2245 int count = 1; 2243 int count = 1;
2246 2244
2247 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2248 drp[col] = rend; 2246 drp[col] = rend;
… …
2252 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2253 { 2251 {
2254 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2255 { 2253 {
2256 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2257 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2258 count++; 2257 count++;
2259 i++; 2258 i++;
2260 2259
2261 continue; 2260 continue;
2262 } 2261 }
… …
2292 */ 2291 */
2293 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2295 2294
2296 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2297 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2297 {
2299 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2300 2299
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2321 2320
2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2323 fore = Color_UL; 2322 fore = Color_UL;
2324#endif 2323#endif
2325 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2326 if (invert) 2345 if (invert)
2327 { 2346 {
2328#ifdef OPTION_HC
2329 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2330 || !ISSET_PIXCOLOR (Color_HC))
2331#endif
2332 /* invert the column if no highlightColor is set or it is the
2333 * current cursor column */
2334 ::swap (fore, back); 2347 ::swap (fore, back);
2335#ifdef OPTION_HC
2336 else if (ISSET_PIXCOLOR (Color_HC))
2337 back = Color_HC;
2338#endif
2339 2348
2340#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2341# ifndef OPTION_HC
2342 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV;
2344# endif
2345 if (fore == back) 2350 if (fore == back)
2346 { 2351 {
2347 fore = Color_bg; 2352 fore = Color_bg;
2348 back = Color_fg; 2353 back = Color_fg;
2349 } 2354 }
… …
2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2419 } 2424 }
2420 } /* for (col....) */ 2425 } /* for (col....) */
2421 } /* for (row....) */ 2426 } /* for (row....) */
2422 2427
2423#if ENABLE_OVERLAY
2424 scr_swap_overlay ();
2425#endif
2426 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427
2428 /* 2428 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2430 */
2431 if (showcursor) 2431 if (showcursor)
2432 { 2432 {
… …
2470 } 2470 }
2471 2471
2472 /* 2472 /*
2473 * H: cleanup selection 2473 * H: cleanup selection
2474 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2475 scr_reverse_selection (); 2480 scr_reverse_selection ();
2476 2481
2482 screen.flags = old_screen_flags;
2477 num_scr = 0; 2483 num_scr = 0;
2478 num_scr_allow = 1; 2484 num_scr_allow = 1;
2479} 2485}
2480 2486
2481void 2487void
… …
2502 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2503 } 2509 }
2504} 2510}
2505 2511
2506void 2512void
2507rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2514{
2515 bool transparent = false;
2516
2509#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2518 if (bgPixmap.pixmap != None)
2511#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2512 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2514 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2516 2543
2517 if (scrollBar.win) 2544 if (scrollBar.win)
2518 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2551 scrollBar.show (0);
2522 } 2552 }
2523 2553
2524#endif 2554 if (refresh)
2525 2555 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2556 scr_clear ();
2528 scr_touch (true); 2557 scr_touch (true);
2558 }
2529 want_refresh = 1; 2559 want_refresh = 1;
2530} 2560}
2531 2561
2532/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2533void 2563void
… …
2601 { 2631 {
2602#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2603 if (selection.rect) 2633 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2637 else
2608#endif 2638#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2611 RS_RVid); 2641 RS_Sel | RS_RVid);
2612 } 2642 }
2613} 2643}
2614 2644
2615/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2616/* 2646/*
… …
2621void 2651void
2622rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2653{
2624 int row, wrote; 2654 int row, wrote;
2625 unsigned int width, towrite; 2655 unsigned int width, towrite;
2626 char r1[] = "\n"; 2656 const char r1[] = "\n";
2627 2657
2628 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2630 { 2660 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2678/* 2708/*
2679 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2680 */ 2710 */
2681void 2711void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2713{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2691 2721
2692 tt_write (data, len); 2722 tt_write (data, len);
2693 2723
2694 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2696} 2735}
2697 2736
2698/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2699/* 2738/*
2700 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2757 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success) 2797 &ct2.value) != Success)
2759 goto bailout; 2798 goto bailout;
2760 2799
2761 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2765 2804
2766 XFree (ct2.value); 2805 XFree (ct2.value);
2767 } 2806 }
… …
2816 incr_ev.start (10); 2855 incr_ev.start (10);
2817 2856
2818 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 { 2858 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2822 } 2861 }
2823 2862
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2826 2865
… …
2909 selection_wait = Sel_normal; 2948 selection_wait = Sel_normal;
2910 2949
2911#if X_HAVE_UTF8_STRING 2950#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2951 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2952 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2953 return;
2915#else 2954#else
2916 selection_type = Sel_CompoundText; 2955 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2956 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2957 return;
2919#endif 2958#endif
2920 } 2959 }
2921 2960
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2961 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2962 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2990/*
2952 * Clear all selected text 2991 * Clear all selected text
2953 * EXT: SelectionClear 2992 * EXT: SelectionClear
2954 */ 2993 */
2955void 2994void
2956rxvt_term::selection_clear () NOTHROW 2995rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2996{
2997 if (!clipboard)
2998 {
2958 want_refresh = 1; 2999 want_refresh = 1;
2959 free (selection.text); 3000 free (selection.text);
2960 selection.text = NULL; 3001 selection.text = NULL;
2961 selection.len = 0; 3002 selection.len = 0;
2962 CLEAR_SELECTION (); 3003 CLEAR_SELECTION ();
2963 3004
2964 if (display->selection_owner == this) 3005 if (display->selection_owner == this)
2965 display->selection_owner = 0; 3006 display->selection_owner = 0;
3007 }
3008 else
3009 {
3010 free (selection.clip_text);
3011 selection.clip_text = NULL;
3012 selection.clip_len = 0;
3013
3014 if (display->clipboard_owner == this)
3015 display->clipboard_owner = 0;
3016 }
2966} 3017}
2967 3018
2968/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2969/* 3020/*
2970 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2971 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2972 */ 3023 */
2973void 3024void
2974rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2975{ 3026{
2976 int i; 3027 int size;
2977 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
2978 text_t *t; 3029 text_t *t;
2979 3030
2980 switch (selection.op) 3031 switch (selection.op)
2981 { 3032 {
… …
2997 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
2998 3049
2999 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3000 return; 3051 return;
3001 3052
3002 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3003 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3004 3055
3005 int ofs = 0; 3056 int ofs = 0;
3006 int extra = 0; 3057 int extra = 0;
3007 3058
3008 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
3014 { 3065 {
3015#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
3016 if (selection.rect) 3067 if (selection.rect)
3017 { 3068 {
3018 col = selection.beg.col; 3069 col = selection.beg.col;
3019 end_col = ncol + 1; 3070 end_col = selection.end.col;
3020 } 3071 }
3021 else 3072 else
3022#endif 3073#endif
3023 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
3024 3075
3025 col = max (col, 0); 3076 col = max (col, 0);
3026 3077
3027 if (row == selection.end.row 3078 if (row == selection.end.row)
3028#if !ENABLE_MINIMAL
3029 || selection.rect
3030#endif
3031 )
3032 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
3033 3080
3034 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
3035 3082
3036 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3044 3091
3045 extra -= (len - 1); 3092 extra -= (len - 1);
3046 3093
3047 if (extra < 0) 3094 if (extra < 0)
3048 { 3095 {
3049 extra += i; 3096 extra += size;
3050 i += i; 3097 size += size;
3051 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3052 } 3099 }
3053 3100
3054 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3055 } 3102 }
3056#endif 3103#endif
… …
3068 3115
3069 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3070 } 3117 }
3071 else 3118 else
3072#endif 3119#endif
3073 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3074 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3075 } 3124 }
3076
3077 if (end_col != selection.end.col)
3078 new_selection_text[ofs++] = C0_LF;
3079 3125
3080 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3081 3127
3082 if (ofs == 0) 3128 if (ofs == 0)
3083 { 3129 {
… …
3096 3142
3097 selection_grab (tm); 3143 selection_grab (tm);
3098} 3144}
3099 3145
3100bool 3146bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3147rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3148{
3149 Atom sel;
3150
3151 if (!clipboard)
3152 {
3103 selection_time = tm; 3153 selection_time = tm;
3154 sel = XA_PRIMARY;
3155 }
3156 else
3157 {
3158 clipboard_time = tm;
3159 sel = xa[XA_CLIPBOARD];
3160 }
3104 3161
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3162 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3163 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3164 {
3108 display->set_selection_owner (this); 3165 display->set_selection_owner (this, clipboard);
3109 return true; 3166 return true;
3110 } 3167 }
3111 else 3168 else
3112 { 3169 {
3113 selection_clear (); 3170 selection_clear (clipboard);
3114 return false; 3171 return false;
3115 } 3172 }
3116 3173
3117#if 0 3174#if 0
3118 XTextProperty ct; 3175 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3670 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3671 {
3615 /* TODO: Handle MULTIPLE */ 3672 /* TODO: Handle MULTIPLE */
3616 } 3673 }
3617#endif 3674#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3675 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3676 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3677 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3678 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3679 ev.property = rq.property;
3680 }
3681 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3682 {
3683 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3684 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3685 ev.property = rq.property;
3623 } 3686 }
3624 else if (rq.target == XA_STRING 3687 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3688 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3689 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3722 {
3660 target = xa[XA_COMPOUND_TEXT]; 3723 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3724 style = enc_compound_text;
3662 } 3725 }
3663 3726
3664 if (selection.text) 3727 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3728 {
3666 cl = selection.text; 3729 cl = selection.text;
3667 selectlen = selection.len; 3730 selectlen = selection.len;
3731 }
3732 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3733 {
3734 cl = selection.clip_text;
3735 selectlen = selection.clip_len;
3668 } 3736 }
3669 else 3737 else
3670 { 3738 {
3671 cl = L""; 3739 cl = L"";
3672 selectlen = 0; 3740 selectlen = 0;
… …
3740 h += 2; min_it (h, nrow); 3808 h += 2; min_it (h, nrow);
3741 3809
3742 x -= 1; clamp_it (x, 0, ncol - w); 3810 x -= 1; clamp_it (x, 0, ncol - w);
3743 y -= 1; clamp_it (y, 0, nrow - h); 3811 y -= 1; clamp_it (y, 0, nrow - h);
3744 3812
3745 ov_x = x; ov_y = y; 3813 ov.x = x; ov.y = y;
3746 ov_w = w; ov_h = h; 3814 ov.w = w; ov.h = h;
3747 3815
3748 ov_text = new text_t *[h]; 3816 ov.text = new text_t *[h];
3749 ov_rend = new rend_t *[h]; 3817 ov.rend = new rend_t *[h];
3750 3818
3751 for (y = 0; y < h; y++) 3819 for (y = 0; y < h; y++)
3752 { 3820 {
3753 text_t *tp = ov_text[y] = new text_t[w]; 3821 text_t *tp = ov.text[y] = new text_t[w];
3754 rend_t *rp = ov_rend[y] = new rend_t[w]; 3822 rend_t *rp = ov.rend[y] = new rend_t[w];
3755 3823
3756 text_t t0, t1, t2; 3824 text_t t0, t1, t2;
3757 rend_t r = OVERLAY_RSTYLE; 3825 rend_t r = OVERLAY_RSTYLE;
3758 3826
3759 if (y == 0) 3827 if (y == 0)
… …
3778} 3846}
3779 3847
3780void 3848void
3781rxvt_term::scr_overlay_off () NOTHROW 3849rxvt_term::scr_overlay_off () NOTHROW
3782{ 3850{
3783 if (!ov_text) 3851 if (!ov.text)
3784 return; 3852 return;
3785 3853
3786 want_refresh = 1; 3854 want_refresh = 1;
3787 3855
3788 for (int y = 0; y < ov_h; y++) 3856 for (int y = 0; y < ov.h; y++)
3789 { 3857 {
3790 delete [] ov_text[y]; 3858 delete [] ov.text[y];
3791 delete [] ov_rend[y]; 3859 delete [] ov.rend[y];
3792 } 3860 }
3793 3861
3794 delete [] ov_text; ov_text = 0; 3862 delete [] ov.text; ov.text = 0;
3795 delete [] ov_rend; ov_rend = 0; 3863 delete [] ov.rend; ov.rend = 0;
3796} 3864}
3797 3865
3798void 3866void
3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3867rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3800{ 3868{
3801 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3869 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3802 return; 3870 return;
3803 3871
3804 x++, y++; 3872 x++, y++;
3805 3873
3806 ov_text[y][x] = text; 3874 ov.text[y][x] = text;
3807 ov_rend[y][x] = rend; 3875 ov.rend[y][x] = rend;
3808} 3876}
3809 3877
3810void 3878void
3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3879rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3812{ 3880{
… …
3831} 3899}
3832 3900
3833void 3901void
3834rxvt_term::scr_swap_overlay () NOTHROW 3902rxvt_term::scr_swap_overlay () NOTHROW
3835{ 3903{
3836 if (!ov_text) 3904 if (!ov.text)
3837 return; 3905 return;
3838 3906
3907 // hide cursor if it is within the overlay area
3908 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3909 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3910 screen.flags &= ~Screen_VisibleCursor;
3911
3839 // swap screen mem with overlay 3912 // swap screen mem with overlay
3840 for (int y = ov_h; y--; ) 3913 for (int y = ov.h; y--; )
3841 { 3914 {
3842 text_t *t1 = ov_text[y]; 3915 text_t *t1 = ov.text[y];
3843 rend_t *r1 = ov_rend[y]; 3916 rend_t *r1 = ov.rend[y];
3844 3917
3845 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3918 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3846 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3919 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3847 3920
3848 for (int x = ov_w; x--; ) 3921 for (int x = ov.w; x--; )
3849 { 3922 {
3850 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3923 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3851 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3924 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3852 } 3925 }
3853 } 3926 }

Diff Legend

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