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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 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 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found begin, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 154 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 164 view_start = 0;
169 num_scr = 0; 165 num_scr = 0;
170 166
171 if (ncol == 0) 167 if (ncol == 0)
172 ncol = 80; 168 ncol = 80;
… …
174 if (nrow == 0) 170 if (nrow == 0)
175 nrow = 24; 171 nrow = 24;
176 172
177 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 174 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 175
183 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
185 { 178 {
186 //TODO//FIXME 179 //TODO//FIXME
… …
239 selection.text = NULL; 232 selection.text = NULL;
240 selection.len = 0; 233 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
243 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
244 } 239 }
245 else 240 else
246 { 241 {
247 /* 242 /*
248 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 281
287 if (top_row) 282 if (top_row)
288 { 283 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
291 287
292 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 290
295 do 291 do
296 { 292 {
297 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 295 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 297
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 299 {
… …
399 delete old_ta; 393 delete old_ta;
400 delete old_ra; 394 delete old_ra;
401 395
402 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
404 399
405 free (tabs); 400 free (tabs);
406 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
411 prev_ncol = ncol; 409 prev_ncol = ncol;
412
413 tabs = (char *)rxvt_malloc (ncol);
414
415 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0;
417
418 if (current_screen != PRIMARY)
419 scr_swap_screen ();
420 410
421 tt_winch (); 411 tt_winch ();
422 412
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 414}
… …
436 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
437 427
438 free (row_buf); 428 free (row_buf);
439 free (swap_buf); 429 free (swap_buf);
440 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
441 free (tabs); 433 free (tabs);
442 434 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 435 }
445} 436}
446 437
447/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
448/* 439/*
449 * Hard reset 440 * Hard/Soft reset
450 */ 441 */
451void 442void
452rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
453{ 444{
454 scr_release (); 445 scr_release ();
455 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
456 scr_reset (); 449 scr_reset ();
457 450
458 scr_clear (true); 451 scr_clear (true);
459 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
460} 469}
461 470
462/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
502 } 511 }
503 512
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
510#endif
511} 518}
512 519
513void 520void
514rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
515{ 522{
… …
540 want_refresh = 1; 547 want_refresh = 1;
541 view_start = 0; 548 view_start = 0;
542 549
543 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
544 551
545 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
546 553
547#if NSCREENS 554#if NSCREENS
548 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
549 { 556 {
550 num_scr = 0; 557 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
777 } 784 }
778 } 785 }
779 786
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 790 int row = screen.cur.row;
786 791
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 793
789 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
893# else 898# else
894 c = 0xfffd; 899 c = 0xfffd;
895# endif 900# endif
896#endif 901#endif
897 902
898 // nuke the character at this position, if required
899 if (expect_false (
900 line->t[screen.cur.col] == NOCHAR
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 904
908 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 907 {
911 // ...output spaces 908 if (screen.flags & Screen_Autowrap)
912 c = ' '; 909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
913 // and try the same character next loop iteration 912 // and try the same character next loop iteration
914 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
915 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
916 925
917 line->touch (); 926 line->touch ();
918 927
919 do 928 do
920 { 929 {
… …
926 else 935 else
927 { 936 {
928 line->l = ncol; 937 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
931 break; 940
941 goto end_of_line;
932 } 942 }
933 943
934 c = NOCHAR; 944 c = NOCHAR;
935 } 945 }
936 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
937 947
938 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 950 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 951 line->t[c] = ' ';
946 line->r[c] = rend; 952 line->r[c] = rend;
947 }
948 } 953 }
954
955end_of_line:
956 ;
949 } 957 }
950#if ENABLE_COMBINING 958#if ENABLE_COMBINING
951 else // width == 0 959 else // width == 0
952 { 960 {
953 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
993#endif 1001#endif
994 } 1002 }
995 1003
996 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
997 1005
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1000#endif
1001} 1007}
1002 1008
1003/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1004/* 1010/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1024
1019 want_refresh = 1; 1025 want_refresh = 1;
1020#endif 1026#endif
1021 } 1027 }
1022 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1023 else 1031 else
1024 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1025} 1033}
1026 1034
1027/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1349 {
1343 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1344 1351
1345 if (mapped) 1352 if (mapped)
1346 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1349 } 1356 }
1350 else 1357 else
1351 { 1358 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1360
1361 if (mapped)
1362 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1366 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1367 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1368 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1362 } 1372 }
1363 1373
1364 for (; num--; row++) 1374 for (; num--; row++)
1365 { 1375 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1377
1378 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1380 }
1369} 1381}
1370 1382
1371#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1372void 1384void
… …
1464 line_t *line = &ROW(row); 1476 line_t *line = &ROW(row);
1465 1477
1466 line->touch (); 1478 line->touch ();
1467 line->is_longer (0); 1479 line->is_longer (0);
1468 1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1469 switch (insdel) 1485 switch (insdel)
1470 { 1486 {
1471 case INSERT: 1487 case INSERT:
1472 line->l = min (line->l + count, ncol); 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);
1473 1492
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1494 {
1476 line->t[col] = line->t[col - count]; 1495 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1496 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1517 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1519 selection_check (1);
1501 screen.cur.col -= count; 1520 screen.cur.col -= count;
1502 1521
1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
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 {
1508 line->l = max (line->l - count, 0); 1530 line->l = max (line->l - count, 0);
1509 1531
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 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);
1511 1535
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1537 {
1514 line->t[col] = line->t[col + count]; 1538 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1539 line->r[col] = line->r[col + count];
1516 } 1540 }
1517 1541
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr); 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1543
1524 if (selection.op && current_screen == selection.screen 1544 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1546 {
1527 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1548 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1549 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1550 CLEAR_SELECTION ();
1531 else 1551 else
1532 { 1552 {
1533 /* shift selection */ 1553 /* shift selection */
1534 selection.beg.col -= count; 1554 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1555 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1556 selection.end.col -= count;
1537 } 1557 }
1538 }
1539 } 1558 }
1540 1559
1541 break; 1560 break;
1542 } 1561 }
1543} 1562}
… …
1664 { 1683 {
1665 rvideo_state = on; 1684 rvideo_state = on;
1666 1685
1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1668#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1669 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1670#endif 1689#endif
1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1672 1691
1673 XGCValues gcvalue; 1692 XGCValues gcvalue;
1674 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1818 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1819 { 1838 {
1820 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1821 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1822 } 1841 }
1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1824 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++)
1825 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);
1826 1845
1827 num_scr_allow = 0; 1846 num_scr_allow = 0;
1828 1847
… …
1919 1938
1920 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1921 } 1940 }
1922 else 1941 else
1923 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1924#endif 1944#endif
1925} 1945}
1926 1946
1927/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1928/* ARGSUSED */ 1948/* ARGSUSED */
… …
1947 row_start = view_start; 1967 row_start = view_start;
1948 } 1968 }
1949 1969
1950 wctomb (0, 0); 1970 wctomb (0, 0);
1951 1971
1952 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1953 { 1973 {
1954 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1955 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1956 1976
1957 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
… …
1986 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2007 */
1988void 2008void
1989rxvt_term::scr_refresh () NOTHROW 2009rxvt_term::scr_refresh () NOTHROW
1990{ 2010{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2011 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2013 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2026 /*
2009 * A: set up vars 2027 * A: set up vars
2010 */ 2028 */
2011 refresh_count = 0; 2029 refresh_count = 0;
2012 2030
2031 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2032 char have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2016#endif 2035#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2037
2019 /* 2038 /*
2020 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
2021 */ 2040 */
2022 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;
2023 2049
2024 /* 2050 /*
2025 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
2026 */ 2052 */
2027 { 2053 {
2028 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
2029 2055
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2057 if (hidden_cursor)
2033 showcursor = 0; 2058 showcursor = 0;
2034#endif 2059#endif
2035 2060
… …
2063 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2064#else 2089#else
2065 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2066#endif 2091#endif
2067 2092
2068 if (showcursor && focus) 2093 if (focus)
2069 { 2094 {
2070 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2071 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2072 else 2097 else
2073 { 2098 {
… …
2108 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
2109 } 2134 }
2110 } 2135 }
2111 } 2136 }
2112 2137
2113 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2114#if ENABLE_OVERLAY
2115 scr_swap_overlay ();
2116#endif
2117
2118#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2139 /*
2120 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
2122 */ 2142 */
… …
2214 2234
2215 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2216 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2217 --col; 2237 --col;
2218 2238
2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2220 text_t *text = stp + col; 2240 text_t *text = stp + col;
2221 int count = 1; 2241 int count = 1;
2222 2242
2223 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2224 drp[col] = rend; 2244 drp[col] = rend;
… …
2228 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2229 { 2249 {
2230 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2231 { 2251 {
2232 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2233 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2234 count++; 2255 count++;
2235 i++; 2256 i++;
2236 2257
2237 continue; 2258 continue;
2238 } 2259 }
… …
2268 */ 2289 */
2269 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2270 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2271 2292
2272 // 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
2273 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)))
2274 { 2295 {
2275 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2276 2297
2277#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2278 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2297 2318
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2320 fore = Color_UL;
2300#endif 2321#endif
2301 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
2302 if (invert) 2343 if (invert)
2303 { 2344 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2310 ::swap (fore, back); 2345 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2346
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2318 if (ISSET_PIXCOLOR (Color_RV))
2319 back = Color_RV;
2320# endif
2321 if (fore == back) 2348 if (fore == back)
2322 { 2349 {
2323 fore = Color_bg; 2350 fore = Color_bg;
2324 back = Color_fg; 2351 back = Color_fg;
2325 } 2352 }
… …
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2422 }
2396 } /* for (col....) */ 2423 } /* for (col....) */
2397 } /* for (row....) */ 2424 } /* for (row....) */
2398 2425
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403
2404 /* 2426 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2428 */
2407 if (showcursor) 2429 if (showcursor)
2408 { 2430 {
… …
2446 } 2468 }
2447 2469
2448 /* 2470 /*
2449 * H: cleanup selection 2471 * H: cleanup selection
2450 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2451 scr_reverse_selection (); 2478 scr_reverse_selection ();
2452 2479
2480 screen.flags = old_screen_flags;
2453 num_scr = 0; 2481 num_scr = 0;
2454 num_scr_allow = 1; 2482 num_scr_allow = 1;
2455} 2483}
2456 2484
2457void 2485void
… …
2478 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2479 } 2507 }
2480} 2508}
2481 2509
2482void 2510void
2483rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2484{ 2512{
2513 bool transparent = false;
2514
2485#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2486 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2487#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);
2488 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 {
2489 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
2490 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2492 2541
2493 if (scrollBar.win) 2542 if (scrollBar.win)
2494 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2496 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2497 scrollBar.show (0); 2549 scrollBar.show (0);
2498 } 2550 }
2499 2551
2500#endif 2552 if (refresh)
2501 2553 {
2502 /* bgPixmap.apply () does not do the following : */
2503 scr_clear (); 2554 scr_clear ();
2504 scr_touch (true); 2555 scr_touch (true);
2556 }
2505 want_refresh = 1; 2557 want_refresh = 1;
2506} 2558}
2507 2559
2508/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2509void 2561void
… …
2577 { 2629 {
2578#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2579 if (selection.rect) 2631 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2583 else 2635 else
2584#endif 2636#endif
2585 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2587 RS_RVid); 2639 RS_Sel | RS_RVid);
2588 } 2640 }
2589} 2641}
2590 2642
2591/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2592/* 2644/*
… …
2597void 2649void
2598rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2599{ 2651{
2600 int row, wrote; 2652 int row, wrote;
2601 unsigned int width, towrite; 2653 unsigned int width, towrite;
2602 char r1[] = "\n"; 2654 const char r1[] = "\n";
2603 2655
2604 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2605 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2606 { 2658 {
2607 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2653/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2654/* 2706/*
2655 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2656 */ 2708 */
2657void 2709void
2658rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2659{ 2711{
2660 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2661 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2662 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2663 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2669 2721
2670 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2672} 2724}
2673 2725
2726void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return;
2731
2732 tt_paste (data, len);
2733}
2734
2674/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2675/* 2736/*
2676 * Respond to a notification that a primary selection has been sent 2737 * Respond to a notification that a primary selection has been sent
2677 * EXT: SelectionNotify 2738 * EXT: SelectionNotify
2678 */ 2739 */
2679void 2740void
2680rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2681{ 2742{
2682 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2683 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2684 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2685 { 2748 {
2686 int selnum = selection_type & Sel_whereMask;
2687
2688 selection_type = 0; 2749 selection_type = 0;
2689 if (selnum != Sel_direct)
2690 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2691 } 2751 }
2692 2752
2693 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2694 { 2754 {
2695 int selnum = selection_type & Sel_whereMask;
2696
2697 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2698 if (selnum != Sel_direct)
2699 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2700 else
2701 selection_type = 0;
2702 } 2757 }
2703 2758
2704 return; 2759 return;
2705 } 2760 }
2706 2761
2707 unsigned long bytes_after; 2762 unsigned long bytes_after;
2708 XTextProperty ct; 2763 XTextProperty ct;
2709 2764
2765 // length == (2^31 - 1) / 4, as gdk
2710 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2711 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2712 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2713 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2714 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2715 &ct.value) != Success) 2771 &ct.value) != Success)
2716 { 2772 {
… …
2718 goto bailout; 2774 goto bailout;
2719 } 2775 }
2720 2776
2721 if (ct.encoding == None) 2777 if (ct.encoding == None)
2722 goto bailout; 2778 goto bailout;
2723
2724 if (bytes_after)
2725 {
2726 // fetch and append remaining data
2727 XTextProperty ct2;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 ct.nitems / 4, (bytes_after + 3) / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct2.encoding, &ct2.format,
2733 &ct2.nitems, &bytes_after,
2734 &ct2.value) != Success)
2735 goto bailout;
2736
2737 // realloc should be compatible to XFree, here, and elsewhere, too
2738 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2739 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2740 ct.nitems += ct2.nitems;
2741
2742 XFree (ct2.value);
2743 }
2744 2779
2745 if (ct.value == 0) 2780 if (ct.value == 0)
2746 goto bailout; 2781 goto bailout;
2747 2782
2748 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2779 { 2814 {
2780 /* 2815 /*
2781 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2782 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2783 */ 2818 */
2784 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2785 } 2820 }
2786 2821
2787 goto bailout; 2822 goto bailout;
2788 } 2823 }
2789 } 2824 }
… …
2792 incr_ev.start (10); 2827 incr_ev.start (10);
2793 2828
2794 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2795 { 2830 {
2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2798 } 2833 }
2799 2834
2800 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2801 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2802 2837
… …
2843{ 2878{
2844 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2845 2880
2846 incr_buf_size = 0; 2881 incr_buf_size = 0;
2847 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2848 2884
2849 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2850} 2886}
2851 2887
2852void 2888void
… …
2885 selection_wait = Sel_normal; 2921 selection_wait = Sel_normal;
2886 2922
2887#if X_HAVE_UTF8_STRING 2923#if X_HAVE_UTF8_STRING
2888 selection_type = Sel_UTF8String; 2924 selection_type = Sel_UTF8String;
2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2925 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2890 return; 2926 return;
2891#else 2927#else
2892 selection_type = Sel_CompoundText; 2928 selection_type = Sel_CompoundText;
2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2929 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2894 return; 2930 return;
2895#endif 2931#endif
2896 } 2932 }
2897 2933
2898 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2934 selection_wait = Sel_none; /* don't loop in selection_paste () */
2899 selection_paste (display->root, XA_CUT_BUFFER0, false); 2935 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2927/* 2963/*
2928 * Clear all selected text 2964 * Clear all selected text
2929 * EXT: SelectionClear 2965 * EXT: SelectionClear
2930 */ 2966 */
2931void 2967void
2932rxvt_term::selection_clear () NOTHROW 2968rxvt_term::selection_clear (bool clipboard) NOTHROW
2933{ 2969{
2970 if (!clipboard)
2971 {
2934 want_refresh = 1; 2972 want_refresh = 1;
2935 free (selection.text); 2973 free (selection.text);
2936 selection.text = NULL; 2974 selection.text = NULL;
2937 selection.len = 0; 2975 selection.len = 0;
2938 CLEAR_SELECTION (); 2976 CLEAR_SELECTION ();
2939 2977
2940 if (display->selection_owner == this) 2978 if (display->selection_owner == this)
2941 display->selection_owner = 0; 2979 display->selection_owner = 0;
2980 }
2981 else
2982 {
2983 free (selection.clip_text);
2984 selection.clip_text = NULL;
2985 selection.clip_len = 0;
2986
2987 if (display->clipboard_owner == this)
2988 display->clipboard_owner = 0;
2989 }
2942} 2990}
2943 2991
2944/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2945/* 2993/*
2946 * Copy a selection into the cut buffer 2994 * Copy a selection into the cut buffer
2947 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2948 */ 2996 */
2949void 2997void
2950rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2951{ 2999{
2952 int i; 3000 int size;
2953 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2954 text_t *t; 3002 text_t *t;
2955 3003
2956 switch (selection.op) 3004 switch (selection.op)
2957 { 3005 {
… …
2973 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
2974 3022
2975 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3023 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2976 return; 3024 return;
2977 3025
2978 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3027 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2980 3028
2981 int ofs = 0; 3029 int ofs = 0;
2982 int extra = 0; 3030 int extra = 0;
2983 3031
2984 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
2990 { 3038 {
2991#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
2992 if (selection.rect) 3040 if (selection.rect)
2993 { 3041 {
2994 col = selection.beg.col; 3042 col = selection.beg.col;
2995 end_col = ncol + 1; 3043 end_col = selection.end.col;
2996 } 3044 }
2997 else 3045 else
2998#endif 3046#endif
2999 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3000 3048
3001 col = max (col, 0); 3049 col = max (col, 0);
3002 3050
3003 if (row == selection.end.row 3051 if (row == selection.end.row)
3004#if !ENABLE_MINIMAL
3005 || selection.rect
3006#endif
3007 )
3008 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3009 3053
3010 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3011 3055
3012 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3020 3064
3021 extra -= (len - 1); 3065 extra -= (len - 1);
3022 3066
3023 if (extra < 0) 3067 if (extra < 0)
3024 { 3068 {
3025 extra += i; 3069 extra += size;
3026 i += i; 3070 size += size;
3027 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3028 } 3072 }
3029 3073
3030 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3031 } 3075 }
3032#endif 3076#endif
… …
3044 3088
3045 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3046 } 3090 }
3047 else 3091 else
3048#endif 3092#endif
3049 if (!ROW(row).is_longer () && row != selection.end.row) 3093 if (!ROW(row).is_longer ()
3094 && (row != selection.end.row || end_col != selection.end.col)
3095 && (row != selection.beg.row || selection.beg.col < ncol))
3050 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3051 } 3097 }
3052
3053 if (end_col != selection.end.col)
3054 new_selection_text[ofs++] = C0_LF;
3055 3098
3056 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3057 3100
3058 if (ofs == 0) 3101 if (ofs == 0)
3059 { 3102 {
… …
3072 3115
3073 selection_grab (tm); 3116 selection_grab (tm);
3074} 3117}
3075 3118
3076bool 3119bool
3077rxvt_term::selection_grab (Time tm) NOTHROW 3120rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3078{ 3121{
3122 Atom sel;
3123
3124 if (!clipboard)
3125 {
3079 selection_time = tm; 3126 selection_time = tm;
3127 sel = XA_PRIMARY;
3128 }
3129 else
3130 {
3131 clipboard_time = tm;
3132 sel = xa[XA_CLIPBOARD];
3133 }
3080 3134
3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3135 XSetSelectionOwner (dpy, sel, vt, tm);
3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3136 if (XGetSelectionOwner (dpy, sel) == vt)
3083 { 3137 {
3084 display->set_selection_owner (this); 3138 display->set_selection_owner (this, clipboard);
3085 return true; 3139 return true;
3086 } 3140 }
3087 else 3141 else
3088 { 3142 {
3089 selection_clear (); 3143 selection_clear (clipboard);
3090 return false; 3144 return false;
3091 } 3145 }
3092 3146
3093#if 0 3147#if 0
3094 XTextProperty ct; 3148 XTextProperty ct;
… …
3589 else if (rq.target == xa[XA_MULTIPLE]) 3643 else if (rq.target == xa[XA_MULTIPLE])
3590 { 3644 {
3591 /* TODO: Handle MULTIPLE */ 3645 /* TODO: Handle MULTIPLE */
3592 } 3646 }
3593#endif 3647#endif
3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3648 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3595 { 3649 {
3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3650 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3597 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3651 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3652 ev.property = rq.property;
3653 }
3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3655 {
3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3657 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3598 ev.property = rq.property; 3658 ev.property = rq.property;
3599 } 3659 }
3600 else if (rq.target == XA_STRING 3660 else if (rq.target == XA_STRING
3601 || rq.target == xa[XA_TEXT] 3661 || rq.target == xa[XA_TEXT]
3602 || rq.target == xa[XA_COMPOUND_TEXT] 3662 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3635 { 3695 {
3636 target = xa[XA_COMPOUND_TEXT]; 3696 target = xa[XA_COMPOUND_TEXT];
3637 style = enc_compound_text; 3697 style = enc_compound_text;
3638 } 3698 }
3639 3699
3640 if (selection.text) 3700 if (rq.selection == XA_PRIMARY && selection.text)
3641 { 3701 {
3642 cl = selection.text; 3702 cl = selection.text;
3643 selectlen = selection.len; 3703 selectlen = selection.len;
3704 }
3705 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3706 {
3707 cl = selection.clip_text;
3708 selectlen = selection.clip_len;
3644 } 3709 }
3645 else 3710 else
3646 { 3711 {
3647 cl = L""; 3712 cl = L"";
3648 selectlen = 0; 3713 selectlen = 0;
… …
3716 h += 2; min_it (h, nrow); 3781 h += 2; min_it (h, nrow);
3717 3782
3718 x -= 1; clamp_it (x, 0, ncol - w); 3783 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3784 y -= 1; clamp_it (y, 0, nrow - h);
3720 3785
3721 ov_x = x; ov_y = y; 3786 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3787 ov.w = w; ov.h = h;
3723 3788
3724 ov_text = new text_t *[h]; 3789 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3790 ov.rend = new rend_t *[h];
3726 3791
3727 for (y = 0; y < h; y++) 3792 for (y = 0; y < h; y++)
3728 { 3793 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3794 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3795 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3796
3732 text_t t0, t1, t2; 3797 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3798 rend_t r = OVERLAY_RSTYLE;
3734 3799
3735 if (y == 0) 3800 if (y == 0)
… …
3754} 3819}
3755 3820
3756void 3821void
3757rxvt_term::scr_overlay_off () NOTHROW 3822rxvt_term::scr_overlay_off () NOTHROW
3758{ 3823{
3759 if (!ov_text) 3824 if (!ov.text)
3760 return; 3825 return;
3761 3826
3762 want_refresh = 1; 3827 want_refresh = 1;
3763 3828
3764 for (int y = 0; y < ov_h; y++) 3829 for (int y = 0; y < ov.h; y++)
3765 { 3830 {
3766 delete [] ov_text[y]; 3831 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3832 delete [] ov.rend[y];
3768 } 3833 }
3769 3834
3770 delete [] ov_text; ov_text = 0; 3835 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3836 delete [] ov.rend; ov.rend = 0;
3772} 3837}
3773 3838
3774void 3839void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3840rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3776{ 3841{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3842 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3843 return;
3779 3844
3780 x++, y++; 3845 x++, y++;
3781 3846
3782 ov_text[y][x] = text; 3847 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3848 ov.rend[y][x] = rend;
3784} 3849}
3785 3850
3786void 3851void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3852rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3788{ 3853{
… …
3807} 3872}
3808 3873
3809void 3874void
3810rxvt_term::scr_swap_overlay () NOTHROW 3875rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3876{
3812 if (!ov_text) 3877 if (!ov.text)
3813 return; 3878 return;
3814 3879
3880 // hide cursor if it is within the overlay area
3881 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3882 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3883 screen.flags &= ~Screen_VisibleCursor;
3884
3815 // swap screen mem with overlay 3885 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3886 for (int y = ov.h; y--; )
3817 { 3887 {
3818 text_t *t1 = ov_text[y]; 3888 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3889 rend_t *r1 = ov.rend[y];
3820 3890
3821 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3891 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3822 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3892 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3823 3893
3824 for (int x = ov_w; x--; ) 3894 for (int x = ov.w; x--; )
3825 { 3895 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3896 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3897 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3828 } 3898 }
3829 } 3899 }

Diff Legend

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