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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
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
… …
1026 1026
1027 want_refresh = 1; 1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034#endif
1031 else 1035 else
1032 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1033} 1037}
1034 1038
1035/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1342 return; 1346 return;
1343 1347
1344 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1345 1349
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)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1353 {
1353 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1354 1355
1355 if (mapped && !view_start) 1356 if (mapped)
1356 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1359 } 1360 }
1360 else 1361 else
1361 { 1362 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1364
1364 if (mapped && !view_start) 1365 if (mapped)
1365 { 1366 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1376 1377
1377 for (; num--; row++) 1378 for (; num--; row++)
1378 { 1379 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1380 1381
1381 if (!view_start) 1382 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1384 }
1384} 1385}
1385 1386
1386#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1387void 1388void
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1842 {
1842 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1844 } 1845 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1849
1849 num_scr_allow = 0; 1850 num_scr_allow = 0;
1850 1851
… …
1941 1942
1942 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1944 }
1944 else 1945 else
1945 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1948#endif
1947} 1949}
1948 1950
1949/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1952/* ARGSUSED */
… …
1969 row_start = view_start; 1971 row_start = view_start;
1970 } 1972 }
1971 1973
1972 wctomb (0, 0); 1974 wctomb (0, 0);
1973 1975
1974 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1977 {
1976 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1978 1980
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2090 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2091#else 2093#else
2092 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2093#endif 2095#endif
2094 2096
2095 if (showcursor && focus) 2097 if (focus)
2096 { 2098 {
2097 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2099 else 2101 else
2100 { 2102 {
… …
2236 2238
2237 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2241 --col;
2240 2242
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2244 text_t *text = stp + col;
2243 int count = 1; 2245 int count = 1;
2244 2246
2245 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2246 drp[col] = rend; 2248 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2251 { 2253 {
2252 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2253 { 2255 {
2254 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2255 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2256 count++; 2259 count++;
2257 i++; 2260 i++;
2258 2261
2259 continue; 2262 continue;
2260 } 2263 }
… …
2290 */ 2293 */
2291 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2293 2296
2294 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2299 {
2297 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2298 2301
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2322
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2324 fore = Color_UL;
2322#endif 2325#endif
2323 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2324 if (invert) 2347 if (invert)
2325 { 2348 {
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); 2349 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2350
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#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) 2352 if (fore == back)
2344 { 2353 {
2345 fore = Color_bg; 2354 fore = Color_bg;
2346 back = Color_fg; 2355 back = Color_fg;
2347 } 2356 }
… …
2600 { 2609 {
2601#if !ENABLE_MINIMAL 2610#if !ENABLE_MINIMAL
2602 if (selection.rect) 2611 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2612 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2613 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2614 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2615 else
2607#endif 2616#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2617 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2618 selection.end.row, selection.end.col,
2610 RS_RVid); 2619 RS_Sel | RS_RVid);
2611 } 2620 }
2612} 2621}
2613 2622
2614/* ------------------------------------------------------------------------- */ 2623/* ------------------------------------------------------------------------- */
2615/* 2624/*
… …
2676/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2677/* 2686/*
2678 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2679 */ 2688 */
2680void 2689void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2691{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2690 2699
2691 tt_write (data, len); 2700 tt_write (data, len);
2692 2701
2693 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2703 tt_printf ("\e[201~");
2704}
2705
2706void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{
2709 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2710 return;
2711
2712 tt_paste (data, len);
2695} 2713}
2696 2714
2697/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2698/* 2716/*
2699 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2908 selection_wait = Sel_normal; 2926 selection_wait = Sel_normal;
2909 2927
2910#if X_HAVE_UTF8_STRING 2928#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String; 2929 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return; 2931 return;
2914#else 2932#else
2915 selection_type = Sel_CompoundText; 2933 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return; 2935 return;
2918#endif 2936#endif
2919 } 2937 }
2920 2938
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false); 2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2950/* 2968/*
2951 * Clear all selected text 2969 * Clear all selected text
2952 * EXT: SelectionClear 2970 * EXT: SelectionClear
2953 */ 2971 */
2954void 2972void
2955rxvt_term::selection_clear () NOTHROW 2973rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2974{
2975 if (!clipboard)
2976 {
2957 want_refresh = 1; 2977 want_refresh = 1;
2958 free (selection.text); 2978 free (selection.text);
2959 selection.text = NULL; 2979 selection.text = NULL;
2960 selection.len = 0; 2980 selection.len = 0;
2961 CLEAR_SELECTION (); 2981 CLEAR_SELECTION ();
2962 2982
2963 if (display->selection_owner == this) 2983 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2984 display->selection_owner = 0;
2985 }
2986 else
2987 {
2988 free (selection.clip_text);
2989 selection.clip_text = NULL;
2990 selection.clip_len = 0;
2991
2992 if (display->clipboard_owner == this)
2993 display->clipboard_owner = 0;
2994 }
2965} 2995}
2966 2996
2967/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2968/* 2998/*
2969 * Copy a selection into the cut buffer 2999 * Copy a selection into the cut buffer
… …
3095 3125
3096 selection_grab (tm); 3126 selection_grab (tm);
3097} 3127}
3098 3128
3099bool 3129bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 3130rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 3131{
3132 Atom sel;
3133
3134 if (!clipboard)
3135 {
3102 selection_time = tm; 3136 selection_time = tm;
3137 sel = XA_PRIMARY;
3138 }
3139 else
3140 {
3141 clipboard_time = tm;
3142 sel = xa[XA_CLIPBOARD];
3143 }
3103 3144
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3145 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3146 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 3147 {
3107 display->set_selection_owner (this); 3148 display->set_selection_owner (this, clipboard);
3108 return true; 3149 return true;
3109 } 3150 }
3110 else 3151 else
3111 { 3152 {
3112 selection_clear (); 3153 selection_clear (clipboard);
3113 return false; 3154 return false;
3114 } 3155 }
3115 3156
3116#if 0 3157#if 0
3117 XTextProperty ct; 3158 XTextProperty ct;
… …
3612 else if (rq.target == xa[XA_MULTIPLE]) 3653 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3654 {
3614 /* TODO: Handle MULTIPLE */ 3655 /* TODO: Handle MULTIPLE */
3615 } 3656 }
3616#endif 3657#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3659 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3661 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property;
3663 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3621 ev.property = rq.property; 3668 ev.property = rq.property;
3622 } 3669 }
3623 else if (rq.target == XA_STRING 3670 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3671 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3672 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3658 { 3705 {
3659 target = xa[XA_COMPOUND_TEXT]; 3706 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3707 style = enc_compound_text;
3661 } 3708 }
3662 3709
3663 if (selection.text) 3710 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3711 {
3665 cl = selection.text; 3712 cl = selection.text;
3666 selectlen = selection.len; 3713 selectlen = selection.len;
3714 }
3715 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3716 {
3717 cl = selection.clip_text;
3718 selectlen = selection.clip_len;
3667 } 3719 }
3668 else 3720 else
3669 { 3721 {
3670 cl = L""; 3722 cl = L"";
3671 selectlen = 0; 3723 selectlen = 0;

Diff Legend

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