ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.311 by root, Wed Oct 15 14:48:22 2008 UTC vs.
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 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 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
155}
156
137/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
140 160
141void 161void
142rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
143{ 163{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 164 view_start = 0;
150 num_scr = 0; 165 num_scr = 0;
151 166
152 if (ncol == 0) 167 if (ncol == 0)
153 ncol = 80; 168 ncol = 80;
… …
155 if (nrow == 0) 170 if (nrow == 0)
156 nrow = 24; 171 nrow = 24;
157 172
158 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 174 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 175
164 // we need at least two lines for wrapping to work correctly 176 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 177 while (nrow + saveLines < 2)
166 { 178 {
167 //TODO//FIXME 179 //TODO//FIXME
… …
220 selection.text = NULL; 232 selection.text = NULL;
221 selection.len = 0; 233 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
224 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
225 } 239 }
226 else 240 else
227 { 241 {
228 /* 242 /*
229 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
267 281
268 if (top_row) 282 if (top_row)
269 { 283 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
272 287
273 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 290
276 do 291 do
277 { 292 {
278 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 295 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 297
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 299 {
… …
380 delete old_ta; 393 delete old_ta;
381 delete old_ra; 394 delete old_ra;
382 395
383 clamp_it (screen.cur.row, 0, nrow - 1); 396 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
385 399
386 free (tabs); 400 free (tabs);
387 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
388 405
389 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
390 407
391 prev_nrow = nrow; 408 prev_nrow = nrow;
392 prev_ncol = ncol; 409 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 410
402 tt_winch (); 411 tt_winch ();
403 412
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 414}
… …
417 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
418 427
419 free (row_buf); 428 free (row_buf);
420 free (swap_buf); 429 free (swap_buf);
421 free (drawn_buf); 430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
422 free (tabs); 433 free (tabs);
423 434 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 435 }
426} 436}
427 437
428/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
429/* 439/*
430 * Hard reset 440 * Hard/Soft reset
431 */ 441 */
432void 442void
433rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
434{ 444{
435 scr_release (); 445 scr_release ();
436 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
437 scr_reset (); 449 scr_reset ();
438 450
439 scr_clear (true); 451 scr_clear (true);
440 scr_refresh (); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
441} 469}
442 470
443/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
483 } 511 }
484 512
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
491#endif
492} 518}
493 519
494void 520void
495rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
496{ 522{
… …
521 want_refresh = 1; 547 want_refresh = 1;
522 view_start = 0; 548 view_start = 0;
523 549
524 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
525 551
526 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
527 553
528#if NSCREENS 554#if NSCREENS
529 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
530 { 556 {
531 num_scr = 0; 557 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
758 } 784 }
759 } 785 }
760 786
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 790 int row = screen.cur.row;
767 791
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 793
770 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
880 if (expect_false ( 904 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 905 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 906 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 907 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 908 ))
885 { 909 scr_kill_char (*line, screen.cur.col);
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 910
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 912
904 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 915 {
907 // ...output spaces 916 if (screen.flags & Screen_Autowrap)
908 c = ' '; 917 {
918 // ... artificially enlargen the previous one
919 c = NOCHAR;
909 // and try the same character next loop iteration 920 // and try the same character next loop iteration
910 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
911 } 925 }
912 926
913 line->touch (); 927 line->touch ();
914 928
915 do 929 do
… …
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#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034#endif
1019 else 1035 else
1020 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1021} 1037}
1022 1038
1023/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1330 return; 1346 return;
1331 1347
1332 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1333 1349
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1335 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1353 {
1339 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1340 1355
1341 if (mapped) 1356 if (mapped)
1342 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1345 } 1360 }
1346 else 1361 else
1347 { 1362 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1364
1365 if (mapped)
1366 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1371 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1358 } 1376 }
1359 1377
1360 for (; num--; row++) 1378 for (; num--; row++)
1361 { 1379 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1364 } 1384 }
1365} 1385}
1366 1386
1367#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1368void 1388void
… …
1442 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1443 */ 1463 */
1444void 1464void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1466{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1467 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1452 1469
1453 if (count <= 0) 1470 if (count <= 0)
1454 return; 1471 return;
… …
1456 scr_do_wrap (); 1473 scr_do_wrap ();
1457 1474
1458 selection_check (1); 1475 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1460 1477
1461 row = screen.cur.row; 1478 int row = screen.cur.row;
1462 1479
1463 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1464 1481
1465 line->touch (); 1482 line->touch ();
1466 line->is_longer (0); 1483 line->is_longer (0);
1467 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1468 switch (insdel) 1489 switch (insdel)
1469 { 1490 {
1470 case INSERT: 1491 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1498 {
1473 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1475 } 1501 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1502
1479 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1505 {
1482 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1521 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1523 selection_check (1);
1500 screen.cur.col -= count; 1524 screen.cur.col -= count;
1501 1525
1502 line->l = max (line->l - count, 0); 1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1531 break;
1505 1532
1506 case DELETE: 1533 case DELETE:
1507 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1508 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1509 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1510 { 1541 {
1511 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1512 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1513 } 1544 }
1514 1545
1515 line->l = max (line->l - count, 0);
1516 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1517 1547
1518 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1519 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1520 { 1550 {
1521 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1811 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1812 { 1842 {
1813 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1814 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1815 } 1845 }
1816// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1817 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1847 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1818 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1848 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1819 1849
1820 num_scr_allow = 0; 1850 num_scr_allow = 0;
1821 1851
… …
1912 1942
1913 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1914 } 1944 }
1915 else 1945 else
1916 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1917#endif 1948#endif
1918} 1949}
1919 1950
1920/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1921/* ARGSUSED */ 1952/* ARGSUSED */
… …
1940 row_start = view_start; 1971 row_start = view_start;
1941 } 1972 }
1942 1973
1943 wctomb (0, 0); 1974 wctomb (0, 0);
1944 1975
1945 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1946 { 1977 {
1947 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1948 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1949 1980
1950 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1979 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1980 */ 2011 */
1981void 2012void
1982rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1983{ 2014{
1984 unsigned char have_bg,
1985 showcursor; /* show the cursor */
1986 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1987 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1988 int i; /* tmp */ 2017 int i; /* tmp */
1989#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1990 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2001 /* 2030 /*
2002 * A: set up vars 2031 * A: set up vars
2003 */ 2032 */
2004 refresh_count = 0; 2033 refresh_count = 0;
2005 2034
2035 unsigned int old_screen_flags = screen.flags;
2006 have_bg = 0; 2036 char have_bg = 0;
2007#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2008 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bgPixmap.pixmap != None;
2009#endif 2039#endif
2010 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2011 2041
2012 /* 2042 /*
2013 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2014 */ 2044 */
2015 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
2016 2053
2017 /* 2054 /*
2018 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2019 */ 2056 */
2020 { 2057 {
2021 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2022 2059
2023 showcursor = (screen.flags & Screen_VisibleCursor);
2024#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2025 if (hidden_cursor) 2061 if (hidden_cursor)
2026 showcursor = 0; 2062 showcursor = 0;
2027#endif 2063#endif
2028 2064
… …
2056 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2057#else 2093#else
2058 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2059#endif 2095#endif
2060 2096
2061 if (showcursor && focus) 2097 if (focus)
2062 { 2098 {
2063 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2064 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2065 else 2101 else
2066 { 2102 {
… …
2101 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2102 } 2138 }
2103 } 2139 }
2104 } 2140 }
2105 2141
2106 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2107#if ENABLE_OVERLAY
2108 scr_swap_overlay ();
2109#endif
2110
2111#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2112 /* 2143 /*
2113 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2114 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2115 */ 2146 */
… …
2207 2238
2208 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2209 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2210 --col; 2241 --col;
2211 2242
2212 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2213 text_t *text = stp + col; 2244 text_t *text = stp + col;
2214 int count = 1; 2245 int count = 1;
2215 2246
2216 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2217 drp[col] = rend; 2248 drp[col] = rend;
… …
2221 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2222 { 2253 {
2223 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2224 { 2255 {
2225 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2226 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2227 count++; 2259 count++;
2228 i++; 2260 i++;
2229 2261
2230 continue; 2262 continue;
2231 } 2263 }
… …
2261 */ 2293 */
2262 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2263 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2264 2296
2265 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2266 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2267 { 2299 {
2268 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2269 2301
2270#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2271 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2290 2322
2291 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2292 fore = Color_UL; 2324 fore = Color_UL;
2293#endif 2325#endif
2294 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2295 if (invert) 2347 if (invert)
2296 { 2348 {
2297#ifdef OPTION_HC
2298 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2299 || !ISSET_PIXCOLOR (Color_HC))
2300#endif
2301 /* invert the column if no highlightColor is set or it is the
2302 * current cursor column */
2303 ::swap (fore, back); 2349 ::swap (fore, back);
2304#ifdef OPTION_HC
2305 else if (ISSET_PIXCOLOR (Color_HC))
2306 back = Color_HC;
2307#endif
2308 2350
2309#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2310# ifndef OPTION_HC
2311 if (ISSET_PIXCOLOR (Color_RV))
2312 back = Color_RV;
2313# endif
2314 if (fore == back) 2352 if (fore == back)
2315 { 2353 {
2316 fore = Color_bg; 2354 fore = Color_bg;
2317 back = Color_fg; 2355 back = Color_fg;
2318 } 2356 }
… …
2387 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2388 } 2426 }
2389 } /* for (col....) */ 2427 } /* for (col....) */
2390 } /* for (row....) */ 2428 } /* for (row....) */
2391 2429
2392#if ENABLE_OVERLAY
2393 scr_swap_overlay ();
2394#endif
2395 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2396
2397 /* 2430 /*
2398 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2399 */ 2432 */
2400 if (showcursor) 2433 if (showcursor)
2401 { 2434 {
… …
2439 } 2472 }
2440 2473
2441 /* 2474 /*
2442 * H: cleanup selection 2475 * H: cleanup selection
2443 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2444 scr_reverse_selection (); 2482 scr_reverse_selection ();
2445 2483
2484 screen.flags = old_screen_flags;
2446 num_scr = 0; 2485 num_scr = 0;
2447 num_scr_allow = 1; 2486 num_scr_allow = 1;
2448} 2487}
2449 2488
2450void 2489void
… …
2570 { 2609 {
2571#if !ENABLE_MINIMAL 2610#if !ENABLE_MINIMAL
2572 if (selection.rect) 2611 if (selection.rect)
2573 scr_xor_rect (selection.beg.row, selection.beg.col, 2612 scr_xor_rect (selection.beg.row, selection.beg.col,
2574 selection.end.row, selection.end.col, 2613 selection.end.row, selection.end.col,
2575 RS_RVid, RS_RVid | RS_Uline); 2614 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2576 else 2615 else
2577#endif 2616#endif
2578 scr_xor_span (selection.beg.row, selection.beg.col, 2617 scr_xor_span (selection.beg.row, selection.beg.col,
2579 selection.end.row, selection.end.col, 2618 selection.end.row, selection.end.col,
2580 RS_RVid); 2619 RS_Sel | RS_RVid);
2581 } 2620 }
2582} 2621}
2583 2622
2584/* ------------------------------------------------------------------------- */ 2623/* ------------------------------------------------------------------------- */
2585/* 2624/*
… …
2646/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2647/* 2686/*
2648 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2649 */ 2688 */
2650void 2689void
2651rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2652{ 2691{
2653 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2654 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2655 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2656 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2660 2699
2661 tt_write (data, len); 2700 tt_write (data, len);
2662 2701
2663 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2664 tt_printf ("\e[201~"); 2703 tt_printf ("\e[201~");
2704}
2705
2706void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{
2709 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2710 return;
2711
2712 tt_paste (data, len);
2665} 2713}
2666 2714
2667/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2668/* 2716/*
2669 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2878 selection_wait = Sel_normal; 2926 selection_wait = Sel_normal;
2879 2927
2880#if X_HAVE_UTF8_STRING 2928#if X_HAVE_UTF8_STRING
2881 selection_type = Sel_UTF8String; 2929 selection_type = Sel_UTF8String;
2882 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2883 return; 2931 return;
2884#else 2932#else
2885 selection_type = Sel_CompoundText; 2933 selection_type = Sel_CompoundText;
2886 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2887 return; 2935 return;
2888#endif 2936#endif
2889 } 2937 }
2890 2938
2891 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2892 selection_paste (display->root, XA_CUT_BUFFER0, false); 2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2920/* 2968/*
2921 * Clear all selected text 2969 * Clear all selected text
2922 * EXT: SelectionClear 2970 * EXT: SelectionClear
2923 */ 2971 */
2924void 2972void
2925rxvt_term::selection_clear () NOTHROW 2973rxvt_term::selection_clear (bool clipboard) NOTHROW
2926{ 2974{
2975 if (!clipboard)
2976 {
2927 want_refresh = 1; 2977 want_refresh = 1;
2928 free (selection.text); 2978 free (selection.text);
2929 selection.text = NULL; 2979 selection.text = NULL;
2930 selection.len = 0; 2980 selection.len = 0;
2931 CLEAR_SELECTION (); 2981 CLEAR_SELECTION ();
2932 2982
2933 if (display->selection_owner == this) 2983 if (display->selection_owner == this)
2934 display->selection_owner = 0; 2984 display->selection_owner = 0;
2985 }
2986 else
2987 {
2988 free (selection.clip_text);
2989 selection.clip_text = NULL;
2990 selection.clip_len = 0;
2991
2992 if (display->clipboard_owner == this)
2993 display->clipboard_owner = 0;
2994 }
2935} 2995}
2936 2996
2937/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2938/* 2998/*
2939 * Copy a selection into the cut buffer 2999 * Copy a selection into the cut buffer
… …
3065 3125
3066 selection_grab (tm); 3126 selection_grab (tm);
3067} 3127}
3068 3128
3069bool 3129bool
3070rxvt_term::selection_grab (Time tm) NOTHROW 3130rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3071{ 3131{
3132 Atom sel;
3133
3134 if (!clipboard)
3135 {
3072 selection_time = tm; 3136 selection_time = tm;
3137 sel = XA_PRIMARY;
3138 }
3139 else
3140 {
3141 clipboard_time = tm;
3142 sel = xa[XA_CLIPBOARD];
3143 }
3073 3144
3074 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3145 XSetSelectionOwner (dpy, sel, vt, tm);
3075 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3146 if (XGetSelectionOwner (dpy, sel) == vt)
3076 { 3147 {
3077 display->set_selection_owner (this); 3148 display->set_selection_owner (this, clipboard);
3078 return true; 3149 return true;
3079 } 3150 }
3080 else 3151 else
3081 { 3152 {
3082 selection_clear (); 3153 selection_clear (clipboard);
3083 return false; 3154 return false;
3084 } 3155 }
3085 3156
3086#if 0 3157#if 0
3087 XTextProperty ct; 3158 XTextProperty ct;
… …
3582 else if (rq.target == xa[XA_MULTIPLE]) 3653 else if (rq.target == xa[XA_MULTIPLE])
3583 { 3654 {
3584 /* TODO: Handle MULTIPLE */ 3655 /* TODO: Handle MULTIPLE */
3585 } 3656 }
3586#endif 3657#endif
3587 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3588 { 3659 {
3589 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3590 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3661 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3662 ev.property = rq.property;
3663 }
3664 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3665 {
3666 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3667 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3591 ev.property = rq.property; 3668 ev.property = rq.property;
3592 } 3669 }
3593 else if (rq.target == XA_STRING 3670 else if (rq.target == XA_STRING
3594 || rq.target == xa[XA_TEXT] 3671 || rq.target == xa[XA_TEXT]
3595 || rq.target == xa[XA_COMPOUND_TEXT] 3672 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3628 { 3705 {
3629 target = xa[XA_COMPOUND_TEXT]; 3706 target = xa[XA_COMPOUND_TEXT];
3630 style = enc_compound_text; 3707 style = enc_compound_text;
3631 } 3708 }
3632 3709
3633 if (selection.text) 3710 if (rq.selection == XA_PRIMARY && selection.text)
3634 { 3711 {
3635 cl = selection.text; 3712 cl = selection.text;
3636 selectlen = selection.len; 3713 selectlen = selection.len;
3714 }
3715 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3716 {
3717 cl = selection.clip_text;
3718 selectlen = selection.clip_len;
3637 } 3719 }
3638 else 3720 else
3639 { 3721 {
3640 cl = L""; 3722 cl = L"";
3641 selectlen = 0; 3723 selectlen = 0;
… …
3709 h += 2; min_it (h, nrow); 3791 h += 2; min_it (h, nrow);
3710 3792
3711 x -= 1; clamp_it (x, 0, ncol - w); 3793 x -= 1; clamp_it (x, 0, ncol - w);
3712 y -= 1; clamp_it (y, 0, nrow - h); 3794 y -= 1; clamp_it (y, 0, nrow - h);
3713 3795
3714 ov_x = x; ov_y = y; 3796 ov.x = x; ov.y = y;
3715 ov_w = w; ov_h = h; 3797 ov.w = w; ov.h = h;
3716 3798
3717 ov_text = new text_t *[h]; 3799 ov.text = new text_t *[h];
3718 ov_rend = new rend_t *[h]; 3800 ov.rend = new rend_t *[h];
3719 3801
3720 for (y = 0; y < h; y++) 3802 for (y = 0; y < h; y++)
3721 { 3803 {
3722 text_t *tp = ov_text[y] = new text_t[w]; 3804 text_t *tp = ov.text[y] = new text_t[w];
3723 rend_t *rp = ov_rend[y] = new rend_t[w]; 3805 rend_t *rp = ov.rend[y] = new rend_t[w];
3724 3806
3725 text_t t0, t1, t2; 3807 text_t t0, t1, t2;
3726 rend_t r = OVERLAY_RSTYLE; 3808 rend_t r = OVERLAY_RSTYLE;
3727 3809
3728 if (y == 0) 3810 if (y == 0)
… …
3747} 3829}
3748 3830
3749void 3831void
3750rxvt_term::scr_overlay_off () NOTHROW 3832rxvt_term::scr_overlay_off () NOTHROW
3751{ 3833{
3752 if (!ov_text) 3834 if (!ov.text)
3753 return; 3835 return;
3754 3836
3755 want_refresh = 1; 3837 want_refresh = 1;
3756 3838
3757 for (int y = 0; y < ov_h; y++) 3839 for (int y = 0; y < ov.h; y++)
3758 { 3840 {
3759 delete [] ov_text[y]; 3841 delete [] ov.text[y];
3760 delete [] ov_rend[y]; 3842 delete [] ov.rend[y];
3761 } 3843 }
3762 3844
3763 delete [] ov_text; ov_text = 0; 3845 delete [] ov.text; ov.text = 0;
3764 delete [] ov_rend; ov_rend = 0; 3846 delete [] ov.rend; ov.rend = 0;
3765} 3847}
3766 3848
3767void 3849void
3768rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3850rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3769{ 3851{
3770 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3852 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3771 return; 3853 return;
3772 3854
3773 x++, y++; 3855 x++, y++;
3774 3856
3775 ov_text[y][x] = text; 3857 ov.text[y][x] = text;
3776 ov_rend[y][x] = rend; 3858 ov.rend[y][x] = rend;
3777} 3859}
3778 3860
3779void 3861void
3780rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3862rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3781{ 3863{
… …
3800} 3882}
3801 3883
3802void 3884void
3803rxvt_term::scr_swap_overlay () NOTHROW 3885rxvt_term::scr_swap_overlay () NOTHROW
3804{ 3886{
3805 if (!ov_text) 3887 if (!ov.text)
3806 return; 3888 return;
3807 3889
3890 // hide cursor if it is within the overlay area
3891 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3892 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3893 screen.flags &= ~Screen_VisibleCursor;
3894
3808 // swap screen mem with overlay 3895 // swap screen mem with overlay
3809 for (int y = ov_h; y--; ) 3896 for (int y = ov.h; y--; )
3810 { 3897 {
3811 text_t *t1 = ov_text[y]; 3898 text_t *t1 = ov.text[y];
3812 rend_t *r1 = ov_rend[y]; 3899 rend_t *r1 = ov.rend[y];
3813 3900
3814 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3901 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3815 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3902 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3816 3903
3817 for (int x = ov_w; x--; ) 3904 for (int x = ov.w; x--; )
3818 { 3905 {
3819 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3906 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3820 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3907 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3821 } 3908 }
3822 } 3909 }

Diff Legend

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