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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.341 by root, Sat Apr 17 23:05:48 2010 UTC

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

Diff Legend

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