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.325 by root, Wed Nov 5 12:28:15 2008 UTC vs.
Revision 1.381 by sf-exg, Fri Apr 22 10:01:39 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{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
231 selection.text = NULL; 236 selection.text = NULL;
232 selection.len = 0; 237 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
235 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
236 } 243 }
237 else 244 else
238 { 245 {
239 /* 246 /*
240 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 294
288 do 295 do
289 { 296 {
290 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 299 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 301
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 303 {
… …
394 399
395 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 402 }
398 403
404 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409
399 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
400 411
401 prev_nrow = nrow; 412 prev_nrow = nrow;
402 prev_ncol = ncol; 413 prev_ncol = ncol;
403 414
… …
453 scr_overlay_off (); 464 scr_overlay_off ();
454#endif 465#endif
455 466
456 if (current_screen != PRIMARY) 467 if (current_screen != PRIMARY)
457 scr_swap_screen (); 468 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 469
465 scr_scroll_region (0, MAX_ROWS - 1); 470 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None); 471 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0); 472 scr_insert_mode (0);
468} 473}
… …
510 } 515 }
511 516
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
518#endif
519} 522}
520 523
521void 524void
522rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
523{ 526{
… …
548 want_refresh = 1; 551 want_refresh = 1;
549 view_start = 0; 552 view_start = 0;
550 553
551 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
552 555
553 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
554 557
555#if NSCREENS 558#if NSCREENS
556 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
557 { 560 {
558 num_scr = 0; 561 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
785 } 788 }
786 } 789 }
787 790
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 794 int row = screen.cur.row;
794 795
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 797
797 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
… …
901# else 902# else
902 c = 0xfffd; 903 c = 0xfffd;
903# endif 904# endif
904#endif 905#endif
905 906
906 // nuke the character at this position, if required
907 if (expect_false (
908 line->t[screen.cur.col] == NOCHAR
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 908
916 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 911 {
912 if (screen.flags & Screen_Autowrap)
913 {
919 // ... artificially enlargen the previous one 914 // ... artificially enlargen the previous one
920 c = NOCHAR; 915 c = NOCHAR;
921 // and try the same character next loop iteration 916 // and try the same character next loop iteration
922 --str; 917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
923 } 921 }
922
923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col);
924 929
925 line->touch (); 930 line->touch ();
926 931
927 do 932 do
928 { 933 {
… …
934 else 939 else
935 { 940 {
936 line->l = ncol; 941 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
939 break; 944
945 goto end_of_line;
940 } 946 }
941 947
942 c = NOCHAR; 948 c = NOCHAR;
943 } 949 }
944 while (expect_false (--width > 0)); 950 while (expect_false (--width > 0));
945 951
946 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 954 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 955 line->t[c] = ' ';
954 line->r[c] = rend; 956 line->r[c] = rend;
955 }
956 } 957 }
958
959end_of_line:
960 ;
957 } 961 }
958#if ENABLE_COMBINING 962#if ENABLE_COMBINING
959 else // width == 0 963 else // width == 0
960 { 964 {
961 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1005#endif
1002 } 1006 }
1003 1007
1004 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
1005 1009
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
1008#endif
1009} 1011}
1010 1012
1011/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1012/* 1014/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1028
1027 want_refresh = 1; 1029 want_refresh = 1;
1028#endif 1030#endif
1029 } 1031 }
1030 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1031 else 1035 else
1032 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1033} 1037}
1034 1038
1035/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1342 return; 1346 return;
1343 1347
1344 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1345 1349
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1353 {
1353 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1354 1355
1355 if (mapped && !view_start) 1356 if (mapped)
1356 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1359 } 1360 }
1360 else 1361 else
1361 { 1362 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1364
1364 if (mapped && !view_start) 1365 if (mapped)
1365 { 1366 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1376 1377
1377 for (; num--; row++) 1378 for (; num--; row++)
1378 { 1379 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1380 1381
1381 if (!view_start) 1382 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1384 }
1384} 1385}
1385 1386
1386#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1387void 1388void
… …
1686 { 1687 {
1687 rvideo_state = on; 1688 rvideo_state = on;
1688 1689
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1692#endif 1693#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1695
1695 XGCValues gcvalue; 1696 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1842 {
1842 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1844 } 1845 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1849
1849 num_scr_allow = 0; 1850 num_scr_allow = 0;
1850 1851
… …
1923 1924
1924# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1927# endif 1928# endif
1928 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1929# endif 1930# endif
1930 1931
1931# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1934 set_urgency (1);
… …
1941 1942
1942 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1944 }
1944 else 1945 else
1945 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1948#endif
1947} 1949}
1948 1950
1949/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1952/* ARGSUSED */
… …
1969 row_start = view_start; 1971 row_start = view_start;
1970 } 1972 }
1971 1973
1972 wctomb (0, 0); 1974 wctomb (0, 0);
1973 1975
1974 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1977 {
1976 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1978 1980
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2008 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2011 */
2010void 2012void
2011rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
2012{ 2014{
2013 unsigned char have_bg,
2014 showcursor; /* show the cursor */
2015 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
2016 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
2017 int i; /* tmp */ 2017 int i; /* tmp */
2018#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
2019 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2030 /* 2030 /*
2031 * A: set up vars 2031 * A: set up vars
2032 */ 2032 */
2033 refresh_count = 0; 2033 refresh_count = 0;
2034 2034
2035 unsigned int old_screen_flags = screen.flags;
2035 have_bg = 0; 2036 char have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2037 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2038#endif 2039#endif
2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2040 2041
2041 /* 2042 /*
2042 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2043 */ 2044 */
2044 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
2045 2053
2046 /* 2054 /*
2047 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2048 */ 2056 */
2049 { 2057 {
2050 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2051 2059
2052 showcursor = (screen.flags & Screen_VisibleCursor);
2053#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2061 if (hidden_cursor)
2055 showcursor = 0; 2062 showcursor = 0;
2056#endif 2063#endif
2057 2064
… …
2085 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2086#else 2093#else
2087 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2088#endif 2095#endif
2089 2096
2090 if (showcursor && focus) 2097 if (focus)
2091 { 2098 {
2092 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2094 else 2101 else
2095 { 2102 {
… …
2130 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2131 } 2138 }
2132 } 2139 }
2133 } 2140 }
2134 2141
2135 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2136#if ENABLE_OVERLAY
2137 scr_swap_overlay ();
2138#endif
2139
2140#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2141 /* 2143 /*
2142 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2143 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2144 */ 2146 */
… …
2236 2238
2237 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2241 --col;
2240 2242
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2244 text_t *text = stp + col;
2243 int count = 1; 2245 int count = 1;
2244 2246
2245 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2246 drp[col] = rend; 2248 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2251 { 2253 {
2252 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2253 { 2255 {
2254 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2255 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2256 count++; 2259 count++;
2257 i++; 2260 i++;
2258 2261
2259 continue; 2262 continue;
2260 } 2263 }
… …
2290 */ 2293 */
2291 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2293 2296
2294 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2299 {
2297 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2298 2301
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2322
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2324 fore = Color_UL;
2322#endif 2325#endif
2323 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2324 if (invert) 2347 if (invert)
2325 { 2348 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2349 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2350
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2352 if (fore == back)
2344 { 2353 {
2345 fore = Color_bg; 2354 fore = Color_bg;
2346 back = Color_fg; 2355 back = Color_fg;
2347 } 2356 }
… …
2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2417 } 2426 }
2418 } /* for (col....) */ 2427 } /* for (col....) */
2419 } /* for (row....) */ 2428 } /* for (row....) */
2420 2429
2421#if ENABLE_OVERLAY
2422 scr_swap_overlay ();
2423#endif
2424 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2425
2426 /* 2430 /*
2427 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2428 */ 2432 */
2429 if (showcursor) 2433 if (showcursor)
2430 { 2434 {
… …
2468 } 2472 }
2469 2473
2470 /* 2474 /*
2471 * H: cleanup selection 2475 * H: cleanup selection
2472 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2473 scr_reverse_selection (); 2482 scr_reverse_selection ();
2474 2483
2484 screen.flags = old_screen_flags;
2475 num_scr = 0; 2485 num_scr = 0;
2476 num_scr_allow = 1; 2486 num_scr_allow = 1;
2477} 2487}
2478 2488
2479void 2489void
… …
2500 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2501 } 2511 }
2502} 2512}
2503 2513
2504void 2514void
2505rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2506{ 2516{
2517 bool transparent = false;
2518
2507#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2508 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2509#else 2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2510 2527
2528 transparent = true;
2529 }
2530 else
2531# endif
2532 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2536 }
2537 else
2538#endif
2539 {
2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2512 XClearWindow (dpy, parent[0]);
2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2544 XClearWindow (dpy, parent);
2514 2545
2515 if (scrollBar.win) 2546 if (scrollBar.win)
2516 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2518 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2519 scrollBar.show (0); 2553 scrollBar.show (0);
2520 } 2554 }
2521 2555
2522#endif 2556 if (refresh)
2523 2557 {
2524 /* bgPixmap.apply () does not do the following : */
2525 scr_clear (); 2558 scr_clear ();
2526 scr_touch (true); 2559 scr_touch (true);
2560 }
2527 want_refresh = 1; 2561 want_refresh = 1;
2528} 2562}
2529 2563
2530/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2531void 2565void
… …
2599 { 2633 {
2600#if !ENABLE_MINIMAL 2634#if !ENABLE_MINIMAL
2601 if (selection.rect) 2635 if (selection.rect)
2602 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2604 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2605 else 2639 else
2606#endif 2640#endif
2607 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2608 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2609 RS_RVid); 2643 RS_Sel | RS_RVid);
2610 } 2644 }
2611} 2645}
2612 2646
2613/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2614/* 2648/*
… …
2619void 2653void
2620rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2621{ 2655{
2622 int row, wrote; 2656 int row, wrote;
2623 unsigned int width, towrite; 2657 unsigned int width, towrite;
2624 char r1[] = "\n"; 2658 const char r1[] = "\n";
2625 2659
2626 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2627 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2628 { 2662 {
2629 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2675/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2676/* 2710/*
2677 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2678 */ 2712 */
2679void 2713void
2680rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2681{ 2715{
2682 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2683 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2684 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2685 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2691 2725
2692 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2694} 2728}
2695 2729
2696/* ------------------------------------------------------------------------- */
2697/*
2698 * Respond to a notification that a primary selection has been sent
2699 * EXT: SelectionNotify
2700 */
2701void 2730void
2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2703{ 2732{
2704 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2705 {
2706 if ((selection_type & Sel_CompoundText))
2707 {
2708 int selnum = selection_type & Sel_whereMask;
2709
2710 selection_type = 0;
2711 if (selnum != Sel_direct)
2712 selection_request_other (XA_STRING, selnum);
2713 }
2714
2715 if ((selection_type & Sel_UTF8String))
2716 {
2717 int selnum = selection_type & Sel_whereMask;
2718
2719 selection_type = Sel_CompoundText;
2720 if (selnum != Sel_direct)
2721 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2722 else
2723 selection_type = 0;
2724 }
2725
2726 return;
2727 }
2728
2729 unsigned long bytes_after;
2730 XTextProperty ct;
2731
2732 if (XGetWindowProperty (dpy, win, prop,
2733 0, PROP_SIZE / 4,
2734 delete_prop, AnyPropertyType,
2735 &ct.encoding, &ct.format,
2736 &ct.nitems, &bytes_after,
2737 &ct.value) != Success)
2738 {
2739 ct.value = 0;
2740 goto bailout;
2741 }
2742
2743 if (ct.encoding == None)
2744 goto bailout;
2745
2746 if (bytes_after)
2747 {
2748 // fetch and append remaining data
2749 XTextProperty ct2;
2750
2751 if (XGetWindowProperty (dpy, win, prop,
2752 ct.nitems / 4, (bytes_after + 3) / 4,
2753 delete_prop, AnyPropertyType,
2754 &ct2.encoding, &ct2.format,
2755 &ct2.nitems, &bytes_after,
2756 &ct2.value) != Success)
2757 goto bailout;
2758
2759 // realloc should be compatible to XFree, here, and elsewhere, too
2760 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2761 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2762 ct.nitems += ct2.nitems;
2763
2764 XFree (ct2.value);
2765 }
2766
2767 if (ct.value == 0)
2768 goto bailout;
2769
2770 if (ct.encoding == xa[XA_INCR])
2771 {
2772 // INCR selection, start handshake
2773 if (!delete_prop)
2774 XDeleteProperty (dpy, win, prop);
2775
2776 selection_wait = Sel_incr;
2777 incr_buf_fill = 0;
2778 incr_ev.start (10);
2779
2780 goto bailout;
2781 }
2782
2783 if (ct.nitems == 0)
2784 {
2785 if (selection_wait == Sel_incr)
2786 {
2787 XFree (ct.value);
2788
2789 // finally complete, now paste the whole thing
2790 selection_wait = Sel_normal;
2791 ct.value = (unsigned char *)incr_buf;
2792 ct.nitems = incr_buf_fill;
2793 incr_buf = 0;
2794 incr_buf_size = 0;
2795 incr_ev.stop ();
2796 }
2797 else
2798 {
2799 if (selection_wait == Sel_normal
2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2801 {
2802 /*
2803 * pass through again trying CUT_BUFFER0 if we've come from
2804 * XConvertSelection () but nothing was presented
2805 */
2806 selection_paste (display->root, XA_CUT_BUFFER0, False);
2807 }
2808
2809 goto bailout;
2810 }
2811 }
2812 else if (selection_wait == Sel_incr)
2813 {
2814 incr_ev.start (10);
2815
2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2817 {
2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2820 }
2821
2822 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2823 incr_buf_fill += ct.nitems;
2824
2825 goto bailout;
2826 }
2827
2828 char **cl;
2829 int cr;
2830
2831#if !ENABLE_MINIMAL
2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2833 // so recode it manually
2834 if (ct.encoding == xa[XA_UTF8_STRING])
2835 {
2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2837 char *s = rxvt_wcstombs (w);
2838 free (w);
2839 // TODO: strlen == only the first element will be converted. well...
2840 paste (s, strlen (s));
2841 free (s);
2842 }
2843 else
2844#endif
2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2846 && cl)
2847 {
2848 for (int i = 0; i < cr; i++)
2849 paste (cl[i], strlen (cl[i]));
2850
2851 XFreeStringList (cl);
2852 }
2853 else
2854 paste ((char *)ct.value, ct.nitems); // paste raw
2855
2856bailout:
2857 XFree (ct.value);
2858
2859 if (selection_wait == Sel_normal)
2860 selection_wait = Sel_none;
2861}
2862
2863void
2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2865{
2866 selection_wait = Sel_none;
2867
2868 incr_buf_size = 0;
2869 free (incr_buf);
2870
2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2872}
2873
2874void
2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2876{
2877 if (prop == None || selection_wait != Sel_incr)
2878 return; 2734 return;
2879 2735
2880 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2881} 2737}
2882 2738
2883/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2884/* 2740/*
2885 * Request the current selection: 2741 * Request the current selection:
… …
2891 * EXT: button 2 release 2747 * EXT: button 2 release
2892 */ 2748 */
2893void 2749void
2894rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2895{ 2751{
2896 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2897 {
2898 /* internal selection */
2899 char *str = rxvt_wcstombs (selection.text, selection.len);
2900 paste (str, strlen (str));
2901 free (str);
2902 return;
2903 } 2753 {
2904 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2905 { 2756 }
2906 selection_request_time = tm;
2907 selection_wait = Sel_normal;
2908
2909#if X_HAVE_UTF8_STRING
2910 selection_type = Sel_UTF8String;
2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2912 return;
2913#else
2914 selection_type = Sel_CompoundText;
2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2916 return;
2917#endif
2918 }
2919
2920 selection_wait = Sel_none; /* don't loop in selection_paste () */
2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2922}
2923
2924int
2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2926{
2927 Atom sel;
2928
2929 selection_type |= selnum;
2930
2931 if (selnum == Sel_Primary)
2932 sel = XA_PRIMARY;
2933 else if (selnum == Sel_Secondary)
2934 sel = XA_SECONDARY;
2935 else
2936 sel = xa[XA_CLIPBOARD];
2937
2938 if (XGetSelectionOwner (dpy, sel) != None)
2939 {
2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2941 vt, selection_request_time);
2942 return 1;
2943 }
2944
2945 return 0;
2946} 2757}
2947 2758
2948/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2949/* 2760/*
2950 * Clear all selected text 2761 * Clear all selected text
2951 * EXT: SelectionClear 2762 * EXT: SelectionClear
2952 */ 2763 */
2953void 2764void
2954rxvt_term::selection_clear () NOTHROW 2765rxvt_term::selection_clear (bool clipboard) NOTHROW
2955{ 2766{
2767 if (!clipboard)
2768 {
2956 want_refresh = 1; 2769 want_refresh = 1;
2957 free (selection.text); 2770 free (selection.text);
2958 selection.text = NULL; 2771 selection.text = NULL;
2959 selection.len = 0; 2772 selection.len = 0;
2960 CLEAR_SELECTION (); 2773 CLEAR_SELECTION ();
2961 2774
2962 if (display->selection_owner == this) 2775 if (display->selection_owner == this)
2963 display->selection_owner = 0; 2776 display->selection_owner = 0;
2777 }
2778 else
2779 {
2780 free (selection.clip_text);
2781 selection.clip_text = NULL;
2782 selection.clip_len = 0;
2783
2784 if (display->clipboard_owner == this)
2785 display->clipboard_owner = 0;
2786 }
2964} 2787}
2965 2788
2966/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2967/* 2790/*
2968 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2969 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2970 */ 2793 */
2971void 2794void
2972rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2973{ 2796{
2974 int i; 2797 int size;
2975 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2976 text_t *t; 2799 text_t *t;
2977 2800
2978 switch (selection.op) 2801 switch (selection.op)
2979 { 2802 {
… …
2995 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
2996 2819
2997 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2998 return; 2821 return;
2999 2822
3000 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3001 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3002 2825
3003 int ofs = 0; 2826 int ofs = 0;
3004 int extra = 0; 2827 int extra = 0;
3005 2828
3006 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
3012 { 2835 {
3013#if !ENABLE_MINIMAL 2836#if !ENABLE_MINIMAL
3014 if (selection.rect) 2837 if (selection.rect)
3015 { 2838 {
3016 col = selection.beg.col; 2839 col = selection.beg.col;
3017 end_col = ncol + 1; 2840 end_col = selection.end.col;
3018 } 2841 }
3019 else 2842 else
3020#endif 2843#endif
3021 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
3022 2845
3023 col = max (col, 0); 2846 col = max (col, 0);
3024 2847
3025 if (row == selection.end.row 2848 if (row == selection.end.row)
3026#if !ENABLE_MINIMAL
3027 || selection.rect
3028#endif
3029 )
3030 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
3031 2850
3032 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
3033 2852
3034 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
3042 2861
3043 extra -= (len - 1); 2862 extra -= (len - 1);
3044 2863
3045 if (extra < 0) 2864 if (extra < 0)
3046 { 2865 {
3047 extra += i; 2866 extra += size;
3048 i += i; 2867 size += size;
3049 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3050 } 2869 }
3051 2870
3052 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3053 } 2872 }
3054#endif 2873#endif
… …
3066 2885
3067 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3068 } 2887 }
3069 else 2888 else
3070#endif 2889#endif
3071 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
3072 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3073 } 2894 }
3074
3075 if (end_col != selection.end.col)
3076 new_selection_text[ofs++] = C0_LF;
3077 2895
3078 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3079 2897
3080 if (ofs == 0) 2898 if (ofs == 0)
3081 { 2899 {
… …
3094 2912
3095 selection_grab (tm); 2913 selection_grab (tm);
3096} 2914}
3097 2915
3098bool 2916bool
3099rxvt_term::selection_grab (Time tm) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3100{ 2918{
2919 Atom sel;
2920
2921 if (!clipboard)
2922 {
3101 selection_time = tm; 2923 selection_time = tm;
2924 sel = XA_PRIMARY;
2925 }
2926 else
2927 {
2928 clipboard_time = tm;
2929 sel = xa[XA_CLIPBOARD];
2930 }
3102 2931
3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2932 XSetSelectionOwner (dpy, sel, vt, tm);
3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2933 if (XGetSelectionOwner (dpy, sel) == vt)
3105 { 2934 {
3106 display->set_selection_owner (this); 2935 display->set_selection_owner (this, clipboard);
3107 return true; 2936 return true;
3108 } 2937 }
3109 else 2938 else
3110 { 2939 {
3111 selection_clear (); 2940 selection_clear (clipboard);
3112 return false; 2941 return false;
3113 } 2942 }
3114 2943
3115#if 0 2944#if 0
3116 XTextProperty ct; 2945 XTextProperty ct;
… …
3576 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3577 */ 3406 */
3578void 3407void
3579rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3580{ 3409{
3410 Atom property = rq.property == None ? rq.target : rq.property;
3581 XSelectionEvent ev; 3411 XSelectionEvent ev;
3582 3412
3583 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
3584 ev.property = None; 3414 ev.property = None;
3585 ev.display = rq.display; 3415 ev.display = rq.display;
… …
3600 *target++ = xa[XA_COMPOUND_TEXT]; 3430 *target++ = xa[XA_COMPOUND_TEXT];
3601#if X_HAVE_UTF8_STRING 3431#if X_HAVE_UTF8_STRING
3602 *target++ = xa[XA_UTF8_STRING]; 3432 *target++ = xa[XA_UTF8_STRING];
3603#endif 3433#endif
3604 3434
3605 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3435 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3606 32, PropModeReplace, 3436 32, PropModeReplace,
3607 (unsigned char *)target_list, target - target_list); 3437 (unsigned char *)target_list, target - target_list);
3608 ev.property = rq.property; 3438 ev.property = property;
3609 } 3439 }
3610#if TODO // TODO 3440#if TODO // TODO
3611 else if (rq.target == xa[XA_MULTIPLE]) 3441 else if (rq.target == xa[XA_MULTIPLE])
3612 { 3442 {
3613 /* TODO: Handle MULTIPLE */ 3443 /* TODO: Handle MULTIPLE */
3614 } 3444 }
3615#endif 3445#endif
3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3446 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3617 { 3447 {
3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3448 XChangeProperty (dpy, rq.requestor, property, rq.target,
3619 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3449 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3620 ev.property = rq.property; 3450 ev.property = property;
3451 }
3452 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3453 {
3454 XChangeProperty (dpy, rq.requestor, property, rq.target,
3455 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3456 ev.property = property;
3621 } 3457 }
3622 else if (rq.target == XA_STRING 3458 else if (rq.target == XA_STRING
3623 || rq.target == xa[XA_TEXT] 3459 || rq.target == xa[XA_TEXT]
3624 || rq.target == xa[XA_COMPOUND_TEXT] 3460 || rq.target == xa[XA_COMPOUND_TEXT]
3625 || rq.target == xa[XA_UTF8_STRING] 3461 || rq.target == xa[XA_UTF8_STRING]
… …
3657 { 3493 {
3658 target = xa[XA_COMPOUND_TEXT]; 3494 target = xa[XA_COMPOUND_TEXT];
3659 style = enc_compound_text; 3495 style = enc_compound_text;
3660 } 3496 }
3661 3497
3662 if (selection.text) 3498 if (rq.selection == XA_PRIMARY && selection.text)
3663 { 3499 {
3664 cl = selection.text; 3500 cl = selection.text;
3665 selectlen = selection.len; 3501 selectlen = selection.len;
3502 }
3503 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3504 {
3505 cl = selection.clip_text;
3506 selectlen = selection.clip_len;
3666 } 3507 }
3667 else 3508 else
3668 { 3509 {
3669 cl = L""; 3510 cl = L"";
3670 selectlen = 0; 3511 selectlen = 0;
… …
3691 ct.value = (unsigned char *)cl; 3532 ct.value = (unsigned char *)cl;
3692 ct.nitems = selectlen; 3533 ct.nitems = selectlen;
3693 ct.encoding = target; 3534 ct.encoding = target;
3694 } 3535 }
3695 3536
3696 XChangeProperty (dpy, rq.requestor, rq.property, 3537 XChangeProperty (dpy, rq.requestor, property,
3697 ct.encoding, 8, PropModeReplace, 3538 ct.encoding, 8, PropModeReplace,
3698 ct.value, (int)ct.nitems); 3539 ct.value, (int)ct.nitems);
3699 ev.property = rq.property; 3540 ev.property = property;
3700 3541
3701 if (freect) 3542 if (freect)
3702 XFree (ct.value); 3543 XFree (ct.value);
3703 } 3544 }
3704 3545
… …
3738 h += 2; min_it (h, nrow); 3579 h += 2; min_it (h, nrow);
3739 3580
3740 x -= 1; clamp_it (x, 0, ncol - w); 3581 x -= 1; clamp_it (x, 0, ncol - w);
3741 y -= 1; clamp_it (y, 0, nrow - h); 3582 y -= 1; clamp_it (y, 0, nrow - h);
3742 3583
3743 ov_x = x; ov_y = y; 3584 ov.x = x; ov.y = y;
3744 ov_w = w; ov_h = h; 3585 ov.w = w; ov.h = h;
3745 3586
3746 ov_text = new text_t *[h]; 3587 ov.text = new text_t *[h];
3747 ov_rend = new rend_t *[h]; 3588 ov.rend = new rend_t *[h];
3748 3589
3749 for (y = 0; y < h; y++) 3590 for (y = 0; y < h; y++)
3750 { 3591 {
3751 text_t *tp = ov_text[y] = new text_t[w]; 3592 text_t *tp = ov.text[y] = new text_t[w];
3752 rend_t *rp = ov_rend[y] = new rend_t[w]; 3593 rend_t *rp = ov.rend[y] = new rend_t[w];
3753 3594
3754 text_t t0, t1, t2; 3595 text_t t0, t1, t2;
3755 rend_t r = OVERLAY_RSTYLE; 3596 rend_t r = OVERLAY_RSTYLE;
3756 3597
3757 if (y == 0) 3598 if (y == 0)
… …
3776} 3617}
3777 3618
3778void 3619void
3779rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () NOTHROW
3780{ 3621{
3781 if (!ov_text) 3622 if (!ov.text)
3782 return; 3623 return;
3783 3624
3784 want_refresh = 1; 3625 want_refresh = 1;
3785 3626
3786 for (int y = 0; y < ov_h; y++) 3627 for (int y = 0; y < ov.h; y++)
3787 { 3628 {
3788 delete [] ov_text[y]; 3629 delete [] ov.text[y];
3789 delete [] ov_rend[y]; 3630 delete [] ov.rend[y];
3790 } 3631 }
3791 3632
3792 delete [] ov_text; ov_text = 0; 3633 delete [] ov.text; ov.text = 0;
3793 delete [] ov_rend; ov_rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3794} 3635}
3795 3636
3796void 3637void
3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3638rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3798{ 3639{
3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3800 return; 3641 return;
3801 3642
3802 x++, y++; 3643 x++, y++;
3803 3644
3804 ov_text[y][x] = text; 3645 ov.text[y][x] = text;
3805 ov_rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3806} 3647}
3807 3648
3808void 3649void
3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3650rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3810{ 3651{
… …
3829} 3670}
3830 3671
3831void 3672void
3832rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () NOTHROW
3833{ 3674{
3834 if (!ov_text) 3675 if (!ov.text)
3835 return; 3676 return;
3836 3677
3678 // hide cursor if it is within the overlay area
3679 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3680 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3681 screen.flags &= ~Screen_VisibleCursor;
3682
3837 // swap screen mem with overlay 3683 // swap screen mem with overlay
3838 for (int y = ov_h; y--; ) 3684 for (int y = ov.h; y--; )
3839 { 3685 {
3840 text_t *t1 = ov_text[y]; 3686 text_t *t1 = ov.text[y];
3841 rend_t *r1 = ov_rend[y]; 3687 rend_t *r1 = ov.rend[y];
3842 3688
3843 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3689 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3844 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3690 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3845 3691
3846 for (int x = ov_w; x--; ) 3692 for (int x = ov.w; x--; )
3847 { 3693 {
3848 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3694 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3849 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3695 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3850 } 3696 }
3851 } 3697 }

Diff Legend

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