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.328 by root, Sun Mar 29 13:36:03 2009 UTC vs.
Revision 1.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC

… …
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 seperate 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
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 290
288 do 291 do
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 295 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 297
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 299 {
… …
510 } 511 }
511 512
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
518#endif
519} 518}
520 519
521void 520void
522rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
523{ 522{
… …
548 want_refresh = 1; 547 want_refresh = 1;
549 view_start = 0; 548 view_start = 0;
550 549
551 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
552 551
553 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
554 553
555#if NSCREENS 554#if NSCREENS
556 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
557 { 556 {
558 num_scr = 0; 557 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
785 } 784 }
786 } 785 }
787 786
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 790 int row = screen.cur.row;
794 791
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 793
797 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
1001#endif 998#endif
1002 } 999 }
1003 1000
1004 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1005 1002
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1008#endif
1009} 1004}
1010 1005
1011/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1012/* 1007/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1344 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1345 1340
1346 // TODO: the code below does not work when view_start != 0 1341 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh 1342 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious. 1343 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1347 {
1353 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1354 1349
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1836 {
1842 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1844 } 1839 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1843
1849 num_scr_allow = 0; 1844 num_scr_allow = 0;
1850 1845
… …
1941 1936
1942 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1938 }
1944 else 1939 else
1945 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1942#endif
1947} 1943}
1948 1944
1949/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1946/* ARGSUSED */
… …
1969 row_start = view_start; 1965 row_start = view_start;
1970 } 1966 }
1971 1967
1972 wctomb (0, 0); 1968 wctomb (0, 0);
1973 1969
1974 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1971 {
1976 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1978 1974
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2090 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2091#else 2087#else
2092 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2093#endif 2089#endif
2094 2090
2095 if (showcursor && focus) 2091 if (focus)
2096 { 2092 {
2097 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2099 else 2095 else
2100 { 2096 {
… …
2236 2232
2237 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2235 --col;
2240 2236
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2238 text_t *text = stp + col;
2243 int count = 1; 2239 int count = 1;
2244 2240
2245 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2246 drp[col] = rend; 2242 drp[col] = rend;
… …
2291 */ 2287 */
2292 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2294 2290
2295 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2293 {
2298 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2299 2295
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2320 2316
2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2322 fore = Color_UL; 2318 fore = Color_UL;
2323#endif 2319#endif
2324 2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2325 if (invert) 2341 if (invert)
2326 { 2342 {
2327#ifdef OPTION_HC
2328 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 || !ISSET_PIXCOLOR (Color_HC))
2330#endif
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 ::swap (fore, back); 2343 ::swap (fore, back);
2334#ifdef OPTION_HC
2335 else if (ISSET_PIXCOLOR (Color_HC))
2336 back = Color_HC;
2337#endif
2338 2344
2339#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2340# ifndef OPTION_HC
2341 if (ISSET_PIXCOLOR (Color_RV))
2342 back = Color_RV;
2343# endif
2344 if (fore == back) 2346 if (fore == back)
2345 { 2347 {
2346 fore = Color_bg; 2348 fore = Color_bg;
2347 back = Color_fg; 2349 back = Color_fg;
2348 } 2350 }
… …
2601 { 2603 {
2602#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2603 if (selection.rect) 2605 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2609 else
2608#endif 2610#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2611 RS_RVid); 2613 RS_Sel | RS_RVid);
2612 } 2614 }
2613} 2615}
2614 2616
2615/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2616/* 2618/*
… …
2677/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2678/* 2680/*
2679 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2680 */ 2682 */
2681void 2683void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2684rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2685{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2687 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2688 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2689 data[i] = C0_CR;
… …
2691 2693
2692 tt_write (data, len); 2694 tt_write (data, len);
2693 2695
2694 if (priv_modes & PrivMode_BracketPaste) 2696 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2697 tt_printf ("\e[201~");
2698}
2699
2700void
2701rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{
2703 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 return;
2705
2706 tt_paste (data, len);
2696} 2707}
2697 2708
2698/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2699/* 2710/*
2700 * Respond to a notification that a primary selection has been sent 2711 * Respond to a notification that a primary selection has been sent
… …
2909 selection_wait = Sel_normal; 2920 selection_wait = Sel_normal;
2910 2921
2911#if X_HAVE_UTF8_STRING 2922#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2923 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2925 return;
2915#else 2926#else
2916 selection_type = Sel_CompoundText; 2927 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2929 return;
2919#endif 2930#endif
2920 } 2931 }
2921 2932
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2962/*
2952 * Clear all selected text 2963 * Clear all selected text
2953 * EXT: SelectionClear 2964 * EXT: SelectionClear
2954 */ 2965 */
2955void 2966void
2956rxvt_term::selection_clear () NOTHROW 2967rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2968{
2969 if (!clipboard)
2970 {
2958 want_refresh = 1; 2971 want_refresh = 1;
2959 free (selection.text); 2972 free (selection.text);
2960 selection.text = NULL; 2973 selection.text = NULL;
2961 selection.len = 0; 2974 selection.len = 0;
2962 CLEAR_SELECTION (); 2975 CLEAR_SELECTION ();
2963 2976
2964 if (display->selection_owner == this) 2977 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2978 display->selection_owner = 0;
2979 }
2980 else
2981 {
2982 free (selection.clip_text);
2983 selection.clip_text = NULL;
2984 selection.clip_len = 0;
2985
2986 if (display->clipboard_owner == this)
2987 display->clipboard_owner = 0;
2988 }
2966} 2989}
2967 2990
2968/* ------------------------------------------------------------------------- */ 2991/* ------------------------------------------------------------------------- */
2969/* 2992/*
2970 * Copy a selection into the cut buffer 2993 * Copy a selection into the cut buffer
… …
3096 3119
3097 selection_grab (tm); 3120 selection_grab (tm);
3098} 3121}
3099 3122
3100bool 3123bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3124rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3125{
3126 Atom sel;
3127
3128 if (!clipboard)
3129 {
3103 selection_time = tm; 3130 selection_time = tm;
3131 sel = XA_PRIMARY;
3132 }
3133 else
3134 {
3135 clipboard_time = tm;
3136 sel = xa[XA_CLIPBOARD];
3137 }
3104 3138
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3139 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3140 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3141 {
3108 display->set_selection_owner (this); 3142 display->set_selection_owner (this, clipboard);
3109 return true; 3143 return true;
3110 } 3144 }
3111 else 3145 else
3112 { 3146 {
3113 selection_clear (); 3147 selection_clear (clipboard);
3114 return false; 3148 return false;
3115 } 3149 }
3116 3150
3117#if 0 3151#if 0
3118 XTextProperty ct; 3152 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3647 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3648 {
3615 /* TODO: Handle MULTIPLE */ 3649 /* TODO: Handle MULTIPLE */
3616 } 3650 }
3617#endif 3651#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3653 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3655 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property;
3657 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3662 ev.property = rq.property;
3623 } 3663 }
3624 else if (rq.target == XA_STRING 3664 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3665 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3666 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3699 {
3660 target = xa[XA_COMPOUND_TEXT]; 3700 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3701 style = enc_compound_text;
3662 } 3702 }
3663 3703
3664 if (selection.text) 3704 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3705 {
3666 cl = selection.text; 3706 cl = selection.text;
3667 selectlen = selection.len; 3707 selectlen = selection.len;
3708 }
3709 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3710 {
3711 cl = selection.clip_text;
3712 selectlen = selection.clip_len;
3668 } 3713 }
3669 else 3714 else
3670 { 3715 {
3671 cl = L""; 3716 cl = L"";
3672 selectlen = 0; 3717 selectlen = 0;

Diff Legend

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