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

Diff Legend

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