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.323 by root, Tue Nov 4 23:53:29 2008 UTC vs.
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 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);
… …
1002#endif 998#endif
1003 } 999 }
1004 1000
1005 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1006 1002
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1009#endif
1010} 1004}
1011 1005
1012/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1013/* 1007/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1343 return; 1337 return;
1344 1338
1345 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1346 1340
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1344 {
1352 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1353 1346
1354 if (mapped && !view_start) 1347 if (mapped)
1355 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1358 } 1351 }
1359 else 1352 else
1360 { 1353 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1355
1363 if (mapped && !view_start) 1356 if (mapped)
1364 { 1357 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1361 0, Row2Pixel (row - view_start),
… …
1374 } 1367 }
1375 1368
1376 for (; num--; row++) 1369 for (; num--; row++)
1377 { 1370 {
1378 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372
1379 if (!view_start) 1373 if (row - view_start < nrow)
1380 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1381 } 1375 }
1382} 1376}
1383 1377
1384#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1385void 1379void
… …
1538 { 1532 {
1539 line->t[col] = line->t[col + count]; 1533 line->t[col] = line->t[col + count];
1540 line->r[col] = line->r[col + count]; 1534 line->r[col] = line->r[col + count];
1541 } 1535 }
1542 1536
1543 scr_blank_line (*line, ncol - count, count, 1537 scr_blank_line (*line, ncol - count, count, rstyle);
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1545 1538
1546 if (selection.op && current_screen == selection.screen 1539 if (selection.op && current_screen == selection.screen
1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1540 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1548 { 1541 {
1549 if (selection.end.row != screen.cur.row 1542 if (selection.end.row != screen.cur.row
… …
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1833 {
1841 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1842 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1843 } 1836 }
1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1837
1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847 1840
1848 num_scr_allow = 0; 1841 num_scr_allow = 0;
1849 1842
… …
1940 1933
1941 bell_ev.start (VISUAL_BELL_DURATION); 1934 bell_ev.start (VISUAL_BELL_DURATION);
1942 } 1935 }
1943 else 1936 else
1944 XBell (dpy, 0); 1937 XBell (dpy, 0);
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1945#endif 1939#endif
1946} 1940}
1947 1941
1948/* ------------------------------------------------------------------------- */ 1942/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1943/* ARGSUSED */
… …
1968 row_start = view_start; 1962 row_start = view_start;
1969 } 1963 }
1970 1964
1971 wctomb (0, 0); 1965 wctomb (0, 0);
1972 1966
1973 for (int r1 = 0; r1 < nrows; r1++) 1967 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1974 { 1968 {
1975 text_t *tp = ROW(r1).t; 1969 text_t *tp = ROW(r1).t;
1976 int len = ROW(r1).l; 1970 int len = ROW(r1).l;
1977 1971
1978 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1972 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2007 * screen.text/screen.rend contain what the screen will change to. 2001 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2002 */
2009void 2003void
2010rxvt_term::scr_refresh () NOTHROW 2004rxvt_term::scr_refresh () NOTHROW
2011{ 2005{
2012 unsigned char have_bg,
2013 showcursor; /* show the cursor */
2014 int16_t col, row, /* column/row we're processing */ 2006 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2007 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2008 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR 2009#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */ 2010 rend_t cc1; /* store colours at cursor position (s) */
… …
2029 /* 2021 /*
2030 * A: set up vars 2022 * A: set up vars
2031 */ 2023 */
2032 refresh_count = 0; 2024 refresh_count = 0;
2033 2025
2026 unsigned int old_screen_flags = screen.flags;
2034 have_bg = 0; 2027 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2028#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2029 have_bg = bgPixmap.pixmap != None;
2037#endif 2030#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2032
2040 /* 2033 /*
2041 * B: reverse any characters which are selected 2034 * B: reverse any characters which are selected
2042 */ 2035 */
2043 scr_reverse_selection (); 2036 scr_reverse_selection ();
2037
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY
2040 scr_swap_overlay ();
2041#endif
2042
2043 char showcursor = screen.flags & Screen_VisibleCursor;
2044 2044
2045 /* 2045 /*
2046 * C: set the cursor character (s) 2046 * C: set the cursor character (s)
2047 */ 2047 */
2048 { 2048 {
2049 unsigned char setoldcursor; 2049 unsigned char setoldcursor;
2050 2050
2051 showcursor = (screen.flags & Screen_VisibleCursor);
2052#ifdef CURSOR_BLINK 2051#ifdef CURSOR_BLINK
2053 if (hidden_cursor) 2052 if (hidden_cursor)
2054 showcursor = 0; 2053 showcursor = 0;
2055#endif 2054#endif
2056 2055
… …
2084 ccol2 = bgcolor_of (rstyle); 2083 ccol2 = bgcolor_of (rstyle);
2085#else 2084#else
2086 ccol2 = Color_bg; 2085 ccol2 = Color_bg;
2087#endif 2086#endif
2088 2087
2089 if (showcursor && focus) 2088 if (focus)
2090 { 2089 {
2091 if (option (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2092 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2093 else 2092 else
2094 { 2093 {
… …
2129 oldcursor.col = screen.cur.col; 2128 oldcursor.col = screen.cur.col;
2130 } 2129 }
2131 } 2130 }
2132 } 2131 }
2133 2132
2134 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2135#if ENABLE_OVERLAY
2136 scr_swap_overlay ();
2137#endif
2138
2139#ifndef NO_SLOW_LINK_SUPPORT 2133#ifndef NO_SLOW_LINK_SUPPORT
2140 /* 2134 /*
2141 * D: CopyArea pass - very useful for slower links 2135 * D: CopyArea pass - very useful for slower links
2142 * This has been deliberately kept simple. 2136 * This has been deliberately kept simple.
2143 */ 2137 */
… …
2235 2229
2236 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2237 while (expect_false (stp[col] == NOCHAR && col > 0)) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2238 --col; 2232 --col;
2239 2233
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2241 text_t *text = stp + col; 2235 text_t *text = stp + col;
2242 int count = 1; 2236 int count = 1;
2243 2237
2244 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2245 drp[col] = rend; 2239 drp[col] = rend;
… …
2249 for (i = 0; ++col < ncol; ) 2243 for (i = 0; ++col < ncol; )
2250 { 2244 {
2251 if (stp[col] == NOCHAR) 2245 if (stp[col] == NOCHAR)
2252 { 2246 {
2253 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2254 drp[col] = rend; 2248 drp[col] = srp[col];
2249
2255 count++; 2250 count++;
2256 i++; 2251 i++;
2257 2252
2258 continue; 2253 continue;
2259 } 2254 }
… …
2289 */ 2284 */
2290 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2292 2287
2293 // only do special processing if any attributes are set, which is unlikely 2288 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2290 {
2296 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2297 2292
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2318 2313
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL; 2315 fore = Color_UL;
2321#endif 2316#endif
2322 2317
2318#ifdef OPTION_HC
2319 if (rend & RS_Sel)
2320 {
2321 /* invert the column if no highlightColor is set or it is the
2322 * current cursor column */
2323 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 && ISSET_PIXCOLOR (Color_HC))
2325 {
2326 if (ISSET_PIXCOLOR (Color_HTC))
2327 fore = Color_HTC;
2328 // if invert is 0 reverse video is set so we use bg color as fg color
2329 else if (!invert)
2330 fore = back;
2331
2332 back = Color_HC;
2333 invert = 0;
2334 }
2335 }
2336#endif
2337
2323 if (invert) 2338 if (invert)
2324 { 2339 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 ::swap (fore, back); 2340 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2336 2341
2337#ifndef NO_BOLD_UNDERLINE_REVERSE 2342#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2339 if (ISSET_PIXCOLOR (Color_RV))
2340 back = Color_RV;
2341# endif
2342 if (fore == back) 2343 if (fore == back)
2343 { 2344 {
2344 fore = Color_bg; 2345 fore = Color_bg;
2345 back = Color_fg; 2346 back = Color_fg;
2346 } 2347 }
… …
2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2416 } 2417 }
2417 } /* for (col....) */ 2418 } /* for (col....) */
2418 } /* for (row....) */ 2419 } /* for (row....) */
2419 2420
2420#if ENABLE_OVERLAY
2421 scr_swap_overlay ();
2422#endif
2423 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2424
2425 /* 2421 /*
2426 * G: cleanup cursor and display outline cursor if necessary 2422 * G: cleanup cursor and display outline cursor if necessary
2427 */ 2423 */
2428 if (showcursor) 2424 if (showcursor)
2429 { 2425 {
… …
2467 } 2463 }
2468 2464
2469 /* 2465 /*
2470 * H: cleanup selection 2466 * H: cleanup selection
2471 */ 2467 */
2468#if ENABLE_OVERLAY
2469 scr_swap_overlay ();
2470#endif
2471 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2472
2472 scr_reverse_selection (); 2473 scr_reverse_selection ();
2473 2474
2475 screen.flags = old_screen_flags;
2474 num_scr = 0; 2476 num_scr = 0;
2475 num_scr_allow = 1; 2477 num_scr_allow = 1;
2476} 2478}
2477 2479
2478void 2480void
… …
2598 { 2600 {
2599#if !ENABLE_MINIMAL 2601#if !ENABLE_MINIMAL
2600 if (selection.rect) 2602 if (selection.rect)
2601 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2603 RS_RVid, RS_RVid | RS_Uline); 2605 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2604 else 2606 else
2605#endif 2607#endif
2606 scr_xor_span (selection.beg.row, selection.beg.col, 2608 scr_xor_span (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2608 RS_RVid); 2610 RS_Sel | RS_RVid);
2609 } 2611 }
2610} 2612}
2611 2613
2612/* ------------------------------------------------------------------------- */ 2614/* ------------------------------------------------------------------------- */
2613/* 2615/*
… …
2674/* ------------------------------------------------------------------------- */ 2676/* ------------------------------------------------------------------------- */
2675/* 2677/*
2676 * Paste a selection direct to the command fd 2678 * Paste a selection direct to the command fd
2677 */ 2679 */
2678void 2680void
2679rxvt_term::paste (char *data, unsigned int len) NOTHROW 2681rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2680{ 2682{
2681 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2682 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2683 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2684 data[i] = C0_CR; 2686 data[i] = C0_CR;
… …
2688 2690
2689 tt_write (data, len); 2691 tt_write (data, len);
2690 2692
2691 if (priv_modes & PrivMode_BracketPaste) 2693 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~"); 2694 tt_printf ("\e[201~");
2695}
2696
2697void
2698rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699{
2700 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2701 return;
2702
2703 tt_paste (data, len);
2693} 2704}
2694 2705
2695/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2696/* 2707/*
2697 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
… …
2906 selection_wait = Sel_normal; 2917 selection_wait = Sel_normal;
2907 2918
2908#if X_HAVE_UTF8_STRING 2919#if X_HAVE_UTF8_STRING
2909 selection_type = Sel_UTF8String; 2920 selection_type = Sel_UTF8String;
2910 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2911 return; 2922 return;
2912#else 2923#else
2913 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2914 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2915 return; 2926 return;
2916#endif 2927#endif
2917 } 2928 }
2918 2929
2919 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2920 selection_paste (display->root, XA_CUT_BUFFER0, false); 2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2948/* 2959/*
2949 * Clear all selected text 2960 * Clear all selected text
2950 * EXT: SelectionClear 2961 * EXT: SelectionClear
2951 */ 2962 */
2952void 2963void
2953rxvt_term::selection_clear () NOTHROW 2964rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2965{
2966 if (!clipboard)
2967 {
2955 want_refresh = 1; 2968 want_refresh = 1;
2956 free (selection.text); 2969 free (selection.text);
2957 selection.text = NULL; 2970 selection.text = NULL;
2958 selection.len = 0; 2971 selection.len = 0;
2959 CLEAR_SELECTION (); 2972 CLEAR_SELECTION ();
2960 2973
2961 if (display->selection_owner == this) 2974 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2975 display->selection_owner = 0;
2976 }
2977 else
2978 {
2979 free (selection.clip_text);
2980 selection.clip_text = NULL;
2981 selection.clip_len = 0;
2982
2983 if (display->clipboard_owner == this)
2984 display->clipboard_owner = 0;
2985 }
2963} 2986}
2964 2987
2965/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2966/* 2989/*
2967 * Copy a selection into the cut buffer 2990 * Copy a selection into the cut buffer
… …
3093 3116
3094 selection_grab (tm); 3117 selection_grab (tm);
3095} 3118}
3096 3119
3097bool 3120bool
3098rxvt_term::selection_grab (Time tm) NOTHROW 3121rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3099{ 3122{
3123 Atom sel;
3124
3125 if (!clipboard)
3126 {
3100 selection_time = tm; 3127 selection_time = tm;
3128 sel = XA_PRIMARY;
3129 }
3130 else
3131 {
3132 clipboard_time = tm;
3133 sel = xa[XA_CLIPBOARD];
3134 }
3101 3135
3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3136 XSetSelectionOwner (dpy, sel, vt, tm);
3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3137 if (XGetSelectionOwner (dpy, sel) == vt)
3104 { 3138 {
3105 display->set_selection_owner (this); 3139 display->set_selection_owner (this, clipboard);
3106 return true; 3140 return true;
3107 } 3141 }
3108 else 3142 else
3109 { 3143 {
3110 selection_clear (); 3144 selection_clear (clipboard);
3111 return false; 3145 return false;
3112 } 3146 }
3113 3147
3114#if 0 3148#if 0
3115 XTextProperty ct; 3149 XTextProperty ct;
… …
3610 else if (rq.target == xa[XA_MULTIPLE]) 3644 else if (rq.target == xa[XA_MULTIPLE])
3611 { 3645 {
3612 /* TODO: Handle MULTIPLE */ 3646 /* TODO: Handle MULTIPLE */
3613 } 3647 }
3614#endif 3648#endif
3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3616 { 3650 {
3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3618 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3652 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653 ev.property = rq.property;
3654 }
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3619 ev.property = rq.property; 3659 ev.property = rq.property;
3620 } 3660 }
3621 else if (rq.target == XA_STRING 3661 else if (rq.target == XA_STRING
3622 || rq.target == xa[XA_TEXT] 3662 || rq.target == xa[XA_TEXT]
3623 || rq.target == xa[XA_COMPOUND_TEXT] 3663 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3656 { 3696 {
3657 target = xa[XA_COMPOUND_TEXT]; 3697 target = xa[XA_COMPOUND_TEXT];
3658 style = enc_compound_text; 3698 style = enc_compound_text;
3659 } 3699 }
3660 3700
3661 if (selection.text) 3701 if (rq.selection == XA_PRIMARY && selection.text)
3662 { 3702 {
3663 cl = selection.text; 3703 cl = selection.text;
3664 selectlen = selection.len; 3704 selectlen = selection.len;
3705 }
3706 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3707 {
3708 cl = selection.clip_text;
3709 selectlen = selection.clip_len;
3665 } 3710 }
3666 else 3711 else
3667 { 3712 {
3668 cl = L""; 3713 cl = L"";
3669 selectlen = 0; 3714 selectlen = 0;
… …
3737 h += 2; min_it (h, nrow); 3782 h += 2; min_it (h, nrow);
3738 3783
3739 x -= 1; clamp_it (x, 0, ncol - w); 3784 x -= 1; clamp_it (x, 0, ncol - w);
3740 y -= 1; clamp_it (y, 0, nrow - h); 3785 y -= 1; clamp_it (y, 0, nrow - h);
3741 3786
3742 ov_x = x; ov_y = y; 3787 ov.x = x; ov.y = y;
3743 ov_w = w; ov_h = h; 3788 ov.w = w; ov.h = h;
3744 3789
3745 ov_text = new text_t *[h]; 3790 ov.text = new text_t *[h];
3746 ov_rend = new rend_t *[h]; 3791 ov.rend = new rend_t *[h];
3747 3792
3748 for (y = 0; y < h; y++) 3793 for (y = 0; y < h; y++)
3749 { 3794 {
3750 text_t *tp = ov_text[y] = new text_t[w]; 3795 text_t *tp = ov.text[y] = new text_t[w];
3751 rend_t *rp = ov_rend[y] = new rend_t[w]; 3796 rend_t *rp = ov.rend[y] = new rend_t[w];
3752 3797
3753 text_t t0, t1, t2; 3798 text_t t0, t1, t2;
3754 rend_t r = OVERLAY_RSTYLE; 3799 rend_t r = OVERLAY_RSTYLE;
3755 3800
3756 if (y == 0) 3801 if (y == 0)
… …
3775} 3820}
3776 3821
3777void 3822void
3778rxvt_term::scr_overlay_off () NOTHROW 3823rxvt_term::scr_overlay_off () NOTHROW
3779{ 3824{
3780 if (!ov_text) 3825 if (!ov.text)
3781 return; 3826 return;
3782 3827
3783 want_refresh = 1; 3828 want_refresh = 1;
3784 3829
3785 for (int y = 0; y < ov_h; y++) 3830 for (int y = 0; y < ov.h; y++)
3786 { 3831 {
3787 delete [] ov_text[y]; 3832 delete [] ov.text[y];
3788 delete [] ov_rend[y]; 3833 delete [] ov.rend[y];
3789 } 3834 }
3790 3835
3791 delete [] ov_text; ov_text = 0; 3836 delete [] ov.text; ov.text = 0;
3792 delete [] ov_rend; ov_rend = 0; 3837 delete [] ov.rend; ov.rend = 0;
3793} 3838}
3794 3839
3795void 3840void
3796rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3841rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3797{ 3842{
3798 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3843 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3799 return; 3844 return;
3800 3845
3801 x++, y++; 3846 x++, y++;
3802 3847
3803 ov_text[y][x] = text; 3848 ov.text[y][x] = text;
3804 ov_rend[y][x] = rend; 3849 ov.rend[y][x] = rend;
3805} 3850}
3806 3851
3807void 3852void
3808rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3853rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3809{ 3854{
… …
3828} 3873}
3829 3874
3830void 3875void
3831rxvt_term::scr_swap_overlay () NOTHROW 3876rxvt_term::scr_swap_overlay () NOTHROW
3832{ 3877{
3833 if (!ov_text) 3878 if (!ov.text)
3834 return; 3879 return;
3835 3880
3881 // hide cursor if it is within the overlay area
3882 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3883 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3884 screen.flags &= ~Screen_VisibleCursor;
3885
3836 // swap screen mem with overlay 3886 // swap screen mem with overlay
3837 for (int y = ov_h; y--; ) 3887 for (int y = ov.h; y--; )
3838 { 3888 {
3839 text_t *t1 = ov_text[y]; 3889 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov_rend[y]; 3890 rend_t *r1 = ov.rend[y];
3841 3891
3842 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3892 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3843 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3893 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3844 3894
3845 for (int x = ov_w; x--; ) 3895 for (int x = ov.w; x--; )
3846 { 3896 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3897 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3898 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3849 } 3899 }
3850 } 3900 }

Diff Legend

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