ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.326 by root, Wed Nov 5 13:04:51 2008 UTC vs.
Revision 1.348 by sf-exg, Sat Oct 9 22:33:45 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
… …
231 selection.text = NULL; 232 selection.text = NULL;
232 selection.len = 0; 233 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
235 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
236 } 239 }
237 else 240 else
238 { 241 {
239 /* 242 /*
240 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 290
288 do 291 do
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 295 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 297
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 299 {
… …
510 } 511 }
511 512
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
518#endif
519} 518}
520 519
521void 520void
522rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
523{ 522{
… …
548 want_refresh = 1; 547 want_refresh = 1;
549 view_start = 0; 548 view_start = 0;
550 549
551 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
552 551
553 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
554 553
555#if NSCREENS 554#if NSCREENS
556 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
557 { 556 {
558 num_scr = 0; 557 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
785 } 784 }
786 } 785 }
787 786
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 790 int row = screen.cur.row;
794 791
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 793
797 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 912
916 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
919 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
920 c = NOCHAR; 919 c = NOCHAR;
921 // and try the same character next loop iteration 920 // and try the same character next loop iteration
922 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
923 } 925 }
924 926
925 line->touch (); 927 line->touch ();
926 928
927 do 929 do
… …
1001#endif 1003#endif
1002 } 1004 }
1003 1005
1004 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1005 1007
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1008#endif
1009} 1009}
1010 1010
1011/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1012/* 1012/*
1013 * 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
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1342 return; 1342 return;
1343 1343
1344 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1345 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1349 {
1353 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1354 1351
1355 if (mapped && !view_start) 1352 if (mapped)
1356 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1359 } 1356 }
1360 else 1357 else
1361 { 1358 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1360
1364 if (mapped && !view_start) 1361 if (mapped)
1365 { 1362 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1376 1373
1377 for (; num--; row++) 1374 for (; num--; row++)
1378 { 1375 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1380 1377
1381 if (!view_start) 1378 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1380 }
1384} 1381}
1385 1382
1386#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1387void 1384void
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1838 {
1842 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1844 } 1841 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1845
1849 num_scr_allow = 0; 1846 num_scr_allow = 0;
1850 1847
… …
1941 1938
1942 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1940 }
1944 else 1941 else
1945 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1944#endif
1947} 1945}
1948 1946
1949/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1948/* ARGSUSED */
… …
1969 row_start = view_start; 1967 row_start = view_start;
1970 } 1968 }
1971 1969
1972 wctomb (0, 0); 1970 wctomb (0, 0);
1973 1971
1974 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1973 {
1976 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1978 1976
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2007 */
2010void 2008void
2011rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
2012{ 2010{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2013 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2026 /*
2031 * A: set up vars 2027 * A: set up vars
2032 */ 2028 */
2033 refresh_count = 0; 2029 refresh_count = 0;
2034 2030
2031 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2032 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bgPixmap.pixmap != None;
2038#endif 2035#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2037
2041 /* 2038 /*
2042 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2043 */ 2040 */
2044 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2049
2046 /* 2050 /*
2047 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2048 */ 2052 */
2049 { 2053 {
2050 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2051 2055
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2057 if (hidden_cursor)
2055 showcursor = 0; 2058 showcursor = 0;
2056#endif 2059#endif
2057 2060
… …
2085 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2086#else 2089#else
2087 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2088#endif 2091#endif
2089 2092
2090 if (showcursor && focus) 2093 if (focus)
2091 { 2094 {
2092 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2094 else 2097 else
2095 { 2098 {
… …
2130 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2131 } 2134 }
2132 } 2135 }
2133 } 2136 }
2134 2137
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2139 /*
2142 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2144 */ 2142 */
… …
2236 2234
2237 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2237 --col;
2240 2238
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2240 text_t *text = stp + col;
2243 int count = 1; 2241 int count = 1;
2244 2242
2245 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2246 drp[col] = rend; 2244 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2251 { 2249 {
2252 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2253 { 2251 {
2254 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2255 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2256 count++; 2255 count++;
2257 i++; 2256 i++;
2258 2257
2259 continue; 2258 continue;
2260 } 2259 }
… …
2290 */ 2289 */
2291 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2293 2292
2294 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2295 {
2297 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2298 2297
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2318
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2320 fore = Color_UL;
2322#endif 2321#endif
2323 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2324 if (invert) 2343 if (invert)
2325 { 2344 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2345 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2346
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2348 if (fore == back)
2344 { 2349 {
2345 fore = Color_bg; 2350 fore = Color_bg;
2346 back = Color_fg; 2351 back = Color_fg;
2347 } 2352 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2422 }
2418 } /* for (col....) */ 2423 } /* for (col....) */
2419 } /* for (row....) */ 2424 } /* for (row....) */
2420 2425
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2426 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2428 */
2429 if (showcursor) 2429 if (showcursor)
2430 { 2430 {
… …
2468 } 2468 }
2469 2469
2470 /* 2470 /*
2471 * H: cleanup selection 2471 * H: cleanup selection
2472 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2473 scr_reverse_selection (); 2478 scr_reverse_selection ();
2474 2479
2480 screen.flags = old_screen_flags;
2475 num_scr = 0; 2481 num_scr = 0;
2476 num_scr_allow = 1; 2482 num_scr_allow = 1;
2477} 2483}
2478 2484
2479void 2485void
… …
2599 { 2605 {
2600#if !ENABLE_MINIMAL 2606#if !ENABLE_MINIMAL
2601 if (selection.rect) 2607 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2608 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2610 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2611 else
2606#endif 2612#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2613 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2614 selection.end.row, selection.end.col,
2609 RS_RVid); 2615 RS_Sel | RS_RVid);
2610 } 2616 }
2611} 2617}
2612 2618
2613/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2614/* 2620/*
… …
2675/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2676/* 2682/*
2677 * Paste a selection direct to the command fd 2683 * Paste a selection direct to the command fd
2678 */ 2684 */
2679void 2685void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2686rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2687{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2688 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2689 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2690 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2691 data[i] = C0_CR;
… …
2689 2695
2690 tt_write (data, len); 2696 tt_write (data, len);
2691 2697
2692 if (priv_modes & PrivMode_BracketPaste) 2698 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2699 tt_printf ("\e[201~");
2700}
2701
2702void
2703rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{
2705 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 return;
2707
2708 tt_paste (data, len);
2694} 2709}
2695 2710
2696/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2697/* 2712/*
2698 * Respond to a notification that a primary selection has been sent 2713 * Respond to a notification that a primary selection has been sent
… …
2907 selection_wait = Sel_normal; 2922 selection_wait = Sel_normal;
2908 2923
2909#if X_HAVE_UTF8_STRING 2924#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String; 2925 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2926 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return; 2927 return;
2913#else 2928#else
2914 selection_type = Sel_CompoundText; 2929 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2930 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return; 2931 return;
2917#endif 2932#endif
2918 } 2933 }
2919 2934
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2935 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false); 2936 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2949/* 2964/*
2950 * Clear all selected text 2965 * Clear all selected text
2951 * EXT: SelectionClear 2966 * EXT: SelectionClear
2952 */ 2967 */
2953void 2968void
2954rxvt_term::selection_clear () NOTHROW 2969rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2970{
2971 if (!clipboard)
2972 {
2956 want_refresh = 1; 2973 want_refresh = 1;
2957 free (selection.text); 2974 free (selection.text);
2958 selection.text = NULL; 2975 selection.text = NULL;
2959 selection.len = 0; 2976 selection.len = 0;
2960 CLEAR_SELECTION (); 2977 CLEAR_SELECTION ();
2961 2978
2962 if (display->selection_owner == this) 2979 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2980 display->selection_owner = 0;
2981 }
2982 else
2983 {
2984 free (selection.clip_text);
2985 selection.clip_text = NULL;
2986 selection.clip_len = 0;
2987
2988 if (display->clipboard_owner == this)
2989 display->clipboard_owner = 0;
2990 }
2964} 2991}
2965 2992
2966/* ------------------------------------------------------------------------- */ 2993/* ------------------------------------------------------------------------- */
2967/* 2994/*
2968 * Copy a selection into the cut buffer 2995 * Copy a selection into the cut buffer
… …
3094 3121
3095 selection_grab (tm); 3122 selection_grab (tm);
3096} 3123}
3097 3124
3098bool 3125bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 3126rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 3127{
3128 Atom sel;
3129
3130 if (!clipboard)
3131 {
3101 selection_time = tm; 3132 selection_time = tm;
3133 sel = XA_PRIMARY;
3134 }
3135 else
3136 {
3137 clipboard_time = tm;
3138 sel = xa[XA_CLIPBOARD];
3139 }
3102 3140
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3141 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3142 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 3143 {
3106 display->set_selection_owner (this); 3144 display->set_selection_owner (this, clipboard);
3107 return true; 3145 return true;
3108 } 3146 }
3109 else 3147 else
3110 { 3148 {
3111 selection_clear (); 3149 selection_clear (clipboard);
3112 return false; 3150 return false;
3113 } 3151 }
3114 3152
3115#if 0 3153#if 0
3116 XTextProperty ct; 3154 XTextProperty ct;
… …
3611 else if (rq.target == xa[XA_MULTIPLE]) 3649 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3650 {
3613 /* TODO: Handle MULTIPLE */ 3651 /* TODO: Handle MULTIPLE */
3614 } 3652 }
3615#endif 3653#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3655 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3657 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3658 ev.property = rq.property;
3659 }
3660 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3661 {
3662 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3663 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3620 ev.property = rq.property; 3664 ev.property = rq.property;
3621 } 3665 }
3622 else if (rq.target == XA_STRING 3666 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3667 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3668 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3657 { 3701 {
3658 target = xa[XA_COMPOUND_TEXT]; 3702 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3703 style = enc_compound_text;
3660 } 3704 }
3661 3705
3662 if (selection.text) 3706 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3707 {
3664 cl = selection.text; 3708 cl = selection.text;
3665 selectlen = selection.len; 3709 selectlen = selection.len;
3710 }
3711 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3712 {
3713 cl = selection.clip_text;
3714 selectlen = selection.clip_len;
3666 } 3715 }
3667 else 3716 else
3668 { 3717 {
3669 cl = L""; 3718 cl = L"";
3670 selectlen = 0; 3719 selectlen = 0;
… …
3738 h += 2; min_it (h, nrow); 3787 h += 2; min_it (h, nrow);
3739 3788
3740 x -= 1; clamp_it (x, 0, ncol - w); 3789 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3790 y -= 1; clamp_it (y, 0, nrow - h);
3742 3791
3743 ov_x = x; ov_y = y; 3792 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3793 ov.w = w; ov.h = h;
3745 3794
3746 ov_text = new text_t *[h]; 3795 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3796 ov.rend = new rend_t *[h];
3748 3797
3749 for (y = 0; y < h; y++) 3798 for (y = 0; y < h; y++)
3750 { 3799 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3800 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3801 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3802
3754 text_t t0, t1, t2; 3803 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3804 rend_t r = OVERLAY_RSTYLE;
3756 3805
3757 if (y == 0) 3806 if (y == 0)
… …
3776} 3825}
3777 3826
3778void 3827void
3779rxvt_term::scr_overlay_off () NOTHROW 3828rxvt_term::scr_overlay_off () NOTHROW
3780{ 3829{
3781 if (!ov_text) 3830 if (!ov.text)
3782 return; 3831 return;
3783 3832
3784 want_refresh = 1; 3833 want_refresh = 1;
3785 3834
3786 for (int y = 0; y < ov_h; y++) 3835 for (int y = 0; y < ov.h; y++)
3787 { 3836 {
3788 delete [] ov_text[y]; 3837 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3838 delete [] ov.rend[y];
3790 } 3839 }
3791 3840
3792 delete [] ov_text; ov_text = 0; 3841 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3842 delete [] ov.rend; ov.rend = 0;
3794} 3843}
3795 3844
3796void 3845void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3846rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3847{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3848 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3849 return;
3801 3850
3802 x++, y++; 3851 x++, y++;
3803 3852
3804 ov_text[y][x] = text; 3853 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3854 ov.rend[y][x] = rend;
3806} 3855}
3807 3856
3808void 3857void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3858rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3859{
… …
3829} 3878}
3830 3879
3831void 3880void
3832rxvt_term::scr_swap_overlay () NOTHROW 3881rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3882{
3834 if (!ov_text) 3883 if (!ov.text)
3835 return; 3884 return;
3836 3885
3886 // hide cursor if it is within the overlay area
3887 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3888 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3889 screen.flags &= ~Screen_VisibleCursor;
3890
3837 // swap screen mem with overlay 3891 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3892 for (int y = ov.h; y--; )
3839 { 3893 {
3840 text_t *t1 = ov_text[y]; 3894 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3895 rend_t *r1 = ov.rend[y];
3842 3896
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3897 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3898 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3899
3846 for (int x = ov_w; x--; ) 3900 for (int x = ov.w; x--; )
3847 { 3901 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3902 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3903 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3904 }
3851 } 3905 }

Diff Legend

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