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.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

… …
158 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
159 159
160void 160void
161rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
162{ 162{
163 scr_soft_reset ();
164
165 view_start = 0; 163 view_start = 0;
166 num_scr = 0; 164 num_scr = 0;
167 165
168 if (ncol == 0) 166 if (ncol == 0)
169 ncol = 80; 167 ncol = 80;
… …
233 selection.text = NULL; 231 selection.text = NULL;
234 selection.len = 0; 232 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
237 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
238 } 238 }
239 else 239 else
240 { 240 {
241 /* 241 /*
242 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
280 280
281 if (top_row) 281 if (top_row)
282 { 282 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
285 286
286 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 289
289 do 290 do
290 { 291 {
291 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 294 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 296
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 298 {
… …
395 394
396 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 397 }
399 398
399 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
404
400 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
401 406
402 prev_nrow = nrow; 407 prev_nrow = nrow;
403 prev_ncol = ncol; 408 prev_ncol = ncol;
404 409
… …
436void 441void
437rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
438{ 443{
439 scr_release (); 444 scr_release ();
440 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
441 scr_reset (); 448 scr_reset ();
442 449
443 scr_clear (true); 450 scr_clear (true);
444 scr_refresh (); 451 scr_refresh ();
445} 452}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 457 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 458#if ENABLE_OVERLAY
452 scr_overlay_off (); 459 scr_overlay_off ();
453#endif 460#endif
454 461
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 462 if (current_screen != PRIMARY)
458 scr_swap_screen (); 463 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 464
466 scr_scroll_region (0, MAX_ROWS - 1); 465 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 466 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 467 scr_insert_mode (0);
469} 468}
… …
511 } 510 }
512 511
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
519#endif
520} 517}
521 518
522void 519void
523rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
524{ 521{
… …
549 want_refresh = 1; 546 want_refresh = 1;
550 view_start = 0; 547 view_start = 0;
551 548
552 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
553 550
554 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
555 552
556#if NSCREENS 553#if NSCREENS
557 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
558 { 555 {
559 num_scr = 0; 556 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
786 } 783 }
787 } 784 }
788 785
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 789 int row = screen.cur.row;
795 790
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 792
798 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
… …
1002#endif 997#endif
1003 } 998 }
1004 999
1005 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
1006 1001
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1009#endif
1010} 1003}
1011 1004
1012/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1013/* 1006/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1541 { 1534 {
1542 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1543 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1544 } 1537 }
1545 1538
1546 scr_blank_line (*line, ncol - count, count, 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1548 1540
1549 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1543 {
1552 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1842 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1843 { 1835 {
1844 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1845 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1846 } 1838 }
1847// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1848 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 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); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1850 1842
1851 num_scr_allow = 0; 1843 num_scr_allow = 0;
1852 1844
… …
1943 1935
1944 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1945 } 1937 }
1946 else 1938 else
1947 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1941#endif
1949} 1942}
1950 1943
1951/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1945/* ARGSUSED */
… …
1971 row_start = view_start; 1964 row_start = view_start;
1972 } 1965 }
1973 1966
1974 wctomb (0, 0); 1967 wctomb (0, 0);
1975 1968
1976 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1977 { 1970 {
1978 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1979 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1980 1973
1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2010 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2004 */
2012void 2005void
2013rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
2014{ 2007{
2015 unsigned char have_bg,
2016 showcursor; /* show the cursor */
2017 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
2018 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
2019 int i; /* tmp */ 2010 int i; /* tmp */
2020#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
2021 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
2032 /* 2023 /*
2033 * A: set up vars 2024 * A: set up vars
2034 */ 2025 */
2035 refresh_count = 0; 2026 refresh_count = 0;
2036 2027
2028 unsigned int old_screen_flags = screen.flags;
2037 have_bg = 0; 2029 char have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2039 have_bg = bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2040#endif 2032#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2034
2043 /* 2035 /*
2044 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2045 */ 2037 */
2046 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2047 2046
2048 /* 2047 /*
2049 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2050 */ 2049 */
2051 { 2050 {
2052 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2053 2052
2054 showcursor = (screen.flags & Screen_VisibleCursor);
2055#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2056 if (hidden_cursor) 2054 if (hidden_cursor)
2057 showcursor = 0; 2055 showcursor = 0;
2058#endif 2056#endif
2059 2057
… …
2087 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2088#else 2086#else
2089 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2090#endif 2088#endif
2091 2089
2092 if (showcursor && focus) 2090 if (focus)
2093 { 2091 {
2094 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2095 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2096 else 2094 else
2097 { 2095 {
… …
2132 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2133 } 2131 }
2134 } 2132 }
2135 } 2133 }
2136 2134
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 2135#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2136 /*
2144 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2145 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2146 */ 2139 */
… …
2238 2231
2239 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2241 --col; 2234 --col;
2242 2235
2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2237 text_t *text = stp + col;
2245 int count = 1; 2238 int count = 1;
2246 2239
2247 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2248 drp[col] = rend; 2241 drp[col] = rend;
… …
2252 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2253 { 2246 {
2254 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2255 { 2248 {
2256 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2257 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2258 count++; 2252 count++;
2259 i++; 2253 i++;
2260 2254
2261 continue; 2255 continue;
2262 } 2256 }
… …
2292 */ 2286 */
2293 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2295 2289
2296 // only do special processing if any attributes are set, which is unlikely 2290 // 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))) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2298 { 2292 {
2299 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2300 2294
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2321 2315
2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2323 fore = Color_UL; 2317 fore = Color_UL;
2324#endif 2318#endif
2325 2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333 back = Color_HC;
2334 invert = 0;
2335 }
2336 }
2337#endif
2338
2326 if (invert) 2339 if (invert)
2327 { 2340 {
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); 2341 ::swap (fore, back);
2335#ifdef OPTION_HC
2336 else if (ISSET_PIXCOLOR (Color_HC))
2337 back = Color_HC;
2338#endif
2339 2342
2340#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#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) 2344 if (fore == back)
2346 { 2345 {
2347 fore = Color_bg; 2346 fore = Color_bg;
2348 back = Color_fg; 2347 back = Color_fg;
2349 } 2348 }
… …
2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2419 } 2418 }
2420 } /* for (col....) */ 2419 } /* for (col....) */
2421 } /* for (row....) */ 2420 } /* for (row....) */
2422 2421
2423#if ENABLE_OVERLAY
2424 scr_swap_overlay ();
2425#endif
2426 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427
2428 /* 2422 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2424 */
2431 if (showcursor) 2425 if (showcursor)
2432 { 2426 {
… …
2470 } 2464 }
2471 2465
2472 /* 2466 /*
2473 * H: cleanup selection 2467 * H: cleanup selection
2474 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2475 scr_reverse_selection (); 2474 scr_reverse_selection ();
2476 2475
2476 screen.flags = old_screen_flags;
2477 num_scr = 0; 2477 num_scr = 0;
2478 num_scr_allow = 1; 2478 num_scr_allow = 1;
2479} 2479}
2480 2480
2481void 2481void
… …
2601 { 2601 {
2602#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2603 if (selection.rect) 2603 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2607 else
2608#endif 2608#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2611 RS_RVid); 2611 RS_Sel | RS_RVid);
2612 } 2612 }
2613} 2613}
2614 2614
2615/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2616/* 2616/*
… …
2909 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2910 2910
2911#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2914 return;
2915#else 2915#else
2916 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2918 return;
2919#endif 2919#endif
2920 } 2920 }
2921 2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2951/*
2952 * Clear all selected text 2952 * Clear all selected text
2953 * EXT: SelectionClear 2953 * EXT: SelectionClear
2954 */ 2954 */
2955void 2955void
2956rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2957{
2958 if (!clipboard)
2959 {
2958 want_refresh = 1; 2960 want_refresh = 1;
2959 free (selection.text); 2961 free (selection.text);
2960 selection.text = NULL; 2962 selection.text = NULL;
2961 selection.len = 0; 2963 selection.len = 0;
2962 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2963 2965
2964 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2967 display->selection_owner = 0;
2968 }
2969 else
2970 {
2971 free (selection.clip_text);
2972 selection.clip_text = NULL;
2973 selection.clip_len = 0;
2974
2975 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0;
2977 }
2978}
2979
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2966} 2992}
2967 2993
2968/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2969/* 2995/*
2970 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3096 3122
3097 selection_grab (tm); 3123 selection_grab (tm);
3098} 3124}
3099 3125
3100bool 3126bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3103 selection_time = tm; 3133 selection_time = tm;
3134 sel = XA_PRIMARY;
3135 }
3136 else
3137 {
3138 clipboard_time = tm;
3139 sel = xa[XA_CLIPBOARD];
3140 }
3104 3141
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3144 {
3108 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3109 return true; 3146 return true;
3110 } 3147 }
3111 else 3148 else
3112 { 3149 {
3113 selection_clear (); 3150 selection_clear (clipboard);
3114 return false; 3151 return false;
3115 } 3152 }
3116 3153
3117#if 0 3154#if 0
3118 XTextProperty ct; 3155 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3651 {
3615 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3616 } 3653 }
3617#endif 3654#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3656 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3658 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property;
3660 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3665 ev.property = rq.property;
3623 } 3666 }
3624 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3702 {
3660 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3704 style = enc_compound_text;
3662 } 3705 }
3663 3706
3664 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3708 {
3666 cl = selection.text; 3709 cl = selection.text;
3667 selectlen = selection.len; 3710 selectlen = selection.len;
3711 }
3712 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3713 {
3714 cl = selection.clip_text;
3715 selectlen = selection.clip_len;
3668 } 3716 }
3669 else 3717 else
3670 { 3718 {
3671 cl = L""; 3719 cl = L"";
3672 selectlen = 0; 3720 selectlen = 0;
… …
3740 h += 2; min_it (h, nrow); 3788 h += 2; min_it (h, nrow);
3741 3789
3742 x -= 1; clamp_it (x, 0, ncol - w); 3790 x -= 1; clamp_it (x, 0, ncol - w);
3743 y -= 1; clamp_it (y, 0, nrow - h); 3791 y -= 1; clamp_it (y, 0, nrow - h);
3744 3792
3745 ov_x = x; ov_y = y; 3793 ov.x = x; ov.y = y;
3746 ov_w = w; ov_h = h; 3794 ov.w = w; ov.h = h;
3747 3795
3748 ov_text = new text_t *[h]; 3796 ov.text = new text_t *[h];
3749 ov_rend = new rend_t *[h]; 3797 ov.rend = new rend_t *[h];
3750 3798
3751 for (y = 0; y < h; y++) 3799 for (y = 0; y < h; y++)
3752 { 3800 {
3753 text_t *tp = ov_text[y] = new text_t[w]; 3801 text_t *tp = ov.text[y] = new text_t[w];
3754 rend_t *rp = ov_rend[y] = new rend_t[w]; 3802 rend_t *rp = ov.rend[y] = new rend_t[w];
3755 3803
3756 text_t t0, t1, t2; 3804 text_t t0, t1, t2;
3757 rend_t r = OVERLAY_RSTYLE; 3805 rend_t r = OVERLAY_RSTYLE;
3758 3806
3759 if (y == 0) 3807 if (y == 0)
… …
3778} 3826}
3779 3827
3780void 3828void
3781rxvt_term::scr_overlay_off () NOTHROW 3829rxvt_term::scr_overlay_off () NOTHROW
3782{ 3830{
3783 if (!ov_text) 3831 if (!ov.text)
3784 return; 3832 return;
3785 3833
3786 want_refresh = 1; 3834 want_refresh = 1;
3787 3835
3788 for (int y = 0; y < ov_h; y++) 3836 for (int y = 0; y < ov.h; y++)
3789 { 3837 {
3790 delete [] ov_text[y]; 3838 delete [] ov.text[y];
3791 delete [] ov_rend[y]; 3839 delete [] ov.rend[y];
3792 } 3840 }
3793 3841
3794 delete [] ov_text; ov_text = 0; 3842 delete [] ov.text; ov.text = 0;
3795 delete [] ov_rend; ov_rend = 0; 3843 delete [] ov.rend; ov.rend = 0;
3796} 3844}
3797 3845
3798void 3846void
3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3800{ 3848{
3801 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3849 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3802 return; 3850 return;
3803 3851
3804 x++, y++; 3852 x++, y++;
3805 3853
3806 ov_text[y][x] = text; 3854 ov.text[y][x] = text;
3807 ov_rend[y][x] = rend; 3855 ov.rend[y][x] = rend;
3808} 3856}
3809 3857
3810void 3858void
3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3859rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3812{ 3860{
… …
3831} 3879}
3832 3880
3833void 3881void
3834rxvt_term::scr_swap_overlay () NOTHROW 3882rxvt_term::scr_swap_overlay () NOTHROW
3835{ 3883{
3836 if (!ov_text) 3884 if (!ov.text)
3837 return; 3885 return;
3838 3886
3887 // hide cursor if it is within the overlay area
3888 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3889 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3890 screen.flags &= ~Screen_VisibleCursor;
3891
3839 // swap screen mem with overlay 3892 // swap screen mem with overlay
3840 for (int y = ov_h; y--; ) 3893 for (int y = ov.h; y--; )
3841 { 3894 {
3842 text_t *t1 = ov_text[y]; 3895 text_t *t1 = ov.text[y];
3843 rend_t *r1 = ov_rend[y]; 3896 rend_t *r1 = ov.rend[y];
3844 3897
3845 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3898 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; 3899 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3847 3900
3848 for (int x = ov_w; x--; ) 3901 for (int x = ov.w; x--; )
3849 { 3902 {
3850 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3903 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3851 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3904 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3852 } 3905 }
3853 } 3906 }

Diff Legend

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