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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 164 view_start = 0;
169 num_scr = 0; 165 num_scr = 0;
170 166
171 if (ncol == 0) 167 if (ncol == 0)
172 ncol = 80; 168 ncol = 80;
… …
174 if (nrow == 0) 170 if (nrow == 0)
175 nrow = 24; 171 nrow = 24;
176 172
177 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 174 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 175
183 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
185 { 178 {
186 //TODO//FIXME 179 //TODO//FIXME
… …
239 selection.text = NULL; 232 selection.text = NULL;
240 selection.len = 0; 233 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
243 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
244 } 239 }
245 else 240 else
246 { 241 {
247 /* 242 /*
248 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 281
287 if (top_row) 282 if (top_row)
288 { 283 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
291 287
292 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 290
295 do 291 do
296 { 292 {
297 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 295 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 297
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 299 {
… …
399 delete old_ta; 393 delete old_ta;
400 delete old_ra; 394 delete old_ra;
401 395
402 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
404 399
405 free (tabs); 400 free (tabs);
406 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
411 prev_ncol = ncol; 409 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 410
421 tt_winch (); 411 tt_winch ();
422 412
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 414}
… …
436 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
437 427
438 free (row_buf); 428 free (row_buf);
439 free (swap_buf); 429 free (swap_buf);
440 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
441 free (tabs); 433 free (tabs);
442 434 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 435 }
445} 436}
446 437
447/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
448/* 439/*
449 * Hard reset 440 * Hard/Soft reset
450 */ 441 */
451void 442void
452rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
453{ 444{
454 scr_release (); 445 scr_release ();
455 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
456 scr_reset (); 449 scr_reset ();
457 450
458 scr_clear (true); 451 scr_clear (true);
459 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
460} 469}
461 470
462/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
502 } 511 }
503 512
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
510#endif
511} 518}
512 519
513void 520void
514rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
515{ 522{
… …
540 want_refresh = 1; 547 want_refresh = 1;
541 view_start = 0; 548 view_start = 0;
542 549
543 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
544 551
545 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
546 553
547#if NSCREENS 554#if NSCREENS
548 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
549 { 556 {
550 num_scr = 0; 557 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
777 } 784 }
778 } 785 }
779 786
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 790 int row = screen.cur.row;
786 791
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 793
789 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
893# else 898# else
894 c = 0xfffd; 899 c = 0xfffd;
895# endif 900# endif
896#endif 901#endif
897 902
898 // nuke the character at this position, if required
899 if (expect_false (
900 line->t[screen.cur.col] == NOCHAR
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 904
908 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 907 {
911 // ...output spaces 908 if (screen.flags & Screen_Autowrap)
912 c = ' '; 909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
913 // and try the same character next loop iteration 912 // and try the same character next loop iteration
914 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
915 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
916 925
917 line->touch (); 926 line->touch ();
918 927
919 do 928 do
920 { 929 {
… …
926 else 935 else
927 { 936 {
928 line->l = ncol; 937 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
931 break; 940
941 goto end_of_line;
932 } 942 }
933 943
934 c = NOCHAR; 944 c = NOCHAR;
935 } 945 }
936 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
937 947
938 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 950 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 951 line->t[c] = ' ';
946 line->r[c] = rend; 952 line->r[c] = rend;
947 }
948 } 953 }
954
955end_of_line:
956 ;
949 } 957 }
950#if ENABLE_COMBINING 958#if ENABLE_COMBINING
951 else // width == 0 959 else // width == 0
952 { 960 {
953 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
993#endif 1001#endif
994 } 1002 }
995 1003
996 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
997 1005
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1000#endif
1001} 1007}
1002 1008
1003/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1004/* 1010/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1024
1019 want_refresh = 1; 1025 want_refresh = 1;
1020#endif 1026#endif
1021 } 1027 }
1022 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1023 else 1031 else
1024 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1025} 1033}
1026 1034
1027/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1349 {
1343 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1344 1351
1345 if (mapped) 1352 if (mapped)
1346 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1349 } 1356 }
1350 else 1357 else
1351 { 1358 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1360
1361 if (mapped)
1362 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1366 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1367 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1368 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1362 } 1372 }
1363 1373
1364 for (; num--; row++) 1374 for (; num--; row++)
1365 { 1375 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1380 }
1369} 1381}
1370 1382
1371#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1372void 1384void
… …
1525 { 1537 {
1526 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1527 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1528 } 1540 }
1529 1541
1530 scr_blank_line (*line, ncol - count, count, 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1531 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1532 1543
1533 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1534 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1535 { 1546 {
1536 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1672 { 1683 {
1673 rvideo_state = on; 1684 rvideo_state = on;
1674 1685
1675 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1676#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1677 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1678#endif 1689#endif
1679 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1680 1691
1681 XGCValues gcvalue; 1692 XGCValues gcvalue;
1682 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1826 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1827 { 1838 {
1828 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1829 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1830 } 1841 }
1831// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1832 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1833 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1834 1845
1835 num_scr_allow = 0; 1846 num_scr_allow = 0;
1836 1847
… …
1927 1938
1928 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1929 } 1940 }
1930 else 1941 else
1931 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1932#endif 1944#endif
1933} 1945}
1934 1946
1935/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1936/* ARGSUSED */ 1948/* ARGSUSED */
… …
1955 row_start = view_start; 1967 row_start = view_start;
1956 } 1968 }
1957 1969
1958 wctomb (0, 0); 1970 wctomb (0, 0);
1959 1971
1960 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1961 { 1973 {
1962 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1963 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1964 1976
1965 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1994 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1995 */ 2007 */
1996void 2008void
1997rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1998{ 2010{
1999 unsigned char have_bg,
2000 showcursor; /* show the cursor */
2001 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2002 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2003 int i; /* tmp */ 2013 int i; /* tmp */
2004#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2005 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2016 /* 2026 /*
2017 * A: set up vars 2027 * A: set up vars
2018 */ 2028 */
2019 refresh_count = 0; 2029 refresh_count = 0;
2020 2030
2031 unsigned int old_screen_flags = screen.flags;
2021 have_bg = 0; 2032 char have_bg = 0;
2022#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2023 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2024#endif 2035#endif
2025 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2026 2037
2027 /* 2038 /*
2028 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2029 */ 2040 */
2030 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2031 2049
2032 /* 2050 /*
2033 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2034 */ 2052 */
2035 { 2053 {
2036 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2037 2055
2038 showcursor = (screen.flags & Screen_VisibleCursor);
2039#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2040 if (hidden_cursor) 2057 if (hidden_cursor)
2041 showcursor = 0; 2058 showcursor = 0;
2042#endif 2059#endif
2043 2060
… …
2071 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2072#else 2089#else
2073 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2074#endif 2091#endif
2075 2092
2076 if (showcursor && focus) 2093 if (focus)
2077 { 2094 {
2078 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2079 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2080 else 2097 else
2081 { 2098 {
… …
2116 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2117 } 2134 }
2118 } 2135 }
2119 } 2136 }
2120 2137
2121 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2122#if ENABLE_OVERLAY
2123 scr_swap_overlay ();
2124#endif
2125
2126#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2127 /* 2139 /*
2128 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2129 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2130 */ 2142 */
… …
2222 2234
2223 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2224 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2225 --col; 2237 --col;
2226 2238
2227 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2228 text_t *text = stp + col; 2240 text_t *text = stp + col;
2229 int count = 1; 2241 int count = 1;
2230 2242
2231 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2232 drp[col] = rend; 2244 drp[col] = rend;
… …
2236 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2237 { 2249 {
2238 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2239 { 2251 {
2240 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2241 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2242 count++; 2255 count++;
2243 i++; 2256 i++;
2244 2257
2245 continue; 2258 continue;
2246 } 2259 }
… …
2276 */ 2289 */
2277 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2278 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2279 2292
2280 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2281 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2282 { 2295 {
2283 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2284 2297
2285#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2286 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2305 2318
2306 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2307 fore = Color_UL; 2320 fore = Color_UL;
2308#endif 2321#endif
2309 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2310 if (invert) 2343 if (invert)
2311 { 2344 {
2312#ifdef OPTION_HC
2313 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2314 || !ISSET_PIXCOLOR (Color_HC))
2315#endif
2316 /* invert the column if no highlightColor is set or it is the
2317 * current cursor column */
2318 ::swap (fore, back); 2345 ::swap (fore, back);
2319#ifdef OPTION_HC
2320 else if (ISSET_PIXCOLOR (Color_HC))
2321 back = Color_HC;
2322#endif
2323 2346
2324#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2325# ifndef OPTION_HC
2326 if (ISSET_PIXCOLOR (Color_RV))
2327 back = Color_RV;
2328# endif
2329 if (fore == back) 2348 if (fore == back)
2330 { 2349 {
2331 fore = Color_bg; 2350 fore = Color_bg;
2332 back = Color_fg; 2351 back = Color_fg;
2333 } 2352 }
… …
2402 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2403 } 2422 }
2404 } /* for (col....) */ 2423 } /* for (col....) */
2405 } /* for (row....) */ 2424 } /* for (row....) */
2406 2425
2407#if ENABLE_OVERLAY
2408 scr_swap_overlay ();
2409#endif
2410 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2411
2412 /* 2426 /*
2413 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2414 */ 2428 */
2415 if (showcursor) 2429 if (showcursor)
2416 { 2430 {
… …
2454 } 2468 }
2455 2469
2456 /* 2470 /*
2457 * H: cleanup selection 2471 * H: cleanup selection
2458 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2459 scr_reverse_selection (); 2478 scr_reverse_selection ();
2460 2479
2480 screen.flags = old_screen_flags;
2461 num_scr = 0; 2481 num_scr = 0;
2462 num_scr_allow = 1; 2482 num_scr_allow = 1;
2463} 2483}
2464 2484
2465void 2485void
… …
2486 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2487 } 2507 }
2488} 2508}
2489 2509
2490void 2510void
2491rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2492{ 2512{
2513 bool transparent = false;
2514
2493#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2494 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2495#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2496 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2497 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2498 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2499 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2500 2541
2501 if (scrollBar.win) 2542 if (scrollBar.win)
2502 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2503 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2504 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2505 scrollBar.show (0); 2549 scrollBar.show (0);
2506 } 2550 }
2507 2551
2508#endif 2552 if (refresh)
2509 2553 {
2510 /* bgPixmap.apply () does not do the following : */
2511 scr_clear (); 2554 scr_clear ();
2512 scr_touch (true); 2555 scr_touch (true);
2556 }
2513 want_refresh = 1; 2557 want_refresh = 1;
2514} 2558}
2515 2559
2516/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2517void 2561void
… …
2585 { 2629 {
2586#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2587 if (selection.rect) 2631 if (selection.rect)
2588 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2589 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2590 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2591 else 2635 else
2592#endif 2636#endif
2593 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2594 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2595 RS_RVid); 2639 RS_Sel | RS_RVid);
2596 } 2640 }
2597} 2641}
2598 2642
2599/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2600/* 2644/*
… …
2605void 2649void
2606rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2607{ 2651{
2608 int row, wrote; 2652 int row, wrote;
2609 unsigned int width, towrite; 2653 unsigned int width, towrite;
2610 char r1[] = "\n"; 2654 const char r1[] = "\n";
2611 2655
2612 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2613 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2614 { 2658 {
2615 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2661/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2662/* 2706/*
2663 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2664 */ 2708 */
2665void 2709void
2666rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2667{ 2711{
2668 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2669 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2670 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2671 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2677 2721
2678 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2679 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2680} 2724}
2681 2725
2682/* ------------------------------------------------------------------------- */
2683/*
2684 * Respond to a notification that a primary selection has been sent
2685 * EXT: SelectionNotify
2686 */
2687void 2726void
2688rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2689{ 2728{
2690 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2691 {
2692 if ((selection_type & Sel_CompoundText))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = 0;
2697 if (selnum != Sel_direct)
2698 selection_request_other (XA_STRING, selnum);
2699 }
2700
2701 if ((selection_type & Sel_UTF8String))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = Sel_CompoundText;
2706 if (selnum != Sel_direct)
2707 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2708 else
2709 selection_type = 0;
2710 }
2711
2712 return;
2713 }
2714
2715 unsigned long bytes_after;
2716 XTextProperty ct;
2717
2718 if (XGetWindowProperty (dpy, win, prop,
2719 0, PROP_SIZE / 4,
2720 delete_prop, AnyPropertyType,
2721 &ct.encoding, &ct.format,
2722 &ct.nitems, &bytes_after,
2723 &ct.value) != Success)
2724 {
2725 ct.value = 0;
2726 goto bailout;
2727 }
2728
2729 if (ct.encoding == None)
2730 goto bailout;
2731
2732 if (bytes_after)
2733 {
2734 // fetch and append remaining data
2735 XTextProperty ct2;
2736
2737 if (XGetWindowProperty (dpy, win, prop,
2738 ct.nitems / 4, (bytes_after + 3) / 4,
2739 delete_prop, AnyPropertyType,
2740 &ct2.encoding, &ct2.format,
2741 &ct2.nitems, &bytes_after,
2742 &ct2.value) != Success)
2743 goto bailout;
2744
2745 // realloc should be compatible to XFree, here, and elsewhere, too
2746 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2747 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2748 ct.nitems += ct2.nitems;
2749
2750 XFree (ct2.value);
2751 }
2752
2753 if (ct.value == 0)
2754 goto bailout;
2755
2756 if (ct.encoding == xa[XA_INCR])
2757 {
2758 // INCR selection, start handshake
2759 if (!delete_prop)
2760 XDeleteProperty (dpy, win, prop);
2761
2762 selection_wait = Sel_incr;
2763 incr_buf_fill = 0;
2764 incr_ev.start (10);
2765
2766 goto bailout;
2767 }
2768
2769 if (ct.nitems == 0)
2770 {
2771 if (selection_wait == Sel_incr)
2772 {
2773 XFree (ct.value);
2774
2775 // finally complete, now paste the whole thing
2776 selection_wait = Sel_normal;
2777 ct.value = (unsigned char *)incr_buf;
2778 ct.nitems = incr_buf_fill;
2779 incr_buf = 0;
2780 incr_buf_size = 0;
2781 incr_ev.stop ();
2782 }
2783 else
2784 {
2785 if (selection_wait == Sel_normal
2786 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2787 {
2788 /*
2789 * pass through again trying CUT_BUFFER0 if we've come from
2790 * XConvertSelection () but nothing was presented
2791 */
2792 selection_paste (display->root, XA_CUT_BUFFER0, False);
2793 }
2794
2795 goto bailout;
2796 }
2797 }
2798 else if (selection_wait == Sel_incr)
2799 {
2800 incr_ev.start (10);
2801
2802 while (incr_buf_fill + ct.nitems > incr_buf_size)
2803 {
2804 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2805 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2806 }
2807
2808 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2809 incr_buf_fill += ct.nitems;
2810
2811 goto bailout;
2812 }
2813
2814 char **cl;
2815 int cr;
2816
2817#if !ENABLE_MINIMAL
2818 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2819 // so recode it manually
2820 if (ct.encoding == xa[XA_UTF8_STRING])
2821 {
2822 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2823 char *s = rxvt_wcstombs (w);
2824 free (w);
2825 // TODO: strlen == only the first element will be converted. well...
2826 paste (s, strlen (s));
2827 free (s);
2828 }
2829 else
2830#endif
2831 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2832 && cl)
2833 {
2834 for (int i = 0; i < cr; i++)
2835 paste (cl[i], strlen (cl[i]));
2836
2837 XFreeStringList (cl);
2838 }
2839 else
2840 paste ((char *)ct.value, ct.nitems); // paste raw
2841
2842bailout:
2843 XFree (ct.value);
2844
2845 if (selection_wait == Sel_normal)
2846 selection_wait = Sel_none;
2847}
2848
2849void
2850rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2851{
2852 selection_wait = Sel_none;
2853
2854 incr_buf_size = 0;
2855 free (incr_buf);
2856
2857 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2858}
2859
2860void
2861rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2862{
2863 if (prop == None || selection_wait != Sel_incr)
2864 return; 2730 return;
2865 2731
2866 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2867} 2733}
2868 2734
2869/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2870/* 2736/*
2871 * Request the current selection: 2737 * Request the current selection:
… …
2885 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2886 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2887 free (str); 2753 free (str);
2888 return; 2754 return;
2889 } 2755 }
2890 else 2756 else if (!selection_req)
2891 {
2892 selection_request_time = tm;
2893 selection_wait = Sel_normal;
2894
2895#if X_HAVE_UTF8_STRING
2896 selection_type = Sel_UTF8String;
2897 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2898 return;
2899#else
2900 selection_type = Sel_CompoundText;
2901 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2902 return;
2903#endif
2904 } 2757 {
2905 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2906 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2907 selection_paste (display->root, XA_CUT_BUFFER0, false);
2908}
2909
2910int
2911rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2912{
2913 Atom sel;
2914
2915 selection_type |= selnum;
2916
2917 if (selnum == Sel_Primary)
2918 sel = XA_PRIMARY;
2919 else if (selnum == Sel_Secondary)
2920 sel = XA_SECONDARY;
2921 else
2922 sel = xa[XA_CLIPBOARD];
2923
2924 if (XGetSelectionOwner (dpy, sel) != None)
2925 { 2760 }
2926 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2927 vt, selection_request_time);
2928 return 1;
2929 }
2930
2931 return 0;
2932} 2761}
2933 2762
2934/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2935/* 2764/*
2936 * Clear all selected text 2765 * Clear all selected text
2937 * EXT: SelectionClear 2766 * EXT: SelectionClear
2938 */ 2767 */
2939void 2768void
2940rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2941{ 2770{
2771 if (!clipboard)
2772 {
2942 want_refresh = 1; 2773 want_refresh = 1;
2943 free (selection.text); 2774 free (selection.text);
2944 selection.text = NULL; 2775 selection.text = NULL;
2945 selection.len = 0; 2776 selection.len = 0;
2946 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2947 2778
2948 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2949 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2950} 2791}
2951 2792
2952/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2953/* 2794/*
2954 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2955 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2956 */ 2797 */
2957void 2798void
2958rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2959{ 2800{
2960 int i; 2801 int size;
2961 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2962 text_t *t; 2803 text_t *t;
2963 2804
2964 switch (selection.op) 2805 switch (selection.op)
2965 { 2806 {
… …
2981 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2982 2823
2983 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2984 return; 2825 return;
2985 2826
2986 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2987 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2988 2829
2989 int ofs = 0; 2830 int ofs = 0;
2990 int extra = 0; 2831 int extra = 0;
2991 2832
2992 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
2998 { 2839 {
2999#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3000 if (selection.rect) 2841 if (selection.rect)
3001 { 2842 {
3002 col = selection.beg.col; 2843 col = selection.beg.col;
3003 end_col = ncol + 1; 2844 end_col = selection.end.col;
3004 } 2845 }
3005 else 2846 else
3006#endif 2847#endif
3007 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3008 2849
3009 col = max (col, 0); 2850 col = max (col, 0);
3010 2851
3011 if (row == selection.end.row 2852 if (row == selection.end.row)
3012#if !ENABLE_MINIMAL
3013 || selection.rect
3014#endif
3015 )
3016 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3017 2854
3018 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3019 2856
3020 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3028 2865
3029 extra -= (len - 1); 2866 extra -= (len - 1);
3030 2867
3031 if (extra < 0) 2868 if (extra < 0)
3032 { 2869 {
3033 extra += i; 2870 extra += size;
3034 i += i; 2871 size += size;
3035 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3036 } 2873 }
3037 2874
3038 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3039 } 2876 }
3040#endif 2877#endif
… …
3052 2889
3053 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3054 } 2891 }
3055 else 2892 else
3056#endif 2893#endif
3057 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3058 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3059 } 2898 }
3060
3061 if (end_col != selection.end.col)
3062 new_selection_text[ofs++] = C0_LF;
3063 2899
3064 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3065 2901
3066 if (ofs == 0) 2902 if (ofs == 0)
3067 { 2903 {
… …
3080 2916
3081 selection_grab (tm); 2917 selection_grab (tm);
3082} 2918}
3083 2919
3084bool 2920bool
3085rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3086{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3087 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3088 2935
3089 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3090 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3091 { 2938 {
3092 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3093 return true; 2940 return true;
3094 } 2941 }
3095 else 2942 else
3096 { 2943 {
3097 selection_clear (); 2944 selection_clear (clipboard);
3098 return false; 2945 return false;
3099 } 2946 }
3100 2947
3101#if 0 2948#if 0
3102 XTextProperty ct; 2949 XTextProperty ct;
… …
3597 else if (rq.target == xa[XA_MULTIPLE]) 3444 else if (rq.target == xa[XA_MULTIPLE])
3598 { 3445 {
3599 /* TODO: Handle MULTIPLE */ 3446 /* TODO: Handle MULTIPLE */
3600 } 3447 }
3601#endif 3448#endif
3602 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3603 { 3450 {
3604 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3605 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3452 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3453 ev.property = rq.property;
3454 }
3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3456 {
3457 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3606 ev.property = rq.property; 3459 ev.property = rq.property;
3607 } 3460 }
3608 else if (rq.target == XA_STRING 3461 else if (rq.target == XA_STRING
3609 || rq.target == xa[XA_TEXT] 3462 || rq.target == xa[XA_TEXT]
3610 || rq.target == xa[XA_COMPOUND_TEXT] 3463 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3643 { 3496 {
3644 target = xa[XA_COMPOUND_TEXT]; 3497 target = xa[XA_COMPOUND_TEXT];
3645 style = enc_compound_text; 3498 style = enc_compound_text;
3646 } 3499 }
3647 3500
3648 if (selection.text) 3501 if (rq.selection == XA_PRIMARY && selection.text)
3649 { 3502 {
3650 cl = selection.text; 3503 cl = selection.text;
3651 selectlen = selection.len; 3504 selectlen = selection.len;
3505 }
3506 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3507 {
3508 cl = selection.clip_text;
3509 selectlen = selection.clip_len;
3652 } 3510 }
3653 else 3511 else
3654 { 3512 {
3655 cl = L""; 3513 cl = L"";
3656 selectlen = 0; 3514 selectlen = 0;
… …
3724 h += 2; min_it (h, nrow); 3582 h += 2; min_it (h, nrow);
3725 3583
3726 x -= 1; clamp_it (x, 0, ncol - w); 3584 x -= 1; clamp_it (x, 0, ncol - w);
3727 y -= 1; clamp_it (y, 0, nrow - h); 3585 y -= 1; clamp_it (y, 0, nrow - h);
3728 3586
3729 ov_x = x; ov_y = y; 3587 ov.x = x; ov.y = y;
3730 ov_w = w; ov_h = h; 3588 ov.w = w; ov.h = h;
3731 3589
3732 ov_text = new text_t *[h]; 3590 ov.text = new text_t *[h];
3733 ov_rend = new rend_t *[h]; 3591 ov.rend = new rend_t *[h];
3734 3592
3735 for (y = 0; y < h; y++) 3593 for (y = 0; y < h; y++)
3736 { 3594 {
3737 text_t *tp = ov_text[y] = new text_t[w]; 3595 text_t *tp = ov.text[y] = new text_t[w];
3738 rend_t *rp = ov_rend[y] = new rend_t[w]; 3596 rend_t *rp = ov.rend[y] = new rend_t[w];
3739 3597
3740 text_t t0, t1, t2; 3598 text_t t0, t1, t2;
3741 rend_t r = OVERLAY_RSTYLE; 3599 rend_t r = OVERLAY_RSTYLE;
3742 3600
3743 if (y == 0) 3601 if (y == 0)
… …
3762} 3620}
3763 3621
3764void 3622void
3765rxvt_term::scr_overlay_off () NOTHROW 3623rxvt_term::scr_overlay_off () NOTHROW
3766{ 3624{
3767 if (!ov_text) 3625 if (!ov.text)
3768 return; 3626 return;
3769 3627
3770 want_refresh = 1; 3628 want_refresh = 1;
3771 3629
3772 for (int y = 0; y < ov_h; y++) 3630 for (int y = 0; y < ov.h; y++)
3773 { 3631 {
3774 delete [] ov_text[y]; 3632 delete [] ov.text[y];
3775 delete [] ov_rend[y]; 3633 delete [] ov.rend[y];
3776 } 3634 }
3777 3635
3778 delete [] ov_text; ov_text = 0; 3636 delete [] ov.text; ov.text = 0;
3779 delete [] ov_rend; ov_rend = 0; 3637 delete [] ov.rend; ov.rend = 0;
3780} 3638}
3781 3639
3782void 3640void
3783rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3784{ 3642{
3785 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3643 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3786 return; 3644 return;
3787 3645
3788 x++, y++; 3646 x++, y++;
3789 3647
3790 ov_text[y][x] = text; 3648 ov.text[y][x] = text;
3791 ov_rend[y][x] = rend; 3649 ov.rend[y][x] = rend;
3792} 3650}
3793 3651
3794void 3652void
3795rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3653rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3796{ 3654{
… …
3815} 3673}
3816 3674
3817void 3675void
3818rxvt_term::scr_swap_overlay () NOTHROW 3676rxvt_term::scr_swap_overlay () NOTHROW
3819{ 3677{
3820 if (!ov_text) 3678 if (!ov.text)
3821 return; 3679 return;
3822 3680
3681 // hide cursor if it is within the overlay area
3682 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3683 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3684 screen.flags &= ~Screen_VisibleCursor;
3685
3823 // swap screen mem with overlay 3686 // swap screen mem with overlay
3824 for (int y = ov_h; y--; ) 3687 for (int y = ov.h; y--; )
3825 { 3688 {
3826 text_t *t1 = ov_text[y]; 3689 text_t *t1 = ov.text[y];
3827 rend_t *r1 = ov_rend[y]; 3690 rend_t *r1 = ov.rend[y];
3828 3691
3829 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3692 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3830 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3693 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3831 3694
3832 for (int x = ov_w; x--; ) 3695 for (int x = ov.w; x--; )
3833 { 3696 {
3834 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3697 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3835 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3698 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3836 } 3699 }
3837 } 3700 }

Diff Legend

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