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.317 by root, Tue Nov 4 15:09:51 2008 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
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 164 view_start = 0;
169 num_scr = 0; 165 num_scr = 0;
170 166
171 if (ncol == 0) 167 if (ncol == 0)
172 ncol = 80; 168 ncol = 80;
… …
174 if (nrow == 0) 170 if (nrow == 0)
175 nrow = 24; 171 nrow = 24;
176 172
177 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 174 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 175
183 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
185 { 178 {
186 //TODO//FIXME 179 //TODO//FIXME
… …
239 selection.text = NULL; 232 selection.text = NULL;
240 selection.len = 0; 233 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
243 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
244 } 239 }
245 else 240 else
246 { 241 {
247 /* 242 /*
248 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 281
287 if (top_row) 282 if (top_row)
288 { 283 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
291 287
292 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 290
295 do 291 do
296 { 292 {
297 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 295 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 297
304 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 ())
305 { 299 {
… …
399 delete old_ta; 393 delete old_ta;
400 delete old_ra; 394 delete old_ra;
401 395
402 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
404 399
405 free (tabs); 400 free (tabs);
406 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
411 prev_ncol = ncol; 409 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 410
421 tt_winch (); 411 tt_winch ();
422 412
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 414}
… …
436 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
437 427
438 free (row_buf); 428 free (row_buf);
439 free (swap_buf); 429 free (swap_buf);
440 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
441 free (tabs); 433 free (tabs);
442 434 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 435 }
445} 436}
446 437
447/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
448/* 439/*
449 * Hard reset 440 * Hard/Soft reset
450 */ 441 */
451void 442void
452rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
453{ 444{
454 scr_release (); 445 scr_release ();
455 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
456 scr_reset (); 449 scr_reset ();
457 450
458 scr_clear (true); 451 scr_clear (true);
459 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
460} 469}
461 470
462/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
502 } 511 }
503 512
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
510#endif
511} 518}
512 519
513void 520void
514rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
515{ 522{
… …
540 want_refresh = 1; 547 want_refresh = 1;
541 view_start = 0; 548 view_start = 0;
542 549
543 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
544 551
545 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
546 553
547#if NSCREENS 554#if NSCREENS
548 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
549 { 556 {
550 num_scr = 0; 557 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
777 } 784 }
778 } 785 }
779 786
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 790 int row = screen.cur.row;
786 791
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 793
789 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
993#endif 998#endif
994 } 999 }
995 1000
996 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
997 1002
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1000#endif
1001} 1004}
1002 1005
1003/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1004/* 1007/*
1005 * 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
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1334 return; 1337 return;
1335 1338
1336 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1337 1340
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1347 {
1343 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1344 1349
1345 if (mapped) 1350 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1351 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1352 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1353 (unsigned int)Height2Pixel (num), False);
1349 } 1354 }
1350 else 1355 else
1351 { 1356 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1358
1359 if (mapped && !view_start)
1360 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1363 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1364 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1365 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1366 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1362 } 1370 }
1363 1371
1364 for (; num--; row++) 1372 for (; num--; row++)
1365 { 1373 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1378 }
1369} 1379}
1370 1380
1371#if !ENABLE_MINIMAL 1381#if !ENABLE_MINIMAL
1372void 1382void
… …
1525 { 1535 {
1526 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1528 } 1538 }
1529 1539
1530 scr_blank_line (*line, ncol - count, count, 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1541
1533 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1544 {
1536 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1836 {
1828 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1830 } 1839 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1832 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++)
1833 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);
1834 1843
1835 num_scr_allow = 0; 1844 num_scr_allow = 0;
1836 1845
… …
1927 1936
1928 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1938 }
1930 else 1939 else
1931 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1942#endif
1933} 1943}
1934 1944
1935/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */ 1946/* ARGSUSED */
… …
1955 row_start = view_start; 1965 row_start = view_start;
1956 } 1966 }
1957 1967
1958 wctomb (0, 0); 1968 wctomb (0, 0);
1959 1969
1960 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1971 {
1962 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1964 1974
1965 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
… …
1994 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2005 */
1996void 2006void
1997rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
1998{ 2008{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2011 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
2016 /* 2024 /*
2017 * A: set up vars 2025 * A: set up vars
2018 */ 2026 */
2019 refresh_count = 0; 2027 refresh_count = 0;
2020 2028
2029 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2030 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2024#endif 2033#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2035
2027 /* 2036 /*
2028 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2029 */ 2038 */
2030 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2031 2047
2032 /* 2048 /*
2033 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2034 */ 2050 */
2035 { 2051 {
2036 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2037 2053
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2055 if (hidden_cursor)
2041 showcursor = 0; 2056 showcursor = 0;
2042#endif 2057#endif
2043 2058
… …
2071 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2072#else 2087#else
2073 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2074#endif 2089#endif
2075 2090
2076 if (showcursor && focus) 2091 if (focus)
2077 { 2092 {
2078 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2080 else 2095 else
2081 { 2096 {
… …
2116 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2117 } 2132 }
2118 } 2133 }
2119 } 2134 }
2120 2135
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2137 /*
2128 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2130 */ 2140 */
… …
2222 2232
2223 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2225 --col; 2235 --col;
2226 2236
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2238 text_t *text = stp + col;
2229 int count = 1; 2239 int count = 1;
2230 2240
2231 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2232 drp[col] = rend; 2242 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2237 { 2247 {
2238 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2239 { 2249 {
2240 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2241 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2242 count++; 2253 count++;
2243 i++; 2254 i++;
2244 2255
2245 continue; 2256 continue;
2246 } 2257 }
… …
2276 */ 2287 */
2277 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2279 2290
2280 // 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
2281 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)))
2282 { 2293 {
2283 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2284 2295
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2316
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2318 fore = Color_UL;
2308#endif 2319#endif
2309 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
2310 if (invert) 2341 if (invert)
2311 { 2342 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2343 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2344
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2346 if (fore == back)
2330 { 2347 {
2331 fore = Color_bg; 2348 fore = Color_bg;
2332 back = Color_fg; 2349 back = Color_fg;
2333 } 2350 }
… …
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2420 }
2404 } /* for (col....) */ 2421 } /* for (col....) */
2405 } /* for (row....) */ 2422 } /* for (row....) */
2406 2423
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411
2412 /* 2424 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2426 */
2415 if (showcursor) 2427 if (showcursor)
2416 { 2428 {
… …
2454 } 2466 }
2455 2467
2456 /* 2468 /*
2457 * H: cleanup selection 2469 * H: cleanup selection
2458 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2459 scr_reverse_selection (); 2476 scr_reverse_selection ();
2460 2477
2478 screen.flags = old_screen_flags;
2461 num_scr = 0; 2479 num_scr = 0;
2462 num_scr_allow = 1; 2480 num_scr_allow = 1;
2463} 2481}
2464 2482
2465void 2483void
… …
2585 { 2603 {
2586#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2587 if (selection.rect) 2605 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2609 else
2592#endif 2610#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2595 RS_RVid); 2613 RS_Sel | RS_RVid);
2596 } 2614 }
2597} 2615}
2598 2616
2599/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2600/* 2618/*
… …
2661/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2662/* 2680/*
2663 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2664 */ 2682 */
2665void 2683void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2684rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2685{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2687 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2688 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2689 data[i] = C0_CR;
… …
2675 2693
2676 tt_write (data, len); 2694 tt_write (data, len);
2677 2695
2678 if (priv_modes & PrivMode_BracketPaste) 2696 if (priv_modes & PrivMode_BracketPaste)
2679 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);
2680} 2707}
2681 2708
2682/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2683/* 2710/*
2684 * Respond to a notification that a primary selection has been sent 2711 * Respond to a notification that a primary selection has been sent
… …
2893 selection_wait = Sel_normal; 2920 selection_wait = Sel_normal;
2894 2921
2895#if X_HAVE_UTF8_STRING 2922#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String; 2923 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return; 2925 return;
2899#else 2926#else
2900 selection_type = Sel_CompoundText; 2927 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return; 2929 return;
2903#endif 2930#endif
2904 } 2931 }
2905 2932
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false); 2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2935/* 2962/*
2936 * Clear all selected text 2963 * Clear all selected text
2937 * EXT: SelectionClear 2964 * EXT: SelectionClear
2938 */ 2965 */
2939void 2966void
2940rxvt_term::selection_clear () NOTHROW 2967rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2968{
2969 if (!clipboard)
2970 {
2942 want_refresh = 1; 2971 want_refresh = 1;
2943 free (selection.text); 2972 free (selection.text);
2944 selection.text = NULL; 2973 selection.text = NULL;
2945 selection.len = 0; 2974 selection.len = 0;
2946 CLEAR_SELECTION (); 2975 CLEAR_SELECTION ();
2947 2976
2948 if (display->selection_owner == this) 2977 if (display->selection_owner == this)
2949 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 }
2950} 2989}
2951 2990
2952/* ------------------------------------------------------------------------- */ 2991/* ------------------------------------------------------------------------- */
2953/* 2992/*
2954 * Copy a selection into the cut buffer 2993 * Copy a selection into the cut buffer
… …
3080 3119
3081 selection_grab (tm); 3120 selection_grab (tm);
3082} 3121}
3083 3122
3084bool 3123bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 3124rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 3125{
3126 Atom sel;
3127
3128 if (!clipboard)
3129 {
3087 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 }
3088 3138
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3139 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3140 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 3141 {
3092 display->set_selection_owner (this); 3142 display->set_selection_owner (this, clipboard);
3093 return true; 3143 return true;
3094 } 3144 }
3095 else 3145 else
3096 { 3146 {
3097 selection_clear (); 3147 selection_clear (clipboard);
3098 return false; 3148 return false;
3099 } 3149 }
3100 3150
3101#if 0 3151#if 0
3102 XTextProperty ct; 3152 XTextProperty ct;
… …
3597 else if (rq.target == xa[XA_MULTIPLE]) 3647 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3648 {
3599 /* TODO: Handle MULTIPLE */ 3649 /* TODO: Handle MULTIPLE */
3600 } 3650 }
3601#endif 3651#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3653 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3605 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);
3606 ev.property = rq.property; 3662 ev.property = rq.property;
3607 } 3663 }
3608 else if (rq.target == XA_STRING 3664 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3665 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3666 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3643 { 3699 {
3644 target = xa[XA_COMPOUND_TEXT]; 3700 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3701 style = enc_compound_text;
3646 } 3702 }
3647 3703
3648 if (selection.text) 3704 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3705 {
3650 cl = selection.text; 3706 cl = selection.text;
3651 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;
3652 } 3713 }
3653 else 3714 else
3654 { 3715 {
3655 cl = L""; 3716 cl = L"";
3656 selectlen = 0; 3717 selectlen = 0;
… …
3724 h += 2; min_it (h, nrow); 3785 h += 2; min_it (h, nrow);
3725 3786
3726 x -= 1; clamp_it (x, 0, ncol - w); 3787 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3788 y -= 1; clamp_it (y, 0, nrow - h);
3728 3789
3729 ov_x = x; ov_y = y; 3790 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3791 ov.w = w; ov.h = h;
3731 3792
3732 ov_text = new text_t *[h]; 3793 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3794 ov.rend = new rend_t *[h];
3734 3795
3735 for (y = 0; y < h; y++) 3796 for (y = 0; y < h; y++)
3736 { 3797 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3798 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3799 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3800
3740 text_t t0, t1, t2; 3801 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3802 rend_t r = OVERLAY_RSTYLE;
3742 3803
3743 if (y == 0) 3804 if (y == 0)
… …
3762} 3823}
3763 3824
3764void 3825void
3765rxvt_term::scr_overlay_off () NOTHROW 3826rxvt_term::scr_overlay_off () NOTHROW
3766{ 3827{
3767 if (!ov_text) 3828 if (!ov.text)
3768 return; 3829 return;
3769 3830
3770 want_refresh = 1; 3831 want_refresh = 1;
3771 3832
3772 for (int y = 0; y < ov_h; y++) 3833 for (int y = 0; y < ov.h; y++)
3773 { 3834 {
3774 delete [] ov_text[y]; 3835 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3836 delete [] ov.rend[y];
3776 } 3837 }
3777 3838
3778 delete [] ov_text; ov_text = 0; 3839 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3840 delete [] ov.rend; ov.rend = 0;
3780} 3841}
3781 3842
3782void 3843void
3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3844rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3784{ 3845{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3846 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3847 return;
3787 3848
3788 x++, y++; 3849 x++, y++;
3789 3850
3790 ov_text[y][x] = text; 3851 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3852 ov.rend[y][x] = rend;
3792} 3853}
3793 3854
3794void 3855void
3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3856rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3796{ 3857{
… …
3815} 3876}
3816 3877
3817void 3878void
3818rxvt_term::scr_swap_overlay () NOTHROW 3879rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3880{
3820 if (!ov_text) 3881 if (!ov.text)
3821 return; 3882 return;
3822 3883
3884 // hide cursor if it is within the overlay area
3885 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3886 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3887 screen.flags &= ~Screen_VisibleCursor;
3888
3823 // swap screen mem with overlay 3889 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3890 for (int y = ov.h; y--; )
3825 { 3891 {
3826 text_t *t1 = ov_text[y]; 3892 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3893 rend_t *r1 = ov.rend[y];
3828 3894
3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3895 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3896 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3831 3897
3832 for (int x = ov_w; x--; ) 3898 for (int x = ov.w; x--; )
3833 { 3899 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3900 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3901 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3836 } 3902 }
3837 } 3903 }

Diff Legend

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