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.324 by root, Wed Nov 5 00:01:01 2008 UTC vs.
Revision 1.377 by root, Mon Mar 21 13:46:17 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 code below does not work when view_start != 0
1348 // the workaround is to disable the clear and use a normal refresh
1349 // when view_start != 0. mysterious.
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 && !view_start) 1352 if (mapped)
1357 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (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
1365 if (mapped && !view_start) 1361 if (mapped)
1366 { 1362 {
1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1377 1373
1378 for (; num--; row++) 1374 for (; num--; row++)
1379 { 1375 {
1380 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1381 1377
1382 if (!view_start) 1378 if (row - view_start < nrow)
1383 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1384 } 1380 }
1385} 1381}
1386 1382
1387#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1388void 1384void
… …
1541 { 1537 {
1542 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1543 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1544 } 1540 }
1545 1541
1546 scr_blank_line (*line, ncol - count, count, 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1547 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1548 1543
1549 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1550 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1551 { 1546 {
1552 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1688 { 1683 {
1689 rvideo_state = on; 1684 rvideo_state = on;
1690 1685
1691 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1692#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1693 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1694#endif 1689#endif
1695 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1696 1691
1697 XGCValues gcvalue; 1692 XGCValues gcvalue;
1698 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1842 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1843 { 1838 {
1844 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1845 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1846 } 1841 }
1847// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1848 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++)
1849 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);
1850 1845
1851 num_scr_allow = 0; 1846 num_scr_allow = 0;
1852 1847
… …
1943 1938
1944 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1945 } 1940 }
1946 else 1941 else
1947 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1948#endif 1944#endif
1949} 1945}
1950 1946
1951/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1952/* ARGSUSED */ 1948/* ARGSUSED */
… …
1971 row_start = view_start; 1967 row_start = view_start;
1972 } 1968 }
1973 1969
1974 wctomb (0, 0); 1970 wctomb (0, 0);
1975 1971
1976 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1977 { 1973 {
1978 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1979 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1980 1976
1981 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
… …
2010 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
2011 */ 2007 */
2012void 2008void
2013rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
2014{ 2010{
2015 unsigned char have_bg,
2016 showcursor; /* show the cursor */
2017 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2018 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2019 int i; /* tmp */ 2013 int i; /* tmp */
2020#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2021 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2032 /* 2026 /*
2033 * A: set up vars 2027 * A: set up vars
2034 */ 2028 */
2035 refresh_count = 0; 2029 refresh_count = 0;
2036 2030
2031 unsigned int old_screen_flags = screen.flags;
2037 have_bg = 0; 2032 char have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2039 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2040#endif 2035#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2037
2043 /* 2038 /*
2044 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2045 */ 2040 */
2046 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;
2047 2049
2048 /* 2050 /*
2049 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2050 */ 2052 */
2051 { 2053 {
2052 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2053 2055
2054 showcursor = (screen.flags & Screen_VisibleCursor);
2055#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2056 if (hidden_cursor) 2057 if (hidden_cursor)
2057 showcursor = 0; 2058 showcursor = 0;
2058#endif 2059#endif
2059 2060
… …
2087 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2088#else 2089#else
2089 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2090#endif 2091#endif
2091 2092
2092 if (showcursor && focus) 2093 if (focus)
2093 { 2094 {
2094 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2095 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2096 else 2097 else
2097 { 2098 {
… …
2132 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2133 } 2134 }
2134 } 2135 }
2135 } 2136 }
2136 2137
2137 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2138#if ENABLE_OVERLAY
2139 scr_swap_overlay ();
2140#endif
2141
2142#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2143 /* 2139 /*
2144 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2145 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2146 */ 2142 */
… …
2238 2234
2239 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2240 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2241 --col; 2237 --col;
2242 2238
2243 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2244 text_t *text = stp + col; 2240 text_t *text = stp + col;
2245 int count = 1; 2241 int count = 1;
2246 2242
2247 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2248 drp[col] = rend; 2244 drp[col] = rend;
… …
2252 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2253 { 2249 {
2254 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2255 { 2251 {
2256 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2257 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2258 count++; 2255 count++;
2259 i++; 2256 i++;
2260 2257
2261 continue; 2258 continue;
2262 } 2259 }
… …
2292 */ 2289 */
2293 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2294 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2295 2292
2296 // 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
2297 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)))
2298 { 2295 {
2299 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2300 2297
2301#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2302 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2321 2318
2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2323 fore = Color_UL; 2320 fore = Color_UL;
2324#endif 2321#endif
2325 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
2326 if (invert) 2343 if (invert)
2327 { 2344 {
2328#ifdef OPTION_HC
2329 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2330 || !ISSET_PIXCOLOR (Color_HC))
2331#endif
2332 /* invert the column if no highlightColor is set or it is the
2333 * current cursor column */
2334 ::swap (fore, back); 2345 ::swap (fore, back);
2335#ifdef OPTION_HC
2336 else if (ISSET_PIXCOLOR (Color_HC))
2337 back = Color_HC;
2338#endif
2339 2346
2340#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2341# ifndef OPTION_HC
2342 if (ISSET_PIXCOLOR (Color_RV))
2343 back = Color_RV;
2344# endif
2345 if (fore == back) 2348 if (fore == back)
2346 { 2349 {
2347 fore = Color_bg; 2350 fore = Color_bg;
2348 back = Color_fg; 2351 back = Color_fg;
2349 } 2352 }
… …
2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2419 } 2422 }
2420 } /* for (col....) */ 2423 } /* for (col....) */
2421 } /* for (row....) */ 2424 } /* for (row....) */
2422 2425
2423#if ENABLE_OVERLAY
2424 scr_swap_overlay ();
2425#endif
2426 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2427
2428 /* 2426 /*
2429 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2428 */
2431 if (showcursor) 2429 if (showcursor)
2432 { 2430 {
… …
2470 } 2468 }
2471 2469
2472 /* 2470 /*
2473 * H: cleanup selection 2471 * H: cleanup selection
2474 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2475 scr_reverse_selection (); 2478 scr_reverse_selection ();
2476 2479
2480 screen.flags = old_screen_flags;
2477 num_scr = 0; 2481 num_scr = 0;
2478 num_scr_allow = 1; 2482 num_scr_allow = 1;
2479} 2483}
2480 2484
2481void 2485void
… …
2502 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2503 } 2507 }
2504} 2508}
2505 2509
2506void 2510void
2507rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2512{
2513 bool transparent = false;
2514
2509#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2511#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);
2512 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 {
2513 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
2514 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2516 2541
2517 if (scrollBar.win) 2542 if (scrollBar.win)
2518 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2549 scrollBar.show (0);
2522 } 2550 }
2523 2551
2524#endif 2552 if (refresh)
2525 2553 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2554 scr_clear ();
2528 scr_touch (true); 2555 scr_touch (true);
2556 }
2529 want_refresh = 1; 2557 want_refresh = 1;
2530} 2558}
2531 2559
2532/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2533void 2561void
… …
2601 { 2629 {
2602#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2603 if (selection.rect) 2631 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2635 else
2608#endif 2636#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2611 RS_RVid); 2639 RS_Sel | RS_RVid);
2612 } 2640 }
2613} 2641}
2614 2642
2615/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2616/* 2644/*
… …
2621void 2649void
2622rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2651{
2624 int row, wrote; 2652 int row, wrote;
2625 unsigned int width, towrite; 2653 unsigned int width, towrite;
2626 char r1[] = "\n"; 2654 const char r1[] = "\n";
2627 2655
2628 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2630 { 2658 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2678/* 2706/*
2679 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2680 */ 2708 */
2681void 2709void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2711{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2693 2721
2694 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2696} 2724}
2697 2725
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2726void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2728{
2706 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2730 return;
2881 2731
2882 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2883} 2733}
2884 2734
2885/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2886/* 2736/*
2887 * Request the current selection: 2737 * Request the current selection:
… …
2899 { 2749 {
2900 /* internal selection */ 2750 /* internal selection */
2901 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2903 free (str); 2753 free (str);
2904 return;
2905 }
2906 else
2907 { 2754 }
2908 selection_request_time = tm; 2755 else if (!selection_req)
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 } 2756 {
2921 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2758 selection_req->run ();
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 { 2759 }
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2760}
2949 2761
2950/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2951/* 2763/*
2952 * Clear all selected text 2764 * Clear all selected text
2953 * EXT: SelectionClear 2765 * EXT: SelectionClear
2954 */ 2766 */
2955void 2767void
2956rxvt_term::selection_clear () NOTHROW 2768rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2769{
2770 if (!clipboard)
2771 {
2958 want_refresh = 1; 2772 want_refresh = 1;
2959 free (selection.text); 2773 free (selection.text);
2960 selection.text = NULL; 2774 selection.text = NULL;
2961 selection.len = 0; 2775 selection.len = 0;
2962 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2963 2777
2964 if (display->selection_owner == this) 2778 if (display->selection_owner == this)
2965 display->selection_owner = 0; 2779 display->selection_owner = 0;
2780 }
2781 else
2782 {
2783 free (selection.clip_text);
2784 selection.clip_text = NULL;
2785 selection.clip_len = 0;
2786
2787 if (display->clipboard_owner == this)
2788 display->clipboard_owner = 0;
2789 }
2966} 2790}
2967 2791
2968/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2969/* 2793/*
2970 * Copy a selection into the cut buffer 2794 * Copy a selection into the cut buffer
2971 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2972 */ 2796 */
2973void 2797void
2974rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
2975{ 2799{
2976 int i; 2800 int size;
2977 wchar_t *new_selection_text; 2801 wchar_t *new_selection_text;
2978 text_t *t; 2802 text_t *t;
2979 2803
2980 switch (selection.op) 2804 switch (selection.op)
2981 { 2805 {
… …
2997 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
2998 2822
2999 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3000 return; 2824 return;
3001 2825
3002 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3003 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3004 2828
3005 int ofs = 0; 2829 int ofs = 0;
3006 int extra = 0; 2830 int extra = 0;
3007 2831
3008 int col = selection.beg.col; 2832 int col = selection.beg.col;
… …
3014 { 2838 {
3015#if !ENABLE_MINIMAL 2839#if !ENABLE_MINIMAL
3016 if (selection.rect) 2840 if (selection.rect)
3017 { 2841 {
3018 col = selection.beg.col; 2842 col = selection.beg.col;
3019 end_col = ncol + 1; 2843 end_col = selection.end.col;
3020 } 2844 }
3021 else 2845 else
3022#endif 2846#endif
3023 end_col = ROW(row).l; 2847 end_col = ROW(row).l;
3024 2848
3025 col = max (col, 0); 2849 col = max (col, 0);
3026 2850
3027 if (row == selection.end.row 2851 if (row == selection.end.row)
3028#if !ENABLE_MINIMAL
3029 || selection.rect
3030#endif
3031 )
3032 min_it (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
3033 2853
3034 t = ROW(row).t + col; 2854 t = ROW(row).t + col;
3035 2855
3036 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
… …
3044 2864
3045 extra -= (len - 1); 2865 extra -= (len - 1);
3046 2866
3047 if (extra < 0) 2867 if (extra < 0)
3048 { 2868 {
3049 extra += i; 2869 extra += size;
3050 i += i; 2870 size += size;
3051 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3052 } 2872 }
3053 2873
3054 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3055 } 2875 }
3056#endif 2876#endif
… …
3068 2888
3069 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3070 } 2890 }
3071 else 2891 else
3072#endif 2892#endif
3073 if (!ROW(row).is_longer () && row != selection.end.row) 2893 if (!ROW(row).is_longer ()
2894 && (row != selection.end.row || end_col != selection.end.col)
2895 && (row != selection.beg.row || selection.beg.col < ncol))
3074 new_selection_text[ofs++] = C0_LF; 2896 new_selection_text[ofs++] = C0_LF;
3075 } 2897 }
3076
3077 if (end_col != selection.end.col)
3078 new_selection_text[ofs++] = C0_LF;
3079 2898
3080 new_selection_text[ofs] = 0; 2899 new_selection_text[ofs] = 0;
3081 2900
3082 if (ofs == 0) 2901 if (ofs == 0)
3083 { 2902 {
… …
3096 2915
3097 selection_grab (tm); 2916 selection_grab (tm);
3098} 2917}
3099 2918
3100bool 2919bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 2920rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 2921{
2922 Atom sel;
2923
2924 if (!clipboard)
2925 {
3103 selection_time = tm; 2926 selection_time = tm;
2927 sel = XA_PRIMARY;
2928 }
2929 else
2930 {
2931 clipboard_time = tm;
2932 sel = xa[XA_CLIPBOARD];
2933 }
3104 2934
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2935 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2936 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 2937 {
3108 display->set_selection_owner (this); 2938 display->set_selection_owner (this, clipboard);
3109 return true; 2939 return true;
3110 } 2940 }
3111 else 2941 else
3112 { 2942 {
3113 selection_clear (); 2943 selection_clear (clipboard);
3114 return false; 2944 return false;
3115 } 2945 }
3116 2946
3117#if 0 2947#if 0
3118 XTextProperty ct; 2948 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3444 {
3615 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3616 } 3446 }
3617#endif 3447#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3449 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3458 ev.property = rq.property;
3623 } 3459 }
3624 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3495 {
3660 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3497 style = enc_compound_text;
3662 } 3498 }
3663 3499
3664 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3501 {
3666 cl = selection.text; 3502 cl = selection.text;
3667 selectlen = selection.len; 3503 selectlen = selection.len;
3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3668 } 3509 }
3669 else 3510 else
3670 { 3511 {
3671 cl = L""; 3512 cl = L"";
3672 selectlen = 0; 3513 selectlen = 0;
… …
3740 h += 2; min_it (h, nrow); 3581 h += 2; min_it (h, nrow);
3741 3582
3742 x -= 1; clamp_it (x, 0, ncol - w); 3583 x -= 1; clamp_it (x, 0, ncol - w);
3743 y -= 1; clamp_it (y, 0, nrow - h); 3584 y -= 1; clamp_it (y, 0, nrow - h);
3744 3585
3745 ov_x = x; ov_y = y; 3586 ov.x = x; ov.y = y;
3746 ov_w = w; ov_h = h; 3587 ov.w = w; ov.h = h;
3747 3588
3748 ov_text = new text_t *[h]; 3589 ov.text = new text_t *[h];
3749 ov_rend = new rend_t *[h]; 3590 ov.rend = new rend_t *[h];
3750 3591
3751 for (y = 0; y < h; y++) 3592 for (y = 0; y < h; y++)
3752 { 3593 {
3753 text_t *tp = ov_text[y] = new text_t[w]; 3594 text_t *tp = ov.text[y] = new text_t[w];
3754 rend_t *rp = ov_rend[y] = new rend_t[w]; 3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3755 3596
3756 text_t t0, t1, t2; 3597 text_t t0, t1, t2;
3757 rend_t r = OVERLAY_RSTYLE; 3598 rend_t r = OVERLAY_RSTYLE;
3758 3599
3759 if (y == 0) 3600 if (y == 0)
… …
3778} 3619}
3779 3620
3780void 3621void
3781rxvt_term::scr_overlay_off () NOTHROW 3622rxvt_term::scr_overlay_off () NOTHROW
3782{ 3623{
3783 if (!ov_text) 3624 if (!ov.text)
3784 return; 3625 return;
3785 3626
3786 want_refresh = 1; 3627 want_refresh = 1;
3787 3628
3788 for (int y = 0; y < ov_h; y++) 3629 for (int y = 0; y < ov.h; y++)
3789 { 3630 {
3790 delete [] ov_text[y]; 3631 delete [] ov.text[y];
3791 delete [] ov_rend[y]; 3632 delete [] ov.rend[y];
3792 } 3633 }
3793 3634
3794 delete [] ov_text; ov_text = 0; 3635 delete [] ov.text; ov.text = 0;
3795 delete [] ov_rend; ov_rend = 0; 3636 delete [] ov.rend; ov.rend = 0;
3796} 3637}
3797 3638
3798void 3639void
3799rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3640rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3800{ 3641{
3801 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3802 return; 3643 return;
3803 3644
3804 x++, y++; 3645 x++, y++;
3805 3646
3806 ov_text[y][x] = text; 3647 ov.text[y][x] = text;
3807 ov_rend[y][x] = rend; 3648 ov.rend[y][x] = rend;
3808} 3649}
3809 3650
3810void 3651void
3811rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3812{ 3653{
… …
3831} 3672}
3832 3673
3833void 3674void
3834rxvt_term::scr_swap_overlay () NOTHROW 3675rxvt_term::scr_swap_overlay () NOTHROW
3835{ 3676{
3836 if (!ov_text) 3677 if (!ov.text)
3837 return; 3678 return;
3838 3679
3680 // hide cursor if it is within the overlay area
3681 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3682 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3683 screen.flags &= ~Screen_VisibleCursor;
3684
3839 // swap screen mem with overlay 3685 // swap screen mem with overlay
3840 for (int y = ov_h; y--; ) 3686 for (int y = ov.h; y--; )
3841 { 3687 {
3842 text_t *t1 = ov_text[y]; 3688 text_t *t1 = ov.text[y];
3843 rend_t *r1 = ov_rend[y]; 3689 rend_t *r1 = ov.rend[y];
3844 3690
3845 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3691 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3846 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3692 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3847 3693
3848 for (int x = ov_w; x--; ) 3694 for (int x = ov.w; x--; )
3849 { 3695 {
3850 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3851 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3697 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3852 } 3698 }
3853 } 3699 }

Diff Legend

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