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.323 by root, Tue Nov 4 23:53:29 2008 UTC vs.
Revision 1.352 by root, Fri Oct 15 20:52:15 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 scr_soft_reset ();
164
165 view_start = 0; 166 view_start = 0;
166 num_scr = 0; 167 num_scr = 0;
167 168
168 if (ncol == 0) 169 if (ncol == 0)
169 ncol = 80; 170 ncol = 80;
… …
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
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
907 // nuke the character at this position, if required 921 // nuke the character at this position, if required
908 if (expect_false ( 922 if (expect_false (
909 line->t[screen.cur.col] == NOCHAR 923 line->t[screen.cur.col] == NOCHAR
910 || (screen.cur.col < ncol - 1 924 || (screen.cur.col < ncol - 1
911 && line->t[screen.cur.col + 1] == NOCHAR) 925 && line->t[screen.cur.col + 1] == NOCHAR)
912 )) 926 ))
913 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
914 928
915 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916
917 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 {
920 // ... artificially enlargen the previous one
921 c = NOCHAR;
922 // and try the same character next loop iteration
923 --str;
924 }
925
926 line->touch (); 929 line->touch ();
927 930
928 do 931 do
929 { 932 {
930 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
… …
935 else 938 else
936 { 939 {
937 line->l = ncol; 940 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
940 break; 943
944 goto end_of_line;
941 } 945 }
942 946
943 c = NOCHAR; 947 c = NOCHAR;
944 } 948 }
945 while (expect_false (--width > 0)); 949 while (expect_false (--width > 0));
946 950
947 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
949 { 953 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 954 line->t[c] = ' ';
955 line->r[c] = rend; 955 line->r[c] = rend;
956 }
957 } 956 }
957
958end_of_line:
959 ;
958 } 960 }
959#if ENABLE_COMBINING 961#if ENABLE_COMBINING
960 else // width == 0 962 else // width == 0
961 { 963 {
962 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1004#endif
1003 } 1005 }
1004 1006
1005 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
1006 1008
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1009 assert (screen.cur.row >= 0);
1009#endif
1010} 1010}
1011 1011
1012/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
1013/* 1013/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1014 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1027
1028 want_refresh = 1; 1028 want_refresh = 1;
1029#endif 1029#endif
1030 } 1030 }
1031 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1032 else 1034 else
1033 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1034} 1036}
1035 1037
1036/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1343 return; 1345 return;
1344 1346
1345 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1346 1348
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1352 {
1352 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1353 1354
1354 if (mapped && !view_start) 1355 if (mapped)
1355 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1358 } 1359 }
1359 else 1360 else
1360 { 1361 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1363
1363 if (mapped && !view_start) 1364 if (mapped)
1364 { 1365 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1369 0, Row2Pixel (row - view_start),
… …
1374 } 1375 }
1375 1376
1376 for (; num--; row++) 1377 for (; num--; row++)
1377 { 1378 {
1378 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1379 if (!view_start) 1381 if (row - view_start < nrow)
1380 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1381 } 1383 }
1382} 1384}
1383 1385
1384#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1385void 1387void
… …
1538 { 1540 {
1539 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1540 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1541 } 1543 }
1542 1544
1543 scr_blank_line (*line, ncol - count, count, 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1545 1546
1546 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1548 { 1549 {
1549 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1841 {
1841 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1842 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1843 } 1844 }
1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1845
1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847 1848
1848 num_scr_allow = 0; 1849 num_scr_allow = 0;
1849 1850
… …
1940 1941
1941 bell_ev.start (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1942 } 1943 }
1943 else 1944 else
1944 XBell (dpy, 0); 1945 XBell (dpy, 0);
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1945#endif 1947#endif
1946} 1948}
1947 1949
1948/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1951/* ARGSUSED */
… …
1968 row_start = view_start; 1970 row_start = view_start;
1969 } 1971 }
1970 1972
1971 wctomb (0, 0); 1973 wctomb (0, 0);
1972 1974
1973 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1974 { 1976 {
1975 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1976 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1977 1979
1978 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1980 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2007 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2010 */
2009void 2011void
2010rxvt_term::scr_refresh () NOTHROW 2012rxvt_term::scr_refresh () NOTHROW
2011{ 2013{
2012 unsigned char have_bg,
2013 showcursor; /* show the cursor */
2014 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2016 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
… …
2029 /* 2029 /*
2030 * A: set up vars 2030 * A: set up vars
2031 */ 2031 */
2032 refresh_count = 0; 2032 refresh_count = 0;
2033 2033
2034 unsigned int old_screen_flags = screen.flags;
2034 have_bg = 0; 2035 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
2037#endif 2038#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2040
2040 /* 2041 /*
2041 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
2042 */ 2043 */
2043 scr_reverse_selection (); 2044 scr_reverse_selection ();
2045
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY
2048 scr_swap_overlay ();
2049#endif
2050
2051 char showcursor = screen.flags & Screen_VisibleCursor;
2044 2052
2045 /* 2053 /*
2046 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
2047 */ 2055 */
2048 { 2056 {
2049 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
2050 2058
2051 showcursor = (screen.flags & Screen_VisibleCursor);
2052#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
2053 if (hidden_cursor) 2060 if (hidden_cursor)
2054 showcursor = 0; 2061 showcursor = 0;
2055#endif 2062#endif
2056 2063
… …
2084 ccol2 = bgcolor_of (rstyle); 2091 ccol2 = bgcolor_of (rstyle);
2085#else 2092#else
2086 ccol2 = Color_bg; 2093 ccol2 = Color_bg;
2087#endif 2094#endif
2088 2095
2089 if (showcursor && focus) 2096 if (focus)
2090 { 2097 {
2091 if (option (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2092 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2093 else 2100 else
2094 { 2101 {
… …
2129 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2130 } 2137 }
2131 } 2138 }
2132 } 2139 }
2133 2140
2134 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2135#if ENABLE_OVERLAY
2136 scr_swap_overlay ();
2137#endif
2138
2139#ifndef NO_SLOW_LINK_SUPPORT 2141#ifndef NO_SLOW_LINK_SUPPORT
2140 /* 2142 /*
2141 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2142 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2143 */ 2145 */
… …
2235 2237
2236 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2237 while (expect_false (stp[col] == NOCHAR && col > 0)) 2239 while (expect_false (stp[col] == NOCHAR && col > 0))
2238 --col; 2240 --col;
2239 2241
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2241 text_t *text = stp + col; 2243 text_t *text = stp + col;
2242 int count = 1; 2244 int count = 1;
2243 2245
2244 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2245 drp[col] = rend; 2247 drp[col] = rend;
… …
2249 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2250 { 2252 {
2251 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2252 { 2254 {
2253 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2254 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2255 count++; 2258 count++;
2256 i++; 2259 i++;
2257 2260
2258 continue; 2261 continue;
2259 } 2262 }
… …
2289 */ 2292 */
2290 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2292 2295
2293 // only do special processing if any attributes are set, which is unlikely 2296 // only do special processing if any attributes are set, which is unlikely
2294 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2298 {
2296 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2297 2300
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2318 2321
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL; 2323 fore = Color_UL;
2321#endif 2324#endif
2322 2325
2326#ifdef OPTION_HC
2327 if (rend & RS_Sel)
2328 {
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2332 && ISSET_PIXCOLOR (Color_HC))
2333 {
2334 if (ISSET_PIXCOLOR (Color_HTC))
2335 fore = Color_HTC;
2336 // if invert is 0 reverse video is set so we use bg color as fg color
2337 else if (!invert)
2338 fore = back;
2339
2340 back = Color_HC;
2341 invert = 0;
2342 }
2343 }
2344#endif
2345
2323 if (invert) 2346 if (invert)
2324 { 2347 {
2325#ifdef OPTION_HC
2326 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 || !ISSET_PIXCOLOR (Color_HC))
2328#endif
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 ::swap (fore, back); 2348 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2336 2349
2337#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#ifndef NO_BOLD_UNDERLINE_REVERSE
2338# ifndef OPTION_HC
2339 if (ISSET_PIXCOLOR (Color_RV))
2340 back = Color_RV;
2341# endif
2342 if (fore == back) 2351 if (fore == back)
2343 { 2352 {
2344 fore = Color_bg; 2353 fore = Color_bg;
2345 back = Color_fg; 2354 back = Color_fg;
2346 } 2355 }
… …
2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2416 } 2425 }
2417 } /* for (col....) */ 2426 } /* for (col....) */
2418 } /* for (row....) */ 2427 } /* for (row....) */
2419 2428
2420#if ENABLE_OVERLAY
2421 scr_swap_overlay ();
2422#endif
2423 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2424
2425 /* 2429 /*
2426 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2427 */ 2431 */
2428 if (showcursor) 2432 if (showcursor)
2429 { 2433 {
… …
2467 } 2471 }
2468 2472
2469 /* 2473 /*
2470 * H: cleanup selection 2474 * H: cleanup selection
2471 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2472 scr_reverse_selection (); 2481 scr_reverse_selection ();
2473 2482
2483 screen.flags = old_screen_flags;
2474 num_scr = 0; 2484 num_scr = 0;
2475 num_scr_allow = 1; 2485 num_scr_allow = 1;
2476} 2486}
2477 2487
2478void 2488void
… …
2598 { 2608 {
2599#if !ENABLE_MINIMAL 2609#if !ENABLE_MINIMAL
2600 if (selection.rect) 2610 if (selection.rect)
2601 scr_xor_rect (selection.beg.row, selection.beg.col, 2611 scr_xor_rect (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2603 RS_RVid, RS_RVid | RS_Uline); 2613 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2604 else 2614 else
2605#endif 2615#endif
2606 scr_xor_span (selection.beg.row, selection.beg.col, 2616 scr_xor_span (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col, 2617 selection.end.row, selection.end.col,
2608 RS_RVid); 2618 RS_Sel | RS_RVid);
2609 } 2619 }
2610} 2620}
2611 2621
2612/* ------------------------------------------------------------------------- */ 2622/* ------------------------------------------------------------------------- */
2613/* 2623/*
… …
2674/* ------------------------------------------------------------------------- */ 2684/* ------------------------------------------------------------------------- */
2675/* 2685/*
2676 * Paste a selection direct to the command fd 2686 * Paste a selection direct to the command fd
2677 */ 2687 */
2678void 2688void
2679rxvt_term::paste (char *data, unsigned int len) NOTHROW 2689rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2680{ 2690{
2681 /* convert normal newline chars into common keyboard Return key sequence */ 2691 /* convert normal newline chars into common keyboard Return key sequence */
2682 for (unsigned int i = 0; i < len; i++) 2692 for (unsigned int i = 0; i < len; i++)
2683 if (data[i] == C0_LF) 2693 if (data[i] == C0_LF)
2684 data[i] = C0_CR; 2694 data[i] = C0_CR;
… …
2688 2698
2689 tt_write (data, len); 2699 tt_write (data, len);
2690 2700
2691 if (priv_modes & PrivMode_BracketPaste) 2701 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~"); 2702 tt_printf ("\e[201~");
2703}
2704
2705void
2706rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{
2708 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 return;
2710
2711 tt_paste (data, len);
2693} 2712}
2694 2713
2695/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2696/* 2715/*
2697 * Respond to a notification that a primary selection has been sent 2716 * Respond to a notification that a primary selection has been sent
… …
2906 selection_wait = Sel_normal; 2925 selection_wait = Sel_normal;
2907 2926
2908#if X_HAVE_UTF8_STRING 2927#if X_HAVE_UTF8_STRING
2909 selection_type = Sel_UTF8String; 2928 selection_type = Sel_UTF8String;
2910 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2911 return; 2930 return;
2912#else 2931#else
2913 selection_type = Sel_CompoundText; 2932 selection_type = Sel_CompoundText;
2914 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2915 return; 2934 return;
2916#endif 2935#endif
2917 } 2936 }
2918 2937
2919 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2920 selection_paste (display->root, XA_CUT_BUFFER0, false); 2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2948/* 2967/*
2949 * Clear all selected text 2968 * Clear all selected text
2950 * EXT: SelectionClear 2969 * EXT: SelectionClear
2951 */ 2970 */
2952void 2971void
2953rxvt_term::selection_clear () NOTHROW 2972rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2973{
2974 if (!clipboard)
2975 {
2955 want_refresh = 1; 2976 want_refresh = 1;
2956 free (selection.text); 2977 free (selection.text);
2957 selection.text = NULL; 2978 selection.text = NULL;
2958 selection.len = 0; 2979 selection.len = 0;
2959 CLEAR_SELECTION (); 2980 CLEAR_SELECTION ();
2960 2981
2961 if (display->selection_owner == this) 2982 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2983 display->selection_owner = 0;
2984 }
2985 else
2986 {
2987 free (selection.clip_text);
2988 selection.clip_text = NULL;
2989 selection.clip_len = 0;
2990
2991 if (display->clipboard_owner == this)
2992 display->clipboard_owner = 0;
2993 }
2963} 2994}
2964 2995
2965/* ------------------------------------------------------------------------- */ 2996/* ------------------------------------------------------------------------- */
2966/* 2997/*
2967 * Copy a selection into the cut buffer 2998 * Copy a selection into the cut buffer
… …
3093 3124
3094 selection_grab (tm); 3125 selection_grab (tm);
3095} 3126}
3096 3127
3097bool 3128bool
3098rxvt_term::selection_grab (Time tm) NOTHROW 3129rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3099{ 3130{
3131 Atom sel;
3132
3133 if (!clipboard)
3134 {
3100 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 }
3101 3143
3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3144 XSetSelectionOwner (dpy, sel, vt, tm);
3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3145 if (XGetSelectionOwner (dpy, sel) == vt)
3104 { 3146 {
3105 display->set_selection_owner (this); 3147 display->set_selection_owner (this, clipboard);
3106 return true; 3148 return true;
3107 } 3149 }
3108 else 3150 else
3109 { 3151 {
3110 selection_clear (); 3152 selection_clear (clipboard);
3111 return false; 3153 return false;
3112 } 3154 }
3113 3155
3114#if 0 3156#if 0
3115 XTextProperty ct; 3157 XTextProperty ct;
… …
3610 else if (rq.target == xa[XA_MULTIPLE]) 3652 else if (rq.target == xa[XA_MULTIPLE])
3611 { 3653 {
3612 /* TODO: Handle MULTIPLE */ 3654 /* TODO: Handle MULTIPLE */
3613 } 3655 }
3614#endif 3656#endif
3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3616 { 3658 {
3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3618 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);
3619 ev.property = rq.property; 3667 ev.property = rq.property;
3620 } 3668 }
3621 else if (rq.target == XA_STRING 3669 else if (rq.target == XA_STRING
3622 || rq.target == xa[XA_TEXT] 3670 || rq.target == xa[XA_TEXT]
3623 || rq.target == xa[XA_COMPOUND_TEXT] 3671 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3656 { 3704 {
3657 target = xa[XA_COMPOUND_TEXT]; 3705 target = xa[XA_COMPOUND_TEXT];
3658 style = enc_compound_text; 3706 style = enc_compound_text;
3659 } 3707 }
3660 3708
3661 if (selection.text) 3709 if (rq.selection == XA_PRIMARY && selection.text)
3662 { 3710 {
3663 cl = selection.text; 3711 cl = selection.text;
3664 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;
3665 } 3718 }
3666 else 3719 else
3667 { 3720 {
3668 cl = L""; 3721 cl = L"";
3669 selectlen = 0; 3722 selectlen = 0;
… …
3737 h += 2; min_it (h, nrow); 3790 h += 2; min_it (h, nrow);
3738 3791
3739 x -= 1; clamp_it (x, 0, ncol - w); 3792 x -= 1; clamp_it (x, 0, ncol - w);
3740 y -= 1; clamp_it (y, 0, nrow - h); 3793 y -= 1; clamp_it (y, 0, nrow - h);
3741 3794
3742 ov_x = x; ov_y = y; 3795 ov.x = x; ov.y = y;
3743 ov_w = w; ov_h = h; 3796 ov.w = w; ov.h = h;
3744 3797
3745 ov_text = new text_t *[h]; 3798 ov.text = new text_t *[h];
3746 ov_rend = new rend_t *[h]; 3799 ov.rend = new rend_t *[h];
3747 3800
3748 for (y = 0; y < h; y++) 3801 for (y = 0; y < h; y++)
3749 { 3802 {
3750 text_t *tp = ov_text[y] = new text_t[w]; 3803 text_t *tp = ov.text[y] = new text_t[w];
3751 rend_t *rp = ov_rend[y] = new rend_t[w]; 3804 rend_t *rp = ov.rend[y] = new rend_t[w];
3752 3805
3753 text_t t0, t1, t2; 3806 text_t t0, t1, t2;
3754 rend_t r = OVERLAY_RSTYLE; 3807 rend_t r = OVERLAY_RSTYLE;
3755 3808
3756 if (y == 0) 3809 if (y == 0)
… …
3775} 3828}
3776 3829
3777void 3830void
3778rxvt_term::scr_overlay_off () NOTHROW 3831rxvt_term::scr_overlay_off () NOTHROW
3779{ 3832{
3780 if (!ov_text) 3833 if (!ov.text)
3781 return; 3834 return;
3782 3835
3783 want_refresh = 1; 3836 want_refresh = 1;
3784 3837
3785 for (int y = 0; y < ov_h; y++) 3838 for (int y = 0; y < ov.h; y++)
3786 { 3839 {
3787 delete [] ov_text[y]; 3840 delete [] ov.text[y];
3788 delete [] ov_rend[y]; 3841 delete [] ov.rend[y];
3789 } 3842 }
3790 3843
3791 delete [] ov_text; ov_text = 0; 3844 delete [] ov.text; ov.text = 0;
3792 delete [] ov_rend; ov_rend = 0; 3845 delete [] ov.rend; ov.rend = 0;
3793} 3846}
3794 3847
3795void 3848void
3796rxvt_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
3797{ 3850{
3798 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3851 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3799 return; 3852 return;
3800 3853
3801 x++, y++; 3854 x++, y++;
3802 3855
3803 ov_text[y][x] = text; 3856 ov.text[y][x] = text;
3804 ov_rend[y][x] = rend; 3857 ov.rend[y][x] = rend;
3805} 3858}
3806 3859
3807void 3860void
3808rxvt_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
3809{ 3862{
… …
3828} 3881}
3829 3882
3830void 3883void
3831rxvt_term::scr_swap_overlay () NOTHROW 3884rxvt_term::scr_swap_overlay () NOTHROW
3832{ 3885{
3833 if (!ov_text) 3886 if (!ov.text)
3834 return; 3887 return;
3835 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
3836 // swap screen mem with overlay 3894 // swap screen mem with overlay
3837 for (int y = ov_h; y--; ) 3895 for (int y = ov.h; y--; )
3838 { 3896 {
3839 text_t *t1 = ov_text[y]; 3897 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov_rend[y]; 3898 rend_t *r1 = ov.rend[y];
3841 3899
3842 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;
3843 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;
3844 3902
3845 for (int x = ov_w; x--; ) 3903 for (int x = ov.w; x--; )
3846 { 3904 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3905 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 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));
3849 } 3907 }
3850 } 3908 }

Diff Legend

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