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.347 by sf-exg, Sat Aug 28 11:03:04 2010 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
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 separate 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
… …
544 want_refresh = 1; 547 want_refresh = 1;
545 view_start = 0; 548 view_start = 0;
546 549
547 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
548 551
549 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
550 553
551#if NSCREENS 554#if NSCREENS
552 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
553 { 556 {
554 num_scr = 0; 557 num_scr = 0;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1334 return; 1337 return;
1335 1338
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
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1341 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1344 {
1345 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1346 1346
1347 if (mapped && !view_start) 1347 if (mapped)
1348 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1351 } 1351 }
1352 else 1352 else
1353 { 1353 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1355
1356 if (mapped && !view_start) 1356 if (mapped)
1357 { 1357 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1361 0, Row2Pixel (row - view_start),
… …
1368 1368
1369 for (; num--; row++) 1369 for (; num--; row++)
1370 { 1370 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1372 1372
1373 if (!view_start) 1373 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1375 }
1376} 1376}
1377 1377
1378#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1379void 1379void
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1833 {
1834 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1836 } 1836 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1837
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1838 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); 1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1840
1841 num_scr_allow = 0; 1841 num_scr_allow = 0;
1842 1842
… …
2083 ccol2 = bgcolor_of (rstyle); 2083 ccol2 = bgcolor_of (rstyle);
2084#else 2084#else
2085 ccol2 = Color_bg; 2085 ccol2 = Color_bg;
2086#endif 2086#endif
2087 2087
2088 if (showcursor && focus) 2088 if (focus)
2089 { 2089 {
2090 if (option (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2092 else 2092 else
2093 { 2093 {
… …
2229 2229
2230 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2232 --col;
2233 2233
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2235 text_t *text = stp + col;
2236 int count = 1; 2236 int count = 1;
2237 2237
2238 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2239 drp[col] = rend; 2239 drp[col] = rend;
… …
2284 */ 2284 */
2285 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2287 2287
2288 // only do special processing if any attributes are set, which is unlikely 2288 // 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))) 2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2290 {
2291 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2292 2292
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2313
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2315 fore = Color_UL;
2316#endif 2316#endif
2317 2317
2318#ifdef OPTION_HC
2319 if (rend & RS_Sel)
2320 {
2321 /* invert the column if no highlightColor is set or it is the
2322 * current cursor column */
2323 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 && ISSET_PIXCOLOR (Color_HC))
2325 {
2326 if (ISSET_PIXCOLOR (Color_HTC))
2327 fore = Color_HTC;
2328 // if invert is 0 reverse video is set so we use bg color as fg color
2329 else if (!invert)
2330 fore = back;
2331
2332 back = Color_HC;
2333 invert = 0;
2334 }
2335 }
2336#endif
2337
2318 if (invert) 2338 if (invert)
2319 { 2339 {
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); 2340 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2341
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2342#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) 2343 if (fore == back)
2338 { 2344 {
2339 fore = Color_bg; 2345 fore = Color_bg;
2340 back = Color_fg; 2346 back = Color_fg;
2341 } 2347 }
… …
2594 { 2600 {
2595#if !ENABLE_MINIMAL 2601#if !ENABLE_MINIMAL
2596 if (selection.rect) 2602 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2605 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2606 else
2601#endif 2607#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2608 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2604 RS_RVid); 2610 RS_Sel | RS_RVid);
2605 } 2611 }
2606} 2612}
2607 2613
2608/* ------------------------------------------------------------------------- */ 2614/* ------------------------------------------------------------------------- */
2609/* 2615/*
… …
2670/* ------------------------------------------------------------------------- */ 2676/* ------------------------------------------------------------------------- */
2671/* 2677/*
2672 * Paste a selection direct to the command fd 2678 * Paste a selection direct to the command fd
2673 */ 2679 */
2674void 2680void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2681rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2682{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2686 data[i] = C0_CR;
… …
2684 2690
2685 tt_write (data, len); 2691 tt_write (data, len);
2686 2692
2687 if (priv_modes & PrivMode_BracketPaste) 2693 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2694 tt_printf ("\e[201~");
2695}
2696
2697void
2698rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699{
2700 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2701 return;
2702
2703 tt_paste (data, len);
2689} 2704}
2690 2705
2691/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2692/* 2707/*
2693 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
… …
2902 selection_wait = Sel_normal; 2917 selection_wait = Sel_normal;
2903 2918
2904#if X_HAVE_UTF8_STRING 2919#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2920 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2922 return;
2908#else 2923#else
2909 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2926 return;
2912#endif 2927#endif
2913 } 2928 }
2914 2929
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2959/*
2945 * Clear all selected text 2960 * Clear all selected text
2946 * EXT: SelectionClear 2961 * EXT: SelectionClear
2947 */ 2962 */
2948void 2963void
2949rxvt_term::selection_clear () NOTHROW 2964rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2965{
2966 if (!clipboard)
2967 {
2951 want_refresh = 1; 2968 want_refresh = 1;
2952 free (selection.text); 2969 free (selection.text);
2953 selection.text = NULL; 2970 selection.text = NULL;
2954 selection.len = 0; 2971 selection.len = 0;
2955 CLEAR_SELECTION (); 2972 CLEAR_SELECTION ();
2956 2973
2957 if (display->selection_owner == this) 2974 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2975 display->selection_owner = 0;
2976 }
2977 else
2978 {
2979 free (selection.clip_text);
2980 selection.clip_text = NULL;
2981 selection.clip_len = 0;
2982
2983 if (display->clipboard_owner == this)
2984 display->clipboard_owner = 0;
2985 }
2959} 2986}
2960 2987
2961/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2962/* 2989/*
2963 * Copy a selection into the cut buffer 2990 * Copy a selection into the cut buffer
… …
3089 3116
3090 selection_grab (tm); 3117 selection_grab (tm);
3091} 3118}
3092 3119
3093bool 3120bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3121rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3122{
3123 Atom sel;
3124
3125 if (!clipboard)
3126 {
3096 selection_time = tm; 3127 selection_time = tm;
3128 sel = XA_PRIMARY;
3129 }
3130 else
3131 {
3132 clipboard_time = tm;
3133 sel = xa[XA_CLIPBOARD];
3134 }
3097 3135
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3136 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3137 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3138 {
3101 display->set_selection_owner (this); 3139 display->set_selection_owner (this, clipboard);
3102 return true; 3140 return true;
3103 } 3141 }
3104 else 3142 else
3105 { 3143 {
3106 selection_clear (); 3144 selection_clear (clipboard);
3107 return false; 3145 return false;
3108 } 3146 }
3109 3147
3110#if 0 3148#if 0
3111 XTextProperty ct; 3149 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3644 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3645 {
3608 /* TODO: Handle MULTIPLE */ 3646 /* TODO: Handle MULTIPLE */
3609 } 3647 }
3610#endif 3648#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3650 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3652 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3653 ev.property = rq.property;
3654 }
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3656 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3615 ev.property = rq.property; 3659 ev.property = rq.property;
3616 } 3660 }
3617 else if (rq.target == XA_STRING 3661 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3662 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3663 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3696 {
3653 target = xa[XA_COMPOUND_TEXT]; 3697 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3698 style = enc_compound_text;
3655 } 3699 }
3656 3700
3657 if (selection.text) 3701 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3702 {
3659 cl = selection.text; 3703 cl = selection.text;
3660 selectlen = selection.len; 3704 selectlen = selection.len;
3705 }
3706 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3707 {
3708 cl = selection.clip_text;
3709 selectlen = selection.clip_len;
3661 } 3710 }
3662 else 3711 else
3663 { 3712 {
3664 cl = L""; 3713 cl = L"";
3665 selectlen = 0; 3714 selectlen = 0;

Diff Legend

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