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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.380 by sf-exg, Thu Apr 7 12:19:41 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);
… …
162{ 163{
163#if ENABLE_OVERLAY 164#if ENABLE_OVERLAY
164 scr_overlay_off (); 165 scr_overlay_off ();
165#endif 166#endif
166 167
167 rvideo_mode = false;
168 view_start = 0; 168 view_start = 0;
169 num_scr = 0; 169 num_scr = 0;
170 170
171 if (ncol == 0) 171 if (ncol == 0)
172 ncol = 80; 172 ncol = 80;
… …
174 if (nrow == 0) 174 if (nrow == 0)
175 nrow = 24; 175 nrow = 24;
176 176
177 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 178 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 179
183 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
185 { 182 {
186 //TODO//FIXME 183 //TODO//FIXME
… …
239 selection.text = NULL; 236 selection.text = NULL;
240 selection.len = 0; 237 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
243 selection.clicks = 0; 240 selection.clicks = 0;
241 selection.clip_text = NULL;
242 selection.clip_len = 0;
244 } 243 }
245 else 244 else
246 { 245 {
247 /* 246 /*
248 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
286 285
287 if (top_row) 286 if (top_row)
288 { 287 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
291 291
292 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 294
295 do 295 do
296 { 296 {
297 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 299 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 301
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 303 {
… …
399 delete old_ta; 397 delete old_ta;
400 delete old_ra; 398 delete old_ra;
401 399
402 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
404 403
405 free (tabs); 404 free (tabs);
406 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
407 409
408 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
409 411
410 prev_nrow = nrow; 412 prev_nrow = nrow;
411 prev_ncol = ncol; 413 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 414
421 tt_winch (); 415 tt_winch ();
422 416
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 418}
… …
436 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
437 431
438 free (row_buf); 432 free (row_buf);
439 free (swap_buf); 433 free (swap_buf);
440 free (drawn_buf); 434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
441 free (tabs); 437 free (tabs);
442 438 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 439 }
445} 440}
446 441
447/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
448/* 443/*
449 * Hard reset 444 * Hard/Soft reset
450 */ 445 */
451void 446void
452rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
453{ 448{
454 scr_release (); 449 scr_release ();
455 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
456 scr_reset (); 453 scr_reset ();
457 454
458 scr_clear (true); 455 scr_clear (true);
459 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
460} 473}
461 474
462/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
502 } 515 }
503 516
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
510#endif
511} 522}
512 523
513void 524void
514rxvt_term::scr_swap_screen () 525rxvt_term::scr_swap_screen ()
515{ 526{
… …
540 want_refresh = 1; 551 want_refresh = 1;
541 view_start = 0; 552 view_start = 0;
542 553
543 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
544 555
545 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
546 557
547#if NSCREENS 558#if NSCREENS
548 if (option (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
549 { 560 {
550 num_scr = 0; 561 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
777 } 788 }
778 } 789 }
779 790
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 794 int row = screen.cur.row;
786 795
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 797
789 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
… …
893# else 902# else
894 c = 0xfffd; 903 c = 0xfffd;
895# endif 904# endif
896#endif 905#endif
897 906
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)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 908
908 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 911 {
911 // ...output spaces 912 if (screen.flags & Screen_Autowrap)
912 c = ' '; 913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
913 // and try the same character next loop iteration 916 // and try the same character next loop iteration
914 --str; 917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
915 } 921 }
922
923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col);
916 929
917 line->touch (); 930 line->touch ();
918 931
919 do 932 do
920 { 933 {
… …
926 else 939 else
927 { 940 {
928 line->l = ncol; 941 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
931 break; 944
945 goto end_of_line;
932 } 946 }
933 947
934 c = NOCHAR; 948 c = NOCHAR;
935 } 949 }
936 while (expect_false (--width > 0)); 950 while (expect_false (--width > 0));
937 951
938 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 954 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 955 line->t[c] = ' ';
946 line->r[c] = rend; 956 line->r[c] = rend;
947 }
948 } 957 }
958
959end_of_line:
960 ;
949 } 961 }
950#if ENABLE_COMBINING 962#if ENABLE_COMBINING
951 else // width == 0 963 else // width == 0
952 { 964 {
953 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
993#endif 1005#endif
994 } 1006 }
995 1007
996 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
997 1009
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
1000#endif
1001} 1011}
1002 1012
1003/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
1004/* 1014/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1028
1019 want_refresh = 1; 1029 want_refresh = 1;
1020#endif 1030#endif
1021 } 1031 }
1022 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1023 else 1035 else
1024 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1025} 1037}
1026 1038
1027/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1334 return; 1346 return;
1335 1347
1336 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1337 1349
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1353 {
1343 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1344 1355
1345 if (mapped) 1356 if (mapped)
1346 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1349 } 1360 }
1350 else 1361 else
1351 { 1362 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1364
1365 if (mapped)
1366 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1371 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1362 } 1376 }
1363 1377
1364 for (; num--; row++) 1378 for (; num--; row++)
1365 { 1379 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1384 }
1369} 1385}
1370 1386
1371#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1372void 1388void
… …
1464 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1465 1481
1466 line->touch (); 1482 line->touch ();
1467 line->is_longer (0); 1483 line->is_longer (0);
1468 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1469 switch (insdel) 1489 switch (insdel)
1470 { 1490 {
1471 case INSERT: 1491 case INSERT:
1472 line->l = min (line->l + count, ncol); 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1473 1496
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1498 {
1476 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1521 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1523 selection_check (1);
1501 screen.cur.col -= count; 1524 screen.cur.col -= count;
1502 1525
1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1531 break;
1505 1532
1506 case DELETE: 1533 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0); 1534 line->l = max (line->l - count, 0);
1509 1535
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1511 1539
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1541 {
1514 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1516 } 1544 }
1517 1545
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1547
1524 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1550 {
1527 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1552 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1553 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1554 CLEAR_SELECTION ();
1531 else 1555 else
1532 { 1556 {
1533 /* shift selection */ 1557 /* shift selection */
1534 selection.beg.col -= count; 1558 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1559 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1560 selection.end.col -= count;
1537 } 1561 }
1538 }
1539 } 1562 }
1540 1563
1541 break; 1564 break;
1542 } 1565 }
1543} 1566}
… …
1664 { 1687 {
1665 rvideo_state = on; 1688 rvideo_state = on;
1666 1689
1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1668#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1669 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1670#endif 1693#endif
1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1672 1695
1673 XGCValues gcvalue; 1696 XGCValues gcvalue;
1674 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1818 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1819 { 1842 {
1820 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1821 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1822 } 1845 }
1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1826 1849
1827 num_scr_allow = 0; 1850 num_scr_allow = 0;
1828 1851
… …
1901 1924
1902# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1903# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1904 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1905# endif 1928# endif
1906 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1907# endif 1930# endif
1908 1931
1909# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1911 set_urgency (1); 1934 set_urgency (1);
… …
1919 1942
1920 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1921 } 1944 }
1922 else 1945 else
1923 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1924#endif 1948#endif
1925} 1949}
1926 1950
1927/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1928/* ARGSUSED */ 1952/* ARGSUSED */
… …
1947 row_start = view_start; 1971 row_start = view_start;
1948 } 1972 }
1949 1973
1950 wctomb (0, 0); 1974 wctomb (0, 0);
1951 1975
1952 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1953 { 1977 {
1954 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1955 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1956 1980
1957 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1986 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2011 */
1988void 2012void
1989rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1990{ 2014{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2017 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2030 /*
2009 * A: set up vars 2031 * A: set up vars
2010 */ 2032 */
2011 refresh_count = 0; 2033 refresh_count = 0;
2012 2034
2035 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2036 char have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2016#endif 2039#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2041
2019 /* 2042 /*
2020 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2021 */ 2044 */
2022 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
2023 2053
2024 /* 2054 /*
2025 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2026 */ 2056 */
2027 { 2057 {
2028 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2029 2059
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2061 if (hidden_cursor)
2033 showcursor = 0; 2062 showcursor = 0;
2034#endif 2063#endif
2035 2064
… …
2063 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2064#else 2093#else
2065 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2066#endif 2095#endif
2067 2096
2068 if (showcursor && focus) 2097 if (focus)
2069 { 2098 {
2070 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2071 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2072 else 2101 else
2073 { 2102 {
… …
2108 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2109 } 2138 }
2110 } 2139 }
2111 } 2140 }
2112 2141
2113 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2114#if ENABLE_OVERLAY
2115 scr_swap_overlay ();
2116#endif
2117
2118#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2143 /*
2120 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2122 */ 2146 */
… …
2214 2238
2215 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2216 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2217 --col; 2241 --col;
2218 2242
2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2220 text_t *text = stp + col; 2244 text_t *text = stp + col;
2221 int count = 1; 2245 int count = 1;
2222 2246
2223 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2224 drp[col] = rend; 2248 drp[col] = rend;
… …
2228 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2229 { 2253 {
2230 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2231 { 2255 {
2232 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2233 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2234 count++; 2259 count++;
2235 i++; 2260 i++;
2236 2261
2237 continue; 2262 continue;
2238 } 2263 }
… …
2268 */ 2293 */
2269 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2270 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2271 2296
2272 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2274 { 2299 {
2275 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2276 2301
2277#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2278 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2297 2322
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2324 fore = Color_UL;
2300#endif 2325#endif
2301 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2302 if (invert) 2347 if (invert)
2303 { 2348 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2310 ::swap (fore, back); 2349 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2350
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2318 if (ISSET_PIXCOLOR (Color_RV))
2319 back = Color_RV;
2320# endif
2321 if (fore == back) 2352 if (fore == back)
2322 { 2353 {
2323 fore = Color_bg; 2354 fore = Color_bg;
2324 back = Color_fg; 2355 back = Color_fg;
2325 } 2356 }
… …
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2426 }
2396 } /* for (col....) */ 2427 } /* for (col....) */
2397 } /* for (row....) */ 2428 } /* for (row....) */
2398 2429
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403
2404 /* 2430 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2432 */
2407 if (showcursor) 2433 if (showcursor)
2408 { 2434 {
… …
2446 } 2472 }
2447 2473
2448 /* 2474 /*
2449 * H: cleanup selection 2475 * H: cleanup selection
2450 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2451 scr_reverse_selection (); 2482 scr_reverse_selection ();
2452 2483
2484 screen.flags = old_screen_flags;
2453 num_scr = 0; 2485 num_scr = 0;
2454 num_scr_allow = 1; 2486 num_scr_allow = 1;
2455} 2487}
2456 2488
2457void 2489void
… …
2478 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2479 } 2511 }
2480} 2512}
2481 2513
2482void 2514void
2483rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2484{ 2516{
2517 bool transparent = false;
2518
2485#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2486 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2487#else 2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2488 2527
2528 transparent = true;
2529 }
2530 else
2531# endif
2532 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2536 }
2537 else
2538#endif
2539 {
2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2490 XClearWindow (dpy, parent[0]);
2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2544 XClearWindow (dpy, parent);
2492 2545
2493 if (scrollBar.win) 2546 if (scrollBar.win)
2494 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2496 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2497 scrollBar.show (0); 2553 scrollBar.show (0);
2498 } 2554 }
2499 2555
2500#endif 2556 if (refresh)
2501 2557 {
2502 /* bgPixmap.apply () does not do the following : */
2503 scr_clear (); 2558 scr_clear ();
2504 scr_touch (true); 2559 scr_touch (true);
2560 }
2505 want_refresh = 1; 2561 want_refresh = 1;
2506} 2562}
2507 2563
2508/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2509void 2565void
… …
2577 { 2633 {
2578#if !ENABLE_MINIMAL 2634#if !ENABLE_MINIMAL
2579 if (selection.rect) 2635 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2583 else 2639 else
2584#endif 2640#endif
2585 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2587 RS_RVid); 2643 RS_Sel | RS_RVid);
2588 } 2644 }
2589} 2645}
2590 2646
2591/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2592/* 2648/*
… …
2597void 2653void
2598rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2599{ 2655{
2600 int row, wrote; 2656 int row, wrote;
2601 unsigned int width, towrite; 2657 unsigned int width, towrite;
2602 char r1[] = "\n"; 2658 const char r1[] = "\n";
2603 2659
2604 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2605 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2606 { 2662 {
2607 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2653/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2654/* 2710/*
2655 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2656 */ 2712 */
2657void 2713void
2658rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2659{ 2715{
2660 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2661 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2662 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2663 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2669 2725
2670 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2672} 2728}
2673 2729
2674/* ------------------------------------------------------------------------- */
2675/*
2676 * Respond to a notification that a primary selection has been sent
2677 * EXT: SelectionNotify
2678 */
2679void 2730void
2680rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2681{ 2732{
2682 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2683 {
2684 if ((selection_type & Sel_CompoundText))
2685 {
2686 int selnum = selection_type & Sel_whereMask;
2687
2688 selection_type = 0;
2689 if (selnum != Sel_direct)
2690 selection_request_other (XA_STRING, selnum);
2691 }
2692
2693 if ((selection_type & Sel_UTF8String))
2694 {
2695 int selnum = selection_type & Sel_whereMask;
2696
2697 selection_type = Sel_CompoundText;
2698 if (selnum != Sel_direct)
2699 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2700 else
2701 selection_type = 0;
2702 }
2703
2704 return;
2705 }
2706
2707 unsigned long bytes_after;
2708 XTextProperty ct;
2709
2710 if (XGetWindowProperty (dpy, win, prop,
2711 0, PROP_SIZE / 4,
2712 delete_prop, AnyPropertyType,
2713 &ct.encoding, &ct.format,
2714 &ct.nitems, &bytes_after,
2715 &ct.value) != Success)
2716 {
2717 ct.value = 0;
2718 goto bailout;
2719 }
2720
2721 if (ct.encoding == None)
2722 goto bailout;
2723
2724 if (bytes_after)
2725 {
2726 // fetch and append remaining data
2727 XTextProperty ct2;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 ct.nitems / 4, (bytes_after + 3) / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct2.encoding, &ct2.format,
2733 &ct2.nitems, &bytes_after,
2734 &ct2.value) != Success)
2735 goto bailout;
2736
2737 // realloc should be compatible to XFree, here, and elsewhere, too
2738 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2739 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2740 ct.nitems += ct2.nitems;
2741
2742 XFree (ct2.value);
2743 }
2744
2745 if (ct.value == 0)
2746 goto bailout;
2747
2748 if (ct.encoding == xa[XA_INCR])
2749 {
2750 // INCR selection, start handshake
2751 if (!delete_prop)
2752 XDeleteProperty (dpy, win, prop);
2753
2754 selection_wait = Sel_incr;
2755 incr_buf_fill = 0;
2756 incr_ev.start (10);
2757
2758 goto bailout;
2759 }
2760
2761 if (ct.nitems == 0)
2762 {
2763 if (selection_wait == Sel_incr)
2764 {
2765 XFree (ct.value);
2766
2767 // finally complete, now paste the whole thing
2768 selection_wait = Sel_normal;
2769 ct.value = (unsigned char *)incr_buf;
2770 ct.nitems = incr_buf_fill;
2771 incr_buf = 0;
2772 incr_buf_size = 0;
2773 incr_ev.stop ();
2774 }
2775 else
2776 {
2777 if (selection_wait == Sel_normal
2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2779 {
2780 /*
2781 * pass through again trying CUT_BUFFER0 if we've come from
2782 * XConvertSelection () but nothing was presented
2783 */
2784 selection_paste (display->root, XA_CUT_BUFFER0, False);
2785 }
2786
2787 goto bailout;
2788 }
2789 }
2790 else if (selection_wait == Sel_incr)
2791 {
2792 incr_ev.start (10);
2793
2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2795 {
2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2798 }
2799
2800 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2801 incr_buf_fill += ct.nitems;
2802
2803 goto bailout;
2804 }
2805
2806 char **cl;
2807 int cr;
2808
2809#if !ENABLE_MINIMAL
2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2811 // so recode it manually
2812 if (ct.encoding == xa[XA_UTF8_STRING])
2813 {
2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2815 char *s = rxvt_wcstombs (w);
2816 free (w);
2817 // TODO: strlen == only the first element will be converted. well...
2818 paste (s, strlen (s));
2819 free (s);
2820 }
2821 else
2822#endif
2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2824 && cl)
2825 {
2826 for (int i = 0; i < cr; i++)
2827 paste (cl[i], strlen (cl[i]));
2828
2829 XFreeStringList (cl);
2830 }
2831 else
2832 paste ((char *)ct.value, ct.nitems); // paste raw
2833
2834bailout:
2835 XFree (ct.value);
2836
2837 if (selection_wait == Sel_normal)
2838 selection_wait = Sel_none;
2839}
2840
2841void
2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2843{
2844 selection_wait = Sel_none;
2845
2846 incr_buf_size = 0;
2847 free (incr_buf);
2848
2849 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2850}
2851
2852void
2853rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2854{
2855 if (prop == None || selection_wait != Sel_incr)
2856 return; 2734 return;
2857 2735
2858 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2859} 2737}
2860 2738
2861/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2862/* 2740/*
2863 * Request the current selection: 2741 * Request the current selection:
… …
2869 * EXT: button 2 release 2747 * EXT: button 2 release
2870 */ 2748 */
2871void 2749void
2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2873{ 2751{
2874 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2875 {
2876 /* internal selection */
2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2878 paste (str, strlen (str));
2879 free (str);
2880 return;
2881 } 2753 {
2882 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2883 { 2756 }
2884 selection_request_time = tm;
2885 selection_wait = Sel_normal;
2886
2887#if X_HAVE_UTF8_STRING
2888 selection_type = Sel_UTF8String;
2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2890 return;
2891#else
2892 selection_type = Sel_CompoundText;
2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2894 return;
2895#endif
2896 }
2897
2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2900}
2901
2902int
2903rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2904{
2905 Atom sel;
2906
2907 selection_type |= selnum;
2908
2909 if (selnum == Sel_Primary)
2910 sel = XA_PRIMARY;
2911 else if (selnum == Sel_Secondary)
2912 sel = XA_SECONDARY;
2913 else
2914 sel = xa[XA_CLIPBOARD];
2915
2916 if (XGetSelectionOwner (dpy, sel) != None)
2917 {
2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2919 vt, selection_request_time);
2920 return 1;
2921 }
2922
2923 return 0;
2924} 2757}
2925 2758
2926/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2927/* 2760/*
2928 * Clear all selected text 2761 * Clear all selected text
2929 * EXT: SelectionClear 2762 * EXT: SelectionClear
2930 */ 2763 */
2931void 2764void
2932rxvt_term::selection_clear () NOTHROW 2765rxvt_term::selection_clear (bool clipboard) NOTHROW
2933{ 2766{
2767 if (!clipboard)
2768 {
2934 want_refresh = 1; 2769 want_refresh = 1;
2935 free (selection.text); 2770 free (selection.text);
2936 selection.text = NULL; 2771 selection.text = NULL;
2937 selection.len = 0; 2772 selection.len = 0;
2938 CLEAR_SELECTION (); 2773 CLEAR_SELECTION ();
2939 2774
2940 if (display->selection_owner == this) 2775 if (display->selection_owner == this)
2941 display->selection_owner = 0; 2776 display->selection_owner = 0;
2777 }
2778 else
2779 {
2780 free (selection.clip_text);
2781 selection.clip_text = NULL;
2782 selection.clip_len = 0;
2783
2784 if (display->clipboard_owner == this)
2785 display->clipboard_owner = 0;
2786 }
2942} 2787}
2943 2788
2944/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2945/* 2790/*
2946 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2947 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2948 */ 2793 */
2949void 2794void
2950rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2951{ 2796{
2952 int i; 2797 int size;
2953 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2954 text_t *t; 2799 text_t *t;
2955 2800
2956 switch (selection.op) 2801 switch (selection.op)
2957 { 2802 {
… …
2973 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
2974 2819
2975 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2976 return; 2821 return;
2977 2822
2978 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2980 2825
2981 int ofs = 0; 2826 int ofs = 0;
2982 int extra = 0; 2827 int extra = 0;
2983 2828
2984 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
2990 { 2835 {
2991#if !ENABLE_MINIMAL 2836#if !ENABLE_MINIMAL
2992 if (selection.rect) 2837 if (selection.rect)
2993 { 2838 {
2994 col = selection.beg.col; 2839 col = selection.beg.col;
2995 end_col = ncol + 1; 2840 end_col = selection.end.col;
2996 } 2841 }
2997 else 2842 else
2998#endif 2843#endif
2999 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
3000 2845
3001 col = max (col, 0); 2846 col = max (col, 0);
3002 2847
3003 if (row == selection.end.row 2848 if (row == selection.end.row)
3004#if !ENABLE_MINIMAL
3005 || selection.rect
3006#endif
3007 )
3008 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
3009 2850
3010 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
3011 2852
3012 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
3020 2861
3021 extra -= (len - 1); 2862 extra -= (len - 1);
3022 2863
3023 if (extra < 0) 2864 if (extra < 0)
3024 { 2865 {
3025 extra += i; 2866 extra += size;
3026 i += i; 2867 size += size;
3027 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3028 } 2869 }
3029 2870
3030 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3031 } 2872 }
3032#endif 2873#endif
… …
3044 2885
3045 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3046 } 2887 }
3047 else 2888 else
3048#endif 2889#endif
3049 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
3050 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3051 } 2894 }
3052
3053 if (end_col != selection.end.col)
3054 new_selection_text[ofs++] = C0_LF;
3055 2895
3056 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3057 2897
3058 if (ofs == 0) 2898 if (ofs == 0)
3059 { 2899 {
… …
3072 2912
3073 selection_grab (tm); 2913 selection_grab (tm);
3074} 2914}
3075 2915
3076bool 2916bool
3077rxvt_term::selection_grab (Time tm) NOTHROW 2917rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3078{ 2918{
2919 Atom sel;
2920
2921 if (!clipboard)
2922 {
3079 selection_time = tm; 2923 selection_time = tm;
2924 sel = XA_PRIMARY;
2925 }
2926 else
2927 {
2928 clipboard_time = tm;
2929 sel = xa[XA_CLIPBOARD];
2930 }
3080 2931
3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2932 XSetSelectionOwner (dpy, sel, vt, tm);
3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2933 if (XGetSelectionOwner (dpy, sel) == vt)
3083 { 2934 {
3084 display->set_selection_owner (this); 2935 display->set_selection_owner (this, clipboard);
3085 return true; 2936 return true;
3086 } 2937 }
3087 else 2938 else
3088 { 2939 {
3089 selection_clear (); 2940 selection_clear (clipboard);
3090 return false; 2941 return false;
3091 } 2942 }
3092 2943
3093#if 0 2944#if 0
3094 XTextProperty ct; 2945 XTextProperty ct;
… …
3589 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3590 { 3441 {
3591 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3592 } 3443 }
3593#endif 3444#endif
3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3595 { 3446 {
3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3597 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3449 ev.property = rq.property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3598 ev.property = rq.property; 3455 ev.property = rq.property;
3599 } 3456 }
3600 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3601 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3602 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3635 { 3492 {
3636 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3637 style = enc_compound_text; 3494 style = enc_compound_text;
3638 } 3495 }
3639 3496
3640 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3641 { 3498 {
3642 cl = selection.text; 3499 cl = selection.text;
3643 selectlen = selection.len; 3500 selectlen = selection.len;
3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3644 } 3506 }
3645 else 3507 else
3646 { 3508 {
3647 cl = L""; 3509 cl = L"";
3648 selectlen = 0; 3510 selectlen = 0;
… …
3716 h += 2; min_it (h, nrow); 3578 h += 2; min_it (h, nrow);
3717 3579
3718 x -= 1; clamp_it (x, 0, ncol - w); 3580 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3581 y -= 1; clamp_it (y, 0, nrow - h);
3720 3582
3721 ov_x = x; ov_y = y; 3583 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3584 ov.w = w; ov.h = h;
3723 3585
3724 ov_text = new text_t *[h]; 3586 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3587 ov.rend = new rend_t *[h];
3726 3588
3727 for (y = 0; y < h; y++) 3589 for (y = 0; y < h; y++)
3728 { 3590 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3591 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3592 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3593
3732 text_t t0, t1, t2; 3594 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3595 rend_t r = OVERLAY_RSTYLE;
3734 3596
3735 if (y == 0) 3597 if (y == 0)
… …
3754} 3616}
3755 3617
3756void 3618void
3757rxvt_term::scr_overlay_off () NOTHROW 3619rxvt_term::scr_overlay_off () NOTHROW
3758{ 3620{
3759 if (!ov_text) 3621 if (!ov.text)
3760 return; 3622 return;
3761 3623
3762 want_refresh = 1; 3624 want_refresh = 1;
3763 3625
3764 for (int y = 0; y < ov_h; y++) 3626 for (int y = 0; y < ov.h; y++)
3765 { 3627 {
3766 delete [] ov_text[y]; 3628 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3629 delete [] ov.rend[y];
3768 } 3630 }
3769 3631
3770 delete [] ov_text; ov_text = 0; 3632 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3772} 3634}
3773 3635
3774void 3636void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3776{ 3638{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3640 return;
3779 3641
3780 x++, y++; 3642 x++, y++;
3781 3643
3782 ov_text[y][x] = text; 3644 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3784} 3646}
3785 3647
3786void 3648void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3788{ 3650{
… …
3807} 3669}
3808 3670
3809void 3671void
3810rxvt_term::scr_swap_overlay () NOTHROW 3672rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3673{
3812 if (!ov_text) 3674 if (!ov.text)
3813 return; 3675 return;
3814 3676
3677 // hide cursor if it is within the overlay area
3678 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3679 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3680 screen.flags &= ~Screen_VisibleCursor;
3681
3815 // swap screen mem with overlay 3682 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3683 for (int y = ov.h; y--; )
3817 { 3684 {
3818 text_t *t1 = ov_text[y]; 3685 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3686 rend_t *r1 = ov.rend[y];
3820 3687
3821 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3688 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3822 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3689 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3823 3690
3824 for (int x = ov_w; x--; ) 3691 for (int x = ov.w; x--; )
3825 { 3692 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3693 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3694 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3828 } 3695 }
3829 } 3696 }

Diff Legend

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