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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC

… …
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
231 selection.text = NULL; 232 selection.text = NULL;
232 selection.len = 0; 233 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
235 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
236 } 239 }
237 else 240 else
238 { 241 {
239 /* 242 /*
240 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
278 281
279 if (top_row) 282 if (top_row)
280 { 283 {
281 // 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
282 // 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
283 287
284 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 290
287 do 291 do
288 { 292 {
289 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 295 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 297
296 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 ())
297 { 299 {
… …
393 395
394 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 398 }
397 399
400 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
405
398 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
399 407
400 prev_nrow = nrow; 408 prev_nrow = nrow;
401 prev_ncol = ncol; 409 prev_ncol = ncol;
402 410
… …
434void 442void
435rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
436{ 444{
437 scr_release (); 445 scr_release ();
438 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
439 scr_soft_reset (); 448 scr_soft_reset ();
440 scr_reset (); 449 scr_reset ();
441 450
442 scr_clear (true); 451 scr_clear (true);
443 scr_refresh (); 452 scr_refresh ();
… …
449 /* only affects modes, nothing drastic such as clearing the screen */ 458 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 459#if ENABLE_OVERLAY
451 scr_overlay_off (); 460 scr_overlay_off ();
452#endif 461#endif
453 462
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY) 463 if (current_screen != PRIMARY)
457 scr_swap_screen (); 464 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464 465
465 scr_scroll_region (0, MAX_ROWS - 1); 466 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None); 467 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0); 468 scr_insert_mode (0);
468} 469}
… …
510 } 511 }
511 512
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
518#endif
519} 518}
520 519
521void 520void
522rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
523{ 522{
… …
548 want_refresh = 1; 547 want_refresh = 1;
549 view_start = 0; 548 view_start = 0;
550 549
551 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
552 551
553 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
554 553
555#if NSCREENS 554#if NSCREENS
556 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
557 { 556 {
558 num_scr = 0; 557 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
785 } 784 }
786 } 785 }
787 786
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 790 int row = screen.cur.row;
794 791
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 793
797 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
1001#endif 998#endif
1002 } 999 }
1003 1000
1004 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
1005 1002
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1008#endif
1009} 1004}
1010 1005
1011/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1012/* 1007/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1342 return; 1337 return;
1343 1338
1344 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1345 1340
1346 /*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.
1347 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1349 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1350 { 1347 {
1351 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1352 1349
1353 if (mapped) 1350 if (mapped && !view_start)
1354 XClearArea (dpy, vt, 0, 1351 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width, 1352 Row2Pixel (row - view_start), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False); 1353 (unsigned int)Height2Pixel (num), False);
1357 } 1354 }
1358 else 1355 else
1359 { 1356 {
1360 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1361 1358
1359 if (mapped && !view_start)
1360 {
1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364 XFillRectangle (dpy, vt, gc, 1363 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row), 1364 0, Row2Pixel (row - view_start),
1366 (unsigned int)width, 1365 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num)); 1366 (unsigned int)Height2Pixel (num));
1368 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1369 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1370 } 1370 }
1371 1371
1372 for (; num--; row++) 1372 for (; num--; row++)
1373 { 1373 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1375 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1376 } 1378 }
1377} 1379}
1378 1380
1379#if !ENABLE_MINIMAL 1381#if !ENABLE_MINIMAL
1380void 1382void
… …
1533 { 1535 {
1534 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1535 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1536 } 1538 }
1537 1539
1538 scr_blank_line (*line, ncol - count, count, 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540 1541
1541 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 { 1544 {
1544 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1834 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1835 { 1836 {
1836 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1837 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1838 } 1839 }
1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1840 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++)
1841 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);
1842 1843
1843 num_scr_allow = 0; 1844 num_scr_allow = 0;
1844 1845
… …
1935 1936
1936 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1937 } 1938 }
1938 else 1939 else
1939 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940#endif 1942#endif
1941} 1943}
1942 1944
1943/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1944/* ARGSUSED */ 1946/* ARGSUSED */
… …
1963 row_start = view_start; 1965 row_start = view_start;
1964 } 1966 }
1965 1967
1966 wctomb (0, 0); 1968 wctomb (0, 0);
1967 1969
1968 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969 { 1971 {
1970 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1971 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1972 1974
1973 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
… …
2002 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
2003 */ 2005 */
2004void 2006void
2005rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
2006{ 2008{
2007 unsigned char have_bg,
2008 showcursor; /* show the cursor */
2009 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
2010 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
2011 int i; /* tmp */ 2011 int i; /* tmp */
2012#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
2013 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
2024 /* 2024 /*
2025 * A: set up vars 2025 * A: set up vars
2026 */ 2026 */
2027 refresh_count = 0; 2027 refresh_count = 0;
2028 2028
2029 unsigned int old_screen_flags = screen.flags;
2029 have_bg = 0; 2030 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2032#endif 2033#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2035
2035 /* 2036 /*
2036 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2037 */ 2038 */
2038 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;
2039 2047
2040 /* 2048 /*
2041 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2042 */ 2050 */
2043 { 2051 {
2044 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2045 2053
2046 showcursor = (screen.flags & Screen_VisibleCursor);
2047#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2048 if (hidden_cursor) 2055 if (hidden_cursor)
2049 showcursor = 0; 2056 showcursor = 0;
2050#endif 2057#endif
2051 2058
… …
2079 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2080#else 2087#else
2081 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2082#endif 2089#endif
2083 2090
2084 if (showcursor && focus) 2091 if (focus)
2085 { 2092 {
2086 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2087 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2088 else 2095 else
2089 { 2096 {
… …
2124 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2125 } 2132 }
2126 } 2133 }
2127 } 2134 }
2128 2135
2129 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130#if ENABLE_OVERLAY
2131 scr_swap_overlay ();
2132#endif
2133
2134#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2135 /* 2137 /*
2136 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2137 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2138 */ 2140 */
… …
2230 2232
2231 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2232 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2233 --col; 2235 --col;
2234 2236
2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236 text_t *text = stp + col; 2238 text_t *text = stp + col;
2237 int count = 1; 2239 int count = 1;
2238 2240
2239 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2240 drp[col] = rend; 2242 drp[col] = rend;
… …
2244 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2245 { 2247 {
2246 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2247 { 2249 {
2248 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2249 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2250 count++; 2253 count++;
2251 i++; 2254 i++;
2252 2255
2253 continue; 2256 continue;
2254 } 2257 }
… …
2284 */ 2287 */
2285 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2287 2290
2288 // 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
2289 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)))
2290 { 2293 {
2291 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2292 2295
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2316
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2318 fore = Color_UL;
2316#endif 2319#endif
2317 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
2318 if (invert) 2341 if (invert)
2319 { 2342 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2343 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2344
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2346 if (fore == back)
2338 { 2347 {
2339 fore = Color_bg; 2348 fore = Color_bg;
2340 back = Color_fg; 2349 back = Color_fg;
2341 } 2350 }
… …
2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 } 2420 }
2412 } /* for (col....) */ 2421 } /* for (col....) */
2413 } /* for (row....) */ 2422 } /* for (row....) */
2414 2423
2415#if ENABLE_OVERLAY
2416 scr_swap_overlay ();
2417#endif
2418 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419
2420 /* 2424 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2426 */
2423 if (showcursor) 2427 if (showcursor)
2424 { 2428 {
… …
2462 } 2466 }
2463 2467
2464 /* 2468 /*
2465 * H: cleanup selection 2469 * H: cleanup selection
2466 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2467 scr_reverse_selection (); 2476 scr_reverse_selection ();
2468 2477
2478 screen.flags = old_screen_flags;
2469 num_scr = 0; 2479 num_scr = 0;
2470 num_scr_allow = 1; 2480 num_scr_allow = 1;
2471} 2481}
2472 2482
2473void 2483void
… …
2593 { 2603 {
2594#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2595 if (selection.rect) 2605 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2609 else
2600#endif 2610#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2603 RS_RVid); 2613 RS_Sel | RS_RVid);
2604 } 2614 }
2605} 2615}
2606 2616
2607/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2608/* 2618/*
… …
2901 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2902 2912
2903#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2916 return;
2907#else 2917#else
2908 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2920 return;
2911#endif 2921#endif
2912 } 2922 }
2913 2923
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2943/* 2953/*
2944 * Clear all selected text 2954 * Clear all selected text
2945 * EXT: SelectionClear 2955 * EXT: SelectionClear
2946 */ 2956 */
2947void 2957void
2948rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2959{
2960 if (!clipboard)
2961 {
2950 want_refresh = 1; 2962 want_refresh = 1;
2951 free (selection.text); 2963 free (selection.text);
2952 selection.text = NULL; 2964 selection.text = NULL;
2953 selection.len = 0; 2965 selection.len = 0;
2954 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2955 2967
2956 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2958} 2980}
2959 2981
2960/* ------------------------------------------------------------------------- */ 2982/* ------------------------------------------------------------------------- */
2961/* 2983/*
2962 * Copy a selection into the cut buffer 2984 * Copy a selection into the cut buffer
… …
3088 3110
3089 selection_grab (tm); 3111 selection_grab (tm);
3090} 3112}
3091 3113
3092bool 3114bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 3115rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 3116{
3117 Atom sel;
3118
3119 if (!clipboard)
3120 {
3095 selection_time = tm; 3121 selection_time = tm;
3122 sel = XA_PRIMARY;
3123 }
3124 else
3125 {
3126 clipboard_time = tm;
3127 sel = xa[XA_CLIPBOARD];
3128 }
3096 3129
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3130 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3131 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 3132 {
3100 display->set_selection_owner (this); 3133 display->set_selection_owner (this, clipboard);
3101 return true; 3134 return true;
3102 } 3135 }
3103 else 3136 else
3104 { 3137 {
3105 selection_clear (); 3138 selection_clear (clipboard);
3106 return false; 3139 return false;
3107 } 3140 }
3108 3141
3109#if 0 3142#if 0
3110 XTextProperty ct; 3143 XTextProperty ct;
… …
3605 else if (rq.target == xa[XA_MULTIPLE]) 3638 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3639 {
3607 /* TODO: Handle MULTIPLE */ 3640 /* TODO: Handle MULTIPLE */
3608 } 3641 }
3609#endif 3642#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3644 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3646 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property;
3648 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3614 ev.property = rq.property; 3653 ev.property = rq.property;
3615 } 3654 }
3616 else if (rq.target == XA_STRING 3655 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3656 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3657 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3651 { 3690 {
3652 target = xa[XA_COMPOUND_TEXT]; 3691 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3692 style = enc_compound_text;
3654 } 3693 }
3655 3694
3656 if (selection.text) 3695 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3696 {
3658 cl = selection.text; 3697 cl = selection.text;
3659 selectlen = selection.len; 3698 selectlen = selection.len;
3699 }
3700 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3701 {
3702 cl = selection.clip_text;
3703 selectlen = selection.clip_len;
3660 } 3704 }
3661 else 3705 else
3662 { 3706 {
3663 cl = L""; 3707 cl = L"";
3664 selectlen = 0; 3708 selectlen = 0;
… …
3732 h += 2; min_it (h, nrow); 3776 h += 2; min_it (h, nrow);
3733 3777
3734 x -= 1; clamp_it (x, 0, ncol - w); 3778 x -= 1; clamp_it (x, 0, ncol - w);
3735 y -= 1; clamp_it (y, 0, nrow - h); 3779 y -= 1; clamp_it (y, 0, nrow - h);
3736 3780
3737 ov_x = x; ov_y = y; 3781 ov.x = x; ov.y = y;
3738 ov_w = w; ov_h = h; 3782 ov.w = w; ov.h = h;
3739 3783
3740 ov_text = new text_t *[h]; 3784 ov.text = new text_t *[h];
3741 ov_rend = new rend_t *[h]; 3785 ov.rend = new rend_t *[h];
3742 3786
3743 for (y = 0; y < h; y++) 3787 for (y = 0; y < h; y++)
3744 { 3788 {
3745 text_t *tp = ov_text[y] = new text_t[w]; 3789 text_t *tp = ov.text[y] = new text_t[w];
3746 rend_t *rp = ov_rend[y] = new rend_t[w]; 3790 rend_t *rp = ov.rend[y] = new rend_t[w];
3747 3791
3748 text_t t0, t1, t2; 3792 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE; 3793 rend_t r = OVERLAY_RSTYLE;
3750 3794
3751 if (y == 0) 3795 if (y == 0)
… …
3770} 3814}
3771 3815
3772void 3816void
3773rxvt_term::scr_overlay_off () NOTHROW 3817rxvt_term::scr_overlay_off () NOTHROW
3774{ 3818{
3775 if (!ov_text) 3819 if (!ov.text)
3776 return; 3820 return;
3777 3821
3778 want_refresh = 1; 3822 want_refresh = 1;
3779 3823
3780 for (int y = 0; y < ov_h; y++) 3824 for (int y = 0; y < ov.h; y++)
3781 { 3825 {
3782 delete [] ov_text[y]; 3826 delete [] ov.text[y];
3783 delete [] ov_rend[y]; 3827 delete [] ov.rend[y];
3784 } 3828 }
3785 3829
3786 delete [] ov_text; ov_text = 0; 3830 delete [] ov.text; ov.text = 0;
3787 delete [] ov_rend; ov_rend = 0; 3831 delete [] ov.rend; ov.rend = 0;
3788} 3832}
3789 3833
3790void 3834void
3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3835rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792{ 3836{
3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3837 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794 return; 3838 return;
3795 3839
3796 x++, y++; 3840 x++, y++;
3797 3841
3798 ov_text[y][x] = text; 3842 ov.text[y][x] = text;
3799 ov_rend[y][x] = rend; 3843 ov.rend[y][x] = rend;
3800} 3844}
3801 3845
3802void 3846void
3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3847rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804{ 3848{
… …
3823} 3867}
3824 3868
3825void 3869void
3826rxvt_term::scr_swap_overlay () NOTHROW 3870rxvt_term::scr_swap_overlay () NOTHROW
3827{ 3871{
3828 if (!ov_text) 3872 if (!ov.text)
3829 return; 3873 return;
3830 3874
3875 // hide cursor if it is within the overlay area
3876 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3877 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3878 screen.flags &= ~Screen_VisibleCursor;
3879
3831 // swap screen mem with overlay 3880 // swap screen mem with overlay
3832 for (int y = ov_h; y--; ) 3881 for (int y = ov.h; y--; )
3833 { 3882 {
3834 text_t *t1 = ov_text[y]; 3883 text_t *t1 = ov.text[y];
3835 rend_t *r1 = ov_rend[y]; 3884 rend_t *r1 = ov.rend[y];
3836 3885
3837 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3886 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3838 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3887 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3839 3888
3840 for (int x = ov_w; x--; ) 3889 for (int x = ov.w; x--; )
3841 { 3890 {
3842 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3891 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3892 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3844 } 3893 }
3845 } 3894 }

Diff Legend

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