ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.359 by sf-exg, Tue Jan 4 23:06:10 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
… …
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 ();
… …
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 464
454 rvideo_mode = false;
455
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 xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1347 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1349 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1350 { 1351 {
1351 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1352 1353
1353 if (mapped) 1354 if (mapped)
1354 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1357 } 1358 }
1358 else 1359 else
1359 { 1360 {
1360 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1361 1362
1363 if (mapped)
1364 {
1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row), 1368 0, Row2Pixel (row - view_start),
1366 (unsigned int)width, 1369 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num)); 1370 (unsigned int)Height2Pixel (num));
1368 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1369 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1370 } 1374 }
1371 1375
1372 for (; num--; row++) 1376 for (; num--; row++)
1373 { 1377 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1375 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1376 } 1382 }
1377} 1383}
1378 1384
1379#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1380void 1386void
… …
1533 { 1539 {
1534 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1535 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1536 } 1542 }
1537 1543
1538 scr_blank_line (*line, ncol - count, count, 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540 1545
1541 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 { 1548 {
1544 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1834 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1835 { 1840 {
1836 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1837 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1838 } 1843 }
1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1840 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++)
1841 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);
1842 1847
1843 num_scr_allow = 0; 1848 num_scr_allow = 0;
1844 1849
… …
1935 1940
1936 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1937 } 1942 }
1938 else 1943 else
1939 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940#endif 1946#endif
1941} 1947}
1942 1948
1943/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1944/* ARGSUSED */ 1950/* ARGSUSED */
… …
1963 row_start = view_start; 1969 row_start = view_start;
1964 } 1970 }
1965 1971
1966 wctomb (0, 0); 1972 wctomb (0, 0);
1967 1973
1968 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969 { 1975 {
1970 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1971 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1972 1978
1973 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
… …
2002 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
2003 */ 2009 */
2004void 2010void
2005rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
2006{ 2012{
2007 unsigned char have_bg,
2008 showcursor; /* show the cursor */
2009 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2010 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2011 int i; /* tmp */ 2015 int i; /* tmp */
2012#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2013 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2024 /* 2028 /*
2025 * A: set up vars 2029 * A: set up vars
2026 */ 2030 */
2027 refresh_count = 0; 2031 refresh_count = 0;
2028 2032
2033 unsigned int old_screen_flags = screen.flags;
2029 have_bg = 0; 2034 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2032#endif 2037#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2039
2035 /* 2040 /*
2036 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2037 */ 2042 */
2038 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;
2039 2051
2040 /* 2052 /*
2041 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2042 */ 2054 */
2043 { 2055 {
2044 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2045 2057
2046 showcursor = (screen.flags & Screen_VisibleCursor);
2047#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2048 if (hidden_cursor) 2059 if (hidden_cursor)
2049 showcursor = 0; 2060 showcursor = 0;
2050#endif 2061#endif
2051 2062
… …
2079 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2080#else 2091#else
2081 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2082#endif 2093#endif
2083 2094
2084 if (showcursor && focus) 2095 if (focus)
2085 { 2096 {
2086 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2087 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2088 else 2099 else
2089 { 2100 {
… …
2124 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2125 } 2136 }
2126 } 2137 }
2127 } 2138 }
2128 2139
2129 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130#if ENABLE_OVERLAY
2131 scr_swap_overlay ();
2132#endif
2133
2134#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2135 /* 2141 /*
2136 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2137 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2138 */ 2144 */
… …
2230 2236
2231 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2232 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2233 --col; 2239 --col;
2234 2240
2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236 text_t *text = stp + col; 2242 text_t *text = stp + col;
2237 int count = 1; 2243 int count = 1;
2238 2244
2239 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2240 drp[col] = rend; 2246 drp[col] = rend;
… …
2244 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2245 { 2251 {
2246 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2247 { 2253 {
2248 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2249 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2250 count++; 2257 count++;
2251 i++; 2258 i++;
2252 2259
2253 continue; 2260 continue;
2254 } 2261 }
… …
2284 */ 2291 */
2285 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2287 2294
2288 // 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
2289 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)))
2290 { 2297 {
2291 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2292 2299
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2320
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2322 fore = Color_UL;
2316#endif 2323#endif
2317 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
2318 if (invert) 2345 if (invert)
2319 { 2346 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2347 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2348
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2350 if (fore == back)
2338 { 2351 {
2339 fore = Color_bg; 2352 fore = Color_bg;
2340 back = Color_fg; 2353 back = Color_fg;
2341 } 2354 }
… …
2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 } 2424 }
2412 } /* for (col....) */ 2425 } /* for (col....) */
2413 } /* for (row....) */ 2426 } /* for (row....) */
2414 2427
2415#if ENABLE_OVERLAY
2416 scr_swap_overlay ();
2417#endif
2418 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419
2420 /* 2428 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2430 */
2423 if (showcursor) 2431 if (showcursor)
2424 { 2432 {
… …
2462 } 2470 }
2463 2471
2464 /* 2472 /*
2465 * H: cleanup selection 2473 * H: cleanup selection
2466 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2467 scr_reverse_selection (); 2480 scr_reverse_selection ();
2468 2481
2482 screen.flags = old_screen_flags;
2469 num_scr = 0; 2483 num_scr = 0;
2470 num_scr_allow = 1; 2484 num_scr_allow = 1;
2471} 2485}
2472 2486
2473void 2487void
… …
2593 { 2607 {
2594#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2595 if (selection.rect) 2609 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2613 else
2600#endif 2614#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2603 RS_RVid); 2617 RS_Sel | RS_RVid);
2604 } 2618 }
2605} 2619}
2606 2620
2607/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2608/* 2622/*
… …
2613void 2627void
2614rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2629{
2616 int row, wrote; 2630 int row, wrote;
2617 unsigned int width, towrite; 2631 unsigned int width, towrite;
2618 char r1[] = "\n"; 2632 const char r1[] = "\n";
2619 2633
2620 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2622 { 2636 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2669/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2670/* 2684/*
2671 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2672 */ 2686 */
2673void 2687void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2689{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2683 2697
2684 tt_write (data, len); 2698 tt_write (data, len);
2685 2699
2686 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2687 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);
2688} 2711}
2689 2712
2690/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2691/* 2714/*
2692 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2901 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2902 2925
2903#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return; 2929 return;
2907#else 2930#else
2908 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return; 2933 return;
2911#endif 2934#endif
2912 } 2935 }
2913 2936
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2943/* 2966/*
2944 * Clear all selected text 2967 * Clear all selected text
2945 * EXT: SelectionClear 2968 * EXT: SelectionClear
2946 */ 2969 */
2947void 2970void
2948rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2972{
2973 if (!clipboard)
2974 {
2950 want_refresh = 1; 2975 want_refresh = 1;
2951 free (selection.text); 2976 free (selection.text);
2952 selection.text = NULL; 2977 selection.text = NULL;
2953 selection.len = 0; 2978 selection.len = 0;
2954 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2955 2980
2956 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2957 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 }
2958} 2993}
2959 2994
2960/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2961/* 2996/*
2962 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
2964 */ 2999 */
2965void 3000void
2966rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
2967{ 3002{
2968 int i; 3003 int size;
2969 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
2970 text_t *t; 3005 text_t *t;
2971 3006
2972 switch (selection.op) 3007 switch (selection.op)
2973 { 3008 {
… …
2989 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
2990 3025
2991 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)))
2992 return; 3027 return;
2993 3028
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 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));
2996 3031
2997 int ofs = 0; 3032 int ofs = 0;
2998 int extra = 0; 3033 int extra = 0;
2999 3034
3000 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3006 { 3041 {
3007#if !ENABLE_MINIMAL 3042#if !ENABLE_MINIMAL
3008 if (selection.rect) 3043 if (selection.rect)
3009 { 3044 {
3010 col = selection.beg.col; 3045 col = selection.beg.col;
3011 end_col = ncol + 1; 3046 end_col = selection.end.col;
3012 } 3047 }
3013 else 3048 else
3014#endif 3049#endif
3015 end_col = ROW(row).l; 3050 end_col = ROW(row).l;
3016 3051
3017 col = max (col, 0); 3052 col = max (col, 0);
3018 3053
3019 if (row == selection.end.row 3054 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3025 3056
3026 t = ROW(row).t + col; 3057 t = ROW(row).t + col;
3027 3058
3028 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
… …
3036 3067
3037 extra -= (len - 1); 3068 extra -= (len - 1);
3038 3069
3039 if (extra < 0) 3070 if (extra < 0)
3040 { 3071 {
3041 extra += i; 3072 extra += size;
3042 i += i; 3073 size += size;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044 } 3075 }
3045 3076
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 3078 }
3048#endif 3079#endif
… …
3060 3091
3061 new_selection_text[ofs++] = C0_LF; 3092 new_selection_text[ofs++] = C0_LF;
3062 } 3093 }
3063 else 3094 else
3064#endif 3095#endif
3065 if (!ROW(row).is_longer () && row != selection.end.row) 3096 if (!ROW(row).is_longer () && row != selection.end.row
3097 && (row != selection.beg.row || selection.beg.col < ncol))
3066 new_selection_text[ofs++] = C0_LF; 3098 new_selection_text[ofs++] = C0_LF;
3067 } 3099 }
3068 3100
3069 if (end_col != selection.end.col) 3101 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
… …
3088 3120
3089 selection_grab (tm); 3121 selection_grab (tm);
3090} 3122}
3091 3123
3092bool 3124bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 3125rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 3126{
3127 Atom sel;
3128
3129 if (!clipboard)
3130 {
3095 selection_time = tm; 3131 selection_time = tm;
3132 sel = XA_PRIMARY;
3133 }
3134 else
3135 {
3136 clipboard_time = tm;
3137 sel = xa[XA_CLIPBOARD];
3138 }
3096 3139
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3140 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3141 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 3142 {
3100 display->set_selection_owner (this); 3143 display->set_selection_owner (this, clipboard);
3101 return true; 3144 return true;
3102 } 3145 }
3103 else 3146 else
3104 { 3147 {
3105 selection_clear (); 3148 selection_clear (clipboard);
3106 return false; 3149 return false;
3107 } 3150 }
3108 3151
3109#if 0 3152#if 0
3110 XTextProperty ct; 3153 XTextProperty ct;
… …
3605 else if (rq.target == xa[XA_MULTIPLE]) 3648 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3649 {
3607 /* TODO: Handle MULTIPLE */ 3650 /* TODO: Handle MULTIPLE */
3608 } 3651 }
3609#endif 3652#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3653 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3654 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3655 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3656 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3657 ev.property = rq.property;
3658 }
3659 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3660 {
3661 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3662 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3614 ev.property = rq.property; 3663 ev.property = rq.property;
3615 } 3664 }
3616 else if (rq.target == XA_STRING 3665 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3666 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3667 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3651 { 3700 {
3652 target = xa[XA_COMPOUND_TEXT]; 3701 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3702 style = enc_compound_text;
3654 } 3703 }
3655 3704
3656 if (selection.text) 3705 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3706 {
3658 cl = selection.text; 3707 cl = selection.text;
3659 selectlen = selection.len; 3708 selectlen = selection.len;
3709 }
3710 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3711 {
3712 cl = selection.clip_text;
3713 selectlen = selection.clip_len;
3660 } 3714 }
3661 else 3715 else
3662 { 3716 {
3663 cl = L""; 3717 cl = L"";
3664 selectlen = 0; 3718 selectlen = 0;
… …
3732 h += 2; min_it (h, nrow); 3786 h += 2; min_it (h, nrow);
3733 3787
3734 x -= 1; clamp_it (x, 0, ncol - w); 3788 x -= 1; clamp_it (x, 0, ncol - w);
3735 y -= 1; clamp_it (y, 0, nrow - h); 3789 y -= 1; clamp_it (y, 0, nrow - h);
3736 3790
3737 ov_x = x; ov_y = y; 3791 ov.x = x; ov.y = y;
3738 ov_w = w; ov_h = h; 3792 ov.w = w; ov.h = h;
3739 3793
3740 ov_text = new text_t *[h]; 3794 ov.text = new text_t *[h];
3741 ov_rend = new rend_t *[h]; 3795 ov.rend = new rend_t *[h];
3742 3796
3743 for (y = 0; y < h; y++) 3797 for (y = 0; y < h; y++)
3744 { 3798 {
3745 text_t *tp = ov_text[y] = new text_t[w]; 3799 text_t *tp = ov.text[y] = new text_t[w];
3746 rend_t *rp = ov_rend[y] = new rend_t[w]; 3800 rend_t *rp = ov.rend[y] = new rend_t[w];
3747 3801
3748 text_t t0, t1, t2; 3802 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE; 3803 rend_t r = OVERLAY_RSTYLE;
3750 3804
3751 if (y == 0) 3805 if (y == 0)
… …
3770} 3824}
3771 3825
3772void 3826void
3773rxvt_term::scr_overlay_off () NOTHROW 3827rxvt_term::scr_overlay_off () NOTHROW
3774{ 3828{
3775 if (!ov_text) 3829 if (!ov.text)
3776 return; 3830 return;
3777 3831
3778 want_refresh = 1; 3832 want_refresh = 1;
3779 3833
3780 for (int y = 0; y < ov_h; y++) 3834 for (int y = 0; y < ov.h; y++)
3781 { 3835 {
3782 delete [] ov_text[y]; 3836 delete [] ov.text[y];
3783 delete [] ov_rend[y]; 3837 delete [] ov.rend[y];
3784 } 3838 }
3785 3839
3786 delete [] ov_text; ov_text = 0; 3840 delete [] ov.text; ov.text = 0;
3787 delete [] ov_rend; ov_rend = 0; 3841 delete [] ov.rend; ov.rend = 0;
3788} 3842}
3789 3843
3790void 3844void
3791rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3845rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3792{ 3846{
3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3847 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794 return; 3848 return;
3795 3849
3796 x++, y++; 3850 x++, y++;
3797 3851
3798 ov_text[y][x] = text; 3852 ov.text[y][x] = text;
3799 ov_rend[y][x] = rend; 3853 ov.rend[y][x] = rend;
3800} 3854}
3801 3855
3802void 3856void
3803rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3857rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3804{ 3858{
… …
3823} 3877}
3824 3878
3825void 3879void
3826rxvt_term::scr_swap_overlay () NOTHROW 3880rxvt_term::scr_swap_overlay () NOTHROW
3827{ 3881{
3828 if (!ov_text) 3882 if (!ov.text)
3829 return; 3883 return;
3830 3884
3885 // hide cursor if it is within the overlay area
3886 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3887 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3888 screen.flags &= ~Screen_VisibleCursor;
3889
3831 // swap screen mem with overlay 3890 // swap screen mem with overlay
3832 for (int y = ov_h; y--; ) 3891 for (int y = ov.h; y--; )
3833 { 3892 {
3834 text_t *t1 = ov_text[y]; 3893 text_t *t1 = ov.text[y];
3835 rend_t *r1 = ov_rend[y]; 3894 rend_t *r1 = ov.rend[y];
3836 3895
3837 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3896 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3838 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3897 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3839 3898
3840 for (int x = ov_w; x--; ) 3899 for (int x = ov.w; x--; )
3841 { 3900 {
3842 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3901 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3902 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3844 } 3903 }
3845 } 3904 }

Diff Legend

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