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.374 by sf-exg, Sat Feb 12 00:50:04 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
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163 scr_soft_reset ();
164
165 view_start = 0; 164 view_start = 0;
166 num_scr = 0; 165 num_scr = 0;
167 166
168 if (ncol == 0) 167 if (ncol == 0)
169 ncol = 80; 168 ncol = 80;
… …
233 selection.text = NULL; 232 selection.text = NULL;
234 selection.len = 0; 233 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
237 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
238 } 239 }
239 else 240 else
240 { 241 {
241 /* 242 /*
242 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
280 281
281 if (top_row) 282 if (top_row)
282 { 283 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
285 287
286 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 290
289 do 291 do
290 { 292 {
291 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 297
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 299 {
… …
395 395
396 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 398 }
399 399
400 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
405
400 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
401 407
402 prev_nrow = nrow; 408 prev_nrow = nrow;
403 prev_ncol = ncol; 409 prev_ncol = ncol;
404 410
… …
436void 442void
437rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
438{ 444{
439 scr_release (); 445 scr_release ();
440 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
441 scr_reset (); 449 scr_reset ();
442 450
443 scr_clear (true); 451 scr_clear (true);
444 scr_refresh (); 452 scr_refresh ();
445} 453}
… …
450 /* only affects modes, nothing drastic such as clearing the screen */ 458 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 459#if ENABLE_OVERLAY
452 scr_overlay_off (); 460 scr_overlay_off ();
453#endif 461#endif
454 462
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 463 if (current_screen != PRIMARY)
458 scr_swap_screen (); 464 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 465
466 scr_scroll_region (0, MAX_ROWS - 1); 466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 468 scr_insert_mode (0);
469} 469}
… …
511 } 511 }
512 512
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
519#endif
520} 518}
521 519
522void 520void
523rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
524{ 522{
… …
549 want_refresh = 1; 547 want_refresh = 1;
550 view_start = 0; 548 view_start = 0;
551 549
552 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
553 551
554 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
555 553
556#if NSCREENS 554#if NSCREENS
557 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
558 { 556 {
559 num_scr = 0; 557 num_scr = 0;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
786 } 784 }
787 } 785 }
788 786
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 790 int row = screen.cur.row;
795 791
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 793
798 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
902# else 898# else
903 c = 0xfffd; 899 c = 0xfffd;
904# endif 900# endif
905#endif 901#endif
906 902
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)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
916 904
917 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
918 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
919 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
920 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
921 c = NOCHAR; 911 c = NOCHAR;
922 // and try the same character next loop iteration 912 // and try the same character next loop iteration
923 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
924 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
925 925
926 line->touch (); 926 line->touch ();
927 927
928 do 928 do
929 { 929 {
… …
935 else 935 else
936 { 936 {
937 line->l = ncol; 937 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
940 break; 940
941 goto end_of_line;
941 } 942 }
942 943
943 c = NOCHAR; 944 c = NOCHAR;
944 } 945 }
945 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
946 947
947 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
949 { 950 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 951 line->t[c] = ' ';
955 line->r[c] = rend; 952 line->r[c] = rend;
956 }
957 } 953 }
954
955end_of_line:
956 ;
958 } 957 }
959#if ENABLE_COMBINING 958#if ENABLE_COMBINING
960 else // width == 0 959 else // width == 0
961 { 960 {
962 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1001#endif
1003 } 1002 }
1004 1003
1005 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1006 1005
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1009#endif
1010} 1007}
1011 1008
1012/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1013/* 1010/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1024
1028 want_refresh = 1; 1025 want_refresh = 1;
1029#endif 1026#endif
1030 } 1027 }
1031 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1032 else 1031 else
1033 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1034} 1033}
1035 1034
1036/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1343 return; 1342 return;
1344 1343
1345 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1346 1345
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1349 {
1352 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1353 1351
1354 if (mapped && !view_start) 1352 if (mapped)
1355 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1357 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1358 } 1356 }
1359 else 1357 else
1360 { 1358 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1360
1363 if (mapped && !view_start) 1361 if (mapped)
1364 { 1362 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1374 } 1372 }
1375 1373
1376 for (; num--; row++) 1374 for (; num--; row++)
1377 { 1375 {
1378 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1379 if (!view_start) 1378 if (row - view_start < nrow)
1380 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1381 } 1380 }
1382} 1381}
1383 1382
1384#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1385void 1384void
… …
1538 { 1537 {
1539 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1540 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1541 } 1540 }
1542 1541
1543 scr_blank_line (*line, ncol - count, count, 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1544 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1545 1543
1546 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1548 { 1546 {
1549 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1685 { 1683 {
1686 rvideo_state = on; 1684 rvideo_state = on;
1687 1685
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1691#endif 1689#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1691
1694 XGCValues gcvalue; 1692 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1839 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1840 { 1838 {
1841 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1842 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1843 } 1841 }
1844// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 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); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1847 1845
1848 num_scr_allow = 0; 1846 num_scr_allow = 0;
1849 1847
… …
1940 1938
1941 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1942 } 1940 }
1943 else 1941 else
1944 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1945#endif 1944#endif
1946} 1945}
1947 1946
1948/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1949/* ARGSUSED */ 1948/* ARGSUSED */
… …
1968 row_start = view_start; 1967 row_start = view_start;
1969 } 1968 }
1970 1969
1971 wctomb (0, 0); 1970 wctomb (0, 0);
1972 1971
1973 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1974 { 1973 {
1975 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1976 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1977 1976
1978 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2007 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
2008 */ 2007 */
2009void 2008void
2010rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
2011{ 2010{
2012 unsigned char have_bg,
2013 showcursor; /* show the cursor */
2014 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2015 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2016 int i; /* tmp */ 2013 int i; /* tmp */
2017#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2018 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2029 /* 2026 /*
2030 * A: set up vars 2027 * A: set up vars
2031 */ 2028 */
2032 refresh_count = 0; 2029 refresh_count = 0;
2033 2030
2031 unsigned int old_screen_flags = screen.flags;
2034 have_bg = 0; 2032 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2037#endif 2035#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2037
2040 /* 2038 /*
2041 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2042 */ 2040 */
2043 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2044 2049
2045 /* 2050 /*
2046 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2047 */ 2052 */
2048 { 2053 {
2049 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2050 2055
2051 showcursor = (screen.flags & Screen_VisibleCursor);
2052#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2053 if (hidden_cursor) 2057 if (hidden_cursor)
2054 showcursor = 0; 2058 showcursor = 0;
2055#endif 2059#endif
2056 2060
… …
2084 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2085#else 2089#else
2086 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2087#endif 2091#endif
2088 2092
2089 if (showcursor && focus) 2093 if (focus)
2090 { 2094 {
2091 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2092 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2093 else 2097 else
2094 { 2098 {
… …
2129 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2130 } 2134 }
2131 } 2135 }
2132 } 2136 }
2133 2137
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 2138#ifndef NO_SLOW_LINK_SUPPORT
2140 /* 2139 /*
2141 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2142 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2143 */ 2142 */
… …
2235 2234
2236 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2237 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2238 --col; 2237 --col;
2239 2238
2240 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2241 text_t *text = stp + col; 2240 text_t *text = stp + col;
2242 int count = 1; 2241 int count = 1;
2243 2242
2244 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2245 drp[col] = rend; 2244 drp[col] = rend;
… …
2249 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2250 { 2249 {
2251 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2252 { 2251 {
2253 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2254 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2255 count++; 2255 count++;
2256 i++; 2256 i++;
2257 2257
2258 continue; 2258 continue;
2259 } 2259 }
… …
2289 */ 2289 */
2290 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2291 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2292 2292
2293 // only do special processing if any attributes are set, which is unlikely 2293 // 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))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2295 { 2295 {
2296 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2297 2297
2298#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2299 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2318 2318
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL; 2320 fore = Color_UL;
2321#endif 2321#endif
2322 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2323 if (invert) 2343 if (invert)
2324 { 2344 {
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); 2345 ::swap (fore, back);
2332#ifdef OPTION_HC
2333 else if (ISSET_PIXCOLOR (Color_HC))
2334 back = Color_HC;
2335#endif
2336 2346
2337#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#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) 2348 if (fore == back)
2343 { 2349 {
2344 fore = Color_bg; 2350 fore = Color_bg;
2345 back = Color_fg; 2351 back = Color_fg;
2346 } 2352 }
… …
2415 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2416 } 2422 }
2417 } /* for (col....) */ 2423 } /* for (col....) */
2418 } /* for (row....) */ 2424 } /* for (row....) */
2419 2425
2420#if ENABLE_OVERLAY
2421 scr_swap_overlay ();
2422#endif
2423 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2424
2425 /* 2426 /*
2426 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2427 */ 2428 */
2428 if (showcursor) 2429 if (showcursor)
2429 { 2430 {
… …
2467 } 2468 }
2468 2469
2469 /* 2470 /*
2470 * H: cleanup selection 2471 * H: cleanup selection
2471 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2472 scr_reverse_selection (); 2478 scr_reverse_selection ();
2473 2479
2480 screen.flags = old_screen_flags;
2474 num_scr = 0; 2481 num_scr = 0;
2475 num_scr_allow = 1; 2482 num_scr_allow = 1;
2476} 2483}
2477 2484
2478void 2485void
… …
2499 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2500 } 2507 }
2501} 2508}
2502 2509
2503void 2510void
2504rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2505{ 2512{
2513 bool transparent = false;
2514
2506#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2507 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2508#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2509 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2510 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2511 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2512 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2513 2541
2514 if (scrollBar.win) 2542 if (scrollBar.win)
2515 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2516 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2517 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2518 scrollBar.show (0); 2549 scrollBar.show (0);
2519 } 2550 }
2520 2551
2521#endif 2552 if (refresh)
2522 2553 {
2523 /* bgPixmap.apply () does not do the following : */
2524 scr_clear (); 2554 scr_clear ();
2525 scr_touch (true); 2555 scr_touch (true);
2556 }
2526 want_refresh = 1; 2557 want_refresh = 1;
2527} 2558}
2528 2559
2529/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2530void 2561void
… …
2598 { 2629 {
2599#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2600 if (selection.rect) 2631 if (selection.rect)
2601 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2603 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2604 else 2635 else
2605#endif 2636#endif
2606 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2608 RS_RVid); 2639 RS_Sel | RS_RVid);
2609 } 2640 }
2610} 2641}
2611 2642
2612/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2613/* 2644/*
… …
2618void 2649void
2619rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2620{ 2651{
2621 int row, wrote; 2652 int row, wrote;
2622 unsigned int width, towrite; 2653 unsigned int width, towrite;
2623 char r1[] = "\n"; 2654 const char r1[] = "\n";
2624 2655
2625 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2626 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2627 { 2658 {
2628 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2674/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2675/* 2706/*
2676 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2677 */ 2708 */
2678void 2709void
2679rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2680{ 2711{
2681 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2682 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2683 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2684 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2690 2721
2691 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2693} 2724}
2694 2725
2695/* ------------------------------------------------------------------------- */
2696/*
2697 * Respond to a notification that a primary selection has been sent
2698 * EXT: SelectionNotify
2699 */
2700void 2726void
2701rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{ 2728{
2703 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 {
2705 if ((selection_type & Sel_CompoundText))
2706 {
2707 int selnum = selection_type & Sel_whereMask;
2708
2709 selection_type = 0;
2710 if (selnum != Sel_direct)
2711 selection_request_other (XA_STRING, selnum);
2712 }
2713
2714 if ((selection_type & Sel_UTF8String))
2715 {
2716 int selnum = selection_type & Sel_whereMask;
2717
2718 selection_type = Sel_CompoundText;
2719 if (selnum != Sel_direct)
2720 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2721 else
2722 selection_type = 0;
2723 }
2724
2725 return;
2726 }
2727
2728 unsigned long bytes_after;
2729 XTextProperty ct;
2730
2731 if (XGetWindowProperty (dpy, win, prop,
2732 0, PROP_SIZE / 4,
2733 delete_prop, AnyPropertyType,
2734 &ct.encoding, &ct.format,
2735 &ct.nitems, &bytes_after,
2736 &ct.value) != Success)
2737 {
2738 ct.value = 0;
2739 goto bailout;
2740 }
2741
2742 if (ct.encoding == None)
2743 goto bailout;
2744
2745 if (bytes_after)
2746 {
2747 // fetch and append remaining data
2748 XTextProperty ct2;
2749
2750 if (XGetWindowProperty (dpy, win, prop,
2751 ct.nitems / 4, (bytes_after + 3) / 4,
2752 delete_prop, AnyPropertyType,
2753 &ct2.encoding, &ct2.format,
2754 &ct2.nitems, &bytes_after,
2755 &ct2.value) != Success)
2756 goto bailout;
2757
2758 // realloc should be compatible to XFree, here, and elsewhere, too
2759 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2760 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2761 ct.nitems += ct2.nitems;
2762
2763 XFree (ct2.value);
2764 }
2765
2766 if (ct.value == 0)
2767 goto bailout;
2768
2769 if (ct.encoding == xa[XA_INCR])
2770 {
2771 // INCR selection, start handshake
2772 if (!delete_prop)
2773 XDeleteProperty (dpy, win, prop);
2774
2775 selection_wait = Sel_incr;
2776 incr_buf_fill = 0;
2777 incr_ev.start (10);
2778
2779 goto bailout;
2780 }
2781
2782 if (ct.nitems == 0)
2783 {
2784 if (selection_wait == Sel_incr)
2785 {
2786 XFree (ct.value);
2787
2788 // finally complete, now paste the whole thing
2789 selection_wait = Sel_normal;
2790 ct.value = (unsigned char *)incr_buf;
2791 ct.nitems = incr_buf_fill;
2792 incr_buf = 0;
2793 incr_buf_size = 0;
2794 incr_ev.stop ();
2795 }
2796 else
2797 {
2798 if (selection_wait == Sel_normal
2799 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2800 {
2801 /*
2802 * pass through again trying CUT_BUFFER0 if we've come from
2803 * XConvertSelection () but nothing was presented
2804 */
2805 selection_paste (display->root, XA_CUT_BUFFER0, False);
2806 }
2807
2808 goto bailout;
2809 }
2810 }
2811 else if (selection_wait == Sel_incr)
2812 {
2813 incr_ev.start (10);
2814
2815 while (incr_buf_fill + ct.nitems > incr_buf_size)
2816 {
2817 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2818 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2819 }
2820
2821 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2822 incr_buf_fill += ct.nitems;
2823
2824 goto bailout;
2825 }
2826
2827 char **cl;
2828 int cr;
2829
2830#if !ENABLE_MINIMAL
2831 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2832 // so recode it manually
2833 if (ct.encoding == xa[XA_UTF8_STRING])
2834 {
2835 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2836 char *s = rxvt_wcstombs (w);
2837 free (w);
2838 // TODO: strlen == only the first element will be converted. well...
2839 paste (s, strlen (s));
2840 free (s);
2841 }
2842 else
2843#endif
2844 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2845 && cl)
2846 {
2847 for (int i = 0; i < cr; i++)
2848 paste (cl[i], strlen (cl[i]));
2849
2850 XFreeStringList (cl);
2851 }
2852 else
2853 paste ((char *)ct.value, ct.nitems); // paste raw
2854
2855bailout:
2856 XFree (ct.value);
2857
2858 if (selection_wait == Sel_normal)
2859 selection_wait = Sel_none;
2860}
2861
2862void
2863rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2864{
2865 selection_wait = Sel_none;
2866
2867 incr_buf_size = 0;
2868 free (incr_buf);
2869
2870 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2871}
2872
2873void
2874rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2875{
2876 if (prop == None || selection_wait != Sel_incr)
2877 return; 2730 return;
2878 2731
2879 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2880} 2733}
2881 2734
2882/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2883/* 2736/*
2884 * Request the current selection: 2737 * Request the current selection:
… …
2887 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2888 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2889 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
2890 * EXT: button 2 release 2743 * EXT: button 2 release
2891 */ 2744 */
2745
2746static void
2747selection_cb (char *data, unsigned int len, rxvt_selection *rs)
2748{
2749 rxvt_term *term = (rxvt_term *)rs->user_data;
2750
2751 if (data)
2752 term->paste (data, len);
2753 delete rs;
2754 term->selection_req = 0;
2755}
2756
2892void 2757void
2893rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2758rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2894{ 2759{
2895 if (selection.text && selnum == Sel_Primary) 2760 if (selection.text && selnum == Sel_Primary)
2896 { 2761 {
… …
2898 char *str = rxvt_wcstombs (selection.text, selection.len); 2763 char *str = rxvt_wcstombs (selection.text, selection.len);
2899 paste (str, strlen (str)); 2764 paste (str, strlen (str));
2900 free (str); 2765 free (str);
2901 return; 2766 return;
2902 } 2767 }
2903 else 2768 else if (!selection_req)
2904 {
2905 selection_request_time = tm;
2906 selection_wait = Sel_normal;
2907
2908#if X_HAVE_UTF8_STRING
2909 selection_type = Sel_UTF8String;
2910 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2911 return;
2912#else
2913 selection_type = Sel_CompoundText;
2914 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2915 return;
2916#endif
2917 } 2769 {
2918 2770 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], selection_cb, this);
2919 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2771 selection_req->run ();
2920 selection_paste (display->root, XA_CUT_BUFFER0, false);
2921}
2922
2923int
2924rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2925{
2926 Atom sel;
2927
2928 selection_type |= selnum;
2929
2930 if (selnum == Sel_Primary)
2931 sel = XA_PRIMARY;
2932 else if (selnum == Sel_Secondary)
2933 sel = XA_SECONDARY;
2934 else
2935 sel = xa[XA_CLIPBOARD];
2936
2937 if (XGetSelectionOwner (dpy, sel) != None)
2938 { 2772 }
2939 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2940 vt, selection_request_time);
2941 return 1;
2942 }
2943
2944 return 0;
2945} 2773}
2946 2774
2947/* ------------------------------------------------------------------------- */ 2775/* ------------------------------------------------------------------------- */
2948/* 2776/*
2949 * Clear all selected text 2777 * Clear all selected text
2950 * EXT: SelectionClear 2778 * EXT: SelectionClear
2951 */ 2779 */
2952void 2780void
2953rxvt_term::selection_clear () NOTHROW 2781rxvt_term::selection_clear (bool clipboard) NOTHROW
2954{ 2782{
2783 if (!clipboard)
2784 {
2955 want_refresh = 1; 2785 want_refresh = 1;
2956 free (selection.text); 2786 free (selection.text);
2957 selection.text = NULL; 2787 selection.text = NULL;
2958 selection.len = 0; 2788 selection.len = 0;
2959 CLEAR_SELECTION (); 2789 CLEAR_SELECTION ();
2960 2790
2961 if (display->selection_owner == this) 2791 if (display->selection_owner == this)
2962 display->selection_owner = 0; 2792 display->selection_owner = 0;
2793 }
2794 else
2795 {
2796 free (selection.clip_text);
2797 selection.clip_text = NULL;
2798 selection.clip_len = 0;
2799
2800 if (display->clipboard_owner == this)
2801 display->clipboard_owner = 0;
2802 }
2963} 2803}
2964 2804
2965/* ------------------------------------------------------------------------- */ 2805/* ------------------------------------------------------------------------- */
2966/* 2806/*
2967 * Copy a selection into the cut buffer 2807 * Copy a selection into the cut buffer
2968 * EXT: button 1 or 3 release 2808 * EXT: button 1 or 3 release
2969 */ 2809 */
2970void 2810void
2971rxvt_term::selection_make (Time tm) 2811rxvt_term::selection_make (Time tm)
2972{ 2812{
2973 int i; 2813 int size;
2974 wchar_t *new_selection_text; 2814 wchar_t *new_selection_text;
2975 text_t *t; 2815 text_t *t;
2976 2816
2977 switch (selection.op) 2817 switch (selection.op)
2978 { 2818 {
… …
2994 return; /* nothing selected, go away */ 2834 return; /* nothing selected, go away */
2995 2835
2996 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2836 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2997 return; 2837 return;
2998 2838
2999 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2839 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3000 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2840 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3001 2841
3002 int ofs = 0; 2842 int ofs = 0;
3003 int extra = 0; 2843 int extra = 0;
3004 2844
3005 int col = selection.beg.col; 2845 int col = selection.beg.col;
… …
3011 { 2851 {
3012#if !ENABLE_MINIMAL 2852#if !ENABLE_MINIMAL
3013 if (selection.rect) 2853 if (selection.rect)
3014 { 2854 {
3015 col = selection.beg.col; 2855 col = selection.beg.col;
3016 end_col = ncol + 1; 2856 end_col = selection.end.col;
3017 } 2857 }
3018 else 2858 else
3019#endif 2859#endif
3020 end_col = ROW(row).l; 2860 end_col = ROW(row).l;
3021 2861
3022 col = max (col, 0); 2862 col = max (col, 0);
3023 2863
3024 if (row == selection.end.row 2864 if (row == selection.end.row)
3025#if !ENABLE_MINIMAL
3026 || selection.rect
3027#endif
3028 )
3029 min_it (end_col, selection.end.col); 2865 min_it (end_col, selection.end.col);
3030 2866
3031 t = ROW(row).t + col; 2867 t = ROW(row).t + col;
3032 2868
3033 for (; col < end_col; col++) 2869 for (; col < end_col; col++)
… …
3041 2877
3042 extra -= (len - 1); 2878 extra -= (len - 1);
3043 2879
3044 if (extra < 0) 2880 if (extra < 0)
3045 { 2881 {
3046 extra += i; 2882 extra += size;
3047 i += i; 2883 size += size;
3048 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2884 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3049 } 2885 }
3050 2886
3051 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2887 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3052 } 2888 }
3053#endif 2889#endif
… …
3065 2901
3066 new_selection_text[ofs++] = C0_LF; 2902 new_selection_text[ofs++] = C0_LF;
3067 } 2903 }
3068 else 2904 else
3069#endif 2905#endif
3070 if (!ROW(row).is_longer () && row != selection.end.row) 2906 if (!ROW(row).is_longer ()
2907 && (row != selection.end.row || end_col != selection.end.col)
2908 && (row != selection.beg.row || selection.beg.col < ncol))
3071 new_selection_text[ofs++] = C0_LF; 2909 new_selection_text[ofs++] = C0_LF;
3072 } 2910 }
3073
3074 if (end_col != selection.end.col)
3075 new_selection_text[ofs++] = C0_LF;
3076 2911
3077 new_selection_text[ofs] = 0; 2912 new_selection_text[ofs] = 0;
3078 2913
3079 if (ofs == 0) 2914 if (ofs == 0)
3080 { 2915 {
… …
3093 2928
3094 selection_grab (tm); 2929 selection_grab (tm);
3095} 2930}
3096 2931
3097bool 2932bool
3098rxvt_term::selection_grab (Time tm) NOTHROW 2933rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3099{ 2934{
2935 Atom sel;
2936
2937 if (!clipboard)
2938 {
3100 selection_time = tm; 2939 selection_time = tm;
2940 sel = XA_PRIMARY;
2941 }
2942 else
2943 {
2944 clipboard_time = tm;
2945 sel = xa[XA_CLIPBOARD];
2946 }
3101 2947
3102 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2948 XSetSelectionOwner (dpy, sel, vt, tm);
3103 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2949 if (XGetSelectionOwner (dpy, sel) == vt)
3104 { 2950 {
3105 display->set_selection_owner (this); 2951 display->set_selection_owner (this, clipboard);
3106 return true; 2952 return true;
3107 } 2953 }
3108 else 2954 else
3109 { 2955 {
3110 selection_clear (); 2956 selection_clear (clipboard);
3111 return false; 2957 return false;
3112 } 2958 }
3113 2959
3114#if 0 2960#if 0
3115 XTextProperty ct; 2961 XTextProperty ct;
… …
3610 else if (rq.target == xa[XA_MULTIPLE]) 3456 else if (rq.target == xa[XA_MULTIPLE])
3611 { 3457 {
3612 /* TODO: Handle MULTIPLE */ 3458 /* TODO: Handle MULTIPLE */
3613 } 3459 }
3614#endif 3460#endif
3615 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3461 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3616 { 3462 {
3617 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3463 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3618 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3464 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3465 ev.property = rq.property;
3466 }
3467 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3468 {
3469 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3470 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3619 ev.property = rq.property; 3471 ev.property = rq.property;
3620 } 3472 }
3621 else if (rq.target == XA_STRING 3473 else if (rq.target == XA_STRING
3622 || rq.target == xa[XA_TEXT] 3474 || rq.target == xa[XA_TEXT]
3623 || rq.target == xa[XA_COMPOUND_TEXT] 3475 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3656 { 3508 {
3657 target = xa[XA_COMPOUND_TEXT]; 3509 target = xa[XA_COMPOUND_TEXT];
3658 style = enc_compound_text; 3510 style = enc_compound_text;
3659 } 3511 }
3660 3512
3661 if (selection.text) 3513 if (rq.selection == XA_PRIMARY && selection.text)
3662 { 3514 {
3663 cl = selection.text; 3515 cl = selection.text;
3664 selectlen = selection.len; 3516 selectlen = selection.len;
3517 }
3518 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3519 {
3520 cl = selection.clip_text;
3521 selectlen = selection.clip_len;
3665 } 3522 }
3666 else 3523 else
3667 { 3524 {
3668 cl = L""; 3525 cl = L"";
3669 selectlen = 0; 3526 selectlen = 0;
… …
3737 h += 2; min_it (h, nrow); 3594 h += 2; min_it (h, nrow);
3738 3595
3739 x -= 1; clamp_it (x, 0, ncol - w); 3596 x -= 1; clamp_it (x, 0, ncol - w);
3740 y -= 1; clamp_it (y, 0, nrow - h); 3597 y -= 1; clamp_it (y, 0, nrow - h);
3741 3598
3742 ov_x = x; ov_y = y; 3599 ov.x = x; ov.y = y;
3743 ov_w = w; ov_h = h; 3600 ov.w = w; ov.h = h;
3744 3601
3745 ov_text = new text_t *[h]; 3602 ov.text = new text_t *[h];
3746 ov_rend = new rend_t *[h]; 3603 ov.rend = new rend_t *[h];
3747 3604
3748 for (y = 0; y < h; y++) 3605 for (y = 0; y < h; y++)
3749 { 3606 {
3750 text_t *tp = ov_text[y] = new text_t[w]; 3607 text_t *tp = ov.text[y] = new text_t[w];
3751 rend_t *rp = ov_rend[y] = new rend_t[w]; 3608 rend_t *rp = ov.rend[y] = new rend_t[w];
3752 3609
3753 text_t t0, t1, t2; 3610 text_t t0, t1, t2;
3754 rend_t r = OVERLAY_RSTYLE; 3611 rend_t r = OVERLAY_RSTYLE;
3755 3612
3756 if (y == 0) 3613 if (y == 0)
… …
3775} 3632}
3776 3633
3777void 3634void
3778rxvt_term::scr_overlay_off () NOTHROW 3635rxvt_term::scr_overlay_off () NOTHROW
3779{ 3636{
3780 if (!ov_text) 3637 if (!ov.text)
3781 return; 3638 return;
3782 3639
3783 want_refresh = 1; 3640 want_refresh = 1;
3784 3641
3785 for (int y = 0; y < ov_h; y++) 3642 for (int y = 0; y < ov.h; y++)
3786 { 3643 {
3787 delete [] ov_text[y]; 3644 delete [] ov.text[y];
3788 delete [] ov_rend[y]; 3645 delete [] ov.rend[y];
3789 } 3646 }
3790 3647
3791 delete [] ov_text; ov_text = 0; 3648 delete [] ov.text; ov.text = 0;
3792 delete [] ov_rend; ov_rend = 0; 3649 delete [] ov.rend; ov.rend = 0;
3793} 3650}
3794 3651
3795void 3652void
3796rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3653rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3797{ 3654{
3798 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3655 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3799 return; 3656 return;
3800 3657
3801 x++, y++; 3658 x++, y++;
3802 3659
3803 ov_text[y][x] = text; 3660 ov.text[y][x] = text;
3804 ov_rend[y][x] = rend; 3661 ov.rend[y][x] = rend;
3805} 3662}
3806 3663
3807void 3664void
3808rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3665rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3809{ 3666{
… …
3828} 3685}
3829 3686
3830void 3687void
3831rxvt_term::scr_swap_overlay () NOTHROW 3688rxvt_term::scr_swap_overlay () NOTHROW
3832{ 3689{
3833 if (!ov_text) 3690 if (!ov.text)
3834 return; 3691 return;
3835 3692
3693 // hide cursor if it is within the overlay area
3694 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3695 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3696 screen.flags &= ~Screen_VisibleCursor;
3697
3836 // swap screen mem with overlay 3698 // swap screen mem with overlay
3837 for (int y = ov_h; y--; ) 3699 for (int y = ov.h; y--; )
3838 { 3700 {
3839 text_t *t1 = ov_text[y]; 3701 text_t *t1 = ov.text[y];
3840 rend_t *r1 = ov_rend[y]; 3702 rend_t *r1 = ov.rend[y];
3841 3703
3842 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3704 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; 3705 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3844 3706
3845 for (int x = ov_w; x--; ) 3707 for (int x = ov.w; x--; )
3846 { 3708 {
3847 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3848 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3849 } 3711 }
3850 } 3712 }

Diff Legend

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