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.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC

… …
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 seperate 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
… …
1336 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1337 1340
1338 // TODO: the code below does not work when view_start != 0 1341 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh 1342 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious. 1343 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1347 {
1345 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1346 1349
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1836 {
1834 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1836 } 1839 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 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); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1843
1841 num_scr_allow = 0; 1844 num_scr_allow = 0;
1842 1845
… …
2083 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2084#else 2087#else
2085 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2086#endif 2089#endif
2087 2090
2088 if (showcursor && focus) 2091 if (focus)
2089 { 2092 {
2090 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2092 else 2095 else
2093 { 2096 {
… …
2229 2232
2230 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2235 --col;
2233 2236
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2238 text_t *text = stp + col;
2236 int count = 1; 2239 int count = 1;
2237 2240
2238 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2239 drp[col] = rend; 2242 drp[col] = rend;
… …
2284 */ 2287 */
2285 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2287 2290
2288 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2293 {
2291 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2292 2295
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2316
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2318 fore = Color_UL;
2316#endif 2319#endif
2317 2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2318 if (invert) 2341 if (invert)
2319 { 2342 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2343 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2344
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2346 if (fore == back)
2338 { 2347 {
2339 fore = Color_bg; 2348 fore = Color_bg;
2340 back = Color_fg; 2349 back = Color_fg;
2341 } 2350 }
… …
2594 { 2603 {
2595#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2596 if (selection.rect) 2605 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2609 else
2601#endif 2610#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2604 RS_RVid); 2613 RS_Sel | RS_RVid);
2605 } 2614 }
2606} 2615}
2607 2616
2608/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2609/* 2618/*
… …
2902 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2903 2912
2904#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2916 return;
2908#else 2917#else
2909 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2920 return;
2912#endif 2921#endif
2913 } 2922 }
2914 2923
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2953/*
2945 * Clear all selected text 2954 * Clear all selected text
2946 * EXT: SelectionClear 2955 * EXT: SelectionClear
2947 */ 2956 */
2948void 2957void
2949rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2959{
2960 if (!clipboard)
2961 {
2951 want_refresh = 1; 2962 want_refresh = 1;
2952 free (selection.text); 2963 free (selection.text);
2953 selection.text = NULL; 2964 selection.text = NULL;
2954 selection.len = 0; 2965 selection.len = 0;
2955 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2956 2967
2957 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2959} 2980}
2960 2981
2961/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2962/* 2983/*
2963 * Copy a selection into the cut buffer 2984 * Copy a selection into the cut buffer
… …
3089 3110
3090 selection_grab (tm); 3111 selection_grab (tm);
3091} 3112}
3092 3113
3093bool 3114bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3115rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3116{
3117 Atom sel;
3118
3119 if (!clipboard)
3120 {
3096 selection_time = tm; 3121 selection_time = tm;
3122 sel = XA_PRIMARY;
3123 }
3124 else
3125 {
3126 clipboard_time = tm;
3127 sel = xa[XA_CLIPBOARD];
3128 }
3097 3129
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3130 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3131 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3132 {
3101 display->set_selection_owner (this); 3133 display->set_selection_owner (this, clipboard);
3102 return true; 3134 return true;
3103 } 3135 }
3104 else 3136 else
3105 { 3137 {
3106 selection_clear (); 3138 selection_clear (clipboard);
3107 return false; 3139 return false;
3108 } 3140 }
3109 3141
3110#if 0 3142#if 0
3111 XTextProperty ct; 3143 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3638 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3639 {
3608 /* TODO: Handle MULTIPLE */ 3640 /* TODO: Handle MULTIPLE */
3609 } 3641 }
3610#endif 3642#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3644 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3646 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property;
3648 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3615 ev.property = rq.property; 3653 ev.property = rq.property;
3616 } 3654 }
3617 else if (rq.target == XA_STRING 3655 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3656 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3657 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3690 {
3653 target = xa[XA_COMPOUND_TEXT]; 3691 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3692 style = enc_compound_text;
3655 } 3693 }
3656 3694
3657 if (selection.text) 3695 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3696 {
3659 cl = selection.text; 3697 cl = selection.text;
3660 selectlen = selection.len; 3698 selectlen = selection.len;
3699 }
3700 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3701 {
3702 cl = selection.clip_text;
3703 selectlen = selection.clip_len;
3661 } 3704 }
3662 else 3705 else
3663 { 3706 {
3664 cl = L""; 3707 cl = L"";
3665 selectlen = 0; 3708 selectlen = 0;

Diff Legend

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