ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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