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.329 by root, Sat Dec 26 10:24:04 2009 UTC vs.
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
544 want_refresh = 1; 549 want_refresh = 1;
545 view_start = 0; 550 view_start = 0;
546 551
547 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
548 553
549 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
550 555
551#if NSCREENS 556#if NSCREENS
552 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
553 { 558 {
554 num_scr = 0; 559 num_scr = 0;
… …
895# else 900# else
896 c = 0xfffd; 901 c = 0xfffd;
897# endif 902# endif
898#endif 903#endif
899 904
900 // nuke the character at this position, if required
901 if (expect_false (
902 line->t[screen.cur.col] == NOCHAR
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909 906
910 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
913 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
914 c = NOCHAR; 913 c = NOCHAR;
915 // and try the same character next loop iteration 914 // and try the same character next loop iteration
916 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
917 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
918 927
919 line->touch (); 928 line->touch ();
920 929
921 do 930 do
922 { 931 {
… …
928 else 937 else
929 { 938 {
930 line->l = ncol; 939 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
933 break; 942
943 goto end_of_line;
934 } 944 }
935 945
936 c = NOCHAR; 946 c = NOCHAR;
937 } 947 }
938 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
939 949
940 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
942 { 952 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 953 line->t[c] = ' ';
948 line->r[c] = rend; 954 line->r[c] = rend;
949 }
950 } 955 }
956
957end_of_line:
958 ;
951 } 959 }
952#if ENABLE_COMBINING 960#if ENABLE_COMBINING
953 else // width == 0 961 else // width == 0
954 { 962 {
955 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1018 1026
1019 want_refresh = 1; 1027 want_refresh = 1;
1020#endif 1028#endif
1021 } 1029 }
1022 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1023 else 1033 else
1024 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1025} 1035}
1026 1036
1027/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1334 return; 1344 return;
1335 1345
1336 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1337 1347
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1351 {
1345 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1346 1353
1347 if (mapped && !view_start) 1354 if (mapped)
1348 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1351 } 1358 }
1352 else 1359 else
1353 { 1360 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1362
1356 if (mapped && !view_start) 1363 if (mapped)
1357 { 1364 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1368 1375
1369 for (; num--; row++) 1376 for (; num--; row++)
1370 { 1377 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1372 1379
1373 if (!view_start) 1380 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1382 }
1376} 1383}
1377 1384
1378#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1379void 1386void
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1840 {
1834 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1836 } 1843 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1847
1841 num_scr_allow = 0; 1848 num_scr_allow = 0;
1842 1849
… …
1933 1940
1934 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1942 }
1936 else 1943 else
1937 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1946#endif
1939} 1947}
1940 1948
1941/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1950/* ARGSUSED */
… …
1961 row_start = view_start; 1969 row_start = view_start;
1962 } 1970 }
1963 1971
1964 wctomb (0, 0); 1972 wctomb (0, 0);
1965 1973
1966 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 1975 {
1968 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1970 1978
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2082 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2083#else 2091#else
2084 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2085#endif 2093#endif
2086 2094
2087 if (showcursor && focus) 2095 if (focus)
2088 { 2096 {
2089 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2091 else 2099 else
2092 { 2100 {
… …
2228 2236
2229 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2231 --col; 2239 --col;
2232 2240
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2242 text_t *text = stp + col;
2235 int count = 1; 2243 int count = 1;
2236 2244
2237 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2238 drp[col] = rend; 2246 drp[col] = rend;
… …
2283 */ 2291 */
2284 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2286 2294
2287 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2288 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2297 {
2290 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2291 2299
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2320
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2322 fore = Color_UL;
2315#endif 2323#endif
2316 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2317 if (invert) 2345 if (invert)
2318 { 2346 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back); 2347 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2348
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back) 2350 if (fore == back)
2337 { 2351 {
2338 fore = Color_bg; 2352 fore = Color_bg;
2339 back = Color_fg; 2353 back = Color_fg;
2340 } 2354 }
… …
2593 { 2607 {
2594#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2595 if (selection.rect) 2609 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2613 else
2600#endif 2614#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2603 RS_RVid); 2617 RS_Sel | RS_RVid);
2604 } 2618 }
2605} 2619}
2606 2620
2607/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2608/* 2622/*
… …
2613void 2627void
2614rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2629{
2616 int row, wrote; 2630 int row, wrote;
2617 unsigned int width, towrite; 2631 unsigned int width, towrite;
2618 char r1[] = "\n"; 2632 const char r1[] = "\n";
2619 2633
2620 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2622 { 2636 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2669/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2670/* 2684/*
2671 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2672 */ 2686 */
2673void 2687void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2689{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2683 2697
2684 tt_write (data, len); 2698 tt_write (data, len);
2685 2699
2686 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2688} 2711}
2689 2712
2690/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2691/* 2714/*
2692 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2901 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2902 2925
2903#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2929 return;
2907#else 2930#else
2908 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2933 return;
2911#endif 2934#endif
2912 } 2935 }
2913 2936
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2943/* 2966/*
2944 * Clear all selected text 2967 * Clear all selected text
2945 * EXT: SelectionClear 2968 * EXT: SelectionClear
2946 */ 2969 */
2947void 2970void
2948rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2972{
2973 if (!clipboard)
2974 {
2950 want_refresh = 1; 2975 want_refresh = 1;
2951 free (selection.text); 2976 free (selection.text);
2952 selection.text = NULL; 2977 selection.text = NULL;
2953 selection.len = 0; 2978 selection.len = 0;
2954 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2955 2980
2956 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2958} 2993}
2959 2994
2960/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2961/* 2996/*
2962 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2964 */ 2999 */
2965void 3000void
2966rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2967{ 3002{
2968 int i; 3003 int size;
2969 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2970 text_t *t; 3005 text_t *t;
2971 3006
2972 switch (selection.op) 3007 switch (selection.op)
2973 { 3008 {
… …
2989 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2990 3025
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return; 3027 return;
2993 3028
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996 3031
2997 int ofs = 0; 3032 int ofs = 0;
2998 int extra = 0; 3033 int extra = 0;
2999 3034
3000 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3006 { 3041 {
3007#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3008 if (selection.rect) 3043 if (selection.rect)
3009 { 3044 {
3010 col = selection.beg.col; 3045 col = selection.beg.col;
3011 end_col = ncol + 1; 3046 end_col = selection.end.col;
3012 } 3047 }
3013 else 3048 else
3014#endif 3049#endif
3015 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3016 3051
3017 col = max (col, 0); 3052 col = max (col, 0);
3018 3053
3019 if (row == selection.end.row 3054 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3025 3056
3026 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3027 3058
3028 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3036 3067
3037 extra -= (len - 1); 3068 extra -= (len - 1);
3038 3069
3039 if (extra < 0) 3070 if (extra < 0)
3040 { 3071 {
3041 extra += i; 3072 extra += size;
3042 i += i; 3073 size += size;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044 } 3075 }
3045 3076
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 3078 }
3048#endif 3079#endif
… …
3060 3091
3061 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3062 } 3093 }
3063 else 3094 else
3064#endif 3095#endif
3065 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer () && row != selection.end.row
3097 && (row != selection.beg.row || selection.beg.col < ncol))
3066 new_selection_text[ofs++] = C0_LF; 3098 new_selection_text[ofs++] = C0_LF;
3067 } 3099 }
3068 3100
3069 if (end_col != selection.end.col) 3101 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
… …
3088 3120
3089 selection_grab (tm); 3121 selection_grab (tm);
3090} 3122}
3091 3123
3092bool 3124bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 3125rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 3126{
3127 Atom sel;
3128
3129 if (!clipboard)
3130 {
3095 selection_time = tm; 3131 selection_time = tm;
3132 sel = XA_PRIMARY;
3133 }
3134 else
3135 {
3136 clipboard_time = tm;
3137 sel = xa[XA_CLIPBOARD];
3138 }
3096 3139
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3140 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3141 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 3142 {
3100 display->set_selection_owner (this); 3143 display->set_selection_owner (this, clipboard);
3101 return true; 3144 return true;
3102 } 3145 }
3103 else 3146 else
3104 { 3147 {
3105 selection_clear (); 3148 selection_clear (clipboard);
3106 return false; 3149 return false;
3107 } 3150 }
3108 3151
3109#if 0 3152#if 0
3110 XTextProperty ct; 3153 XTextProperty ct;
… …
3605 else if (rq.target == xa[XA_MULTIPLE]) 3648 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3649 {
3607 /* TODO: Handle MULTIPLE */ 3650 /* TODO: Handle MULTIPLE */
3608 } 3651 }
3609#endif 3652#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3653 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3654 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3655 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3656 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657 ev.property = rq.property;
3658 }
3659 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3660 {
3661 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3662 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3614 ev.property = rq.property; 3663 ev.property = rq.property;
3615 } 3664 }
3616 else if (rq.target == XA_STRING 3665 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3666 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3667 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3651 { 3700 {
3652 target = xa[XA_COMPOUND_TEXT]; 3701 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3702 style = enc_compound_text;
3654 } 3703 }
3655 3704
3656 if (selection.text) 3705 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3706 {
3658 cl = selection.text; 3707 cl = selection.text;
3659 selectlen = selection.len; 3708 selectlen = selection.len;
3709 }
3710 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3711 {
3712 cl = selection.clip_text;
3713 selectlen = selection.clip_len;
3660 } 3714 }
3661 else 3715 else
3662 { 3716 {
3663 cl = L""; 3717 cl = L"";
3664 selectlen = 0; 3718 selectlen = 0;

Diff Legend

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