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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.353 by root, Fri Oct 15 21:13:44 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
… …
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
… …
278 283
279 if (top_row) 284 if (top_row)
280 { 285 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
283 289
284 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 292
287 do 293 do
288 { 294 {
289 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 297 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
295 299
296 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 ())
297 { 301 {
… …
393 397
394 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 400 }
397 401
402 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407
398 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
399 409
400 prev_nrow = nrow; 410 prev_nrow = nrow;
401 prev_ncol = ncol; 411 prev_ncol = ncol;
402 412
… …
434void 444void
435rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
436{ 446{
437 scr_release (); 447 scr_release ();
438 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
439 scr_soft_reset (); 450 scr_soft_reset ();
440 scr_reset (); 451 scr_reset ();
441 452
442 scr_clear (true); 453 scr_clear (true);
443 scr_refresh (); 454 scr_refresh ();
… …
448{ 459{
449 /* only affects modes, nothing drastic such as clearing the screen */ 460 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 461#if ENABLE_OVERLAY
451 scr_overlay_off (); 462 scr_overlay_off ();
452#endif 463#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 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 464
465 if (current_screen != PRIMARY) 465 if (current_screen != PRIMARY)
466 scr_swap_screen (); 466 scr_swap_screen ();
467 467
468 scr_scroll_region (0, MAX_ROWS - 1); 468 scr_scroll_region (0, MAX_ROWS - 1);
… …
513 } 513 }
514 514
515 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
516 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
517 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
518#ifdef DEBUG_STRICT
519 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
521#endif
522} 520}
523 521
524void 522void
525rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
526{ 524{
… …
551 want_refresh = 1; 549 want_refresh = 1;
552 view_start = 0; 550 view_start = 0;
553 551
554 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
555 553
556 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
557 555
558#if NSCREENS 556#if NSCREENS
559 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
560 { 558 {
561 num_scr = 0; 559 num_scr = 0;
… …
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
788 } 786 }
789 } 787 }
790 788
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 792 int row = screen.cur.row;
797 793
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 795
800 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
904# else 900# else
905 c = 0xfffd; 901 c = 0xfffd;
906# endif 902# endif
907#endif 903#endif
908 904
909 // nuke the character at this position, if required
910 if (expect_false (
911 line->t[screen.cur.col] == NOCHAR
912 || (screen.cur.col < ncol - 1
913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918 906
919 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
922 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
923 c = NOCHAR; 913 c = NOCHAR;
924 // and try the same character next loop iteration 914 // and try the same character next loop iteration
925 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
926 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidents everywehere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only it's tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
927 927
928 line->touch (); 928 line->touch ();
929 929
930 do 930 do
931 { 931 {
… …
937 else 937 else
938 { 938 {
939 line->l = ncol; 939 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
942 break; 942
943 goto end_of_line;
943 } 944 }
944 945
945 c = NOCHAR; 946 c = NOCHAR;
946 } 947 }
947 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
948 949
949 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
951 { 952 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 953 line->t[c] = ' ';
957 line->r[c] = rend; 954 line->r[c] = rend;
958 }
959 } 955 }
956
957end_of_line:
958 ;
960 } 959 }
961#if ENABLE_COMBINING 960#if ENABLE_COMBINING
962 else // width == 0 961 else // width == 0
963 { 962 {
964 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1004#endif 1003#endif
1005 } 1004 }
1006 1005
1007 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1008 1007
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1011#endif
1012} 1009}
1013 1010
1014/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1015/* 1012/*
1016 * 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
… …
1029 1026
1030 want_refresh = 1; 1027 want_refresh = 1;
1031#endif 1028#endif
1032 } 1029 }
1033 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1034 else 1033 else
1035 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1036} 1035}
1037 1036
1038/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1344 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1345 return; 1344 return;
1346 1345
1347 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1348 1347
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1351 {
1354 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1355 1353
1356 if (mapped) 1354 if (mapped)
1357 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1360 } 1358 }
1361 else 1359 else
1362 { 1360 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1362
1363 if (mapped)
1364 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1368 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1369 (unsigned int)width,
1370 (unsigned int)Height2Pixel (num)); 1370 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1373 } 1374 }
1374 1375
1375 for (; num--; row++) 1376 for (; num--; row++)
1376 { 1377 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1382 }
1380} 1383}
1381 1384
1382#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1383void 1386void
… …
1536 { 1539 {
1537 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1539 } 1542 }
1540 1543
1541 scr_blank_line (*line, ncol - count, count, 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1545
1544 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1548 {
1547 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1840 {
1839 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1841 } 1843 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1843 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++)
1844 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);
1845 1847
1846 num_scr_allow = 0; 1848 num_scr_allow = 0;
1847 1849
… …
1938 1940
1939 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1942 }
1941 else 1943 else
1942 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1946#endif
1944} 1947}
1945 1948
1946/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */ 1950/* ARGSUSED */
… …
1966 row_start = view_start; 1969 row_start = view_start;
1967 } 1970 }
1968 1971
1969 wctomb (0, 0); 1972 wctomb (0, 0);
1970 1973
1971 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1975 {
1973 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1975 1978
1976 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
… …
2005 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2009 */
2007void 2010void
2008rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2009{ 2012{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2015 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2027 /* 2028 /*
2028 * A: set up vars 2029 * A: set up vars
2029 */ 2030 */
2030 refresh_count = 0; 2031 refresh_count = 0;
2031 2032
2033 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2034 char have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2035#endif 2037#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2039
2038 /* 2040 /*
2039 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2040 */ 2042 */
2041 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;
2042 2051
2043 /* 2052 /*
2044 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2045 */ 2054 */
2046 { 2055 {
2047 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2048 2057
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2059 if (hidden_cursor)
2052 showcursor = 0; 2060 showcursor = 0;
2053#endif 2061#endif
2054 2062
… …
2082 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2083#else 2091#else
2084 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2085#endif 2093#endif
2086 2094
2087 if (showcursor && focus) 2095 if (focus)
2088 { 2096 {
2089 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2091 else 2099 else
2092 { 2100 {
… …
2127 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2128 } 2136 }
2129 } 2137 }
2130 } 2138 }
2131 2139
2132 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133#if ENABLE_OVERLAY
2134 scr_swap_overlay ();
2135#endif
2136
2137#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2141 /*
2139 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2141 */ 2144 */
… …
2233 2236
2234 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2236 --col; 2239 --col;
2237 2240
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2242 text_t *text = stp + col;
2240 int count = 1; 2243 int count = 1;
2241 2244
2242 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2243 drp[col] = rend; 2246 drp[col] = rend;
… …
2247 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2248 { 2251 {
2249 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2250 { 2253 {
2251 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2252 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2253 count++; 2257 count++;
2254 i++; 2258 i++;
2255 2259
2256 continue; 2260 continue;
2257 } 2261 }
… …
2287 */ 2291 */
2288 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2290 2294
2291 // 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
2292 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)))
2293 { 2297 {
2294 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2295 2299
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2316 2320
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2322 fore = Color_UL;
2319#endif 2323#endif
2320 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
2321 if (invert) 2345 if (invert)
2322 { 2346 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2329 ::swap (fore, back); 2347 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2348
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2337 if (ISSET_PIXCOLOR (Color_RV))
2338 back = Color_RV;
2339# endif
2340 if (fore == back) 2350 if (fore == back)
2341 { 2351 {
2342 fore = Color_bg; 2352 fore = Color_bg;
2343 back = Color_fg; 2353 back = Color_fg;
2344 } 2354 }
… …
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2424 }
2415 } /* for (col....) */ 2425 } /* for (col....) */
2416 } /* for (row....) */ 2426 } /* for (row....) */
2417 2427
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422
2423 /* 2428 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2430 */
2426 if (showcursor) 2431 if (showcursor)
2427 { 2432 {
… …
2465 } 2470 }
2466 2471
2467 /* 2472 /*
2468 * H: cleanup selection 2473 * H: cleanup selection
2469 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2470 scr_reverse_selection (); 2480 scr_reverse_selection ();
2471 2481
2482 screen.flags = old_screen_flags;
2472 num_scr = 0; 2483 num_scr = 0;
2473 num_scr_allow = 1; 2484 num_scr_allow = 1;
2474} 2485}
2475 2486
2476void 2487void
… …
2596 { 2607 {
2597#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2598 if (selection.rect) 2609 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2613 else
2603#endif 2614#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2606 RS_RVid); 2617 RS_Sel | RS_RVid);
2607 } 2618 }
2608} 2619}
2609 2620
2610/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2611/* 2622/*
… …
2672/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2673/* 2684/*
2674 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2675 */ 2686 */
2676void 2687void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2689{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2686 2697
2687 tt_write (data, len); 2698 tt_write (data, len);
2688 2699
2689 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2690 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);
2691} 2711}
2692 2712
2693/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2694/* 2714/*
2695 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2904 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2905 2925
2906#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2929 return;
2910#else 2930#else
2911 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2933 return;
2914#endif 2934#endif
2915 } 2935 }
2916 2936
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2946/* 2966/*
2947 * Clear all selected text 2967 * Clear all selected text
2948 * EXT: SelectionClear 2968 * EXT: SelectionClear
2949 */ 2969 */
2950void 2970void
2951rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2972{
2973 if (!clipboard)
2974 {
2953 want_refresh = 1; 2975 want_refresh = 1;
2954 free (selection.text); 2976 free (selection.text);
2955 selection.text = NULL; 2977 selection.text = NULL;
2956 selection.len = 0; 2978 selection.len = 0;
2957 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2958 2980
2959 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2960 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 }
2961} 2993}
2962 2994
2963/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2964/* 2996/*
2965 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3091 3123
3092 selection_grab (tm); 3124 selection_grab (tm);
3093} 3125}
3094 3126
3095bool 3127bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3098 selection_time = tm; 3134 selection_time = tm;
3135 sel = XA_PRIMARY;
3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3099 3142
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 3145 {
3103 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3104 return true; 3147 return true;
3105 } 3148 }
3106 else 3149 else
3107 { 3150 {
3108 selection_clear (); 3151 selection_clear (clipboard);
3109 return false; 3152 return false;
3110 } 3153 }
3111 3154
3112#if 0 3155#if 0
3113 XTextProperty ct; 3156 XTextProperty ct;
… …
3608 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3652 {
3610 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3611 } 3654 }
3612#endif 3655#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3657 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3617 ev.property = rq.property; 3666 ev.property = rq.property;
3618 } 3667 }
3619 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3654 { 3703 {
3655 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3705 style = enc_compound_text;
3657 } 3706 }
3658 3707
3659 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3709 {
3661 cl = selection.text; 3710 cl = selection.text;
3662 selectlen = selection.len; 3711 selectlen = selection.len;
3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3663 } 3717 }
3664 else 3718 else
3665 { 3719 {
3666 cl = L""; 3720 cl = L"";
3667 selectlen = 0; 3721 selectlen = 0;
… …
3735 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3736 3790
3737 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3739 3793
3740 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3742 3796
3743 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3745 3799
3746 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3747 { 3801 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3804
3751 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3753 3807
3754 if (y == 0) 3808 if (y == 0)
… …
3773} 3827}
3774 3828
3775void 3829void
3776rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3777{ 3831{
3778 if (!ov_text) 3832 if (!ov.text)
3779 return; 3833 return;
3780 3834
3781 want_refresh = 1; 3835 want_refresh = 1;
3782 3836
3783 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3784 { 3838 {
3785 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3787 } 3841 }
3788 3842
3789 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3791} 3845}
3792 3846
3793void 3847void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3849{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3851 return;
3798 3852
3799 x++, y++; 3853 x++, y++;
3800 3854
3801 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3803} 3857}
3804 3858
3805void 3859void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3861{
… …
3826} 3880}
3827 3881
3828void 3882void
3829rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3884{
3831 if (!ov_text) 3885 if (!ov.text)
3832 return; 3886 return;
3833 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3834 // swap screen mem with overlay 3893 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3836 { 3895 {
3837 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3839 3898
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3901
3843 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3844 { 3903 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3906 }
3848 } 3907 }

Diff Legend

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