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.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 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
… …
1446 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1447 */ 1463 */
1448void 1464void
1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1450{ 1466{
1451 int col, row;
1452 rend_t tr;
1453
1454 want_refresh = 1; 1467 want_refresh = 1;
1455 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1456 1469
1457 if (count <= 0) 1470 if (count <= 0)
1458 return; 1471 return;
… …
1460 scr_do_wrap (); 1473 scr_do_wrap ();
1461 1474
1462 selection_check (1); 1475 selection_check (1);
1463 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1464 1477
1465 row = screen.cur.row; 1478 int row = screen.cur.row;
1466 1479
1467 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1468 1481
1469 line->touch (); 1482 line->touch ();
1470 line->is_longer (0); 1483 line->is_longer (0);
1471 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1472 switch (insdel) 1489 switch (insdel)
1473 { 1490 {
1474 case INSERT: 1491 case INSERT:
1475 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 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);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1476 { 1498 {
1477 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1478 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1479 } 1501 }
1480
1481 line->l = min (line->l + count, ncol);
1482 1502
1483 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1484 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1485 { 1505 {
1486 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
… …
1501 case ERASE: 1521 case ERASE:
1502 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1503 selection_check (1); 1523 selection_check (1);
1504 screen.cur.col -= count; 1524 screen.cur.col -= count;
1505 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
1506 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1507 break; 1531 break;
1508 1532
1509 case DELETE: 1533 case DELETE:
1510 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1511 1535
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);
1539
1512 for (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 line->l = max (line->l - count, 0);
1519 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1520 1547
1521 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1523 { 1550 {
1524 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1660 { 1687 {
1661 rvideo_state = on; 1688 rvideo_state = on;
1662 1689
1663 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1664#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1665 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1666#endif 1693#endif
1667 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1668 1695
1669 XGCValues gcvalue; 1696 XGCValues gcvalue;
1670 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
1814 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1815 { 1842 {
1816 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1817 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1818 } 1845 }
1819// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1820 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++)
1821 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);
1822 1849
1823 num_scr_allow = 0; 1850 num_scr_allow = 0;
1824 1851
… …
1897 1924
1898# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1899# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1900 if (option (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1901# endif 1928# endif
1902 XMapWindow (dpy, parent[0]); 1929 XMapWindow (dpy, parent);
1903# endif 1930# endif
1904 1931
1905# if ENABLE_FRILLS 1932# if ENABLE_FRILLS
1906 if (option (Opt_urgentOnBell)) 1933 if (option (Opt_urgentOnBell))
1907 set_urgency (1); 1934 set_urgency (1);
… …
1915 1942
1916 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1917 } 1944 }
1918 else 1945 else
1919 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1948#endif
1921} 1949}
1922 1950
1923/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1952/* ARGSUSED */
… …
1943 row_start = view_start; 1971 row_start = view_start;
1944 } 1972 }
1945 1973
1946 wctomb (0, 0); 1974 wctomb (0, 0);
1947 1975
1948 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1977 {
1950 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1952 1980
1953 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
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2011 */
1984void 2012void
1985rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1986{ 2014{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2017 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2004 /* 2030 /*
2005 * A: set up vars 2031 * A: set up vars
2006 */ 2032 */
2007 refresh_count = 0; 2033 refresh_count = 0;
2008 2034
2035 unsigned int old_screen_flags = screen.flags;
2009 have_bg = 0; 2036 char have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2011 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2012#endif 2039#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2041
2015 /* 2042 /*
2016 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2017 */ 2044 */
2018 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;
2019 2053
2020 /* 2054 /*
2021 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2022 */ 2056 */
2023 { 2057 {
2024 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2025 2059
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2061 if (hidden_cursor)
2029 showcursor = 0; 2062 showcursor = 0;
2030#endif 2063#endif
2031 2064
… …
2059 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2060#else 2093#else
2061 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2062#endif 2095#endif
2063 2096
2064 if (showcursor && focus) 2097 if (focus)
2065 { 2098 {
2066 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2068 else 2101 else
2069 { 2102 {
… …
2104 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2105 } 2138 }
2106 } 2139 }
2107 } 2140 }
2108 2141
2109 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110#if ENABLE_OVERLAY
2111 scr_swap_overlay ();
2112#endif
2113
2114#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2143 /*
2116 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2118 */ 2146 */
… …
2210 2238
2211 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2212 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2213 --col; 2241 --col;
2214 2242
2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2216 text_t *text = stp + col; 2244 text_t *text = stp + col;
2217 int count = 1; 2245 int count = 1;
2218 2246
2219 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2220 drp[col] = rend; 2248 drp[col] = rend;
… …
2224 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2225 { 2253 {
2226 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2227 { 2255 {
2228 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2229 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2230 count++; 2259 count++;
2231 i++; 2260 i++;
2232 2261
2233 continue; 2262 continue;
2234 } 2263 }
… …
2264 */ 2293 */
2265 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2266 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2267 2296
2268 // 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
2269 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)))
2270 { 2299 {
2271 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2272 2301
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2293 2322
2294 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2324 fore = Color_UL;
2296#endif 2325#endif
2297 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
2298 if (invert) 2347 if (invert)
2299 { 2348 {
2300#ifdef OPTION_HC
2301 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2302 || !ISSET_PIXCOLOR (Color_HC))
2303#endif
2304 /* invert the column if no highlightColor is set or it is the
2305 * current cursor column */
2306 ::swap (fore, back); 2349 ::swap (fore, back);
2307#ifdef OPTION_HC
2308 else if (ISSET_PIXCOLOR (Color_HC))
2309 back = Color_HC;
2310#endif
2311 2350
2312#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2313# ifndef OPTION_HC
2314 if (ISSET_PIXCOLOR (Color_RV))
2315 back = Color_RV;
2316# endif
2317 if (fore == back) 2352 if (fore == back)
2318 { 2353 {
2319 fore = Color_bg; 2354 fore = Color_bg;
2320 back = Color_fg; 2355 back = Color_fg;
2321 } 2356 }
… …
2390 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2391 } 2426 }
2392 } /* for (col....) */ 2427 } /* for (col....) */
2393 } /* for (row....) */ 2428 } /* for (row....) */
2394 2429
2395#if ENABLE_OVERLAY
2396 scr_swap_overlay ();
2397#endif
2398 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2399
2400 /* 2430 /*
2401 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2402 */ 2432 */
2403 if (showcursor) 2433 if (showcursor)
2404 { 2434 {
… …
2442 } 2472 }
2443 2473
2444 /* 2474 /*
2445 * H: cleanup selection 2475 * H: cleanup selection
2446 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2447 scr_reverse_selection (); 2482 scr_reverse_selection ();
2448 2483
2484 screen.flags = old_screen_flags;
2449 num_scr = 0; 2485 num_scr = 0;
2450 num_scr_allow = 1; 2486 num_scr_allow = 1;
2451} 2487}
2452 2488
2453void 2489void
… …
2474 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2475 } 2511 }
2476} 2512}
2477 2513
2478void 2514void
2479rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2480{ 2516{
2517 bool transparent = false;
2518
2481#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2482 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2483#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);
2484 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 {
2485 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2486 XClearWindow (dpy, parent[0]);
2487 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2544 XClearWindow (dpy, parent);
2488 2545
2489 if (scrollBar.win) 2546 if (scrollBar.win)
2490 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2491 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2492 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2493 scrollBar.show (0); 2553 scrollBar.show (0);
2494 } 2554 }
2495 2555
2496#endif 2556 if (refresh)
2497 2557 {
2498 /* bgPixmap.apply () does not do the following : */
2499 scr_clear (); 2558 scr_clear ();
2500 scr_touch (true); 2559 scr_touch (true);
2560 }
2501 want_refresh = 1; 2561 want_refresh = 1;
2502} 2562}
2503 2563
2504/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2505void 2565void
… …
2573 { 2633 {
2574#if !ENABLE_MINIMAL 2634#if !ENABLE_MINIMAL
2575 if (selection.rect) 2635 if (selection.rect)
2576 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2577 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2578 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2579 else 2639 else
2580#endif 2640#endif
2581 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2582 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2583 RS_RVid); 2643 RS_Sel | RS_RVid);
2584 } 2644 }
2585} 2645}
2586 2646
2587/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2588/* 2648/*
… …
2593void 2653void
2594rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2595{ 2655{
2596 int row, wrote; 2656 int row, wrote;
2597 unsigned int width, towrite; 2657 unsigned int width, towrite;
2598 char r1[] = "\n"; 2658 const char r1[] = "\n";
2599 2659
2600 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2601 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2602 { 2662 {
2603 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2649/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2650/* 2710/*
2651 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2652 */ 2712 */
2653void 2713void
2654rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2655{ 2715{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2665 2725
2666 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2667 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2668} 2728}
2669 2729
2670/* ------------------------------------------------------------------------- */
2671/*
2672 * Respond to a notification that a primary selection has been sent
2673 * EXT: SelectionNotify
2674 */
2675void 2730void
2676rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2677{ 2732{
2678 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2679 {
2680 if ((selection_type & Sel_CompoundText))
2681 {
2682 int selnum = selection_type & Sel_whereMask;
2683
2684 selection_type = 0;
2685 if (selnum != Sel_direct)
2686 selection_request_other (XA_STRING, selnum);
2687 }
2688
2689 if ((selection_type & Sel_UTF8String))
2690 {
2691 int selnum = selection_type & Sel_whereMask;
2692
2693 selection_type = Sel_CompoundText;
2694 if (selnum != Sel_direct)
2695 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2696 else
2697 selection_type = 0;
2698 }
2699
2700 return;
2701 }
2702
2703 unsigned long bytes_after;
2704 XTextProperty ct;
2705
2706 if (XGetWindowProperty (dpy, win, prop,
2707 0, PROP_SIZE / 4,
2708 delete_prop, AnyPropertyType,
2709 &ct.encoding, &ct.format,
2710 &ct.nitems, &bytes_after,
2711 &ct.value) != Success)
2712 {
2713 ct.value = 0;
2714 goto bailout;
2715 }
2716
2717 if (ct.encoding == None)
2718 goto bailout;
2719
2720 if (bytes_after)
2721 {
2722 // fetch and append remaining data
2723 XTextProperty ct2;
2724
2725 if (XGetWindowProperty (dpy, win, prop,
2726 ct.nitems / 4, (bytes_after + 3) / 4,
2727 delete_prop, AnyPropertyType,
2728 &ct2.encoding, &ct2.format,
2729 &ct2.nitems, &bytes_after,
2730 &ct2.value) != Success)
2731 goto bailout;
2732
2733 // realloc should be compatible to XFree, here, and elsewhere, too
2734 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2735 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2736 ct.nitems += ct2.nitems;
2737
2738 XFree (ct2.value);
2739 }
2740
2741 if (ct.value == 0)
2742 goto bailout;
2743
2744 if (ct.encoding == xa[XA_INCR])
2745 {
2746 // INCR selection, start handshake
2747 if (!delete_prop)
2748 XDeleteProperty (dpy, win, prop);
2749
2750 selection_wait = Sel_incr;
2751 incr_buf_fill = 0;
2752 incr_ev.start (10);
2753
2754 goto bailout;
2755 }
2756
2757 if (ct.nitems == 0)
2758 {
2759 if (selection_wait == Sel_incr)
2760 {
2761 XFree (ct.value);
2762
2763 // finally complete, now paste the whole thing
2764 selection_wait = Sel_normal;
2765 ct.value = (unsigned char *)incr_buf;
2766 ct.nitems = incr_buf_fill;
2767 incr_buf = 0;
2768 incr_buf_size = 0;
2769 incr_ev.stop ();
2770 }
2771 else
2772 {
2773 if (selection_wait == Sel_normal
2774 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2775 {
2776 /*
2777 * pass through again trying CUT_BUFFER0 if we've come from
2778 * XConvertSelection () but nothing was presented
2779 */
2780 selection_paste (display->root, XA_CUT_BUFFER0, False);
2781 }
2782
2783 goto bailout;
2784 }
2785 }
2786 else if (selection_wait == Sel_incr)
2787 {
2788 incr_ev.start (10);
2789
2790 while (incr_buf_fill + ct.nitems > incr_buf_size)
2791 {
2792 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2793 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2794 }
2795
2796 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2797 incr_buf_fill += ct.nitems;
2798
2799 goto bailout;
2800 }
2801
2802 char **cl;
2803 int cr;
2804
2805#if !ENABLE_MINIMAL
2806 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2807 // so recode it manually
2808 if (ct.encoding == xa[XA_UTF8_STRING])
2809 {
2810 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2811 char *s = rxvt_wcstombs (w);
2812 free (w);
2813 // TODO: strlen == only the first element will be converted. well...
2814 paste (s, strlen (s));
2815 free (s);
2816 }
2817 else
2818#endif
2819 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2820 && cl)
2821 {
2822 for (int i = 0; i < cr; i++)
2823 paste (cl[i], strlen (cl[i]));
2824
2825 XFreeStringList (cl);
2826 }
2827 else
2828 paste ((char *)ct.value, ct.nitems); // paste raw
2829
2830bailout:
2831 XFree (ct.value);
2832
2833 if (selection_wait == Sel_normal)
2834 selection_wait = Sel_none;
2835}
2836
2837void
2838rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2839{
2840 selection_wait = Sel_none;
2841
2842 incr_buf_size = 0;
2843 free (incr_buf);
2844
2845 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2846}
2847
2848void
2849rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2850{
2851 if (prop == None || selection_wait != Sel_incr)
2852 return; 2734 return;
2853 2735
2854 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2855} 2737}
2856 2738
2857/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2858/* 2740/*
2859 * Request the current selection: 2741 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2860 * Order: > internal selection if available 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2861 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * as fallback
2862 * > CUT_BUFFER0
2863 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2864 * will auto fallback to CUT_BUFFER0
2865 * EXT: button 2 release 2744 * EXT: button 2 release
2866 */ 2745 */
2867void 2746void
2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869{ 2748{
2870 if (selection.text && selnum == Sel_Primary) 2749 if (!selection_req)
2871 {
2872 /* internal selection */
2873 char *str = rxvt_wcstombs (selection.text, selection.len);
2874 paste (str, strlen (str));
2875 free (str);
2876 return;
2877 } 2750 {
2878 else 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2752 selection_req->run ();
2879 { 2753 }
2880 selection_request_time = tm;
2881 selection_wait = Sel_normal;
2882
2883#if X_HAVE_UTF8_STRING
2884 selection_type = Sel_UTF8String;
2885 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2886 return;
2887#else
2888 selection_type = Sel_CompoundText;
2889 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2890 return;
2891#endif
2892 }
2893
2894 selection_wait = Sel_none; /* don't loop in selection_paste () */
2895 selection_paste (display->root, XA_CUT_BUFFER0, false);
2896}
2897
2898int
2899rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2900{
2901 Atom sel;
2902
2903 selection_type |= selnum;
2904
2905 if (selnum == Sel_Primary)
2906 sel = XA_PRIMARY;
2907 else if (selnum == Sel_Secondary)
2908 sel = XA_SECONDARY;
2909 else
2910 sel = xa[XA_CLIPBOARD];
2911
2912 if (XGetSelectionOwner (dpy, sel) != None)
2913 {
2914 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2915 vt, selection_request_time);
2916 return 1;
2917 }
2918
2919 return 0;
2920} 2754}
2921 2755
2922/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2923/* 2757/*
2924 * Clear all selected text 2758 * Clear all selected text
2925 * EXT: SelectionClear 2759 * EXT: SelectionClear
2926 */ 2760 */
2927void 2761void
2928rxvt_term::selection_clear () NOTHROW 2762rxvt_term::selection_clear (bool clipboard) NOTHROW
2929{ 2763{
2764 if (!clipboard)
2765 {
2930 want_refresh = 1; 2766 want_refresh = 1;
2931 free (selection.text); 2767 free (selection.text);
2932 selection.text = NULL; 2768 selection.text = NULL;
2933 selection.len = 0; 2769 selection.len = 0;
2934 CLEAR_SELECTION (); 2770 CLEAR_SELECTION ();
2935 2771
2936 if (display->selection_owner == this) 2772 if (display->selection_owner == this)
2937 display->selection_owner = 0; 2773 display->selection_owner = 0;
2774 }
2775 else
2776 {
2777 free (selection.clip_text);
2778 selection.clip_text = NULL;
2779 selection.clip_len = 0;
2780
2781 if (display->clipboard_owner == this)
2782 display->clipboard_owner = 0;
2783 }
2938} 2784}
2939 2785
2940/* ------------------------------------------------------------------------- */ 2786/* ------------------------------------------------------------------------- */
2941/* 2787/*
2942 * Copy a selection into the cut buffer 2788 * Copy a selection into the cut buffer
2943 * EXT: button 1 or 3 release 2789 * EXT: button 1 or 3 release
2944 */ 2790 */
2945void 2791void
2946rxvt_term::selection_make (Time tm) 2792rxvt_term::selection_make (Time tm)
2947{ 2793{
2948 int i; 2794 int size;
2949 wchar_t *new_selection_text; 2795 wchar_t *new_selection_text;
2950 text_t *t; 2796 text_t *t;
2951 2797
2952 switch (selection.op) 2798 switch (selection.op)
2953 { 2799 {
… …
2969 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
2970 2816
2971 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2817 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2972 return; 2818 return;
2973 2819
2974 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2820 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2975 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2821 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2976 2822
2977 int ofs = 0; 2823 int ofs = 0;
2978 int extra = 0; 2824 int extra = 0;
2979 2825
2980 int col = selection.beg.col; 2826 int col = selection.beg.col;
… …
2986 { 2832 {
2987#if !ENABLE_MINIMAL 2833#if !ENABLE_MINIMAL
2988 if (selection.rect) 2834 if (selection.rect)
2989 { 2835 {
2990 col = selection.beg.col; 2836 col = selection.beg.col;
2991 end_col = ncol + 1; 2837 end_col = selection.end.col;
2992 } 2838 }
2993 else 2839 else
2994#endif 2840#endif
2995 end_col = ROW(row).l; 2841 end_col = ROW(row).l;
2996 2842
2997 col = max (col, 0); 2843 col = max (col, 0);
2998 2844
2999 if (row == selection.end.row 2845 if (row == selection.end.row)
3000#if !ENABLE_MINIMAL
3001 || selection.rect
3002#endif
3003 )
3004 min_it (end_col, selection.end.col); 2846 min_it (end_col, selection.end.col);
3005 2847
3006 t = ROW(row).t + col; 2848 t = ROW(row).t + col;
3007 2849
3008 for (; col < end_col; col++) 2850 for (; col < end_col; col++)
… …
3016 2858
3017 extra -= (len - 1); 2859 extra -= (len - 1);
3018 2860
3019 if (extra < 0) 2861 if (extra < 0)
3020 { 2862 {
3021 extra += i; 2863 extra += size;
3022 i += i; 2864 size += size;
3023 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2865 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3024 } 2866 }
3025 2867
3026 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2868 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3027 } 2869 }
3028#endif 2870#endif
… …
3040 2882
3041 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
3042 } 2884 }
3043 else 2885 else
3044#endif 2886#endif
3045 if (!ROW(row).is_longer () && row != selection.end.row) 2887 if (!ROW(row).is_longer ()
2888 && (row != selection.end.row || end_col != selection.end.col)
2889 && (row != selection.beg.row || selection.beg.col < ncol))
3046 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3047 } 2891 }
3048
3049 if (end_col != selection.end.col)
3050 new_selection_text[ofs++] = C0_LF;
3051 2892
3052 new_selection_text[ofs] = 0; 2893 new_selection_text[ofs] = 0;
3053 2894
3054 if (ofs == 0) 2895 if (ofs == 0)
3055 { 2896 {
… …
3068 2909
3069 selection_grab (tm); 2910 selection_grab (tm);
3070} 2911}
3071 2912
3072bool 2913bool
3073rxvt_term::selection_grab (Time tm) NOTHROW 2914rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3074{ 2915{
2916 Atom sel;
2917
2918 if (!clipboard)
2919 {
3075 selection_time = tm; 2920 selection_time = tm;
2921 sel = XA_PRIMARY;
2922 }
2923 else
2924 {
2925 clipboard_time = tm;
2926 sel = xa[XA_CLIPBOARD];
2927 }
3076 2928
3077 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2929 XSetSelectionOwner (dpy, sel, vt, tm);
3078 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2930 if (XGetSelectionOwner (dpy, sel) == vt)
3079 { 2931 {
3080 display->set_selection_owner (this); 2932 display->set_selection_owner (this, clipboard);
3081 return true; 2933 return true;
3082 } 2934 }
3083 else 2935 else
3084 { 2936 {
3085 selection_clear (); 2937 selection_clear (clipboard);
3086 return false; 2938 return false;
3087 } 2939 }
3088 2940
3089#if 0 2941#if 0
3090 XTextProperty ct; 2942 XTextProperty ct;
… …
3550 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3551 */ 3403 */
3552void 3404void
3553rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3554{ 3406{
3407 Atom property = rq.property == None ? rq.target : rq.property;
3555 XSelectionEvent ev; 3408 XSelectionEvent ev;
3556 3409
3557 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
3558 ev.property = None; 3411 ev.property = None;
3559 ev.display = rq.display; 3412 ev.display = rq.display;
… …
3574 *target++ = xa[XA_COMPOUND_TEXT]; 3427 *target++ = xa[XA_COMPOUND_TEXT];
3575#if X_HAVE_UTF8_STRING 3428#if X_HAVE_UTF8_STRING
3576 *target++ = xa[XA_UTF8_STRING]; 3429 *target++ = xa[XA_UTF8_STRING];
3577#endif 3430#endif
3578 3431
3579 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3432 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3580 32, PropModeReplace, 3433 32, PropModeReplace,
3581 (unsigned char *)target_list, target - target_list); 3434 (unsigned char *)target_list, target - target_list);
3582 ev.property = rq.property; 3435 ev.property = property;
3583 } 3436 }
3584#if TODO // TODO 3437#if TODO // TODO
3585 else if (rq.target == xa[XA_MULTIPLE]) 3438 else if (rq.target == xa[XA_MULTIPLE])
3586 { 3439 {
3587 /* TODO: Handle MULTIPLE */ 3440 /* TODO: Handle MULTIPLE */
3588 } 3441 }
3589#endif 3442#endif
3590 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3591 { 3444 {
3592 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3593 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3446 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3594 ev.property = rq.property; 3447 ev.property = property;
3448 }
3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3450 {
3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3452 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3453 ev.property = property;
3595 } 3454 }
3596 else if (rq.target == XA_STRING 3455 else if (rq.target == XA_STRING
3597 || rq.target == xa[XA_TEXT] 3456 || rq.target == xa[XA_TEXT]
3598 || rq.target == xa[XA_COMPOUND_TEXT] 3457 || rq.target == xa[XA_COMPOUND_TEXT]
3599 || rq.target == xa[XA_UTF8_STRING] 3458 || rq.target == xa[XA_UTF8_STRING]
… …
3631 { 3490 {
3632 target = xa[XA_COMPOUND_TEXT]; 3491 target = xa[XA_COMPOUND_TEXT];
3633 style = enc_compound_text; 3492 style = enc_compound_text;
3634 } 3493 }
3635 3494
3636 if (selection.text) 3495 if (rq.selection == XA_PRIMARY && selection.text)
3637 { 3496 {
3638 cl = selection.text; 3497 cl = selection.text;
3639 selectlen = selection.len; 3498 selectlen = selection.len;
3499 }
3500 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3501 {
3502 cl = selection.clip_text;
3503 selectlen = selection.clip_len;
3640 } 3504 }
3641 else 3505 else
3642 { 3506 {
3643 cl = L""; 3507 cl = L"";
3644 selectlen = 0; 3508 selectlen = 0;
… …
3665 ct.value = (unsigned char *)cl; 3529 ct.value = (unsigned char *)cl;
3666 ct.nitems = selectlen; 3530 ct.nitems = selectlen;
3667 ct.encoding = target; 3531 ct.encoding = target;
3668 } 3532 }
3669 3533
3670 XChangeProperty (dpy, rq.requestor, rq.property, 3534 XChangeProperty (dpy, rq.requestor, property,
3671 ct.encoding, 8, PropModeReplace, 3535 ct.encoding, 8, PropModeReplace,
3672 ct.value, (int)ct.nitems); 3536 ct.value, (int)ct.nitems);
3673 ev.property = rq.property; 3537 ev.property = property;
3674 3538
3675 if (freect) 3539 if (freect)
3676 XFree (ct.value); 3540 XFree (ct.value);
3677 } 3541 }
3678 3542
… …
3712 h += 2; min_it (h, nrow); 3576 h += 2; min_it (h, nrow);
3713 3577
3714 x -= 1; clamp_it (x, 0, ncol - w); 3578 x -= 1; clamp_it (x, 0, ncol - w);
3715 y -= 1; clamp_it (y, 0, nrow - h); 3579 y -= 1; clamp_it (y, 0, nrow - h);
3716 3580
3717 ov_x = x; ov_y = y; 3581 ov.x = x; ov.y = y;
3718 ov_w = w; ov_h = h; 3582 ov.w = w; ov.h = h;
3719 3583
3720 ov_text = new text_t *[h]; 3584 ov.text = new text_t *[h];
3721 ov_rend = new rend_t *[h]; 3585 ov.rend = new rend_t *[h];
3722 3586
3723 for (y = 0; y < h; y++) 3587 for (y = 0; y < h; y++)
3724 { 3588 {
3725 text_t *tp = ov_text[y] = new text_t[w]; 3589 text_t *tp = ov.text[y] = new text_t[w];
3726 rend_t *rp = ov_rend[y] = new rend_t[w]; 3590 rend_t *rp = ov.rend[y] = new rend_t[w];
3727 3591
3728 text_t t0, t1, t2; 3592 text_t t0, t1, t2;
3729 rend_t r = OVERLAY_RSTYLE; 3593 rend_t r = OVERLAY_RSTYLE;
3730 3594
3731 if (y == 0) 3595 if (y == 0)
… …
3750} 3614}
3751 3615
3752void 3616void
3753rxvt_term::scr_overlay_off () NOTHROW 3617rxvt_term::scr_overlay_off () NOTHROW
3754{ 3618{
3755 if (!ov_text) 3619 if (!ov.text)
3756 return; 3620 return;
3757 3621
3758 want_refresh = 1; 3622 want_refresh = 1;
3759 3623
3760 for (int y = 0; y < ov_h; y++) 3624 for (int y = 0; y < ov.h; y++)
3761 { 3625 {
3762 delete [] ov_text[y]; 3626 delete [] ov.text[y];
3763 delete [] ov_rend[y]; 3627 delete [] ov.rend[y];
3764 } 3628 }
3765 3629
3766 delete [] ov_text; ov_text = 0; 3630 delete [] ov.text; ov.text = 0;
3767 delete [] ov_rend; ov_rend = 0; 3631 delete [] ov.rend; ov.rend = 0;
3768} 3632}
3769 3633
3770void 3634void
3771rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3772{ 3636{
3773 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3637 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3774 return; 3638 return;
3775 3639
3776 x++, y++; 3640 x++, y++;
3777 3641
3778 ov_text[y][x] = text; 3642 ov.text[y][x] = text;
3779 ov_rend[y][x] = rend; 3643 ov.rend[y][x] = rend;
3780} 3644}
3781 3645
3782void 3646void
3783rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3647rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3784{ 3648{
… …
3803} 3667}
3804 3668
3805void 3669void
3806rxvt_term::scr_swap_overlay () NOTHROW 3670rxvt_term::scr_swap_overlay () NOTHROW
3807{ 3671{
3808 if (!ov_text) 3672 if (!ov.text)
3809 return; 3673 return;
3810 3674
3675 // hide cursor if it is within the overlay area
3676 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3677 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3678 screen.flags &= ~Screen_VisibleCursor;
3679
3811 // swap screen mem with overlay 3680 // swap screen mem with overlay
3812 for (int y = ov_h; y--; ) 3681 for (int y = ov.h; y--; )
3813 { 3682 {
3814 text_t *t1 = ov_text[y]; 3683 text_t *t1 = ov.text[y];
3815 rend_t *r1 = ov_rend[y]; 3684 rend_t *r1 = ov.rend[y];
3816 3685
3817 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3686 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3818 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3687 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3819 3688
3820 for (int x = ov_w; x--; ) 3689 for (int x = ov.w; x--; )
3821 { 3690 {
3822 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3691 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3823 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3692 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3824 } 3693 }
3825 } 3694 }

Diff Legend

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