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.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC vs.
Revision 1.342 by root, Thu Jul 1 20:02:43 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
… …
544 want_refresh = 1; 546 want_refresh = 1;
545 view_start = 0; 547 view_start = 0;
546 548
547 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
548 550
549 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
550 552
551#if NSCREENS 553#if NSCREENS
552 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
553 { 555 {
554 num_scr = 0; 556 num_scr = 0;
… …
1336 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1337 1339
1338 // TODO: the code below does not work when view_start != 0 1340 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh 1341 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious. 1342 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1346 {
1345 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1346 1348
… …
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
2334 back = Color_HC;
2335 invert = 0;
2336 }
2337 }
2338#endif
2339
2318 if (invert) 2340 if (invert)
2319 { 2341 {
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); 2342 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2343
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2344#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) 2345 if (fore == back)
2338 { 2346 {
2339 fore = Color_bg; 2347 fore = Color_bg;
2340 back = Color_fg; 2348 back = Color_fg;
2341 } 2349 }
… …
2594 { 2602 {
2595#if !ENABLE_MINIMAL 2603#if !ENABLE_MINIMAL
2596 if (selection.rect) 2604 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2605 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2606 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2607 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2608 else
2601#endif 2609#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2610 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2604 RS_RVid); 2612 RS_Sel | RS_RVid);
2605 } 2613 }
2606} 2614}
2607 2615
2608/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2609/* 2617/*
… …
2902 selection_wait = Sel_normal; 2910 selection_wait = Sel_normal;
2903 2911
2904#if X_HAVE_UTF8_STRING 2912#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2913 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2915 return;
2908#else 2916#else
2909 selection_type = Sel_CompoundText; 2917 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2919 return;
2912#endif 2920#endif
2913 } 2921 }
2914 2922
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2952/*
2945 * Clear all selected text 2953 * Clear all selected text
2946 * EXT: SelectionClear 2954 * EXT: SelectionClear
2947 */ 2955 */
2948void 2956void
2949rxvt_term::selection_clear () NOTHROW 2957rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2958{
2959 if (!clipboard)
2960 {
2951 want_refresh = 1; 2961 want_refresh = 1;
2952 free (selection.text); 2962 free (selection.text);
2953 selection.text = NULL; 2963 selection.text = NULL;
2954 selection.len = 0; 2964 selection.len = 0;
2955 CLEAR_SELECTION (); 2965 CLEAR_SELECTION ();
2956 2966
2957 if (display->selection_owner == this) 2967 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2968 display->selection_owner = 0;
2969 }
2970 else
2971 {
2972 free (selection.clip_text);
2973 selection.clip_text = NULL;
2974 selection.clip_len = 0;
2975
2976 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0;
2978 }
2979}
2980
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2959} 2993}
2960 2994
2961/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2962/* 2996/*
2963 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3089 3123
3090 selection_grab (tm); 3124 selection_grab (tm);
3091} 3125}
3092 3126
3093bool 3127bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3096 selection_time = tm; 3134 selection_time = tm;
3135 sel = XA_PRIMARY;
3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3097 3142
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3145 {
3101 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3102 return true; 3147 return true;
3103 } 3148 }
3104 else 3149 else
3105 { 3150 {
3106 selection_clear (); 3151 selection_clear (clipboard);
3107 return false; 3152 return false;
3108 } 3153 }
3109 3154
3110#if 0 3155#if 0
3111 XTextProperty ct; 3156 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3652 {
3608 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3609 } 3654 }
3610#endif 3655#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3657 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3615 ev.property = rq.property; 3666 ev.property = rq.property;
3616 } 3667 }
3617 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3703 {
3653 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3705 style = enc_compound_text;
3655 } 3706 }
3656 3707
3657 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3709 {
3659 cl = selection.text; 3710 cl = selection.text;
3660 selectlen = selection.len; 3711 selectlen = selection.len;
3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3661 } 3717 }
3662 else 3718 else
3663 { 3719 {
3664 cl = L""; 3720 cl = L"";
3665 selectlen = 0; 3721 selectlen = 0;

Diff Legend

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