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.329 by root, Sat Dec 26 10:24:04 2009 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
… …
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;
… …
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
… …
1933 1935
1934 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1937 }
1936 else 1938 else
1937 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1941#endif
1939} 1942}
1940 1943
1941/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1945/* ARGSUSED */
… …
1961 row_start = view_start; 1964 row_start = view_start;
1962 } 1965 }
1963 1966
1964 wctomb (0, 0); 1967 wctomb (0, 0);
1965 1968
1966 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 1970 {
1968 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1970 1973
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2082 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2083#else 2086#else
2084 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2085#endif 2088#endif
2086 2089
2087 if (showcursor && focus) 2090 if (focus)
2088 { 2091 {
2089 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2091 else 2094 else
2092 { 2095 {
… …
2228 2231
2229 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2231 --col; 2234 --col;
2232 2235
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2237 text_t *text = stp + col;
2235 int count = 1; 2238 int count = 1;
2236 2239
2237 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2238 drp[col] = rend; 2241 drp[col] = rend;
… …
2283 */ 2286 */
2284 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2286 2289
2287 // 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
2288 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)))
2289 { 2292 {
2290 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2291 2294
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2315
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2317 fore = Color_UL;
2315#endif 2318#endif
2316 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
2317 if (invert) 2339 if (invert)
2318 { 2340 {
2319#ifdef OPTION_HC
2320 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2321 || !ISSET_PIXCOLOR (Color_HC))
2322#endif
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 ::swap (fore, back); 2341 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2342
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#ifndef NO_BOLD_UNDERLINE_REVERSE
2332# ifndef OPTION_HC
2333 if (ISSET_PIXCOLOR (Color_RV))
2334 back = Color_RV;
2335# endif
2336 if (fore == back) 2344 if (fore == back)
2337 { 2345 {
2338 fore = Color_bg; 2346 fore = Color_bg;
2339 back = Color_fg; 2347 back = Color_fg;
2340 } 2348 }
… …
2593 { 2601 {
2594#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2595 if (selection.rect) 2603 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2607 else
2600#endif 2608#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2603 RS_RVid); 2611 RS_Sel | RS_RVid);
2604 } 2612 }
2605} 2613}
2606 2614
2607/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2608/* 2616/*
… …
2901 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2902 2910
2903#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2914 return;
2907#else 2915#else
2908 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2918 return;
2911#endif 2919#endif
2912 } 2920 }
2913 2921
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2943/* 2951/*
2944 * Clear all selected text 2952 * Clear all selected text
2945 * EXT: SelectionClear 2953 * EXT: SelectionClear
2946 */ 2954 */
2947void 2955void
2948rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2957{
2958 if (!clipboard)
2959 {
2950 want_refresh = 1; 2960 want_refresh = 1;
2951 free (selection.text); 2961 free (selection.text);
2952 selection.text = NULL; 2962 selection.text = NULL;
2953 selection.len = 0; 2963 selection.len = 0;
2954 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2955 2965
2956 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2957 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 }
2958} 2992}
2959 2993
2960/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2961/* 2995/*
2962 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3088 3122
3089 selection_grab (tm); 3123 selection_grab (tm);
3090} 3124}
3091 3125
3092bool 3126bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3095 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 }
3096 3141
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 3144 {
3100 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3101 return true; 3146 return true;
3102 } 3147 }
3103 else 3148 else
3104 { 3149 {
3105 selection_clear (); 3150 selection_clear (clipboard);
3106 return false; 3151 return false;
3107 } 3152 }
3108 3153
3109#if 0 3154#if 0
3110 XTextProperty ct; 3155 XTextProperty ct;
… …
3605 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3651 {
3607 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3608 } 3653 }
3609#endif 3654#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3656 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3613 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);
3614 ev.property = rq.property; 3665 ev.property = rq.property;
3615 } 3666 }
3616 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3651 { 3702 {
3652 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3704 style = enc_compound_text;
3654 } 3705 }
3655 3706
3656 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3708 {
3658 cl = selection.text; 3709 cl = selection.text;
3659 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;
3660 } 3716 }
3661 else 3717 else
3662 { 3718 {
3663 cl = L""; 3719 cl = L"";
3664 selectlen = 0; 3720 selectlen = 0;

Diff Legend

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