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.349 by root, Thu Oct 14 23:12:11 2010 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
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163 scr_soft_reset ();
164
165 view_start = 0; 164 view_start = 0;
166 num_scr = 0; 165 num_scr = 0;
167 166
168 if (ncol == 0) 167 if (ncol == 0)
169 ncol = 80; 168 ncol = 80;
… …
233 selection.text = NULL; 232 selection.text = NULL;
234 selection.len = 0; 233 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
237 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
238 } 239 }
239 else 240 else
240 { 241 {
241 /* 242 /*
242 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
280 281
281 if (top_row) 282 if (top_row)
282 { 283 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
285 287
286 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 290
289 do 291 do
290 { 292 {
291 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 297
298 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 ())
299 { 299 {
… …
395 395
396 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 398 }
399 399
400 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
405
400 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
401 407
402 prev_nrow = nrow; 408 prev_nrow = nrow;
403 prev_ncol = ncol; 409 prev_ncol = ncol;
404 410
… …
436void 442void
437rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
438{ 444{
439 scr_release (); 445 scr_release ();
440 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
441 scr_reset (); 449 scr_reset ();
442 450
443 scr_clear (true); 451 scr_clear (true);
444 scr_refresh (); 452 scr_refresh ();
445} 453}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 458 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 459#if ENABLE_OVERLAY
452 scr_overlay_off (); 460 scr_overlay_off ();
453#endif 461#endif
454 462
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 463 if (current_screen != PRIMARY)
458 scr_swap_screen (); 464 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 465
466 scr_scroll_region (0, MAX_ROWS - 1); 466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 468 scr_insert_mode (0);
469} 469}
… …
511 } 511 }
512 512
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
519#endif
520} 518}
521 519
522void 520void
523rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
524{ 522{
… …
549 want_refresh = 1; 547 want_refresh = 1;
550 view_start = 0; 548 view_start = 0;
551 549
552 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
553 551
554 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
555 553
556#if NSCREENS 554#if NSCREENS
557 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
558 { 556 {
559 num_scr = 0; 557 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
786 } 784 }
787 } 785 }
788 786
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 790 int row = screen.cur.row;
795 791
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 793
798 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916 912
917 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
920 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
921 c = NOCHAR; 919 c = NOCHAR;
922 // and try the same character next loop iteration 920 // and try the same character next loop iteration
923 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
924 } 925 }
925 926
926 line->touch (); 927 line->touch ();
927 928
928 do 929 do
… …
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#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034#endif
1032 else 1035 else
1033 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1034} 1037}
1035 1038
1036/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1343 return; 1346 return;
1344 1347
1345 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1346 1349
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)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1353 {
1354 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1355 1355
1356 if (mapped && !view_start) 1356 if (mapped)
1357 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1360 } 1360 }
1361 else 1361 else
1362 { 1362 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1364
1365 if (mapped && !view_start) 1365 if (mapped)
1366 { 1366 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1377 1377
1378 for (; num--; row++) 1378 for (; num--; row++)
1379 { 1379 {
1380 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381 1381
1382 if (!view_start) 1382 if (row - view_start < nrow)
1383 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1384 } 1384 }
1385} 1385}
1386 1386
1387#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1388void 1388void
… …
1541 { 1541 {
1542 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1543 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1544 } 1544 }
1545 1545
1546 scr_blank_line (*line, ncol - count, count, 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1548 1547
1549 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1550 {
1552 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1842 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1843 { 1842 {
1844 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1845 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1846 } 1845 }
1847// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1848 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++)
1849 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);
1850 1849
1851 num_scr_allow = 0; 1850 num_scr_allow = 0;
1852 1851
… …
1943 1942
1944 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1945 } 1944 }
1946 else 1945 else
1947 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1948#endif
1949} 1949}
1950 1950
1951/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1952/* ARGSUSED */
… …
1971 row_start = view_start; 1971 row_start = view_start;
1972 } 1972 }
1973 1973
1974 wctomb (0, 0); 1974 wctomb (0, 0);
1975 1975
1976 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1977 { 1977 {
1978 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1979 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1980 1980
1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2010 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2011 */
2012void 2012void
2013rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
2014{ 2014{
2015 unsigned char have_bg,
2016 showcursor; /* show the cursor */
2017 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
2018 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
2019 int i; /* tmp */ 2017 int i; /* tmp */
2020#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
2021 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2032 /* 2030 /*
2033 * A: set up vars 2031 * A: set up vars
2034 */ 2032 */
2035 refresh_count = 0; 2033 refresh_count = 0;
2036 2034
2035 unsigned int old_screen_flags = screen.flags;
2037 have_bg = 0; 2036 char have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2039 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bgPixmap.pixmap != None;
2040#endif 2039#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2041
2043 /* 2042 /*
2044 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2045 */ 2044 */
2046 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
2047 2053
2048 /* 2054 /*
2049 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2050 */ 2056 */
2051 { 2057 {
2052 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2053 2059
2054 showcursor = (screen.flags & Screen_VisibleCursor);
2055#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2056 if (hidden_cursor) 2061 if (hidden_cursor)
2057 showcursor = 0; 2062 showcursor = 0;
2058#endif 2063#endif
2059 2064
… …
2087 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2088#else 2093#else
2089 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2090#endif 2095#endif
2091 2096
2092 if (showcursor && focus) 2097 if (focus)
2093 { 2098 {
2094 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2095 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2096 else 2101 else
2097 { 2102 {
… …
2132 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2133 } 2138 }
2134 } 2139 }
2135 } 2140 }
2136 2141
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 2142#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2143 /*
2144 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2145 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2146 */ 2146 */
… …
2238 2238
2239 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2241 --col; 2241 --col;
2242 2242
2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2244 text_t *text = stp + col;
2245 int count = 1; 2245 int count = 1;
2246 2246
2247 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2248 drp[col] = rend; 2248 drp[col] = rend;
… …
2252 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2253 { 2253 {
2254 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2255 { 2255 {
2256 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2257 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2258 count++; 2259 count++;
2259 i++; 2260 i++;
2260 2261
2261 continue; 2262 continue;
2262 } 2263 }
… …
2292 */ 2293 */
2293 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2295 2296
2296 // only do special processing if any attributes are set, which is unlikely 2297 // 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))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2299 {
2299 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2300 2301
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2321 2322
2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2323 fore = Color_UL; 2324 fore = Color_UL;
2324#endif 2325#endif
2325 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2326 if (invert) 2347 if (invert)
2327 { 2348 {
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); 2349 ::swap (fore, back);
2335#ifdef OPTION_HC
2336 else if (ISSET_PIXCOLOR (Color_HC))
2337 back = Color_HC;
2338#endif
2339 2350
2340#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#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) 2352 if (fore == back)
2346 { 2353 {
2347 fore = Color_bg; 2354 fore = Color_bg;
2348 back = Color_fg; 2355 back = Color_fg;
2349 } 2356 }
… …
2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2419 } 2426 }
2420 } /* for (col....) */ 2427 } /* for (col....) */
2421 } /* for (row....) */ 2428 } /* for (row....) */
2422 2429
2423#if ENABLE_OVERLAY
2424 scr_swap_overlay ();
2425#endif
2426 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427
2428 /* 2430 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2432 */
2431 if (showcursor) 2433 if (showcursor)
2432 { 2434 {
… …
2470 } 2472 }
2471 2473
2472 /* 2474 /*
2473 * H: cleanup selection 2475 * H: cleanup selection
2474 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2475 scr_reverse_selection (); 2482 scr_reverse_selection ();
2476 2483
2484 screen.flags = old_screen_flags;
2477 num_scr = 0; 2485 num_scr = 0;
2478 num_scr_allow = 1; 2486 num_scr_allow = 1;
2479} 2487}
2480 2488
2481void 2489void
… …
2601 { 2609 {
2602#if !ENABLE_MINIMAL 2610#if !ENABLE_MINIMAL
2603 if (selection.rect) 2611 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2612 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2613 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2614 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2615 else
2608#endif 2616#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2617 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2618 selection.end.row, selection.end.col,
2611 RS_RVid); 2619 RS_Sel | RS_RVid);
2612 } 2620 }
2613} 2621}
2614 2622
2615/* ------------------------------------------------------------------------- */ 2623/* ------------------------------------------------------------------------- */
2616/* 2624/*
… …
2677/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2678/* 2686/*
2679 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2680 */ 2688 */
2681void 2689void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2691{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2691 2699
2692 tt_write (data, len); 2700 tt_write (data, len);
2693 2701
2694 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2703 tt_printf ("\e[201~");
2704}
2705
2706void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{
2709 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2710 return;
2711
2712 tt_paste (data, len);
2696} 2713}
2697 2714
2698/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2699/* 2716/*
2700 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2909 selection_wait = Sel_normal; 2926 selection_wait = Sel_normal;
2910 2927
2911#if X_HAVE_UTF8_STRING 2928#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2929 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2931 return;
2915#else 2932#else
2916 selection_type = Sel_CompoundText; 2933 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2935 return;
2919#endif 2936#endif
2920 } 2937 }
2921 2938
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2968/*
2952 * Clear all selected text 2969 * Clear all selected text
2953 * EXT: SelectionClear 2970 * EXT: SelectionClear
2954 */ 2971 */
2955void 2972void
2956rxvt_term::selection_clear () NOTHROW 2973rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2974{
2975 if (!clipboard)
2976 {
2958 want_refresh = 1; 2977 want_refresh = 1;
2959 free (selection.text); 2978 free (selection.text);
2960 selection.text = NULL; 2979 selection.text = NULL;
2961 selection.len = 0; 2980 selection.len = 0;
2962 CLEAR_SELECTION (); 2981 CLEAR_SELECTION ();
2963 2982
2964 if (display->selection_owner == this) 2983 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2984 display->selection_owner = 0;
2985 }
2986 else
2987 {
2988 free (selection.clip_text);
2989 selection.clip_text = NULL;
2990 selection.clip_len = 0;
2991
2992 if (display->clipboard_owner == this)
2993 display->clipboard_owner = 0;
2994 }
2966} 2995}
2967 2996
2968/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2969/* 2998/*
2970 * Copy a selection into the cut buffer 2999 * Copy a selection into the cut buffer
… …
3096 3125
3097 selection_grab (tm); 3126 selection_grab (tm);
3098} 3127}
3099 3128
3100bool 3129bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3130rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3131{
3132 Atom sel;
3133
3134 if (!clipboard)
3135 {
3103 selection_time = tm; 3136 selection_time = tm;
3137 sel = XA_PRIMARY;
3138 }
3139 else
3140 {
3141 clipboard_time = tm;
3142 sel = xa[XA_CLIPBOARD];
3143 }
3104 3144
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3145 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3146 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3147 {
3108 display->set_selection_owner (this); 3148 display->set_selection_owner (this, clipboard);
3109 return true; 3149 return true;
3110 } 3150 }
3111 else 3151 else
3112 { 3152 {
3113 selection_clear (); 3153 selection_clear (clipboard);
3114 return false; 3154 return false;
3115 } 3155 }
3116 3156
3117#if 0 3157#if 0
3118 XTextProperty ct; 3158 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3653 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3654 {
3615 /* TODO: Handle MULTIPLE */ 3655 /* TODO: Handle MULTIPLE */
3616 } 3656 }
3617#endif 3657#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3659 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3661 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property;
3663 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3668 ev.property = rq.property;
3623 } 3669 }
3624 else if (rq.target == XA_STRING 3670 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3671 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3672 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3705 {
3660 target = xa[XA_COMPOUND_TEXT]; 3706 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3707 style = enc_compound_text;
3662 } 3708 }
3663 3709
3664 if (selection.text) 3710 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3711 {
3666 cl = selection.text; 3712 cl = selection.text;
3667 selectlen = selection.len; 3713 selectlen = selection.len;
3714 }
3715 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3716 {
3717 cl = selection.clip_text;
3718 selectlen = selection.clip_len;
3668 } 3719 }
3669 else 3720 else
3670 { 3721 {
3671 cl = L""; 3722 cl = L"";
3672 selectlen = 0; 3723 selectlen = 0;
… …
3740 h += 2; min_it (h, nrow); 3791 h += 2; min_it (h, nrow);
3741 3792
3742 x -= 1; clamp_it (x, 0, ncol - w); 3793 x -= 1; clamp_it (x, 0, ncol - w);
3743 y -= 1; clamp_it (y, 0, nrow - h); 3794 y -= 1; clamp_it (y, 0, nrow - h);
3744 3795
3745 ov_x = x; ov_y = y; 3796 ov.x = x; ov.y = y;
3746 ov_w = w; ov_h = h; 3797 ov.w = w; ov.h = h;
3747 3798
3748 ov_text = new text_t *[h]; 3799 ov.text = new text_t *[h];
3749 ov_rend = new rend_t *[h]; 3800 ov.rend = new rend_t *[h];
3750 3801
3751 for (y = 0; y < h; y++) 3802 for (y = 0; y < h; y++)
3752 { 3803 {
3753 text_t *tp = ov_text[y] = new text_t[w]; 3804 text_t *tp = ov.text[y] = new text_t[w];
3754 rend_t *rp = ov_rend[y] = new rend_t[w]; 3805 rend_t *rp = ov.rend[y] = new rend_t[w];
3755 3806
3756 text_t t0, t1, t2; 3807 text_t t0, t1, t2;
3757 rend_t r = OVERLAY_RSTYLE; 3808 rend_t r = OVERLAY_RSTYLE;
3758 3809
3759 if (y == 0) 3810 if (y == 0)
… …
3778} 3829}
3779 3830
3780void 3831void
3781rxvt_term::scr_overlay_off () NOTHROW 3832rxvt_term::scr_overlay_off () NOTHROW
3782{ 3833{
3783 if (!ov_text) 3834 if (!ov.text)
3784 return; 3835 return;
3785 3836
3786 want_refresh = 1; 3837 want_refresh = 1;
3787 3838
3788 for (int y = 0; y < ov_h; y++) 3839 for (int y = 0; y < ov.h; y++)
3789 { 3840 {
3790 delete [] ov_text[y]; 3841 delete [] ov.text[y];
3791 delete [] ov_rend[y]; 3842 delete [] ov.rend[y];
3792 } 3843 }
3793 3844
3794 delete [] ov_text; ov_text = 0; 3845 delete [] ov.text; ov.text = 0;
3795 delete [] ov_rend; ov_rend = 0; 3846 delete [] ov.rend; ov.rend = 0;
3796} 3847}
3797 3848
3798void 3849void
3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3850rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3800{ 3851{
3801 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3852 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3802 return; 3853 return;
3803 3854
3804 x++, y++; 3855 x++, y++;
3805 3856
3806 ov_text[y][x] = text; 3857 ov.text[y][x] = text;
3807 ov_rend[y][x] = rend; 3858 ov.rend[y][x] = rend;
3808} 3859}
3809 3860
3810void 3861void
3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3862rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3812{ 3863{
… …
3831} 3882}
3832 3883
3833void 3884void
3834rxvt_term::scr_swap_overlay () NOTHROW 3885rxvt_term::scr_swap_overlay () NOTHROW
3835{ 3886{
3836 if (!ov_text) 3887 if (!ov.text)
3837 return; 3888 return;
3838 3889
3890 // hide cursor if it is within the overlay area
3891 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3892 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3893 screen.flags &= ~Screen_VisibleCursor;
3894
3839 // swap screen mem with overlay 3895 // swap screen mem with overlay
3840 for (int y = ov_h; y--; ) 3896 for (int y = ov.h; y--; )
3841 { 3897 {
3842 text_t *t1 = ov_text[y]; 3898 text_t *t1 = ov.text[y];
3843 rend_t *r1 = ov_rend[y]; 3899 rend_t *r1 = ov.rend[y];
3844 3900
3845 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3901 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; 3902 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3847 3903
3848 for (int x = ov_w; x--; ) 3904 for (int x = ov.w; x--; )
3849 { 3905 {
3850 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3906 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3851 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3907 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3852 } 3908 }
3853 } 3909 }

Diff Legend

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