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.325 by root, Wed Nov 5 12:28:15 2008 UTC vs.
Revision 1.358 by sf-exg, Tue Jan 4 18:22:11 2011 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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 292
288 do 293 do
289 { 294 {
290 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 297 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 299
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 301 {
… …
394 397
395 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 400 }
398 401
402 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407
399 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
400 409
401 prev_nrow = nrow; 410 prev_nrow = nrow;
402 prev_ncol = ncol; 411 prev_ncol = ncol;
403 412
… …
453 scr_overlay_off (); 462 scr_overlay_off ();
454#endif 463#endif
455 464
456 if (current_screen != PRIMARY) 465 if (current_screen != PRIMARY)
457 scr_swap_screen (); 466 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 467
465 scr_scroll_region (0, MAX_ROWS - 1); 468 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None); 469 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0); 470 scr_insert_mode (0);
468} 471}
… …
510 } 513 }
511 514
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
518#endif
519} 520}
520 521
521void 522void
522rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
523{ 524{
… …
548 want_refresh = 1; 549 want_refresh = 1;
549 view_start = 0; 550 view_start = 0;
550 551
551 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
552 553
553 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
554 555
555#if NSCREENS 556#if NSCREENS
556 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
557 { 558 {
558 num_scr = 0; 559 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
785 } 786 }
786 } 787 }
787 788
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 792 int row = screen.cur.row;
794 793
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 795
797 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
901# else 900# else
902 c = 0xfffd; 901 c = 0xfffd;
903# endif 902# endif
904#endif 903#endif
905 904
906 // nuke the character at this position, if required
907 if (expect_false (
908 line->t[screen.cur.col] == NOCHAR
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 906
916 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
919 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
920 c = NOCHAR; 913 c = NOCHAR;
921 // and try the same character next loop iteration 914 // and try the same character next loop iteration
922 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
923 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
924 927
925 line->touch (); 928 line->touch ();
926 929
927 do 930 do
928 { 931 {
… …
934 else 937 else
935 { 938 {
936 line->l = ncol; 939 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
939 break; 942
943 goto end_of_line;
940 } 944 }
941 945
942 c = NOCHAR; 946 c = NOCHAR;
943 } 947 }
944 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
945 949
946 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 952 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 953 line->t[c] = ' ';
954 line->r[c] = rend; 954 line->r[c] = rend;
955 }
956 } 955 }
956
957end_of_line:
958 ;
957 } 959 }
958#if ENABLE_COMBINING 960#if ENABLE_COMBINING
959 else // width == 0 961 else // width == 0
960 { 962 {
961 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1003#endif
1002 } 1004 }
1003 1005
1004 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1005 1007
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1008#endif
1009} 1009}
1010 1010
1011/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1012/* 1012/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1026
1027 want_refresh = 1; 1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1031 else 1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1342 return; 1344 return;
1343 1345
1344 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1345 1347
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1351 {
1353 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1354 1353
1355 if (mapped && !view_start) 1354 if (mapped)
1356 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1359 } 1358 }
1360 else 1359 else
1361 { 1360 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1362
1364 if (mapped && !view_start) 1363 if (mapped)
1365 { 1364 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1376 1375
1377 for (; num--; row++) 1376 for (; num--; row++)
1378 { 1377 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1380 1379
1381 if (!view_start) 1380 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1382 }
1384} 1383}
1385 1384
1386#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1387void 1386void
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1840 {
1842 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1844 } 1843 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1847
1849 num_scr_allow = 0; 1848 num_scr_allow = 0;
1850 1849
… …
1941 1940
1942 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1942 }
1944 else 1943 else
1945 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1946#endif
1947} 1947}
1948 1948
1949/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1950/* ARGSUSED */
… …
1969 row_start = view_start; 1969 row_start = view_start;
1970 } 1970 }
1971 1971
1972 wctomb (0, 0); 1972 wctomb (0, 0);
1973 1973
1974 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1975 {
1976 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1978 1978
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2009 */
2010void 2010void
2011rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2012{ 2012{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2015 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2028 /*
2031 * A: set up vars 2029 * A: set up vars
2032 */ 2030 */
2033 refresh_count = 0; 2031 refresh_count = 0;
2034 2032
2033 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2034 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2038#endif 2037#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2039
2041 /* 2040 /*
2042 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2043 */ 2042 */
2044 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2051
2046 /* 2052 /*
2047 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2048 */ 2054 */
2049 { 2055 {
2050 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2051 2057
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2059 if (hidden_cursor)
2055 showcursor = 0; 2060 showcursor = 0;
2056#endif 2061#endif
2057 2062
… …
2085 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2086#else 2091#else
2087 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2088#endif 2093#endif
2089 2094
2090 if (showcursor && focus) 2095 if (focus)
2091 { 2096 {
2092 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2094 else 2099 else
2095 { 2100 {
… …
2130 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2131 } 2136 }
2132 } 2137 }
2133 } 2138 }
2134 2139
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2141 /*
2142 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2144 */ 2144 */
… …
2236 2236
2237 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2239 --col;
2240 2240
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2242 text_t *text = stp + col;
2243 int count = 1; 2243 int count = 1;
2244 2244
2245 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2246 drp[col] = rend; 2246 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2251 { 2251 {
2252 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2253 { 2253 {
2254 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2255 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2256 count++; 2257 count++;
2257 i++; 2258 i++;
2258 2259
2259 continue; 2260 continue;
2260 } 2261 }
… …
2290 */ 2291 */
2291 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2293 2294
2294 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2297 {
2297 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2298 2299
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2320
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2322 fore = Color_UL;
2322#endif 2323#endif
2323 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2324 if (invert) 2345 if (invert)
2325 { 2346 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2347 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2348
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2350 if (fore == back)
2344 { 2351 {
2345 fore = Color_bg; 2352 fore = Color_bg;
2346 back = Color_fg; 2353 back = Color_fg;
2347 } 2354 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2424 }
2418 } /* for (col....) */ 2425 } /* for (col....) */
2419 } /* for (row....) */ 2426 } /* for (row....) */
2420 2427
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2428 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2430 */
2429 if (showcursor) 2431 if (showcursor)
2430 { 2432 {
… …
2468 } 2470 }
2469 2471
2470 /* 2472 /*
2471 * H: cleanup selection 2473 * H: cleanup selection
2472 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2473 scr_reverse_selection (); 2480 scr_reverse_selection ();
2474 2481
2482 screen.flags = old_screen_flags;
2475 num_scr = 0; 2483 num_scr = 0;
2476 num_scr_allow = 1; 2484 num_scr_allow = 1;
2477} 2485}
2478 2486
2479void 2487void
… …
2599 { 2607 {
2600#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2601 if (selection.rect) 2609 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2613 else
2606#endif 2614#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2609 RS_RVid); 2617 RS_Sel | RS_RVid);
2610 } 2618 }
2611} 2619}
2612 2620
2613/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2614/* 2622/*
… …
2619void 2627void
2620rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2629{
2622 int row, wrote; 2630 int row, wrote;
2623 unsigned int width, towrite; 2631 unsigned int width, towrite;
2624 char r1[] = "\n"; 2632 const char r1[] = "\n";
2625 2633
2626 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2628 { 2636 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2675/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2676/* 2684/*
2677 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2678 */ 2686 */
2679void 2687void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2689{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2689 2697
2690 tt_write (data, len); 2698 tt_write (data, len);
2691 2699
2692 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2694} 2711}
2695 2712
2696/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2697/* 2714/*
2698 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2907 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2908 2925
2909#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return; 2929 return;
2913#else 2930#else
2914 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return; 2933 return;
2917#endif 2934#endif
2918 } 2935 }
2919 2936
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2949/* 2966/*
2950 * Clear all selected text 2967 * Clear all selected text
2951 * EXT: SelectionClear 2968 * EXT: SelectionClear
2952 */ 2969 */
2953void 2970void
2954rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2972{
2973 if (!clipboard)
2974 {
2956 want_refresh = 1; 2975 want_refresh = 1;
2957 free (selection.text); 2976 free (selection.text);
2958 selection.text = NULL; 2977 selection.text = NULL;
2959 selection.len = 0; 2978 selection.len = 0;
2960 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2961 2980
2962 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2964} 2993}
2965 2994
2966/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2967/* 2996/*
2968 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2970 */ 2999 */
2971void 3000void
2972rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2973{ 3002{
2974 int i; 3003 int size;
2975 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2976 text_t *t; 3005 text_t *t;
2977 3006
2978 switch (selection.op) 3007 switch (selection.op)
2979 { 3008 {
… …
2995 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2996 3025
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 3027 return;
2999 3028
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 3031
3003 int ofs = 0; 3032 int ofs = 0;
3004 int extra = 0; 3033 int extra = 0;
3005 3034
3006 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3042 3071
3043 extra -= (len - 1); 3072 extra -= (len - 1);
3044 3073
3045 if (extra < 0) 3074 if (extra < 0)
3046 { 3075 {
3047 extra += i; 3076 extra += size;
3048 i += i; 3077 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 3079 }
3051 3080
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 3082 }
3054#endif 3083#endif
… …
3066 3095
3067 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3068 } 3097 }
3069 else 3098 else
3070#endif 3099#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 3100 if (!ROW(row).is_longer () && row != selection.end.row
3101 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
3073 } 3103 }
3074 3104
3075 if (end_col != selection.end.col) 3105 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF; 3106 new_selection_text[ofs++] = C0_LF;
… …
3094 3124
3095 selection_grab (tm); 3125 selection_grab (tm);
3096} 3126}
3097 3127
3098bool 3128bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 3129rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 3130{
3131 Atom sel;
3132
3133 if (!clipboard)
3134 {
3101 selection_time = tm; 3135 selection_time = tm;
3136 sel = XA_PRIMARY;
3137 }
3138 else
3139 {
3140 clipboard_time = tm;
3141 sel = xa[XA_CLIPBOARD];
3142 }
3102 3143
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3144 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3145 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 3146 {
3106 display->set_selection_owner (this); 3147 display->set_selection_owner (this, clipboard);
3107 return true; 3148 return true;
3108 } 3149 }
3109 else 3150 else
3110 { 3151 {
3111 selection_clear (); 3152 selection_clear (clipboard);
3112 return false; 3153 return false;
3113 } 3154 }
3114 3155
3115#if 0 3156#if 0
3116 XTextProperty ct; 3157 XTextProperty ct;
… …
3611 else if (rq.target == xa[XA_MULTIPLE]) 3652 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3653 {
3613 /* TODO: Handle MULTIPLE */ 3654 /* TODO: Handle MULTIPLE */
3614 } 3655 }
3615#endif 3656#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3658 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3660 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property;
3662 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3620 ev.property = rq.property; 3667 ev.property = rq.property;
3621 } 3668 }
3622 else if (rq.target == XA_STRING 3669 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3670 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3671 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3657 { 3704 {
3658 target = xa[XA_COMPOUND_TEXT]; 3705 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3706 style = enc_compound_text;
3660 } 3707 }
3661 3708
3662 if (selection.text) 3709 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3710 {
3664 cl = selection.text; 3711 cl = selection.text;
3665 selectlen = selection.len; 3712 selectlen = selection.len;
3713 }
3714 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3715 {
3716 cl = selection.clip_text;
3717 selectlen = selection.clip_len;
3666 } 3718 }
3667 else 3719 else
3668 { 3720 {
3669 cl = L""; 3721 cl = L"";
3670 selectlen = 0; 3722 selectlen = 0;
… …
3738 h += 2; min_it (h, nrow); 3790 h += 2; min_it (h, nrow);
3739 3791
3740 x -= 1; clamp_it (x, 0, ncol - w); 3792 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3793 y -= 1; clamp_it (y, 0, nrow - h);
3742 3794
3743 ov_x = x; ov_y = y; 3795 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3796 ov.w = w; ov.h = h;
3745 3797
3746 ov_text = new text_t *[h]; 3798 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3799 ov.rend = new rend_t *[h];
3748 3800
3749 for (y = 0; y < h; y++) 3801 for (y = 0; y < h; y++)
3750 { 3802 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3803 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3804 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3805
3754 text_t t0, t1, t2; 3806 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3807 rend_t r = OVERLAY_RSTYLE;
3756 3808
3757 if (y == 0) 3809 if (y == 0)
… …
3776} 3828}
3777 3829
3778void 3830void
3779rxvt_term::scr_overlay_off () NOTHROW 3831rxvt_term::scr_overlay_off () NOTHROW
3780{ 3832{
3781 if (!ov_text) 3833 if (!ov.text)
3782 return; 3834 return;
3783 3835
3784 want_refresh = 1; 3836 want_refresh = 1;
3785 3837
3786 for (int y = 0; y < ov_h; y++) 3838 for (int y = 0; y < ov.h; y++)
3787 { 3839 {
3788 delete [] ov_text[y]; 3840 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3841 delete [] ov.rend[y];
3790 } 3842 }
3791 3843
3792 delete [] ov_text; ov_text = 0; 3844 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3845 delete [] ov.rend; ov.rend = 0;
3794} 3846}
3795 3847
3796void 3848void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3849rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3850{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3851 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3852 return;
3801 3853
3802 x++, y++; 3854 x++, y++;
3803 3855
3804 ov_text[y][x] = text; 3856 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3857 ov.rend[y][x] = rend;
3806} 3858}
3807 3859
3808void 3860void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3861rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3862{
… …
3829} 3881}
3830 3882
3831void 3883void
3832rxvt_term::scr_swap_overlay () NOTHROW 3884rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3885{
3834 if (!ov_text) 3886 if (!ov.text)
3835 return; 3887 return;
3836 3888
3889 // hide cursor if it is within the overlay area
3890 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3891 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3892 screen.flags &= ~Screen_VisibleCursor;
3893
3837 // swap screen mem with overlay 3894 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3895 for (int y = ov.h; y--; )
3839 { 3896 {
3840 text_t *t1 = ov_text[y]; 3897 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3898 rend_t *r1 = ov.rend[y];
3842 3899
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3900 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3901 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3902
3846 for (int x = ov_w; x--; ) 3903 for (int x = ov.w; x--; )
3847 { 3904 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3905 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3906 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3907 }
3851 } 3908 }

Diff Legend

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