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.320 by root, Tue Nov 4 23:20:17 2008 UTC vs.
Revision 1.346 by sf-exg, Mon Jul 26 09:57:53 2010 UTC

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

Diff Legend

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