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.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC

… …
231 selection.text = NULL; 231 selection.text = NULL;
232 selection.len = 0; 232 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
235 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
236 } 238 }
237 else 239 else
238 { 240 {
239 /* 241 /*
240 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 289
288 do 290 do
289 { 291 {
290 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 294 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 296
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 298 {
… …
510 } 510 }
511 511
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
518#endif
519} 517}
520 518
521void 519void
522rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
523{ 521{
… …
548 want_refresh = 1; 546 want_refresh = 1;
549 view_start = 0; 547 view_start = 0;
550 548
551 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
552 550
553 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
554 552
555#if NSCREENS 553#if NSCREENS
556 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
557 { 555 {
558 num_scr = 0; 556 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
785 } 783 }
786 } 784 }
787 785
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 789 int row = screen.cur.row;
794 790
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 792
797 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
… …
1001#endif 997#endif
1002 } 998 }
1003 999
1004 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
1005 1001
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
1008#endif
1009} 1003}
1010 1004
1011/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1012/* 1006/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1835 {
1842 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1844 } 1838 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 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); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1842
1849 num_scr_allow = 0; 1843 num_scr_allow = 0;
1850 1844
… …
1941 1935
1942 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1937 }
1944 else 1938 else
1945 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1941#endif
1947} 1942}
1948 1943
1949/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1945/* ARGSUSED */
… …
1969 row_start = view_start; 1964 row_start = view_start;
1970 } 1965 }
1971 1966
1972 wctomb (0, 0); 1967 wctomb (0, 0);
1973 1968
1974 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1970 {
1976 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1978 1973
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2090 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2091#else 2086#else
2092 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2093#endif 2088#endif
2094 2089
2095 if (showcursor && focus) 2090 if (focus)
2096 { 2091 {
2097 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2099 else 2094 else
2100 { 2095 {
… …
2236 2231
2237 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2234 --col;
2240 2235
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2237 text_t *text = stp + col;
2243 int count = 1; 2238 int count = 1;
2244 2239
2245 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2246 drp[col] = rend; 2241 drp[col] = rend;
… …
2291 */ 2286 */
2292 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2294 2289
2295 // only do special processing if any attributes are set, which is unlikely 2290 // 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))) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2292 {
2298 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2299 2294
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2320 2315
2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2322 fore = Color_UL; 2317 fore = Color_UL;
2323#endif 2318#endif
2324 2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333 back = Color_HC;
2334 invert = 0;
2335 }
2336 }
2337#endif
2338
2325 if (invert) 2339 if (invert)
2326 { 2340 {
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); 2341 ::swap (fore, back);
2334#ifdef OPTION_HC
2335 else if (ISSET_PIXCOLOR (Color_HC))
2336 back = Color_HC;
2337#endif
2338 2342
2339#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#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) 2344 if (fore == back)
2345 { 2345 {
2346 fore = Color_bg; 2346 fore = Color_bg;
2347 back = Color_fg; 2347 back = Color_fg;
2348 } 2348 }
… …
2601 { 2601 {
2602#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2603 if (selection.rect) 2603 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2607 else
2608#endif 2608#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2611 RS_RVid); 2611 RS_Sel | RS_RVid);
2612 } 2612 }
2613} 2613}
2614 2614
2615/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2616/* 2616/*
… …
2909 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2910 2910
2911#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2914 return;
2915#else 2915#else
2916 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2918 return;
2919#endif 2919#endif
2920 } 2920 }
2921 2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2951/*
2952 * Clear all selected text 2952 * Clear all selected text
2953 * EXT: SelectionClear 2953 * EXT: SelectionClear
2954 */ 2954 */
2955void 2955void
2956rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2957{
2958 if (!clipboard)
2959 {
2958 want_refresh = 1; 2960 want_refresh = 1;
2959 free (selection.text); 2961 free (selection.text);
2960 selection.text = NULL; 2962 selection.text = NULL;
2961 selection.len = 0; 2963 selection.len = 0;
2962 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2963 2965
2964 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2967 display->selection_owner = 0;
2968 }
2969 else
2970 {
2971 free (selection.clip_text);
2972 selection.clip_text = NULL;
2973 selection.clip_len = 0;
2974
2975 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0;
2977 }
2978}
2979
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2966} 2992}
2967 2993
2968/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2969/* 2995/*
2970 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3096 3122
3097 selection_grab (tm); 3123 selection_grab (tm);
3098} 3124}
3099 3125
3100bool 3126bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3103 selection_time = tm; 3133 selection_time = tm;
3134 sel = XA_PRIMARY;
3135 }
3136 else
3137 {
3138 clipboard_time = tm;
3139 sel = xa[XA_CLIPBOARD];
3140 }
3104 3141
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3144 {
3108 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3109 return true; 3146 return true;
3110 } 3147 }
3111 else 3148 else
3112 { 3149 {
3113 selection_clear (); 3150 selection_clear (clipboard);
3114 return false; 3151 return false;
3115 } 3152 }
3116 3153
3117#if 0 3154#if 0
3118 XTextProperty ct; 3155 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3651 {
3615 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3616 } 3653 }
3617#endif 3654#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3656 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3658 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property;
3660 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3665 ev.property = rq.property;
3623 } 3666 }
3624 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3702 {
3660 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3704 style = enc_compound_text;
3662 } 3705 }
3663 3706
3664 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3708 {
3666 cl = selection.text; 3709 cl = selection.text;
3667 selectlen = selection.len; 3710 selectlen = selection.len;
3711 }
3712 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3713 {
3714 cl = selection.clip_text;
3715 selectlen = selection.clip_len;
3668 } 3716 }
3669 else 3717 else
3670 { 3718 {
3671 cl = L""; 3719 cl = L"";
3672 selectlen = 0; 3720 selectlen = 0;

Diff Legend

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