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.311 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.375 by root, Mon Feb 21 07:12:03 2011 UTC

… …
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
… …
1912 1938
1913 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1940 }
1915 else 1941 else
1916 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1917#endif 1944#endif
1918} 1945}
1919 1946
1920/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1921/* ARGSUSED */ 1948/* ARGSUSED */
… …
1940 row_start = view_start; 1967 row_start = view_start;
1941 } 1968 }
1942 1969
1943 wctomb (0, 0); 1970 wctomb (0, 0);
1944 1971
1945 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1946 { 1973 {
1947 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1948 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1949 1976
1950 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
… …
1979 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1980 */ 2007 */
1981void 2008void
1982rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1983{ 2010{
1984 unsigned char have_bg,
1985 showcursor; /* show the cursor */
1986 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1987 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1988 int i; /* tmp */ 2013 int i; /* tmp */
1989#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1990 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2001 /* 2026 /*
2002 * A: set up vars 2027 * A: set up vars
2003 */ 2028 */
2004 refresh_count = 0; 2029 refresh_count = 0;
2005 2030
2031 unsigned int old_screen_flags = screen.flags;
2006 have_bg = 0; 2032 char have_bg = 0;
2007#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2008 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2009#endif 2035#endif
2010 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2011 2037
2012 /* 2038 /*
2013 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2014 */ 2040 */
2015 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;
2016 2049
2017 /* 2050 /*
2018 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2019 */ 2052 */
2020 { 2053 {
2021 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2022 2055
2023 showcursor = (screen.flags & Screen_VisibleCursor);
2024#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2025 if (hidden_cursor) 2057 if (hidden_cursor)
2026 showcursor = 0; 2058 showcursor = 0;
2027#endif 2059#endif
2028 2060
… …
2056 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2057#else 2089#else
2058 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2059#endif 2091#endif
2060 2092
2061 if (showcursor && focus) 2093 if (focus)
2062 { 2094 {
2063 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2064 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2065 else 2097 else
2066 { 2098 {
… …
2101 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2102 } 2134 }
2103 } 2135 }
2104 } 2136 }
2105 2137
2106 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2107#if ENABLE_OVERLAY
2108 scr_swap_overlay ();
2109#endif
2110
2111#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2112 /* 2139 /*
2113 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2114 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2115 */ 2142 */
… …
2207 2234
2208 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2209 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2210 --col; 2237 --col;
2211 2238
2212 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2213 text_t *text = stp + col; 2240 text_t *text = stp + col;
2214 int count = 1; 2241 int count = 1;
2215 2242
2216 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2217 drp[col] = rend; 2244 drp[col] = rend;
… …
2221 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2222 { 2249 {
2223 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2224 { 2251 {
2225 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2226 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2227 count++; 2255 count++;
2228 i++; 2256 i++;
2229 2257
2230 continue; 2258 continue;
2231 } 2259 }
… …
2261 */ 2289 */
2262 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2263 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2264 2292
2265 // 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
2266 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)))
2267 { 2295 {
2268 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2269 2297
2270#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2271 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2290 2318
2291 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2320 fore = Color_UL;
2293#endif 2321#endif
2294 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
2295 if (invert) 2343 if (invert)
2296 { 2344 {
2297#ifdef OPTION_HC
2298 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2299 || !ISSET_PIXCOLOR (Color_HC))
2300#endif
2301 /* invert the column if no highlightColor is set or it is the
2302 * current cursor column */
2303 ::swap (fore, back); 2345 ::swap (fore, back);
2304#ifdef OPTION_HC
2305 else if (ISSET_PIXCOLOR (Color_HC))
2306 back = Color_HC;
2307#endif
2308 2346
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2310# ifndef OPTION_HC
2311 if (ISSET_PIXCOLOR (Color_RV))
2312 back = Color_RV;
2313# endif
2314 if (fore == back) 2348 if (fore == back)
2315 { 2349 {
2316 fore = Color_bg; 2350 fore = Color_bg;
2317 back = Color_fg; 2351 back = Color_fg;
2318 } 2352 }
… …
2387 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2388 } 2422 }
2389 } /* for (col....) */ 2423 } /* for (col....) */
2390 } /* for (row....) */ 2424 } /* for (row....) */
2391 2425
2392#if ENABLE_OVERLAY
2393 scr_swap_overlay ();
2394#endif
2395 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2396
2397 /* 2426 /*
2398 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2399 */ 2428 */
2400 if (showcursor) 2429 if (showcursor)
2401 { 2430 {
… …
2439 } 2468 }
2440 2469
2441 /* 2470 /*
2442 * H: cleanup selection 2471 * H: cleanup selection
2443 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2444 scr_reverse_selection (); 2478 scr_reverse_selection ();
2445 2479
2480 screen.flags = old_screen_flags;
2446 num_scr = 0; 2481 num_scr = 0;
2447 num_scr_allow = 1; 2482 num_scr_allow = 1;
2448} 2483}
2449 2484
2450void 2485void
… …
2471 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2472 } 2507 }
2473} 2508}
2474 2509
2475void 2510void
2476rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2477{ 2512{
2513 bool transparent = false;
2514
2478#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2479 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2480#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);
2481 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 {
2482 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
2483 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2485 2541
2486 if (scrollBar.win) 2542 if (scrollBar.win)
2487 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2489 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2490 scrollBar.show (0); 2549 scrollBar.show (0);
2491 } 2550 }
2492 2551
2493#endif 2552 if (refresh)
2494 2553 {
2495 /* bgPixmap.apply () does not do the following : */
2496 scr_clear (); 2554 scr_clear ();
2497 scr_touch (true); 2555 scr_touch (true);
2556 }
2498 want_refresh = 1; 2557 want_refresh = 1;
2499} 2558}
2500 2559
2501/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2502void 2561void
… …
2570 { 2629 {
2571#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2572 if (selection.rect) 2631 if (selection.rect)
2573 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2575 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2576 else 2635 else
2577#endif 2636#endif
2578 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2579 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2580 RS_RVid); 2639 RS_Sel | RS_RVid);
2581 } 2640 }
2582} 2641}
2583 2642
2584/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2585/* 2644/*
… …
2590void 2649void
2591rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2592{ 2651{
2593 int row, wrote; 2652 int row, wrote;
2594 unsigned int width, towrite; 2653 unsigned int width, towrite;
2595 char r1[] = "\n"; 2654 const char r1[] = "\n";
2596 2655
2597 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2598 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2599 { 2658 {
2600 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2646/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2647/* 2706/*
2648 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2649 */ 2708 */
2650void 2709void
2651rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2652{ 2711{
2653 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2654 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2655 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2656 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2662 2721
2663 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2664 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2665} 2724}
2666 2725
2667/* ------------------------------------------------------------------------- */
2668/*
2669 * Respond to a notification that a primary selection has been sent
2670 * EXT: SelectionNotify
2671 */
2672void 2726void
2673rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2674{ 2728{
2675 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2676 {
2677 if ((selection_type & Sel_CompoundText))
2678 {
2679 int selnum = selection_type & Sel_whereMask;
2680
2681 selection_type = 0;
2682 if (selnum != Sel_direct)
2683 selection_request_other (XA_STRING, selnum);
2684 }
2685
2686 if ((selection_type & Sel_UTF8String))
2687 {
2688 int selnum = selection_type & Sel_whereMask;
2689
2690 selection_type = Sel_CompoundText;
2691 if (selnum != Sel_direct)
2692 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2693 else
2694 selection_type = 0;
2695 }
2696
2697 return;
2698 }
2699
2700 unsigned long bytes_after;
2701 XTextProperty ct;
2702
2703 if (XGetWindowProperty (dpy, win, prop,
2704 0, PROP_SIZE / 4,
2705 delete_prop, AnyPropertyType,
2706 &ct.encoding, &ct.format,
2707 &ct.nitems, &bytes_after,
2708 &ct.value) != Success)
2709 {
2710 ct.value = 0;
2711 goto bailout;
2712 }
2713
2714 if (ct.encoding == None)
2715 goto bailout;
2716
2717 if (bytes_after)
2718 {
2719 // fetch and append remaining data
2720 XTextProperty ct2;
2721
2722 if (XGetWindowProperty (dpy, win, prop,
2723 ct.nitems / 4, (bytes_after + 3) / 4,
2724 delete_prop, AnyPropertyType,
2725 &ct2.encoding, &ct2.format,
2726 &ct2.nitems, &bytes_after,
2727 &ct2.value) != Success)
2728 goto bailout;
2729
2730 // realloc should be compatible to XFree, here, and elsewhere, too
2731 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2732 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2733 ct.nitems += ct2.nitems;
2734
2735 XFree (ct2.value);
2736 }
2737
2738 if (ct.value == 0)
2739 goto bailout;
2740
2741 if (ct.encoding == xa[XA_INCR])
2742 {
2743 // INCR selection, start handshake
2744 if (!delete_prop)
2745 XDeleteProperty (dpy, win, prop);
2746
2747 selection_wait = Sel_incr;
2748 incr_buf_fill = 0;
2749 incr_ev.start (10);
2750
2751 goto bailout;
2752 }
2753
2754 if (ct.nitems == 0)
2755 {
2756 if (selection_wait == Sel_incr)
2757 {
2758 XFree (ct.value);
2759
2760 // finally complete, now paste the whole thing
2761 selection_wait = Sel_normal;
2762 ct.value = (unsigned char *)incr_buf;
2763 ct.nitems = incr_buf_fill;
2764 incr_buf = 0;
2765 incr_buf_size = 0;
2766 incr_ev.stop ();
2767 }
2768 else
2769 {
2770 if (selection_wait == Sel_normal
2771 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2772 {
2773 /*
2774 * pass through again trying CUT_BUFFER0 if we've come from
2775 * XConvertSelection () but nothing was presented
2776 */
2777 selection_paste (display->root, XA_CUT_BUFFER0, False);
2778 }
2779
2780 goto bailout;
2781 }
2782 }
2783 else if (selection_wait == Sel_incr)
2784 {
2785 incr_ev.start (10);
2786
2787 while (incr_buf_fill + ct.nitems > incr_buf_size)
2788 {
2789 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2790 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2791 }
2792
2793 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2794 incr_buf_fill += ct.nitems;
2795
2796 goto bailout;
2797 }
2798
2799 char **cl;
2800 int cr;
2801
2802#if !ENABLE_MINIMAL
2803 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2804 // so recode it manually
2805 if (ct.encoding == xa[XA_UTF8_STRING])
2806 {
2807 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2808 char *s = rxvt_wcstombs (w);
2809 free (w);
2810 // TODO: strlen == only the first element will be converted. well...
2811 paste (s, strlen (s));
2812 free (s);
2813 }
2814 else
2815#endif
2816 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2817 && cl)
2818 {
2819 for (int i = 0; i < cr; i++)
2820 paste (cl[i], strlen (cl[i]));
2821
2822 XFreeStringList (cl);
2823 }
2824 else
2825 paste ((char *)ct.value, ct.nitems); // paste raw
2826
2827bailout:
2828 XFree (ct.value);
2829
2830 if (selection_wait == Sel_normal)
2831 selection_wait = Sel_none;
2832}
2833
2834void
2835rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2836{
2837 selection_wait = Sel_none;
2838
2839 incr_buf_size = 0;
2840 free (incr_buf);
2841
2842 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2843}
2844
2845void
2846rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2847{
2848 if (prop == None || selection_wait != Sel_incr)
2849 return; 2730 return;
2850 2731
2851 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2852} 2733}
2853 2734
2854/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2855/* 2736/*
2856 * Request the current selection: 2737 * Request the current selection:
… …
2870 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2871 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2872 free (str); 2753 free (str);
2873 return; 2754 return;
2874 } 2755 }
2875 else 2756 else if (!selection_req)
2876 {
2877 selection_request_time = tm;
2878 selection_wait = Sel_normal;
2879
2880#if X_HAVE_UTF8_STRING
2881 selection_type = Sel_UTF8String;
2882 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2883 return;
2884#else
2885 selection_type = Sel_CompoundText;
2886 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2887 return;
2888#endif
2889 } 2757 {
2890 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2891 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2759 selection_req->run ();
2892 selection_paste (display->root, XA_CUT_BUFFER0, false);
2893}
2894
2895int
2896rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2897{
2898 Atom sel;
2899
2900 selection_type |= selnum;
2901
2902 if (selnum == Sel_Primary)
2903 sel = XA_PRIMARY;
2904 else if (selnum == Sel_Secondary)
2905 sel = XA_SECONDARY;
2906 else
2907 sel = xa[XA_CLIPBOARD];
2908
2909 if (XGetSelectionOwner (dpy, sel) != None)
2910 { 2760 }
2911 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2912 vt, selection_request_time);
2913 return 1;
2914 }
2915
2916 return 0;
2917} 2761}
2918 2762
2919/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2920/* 2764/*
2921 * Clear all selected text 2765 * Clear all selected text
2922 * EXT: SelectionClear 2766 * EXT: SelectionClear
2923 */ 2767 */
2924void 2768void
2925rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2926{ 2770{
2771 if (!clipboard)
2772 {
2927 want_refresh = 1; 2773 want_refresh = 1;
2928 free (selection.text); 2774 free (selection.text);
2929 selection.text = NULL; 2775 selection.text = NULL;
2930 selection.len = 0; 2776 selection.len = 0;
2931 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2932 2778
2933 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2934 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2935} 2791}
2936 2792
2937/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2938/* 2794/*
2939 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2940 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2941 */ 2797 */
2942void 2798void
2943rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2944{ 2800{
2945 int i; 2801 int size;
2946 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2947 text_t *t; 2803 text_t *t;
2948 2804
2949 switch (selection.op) 2805 switch (selection.op)
2950 { 2806 {
… …
2966 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2967 2823
2968 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2969 return; 2825 return;
2970 2826
2971 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2972 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2973 2829
2974 int ofs = 0; 2830 int ofs = 0;
2975 int extra = 0; 2831 int extra = 0;
2976 2832
2977 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
2983 { 2839 {
2984#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
2985 if (selection.rect) 2841 if (selection.rect)
2986 { 2842 {
2987 col = selection.beg.col; 2843 col = selection.beg.col;
2988 end_col = ncol + 1; 2844 end_col = selection.end.col;
2989 } 2845 }
2990 else 2846 else
2991#endif 2847#endif
2992 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
2993 2849
2994 col = max (col, 0); 2850 col = max (col, 0);
2995 2851
2996 if (row == selection.end.row 2852 if (row == selection.end.row)
2997#if !ENABLE_MINIMAL
2998 || selection.rect
2999#endif
3000 )
3001 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3002 2854
3003 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3004 2856
3005 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3013 2865
3014 extra -= (len - 1); 2866 extra -= (len - 1);
3015 2867
3016 if (extra < 0) 2868 if (extra < 0)
3017 { 2869 {
3018 extra += i; 2870 extra += size;
3019 i += i; 2871 size += size;
3020 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3021 } 2873 }
3022 2874
3023 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3024 } 2876 }
3025#endif 2877#endif
… …
3037 2889
3038 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3039 } 2891 }
3040 else 2892 else
3041#endif 2893#endif
3042 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3043 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3044 } 2898 }
3045
3046 if (end_col != selection.end.col)
3047 new_selection_text[ofs++] = C0_LF;
3048 2899
3049 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3050 2901
3051 if (ofs == 0) 2902 if (ofs == 0)
3052 { 2903 {
… …
3065 2916
3066 selection_grab (tm); 2917 selection_grab (tm);
3067} 2918}
3068 2919
3069bool 2920bool
3070rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3071{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3072 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3073 2935
3074 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3075 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3076 { 2938 {
3077 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3078 return true; 2940 return true;
3079 } 2941 }
3080 else 2942 else
3081 { 2943 {
3082 selection_clear (); 2944 selection_clear (clipboard);
3083 return false; 2945 return false;
3084 } 2946 }
3085 2947
3086#if 0 2948#if 0
3087 XTextProperty ct; 2949 XTextProperty ct;
… …
3582 else if (rq.target == xa[XA_MULTIPLE]) 3444 else if (rq.target == xa[XA_MULTIPLE])
3583 { 3445 {
3584 /* TODO: Handle MULTIPLE */ 3446 /* TODO: Handle MULTIPLE */
3585 } 3447 }
3586#endif 3448#endif
3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3588 { 3450 {
3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3451 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3590 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3452 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3453 ev.property = rq.property;
3454 }
3455 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3456 {
3457 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3458 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3591 ev.property = rq.property; 3459 ev.property = rq.property;
3592 } 3460 }
3593 else if (rq.target == XA_STRING 3461 else if (rq.target == XA_STRING
3594 || rq.target == xa[XA_TEXT] 3462 || rq.target == xa[XA_TEXT]
3595 || rq.target == xa[XA_COMPOUND_TEXT] 3463 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3628 { 3496 {
3629 target = xa[XA_COMPOUND_TEXT]; 3497 target = xa[XA_COMPOUND_TEXT];
3630 style = enc_compound_text; 3498 style = enc_compound_text;
3631 } 3499 }
3632 3500
3633 if (selection.text) 3501 if (rq.selection == XA_PRIMARY && selection.text)
3634 { 3502 {
3635 cl = selection.text; 3503 cl = selection.text;
3636 selectlen = selection.len; 3504 selectlen = selection.len;
3505 }
3506 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3507 {
3508 cl = selection.clip_text;
3509 selectlen = selection.clip_len;
3637 } 3510 }
3638 else 3511 else
3639 { 3512 {
3640 cl = L""; 3513 cl = L"";
3641 selectlen = 0; 3514 selectlen = 0;
… …
3709 h += 2; min_it (h, nrow); 3582 h += 2; min_it (h, nrow);
3710 3583
3711 x -= 1; clamp_it (x, 0, ncol - w); 3584 x -= 1; clamp_it (x, 0, ncol - w);
3712 y -= 1; clamp_it (y, 0, nrow - h); 3585 y -= 1; clamp_it (y, 0, nrow - h);
3713 3586
3714 ov_x = x; ov_y = y; 3587 ov.x = x; ov.y = y;
3715 ov_w = w; ov_h = h; 3588 ov.w = w; ov.h = h;
3716 3589
3717 ov_text = new text_t *[h]; 3590 ov.text = new text_t *[h];
3718 ov_rend = new rend_t *[h]; 3591 ov.rend = new rend_t *[h];
3719 3592
3720 for (y = 0; y < h; y++) 3593 for (y = 0; y < h; y++)
3721 { 3594 {
3722 text_t *tp = ov_text[y] = new text_t[w]; 3595 text_t *tp = ov.text[y] = new text_t[w];
3723 rend_t *rp = ov_rend[y] = new rend_t[w]; 3596 rend_t *rp = ov.rend[y] = new rend_t[w];
3724 3597
3725 text_t t0, t1, t2; 3598 text_t t0, t1, t2;
3726 rend_t r = OVERLAY_RSTYLE; 3599 rend_t r = OVERLAY_RSTYLE;
3727 3600
3728 if (y == 0) 3601 if (y == 0)
… …
3747} 3620}
3748 3621
3749void 3622void
3750rxvt_term::scr_overlay_off () NOTHROW 3623rxvt_term::scr_overlay_off () NOTHROW
3751{ 3624{
3752 if (!ov_text) 3625 if (!ov.text)
3753 return; 3626 return;
3754 3627
3755 want_refresh = 1; 3628 want_refresh = 1;
3756 3629
3757 for (int y = 0; y < ov_h; y++) 3630 for (int y = 0; y < ov.h; y++)
3758 { 3631 {
3759 delete [] ov_text[y]; 3632 delete [] ov.text[y];
3760 delete [] ov_rend[y]; 3633 delete [] ov.rend[y];
3761 } 3634 }
3762 3635
3763 delete [] ov_text; ov_text = 0; 3636 delete [] ov.text; ov.text = 0;
3764 delete [] ov_rend; ov_rend = 0; 3637 delete [] ov.rend; ov.rend = 0;
3765} 3638}
3766 3639
3767void 3640void
3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3769{ 3642{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3643 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3771 return; 3644 return;
3772 3645
3773 x++, y++; 3646 x++, y++;
3774 3647
3775 ov_text[y][x] = text; 3648 ov.text[y][x] = text;
3776 ov_rend[y][x] = rend; 3649 ov.rend[y][x] = rend;
3777} 3650}
3778 3651
3779void 3652void
3780rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3653rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3781{ 3654{
… …
3800} 3673}
3801 3674
3802void 3675void
3803rxvt_term::scr_swap_overlay () NOTHROW 3676rxvt_term::scr_swap_overlay () NOTHROW
3804{ 3677{
3805 if (!ov_text) 3678 if (!ov.text)
3806 return; 3679 return;
3807 3680
3681 // hide cursor if it is within the overlay area
3682 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3683 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3684 screen.flags &= ~Screen_VisibleCursor;
3685
3808 // swap screen mem with overlay 3686 // swap screen mem with overlay
3809 for (int y = ov_h; y--; ) 3687 for (int y = ov.h; y--; )
3810 { 3688 {
3811 text_t *t1 = ov_text[y]; 3689 text_t *t1 = ov.text[y];
3812 rend_t *r1 = ov_rend[y]; 3690 rend_t *r1 = ov.rend[y];
3813 3691
3814 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3692 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3815 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3693 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3816 3694
3817 for (int x = ov_w; x--; ) 3695 for (int x = ov.w; x--; )
3818 { 3696 {
3819 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3697 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3820 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3698 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3821 } 3699 }
3822 } 3700 }

Diff Legend

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