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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.368 by sf-exg, Tue Feb 1 00:41:01 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
… …
132 133
133 l.l = 0; 134 l.l = 0;
134 l.f = 0; 135 l.f = 0;
135} 136}
136 137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
150
151 // found start, nuke
152 do {
153 l.t[col] = ' ';
154 l.r[col] = rend;
155 col++;
156 } while (col < ncol && l.t[col] == NOCHAR);
157}
158
137/* ------------------------------------------------------------------------- * 159/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 160 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
140 162
141void 163void
142rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
143{ 165{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 166 view_start = 0;
150 num_scr = 0; 167 num_scr = 0;
151 168
152 if (ncol == 0) 169 if (ncol == 0)
153 ncol = 80; 170 ncol = 80;
… …
155 if (nrow == 0) 172 if (nrow == 0)
156 nrow = 24; 173 nrow = 24;
157 174
158 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 176 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 177
164 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
166 { 180 {
167 //TODO//FIXME 181 //TODO//FIXME
… …
220 selection.text = NULL; 234 selection.text = NULL;
221 selection.len = 0; 235 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
224 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
225 } 241 }
226 else 242 else
227 { 243 {
228 /* 244 /*
229 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
267 283
268 if (top_row) 284 if (top_row)
269 { 285 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
272 289
273 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 292
276 do 293 do
277 { 294 {
278 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 297 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 299
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 301 {
… …
380 delete old_ta; 395 delete old_ta;
381 delete old_ra; 396 delete old_ra;
382 397
383 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
385 401
386 free (tabs); 402 free (tabs);
387 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0;
388 407
389 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
390 409
391 prev_nrow = nrow; 410 prev_nrow = nrow;
392 prev_ncol = ncol; 411 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 412
402 tt_winch (); 413 tt_winch ();
403 414
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 416}
… …
417 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
418 429
419 free (row_buf); 430 free (row_buf);
420 free (swap_buf); 431 free (swap_buf);
421 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
422 free (tabs); 435 free (tabs);
423 436 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 437 }
426} 438}
427 439
428/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
429/* 441/*
430 * Hard reset 442 * Hard/Soft reset
431 */ 443 */
432void 444void
433rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
434{ 446{
435 scr_release (); 447 scr_release ();
436 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
437 scr_reset (); 451 scr_reset ();
438 452
439 scr_clear (true); 453 scr_clear (true);
440 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
441} 471}
442 472
443/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
483 } 513 }
484 514
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
491#endif
492} 520}
493 521
494void 522void
495rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
496{ 524{
… …
521 want_refresh = 1; 549 want_refresh = 1;
522 view_start = 0; 550 view_start = 0;
523 551
524 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
525 553
526 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
527 555
528#if NSCREENS 556#if NSCREENS
529 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
530 { 558 {
531 num_scr = 0; 559 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
758 } 786 }
759 } 787 }
760 788
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 792 int row = screen.cur.row;
767 793
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 795
770 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
874# else 900# else
875 c = 0xfffd; 901 c = 0xfffd;
876# endif 902# endif
877#endif 903#endif
878 904
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)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 906
904 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 909 {
907 // ...output spaces 910 if (screen.flags & Screen_Autowrap)
908 c = ' '; 911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
909 // and try the same character next loop iteration 914 // and try the same character next loop iteration
910 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
911 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
912 927
913 line->touch (); 928 line->touch ();
914 929
915 do 930 do
916 { 931 {
… …
922 else 937 else
923 { 938 {
924 line->l = ncol; 939 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
927 break; 942
943 goto end_of_line;
928 } 944 }
929 945
930 c = NOCHAR; 946 c = NOCHAR;
931 } 947 }
932 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
933 949
934 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
935 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
936 { 952 {
937 line->touch ();
938
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
940 {
941 line->t[c] = ' '; 953 line->t[c] = ' ';
942 line->r[c] = rend; 954 line->r[c] = rend;
943 }
944 } 955 }
956
957end_of_line:
958 ;
945 } 959 }
946#if ENABLE_COMBINING 960#if ENABLE_COMBINING
947 else // width == 0 961 else // width == 0
948 { 962 {
949 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
989#endif 1003#endif
990 } 1004 }
991 1005
992 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
993 1007
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
996#endif
997} 1009}
998 1010
999/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1000/* 1012/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1014 1026
1015 want_refresh = 1; 1027 want_refresh = 1;
1016#endif 1028#endif
1017 } 1029 }
1018 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1019 else 1033 else
1020 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1021} 1035}
1022 1036
1023/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1330 return; 1344 return;
1331 1345
1332 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1333 1347
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1351 {
1339 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1340 1353
1341 if (mapped) 1354 if (mapped)
1342 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1345 } 1358 }
1346 else 1359 else
1347 { 1360 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1362
1363 if (mapped)
1364 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1368 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1369 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1370 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1371 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1372 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 }
1358 } 1374 }
1359 1375
1360 for (; num--; row++) 1376 for (; num--; row++)
1361 { 1377 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1379
1380 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1382 }
1365} 1383}
1366 1384
1367#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1368void 1386void
… …
1442 * Insert/Delete <count> characters from the current position 1460 * Insert/Delete <count> characters from the current position
1443 */ 1461 */
1444void 1462void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1463rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1464{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1465 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1466 ZERO_SCROLLBACK ();
1452 1467
1453 if (count <= 0) 1468 if (count <= 0)
1454 return; 1469 return;
… …
1456 scr_do_wrap (); 1471 scr_do_wrap ();
1457 1472
1458 selection_check (1); 1473 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1474 min_it (count, ncol - screen.cur.col);
1460 1475
1461 row = screen.cur.row; 1476 int row = screen.cur.row;
1462 1477
1463 line_t *line = &ROW(row); 1478 line_t *line = &ROW(row);
1464 1479
1465 line->touch (); 1480 line->touch ();
1466 line->is_longer (0); 1481 line->is_longer (0);
1467 1482
1483 // nuke wide spanning the start
1484 if (line->t[screen.cur.col] == NOCHAR)
1485 scr_kill_char (*line, screen.cur.col);
1486
1468 switch (insdel) 1487 switch (insdel)
1469 { 1488 {
1470 case INSERT: 1489 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1490 line->l = min (line->l + count, ncol);
1491
1492 if (line->t[screen.cur.col] == NOCHAR)
1493 scr_kill_char (*line, screen.cur.col);
1494
1495 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1496 {
1473 line->t[col] = line->t[col - count]; 1497 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1498 line->r[col] = line->r[col - count];
1475 } 1499 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1500
1479 if (selection.op && current_screen == selection.screen 1501 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1502 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1503 {
1482 if (selection.end.row != screen.cur.row 1504 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1519 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1520 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1521 selection_check (1);
1500 screen.cur.col -= count; 1522 screen.cur.col -= count;
1501 1523
1524 // nuke wide char after the end
1525 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1526 scr_kill_char (*line, screen.cur.col + count);
1527
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1528 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1529 break;
1504 1530
1505 case DELETE: 1531 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1532 line->l = max (line->l - count, 0);
1507 1533
1534 // nuke wide char spanning the end
1535 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1536 scr_kill_char (*line, screen.cur.col + count);
1537
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1538 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1539 {
1510 line->t[col] = line->t[col + count]; 1540 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1541 line->r[col] = line->r[col + count];
1512 } 1542 }
1513 1543
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1544 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1545
1517 if (selection.op && current_screen == selection.screen 1546 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1547 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1548 {
1520 if (selection.end.row != screen.cur.row 1549 if (selection.end.row != screen.cur.row
… …
1656 { 1685 {
1657 rvideo_state = on; 1686 rvideo_state = on;
1658 1687
1659 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1660#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1661 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1662#endif 1691#endif
1663 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1664 1693
1665 XGCValues gcvalue; 1694 XGCValues gcvalue;
1666 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1810 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1811 { 1840 {
1812 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1813 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1814 } 1843 }
1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1818 1847
1819 num_scr_allow = 0; 1848 num_scr_allow = 0;
1820 1849
… …
1911 1940
1912 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1942 }
1914 else 1943 else
1915 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1946#endif
1917} 1947}
1918 1948
1919/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1950/* ARGSUSED */
… …
1939 row_start = view_start; 1969 row_start = view_start;
1940 } 1970 }
1941 1971
1942 wctomb (0, 0); 1972 wctomb (0, 0);
1943 1973
1944 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1975 {
1946 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1948 1978
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2009 */
1980void 2010void
1981rxvt_term::scr_refresh () NOTHROW 2011rxvt_term::scr_refresh () NOTHROW
1982{ 2012{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2013 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2014 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2015 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2016#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2017 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2028 /*
2001 * A: set up vars 2029 * A: set up vars
2002 */ 2030 */
2003 refresh_count = 0; 2031 refresh_count = 0;
2004 2032
2033 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2034 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2008#endif 2037#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2039
2011 /* 2040 /*
2012 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
2013 */ 2042 */
2014 scr_reverse_selection (); 2043 scr_reverse_selection ();
2044
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY
2047 scr_swap_overlay ();
2048#endif
2049
2050 char showcursor = screen.flags & Screen_VisibleCursor;
2015 2051
2016 /* 2052 /*
2017 * C: set the cursor character (s) 2053 * C: set the cursor character (s)
2018 */ 2054 */
2019 { 2055 {
2020 unsigned char setoldcursor; 2056 unsigned char setoldcursor;
2021 2057
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2058#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2059 if (hidden_cursor)
2025 showcursor = 0; 2060 showcursor = 0;
2026#endif 2061#endif
2027 2062
… …
2055 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2056#else 2091#else
2057 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2058#endif 2093#endif
2059 2094
2060 if (showcursor && focus) 2095 if (focus)
2061 { 2096 {
2062 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2064 else 2099 else
2065 { 2100 {
… …
2100 oldcursor.col = screen.cur.col; 2135 oldcursor.col = screen.cur.col;
2101 } 2136 }
2102 } 2137 }
2103 } 2138 }
2104 2139
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2141 /*
2112 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2114 */ 2144 */
… …
2206 2236
2207 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2208 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2209 --col; 2239 --col;
2210 2240
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2242 text_t *text = stp + col;
2213 int count = 1; 2243 int count = 1;
2214 2244
2215 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2216 drp[col] = rend; 2246 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2250 for (i = 0; ++col < ncol; )
2221 { 2251 {
2222 if (stp[col] == NOCHAR) 2252 if (stp[col] == NOCHAR)
2223 { 2253 {
2224 dtp[col] = stp[col]; 2254 dtp[col] = stp[col];
2225 drp[col] = rend; 2255 drp[col] = srp[col];
2256
2226 count++; 2257 count++;
2227 i++; 2258 i++;
2228 2259
2229 continue; 2260 continue;
2230 } 2261 }
… …
2260 */ 2291 */
2261 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2263 2294
2264 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2297 {
2267 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2268 2299
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2320
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2322 fore = Color_UL;
2292#endif 2323#endif
2293 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2294 if (invert) 2345 if (invert)
2295 { 2346 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2347 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2348
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2350 if (fore == back)
2314 { 2351 {
2315 fore = Color_bg; 2352 fore = Color_bg;
2316 back = Color_fg; 2353 back = Color_fg;
2317 } 2354 }
… …
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2423 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2424 }
2388 } /* for (col....) */ 2425 } /* for (col....) */
2389 } /* for (row....) */ 2426 } /* for (row....) */
2390 2427
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395
2396 /* 2428 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2429 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2430 */
2399 if (showcursor) 2431 if (showcursor)
2400 { 2432 {
… …
2438 } 2470 }
2439 2471
2440 /* 2472 /*
2441 * H: cleanup selection 2473 * H: cleanup selection
2442 */ 2474 */
2475#if ENABLE_OVERLAY
2476 scr_swap_overlay ();
2477#endif
2478 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2479
2443 scr_reverse_selection (); 2480 scr_reverse_selection ();
2444 2481
2482 screen.flags = old_screen_flags;
2445 num_scr = 0; 2483 num_scr = 0;
2446 num_scr_allow = 1; 2484 num_scr_allow = 1;
2447} 2485}
2448 2486
2449void 2487void
… …
2470 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2471 } 2509 }
2472} 2510}
2473 2511
2474void 2512void
2475rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2476{ 2514{
2515 bool transparent = false;
2516
2477#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2478 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2479#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2480 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2482 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2484 2543
2485 if (scrollBar.win) 2544 if (scrollBar.win)
2486 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2488 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2489 scrollBar.show (0); 2551 scrollBar.show (0);
2490 } 2552 }
2491 2553
2492#endif 2554 if (refresh)
2493 2555 {
2494 /* bgPixmap.apply () does not do the following : */
2495 scr_clear (); 2556 scr_clear ();
2496 scr_touch (true); 2557 scr_touch (true);
2558 }
2497 want_refresh = 1; 2559 want_refresh = 1;
2498} 2560}
2499 2561
2500/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2501void 2563void
… …
2569 { 2631 {
2570#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2571 if (selection.rect) 2633 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2637 else
2576#endif 2638#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2579 RS_RVid); 2641 RS_Sel | RS_RVid);
2580 } 2642 }
2581} 2643}
2582 2644
2583/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2584/* 2646/*
… …
2589void 2651void
2590rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2591{ 2653{
2592 int row, wrote; 2654 int row, wrote;
2593 unsigned int width, towrite; 2655 unsigned int width, towrite;
2594 char r1[] = "\n"; 2656 const char r1[] = "\n";
2595 2657
2596 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2597 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2598 { 2660 {
2599 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2645/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2646/* 2708/*
2647 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2648 */ 2710 */
2649void 2711void
2650rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2651{ 2713{
2652 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2653 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2654 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2655 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2661 2723
2662 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2664} 2726}
2665 2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2735}
2736
2666/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2667/* 2738/*
2668 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
2669 * EXT: SelectionNotify 2740 * EXT: SelectionNotify
2670 */ 2741 */
2671void 2742void
2672rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2673{ 2744{
2674 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2675 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2676 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2677 { 2753 {
2678 int selnum = selection_type & Sel_whereMask;
2679
2680 selection_type = 0; 2754 selection_type = 0;
2681 if (selnum != Sel_direct)
2682 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2683 } 2756 }
2684 2757
2685 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2686 { 2759 {
2687 int selnum = selection_type & Sel_whereMask;
2688
2689 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2690 if (selnum != Sel_direct)
2691 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2692 else
2693 selection_type = 0;
2694 } 2762 }
2695 2763
2696 return; 2764 return;
2697 } 2765 }
2698 2766
… …
2725 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2726 &ct2.value) != Success) 2794 &ct2.value) != Success)
2727 goto bailout; 2795 goto bailout;
2728 2796
2729 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2730 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2731 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2732 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2733 2801
2734 XFree (ct2.value); 2802 XFree (ct2.value);
2735 } 2803 }
… …
2771 { 2839 {
2772 /* 2840 /*
2773 * pass through again trying CUT_BUFFER0 if we've come from 2841 * pass through again trying CUT_BUFFER0 if we've come from
2774 * XConvertSelection () but nothing was presented 2842 * XConvertSelection () but nothing was presented
2775 */ 2843 */
2776 selection_paste (display->root, XA_CUT_BUFFER0, False); 2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2777 } 2845 }
2778 2846
2779 goto bailout; 2847 goto bailout;
2780 } 2848 }
2781 } 2849 }
… …
2784 incr_ev.start (10); 2852 incr_ev.start (10);
2785 2853
2786 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2787 { 2855 {
2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2790 } 2858 }
2791 2859
2792 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2793 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2794 2862
… …
2877 selection_wait = Sel_normal; 2945 selection_wait = Sel_normal;
2878 2946
2879#if X_HAVE_UTF8_STRING 2947#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String; 2948 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return; 2950 return;
2883#else 2951#else
2884 selection_type = Sel_CompoundText; 2952 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return; 2954 return;
2887#endif 2955#endif
2888 } 2956 }
2889 2957
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false); 2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2919/* 2987/*
2920 * Clear all selected text 2988 * Clear all selected text
2921 * EXT: SelectionClear 2989 * EXT: SelectionClear
2922 */ 2990 */
2923void 2991void
2924rxvt_term::selection_clear () NOTHROW 2992rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2993{
2994 if (!clipboard)
2995 {
2926 want_refresh = 1; 2996 want_refresh = 1;
2927 free (selection.text); 2997 free (selection.text);
2928 selection.text = NULL; 2998 selection.text = NULL;
2929 selection.len = 0; 2999 selection.len = 0;
2930 CLEAR_SELECTION (); 3000 CLEAR_SELECTION ();
2931 3001
2932 if (display->selection_owner == this) 3002 if (display->selection_owner == this)
2933 display->selection_owner = 0; 3003 display->selection_owner = 0;
3004 }
3005 else
3006 {
3007 free (selection.clip_text);
3008 selection.clip_text = NULL;
3009 selection.clip_len = 0;
3010
3011 if (display->clipboard_owner == this)
3012 display->clipboard_owner = 0;
3013 }
2934} 3014}
2935 3015
2936/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
2937/* 3017/*
2938 * Copy a selection into the cut buffer 3018 * Copy a selection into the cut buffer
2939 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2940 */ 3020 */
2941void 3021void
2942rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2943{ 3023{
2944 int i; 3024 int size;
2945 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2946 text_t *t; 3026 text_t *t;
2947 3027
2948 switch (selection.op) 3028 switch (selection.op)
2949 { 3029 {
… …
2965 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
2966 3046
2967 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2968 return; 3048 return;
2969 3049
2970 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2971 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2972 3052
2973 int ofs = 0; 3053 int ofs = 0;
2974 int extra = 0; 3054 int extra = 0;
2975 3055
2976 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
2982 { 3062 {
2983#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
2984 if (selection.rect) 3064 if (selection.rect)
2985 { 3065 {
2986 col = selection.beg.col; 3066 col = selection.beg.col;
2987 end_col = ncol + 1; 3067 end_col = selection.end.col;
2988 } 3068 }
2989 else 3069 else
2990#endif 3070#endif
2991 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
2992 3072
2993 col = max (col, 0); 3073 col = max (col, 0);
2994 3074
2995 if (row == selection.end.row 3075 if (row == selection.end.row)
2996#if !ENABLE_MINIMAL
2997 || selection.rect
2998#endif
2999 )
3000 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3001 3077
3002 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3003 3079
3004 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3012 3088
3013 extra -= (len - 1); 3089 extra -= (len - 1);
3014 3090
3015 if (extra < 0) 3091 if (extra < 0)
3016 { 3092 {
3017 extra += i; 3093 extra += size;
3018 i += i; 3094 size += size;
3019 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3020 } 3096 }
3021 3097
3022 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3023 } 3099 }
3024#endif 3100#endif
… …
3036 3112
3037 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3038 } 3114 }
3039 else 3115 else
3040#endif 3116#endif
3041 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3042 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3043 } 3121 }
3044
3045 if (end_col != selection.end.col)
3046 new_selection_text[ofs++] = C0_LF;
3047 3122
3048 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3049 3124
3050 if (ofs == 0) 3125 if (ofs == 0)
3051 { 3126 {
… …
3064 3139
3065 selection_grab (tm); 3140 selection_grab (tm);
3066} 3141}
3067 3142
3068bool 3143bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 3144rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 3145{
3146 Atom sel;
3147
3148 if (!clipboard)
3149 {
3071 selection_time = tm; 3150 selection_time = tm;
3151 sel = XA_PRIMARY;
3152 }
3153 else
3154 {
3155 clipboard_time = tm;
3156 sel = xa[XA_CLIPBOARD];
3157 }
3072 3158
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3159 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3160 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 3161 {
3076 display->set_selection_owner (this); 3162 display->set_selection_owner (this, clipboard);
3077 return true; 3163 return true;
3078 } 3164 }
3079 else 3165 else
3080 { 3166 {
3081 selection_clear (); 3167 selection_clear (clipboard);
3082 return false; 3168 return false;
3083 } 3169 }
3084 3170
3085#if 0 3171#if 0
3086 XTextProperty ct; 3172 XTextProperty ct;
… …
3581 else if (rq.target == xa[XA_MULTIPLE]) 3667 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3668 {
3583 /* TODO: Handle MULTIPLE */ 3669 /* TODO: Handle MULTIPLE */
3584 } 3670 }
3585#endif 3671#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3673 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3675 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property;
3677 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3590 ev.property = rq.property; 3682 ev.property = rq.property;
3591 } 3683 }
3592 else if (rq.target == XA_STRING 3684 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3685 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3686 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3627 { 3719 {
3628 target = xa[XA_COMPOUND_TEXT]; 3720 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3721 style = enc_compound_text;
3630 } 3722 }
3631 3723
3632 if (selection.text) 3724 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3725 {
3634 cl = selection.text; 3726 cl = selection.text;
3635 selectlen = selection.len; 3727 selectlen = selection.len;
3728 }
3729 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3730 {
3731 cl = selection.clip_text;
3732 selectlen = selection.clip_len;
3636 } 3733 }
3637 else 3734 else
3638 { 3735 {
3639 cl = L""; 3736 cl = L"";
3640 selectlen = 0; 3737 selectlen = 0;
… …
3708 h += 2; min_it (h, nrow); 3805 h += 2; min_it (h, nrow);
3709 3806
3710 x -= 1; clamp_it (x, 0, ncol - w); 3807 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3808 y -= 1; clamp_it (y, 0, nrow - h);
3712 3809
3713 ov_x = x; ov_y = y; 3810 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3811 ov.w = w; ov.h = h;
3715 3812
3716 ov_text = new text_t *[h]; 3813 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3814 ov.rend = new rend_t *[h];
3718 3815
3719 for (y = 0; y < h; y++) 3816 for (y = 0; y < h; y++)
3720 { 3817 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3818 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3819 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3820
3724 text_t t0, t1, t2; 3821 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3822 rend_t r = OVERLAY_RSTYLE;
3726 3823
3727 if (y == 0) 3824 if (y == 0)
… …
3746} 3843}
3747 3844
3748void 3845void
3749rxvt_term::scr_overlay_off () NOTHROW 3846rxvt_term::scr_overlay_off () NOTHROW
3750{ 3847{
3751 if (!ov_text) 3848 if (!ov.text)
3752 return; 3849 return;
3753 3850
3754 want_refresh = 1; 3851 want_refresh = 1;
3755 3852
3756 for (int y = 0; y < ov_h; y++) 3853 for (int y = 0; y < ov.h; y++)
3757 { 3854 {
3758 delete [] ov_text[y]; 3855 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3856 delete [] ov.rend[y];
3760 } 3857 }
3761 3858
3762 delete [] ov_text; ov_text = 0; 3859 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3860 delete [] ov.rend; ov.rend = 0;
3764} 3861}
3765 3862
3766void 3863void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3864rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3865{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3866 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3867 return;
3771 3868
3772 x++, y++; 3869 x++, y++;
3773 3870
3774 ov_text[y][x] = text; 3871 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3872 ov.rend[y][x] = rend;
3776} 3873}
3777 3874
3778void 3875void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3876rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3877{
… …
3799} 3896}
3800 3897
3801void 3898void
3802rxvt_term::scr_swap_overlay () NOTHROW 3899rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3900{
3804 if (!ov_text) 3901 if (!ov.text)
3805 return; 3902 return;
3806 3903
3904 // hide cursor if it is within the overlay area
3905 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3906 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3907 screen.flags &= ~Screen_VisibleCursor;
3908
3807 // swap screen mem with overlay 3909 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3910 for (int y = ov.h; y--; )
3809 { 3911 {
3810 text_t *t1 = ov_text[y]; 3912 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3913 rend_t *r1 = ov.rend[y];
3812 3914
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3915 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3916 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3917
3816 for (int x = ov_w; x--; ) 3918 for (int x = ov.w; x--; )
3817 { 3919 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3920 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3921 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3922 }
3821 } 3923 }

Diff Legend

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