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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.355 by sf-exg, Sat Oct 16 11:32:53 2010 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
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#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 166 view_start = 0;
169 num_scr = 0; 167 num_scr = 0;
170 168
171 if (ncol == 0) 169 if (ncol == 0)
172 ncol = 80; 170 ncol = 80;
… …
174 if (nrow == 0) 172 if (nrow == 0)
175 nrow = 24; 173 nrow = 24;
176 174
177 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 176 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 177
183 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
185 { 180 {
186 //TODO//FIXME 181 //TODO//FIXME
… …
239 selection.text = NULL; 234 selection.text = NULL;
240 selection.len = 0; 235 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
243 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
244 } 241 }
245 else 242 else
246 { 243 {
247 /* 244 /*
248 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
286 283
287 if (top_row) 284 if (top_row)
288 { 285 {
289 // 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
290 // 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
291 289
292 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 292
295 do 293 do
296 { 294 {
297 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 297 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 299
304 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 ())
305 { 301 {
… …
399 delete old_ta; 395 delete old_ta;
400 delete old_ra; 396 delete old_ra;
401 397
402 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
404 401
405 free (tabs); 402 free (tabs);
406 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407 407
408 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
409 409
410 prev_nrow = nrow; 410 prev_nrow = nrow;
411 prev_ncol = ncol; 411 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 412
421 tt_winch (); 413 tt_winch ();
422 414
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 416}
… …
436 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
437 429
438 free (row_buf); 430 free (row_buf);
439 free (swap_buf); 431 free (swap_buf);
440 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
441 free (tabs); 435 free (tabs);
442 436 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 437 }
445} 438}
446 439
447/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
448/* 441/*
449 * Hard reset 442 * Hard/Soft reset
450 */ 443 */
451void 444void
452rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
453{ 446{
454 scr_release (); 447 scr_release ();
455 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
456 scr_reset (); 451 scr_reset ();
457 452
458 scr_clear (true); 453 scr_clear (true);
459 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
460} 471}
461 472
462/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
502 } 513 }
503 514
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
510#endif
511} 520}
512 521
513void 522void
514rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
515{ 524{
… …
540 want_refresh = 1; 549 want_refresh = 1;
541 view_start = 0; 550 view_start = 0;
542 551
543 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
544 553
545 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
546 555
547#if NSCREENS 556#if NSCREENS
548 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
549 { 558 {
550 num_scr = 0; 559 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
777 } 786 }
778 } 787 }
779 788
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 792 int row = screen.cur.row;
786 793
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 795
789 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
893# else 900# else
894 c = 0xfffd; 901 c = 0xfffd;
895# endif 902# endif
896#endif 903#endif
897 904
898 // nuke the character at this position, if required
899 if (expect_false (
900 line->t[screen.cur.col] == NOCHAR
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 906
908 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 909 {
911 // ...output spaces 910 if (screen.flags & Screen_Autowrap)
912 c = ' '; 911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
913 // and try the same character next loop iteration 914 // and try the same character next loop iteration
914 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
915 } 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);
916 927
917 line->touch (); 928 line->touch ();
918 929
919 do 930 do
920 { 931 {
… …
926 else 937 else
927 { 938 {
928 line->l = ncol; 939 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
931 break; 942
943 goto end_of_line;
932 } 944 }
933 945
934 c = NOCHAR; 946 c = NOCHAR;
935 } 947 }
936 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
937 949
938 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 952 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 953 line->t[c] = ' ';
946 line->r[c] = rend; 954 line->r[c] = rend;
947 }
948 } 955 }
956
957end_of_line:
958 ;
949 } 959 }
950#if ENABLE_COMBINING 960#if ENABLE_COMBINING
951 else // width == 0 961 else // width == 0
952 { 962 {
953 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
993#endif 1003#endif
994 } 1004 }
995 1005
996 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
997 1007
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1000#endif
1001} 1009}
1002 1010
1003/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1004/* 1012/*
1005 * 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
… …
1018 1026
1019 want_refresh = 1; 1027 want_refresh = 1;
1020#endif 1028#endif
1021 } 1029 }
1022 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1023 else 1033 else
1024 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1025} 1035}
1026 1036
1027/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1334 return; 1344 return;
1335 1345
1336 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1337 1347
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1351 {
1343 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1344 1353
1345 if (mapped) 1354 if (mapped)
1346 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1349 } 1358 }
1350 else 1359 else
1351 { 1360 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1362
1363 if (mapped)
1364 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1368 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1369 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1370 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1362 } 1374 }
1363 1375
1364 for (; num--; row++) 1376 for (; num--; row++)
1365 { 1377 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1382 }
1369} 1383}
1370 1384
1371#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1372void 1386void
… …
1525 { 1539 {
1526 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1528 } 1542 }
1529 1543
1530 scr_blank_line (*line, ncol - count, count, 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1545
1533 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1548 {
1536 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1840 {
1828 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1830 } 1843 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1832 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++)
1833 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);
1834 1847
1835 num_scr_allow = 0; 1848 num_scr_allow = 0;
1836 1849
… …
1927 1940
1928 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1942 }
1930 else 1943 else
1931 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1946#endif
1933} 1947}
1934 1948
1935/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */ 1950/* ARGSUSED */
… …
1955 row_start = view_start; 1969 row_start = view_start;
1956 } 1970 }
1957 1971
1958 wctomb (0, 0); 1972 wctomb (0, 0);
1959 1973
1960 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1975 {
1962 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1964 1978
1965 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
… …
1994 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2009 */
1996void 2010void
1997rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1998{ 2012{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2015 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2016 /* 2028 /*
2017 * A: set up vars 2029 * A: set up vars
2018 */ 2030 */
2019 refresh_count = 0; 2031 refresh_count = 0;
2020 2032
2033 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2034 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bgPixmap.pixmap != None;
2024#endif 2037#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2039
2027 /* 2040 /*
2028 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2029 */ 2042 */
2030 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;
2031 2051
2032 /* 2052 /*
2033 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2034 */ 2054 */
2035 { 2055 {
2036 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2037 2057
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2059 if (hidden_cursor)
2041 showcursor = 0; 2060 showcursor = 0;
2042#endif 2061#endif
2043 2062
… …
2071 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2072#else 2091#else
2073 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2074#endif 2093#endif
2075 2094
2076 if (showcursor && focus) 2095 if (focus)
2077 { 2096 {
2078 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2080 else 2099 else
2081 { 2100 {
… …
2116 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2117 } 2136 }
2118 } 2137 }
2119 } 2138 }
2120 2139
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2141 /*
2128 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2130 */ 2144 */
… …
2222 2236
2223 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2225 --col; 2239 --col;
2226 2240
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2242 text_t *text = stp + col;
2229 int count = 1; 2243 int count = 1;
2230 2244
2231 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2232 drp[col] = rend; 2246 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2237 { 2251 {
2238 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2239 { 2253 {
2240 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2241 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2242 count++; 2257 count++;
2243 i++; 2258 i++;
2244 2259
2245 continue; 2260 continue;
2246 } 2261 }
… …
2276 */ 2291 */
2277 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2279 2294
2280 // 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
2281 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)))
2282 { 2297 {
2283 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2284 2299
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2320
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2322 fore = Color_UL;
2308#endif 2323#endif
2309 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
2310 if (invert) 2345 if (invert)
2311 { 2346 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2347 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2348
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2350 if (fore == back)
2330 { 2351 {
2331 fore = Color_bg; 2352 fore = Color_bg;
2332 back = Color_fg; 2353 back = Color_fg;
2333 } 2354 }
… …
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2424 }
2404 } /* for (col....) */ 2425 } /* for (col....) */
2405 } /* for (row....) */ 2426 } /* for (row....) */
2406 2427
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411
2412 /* 2428 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2430 */
2415 if (showcursor) 2431 if (showcursor)
2416 { 2432 {
… …
2454 } 2470 }
2455 2471
2456 /* 2472 /*
2457 * H: cleanup selection 2473 * H: cleanup selection
2458 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2459 scr_reverse_selection (); 2480 scr_reverse_selection ();
2460 2481
2482 screen.flags = old_screen_flags;
2461 num_scr = 0; 2483 num_scr = 0;
2462 num_scr_allow = 1; 2484 num_scr_allow = 1;
2463} 2485}
2464 2486
2465void 2487void
… …
2585 { 2607 {
2586#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2587 if (selection.rect) 2609 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2613 else
2592#endif 2614#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2595 RS_RVid); 2617 RS_Sel | RS_RVid);
2596 } 2618 }
2597} 2619}
2598 2620
2599/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2600/* 2622/*
… …
2661/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2662/* 2684/*
2663 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2664 */ 2686 */
2665void 2687void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2689{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2675 2697
2676 tt_write (data, len); 2698 tt_write (data, len);
2677 2699
2678 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2679 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);
2680} 2711}
2681 2712
2682/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2683/* 2714/*
2684 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2893 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2894 2925
2895#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return; 2929 return;
2899#else 2930#else
2900 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return; 2933 return;
2903#endif 2934#endif
2904 } 2935 }
2905 2936
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2907 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2935/* 2966/*
2936 * Clear all selected text 2967 * Clear all selected text
2937 * EXT: SelectionClear 2968 * EXT: SelectionClear
2938 */ 2969 */
2939void 2970void
2940rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2972{
2973 if (!clipboard)
2974 {
2942 want_refresh = 1; 2975 want_refresh = 1;
2943 free (selection.text); 2976 free (selection.text);
2944 selection.text = NULL; 2977 selection.text = NULL;
2945 selection.len = 0; 2978 selection.len = 0;
2946 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2947 2980
2948 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2949 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 }
2950} 2993}
2951 2994
2952/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2953/* 2996/*
2954 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3080 3123
3081 selection_grab (tm); 3124 selection_grab (tm);
3082} 3125}
3083 3126
3084bool 3127bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3087 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 }
3088 3142
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 3145 {
3092 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3093 return true; 3147 return true;
3094 } 3148 }
3095 else 3149 else
3096 { 3150 {
3097 selection_clear (); 3151 selection_clear (clipboard);
3098 return false; 3152 return false;
3099 } 3153 }
3100 3154
3101#if 0 3155#if 0
3102 XTextProperty ct; 3156 XTextProperty ct;
… …
3597 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3652 {
3599 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3600 } 3654 }
3601#endif 3655#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3657 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3605 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);
3606 ev.property = rq.property; 3666 ev.property = rq.property;
3607 } 3667 }
3608 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3643 { 3703 {
3644 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3705 style = enc_compound_text;
3646 } 3706 }
3647 3707
3648 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3709 {
3650 cl = selection.text; 3710 cl = selection.text;
3651 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;
3652 } 3717 }
3653 else 3718 else
3654 { 3719 {
3655 cl = L""; 3720 cl = L"";
3656 selectlen = 0; 3721 selectlen = 0;
… …
3724 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3725 3790
3726 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3728 3793
3729 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3731 3796
3732 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3734 3799
3735 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3736 { 3801 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3804
3740 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3742 3807
3743 if (y == 0) 3808 if (y == 0)
… …
3762} 3827}
3763 3828
3764void 3829void
3765rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3766{ 3831{
3767 if (!ov_text) 3832 if (!ov.text)
3768 return; 3833 return;
3769 3834
3770 want_refresh = 1; 3835 want_refresh = 1;
3771 3836
3772 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3773 { 3838 {
3774 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3776 } 3841 }
3777 3842
3778 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3780} 3845}
3781 3846
3782void 3847void
3783rxvt_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
3784{ 3849{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3851 return;
3787 3852
3788 x++, y++; 3853 x++, y++;
3789 3854
3790 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3792} 3857}
3793 3858
3794void 3859void
3795rxvt_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
3796{ 3861{
… …
3815} 3880}
3816 3881
3817void 3882void
3818rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3884{
3820 if (!ov_text) 3885 if (!ov.text)
3821 return; 3886 return;
3822 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
3823 // swap screen mem with overlay 3893 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3825 { 3895 {
3826 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3828 3898
3829 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;
3830 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;
3831 3901
3832 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3833 { 3903 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 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));
3836 } 3906 }
3837 } 3907 }

Diff Legend

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