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

Diff Legend

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