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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.378 by sf-exg, Thu Mar 24 23:55:31 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 begin, 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++;
153 } while (col < ncol && l.t[col] == NOCHAR); 154 } while (col < ncol && l.t[col] == NOCHAR);
… …
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
… …
1464 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1465 1477
1466 line->touch (); 1478 line->touch ();
1467 line->is_longer (0); 1479 line->is_longer (0);
1468 1480
1469 // nuke wide char at beginning 1481 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1482 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1483 scr_kill_char (*line, screen.cur.col);
1472 1484
1473 switch (insdel) 1485 switch (insdel)
1474 { 1486 {
… …
1513 1525
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1527 break;
1516 1528
1517 case DELETE: 1529 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1530 line->l = max (line->l - count, 0);
1520 1531
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1522 1535
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1537 {
1525 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1527 } 1540 }
1528 1541
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1543
1535 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1546 {
1538 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1548 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1549 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1550 CLEAR_SELECTION ();
1542 else 1551 else
1543 { 1552 {
1544 /* shift selection */ 1553 /* shift selection */
1545 selection.beg.col -= count; 1554 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1555 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1556 selection.end.col -= count;
1548 } 1557 }
1549 }
1550 } 1558 }
1551 1559
1552 break; 1560 break;
1553 } 1561 }
1554} 1562}
… …
1675 { 1683 {
1676 rvideo_state = on; 1684 rvideo_state = on;
1677 1685
1678 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1679#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1680 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1681#endif 1689#endif
1682 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1683 1691
1684 XGCValues gcvalue; 1692 XGCValues gcvalue;
1685 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1838 {
1831 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1833 } 1841 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1835 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++)
1836 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);
1837 1845
1838 num_scr_allow = 0; 1846 num_scr_allow = 0;
1839 1847
… …
1930 1938
1931 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1940 }
1933 else 1941 else
1934 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1944#endif
1936} 1945}
1937 1946
1938/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1948/* ARGSUSED */
… …
1958 row_start = view_start; 1967 row_start = view_start;
1959 } 1968 }
1960 1969
1961 wctomb (0, 0); 1970 wctomb (0, 0);
1962 1971
1963 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1973 {
1965 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1967 1976
1968 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
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2007 */
1999void 2008void
2000rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
2001{ 2010{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2013 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2026 /*
2020 * A: set up vars 2027 * A: set up vars
2021 */ 2028 */
2022 refresh_count = 0; 2029 refresh_count = 0;
2023 2030
2031 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2032 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2027#endif 2035#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2037
2030 /* 2038 /*
2031 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2032 */ 2040 */
2033 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;
2034 2049
2035 /* 2050 /*
2036 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2037 */ 2052 */
2038 { 2053 {
2039 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2040 2055
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2057 if (hidden_cursor)
2044 showcursor = 0; 2058 showcursor = 0;
2045#endif 2059#endif
2046 2060
… …
2074 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2075#else 2089#else
2076 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2077#endif 2091#endif
2078 2092
2079 if (showcursor && focus) 2093 if (focus)
2080 { 2094 {
2081 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2083 else 2097 else
2084 { 2098 {
… …
2119 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2120 } 2134 }
2121 } 2135 }
2122 } 2136 }
2123 2137
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2139 /*
2131 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2133 */ 2142 */
… …
2225 2234
2226 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2228 --col; 2237 --col;
2229 2238
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2240 text_t *text = stp + col;
2232 int count = 1; 2241 int count = 1;
2233 2242
2234 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2235 drp[col] = rend; 2244 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2240 { 2249 {
2241 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2242 { 2251 {
2243 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2244 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2245 count++; 2255 count++;
2246 i++; 2256 i++;
2247 2257
2248 continue; 2258 continue;
2249 } 2259 }
… …
2279 */ 2289 */
2280 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2282 2292
2283 // 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
2284 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)))
2285 { 2295 {
2286 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2287 2297
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2318
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2320 fore = Color_UL;
2311#endif 2321#endif
2312 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
2313 if (invert) 2343 if (invert)
2314 { 2344 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2321 ::swap (fore, back); 2345 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2346
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2329 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV;
2331# endif
2332 if (fore == back) 2348 if (fore == back)
2333 { 2349 {
2334 fore = Color_bg; 2350 fore = Color_bg;
2335 back = Color_fg; 2351 back = Color_fg;
2336 } 2352 }
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2422 }
2407 } /* for (col....) */ 2423 } /* for (col....) */
2408 } /* for (row....) */ 2424 } /* for (row....) */
2409 2425
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2426 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2428 */
2418 if (showcursor) 2429 if (showcursor)
2419 { 2430 {
… …
2457 } 2468 }
2458 2469
2459 /* 2470 /*
2460 * H: cleanup selection 2471 * H: cleanup selection
2461 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2462 scr_reverse_selection (); 2478 scr_reverse_selection ();
2463 2479
2480 screen.flags = old_screen_flags;
2464 num_scr = 0; 2481 num_scr = 0;
2465 num_scr_allow = 1; 2482 num_scr_allow = 1;
2466} 2483}
2467 2484
2468void 2485void
… …
2489 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2490 } 2507 }
2491} 2508}
2492 2509
2493void 2510void
2494rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2495{ 2512{
2513 bool transparent = false;
2514
2496#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2497 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2498#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);
2499 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 {
2500 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
2501 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2502 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2503 2541
2504 if (scrollBar.win) 2542 if (scrollBar.win)
2505 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2506 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2507 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2508 scrollBar.show (0); 2549 scrollBar.show (0);
2509 } 2550 }
2510 2551
2511#endif 2552 if (refresh)
2512 2553 {
2513 /* bgPixmap.apply () does not do the following : */
2514 scr_clear (); 2554 scr_clear ();
2515 scr_touch (true); 2555 scr_touch (true);
2556 }
2516 want_refresh = 1; 2557 want_refresh = 1;
2517} 2558}
2518 2559
2519/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2520void 2561void
… …
2588 { 2629 {
2589#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2590 if (selection.rect) 2631 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2635 else
2595#endif 2636#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2598 RS_RVid); 2639 RS_Sel | RS_RVid);
2599 } 2640 }
2600} 2641}
2601 2642
2602/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2603/* 2644/*
… …
2608void 2649void
2609rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2610{ 2651{
2611 int row, wrote; 2652 int row, wrote;
2612 unsigned int width, towrite; 2653 unsigned int width, towrite;
2613 char r1[] = "\n"; 2654 const char r1[] = "\n";
2614 2655
2615 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2616 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2617 { 2658 {
2618 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2664/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2665/* 2706/*
2666 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2667 */ 2708 */
2668void 2709void
2669rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670{ 2711{
2671 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2672 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2673 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2674 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2680 2721
2681 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2683} 2724}
2684 2725
2685/* ------------------------------------------------------------------------- */
2686/*
2687 * Respond to a notification that a primary selection has been sent
2688 * EXT: SelectionNotify
2689 */
2690void 2726void
2691rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2692{ 2728{
2693 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2694 {
2695 if ((selection_type & Sel_CompoundText))
2696 {
2697 int selnum = selection_type & Sel_whereMask;
2698
2699 selection_type = 0;
2700 if (selnum != Sel_direct)
2701 selection_request_other (XA_STRING, selnum);
2702 }
2703
2704 if ((selection_type & Sel_UTF8String))
2705 {
2706 int selnum = selection_type & Sel_whereMask;
2707
2708 selection_type = Sel_CompoundText;
2709 if (selnum != Sel_direct)
2710 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2711 else
2712 selection_type = 0;
2713 }
2714
2715 return;
2716 }
2717
2718 unsigned long bytes_after;
2719 XTextProperty ct;
2720
2721 if (XGetWindowProperty (dpy, win, prop,
2722 0, PROP_SIZE / 4,
2723 delete_prop, AnyPropertyType,
2724 &ct.encoding, &ct.format,
2725 &ct.nitems, &bytes_after,
2726 &ct.value) != Success)
2727 {
2728 ct.value = 0;
2729 goto bailout;
2730 }
2731
2732 if (ct.encoding == None)
2733 goto bailout;
2734
2735 if (bytes_after)
2736 {
2737 // fetch and append remaining data
2738 XTextProperty ct2;
2739
2740 if (XGetWindowProperty (dpy, win, prop,
2741 ct.nitems / 4, (bytes_after + 3) / 4,
2742 delete_prop, AnyPropertyType,
2743 &ct2.encoding, &ct2.format,
2744 &ct2.nitems, &bytes_after,
2745 &ct2.value) != Success)
2746 goto bailout;
2747
2748 // realloc should be compatible to XFree, here, and elsewhere, too
2749 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2750 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2751 ct.nitems += ct2.nitems;
2752
2753 XFree (ct2.value);
2754 }
2755
2756 if (ct.value == 0)
2757 goto bailout;
2758
2759 if (ct.encoding == xa[XA_INCR])
2760 {
2761 // INCR selection, start handshake
2762 if (!delete_prop)
2763 XDeleteProperty (dpy, win, prop);
2764
2765 selection_wait = Sel_incr;
2766 incr_buf_fill = 0;
2767 incr_ev.start (10);
2768
2769 goto bailout;
2770 }
2771
2772 if (ct.nitems == 0)
2773 {
2774 if (selection_wait == Sel_incr)
2775 {
2776 XFree (ct.value);
2777
2778 // finally complete, now paste the whole thing
2779 selection_wait = Sel_normal;
2780 ct.value = (unsigned char *)incr_buf;
2781 ct.nitems = incr_buf_fill;
2782 incr_buf = 0;
2783 incr_buf_size = 0;
2784 incr_ev.stop ();
2785 }
2786 else
2787 {
2788 if (selection_wait == Sel_normal
2789 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2790 {
2791 /*
2792 * pass through again trying CUT_BUFFER0 if we've come from
2793 * XConvertSelection () but nothing was presented
2794 */
2795 selection_paste (display->root, XA_CUT_BUFFER0, False);
2796 }
2797
2798 goto bailout;
2799 }
2800 }
2801 else if (selection_wait == Sel_incr)
2802 {
2803 incr_ev.start (10);
2804
2805 while (incr_buf_fill + ct.nitems > incr_buf_size)
2806 {
2807 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2808 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2809 }
2810
2811 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2812 incr_buf_fill += ct.nitems;
2813
2814 goto bailout;
2815 }
2816
2817 char **cl;
2818 int cr;
2819
2820#if !ENABLE_MINIMAL
2821 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2822 // so recode it manually
2823 if (ct.encoding == xa[XA_UTF8_STRING])
2824 {
2825 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2826 char *s = rxvt_wcstombs (w);
2827 free (w);
2828 // TODO: strlen == only the first element will be converted. well...
2829 paste (s, strlen (s));
2830 free (s);
2831 }
2832 else
2833#endif
2834 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2835 && cl)
2836 {
2837 for (int i = 0; i < cr; i++)
2838 paste (cl[i], strlen (cl[i]));
2839
2840 XFreeStringList (cl);
2841 }
2842 else
2843 paste ((char *)ct.value, ct.nitems); // paste raw
2844
2845bailout:
2846 XFree (ct.value);
2847
2848 if (selection_wait == Sel_normal)
2849 selection_wait = Sel_none;
2850}
2851
2852void
2853rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2854{
2855 selection_wait = Sel_none;
2856
2857 incr_buf_size = 0;
2858 free (incr_buf);
2859
2860 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2861}
2862
2863void
2864rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2865{
2866 if (prop == None || selection_wait != Sel_incr)
2867 return; 2730 return;
2868 2731
2869 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2870} 2733}
2871 2734
2872/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2873/* 2736/*
2874 * Request the current selection: 2737 * Request the current selection:
… …
2880 * EXT: button 2 release 2743 * EXT: button 2 release
2881 */ 2744 */
2882void 2745void
2883rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2884{ 2747{
2885 if (selection.text && selnum == Sel_Primary) 2748 if (!selection_req)
2886 {
2887 /* internal selection */
2888 char *str = rxvt_wcstombs (selection.text, selection.len);
2889 paste (str, strlen (str));
2890 free (str);
2891 return;
2892 } 2749 {
2893 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2894 { 2752 }
2895 selection_request_time = tm;
2896 selection_wait = Sel_normal;
2897
2898#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return;
2902#else
2903 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return;
2906#endif
2907 }
2908
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false);
2911}
2912
2913int
2914rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2915{
2916 Atom sel;
2917
2918 selection_type |= selnum;
2919
2920 if (selnum == Sel_Primary)
2921 sel = XA_PRIMARY;
2922 else if (selnum == Sel_Secondary)
2923 sel = XA_SECONDARY;
2924 else
2925 sel = xa[XA_CLIPBOARD];
2926
2927 if (XGetSelectionOwner (dpy, sel) != None)
2928 {
2929 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2930 vt, selection_request_time);
2931 return 1;
2932 }
2933
2934 return 0;
2935} 2753}
2936 2754
2937/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2938/* 2756/*
2939 * Clear all selected text 2757 * Clear all selected text
2940 * EXT: SelectionClear 2758 * EXT: SelectionClear
2941 */ 2759 */
2942void 2760void
2943rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2762{
2763 if (!clipboard)
2764 {
2945 want_refresh = 1; 2765 want_refresh = 1;
2946 free (selection.text); 2766 free (selection.text);
2947 selection.text = NULL; 2767 selection.text = NULL;
2948 selection.len = 0; 2768 selection.len = 0;
2949 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2950 2770
2951 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2772 display->selection_owner = 0;
2773 }
2774 else
2775 {
2776 free (selection.clip_text);
2777 selection.clip_text = NULL;
2778 selection.clip_len = 0;
2779
2780 if (display->clipboard_owner == this)
2781 display->clipboard_owner = 0;
2782 }
2953} 2783}
2954 2784
2955/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2956/* 2786/*
2957 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2958 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2959 */ 2789 */
2960void 2790void
2961rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2962{ 2792{
2963 int i; 2793 int size;
2964 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2965 text_t *t; 2795 text_t *t;
2966 2796
2967 switch (selection.op) 2797 switch (selection.op)
2968 { 2798 {
… …
2984 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2985 2815
2986 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2987 return; 2817 return;
2988 2818
2989 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2990 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2991 2821
2992 int ofs = 0; 2822 int ofs = 0;
2993 int extra = 0; 2823 int extra = 0;
2994 2824
2995 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
3001 { 2831 {
3002#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
3003 if (selection.rect) 2833 if (selection.rect)
3004 { 2834 {
3005 col = selection.beg.col; 2835 col = selection.beg.col;
3006 end_col = ncol + 1; 2836 end_col = selection.end.col;
3007 } 2837 }
3008 else 2838 else
3009#endif 2839#endif
3010 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
3011 2841
3012 col = max (col, 0); 2842 col = max (col, 0);
3013 2843
3014 if (row == selection.end.row 2844 if (row == selection.end.row)
3015#if !ENABLE_MINIMAL
3016 || selection.rect
3017#endif
3018 )
3019 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3020 2846
3021 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3022 2848
3023 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3031 2857
3032 extra -= (len - 1); 2858 extra -= (len - 1);
3033 2859
3034 if (extra < 0) 2860 if (extra < 0)
3035 { 2861 {
3036 extra += i; 2862 extra += size;
3037 i += i; 2863 size += size;
3038 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3039 } 2865 }
3040 2866
3041 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3042 } 2868 }
3043#endif 2869#endif
… …
3055 2881
3056 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3057 } 2883 }
3058 else 2884 else
3059#endif 2885#endif
3060 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3061 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3062 } 2890 }
3063
3064 if (end_col != selection.end.col)
3065 new_selection_text[ofs++] = C0_LF;
3066 2891
3067 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3068 2893
3069 if (ofs == 0) 2894 if (ofs == 0)
3070 { 2895 {
… …
3083 2908
3084 selection_grab (tm); 2909 selection_grab (tm);
3085} 2910}
3086 2911
3087bool 2912bool
3088rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3090 selection_time = tm; 2919 selection_time = tm;
2920 sel = XA_PRIMARY;
2921 }
2922 else
2923 {
2924 clipboard_time = tm;
2925 sel = xa[XA_CLIPBOARD];
2926 }
3091 2927
3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3094 { 2930 {
3095 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3096 return true; 2932 return true;
3097 } 2933 }
3098 else 2934 else
3099 { 2935 {
3100 selection_clear (); 2936 selection_clear (clipboard);
3101 return false; 2937 return false;
3102 } 2938 }
3103 2939
3104#if 0 2940#if 0
3105 XTextProperty ct; 2941 XTextProperty ct;
… …
3600 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3601 { 3437 {
3602 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3603 } 3439 }
3604#endif 3440#endif
3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606 { 3442 {
3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3608 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3445 ev.property = rq.property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3609 ev.property = rq.property; 3451 ev.property = rq.property;
3610 } 3452 }
3611 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3612 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3613 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3646 { 3488 {
3647 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3648 style = enc_compound_text; 3490 style = enc_compound_text;
3649 } 3491 }
3650 3492
3651 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3652 { 3494 {
3653 cl = selection.text; 3495 cl = selection.text;
3654 selectlen = selection.len; 3496 selectlen = selection.len;
3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3655 } 3502 }
3656 else 3503 else
3657 { 3504 {
3658 cl = L""; 3505 cl = L"";
3659 selectlen = 0; 3506 selectlen = 0;
… …
3727 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3728 3575
3729 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3731 3578
3732 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3734 3581
3735 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3737 3584
3738 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3739 { 3586 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3589
3743 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3745 3592
3746 if (y == 0) 3593 if (y == 0)
… …
3765} 3612}
3766 3613
3767void 3614void
3768rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () NOTHROW
3769{ 3616{
3770 if (!ov_text) 3617 if (!ov.text)
3771 return; 3618 return;
3772 3619
3773 want_refresh = 1; 3620 want_refresh = 1;
3774 3621
3775 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3776 { 3623 {
3777 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3779 } 3626 }
3780 3627
3781 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3783} 3630}
3784 3631
3785void 3632void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3634{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3636 return;
3790 3637
3791 x++, y++; 3638 x++, y++;
3792 3639
3793 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3795} 3642}
3796 3643
3797void 3644void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3646{
… …
3818} 3665}
3819 3666
3820void 3667void
3821rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3669{
3823 if (!ov_text) 3670 if (!ov.text)
3824 return; 3671 return;
3825 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3826 // swap screen mem with overlay 3678 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3828 { 3680 {
3829 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3831 3683
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3686
3835 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3836 { 3688 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3691 }
3840 } 3692 }

Diff Legend

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