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.326 by root, Wed Nov 5 13:04:51 2008 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
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2004 */
2010void 2005void
2011rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
2012{ 2007{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2010 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2023 /*
2031 * A: set up vars 2024 * A: set up vars
2032 */ 2025 */
2033 refresh_count = 0; 2026 refresh_count = 0;
2034 2027
2028 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2029 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2038#endif 2032#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2034
2041 /* 2035 /*
2042 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2043 */ 2037 */
2044 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2046
2046 /* 2047 /*
2047 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2048 */ 2049 */
2049 { 2050 {
2050 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2051 2052
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2054 if (hidden_cursor)
2055 showcursor = 0; 2055 showcursor = 0;
2056#endif 2056#endif
2057 2057
… …
2085 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2086#else 2086#else
2087 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2088#endif 2088#endif
2089 2089
2090 if (showcursor && focus) 2090 if (focus)
2091 { 2091 {
2092 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2094 else 2094 else
2095 { 2095 {
… …
2130 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2131 } 2131 }
2132 } 2132 }
2133 } 2133 }
2134 2134
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2136 /*
2142 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2144 */ 2139 */
… …
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;
… …
2250 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2251 { 2246 {
2252 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2253 { 2248 {
2254 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2255 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2256 count++; 2252 count++;
2257 i++; 2253 i++;
2258 2254
2259 continue; 2255 continue;
2260 } 2256 }
… …
2290 */ 2286 */
2291 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2293 2289
2294 // 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
2295 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)))
2296 { 2292 {
2297 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2298 2294
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2315
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2317 fore = Color_UL;
2322#endif 2318#endif
2323 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
2324 if (invert) 2339 if (invert)
2325 { 2340 {
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); 2341 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2342
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2343#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) 2344 if (fore == back)
2344 { 2345 {
2345 fore = Color_bg; 2346 fore = Color_bg;
2346 back = Color_fg; 2347 back = Color_fg;
2347 } 2348 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2417 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2418 }
2418 } /* for (col....) */ 2419 } /* for (col....) */
2419 } /* for (row....) */ 2420 } /* for (row....) */
2420 2421
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2422 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2423 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2424 */
2429 if (showcursor) 2425 if (showcursor)
2430 { 2426 {
… …
2468 } 2464 }
2469 2465
2470 /* 2466 /*
2471 * H: cleanup selection 2467 * H: cleanup selection
2472 */ 2468 */
2469#if ENABLE_OVERLAY
2470 scr_swap_overlay ();
2471#endif
2472 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2473
2473 scr_reverse_selection (); 2474 scr_reverse_selection ();
2474 2475
2476 screen.flags = old_screen_flags;
2475 num_scr = 0; 2477 num_scr = 0;
2476 num_scr_allow = 1; 2478 num_scr_allow = 1;
2477} 2479}
2478 2480
2479void 2481void
… …
2599 { 2601 {
2600#if !ENABLE_MINIMAL 2602#if !ENABLE_MINIMAL
2601 if (selection.rect) 2603 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2604 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2605 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2606 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2607 else
2606#endif 2608#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2609 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2610 selection.end.row, selection.end.col,
2609 RS_RVid); 2611 RS_Sel | RS_RVid);
2610 } 2612 }
2611} 2613}
2612 2614
2613/* ------------------------------------------------------------------------- */ 2615/* ------------------------------------------------------------------------- */
2614/* 2616/*
… …
2907 selection_wait = Sel_normal; 2909 selection_wait = Sel_normal;
2908 2910
2909#if X_HAVE_UTF8_STRING 2911#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String; 2912 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return; 2914 return;
2913#else 2915#else
2914 selection_type = Sel_CompoundText; 2916 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return; 2918 return;
2917#endif 2919#endif
2918 } 2920 }
2919 2921
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false); 2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2949/* 2951/*
2950 * Clear all selected text 2952 * Clear all selected text
2951 * EXT: SelectionClear 2953 * EXT: SelectionClear
2952 */ 2954 */
2953void 2955void
2954rxvt_term::selection_clear () NOTHROW 2956rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2957{
2958 if (!clipboard)
2959 {
2956 want_refresh = 1; 2960 want_refresh = 1;
2957 free (selection.text); 2961 free (selection.text);
2958 selection.text = NULL; 2962 selection.text = NULL;
2959 selection.len = 0; 2963 selection.len = 0;
2960 CLEAR_SELECTION (); 2964 CLEAR_SELECTION ();
2961 2965
2962 if (display->selection_owner == this) 2966 if (display->selection_owner == this)
2963 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 }
2964} 2992}
2965 2993
2966/* ------------------------------------------------------------------------- */ 2994/* ------------------------------------------------------------------------- */
2967/* 2995/*
2968 * Copy a selection into the cut buffer 2996 * Copy a selection into the cut buffer
… …
3094 3122
3095 selection_grab (tm); 3123 selection_grab (tm);
3096} 3124}
3097 3125
3098bool 3126bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 3127rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 3128{
3129 Atom sel;
3130
3131 if (!clipboard)
3132 {
3101 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 }
3102 3141
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3142 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3143 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 3144 {
3106 display->set_selection_owner (this); 3145 display->set_selection_owner (this, clipboard);
3107 return true; 3146 return true;
3108 } 3147 }
3109 else 3148 else
3110 { 3149 {
3111 selection_clear (); 3150 selection_clear (clipboard);
3112 return false; 3151 return false;
3113 } 3152 }
3114 3153
3115#if 0 3154#if 0
3116 XTextProperty ct; 3155 XTextProperty ct;
… …
3611 else if (rq.target == xa[XA_MULTIPLE]) 3650 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3651 {
3613 /* TODO: Handle MULTIPLE */ 3652 /* TODO: Handle MULTIPLE */
3614 } 3653 }
3615#endif 3654#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3656 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3619 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);
3620 ev.property = rq.property; 3665 ev.property = rq.property;
3621 } 3666 }
3622 else if (rq.target == XA_STRING 3667 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3668 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3669 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3657 { 3702 {
3658 target = xa[XA_COMPOUND_TEXT]; 3703 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3704 style = enc_compound_text;
3660 } 3705 }
3661 3706
3662 if (selection.text) 3707 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3708 {
3664 cl = selection.text; 3709 cl = selection.text;
3665 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;
3666 } 3716 }
3667 else 3717 else
3668 { 3718 {
3669 cl = L""; 3719 cl = L"";
3670 selectlen = 0; 3720 selectlen = 0;
… …
3738 h += 2; min_it (h, nrow); 3788 h += 2; min_it (h, nrow);
3739 3789
3740 x -= 1; clamp_it (x, 0, ncol - w); 3790 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3791 y -= 1; clamp_it (y, 0, nrow - h);
3742 3792
3743 ov_x = x; ov_y = y; 3793 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3794 ov.w = w; ov.h = h;
3745 3795
3746 ov_text = new text_t *[h]; 3796 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3797 ov.rend = new rend_t *[h];
3748 3798
3749 for (y = 0; y < h; y++) 3799 for (y = 0; y < h; y++)
3750 { 3800 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3801 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3802 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3803
3754 text_t t0, t1, t2; 3804 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3805 rend_t r = OVERLAY_RSTYLE;
3756 3806
3757 if (y == 0) 3807 if (y == 0)
… …
3776} 3826}
3777 3827
3778void 3828void
3779rxvt_term::scr_overlay_off () NOTHROW 3829rxvt_term::scr_overlay_off () NOTHROW
3780{ 3830{
3781 if (!ov_text) 3831 if (!ov.text)
3782 return; 3832 return;
3783 3833
3784 want_refresh = 1; 3834 want_refresh = 1;
3785 3835
3786 for (int y = 0; y < ov_h; y++) 3836 for (int y = 0; y < ov.h; y++)
3787 { 3837 {
3788 delete [] ov_text[y]; 3838 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3839 delete [] ov.rend[y];
3790 } 3840 }
3791 3841
3792 delete [] ov_text; ov_text = 0; 3842 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3843 delete [] ov.rend; ov.rend = 0;
3794} 3844}
3795 3845
3796void 3846void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3848{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3849 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3850 return;
3801 3851
3802 x++, y++; 3852 x++, y++;
3803 3853
3804 ov_text[y][x] = text; 3854 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3855 ov.rend[y][x] = rend;
3806} 3856}
3807 3857
3808void 3858void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3859rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3860{
… …
3829} 3879}
3830 3880
3831void 3881void
3832rxvt_term::scr_swap_overlay () NOTHROW 3882rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3883{
3834 if (!ov_text) 3884 if (!ov.text)
3835 return; 3885 return;
3836 3886
3887 // hide cursor if it is within the overlay area
3888 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3889 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3890 screen.flags &= ~Screen_VisibleCursor;
3891
3837 // swap screen mem with overlay 3892 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3893 for (int y = ov.h; y--; )
3839 { 3894 {
3840 text_t *t1 = ov_text[y]; 3895 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3896 rend_t *r1 = ov.rend[y];
3842 3897
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3898 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3899 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3900
3846 for (int x = ov_w; x--; ) 3901 for (int x = ov.w; x--; )
3847 { 3902 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3903 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3904 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3905 }
3851 } 3906 }

Diff Legend

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