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.319 by root, Tue Nov 4 23:08:44 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
… …
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 ();
… …
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 466
454 rvideo_mode = false;
455
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 xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1347 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1348 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1349 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1350 { 1353 {
1351 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1352 1355
1353 if (mapped) 1356 if (mapped)
1354 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1355 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1356 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1357 } 1360 }
1358 else 1361 else
1359 { 1362 {
1360 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1361 1364
1365 if (mapped)
1366 {
1362 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1363 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1364 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1365 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1366 (unsigned int)width, 1371 (unsigned int)width,
1367 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1368 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1369 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1370 } 1376 }
1371 1377
1372 for (; num--; row++) 1378 for (; num--; row++)
1373 { 1379 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1375 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1376 } 1384 }
1377} 1385}
1378 1386
1379#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1380void 1388void
… …
1533 { 1541 {
1534 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1535 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1536 } 1544 }
1537 1545
1538 scr_blank_line (*line, ncol - count, count, 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1539 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1540 1547
1541 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1543 { 1550 {
1544 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1680 { 1687 {
1681 rvideo_state = on; 1688 rvideo_state = on;
1682 1689
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1686#endif 1693#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1695
1689 XGCValues gcvalue; 1696 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1834 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1835 { 1842 {
1836 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1837 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1838 } 1845 }
1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1840 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++)
1841 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);
1842 1849
1843 num_scr_allow = 0; 1850 num_scr_allow = 0;
1844 1851
… …
1917 1924
1918# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1921# endif 1928# endif
1922 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1923# endif 1930# endif
1924 1931
1925# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1934 set_urgency (1);
… …
1935 1942
1936 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1937 } 1944 }
1938 else 1945 else
1939 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1940#endif 1948#endif
1941} 1949}
1942 1950
1943/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1944/* ARGSUSED */ 1952/* ARGSUSED */
… …
1963 row_start = view_start; 1971 row_start = view_start;
1964 } 1972 }
1965 1973
1966 wctomb (0, 0); 1974 wctomb (0, 0);
1967 1975
1968 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1969 { 1977 {
1970 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1971 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1972 1980
1973 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
… …
2002 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
2003 */ 2011 */
2004void 2012void
2005rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
2006{ 2014{
2007 unsigned char have_bg,
2008 showcursor; /* show the cursor */
2009 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
2010 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
2011 int i; /* tmp */ 2017 int i; /* tmp */
2012#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
2013 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2024 /* 2030 /*
2025 * A: set up vars 2031 * A: set up vars
2026 */ 2032 */
2027 refresh_count = 0; 2033 refresh_count = 0;
2028 2034
2035 unsigned int old_screen_flags = screen.flags;
2029 have_bg = 0; 2036 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2032#endif 2039#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2041
2035 /* 2042 /*
2036 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2037 */ 2044 */
2038 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;
2039 2053
2040 /* 2054 /*
2041 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2042 */ 2056 */
2043 { 2057 {
2044 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2045 2059
2046 showcursor = (screen.flags & Screen_VisibleCursor);
2047#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2048 if (hidden_cursor) 2061 if (hidden_cursor)
2049 showcursor = 0; 2062 showcursor = 0;
2050#endif 2063#endif
2051 2064
… …
2079 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2080#else 2093#else
2081 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2082#endif 2095#endif
2083 2096
2084 if (showcursor && focus) 2097 if (focus)
2085 { 2098 {
2086 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2087 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2088 else 2101 else
2089 { 2102 {
… …
2124 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2125 } 2138 }
2126 } 2139 }
2127 } 2140 }
2128 2141
2129 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2130#if ENABLE_OVERLAY
2131 scr_swap_overlay ();
2132#endif
2133
2134#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2135 /* 2143 /*
2136 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2137 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2138 */ 2146 */
… …
2230 2238
2231 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2232 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2233 --col; 2241 --col;
2234 2242
2235 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2236 text_t *text = stp + col; 2244 text_t *text = stp + col;
2237 int count = 1; 2245 int count = 1;
2238 2246
2239 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2240 drp[col] = rend; 2248 drp[col] = rend;
… …
2244 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2245 { 2253 {
2246 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2247 { 2255 {
2248 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2249 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2250 count++; 2259 count++;
2251 i++; 2260 i++;
2252 2261
2253 continue; 2262 continue;
2254 } 2263 }
… …
2284 */ 2293 */
2285 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2287 2296
2288 // 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
2289 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)))
2290 { 2299 {
2291 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2292 2301
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2322
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2324 fore = Color_UL;
2316#endif 2325#endif
2317 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
2318 if (invert) 2347 if (invert)
2319 { 2348 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2349 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2350
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2352 if (fore == back)
2338 { 2353 {
2339 fore = Color_bg; 2354 fore = Color_bg;
2340 back = Color_fg; 2355 back = Color_fg;
2341 } 2356 }
… …
2410 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2411 } 2426 }
2412 } /* for (col....) */ 2427 } /* for (col....) */
2413 } /* for (row....) */ 2428 } /* for (row....) */
2414 2429
2415#if ENABLE_OVERLAY
2416 scr_swap_overlay ();
2417#endif
2418 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2419
2420 /* 2430 /*
2421 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2422 */ 2432 */
2423 if (showcursor) 2433 if (showcursor)
2424 { 2434 {
… …
2462 } 2472 }
2463 2473
2464 /* 2474 /*
2465 * H: cleanup selection 2475 * H: cleanup selection
2466 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2467 scr_reverse_selection (); 2482 scr_reverse_selection ();
2468 2483
2484 screen.flags = old_screen_flags;
2469 num_scr = 0; 2485 num_scr = 0;
2470 num_scr_allow = 1; 2486 num_scr_allow = 1;
2471} 2487}
2472 2488
2473void 2489void
… …
2494 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2495 } 2511 }
2496} 2512}
2497 2513
2498void 2514void
2499rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2500{ 2516{
2517 bool transparent = false;
2518
2501#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2503#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);
2504 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 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2544 XClearWindow (dpy, parent);
2508 2545
2509 if (scrollBar.win) 2546 if (scrollBar.win)
2510 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2513 scrollBar.show (0); 2553 scrollBar.show (0);
2514 } 2554 }
2515 2555
2516#endif 2556 if (refresh)
2517 2557 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2558 scr_clear ();
2520 scr_touch (true); 2559 scr_touch (true);
2560 }
2521 want_refresh = 1; 2561 want_refresh = 1;
2522} 2562}
2523 2563
2524/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2525void 2565void
… …
2593 { 2633 {
2594#if !ENABLE_MINIMAL 2634#if !ENABLE_MINIMAL
2595 if (selection.rect) 2635 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2639 else
2600#endif 2640#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2603 RS_RVid); 2643 RS_Sel | RS_RVid);
2604 } 2644 }
2605} 2645}
2606 2646
2607/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2608/* 2648/*
… …
2613void 2653void
2614rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2655{
2616 int row, wrote; 2656 int row, wrote;
2617 unsigned int width, towrite; 2657 unsigned int width, towrite;
2618 char r1[] = "\n"; 2658 const char r1[] = "\n";
2619 2659
2620 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2621 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2622 { 2662 {
2623 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2669/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2670/* 2710/*
2671 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2672 */ 2712 */
2673void 2713void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2715{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2685 2725
2686 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2688} 2728}
2689 2729
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2730void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2732{
2698 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2699 {
2700 if ((selection_type & Sel_CompoundText))
2701 {
2702 int selnum = selection_type & Sel_whereMask;
2703
2704 selection_type = 0;
2705 if (selnum != Sel_direct)
2706 selection_request_other (XA_STRING, selnum);
2707 }
2708
2709 if ((selection_type & Sel_UTF8String))
2710 {
2711 int selnum = selection_type & Sel_whereMask;
2712
2713 selection_type = Sel_CompoundText;
2714 if (selnum != Sel_direct)
2715 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2716 else
2717 selection_type = 0;
2718 }
2719
2720 return;
2721 }
2722
2723 unsigned long bytes_after;
2724 XTextProperty ct;
2725
2726 if (XGetWindowProperty (dpy, win, prop,
2727 0, PROP_SIZE / 4,
2728 delete_prop, AnyPropertyType,
2729 &ct.encoding, &ct.format,
2730 &ct.nitems, &bytes_after,
2731 &ct.value) != Success)
2732 {
2733 ct.value = 0;
2734 goto bailout;
2735 }
2736
2737 if (ct.encoding == None)
2738 goto bailout;
2739
2740 if (bytes_after)
2741 {
2742 // fetch and append remaining data
2743 XTextProperty ct2;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 ct.nitems / 4, (bytes_after + 3) / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct2.encoding, &ct2.format,
2749 &ct2.nitems, &bytes_after,
2750 &ct2.value) != Success)
2751 goto bailout;
2752
2753 // realloc should be compatible to XFree, here, and elsewhere, too
2754 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2755 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2756 ct.nitems += ct2.nitems;
2757
2758 XFree (ct2.value);
2759 }
2760
2761 if (ct.value == 0)
2762 goto bailout;
2763
2764 if (ct.encoding == xa[XA_INCR])
2765 {
2766 // INCR selection, start handshake
2767 if (!delete_prop)
2768 XDeleteProperty (dpy, win, prop);
2769
2770 selection_wait = Sel_incr;
2771 incr_buf_fill = 0;
2772 incr_ev.start (10);
2773
2774 goto bailout;
2775 }
2776
2777 if (ct.nitems == 0)
2778 {
2779 if (selection_wait == Sel_incr)
2780 {
2781 XFree (ct.value);
2782
2783 // finally complete, now paste the whole thing
2784 selection_wait = Sel_normal;
2785 ct.value = (unsigned char *)incr_buf;
2786 ct.nitems = incr_buf_fill;
2787 incr_buf = 0;
2788 incr_buf_size = 0;
2789 incr_ev.stop ();
2790 }
2791 else
2792 {
2793 if (selection_wait == Sel_normal
2794 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2795 {
2796 /*
2797 * pass through again trying CUT_BUFFER0 if we've come from
2798 * XConvertSelection () but nothing was presented
2799 */
2800 selection_paste (display->root, XA_CUT_BUFFER0, False);
2801 }
2802
2803 goto bailout;
2804 }
2805 }
2806 else if (selection_wait == Sel_incr)
2807 {
2808 incr_ev.start (10);
2809
2810 while (incr_buf_fill + ct.nitems > incr_buf_size)
2811 {
2812 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2813 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2814 }
2815
2816 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2817 incr_buf_fill += ct.nitems;
2818
2819 goto bailout;
2820 }
2821
2822 char **cl;
2823 int cr;
2824
2825#if !ENABLE_MINIMAL
2826 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2827 // so recode it manually
2828 if (ct.encoding == xa[XA_UTF8_STRING])
2829 {
2830 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2831 char *s = rxvt_wcstombs (w);
2832 free (w);
2833 // TODO: strlen == only the first element will be converted. well...
2834 paste (s, strlen (s));
2835 free (s);
2836 }
2837 else
2838#endif
2839 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2840 && cl)
2841 {
2842 for (int i = 0; i < cr; i++)
2843 paste (cl[i], strlen (cl[i]));
2844
2845 XFreeStringList (cl);
2846 }
2847 else
2848 paste ((char *)ct.value, ct.nitems); // paste raw
2849
2850bailout:
2851 XFree (ct.value);
2852
2853 if (selection_wait == Sel_normal)
2854 selection_wait = Sel_none;
2855}
2856
2857void
2858rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2859{
2860 selection_wait = Sel_none;
2861
2862 incr_buf_size = 0;
2863 free (incr_buf);
2864
2865 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2866}
2867
2868void
2869rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2870{
2871 if (prop == None || selection_wait != Sel_incr)
2872 return; 2734 return;
2873 2735
2874 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2875} 2737}
2876 2738
2877/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2878/* 2740/*
2879 * Request the current selection: 2741 * Request the current selection:
… …
2885 * EXT: button 2 release 2747 * EXT: button 2 release
2886 */ 2748 */
2887void 2749void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2751{
2890 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2891 {
2892 /* internal selection */
2893 char *str = rxvt_wcstombs (selection.text, selection.len);
2894 paste (str, strlen (str));
2895 free (str);
2896 return;
2897 } 2753 {
2898 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2899 { 2756 }
2900 selection_request_time = tm;
2901 selection_wait = Sel_normal;
2902
2903#if X_HAVE_UTF8_STRING
2904 selection_type = Sel_UTF8String;
2905 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2906 return;
2907#else
2908 selection_type = Sel_CompoundText;
2909 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2910 return;
2911#endif
2912 }
2913
2914 selection_wait = Sel_none; /* don't loop in selection_paste () */
2915 selection_paste (display->root, XA_CUT_BUFFER0, false);
2916}
2917
2918int
2919rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2920{
2921 Atom sel;
2922
2923 selection_type |= selnum;
2924
2925 if (selnum == Sel_Primary)
2926 sel = XA_PRIMARY;
2927 else if (selnum == Sel_Secondary)
2928 sel = XA_SECONDARY;
2929 else
2930 sel = xa[XA_CLIPBOARD];
2931
2932 if (XGetSelectionOwner (dpy, sel) != None)
2933 {
2934 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2935 vt, selection_request_time);
2936 return 1;
2937 }
2938
2939 return 0;
2940} 2757}
2941 2758
2942/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2943/* 2760/*
2944 * Clear all selected text 2761 * Clear all selected text
2945 * EXT: SelectionClear 2762 * EXT: SelectionClear
2946 */ 2763 */
2947void 2764void
2948rxvt_term::selection_clear () NOTHROW 2765rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2766{
2767 if (!clipboard)
2768 {
2950 want_refresh = 1; 2769 want_refresh = 1;
2951 free (selection.text); 2770 free (selection.text);
2952 selection.text = NULL; 2771 selection.text = NULL;
2953 selection.len = 0; 2772 selection.len = 0;
2954 CLEAR_SELECTION (); 2773 CLEAR_SELECTION ();
2955 2774
2956 if (display->selection_owner == this) 2775 if (display->selection_owner == this)
2957 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 }
2958} 2787}
2959 2788
2960/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2961/* 2790/*
2962 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2964 */ 2793 */
2965void 2794void
2966rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2967{ 2796{
2968 int i; 2797 int size;
2969 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2970 text_t *t; 2799 text_t *t;
2971 2800
2972 switch (selection.op) 2801 switch (selection.op)
2973 { 2802 {
… …
2989 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
2990 2819
2991 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)))
2992 return; 2821 return;
2993 2822
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 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));
2996 2825
2997 int ofs = 0; 2826 int ofs = 0;
2998 int extra = 0; 2827 int extra = 0;
2999 2828
3000 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
3006 { 2835 {
3007#if !ENABLE_MINIMAL 2836#if !ENABLE_MINIMAL
3008 if (selection.rect) 2837 if (selection.rect)
3009 { 2838 {
3010 col = selection.beg.col; 2839 col = selection.beg.col;
3011 end_col = ncol + 1; 2840 end_col = selection.end.col;
3012 } 2841 }
3013 else 2842 else
3014#endif 2843#endif
3015 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
3016 2845
3017 col = max (col, 0); 2846 col = max (col, 0);
3018 2847
3019 if (row == selection.end.row 2848 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
3025 2850
3026 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
3027 2852
3028 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
3036 2861
3037 extra -= (len - 1); 2862 extra -= (len - 1);
3038 2863
3039 if (extra < 0) 2864 if (extra < 0)
3040 { 2865 {
3041 extra += i; 2866 extra += size;
3042 i += i; 2867 size += size;
3043 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));
3044 } 2869 }
3045 2870
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2872 }
3048#endif 2873#endif
… …
3060 2885
3061 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3062 } 2887 }
3063 else 2888 else
3064#endif 2889#endif
3065 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))
3066 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3067 } 2894 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2895
3072 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3073 2897
3074 if (ofs == 0) 2898 if (ofs == 0)
3075 { 2899 {
… …
3088 2912
3089 selection_grab (tm); 2913 selection_grab (tm);
3090} 2914}
3091 2915
3092bool 2916bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2918{
2919 Atom sel;
2920
2921 if (!clipboard)
2922 {
3095 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 }
3096 2931
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2932 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2933 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2934 {
3100 display->set_selection_owner (this); 2935 display->set_selection_owner (this, clipboard);
3101 return true; 2936 return true;
3102 } 2937 }
3103 else 2938 else
3104 { 2939 {
3105 selection_clear (); 2940 selection_clear (clipboard);
3106 return false; 2941 return false;
3107 } 2942 }
3108 2943
3109#if 0 2944#if 0
3110 XTextProperty ct; 2945 XTextProperty ct;
… …
3570 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3571 */ 3406 */
3572void 3407void
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3409{
3410 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3411 XSelectionEvent ev;
3576 3412
3577 ev.type = SelectionNotify; 3413 ev.type = SelectionNotify;
3578 ev.property = None; 3414 ev.property = None;
3579 ev.display = rq.display; 3415 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3430 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3431#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3432 *target++ = xa[XA_UTF8_STRING];
3597#endif 3433#endif
3598 3434
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3435 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3436 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3437 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3438 ev.property = property;
3603 } 3439 }
3604#if TODO // TODO 3440#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3441 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3442 {
3607 /* TODO: Handle MULTIPLE */ 3443 /* TODO: Handle MULTIPLE */
3608 } 3444 }
3609#endif 3445#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3446 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3447 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3448 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3449 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 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;
3615 } 3457 }
3616 else if (rq.target == XA_STRING 3458 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3459 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3460 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3461 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3493 {
3652 target = xa[XA_COMPOUND_TEXT]; 3494 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3495 style = enc_compound_text;
3654 } 3496 }
3655 3497
3656 if (selection.text) 3498 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3499 {
3658 cl = selection.text; 3500 cl = selection.text;
3659 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;
3660 } 3507 }
3661 else 3508 else
3662 { 3509 {
3663 cl = L""; 3510 cl = L"";
3664 selectlen = 0; 3511 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3532 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3533 ct.nitems = selectlen;
3687 ct.encoding = target; 3534 ct.encoding = target;
3688 } 3535 }
3689 3536
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3537 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3538 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3539 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3540 ev.property = property;
3694 3541
3695 if (freect) 3542 if (freect)
3696 XFree (ct.value); 3543 XFree (ct.value);
3697 } 3544 }
3698 3545
… …
3732 h += 2; min_it (h, nrow); 3579 h += 2; min_it (h, nrow);
3733 3580
3734 x -= 1; clamp_it (x, 0, ncol - w); 3581 x -= 1; clamp_it (x, 0, ncol - w);
3735 y -= 1; clamp_it (y, 0, nrow - h); 3582 y -= 1; clamp_it (y, 0, nrow - h);
3736 3583
3737 ov_x = x; ov_y = y; 3584 ov.x = x; ov.y = y;
3738 ov_w = w; ov_h = h; 3585 ov.w = w; ov.h = h;
3739 3586
3740 ov_text = new text_t *[h]; 3587 ov.text = new text_t *[h];
3741 ov_rend = new rend_t *[h]; 3588 ov.rend = new rend_t *[h];
3742 3589
3743 for (y = 0; y < h; y++) 3590 for (y = 0; y < h; y++)
3744 { 3591 {
3745 text_t *tp = ov_text[y] = new text_t[w]; 3592 text_t *tp = ov.text[y] = new text_t[w];
3746 rend_t *rp = ov_rend[y] = new rend_t[w]; 3593 rend_t *rp = ov.rend[y] = new rend_t[w];
3747 3594
3748 text_t t0, t1, t2; 3595 text_t t0, t1, t2;
3749 rend_t r = OVERLAY_RSTYLE; 3596 rend_t r = OVERLAY_RSTYLE;
3750 3597
3751 if (y == 0) 3598 if (y == 0)
… …
3770} 3617}
3771 3618
3772void 3619void
3773rxvt_term::scr_overlay_off () NOTHROW 3620rxvt_term::scr_overlay_off () NOTHROW
3774{ 3621{
3775 if (!ov_text) 3622 if (!ov.text)
3776 return; 3623 return;
3777 3624
3778 want_refresh = 1; 3625 want_refresh = 1;
3779 3626
3780 for (int y = 0; y < ov_h; y++) 3627 for (int y = 0; y < ov.h; y++)
3781 { 3628 {
3782 delete [] ov_text[y]; 3629 delete [] ov.text[y];
3783 delete [] ov_rend[y]; 3630 delete [] ov.rend[y];
3784 } 3631 }
3785 3632
3786 delete [] ov_text; ov_text = 0; 3633 delete [] ov.text; ov.text = 0;
3787 delete [] ov_rend; ov_rend = 0; 3634 delete [] ov.rend; ov.rend = 0;
3788} 3635}
3789 3636
3790void 3637void
3791rxvt_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
3792{ 3639{
3793 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3640 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3794 return; 3641 return;
3795 3642
3796 x++, y++; 3643 x++, y++;
3797 3644
3798 ov_text[y][x] = text; 3645 ov.text[y][x] = text;
3799 ov_rend[y][x] = rend; 3646 ov.rend[y][x] = rend;
3800} 3647}
3801 3648
3802void 3649void
3803rxvt_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
3804{ 3651{
… …
3823} 3670}
3824 3671
3825void 3672void
3826rxvt_term::scr_swap_overlay () NOTHROW 3673rxvt_term::scr_swap_overlay () NOTHROW
3827{ 3674{
3828 if (!ov_text) 3675 if (!ov.text)
3829 return; 3676 return;
3830 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
3831 // swap screen mem with overlay 3683 // swap screen mem with overlay
3832 for (int y = ov_h; y--; ) 3684 for (int y = ov.h; y--; )
3833 { 3685 {
3834 text_t *t1 = ov_text[y]; 3686 text_t *t1 = ov.text[y];
3835 rend_t *r1 = ov_rend[y]; 3687 rend_t *r1 = ov.rend[y];
3836 3688
3837 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;
3838 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;
3839 3691
3840 for (int x = ov_w; x--; ) 3692 for (int x = ov.w; x--; )
3841 { 3693 {
3842 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3694 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3843 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));
3844 } 3696 }
3845 } 3697 }

Diff Legend

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