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.310 by root, Wed Jul 23 17:10:07 2008 UTC vs.
Revision 1.377 by root, Mon Mar 21 13:46:17 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 * ------------------------------------------------------------------------- */
… …
132 131
133 l.l = 0; 132 l.l = 0;
134 l.f = 0; 133 l.f = 0;
135} 134}
136 135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
137/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
140 160
141void 161void
142rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
143{ 163{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 164 view_start = 0;
150 num_scr = 0; 165 num_scr = 0;
151 166
152 if (ncol == 0) 167 if (ncol == 0)
153 ncol = 80; 168 ncol = 80;
… …
155 if (nrow == 0) 170 if (nrow == 0)
156 nrow = 24; 171 nrow = 24;
157 172
158 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 174 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 175
164 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
166 { 178 {
167 //TODO//FIXME 179 //TODO//FIXME
… …
220 selection.text = NULL; 232 selection.text = NULL;
221 selection.len = 0; 233 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
224 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
225 } 239 }
226 else 240 else
227 { 241 {
228 /* 242 /*
229 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
267 281
268 if (top_row) 282 if (top_row)
269 { 283 {
270 // 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
271 // 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
272 287
273 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 290
276 do 291 do
277 { 292 {
278 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 295 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 297
285 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 ())
286 { 299 {
… …
380 delete old_ta; 393 delete old_ta;
381 delete old_ra; 394 delete old_ra;
382 395
383 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
385 399
386 free (tabs); 400 free (tabs);
387 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
388 405
389 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
390 407
391 prev_nrow = nrow; 408 prev_nrow = nrow;
392 prev_ncol = ncol; 409 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 410
402 tt_winch (); 411 tt_winch ();
403 412
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 414}
… …
417 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
418 427
419 free (row_buf); 428 free (row_buf);
420 free (swap_buf); 429 free (swap_buf);
421 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
422 free (tabs); 433 free (tabs);
423 434 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 435 }
426} 436}
427 437
428/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
429/* 439/*
430 * Hard reset 440 * Hard/Soft reset
431 */ 441 */
432void 442void
433rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
434{ 444{
435 scr_release (); 445 scr_release ();
436 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
437 scr_reset (); 449 scr_reset ();
438 450
439 scr_clear (true); 451 scr_clear (true);
440 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);
441} 469}
442 470
443/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
483 } 511 }
484 512
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
491#endif
492} 518}
493 519
494void 520void
495rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
496{ 522{
… …
521 want_refresh = 1; 547 want_refresh = 1;
522 view_start = 0; 548 view_start = 0;
523 549
524 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
525 551
526 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
527 553
528#if NSCREENS 554#if NSCREENS
529 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
530 { 556 {
531 num_scr = 0; 557 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
758 } 784 }
759 } 785 }
760 786
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 790 int row = screen.cur.row;
767 791
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 793
770 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
874# else 898# else
875 c = 0xfffd; 899 c = 0xfffd;
876# endif 900# endif
877#endif 901#endif
878 902
879 // nuke the character at this position, if required
880 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR)
884 ))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 904
904 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 907 {
907 // ...output spaces 908 if (screen.flags & Screen_Autowrap)
908 c = ' '; 909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
909 // and try the same character next loop iteration 912 // and try the same character next loop iteration
910 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
911 } 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);
912 925
913 line->touch (); 926 line->touch ();
914 927
915 do 928 do
916 { 929 {
… …
922 else 935 else
923 { 936 {
924 line->l = ncol; 937 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
927 break; 940
941 goto end_of_line;
928 } 942 }
929 943
930 c = NOCHAR; 944 c = NOCHAR;
931 } 945 }
932 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
933 947
934 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
936 { 950 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 951 line->t[c] = ' ';
942 line->r[c] = rend; 952 line->r[c] = rend;
943 }
944 } 953 }
954
955end_of_line:
956 ;
945 } 957 }
946#if ENABLE_COMBINING 958#if ENABLE_COMBINING
947 else // width == 0 959 else // width == 0
948 { 960 {
949 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
989#endif 1001#endif
990 } 1002 }
991 1003
992 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
993 1005
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
996#endif
997} 1007}
998 1008
999/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1000/* 1010/*
1001 * 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
… …
1014 1024
1015 want_refresh = 1; 1025 want_refresh = 1;
1016#endif 1026#endif
1017 } 1027 }
1018 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1019 else 1031 else
1020 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1021} 1033}
1022 1034
1023/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1330 return; 1342 return;
1331 1343
1332 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1333 1345
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1349 {
1339 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1340 1351
1341 if (mapped) 1352 if (mapped)
1342 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1345 } 1356 }
1346 else 1357 else
1347 { 1358 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1360
1361 if (mapped)
1362 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1366 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1367 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1368 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1358 } 1372 }
1359 1373
1360 for (; num--; row++) 1374 for (; num--; row++)
1361 { 1375 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1380 }
1365} 1381}
1366 1382
1367#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1368void 1384void
… …
1442 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1443 */ 1459 */
1444void 1460void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1462{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1463 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1452 1465
1453 if (count <= 0) 1466 if (count <= 0)
1454 return; 1467 return;
… …
1456 scr_do_wrap (); 1469 scr_do_wrap ();
1457 1470
1458 selection_check (1); 1471 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1472 min_it (count, ncol - screen.cur.col);
1460 1473
1461 row = screen.cur.row; 1474 int row = screen.cur.row;
1462 1475
1463 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1464 1477
1465 line->touch (); 1478 line->touch ();
1466 line->is_longer (0); 1479 line->is_longer (0);
1467 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1468 switch (insdel) 1485 switch (insdel)
1469 { 1486 {
1470 case INSERT: 1487 case INSERT:
1471 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--)
1472 { 1494 {
1473 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
1475 } 1497 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1498
1479 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1501 {
1482 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1517 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1519 selection_check (1);
1500 screen.cur.col -= count; 1520 screen.cur.col -= count;
1501 1521
1502 line->l = max (line->l - count, 0); 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
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1527 break;
1505 1528
1506 case DELETE: 1529 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1530 line->l = max (line->l - count, 0);
1508 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
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1537 {
1511 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1513 } 1540 }
1514 1541
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1543
1518 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1546 {
1521 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
… …
1657 { 1683 {
1658 rvideo_state = on; 1684 rvideo_state = on;
1659 1685
1660 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1661#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1662 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1663#endif 1689#endif
1664 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1665 1691
1666 XGCValues gcvalue; 1692 XGCValues gcvalue;
1667 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1838 {
1813 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1815 } 1841 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1817 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++)
1818 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);
1819 1845
1820 num_scr_allow = 0; 1846 num_scr_allow = 0;
1821 1847
… …
1899 XMapWindow (dpy, parent[0]); 1925 XMapWindow (dpy, parent[0]);
1900# endif 1926# endif
1901 1927
1902# if ENABLE_FRILLS 1928# if ENABLE_FRILLS
1903 if (option (Opt_urgentOnBell)) 1929 if (option (Opt_urgentOnBell))
1904 { 1930 set_urgency (1);
1905 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1906 {
1907 h->flags |= XUrgencyHint;
1908 XSetWMHints (dpy, parent[0], h);
1909 }
1910 }
1911# endif 1931# endif
1912 1932
1913 if (option (Opt_visualBell)) 1933 if (option (Opt_visualBell))
1914 { 1934 {
1915 rvideo_bell = true; 1935 rvideo_bell = true;
… …
1918 1938
1919 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1920 } 1940 }
1921 else 1941 else
1922 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1923#endif 1944#endif
1924} 1945}
1925 1946
1926/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1927/* ARGSUSED */ 1948/* ARGSUSED */
… …
1946 row_start = view_start; 1967 row_start = view_start;
1947 } 1968 }
1948 1969
1949 wctomb (0, 0); 1970 wctomb (0, 0);
1950 1971
1951 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1952 { 1973 {
1953 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1954 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1955 1976
1956 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
… …
1985 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1986 */ 2007 */
1987void 2008void
1988rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1989{ 2010{
1990 unsigned char have_bg,
1991 showcursor; /* show the cursor */
1992 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1993 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1994 int i; /* tmp */ 2013 int i; /* tmp */
1995#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1996 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2007 /* 2026 /*
2008 * A: set up vars 2027 * A: set up vars
2009 */ 2028 */
2010 refresh_count = 0; 2029 refresh_count = 0;
2011 2030
2031 unsigned int old_screen_flags = screen.flags;
2012 have_bg = 0; 2032 char have_bg = 0;
2013#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2014 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2015#endif 2035#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2037
2018 /* 2038 /*
2019 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2020 */ 2040 */
2021 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;
2022 2049
2023 /* 2050 /*
2024 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2025 */ 2052 */
2026 { 2053 {
2027 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2028 2055
2029 showcursor = (screen.flags & Screen_VisibleCursor);
2030#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2031 if (hidden_cursor) 2057 if (hidden_cursor)
2032 showcursor = 0; 2058 showcursor = 0;
2033#endif 2059#endif
2034 2060
… …
2062 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2063#else 2089#else
2064 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2065#endif 2091#endif
2066 2092
2067 if (showcursor && focus) 2093 if (focus)
2068 { 2094 {
2069 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2070 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2071 else 2097 else
2072 { 2098 {
… …
2107 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2108 } 2134 }
2109 } 2135 }
2110 } 2136 }
2111 2137
2112 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2113#if ENABLE_OVERLAY
2114 scr_swap_overlay ();
2115#endif
2116
2117#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2118 /* 2139 /*
2119 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2120 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2121 */ 2142 */
… …
2213 2234
2214 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2215 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2216 --col; 2237 --col;
2217 2238
2218 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2219 text_t *text = stp + col; 2240 text_t *text = stp + col;
2220 int count = 1; 2241 int count = 1;
2221 2242
2222 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2223 drp[col] = rend; 2244 drp[col] = rend;
… …
2227 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2228 { 2249 {
2229 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2230 { 2251 {
2231 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2232 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2233 count++; 2255 count++;
2234 i++; 2256 i++;
2235 2257
2236 continue; 2258 continue;
2237 } 2259 }
… …
2267 */ 2289 */
2268 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2269 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2270 2292
2271 // 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
2272 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)))
2273 { 2295 {
2274 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2275 2297
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2296 2318
2297 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2298 fore = Color_UL; 2320 fore = Color_UL;
2299#endif 2321#endif
2300 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
2301 if (invert) 2343 if (invert)
2302 { 2344 {
2303#ifdef OPTION_HC
2304 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2305 || !ISSET_PIXCOLOR (Color_HC))
2306#endif
2307 /* invert the column if no highlightColor is set or it is the
2308 * current cursor column */
2309 ::swap (fore, back); 2345 ::swap (fore, back);
2310#ifdef OPTION_HC
2311 else if (ISSET_PIXCOLOR (Color_HC))
2312 back = Color_HC;
2313#endif
2314 2346
2315#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2316# ifndef OPTION_HC
2317 if (ISSET_PIXCOLOR (Color_RV))
2318 back = Color_RV;
2319# endif
2320 if (fore == back) 2348 if (fore == back)
2321 { 2349 {
2322 fore = Color_bg; 2350 fore = Color_bg;
2323 back = Color_fg; 2351 back = Color_fg;
2324 } 2352 }
… …
2393 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2394 } 2422 }
2395 } /* for (col....) */ 2423 } /* for (col....) */
2396 } /* for (row....) */ 2424 } /* for (row....) */
2397 2425
2398#if ENABLE_OVERLAY
2399 scr_swap_overlay ();
2400#endif
2401 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2402
2403 /* 2426 /*
2404 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2405 */ 2428 */
2406 if (showcursor) 2429 if (showcursor)
2407 { 2430 {
… …
2445 } 2468 }
2446 2469
2447 /* 2470 /*
2448 * H: cleanup selection 2471 * H: cleanup selection
2449 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2450 scr_reverse_selection (); 2478 scr_reverse_selection ();
2451 2479
2480 screen.flags = old_screen_flags;
2452 num_scr = 0; 2481 num_scr = 0;
2453 num_scr_allow = 1; 2482 num_scr_allow = 1;
2454} 2483}
2455 2484
2456void 2485void
… …
2477 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2478 } 2507 }
2479} 2508}
2480 2509
2481void 2510void
2482rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2483{ 2512{
2513 bool transparent = false;
2514
2484#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2485 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2486#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);
2487 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 {
2488 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
2489 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2490 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2491 2541
2492 if (scrollBar.win) 2542 if (scrollBar.win)
2493 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2494 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2495 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2496 scrollBar.show (0); 2549 scrollBar.show (0);
2497 } 2550 }
2498 2551
2499#endif 2552 if (refresh)
2500 2553 {
2501 /* bgPixmap.apply () does not do the following : */
2502 scr_clear (); 2554 scr_clear ();
2503 scr_touch (true); 2555 scr_touch (true);
2556 }
2504 want_refresh = 1; 2557 want_refresh = 1;
2505} 2558}
2506 2559
2507/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2508void 2561void
… …
2576 { 2629 {
2577#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2578 if (selection.rect) 2631 if (selection.rect)
2579 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2580 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2581 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2582 else 2635 else
2583#endif 2636#endif
2584 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2585 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2586 RS_RVid); 2639 RS_Sel | RS_RVid);
2587 } 2640 }
2588} 2641}
2589 2642
2590/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2591/* 2644/*
… …
2596void 2649void
2597rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2598{ 2651{
2599 int row, wrote; 2652 int row, wrote;
2600 unsigned int width, towrite; 2653 unsigned int width, towrite;
2601 char r1[] = "\n"; 2654 const char r1[] = "\n";
2602 2655
2603 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2604 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2605 { 2658 {
2606 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2652/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2653/* 2706/*
2654 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2655 */ 2708 */
2656void 2709void
2657rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2658{ 2711{
2659 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2660 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2661 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2662 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2668 2721
2669 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2670 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2671} 2724}
2672 2725
2673/* ------------------------------------------------------------------------- */
2674/*
2675 * Respond to a notification that a primary selection has been sent
2676 * EXT: SelectionNotify
2677 */
2678void 2726void
2679rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2680{ 2728{
2681 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2682 {
2683 if ((selection_type & Sel_CompoundText))
2684 {
2685 int selnum = selection_type & Sel_whereMask;
2686
2687 selection_type = 0;
2688 if (selnum != Sel_direct)
2689 selection_request_other (XA_STRING, selnum);
2690 }
2691
2692 if ((selection_type & Sel_UTF8String))
2693 {
2694 int selnum = selection_type & Sel_whereMask;
2695
2696 selection_type = Sel_CompoundText;
2697 if (selnum != Sel_direct)
2698 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2699 else
2700 selection_type = 0;
2701 }
2702
2703 return;
2704 }
2705
2706 unsigned long bytes_after;
2707 XTextProperty ct;
2708
2709 if (XGetWindowProperty (dpy, win, prop,
2710 0, PROP_SIZE / 4,
2711 delete_prop, AnyPropertyType,
2712 &ct.encoding, &ct.format,
2713 &ct.nitems, &bytes_after,
2714 &ct.value) != Success)
2715 {
2716 ct.value = 0;
2717 goto bailout;
2718 }
2719
2720 if (ct.encoding == None)
2721 goto bailout;
2722
2723 if (bytes_after)
2724 {
2725 // fetch and append remaining data
2726 XTextProperty ct2;
2727
2728 if (XGetWindowProperty (dpy, win, prop,
2729 ct.nitems / 4, (bytes_after + 3) / 4,
2730 delete_prop, AnyPropertyType,
2731 &ct2.encoding, &ct2.format,
2732 &ct2.nitems, &bytes_after,
2733 &ct2.value) != Success)
2734 goto bailout;
2735
2736 // realloc should be compatible to XFree, here, and elsewhere, too
2737 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2738 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2739 ct.nitems += ct2.nitems;
2740
2741 XFree (ct2.value);
2742 }
2743
2744 if (ct.value == 0)
2745 goto bailout;
2746
2747 if (ct.encoding == xa[XA_INCR])
2748 {
2749 // INCR selection, start handshake
2750 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop);
2752
2753 selection_wait = Sel_incr;
2754 incr_buf_fill = 0;
2755 incr_ev.start (10);
2756
2757 goto bailout;
2758 }
2759
2760 if (ct.nitems == 0)
2761 {
2762 if (selection_wait == Sel_incr)
2763 {
2764 XFree (ct.value);
2765
2766 // finally complete, now paste the whole thing
2767 selection_wait = Sel_normal;
2768 ct.value = (unsigned char *)incr_buf;
2769 ct.nitems = incr_buf_fill;
2770 incr_buf = 0;
2771 incr_buf_size = 0;
2772 incr_ev.stop ();
2773 }
2774 else
2775 {
2776 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 {
2779 /*
2780 * pass through again trying CUT_BUFFER0 if we've come from
2781 * XConvertSelection () but nothing was presented
2782 */
2783 selection_paste (display->root, XA_CUT_BUFFER0, False);
2784 }
2785
2786 goto bailout;
2787 }
2788 }
2789 else if (selection_wait == Sel_incr)
2790 {
2791 incr_ev.start (10);
2792
2793 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2797 }
2798
2799 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2800 incr_buf_fill += ct.nitems;
2801
2802 goto bailout;
2803 }
2804
2805 char **cl;
2806 int cr;
2807
2808#if !ENABLE_MINIMAL
2809 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2810 // so recode it manually
2811 if (ct.encoding == xa[XA_UTF8_STRING])
2812 {
2813 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2814 char *s = rxvt_wcstombs (w);
2815 free (w);
2816 // TODO: strlen == only the first element will be converted. well...
2817 paste (s, strlen (s));
2818 free (s);
2819 }
2820 else
2821#endif
2822 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2823 && cl)
2824 {
2825 for (int i = 0; i < cr; i++)
2826 paste (cl[i], strlen (cl[i]));
2827
2828 XFreeStringList (cl);
2829 }
2830 else
2831 paste ((char *)ct.value, ct.nitems); // paste raw
2832
2833bailout:
2834 XFree (ct.value);
2835
2836 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none;
2838}
2839
2840void
2841rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{
2843 selection_wait = Sel_none;
2844
2845 incr_buf_size = 0;
2846 free (incr_buf);
2847
2848 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2849}
2850
2851void
2852rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2853{
2854 if (prop == None || selection_wait != Sel_incr)
2855 return; 2730 return;
2856 2731
2857 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2858} 2733}
2859 2734
2860/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2861/* 2736/*
2862 * Request the current selection: 2737 * Request the current selection:
… …
2874 { 2749 {
2875 /* internal selection */ 2750 /* internal selection */
2876 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2877 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2878 free (str); 2753 free (str);
2879 return;
2880 }
2881 else
2882 { 2754 }
2883 selection_request_time = tm; 2755 else if (!selection_req)
2884 selection_wait = Sel_normal;
2885
2886#if X_HAVE_UTF8_STRING
2887 selection_type = Sel_UTF8String;
2888 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2889 return;
2890#else
2891 selection_type = Sel_CompoundText;
2892 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2893 return;
2894#endif
2895 } 2756 {
2896 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2897 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2758 selection_req->run ();
2898 selection_paste (display->root, XA_CUT_BUFFER0, false);
2899}
2900
2901int
2902rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2903{
2904 Atom sel;
2905
2906 selection_type |= selnum;
2907
2908 if (selnum == Sel_Primary)
2909 sel = XA_PRIMARY;
2910 else if (selnum == Sel_Secondary)
2911 sel = XA_SECONDARY;
2912 else
2913 sel = xa[XA_CLIPBOARD];
2914
2915 if (XGetSelectionOwner (dpy, sel) != None)
2916 { 2759 }
2917 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2918 vt, selection_request_time);
2919 return 1;
2920 }
2921
2922 return 0;
2923} 2760}
2924 2761
2925/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2926/* 2763/*
2927 * Clear all selected text 2764 * Clear all selected text
2928 * EXT: SelectionClear 2765 * EXT: SelectionClear
2929 */ 2766 */
2930void 2767void
2931rxvt_term::selection_clear () NOTHROW 2768rxvt_term::selection_clear (bool clipboard) NOTHROW
2932{ 2769{
2770 if (!clipboard)
2771 {
2933 want_refresh = 1; 2772 want_refresh = 1;
2934 free (selection.text); 2773 free (selection.text);
2935 selection.text = NULL; 2774 selection.text = NULL;
2936 selection.len = 0; 2775 selection.len = 0;
2937 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2938 2777
2939 if (display->selection_owner == this) 2778 if (display->selection_owner == this)
2940 display->selection_owner = 0; 2779 display->selection_owner = 0;
2780 }
2781 else
2782 {
2783 free (selection.clip_text);
2784 selection.clip_text = NULL;
2785 selection.clip_len = 0;
2786
2787 if (display->clipboard_owner == this)
2788 display->clipboard_owner = 0;
2789 }
2941} 2790}
2942 2791
2943/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2944/* 2793/*
2945 * Copy a selection into the cut buffer 2794 * Copy a selection into the cut buffer
2946 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2947 */ 2796 */
2948void 2797void
2949rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
2950{ 2799{
2951 int i; 2800 int size;
2952 wchar_t *new_selection_text; 2801 wchar_t *new_selection_text;
2953 text_t *t; 2802 text_t *t;
2954 2803
2955 switch (selection.op) 2804 switch (selection.op)
2956 { 2805 {
… …
2972 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
2973 2822
2974 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2975 return; 2824 return;
2976 2825
2977 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2978 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2979 2828
2980 int ofs = 0; 2829 int ofs = 0;
2981 int extra = 0; 2830 int extra = 0;
2982 2831
2983 int col = selection.beg.col; 2832 int col = selection.beg.col;
… …
2989 { 2838 {
2990#if !ENABLE_MINIMAL 2839#if !ENABLE_MINIMAL
2991 if (selection.rect) 2840 if (selection.rect)
2992 { 2841 {
2993 col = selection.beg.col; 2842 col = selection.beg.col;
2994 end_col = ncol + 1; 2843 end_col = selection.end.col;
2995 } 2844 }
2996 else 2845 else
2997#endif 2846#endif
2998 end_col = ROW(row).l; 2847 end_col = ROW(row).l;
2999 2848
3000 col = max (col, 0); 2849 col = max (col, 0);
3001 2850
3002 if (row == selection.end.row 2851 if (row == selection.end.row)
3003#if !ENABLE_MINIMAL
3004 || selection.rect
3005#endif
3006 )
3007 min_it (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
3008 2853
3009 t = ROW(row).t + col; 2854 t = ROW(row).t + col;
3010 2855
3011 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
… …
3019 2864
3020 extra -= (len - 1); 2865 extra -= (len - 1);
3021 2866
3022 if (extra < 0) 2867 if (extra < 0)
3023 { 2868 {
3024 extra += i; 2869 extra += size;
3025 i += i; 2870 size += size;
3026 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3027 } 2872 }
3028 2873
3029 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3030 } 2875 }
3031#endif 2876#endif
… …
3043 2888
3044 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3045 } 2890 }
3046 else 2891 else
3047#endif 2892#endif
3048 if (!ROW(row).is_longer () && row != selection.end.row) 2893 if (!ROW(row).is_longer ()
2894 && (row != selection.end.row || end_col != selection.end.col)
2895 && (row != selection.beg.row || selection.beg.col < ncol))
3049 new_selection_text[ofs++] = C0_LF; 2896 new_selection_text[ofs++] = C0_LF;
3050 } 2897 }
3051
3052 if (end_col != selection.end.col)
3053 new_selection_text[ofs++] = C0_LF;
3054 2898
3055 new_selection_text[ofs] = 0; 2899 new_selection_text[ofs] = 0;
3056 2900
3057 if (ofs == 0) 2901 if (ofs == 0)
3058 { 2902 {
… …
3071 2915
3072 selection_grab (tm); 2916 selection_grab (tm);
3073} 2917}
3074 2918
3075bool 2919bool
3076rxvt_term::selection_grab (Time tm) NOTHROW 2920rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3077{ 2921{
2922 Atom sel;
2923
2924 if (!clipboard)
2925 {
3078 selection_time = tm; 2926 selection_time = tm;
2927 sel = XA_PRIMARY;
2928 }
2929 else
2930 {
2931 clipboard_time = tm;
2932 sel = xa[XA_CLIPBOARD];
2933 }
3079 2934
3080 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2935 XSetSelectionOwner (dpy, sel, vt, tm);
3081 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2936 if (XGetSelectionOwner (dpy, sel) == vt)
3082 { 2937 {
3083 display->set_selection_owner (this); 2938 display->set_selection_owner (this, clipboard);
3084 return true; 2939 return true;
3085 } 2940 }
3086 else 2941 else
3087 { 2942 {
3088 selection_clear (); 2943 selection_clear (clipboard);
3089 return false; 2944 return false;
3090 } 2945 }
3091 2946
3092#if 0 2947#if 0
3093 XTextProperty ct; 2948 XTextProperty ct;
… …
3588 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3589 { 3444 {
3590 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3591 } 3446 }
3592#endif 3447#endif
3593 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3594 { 3449 {
3595 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3596 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3597 ev.property = rq.property; 3458 ev.property = rq.property;
3598 } 3459 }
3599 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3600 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3601 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3634 { 3495 {
3635 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3636 style = enc_compound_text; 3497 style = enc_compound_text;
3637 } 3498 }
3638 3499
3639 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3640 { 3501 {
3641 cl = selection.text; 3502 cl = selection.text;
3642 selectlen = selection.len; 3503 selectlen = selection.len;
3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3643 } 3509 }
3644 else 3510 else
3645 { 3511 {
3646 cl = L""; 3512 cl = L"";
3647 selectlen = 0; 3513 selectlen = 0;
… …
3715 h += 2; min_it (h, nrow); 3581 h += 2; min_it (h, nrow);
3716 3582
3717 x -= 1; clamp_it (x, 0, ncol - w); 3583 x -= 1; clamp_it (x, 0, ncol - w);
3718 y -= 1; clamp_it (y, 0, nrow - h); 3584 y -= 1; clamp_it (y, 0, nrow - h);
3719 3585
3720 ov_x = x; ov_y = y; 3586 ov.x = x; ov.y = y;
3721 ov_w = w; ov_h = h; 3587 ov.w = w; ov.h = h;
3722 3588
3723 ov_text = new text_t *[h]; 3589 ov.text = new text_t *[h];
3724 ov_rend = new rend_t *[h]; 3590 ov.rend = new rend_t *[h];
3725 3591
3726 for (y = 0; y < h; y++) 3592 for (y = 0; y < h; y++)
3727 { 3593 {
3728 text_t *tp = ov_text[y] = new text_t[w]; 3594 text_t *tp = ov.text[y] = new text_t[w];
3729 rend_t *rp = ov_rend[y] = new rend_t[w]; 3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3730 3596
3731 text_t t0, t1, t2; 3597 text_t t0, t1, t2;
3732 rend_t r = OVERLAY_RSTYLE; 3598 rend_t r = OVERLAY_RSTYLE;
3733 3599
3734 if (y == 0) 3600 if (y == 0)
… …
3753} 3619}
3754 3620
3755void 3621void
3756rxvt_term::scr_overlay_off () NOTHROW 3622rxvt_term::scr_overlay_off () NOTHROW
3757{ 3623{
3758 if (!ov_text) 3624 if (!ov.text)
3759 return; 3625 return;
3760 3626
3761 want_refresh = 1; 3627 want_refresh = 1;
3762 3628
3763 for (int y = 0; y < ov_h; y++) 3629 for (int y = 0; y < ov.h; y++)
3764 { 3630 {
3765 delete [] ov_text[y]; 3631 delete [] ov.text[y];
3766 delete [] ov_rend[y]; 3632 delete [] ov.rend[y];
3767 } 3633 }
3768 3634
3769 delete [] ov_text; ov_text = 0; 3635 delete [] ov.text; ov.text = 0;
3770 delete [] ov_rend; ov_rend = 0; 3636 delete [] ov.rend; ov.rend = 0;
3771} 3637}
3772 3638
3773void 3639void
3774rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3640rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3775{ 3641{
3776 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3777 return; 3643 return;
3778 3644
3779 x++, y++; 3645 x++, y++;
3780 3646
3781 ov_text[y][x] = text; 3647 ov.text[y][x] = text;
3782 ov_rend[y][x] = rend; 3648 ov.rend[y][x] = rend;
3783} 3649}
3784 3650
3785void 3651void
3786rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3787{ 3653{
… …
3806} 3672}
3807 3673
3808void 3674void
3809rxvt_term::scr_swap_overlay () NOTHROW 3675rxvt_term::scr_swap_overlay () NOTHROW
3810{ 3676{
3811 if (!ov_text) 3677 if (!ov.text)
3812 return; 3678 return;
3813 3679
3680 // hide cursor if it is within the overlay area
3681 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3682 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3683 screen.flags &= ~Screen_VisibleCursor;
3684
3814 // swap screen mem with overlay 3685 // swap screen mem with overlay
3815 for (int y = ov_h; y--; ) 3686 for (int y = ov.h; y--; )
3816 { 3687 {
3817 text_t *t1 = ov_text[y]; 3688 text_t *t1 = ov.text[y];
3818 rend_t *r1 = ov_rend[y]; 3689 rend_t *r1 = ov.rend[y];
3819 3690
3820 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3691 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3821 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3692 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3822 3693
3823 for (int x = ov_w; x--; ) 3694 for (int x = ov.w; x--; )
3824 { 3695 {
3825 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3826 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3697 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3827 } 3698 }
3828 } 3699 }

Diff Legend

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