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.348 by sf-exg, Sat Oct 9 22:33:45 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;
… …
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909 912
910 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
913 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
914 c = NOCHAR; 919 c = NOCHAR;
915 // and try the same character next loop iteration 920 // and try the same character next loop iteration
916 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
917 } 925 }
918 926
919 line->touch (); 927 line->touch ();
920 928
921 do 929 do
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
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)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1349 {
1345 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1346 1351
1347 if (mapped && !view_start) 1352 if (mapped)
1348 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1351 } 1356 }
1352 else 1357 else
1353 { 1358 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1360
1356 if (mapped && !view_start) 1361 if (mapped)
1357 { 1362 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1368 1373
1369 for (; num--; row++) 1374 for (; num--; row++)
1370 { 1375 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1372 1377
1373 if (!view_start) 1378 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1380 }
1376} 1381}
1377 1382
1378#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1379void 1384void
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1838 {
1834 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1836 } 1841 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 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); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1845
1841 num_scr_allow = 0; 1846 num_scr_allow = 0;
1842 1847
… …
1933 1938
1934 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1940 }
1936 else 1941 else
1937 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1944#endif
1939} 1945}
1940 1946
1941/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1948/* ARGSUSED */
… …
1961 row_start = view_start; 1967 row_start = view_start;
1962 } 1968 }
1963 1969
1964 wctomb (0, 0); 1970 wctomb (0, 0);
1965 1971
1966 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1967 { 1973 {
1968 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1969 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1970 1976
1971 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2082 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2083#else 2089#else
2084 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2085#endif 2091#endif
2086 2092
2087 if (showcursor && focus) 2093 if (focus)
2088 { 2094 {
2089 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2091 else 2097 else
2092 { 2098 {
… …
2228 2234
2229 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2231 --col; 2237 --col;
2232 2238
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2240 text_t *text = stp + col;
2235 int count = 1; 2241 int count = 1;
2236 2242
2237 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2238 drp[col] = rend; 2244 drp[col] = rend;
… …
2283 */ 2289 */
2284 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2286 2292
2287 // only do special processing if any attributes are set, which is unlikely 2293 // 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))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2295 {
2290 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2291 2297
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2318
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2320 fore = Color_UL;
2315#endif 2321#endif
2316 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2317 if (invert) 2343 if (invert)
2318 { 2344 {
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); 2345 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2346
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#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) 2348 if (fore == back)
2337 { 2349 {
2338 fore = Color_bg; 2350 fore = Color_bg;
2339 back = Color_fg; 2351 back = Color_fg;
2340 } 2352 }
… …
2593 { 2605 {
2594#if !ENABLE_MINIMAL 2606#if !ENABLE_MINIMAL
2595 if (selection.rect) 2607 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2608 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2610 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2611 else
2600#endif 2612#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2613 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2614 selection.end.row, selection.end.col,
2603 RS_RVid); 2615 RS_Sel | RS_RVid);
2604 } 2616 }
2605} 2617}
2606 2618
2607/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2608/* 2620/*
… …
2669/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2670/* 2682/*
2671 * Paste a selection direct to the command fd 2683 * Paste a selection direct to the command fd
2672 */ 2684 */
2673void 2685void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2686rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2687{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2688 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2689 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2690 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2691 data[i] = C0_CR;
… …
2683 2695
2684 tt_write (data, len); 2696 tt_write (data, len);
2685 2697
2686 if (priv_modes & PrivMode_BracketPaste) 2698 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2699 tt_printf ("\e[201~");
2700}
2701
2702void
2703rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{
2705 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 return;
2707
2708 tt_paste (data, len);
2688} 2709}
2689 2710
2690/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2691/* 2712/*
2692 * Respond to a notification that a primary selection has been sent 2713 * Respond to a notification that a primary selection has been sent
… …
2901 selection_wait = Sel_normal; 2922 selection_wait = Sel_normal;
2902 2923
2903#if X_HAVE_UTF8_STRING 2924#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2925 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2926 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2927 return;
2907#else 2928#else
2908 selection_type = Sel_CompoundText; 2929 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2930 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2931 return;
2911#endif 2932#endif
2912 } 2933 }
2913 2934
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2935 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false); 2936 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2943/* 2964/*
2944 * Clear all selected text 2965 * Clear all selected text
2945 * EXT: SelectionClear 2966 * EXT: SelectionClear
2946 */ 2967 */
2947void 2968void
2948rxvt_term::selection_clear () NOTHROW 2969rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2970{
2971 if (!clipboard)
2972 {
2950 want_refresh = 1; 2973 want_refresh = 1;
2951 free (selection.text); 2974 free (selection.text);
2952 selection.text = NULL; 2975 selection.text = NULL;
2953 selection.len = 0; 2976 selection.len = 0;
2954 CLEAR_SELECTION (); 2977 CLEAR_SELECTION ();
2955 2978
2956 if (display->selection_owner == this) 2979 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2980 display->selection_owner = 0;
2981 }
2982 else
2983 {
2984 free (selection.clip_text);
2985 selection.clip_text = NULL;
2986 selection.clip_len = 0;
2987
2988 if (display->clipboard_owner == this)
2989 display->clipboard_owner = 0;
2990 }
2958} 2991}
2959 2992
2960/* ------------------------------------------------------------------------- */ 2993/* ------------------------------------------------------------------------- */
2961/* 2994/*
2962 * Copy a selection into the cut buffer 2995 * Copy a selection into the cut buffer
… …
3088 3121
3089 selection_grab (tm); 3122 selection_grab (tm);
3090} 3123}
3091 3124
3092bool 3125bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 3126rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 3127{
3128 Atom sel;
3129
3130 if (!clipboard)
3131 {
3095 selection_time = tm; 3132 selection_time = tm;
3133 sel = XA_PRIMARY;
3134 }
3135 else
3136 {
3137 clipboard_time = tm;
3138 sel = xa[XA_CLIPBOARD];
3139 }
3096 3140
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3141 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3142 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 3143 {
3100 display->set_selection_owner (this); 3144 display->set_selection_owner (this, clipboard);
3101 return true; 3145 return true;
3102 } 3146 }
3103 else 3147 else
3104 { 3148 {
3105 selection_clear (); 3149 selection_clear (clipboard);
3106 return false; 3150 return false;
3107 } 3151 }
3108 3152
3109#if 0 3153#if 0
3110 XTextProperty ct; 3154 XTextProperty ct;
… …
3605 else if (rq.target == xa[XA_MULTIPLE]) 3649 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3650 {
3607 /* TODO: Handle MULTIPLE */ 3651 /* TODO: Handle MULTIPLE */
3608 } 3652 }
3609#endif 3653#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3655 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3657 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3658 ev.property = rq.property;
3659 }
3660 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3661 {
3662 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3663 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3614 ev.property = rq.property; 3664 ev.property = rq.property;
3615 } 3665 }
3616 else if (rq.target == XA_STRING 3666 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3667 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3668 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3651 { 3701 {
3652 target = xa[XA_COMPOUND_TEXT]; 3702 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3703 style = enc_compound_text;
3654 } 3704 }
3655 3705
3656 if (selection.text) 3706 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3707 {
3658 cl = selection.text; 3708 cl = selection.text;
3659 selectlen = selection.len; 3709 selectlen = selection.len;
3710 }
3711 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3712 {
3713 cl = selection.clip_text;
3714 selectlen = selection.clip_len;
3660 } 3715 }
3661 else 3716 else
3662 { 3717 {
3663 cl = L""; 3718 cl = L"";
3664 selectlen = 0; 3719 selectlen = 0;

Diff Legend

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