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.378 by sf-exg, Thu Mar 24 23:55:31 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found begin, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 154 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 164 view_start = 0;
169 num_scr = 0; 165 num_scr = 0;
170 166
171 if (ncol == 0) 167 if (ncol == 0)
172 ncol = 80; 168 ncol = 80;
… …
174 if (nrow == 0) 170 if (nrow == 0)
175 nrow = 24; 171 nrow = 24;
176 172
177 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 174 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 175
183 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
185 { 178 {
186 //TODO//FIXME 179 //TODO//FIXME
… …
239 selection.text = NULL; 232 selection.text = NULL;
240 selection.len = 0; 233 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
243 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
244 } 239 }
245 else 240 else
246 { 241 {
247 /* 242 /*
248 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 281
287 if (top_row) 282 if (top_row)
288 { 283 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
291 287
292 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 290
295 do 291 do
296 { 292 {
297 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 295 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 297
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 299 {
… …
399 delete old_ta; 393 delete old_ta;
400 delete old_ra; 394 delete old_ra;
401 395
402 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
404 399
405 free (tabs); 400 free (tabs);
406 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
411 prev_ncol = ncol; 409 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 410
421 tt_winch (); 411 tt_winch ();
422 412
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 414}
… …
436 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
437 427
438 free (row_buf); 428 free (row_buf);
439 free (swap_buf); 429 free (swap_buf);
440 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
441 free (tabs); 433 free (tabs);
442 434 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 435 }
445} 436}
446 437
447/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
448/* 439/*
449 * Hard reset 440 * Hard/Soft reset
450 */ 441 */
451void 442void
452rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
453{ 444{
454 scr_release (); 445 scr_release ();
455 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
456 scr_reset (); 449 scr_reset ();
457 450
458 scr_clear (true); 451 scr_clear (true);
459 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
460} 469}
461 470
462/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
502 } 511 }
503 512
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
510#endif
511} 518}
512 519
513void 520void
514rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
515{ 522{
… …
540 want_refresh = 1; 547 want_refresh = 1;
541 view_start = 0; 548 view_start = 0;
542 549
543 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
544 551
545 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
546 553
547#if NSCREENS 554#if NSCREENS
548 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
549 { 556 {
550 num_scr = 0; 557 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
777 } 784 }
778 } 785 }
779 786
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 790 int row = screen.cur.row;
786 791
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 793
789 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
893# else 898# else
894 c = 0xfffd; 899 c = 0xfffd;
895# endif 900# endif
896#endif 901#endif
897 902
898 // nuke the character at this position, if required
899 if (expect_false (
900 line->t[screen.cur.col] == NOCHAR
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 904
908 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 907 {
911 // ...output spaces 908 if (screen.flags & Screen_Autowrap)
912 c = ' '; 909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
913 // and try the same character next loop iteration 912 // and try the same character next loop iteration
914 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
915 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
916 925
917 line->touch (); 926 line->touch ();
918 927
919 do 928 do
920 { 929 {
… …
926 else 935 else
927 { 936 {
928 line->l = ncol; 937 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
931 break; 940
941 goto end_of_line;
932 } 942 }
933 943
934 c = NOCHAR; 944 c = NOCHAR;
935 } 945 }
936 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
937 947
938 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 950 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 951 line->t[c] = ' ';
946 line->r[c] = rend; 952 line->r[c] = rend;
947 }
948 } 953 }
954
955end_of_line:
956 ;
949 } 957 }
950#if ENABLE_COMBINING 958#if ENABLE_COMBINING
951 else // width == 0 959 else // width == 0
952 { 960 {
953 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
993#endif 1001#endif
994 } 1002 }
995 1003
996 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
997 1005
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1000#endif
1001} 1007}
1002 1008
1003/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1004/* 1010/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1024
1019 want_refresh = 1; 1025 want_refresh = 1;
1020#endif 1026#endif
1021 } 1027 }
1022 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1023 else 1031 else
1024 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1025} 1033}
1026 1034
1027/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1349 {
1343 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1344 1351
1345 if (mapped) 1352 if (mapped)
1346 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1349 } 1356 }
1350 else 1357 else
1351 { 1358 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1360
1361 if (mapped)
1362 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1366 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1367 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1368 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1362 } 1372 }
1363 1373
1364 for (; num--; row++) 1374 for (; num--; row++)
1365 { 1375 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1380 }
1369} 1381}
1370 1382
1371#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1372void 1384void
… …
1446 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1447 */ 1459 */
1448void 1460void
1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1450{ 1462{
1451 int col, row;
1452 rend_t tr;
1453
1454 want_refresh = 1; 1463 want_refresh = 1;
1455 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1456 1465
1457 if (count <= 0) 1466 if (count <= 0)
1458 return; 1467 return;
… …
1460 scr_do_wrap (); 1469 scr_do_wrap ();
1461 1470
1462 selection_check (1); 1471 selection_check (1);
1463 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1464 1473
1465 row = screen.cur.row; 1474 int row = screen.cur.row;
1466 1475
1467 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1468 1477
1469 line->touch (); 1478 line->touch ();
1470 line->is_longer (0); 1479 line->is_longer (0);
1471 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1472 switch (insdel) 1485 switch (insdel)
1473 { 1486 {
1474 case INSERT: 1487 case INSERT:
1475 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1488 line->l = min (line->l + count, ncol);
1489
1490 if (line->t[screen.cur.col] == NOCHAR)
1491 scr_kill_char (*line, screen.cur.col);
1492
1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1476 { 1494 {
1477 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1478 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1479 } 1497 }
1480
1481 line->l = min (line->l + count, ncol);
1482 1498
1483 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1484 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1485 { 1501 {
1486 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
… …
1501 case ERASE: 1517 case ERASE:
1502 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1503 selection_check (1); 1519 selection_check (1);
1504 screen.cur.col -= count; 1520 screen.cur.col -= count;
1505 1521
1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
1506 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1507 break; 1527 break;
1508 1528
1509 case DELETE: 1529 case DELETE:
1510 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1511 1531
1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1535
1512 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1537 {
1514 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1516 } 1540 }
1517 1541
1518 line->l = max (line->l - count, 0);
1519 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1520 1543
1521 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1523 { 1546 {
1524 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1660 { 1683 {
1661 rvideo_state = on; 1684 rvideo_state = on;
1662 1685
1663 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1664#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1665 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1666#endif 1689#endif
1667 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1668 1691
1669 XGCValues gcvalue; 1692 XGCValues gcvalue;
1670 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1814 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1815 { 1838 {
1816 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1817 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1818 } 1841 }
1819// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1820 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1821 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1822 1845
1823 num_scr_allow = 0; 1846 num_scr_allow = 0;
1824 1847
… …
1915 1938
1916 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1917 } 1940 }
1918 else 1941 else
1919 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1944#endif
1921} 1945}
1922 1946
1923/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1948/* ARGSUSED */
… …
1943 row_start = view_start; 1967 row_start = view_start;
1944 } 1968 }
1945 1969
1946 wctomb (0, 0); 1970 wctomb (0, 0);
1947 1971
1948 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1973 {
1950 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1952 1976
1953 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2007 */
1984void 2008void
1985rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1986{ 2010{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2013 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2004 /* 2026 /*
2005 * A: set up vars 2027 * A: set up vars
2006 */ 2028 */
2007 refresh_count = 0; 2029 refresh_count = 0;
2008 2030
2031 unsigned int old_screen_flags = screen.flags;
2009 have_bg = 0; 2032 char have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2011 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2012#endif 2035#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2037
2015 /* 2038 /*
2016 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2017 */ 2040 */
2018 scr_reverse_selection (); 2041 scr_reverse_selection ();
2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2019 2049
2020 /* 2050 /*
2021 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2022 */ 2052 */
2023 { 2053 {
2024 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2025 2055
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2057 if (hidden_cursor)
2029 showcursor = 0; 2058 showcursor = 0;
2030#endif 2059#endif
2031 2060
… …
2059 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2060#else 2089#else
2061 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2062#endif 2091#endif
2063 2092
2064 if (showcursor && focus) 2093 if (focus)
2065 { 2094 {
2066 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2068 else 2097 else
2069 { 2098 {
… …
2104 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2105 } 2134 }
2106 } 2135 }
2107 } 2136 }
2108 2137
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 2138#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2139 /*
2116 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2118 */ 2142 */
… …
2210 2234
2211 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2212 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2213 --col; 2237 --col;
2214 2238
2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2216 text_t *text = stp + col; 2240 text_t *text = stp + col;
2217 int count = 1; 2241 int count = 1;
2218 2242
2219 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2220 drp[col] = rend; 2244 drp[col] = rend;
… …
2224 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2225 { 2249 {
2226 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2227 { 2251 {
2228 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2229 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2230 count++; 2255 count++;
2231 i++; 2256 i++;
2232 2257
2233 continue; 2258 continue;
2234 } 2259 }
… …
2264 */ 2289 */
2265 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2266 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2267 2292
2268 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2269 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2270 { 2295 {
2271 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2272 2297
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2293 2318
2294 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2320 fore = Color_UL;
2296#endif 2321#endif
2297 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2298 if (invert) 2343 if (invert)
2299 { 2344 {
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); 2345 ::swap (fore, back);
2307#ifdef OPTION_HC
2308 else if (ISSET_PIXCOLOR (Color_HC))
2309 back = Color_HC;
2310#endif
2311 2346
2312#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#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) 2348 if (fore == back)
2318 { 2349 {
2319 fore = Color_bg; 2350 fore = Color_bg;
2320 back = Color_fg; 2351 back = Color_fg;
2321 } 2352 }
… …
2390 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2391 } 2422 }
2392 } /* for (col....) */ 2423 } /* for (col....) */
2393 } /* for (row....) */ 2424 } /* for (row....) */
2394 2425
2395#if ENABLE_OVERLAY
2396 scr_swap_overlay ();
2397#endif
2398 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2399
2400 /* 2426 /*
2401 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2402 */ 2428 */
2403 if (showcursor) 2429 if (showcursor)
2404 { 2430 {
… …
2442 } 2468 }
2443 2469
2444 /* 2470 /*
2445 * H: cleanup selection 2471 * H: cleanup selection
2446 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2447 scr_reverse_selection (); 2478 scr_reverse_selection ();
2448 2479
2480 screen.flags = old_screen_flags;
2449 num_scr = 0; 2481 num_scr = 0;
2450 num_scr_allow = 1; 2482 num_scr_allow = 1;
2451} 2483}
2452 2484
2453void 2485void
… …
2474 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2475 } 2507 }
2476} 2508}
2477 2509
2478void 2510void
2479rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2480{ 2512{
2513 bool transparent = false;
2514
2481#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2482 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2483#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2484 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2485 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2486 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2487 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2488 2541
2489 if (scrollBar.win) 2542 if (scrollBar.win)
2490 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2491 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2492 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2493 scrollBar.show (0); 2549 scrollBar.show (0);
2494 } 2550 }
2495 2551
2496#endif 2552 if (refresh)
2497 2553 {
2498 /* bgPixmap.apply () does not do the following : */
2499 scr_clear (); 2554 scr_clear ();
2500 scr_touch (true); 2555 scr_touch (true);
2556 }
2501 want_refresh = 1; 2557 want_refresh = 1;
2502} 2558}
2503 2559
2504/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2505void 2561void
… …
2573 { 2629 {
2574#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2575 if (selection.rect) 2631 if (selection.rect)
2576 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2577 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2578 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2579 else 2635 else
2580#endif 2636#endif
2581 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2582 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2583 RS_RVid); 2639 RS_Sel | RS_RVid);
2584 } 2640 }
2585} 2641}
2586 2642
2587/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2588/* 2644/*
… …
2593void 2649void
2594rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2595{ 2651{
2596 int row, wrote; 2652 int row, wrote;
2597 unsigned int width, towrite; 2653 unsigned int width, towrite;
2598 char r1[] = "\n"; 2654 const char r1[] = "\n";
2599 2655
2600 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2601 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2602 { 2658 {
2603 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2649/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2650/* 2706/*
2651 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2652 */ 2708 */
2653void 2709void
2654rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2655{ 2711{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2665 2721
2666 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2667 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2668} 2724}
2669 2725
2670/* ------------------------------------------------------------------------- */
2671/*
2672 * Respond to a notification that a primary selection has been sent
2673 * EXT: SelectionNotify
2674 */
2675void 2726void
2676rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2677{ 2728{
2678 if (prop == None) /* check for failed XConvertSelection */ 2729 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; 2730 return;
2853 2731
2854 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2855} 2733}
2856 2734
2857/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2858/* 2736/*
2859 * Request the current selection: 2737 * Request the current selection:
… …
2865 * EXT: button 2 release 2743 * EXT: button 2 release
2866 */ 2744 */
2867void 2745void
2868rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2869{ 2747{
2870 if (selection.text && selnum == Sel_Primary) 2748 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 } 2749 {
2878 else 2750 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2751 selection_req->run ();
2879 { 2752 }
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} 2753}
2921 2754
2922/* ------------------------------------------------------------------------- */ 2755/* ------------------------------------------------------------------------- */
2923/* 2756/*
2924 * Clear all selected text 2757 * Clear all selected text
2925 * EXT: SelectionClear 2758 * EXT: SelectionClear
2926 */ 2759 */
2927void 2760void
2928rxvt_term::selection_clear () NOTHROW 2761rxvt_term::selection_clear (bool clipboard) NOTHROW
2929{ 2762{
2763 if (!clipboard)
2764 {
2930 want_refresh = 1; 2765 want_refresh = 1;
2931 free (selection.text); 2766 free (selection.text);
2932 selection.text = NULL; 2767 selection.text = NULL;
2933 selection.len = 0; 2768 selection.len = 0;
2934 CLEAR_SELECTION (); 2769 CLEAR_SELECTION ();
2935 2770
2936 if (display->selection_owner == this) 2771 if (display->selection_owner == this)
2937 display->selection_owner = 0; 2772 display->selection_owner = 0;
2773 }
2774 else
2775 {
2776 free (selection.clip_text);
2777 selection.clip_text = NULL;
2778 selection.clip_len = 0;
2779
2780 if (display->clipboard_owner == this)
2781 display->clipboard_owner = 0;
2782 }
2938} 2783}
2939 2784
2940/* ------------------------------------------------------------------------- */ 2785/* ------------------------------------------------------------------------- */
2941/* 2786/*
2942 * Copy a selection into the cut buffer 2787 * Copy a selection into the cut buffer
2943 * EXT: button 1 or 3 release 2788 * EXT: button 1 or 3 release
2944 */ 2789 */
2945void 2790void
2946rxvt_term::selection_make (Time tm) 2791rxvt_term::selection_make (Time tm)
2947{ 2792{
2948 int i; 2793 int size;
2949 wchar_t *new_selection_text; 2794 wchar_t *new_selection_text;
2950 text_t *t; 2795 text_t *t;
2951 2796
2952 switch (selection.op) 2797 switch (selection.op)
2953 { 2798 {
… …
2969 return; /* nothing selected, go away */ 2814 return; /* nothing selected, go away */
2970 2815
2971 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2816 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2972 return; 2817 return;
2973 2818
2974 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2819 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2975 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2820 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2976 2821
2977 int ofs = 0; 2822 int ofs = 0;
2978 int extra = 0; 2823 int extra = 0;
2979 2824
2980 int col = selection.beg.col; 2825 int col = selection.beg.col;
… …
2986 { 2831 {
2987#if !ENABLE_MINIMAL 2832#if !ENABLE_MINIMAL
2988 if (selection.rect) 2833 if (selection.rect)
2989 { 2834 {
2990 col = selection.beg.col; 2835 col = selection.beg.col;
2991 end_col = ncol + 1; 2836 end_col = selection.end.col;
2992 } 2837 }
2993 else 2838 else
2994#endif 2839#endif
2995 end_col = ROW(row).l; 2840 end_col = ROW(row).l;
2996 2841
2997 col = max (col, 0); 2842 col = max (col, 0);
2998 2843
2999 if (row == selection.end.row 2844 if (row == selection.end.row)
3000#if !ENABLE_MINIMAL
3001 || selection.rect
3002#endif
3003 )
3004 min_it (end_col, selection.end.col); 2845 min_it (end_col, selection.end.col);
3005 2846
3006 t = ROW(row).t + col; 2847 t = ROW(row).t + col;
3007 2848
3008 for (; col < end_col; col++) 2849 for (; col < end_col; col++)
… …
3016 2857
3017 extra -= (len - 1); 2858 extra -= (len - 1);
3018 2859
3019 if (extra < 0) 2860 if (extra < 0)
3020 { 2861 {
3021 extra += i; 2862 extra += size;
3022 i += i; 2863 size += size;
3023 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2864 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3024 } 2865 }
3025 2866
3026 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2867 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3027 } 2868 }
3028#endif 2869#endif
… …
3040 2881
3041 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3042 } 2883 }
3043 else 2884 else
3044#endif 2885#endif
3045 if (!ROW(row).is_longer () && row != selection.end.row) 2886 if (!ROW(row).is_longer ()
2887 && (row != selection.end.row || end_col != selection.end.col)
2888 && (row != selection.beg.row || selection.beg.col < ncol))
3046 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3047 } 2890 }
3048
3049 if (end_col != selection.end.col)
3050 new_selection_text[ofs++] = C0_LF;
3051 2891
3052 new_selection_text[ofs] = 0; 2892 new_selection_text[ofs] = 0;
3053 2893
3054 if (ofs == 0) 2894 if (ofs == 0)
3055 { 2895 {
… …
3068 2908
3069 selection_grab (tm); 2909 selection_grab (tm);
3070} 2910}
3071 2911
3072bool 2912bool
3073rxvt_term::selection_grab (Time tm) NOTHROW 2913rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3074{ 2914{
2915 Atom sel;
2916
2917 if (!clipboard)
2918 {
3075 selection_time = tm; 2919 selection_time = tm;
2920 sel = XA_PRIMARY;
2921 }
2922 else
2923 {
2924 clipboard_time = tm;
2925 sel = xa[XA_CLIPBOARD];
2926 }
3076 2927
3077 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2928 XSetSelectionOwner (dpy, sel, vt, tm);
3078 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2929 if (XGetSelectionOwner (dpy, sel) == vt)
3079 { 2930 {
3080 display->set_selection_owner (this); 2931 display->set_selection_owner (this, clipboard);
3081 return true; 2932 return true;
3082 } 2933 }
3083 else 2934 else
3084 { 2935 {
3085 selection_clear (); 2936 selection_clear (clipboard);
3086 return false; 2937 return false;
3087 } 2938 }
3088 2939
3089#if 0 2940#if 0
3090 XTextProperty ct; 2941 XTextProperty ct;
… …
3585 else if (rq.target == xa[XA_MULTIPLE]) 3436 else if (rq.target == xa[XA_MULTIPLE])
3586 { 3437 {
3587 /* TODO: Handle MULTIPLE */ 3438 /* TODO: Handle MULTIPLE */
3588 } 3439 }
3589#endif 3440#endif
3590 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3591 { 3442 {
3592 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3593 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3444 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3445 ev.property = rq.property;
3446 }
3447 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3448 {
3449 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3450 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3594 ev.property = rq.property; 3451 ev.property = rq.property;
3595 } 3452 }
3596 else if (rq.target == XA_STRING 3453 else if (rq.target == XA_STRING
3597 || rq.target == xa[XA_TEXT] 3454 || rq.target == xa[XA_TEXT]
3598 || rq.target == xa[XA_COMPOUND_TEXT] 3455 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3631 { 3488 {
3632 target = xa[XA_COMPOUND_TEXT]; 3489 target = xa[XA_COMPOUND_TEXT];
3633 style = enc_compound_text; 3490 style = enc_compound_text;
3634 } 3491 }
3635 3492
3636 if (selection.text) 3493 if (rq.selection == XA_PRIMARY && selection.text)
3637 { 3494 {
3638 cl = selection.text; 3495 cl = selection.text;
3639 selectlen = selection.len; 3496 selectlen = selection.len;
3497 }
3498 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3499 {
3500 cl = selection.clip_text;
3501 selectlen = selection.clip_len;
3640 } 3502 }
3641 else 3503 else
3642 { 3504 {
3643 cl = L""; 3505 cl = L"";
3644 selectlen = 0; 3506 selectlen = 0;
… …
3712 h += 2; min_it (h, nrow); 3574 h += 2; min_it (h, nrow);
3713 3575
3714 x -= 1; clamp_it (x, 0, ncol - w); 3576 x -= 1; clamp_it (x, 0, ncol - w);
3715 y -= 1; clamp_it (y, 0, nrow - h); 3577 y -= 1; clamp_it (y, 0, nrow - h);
3716 3578
3717 ov_x = x; ov_y = y; 3579 ov.x = x; ov.y = y;
3718 ov_w = w; ov_h = h; 3580 ov.w = w; ov.h = h;
3719 3581
3720 ov_text = new text_t *[h]; 3582 ov.text = new text_t *[h];
3721 ov_rend = new rend_t *[h]; 3583 ov.rend = new rend_t *[h];
3722 3584
3723 for (y = 0; y < h; y++) 3585 for (y = 0; y < h; y++)
3724 { 3586 {
3725 text_t *tp = ov_text[y] = new text_t[w]; 3587 text_t *tp = ov.text[y] = new text_t[w];
3726 rend_t *rp = ov_rend[y] = new rend_t[w]; 3588 rend_t *rp = ov.rend[y] = new rend_t[w];
3727 3589
3728 text_t t0, t1, t2; 3590 text_t t0, t1, t2;
3729 rend_t r = OVERLAY_RSTYLE; 3591 rend_t r = OVERLAY_RSTYLE;
3730 3592
3731 if (y == 0) 3593 if (y == 0)
… …
3750} 3612}
3751 3613
3752void 3614void
3753rxvt_term::scr_overlay_off () NOTHROW 3615rxvt_term::scr_overlay_off () NOTHROW
3754{ 3616{
3755 if (!ov_text) 3617 if (!ov.text)
3756 return; 3618 return;
3757 3619
3758 want_refresh = 1; 3620 want_refresh = 1;
3759 3621
3760 for (int y = 0; y < ov_h; y++) 3622 for (int y = 0; y < ov.h; y++)
3761 { 3623 {
3762 delete [] ov_text[y]; 3624 delete [] ov.text[y];
3763 delete [] ov_rend[y]; 3625 delete [] ov.rend[y];
3764 } 3626 }
3765 3627
3766 delete [] ov_text; ov_text = 0; 3628 delete [] ov.text; ov.text = 0;
3767 delete [] ov_rend; ov_rend = 0; 3629 delete [] ov.rend; ov.rend = 0;
3768} 3630}
3769 3631
3770void 3632void
3771rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3633rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3772{ 3634{
3773 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3635 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3774 return; 3636 return;
3775 3637
3776 x++, y++; 3638 x++, y++;
3777 3639
3778 ov_text[y][x] = text; 3640 ov.text[y][x] = text;
3779 ov_rend[y][x] = rend; 3641 ov.rend[y][x] = rend;
3780} 3642}
3781 3643
3782void 3644void
3783rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3645rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3784{ 3646{
… …
3803} 3665}
3804 3666
3805void 3667void
3806rxvt_term::scr_swap_overlay () NOTHROW 3668rxvt_term::scr_swap_overlay () NOTHROW
3807{ 3669{
3808 if (!ov_text) 3670 if (!ov.text)
3809 return; 3671 return;
3810 3672
3673 // hide cursor if it is within the overlay area
3674 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3675 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3676 screen.flags &= ~Screen_VisibleCursor;
3677
3811 // swap screen mem with overlay 3678 // swap screen mem with overlay
3812 for (int y = ov_h; y--; ) 3679 for (int y = ov.h; y--; )
3813 { 3680 {
3814 text_t *t1 = ov_text[y]; 3681 text_t *t1 = ov.text[y];
3815 rend_t *r1 = ov_rend[y]; 3682 rend_t *r1 = ov.rend[y];
3816 3683
3817 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3684 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3818 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3685 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3819 3686
3820 for (int x = ov_w; x--; ) 3687 for (int x = ov.w; x--; )
3821 { 3688 {
3822 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3689 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3823 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3690 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3824 } 3691 }
3825 } 3692 }

Diff Legend

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