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.334 by sf-exg, Sun Feb 14 11:04:11 2010 UTC vs.
Revision 1.339 by sf-exg, Sat Apr 17 06:48:27 2010 UTC

2085 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2086#else 2086#else
2087 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2088#endif 2088#endif
2089 2089
2090 if (showcursor && focus) 2090 if (focus)
2091 { 2091 {
2092 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2094 else 2094 else
2095 { 2095 {
2231 2231
2232 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2234 --col;
2235 2235
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2237 text_t *text = stp + col;
2238 int count = 1; 2238 int count = 1;
2239 2239
2240 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2241 drp[col] = rend; 2241 drp[col] = rend;
2904 selection_wait = Sel_normal; 2904 selection_wait = Sel_normal;
2905 2905
2906#if X_HAVE_UTF8_STRING 2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2909 return;
2910#else 2910#else
2911 selection_type = Sel_CompoundText; 2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2913 return;
2914#endif 2914#endif
2915 } 2915 }
2916 2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2918 selection_paste (display->root, XA_CUT_BUFFER0, false);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines