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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 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;
… …
2250 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2251 { 2247 {
2252 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2253 { 2249 {
2254 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2255 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2256 count++; 2253 count++;
2257 i++; 2254 i++;
2258 2255
2259 continue; 2256 continue;
2260 } 2257 }
… …
2290 */ 2287 */
2291 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2293 2290
2294 // 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
2295 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)))
2296 { 2293 {
2297 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2298 2295
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2316
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2318 fore = Color_UL;
2322#endif 2319#endif
2323 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
2324 if (invert) 2341 if (invert)
2325 { 2342 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2343 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2344
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2346 if (fore == back)
2344 { 2347 {
2345 fore = Color_bg; 2348 fore = Color_bg;
2346 back = Color_fg; 2349 back = Color_fg;
2347 } 2350 }
… …
2600 { 2603 {
2601#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2602 if (selection.rect) 2605 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2609 else
2607#endif 2610#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2610 RS_RVid); 2613 RS_Sel | RS_RVid);
2611 } 2614 }
2612} 2615}
2613 2616
2614/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2615/* 2618/*
… …
2908 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2909 2912
2910#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return; 2916 return;
2914#else 2917#else
2915 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return; 2920 return;
2918#endif 2921#endif
2919 } 2922 }
2920 2923
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2950/* 2953/*
2951 * Clear all selected text 2954 * Clear all selected text
2952 * EXT: SelectionClear 2955 * EXT: SelectionClear
2953 */ 2956 */
2954void 2957void
2955rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2959{
2960 if (!clipboard)
2961 {
2957 want_refresh = 1; 2962 want_refresh = 1;
2958 free (selection.text); 2963 free (selection.text);
2959 selection.text = NULL; 2964 selection.text = NULL;
2960 selection.len = 0; 2965 selection.len = 0;
2961 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2962 2967
2963 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2980}
2981
2982void
2983rxvt_term::clipboard_copy (Time tm)
2984{
2985 if (selection.len > 0)
2986 {
2987 free (selection.clip_text);
2988 selection.clip_len = selection.len;
2989 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2990 memcpy (selection.clip_text, selection.text,
2991 sizeof (wchar_t) * selection.clip_len);
2992 selection_grab (tm, true);
2993 }
2965} 2994}
2966 2995
2967/* ------------------------------------------------------------------------- */ 2996/* ------------------------------------------------------------------------- */
2968/* 2997/*
2969 * Copy a selection into the cut buffer 2998 * Copy a selection into the cut buffer
… …
3095 3124
3096 selection_grab (tm); 3125 selection_grab (tm);
3097} 3126}
3098 3127
3099bool 3128bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 3129rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 3130{
3131 Atom sel;
3132
3133 if (!clipboard)
3134 {
3102 selection_time = tm; 3135 selection_time = tm;
3136 sel = XA_PRIMARY;
3137 }
3138 else
3139 {
3140 clipboard_time = tm;
3141 sel = xa[XA_CLIPBOARD];
3142 }
3103 3143
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3144 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3145 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 3146 {
3107 display->set_selection_owner (this); 3147 display->set_selection_owner (this, clipboard);
3108 return true; 3148 return true;
3109 } 3149 }
3110 else 3150 else
3111 { 3151 {
3112 selection_clear (); 3152 selection_clear (clipboard);
3113 return false; 3153 return false;
3114 } 3154 }
3115 3155
3116#if 0 3156#if 0
3117 XTextProperty ct; 3157 XTextProperty ct;
… …
3612 else if (rq.target == xa[XA_MULTIPLE]) 3652 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3653 {
3614 /* TODO: Handle MULTIPLE */ 3654 /* TODO: Handle MULTIPLE */
3615 } 3655 }
3616#endif 3656#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3658 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3660 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property;
3662 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3621 ev.property = rq.property; 3667 ev.property = rq.property;
3622 } 3668 }
3623 else if (rq.target == XA_STRING 3669 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3670 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3671 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3658 { 3704 {
3659 target = xa[XA_COMPOUND_TEXT]; 3705 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3706 style = enc_compound_text;
3661 } 3707 }
3662 3708
3663 if (selection.text) 3709 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3710 {
3665 cl = selection.text; 3711 cl = selection.text;
3666 selectlen = selection.len; 3712 selectlen = selection.len;
3713 }
3714 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3715 {
3716 cl = selection.clip_text;
3717 selectlen = selection.clip_len;
3667 } 3718 }
3668 else 3719 else
3669 { 3720 {
3670 cl = L""; 3721 cl = L"";
3671 selectlen = 0; 3722 selectlen = 0;

Diff Legend

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