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

… …
231 selection.text = NULL; 231 selection.text = NULL;
232 selection.len = 0; 232 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
235 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
236 } 238 }
237 else 239 else
238 { 240 {
239 /* 241 /*
240 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1835 {
1834 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1836 } 1838 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1838 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++)
1839 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);
1840 1842
1841 num_scr_allow = 0; 1843 num_scr_allow = 0;
1842 1844
… …
2083 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2084#else 2086#else
2085 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2086#endif 2088#endif
2087 2089
2088 if (showcursor && focus) 2090 if (focus)
2089 { 2091 {
2090 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2092 else 2094 else
2093 { 2095 {
… …
2229 2231
2230 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2234 --col;
2233 2235
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2237 text_t *text = stp + col;
2236 int count = 1; 2238 int count = 1;
2237 2239
2238 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2239 drp[col] = rend; 2241 drp[col] = rend;
… …
2284 */ 2286 */
2285 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2287 2289
2288 // 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
2289 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)))
2290 { 2292 {
2291 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2292 2294
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2315
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2317 fore = Color_UL;
2316#endif 2318#endif
2317 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
2318 if (invert) 2339 if (invert)
2319 { 2340 {
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); 2341 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2342
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#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) 2344 if (fore == back)
2338 { 2345 {
2339 fore = Color_bg; 2346 fore = Color_bg;
2340 back = Color_fg; 2347 back = Color_fg;
2341 } 2348 }
… …
2594 { 2601 {
2595#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2596 if (selection.rect) 2603 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2607 else
2601#endif 2608#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2604 RS_RVid); 2611 RS_Sel | RS_RVid);
2605 } 2612 }
2606} 2613}
2607 2614
2608/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2609/* 2616/*
… …
2902 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2903 2910
2904#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2914 return;
2908#else 2915#else
2909 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2918 return;
2912#endif 2919#endif
2913 } 2920 }
2914 2921
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2951/*
2945 * Clear all selected text 2952 * Clear all selected text
2946 * EXT: SelectionClear 2953 * EXT: SelectionClear
2947 */ 2954 */
2948void 2955void
2949rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2957{
2958 if (!clipboard)
2959 {
2951 want_refresh = 1; 2960 want_refresh = 1;
2952 free (selection.text); 2961 free (selection.text);
2953 selection.text = NULL; 2962 selection.text = NULL;
2954 selection.len = 0; 2963 selection.len = 0;
2955 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2956 2965
2957 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2958 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 }
2959} 2992}
2960 2993
2961/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2962/* 2995/*
2963 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3089 3122
3090 selection_grab (tm); 3123 selection_grab (tm);
3091} 3124}
3092 3125
3093bool 3126bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3096 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 }
3097 3141
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3144 {
3101 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3102 return true; 3146 return true;
3103 } 3147 }
3104 else 3148 else
3105 { 3149 {
3106 selection_clear (); 3150 selection_clear (clipboard);
3107 return false; 3151 return false;
3108 } 3152 }
3109 3153
3110#if 0 3154#if 0
3111 XTextProperty ct; 3155 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3651 {
3608 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3609 } 3653 }
3610#endif 3654#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3656 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 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);
3615 ev.property = rq.property; 3665 ev.property = rq.property;
3616 } 3666 }
3617 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3702 {
3653 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3704 style = enc_compound_text;
3655 } 3705 }
3656 3706
3657 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3708 {
3659 cl = selection.text; 3709 cl = selection.text;
3660 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;
3661 } 3716 }
3662 else 3717 else
3663 { 3718 {
3664 cl = L""; 3719 cl = L"";
3665 selectlen = 0; 3720 selectlen = 0;

Diff Legend

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