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

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

Diff Legend

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