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.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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 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);
… …
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907 912
908 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 { 915 {
911 // ...output spaces 916 if (screen.flags & Screen_Autowrap)
912 c = ' '; 917 {
918 // ... artificially enlargen the previous one
919 c = NOCHAR;
913 // and try the same character next loop iteration 920 // and try the same character next loop iteration
914 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
915 } 925 }
916 926
917 line->touch (); 927 line->touch ();
918 928
919 do 929 do
… …
993#endif 1003#endif
994 } 1004 }
995 1005
996 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
997 1007
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1000#endif
1001} 1009}
1002 1010
1003/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1004/* 1012/*
1005 * 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
… …
1018 1026
1019 want_refresh = 1; 1027 want_refresh = 1;
1020#endif 1028#endif
1021 } 1029 }
1022 } 1030 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034#endif
1023 else 1035 else
1024 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1025} 1037}
1026 1038
1027/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1334 return; 1346 return;
1335 1347
1336 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1337 1349
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1353 {
1343 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1344 1355
1345 if (mapped) 1356 if (mapped)
1346 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1349 } 1360 }
1350 else 1361 else
1351 { 1362 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1364
1365 if (mapped)
1366 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1370 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1371 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1372 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1362 } 1376 }
1363 1377
1364 for (; num--; row++) 1378 for (; num--; row++)
1365 { 1379 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1384 }
1369} 1385}
1370 1386
1371#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1372void 1388void
… …
1464 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1465 1481
1466 line->touch (); 1482 line->touch ();
1467 line->is_longer (0); 1483 line->is_longer (0);
1468 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1469 switch (insdel) 1489 switch (insdel)
1470 { 1490 {
1471 case INSERT: 1491 case INSERT:
1472 line->l = min (line->l + count, ncol); 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);
1473 1496
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1498 {
1476 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1521 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1523 selection_check (1);
1501 screen.cur.col -= count; 1524 screen.cur.col -= count;
1502 1525
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 {
1508 line->l = max (line->l - count, 0); 1534 line->l = max (line->l - count, 0);
1509 1535
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 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);
1511 1539
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1541 {
1514 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1516 } 1544 }
1517 1545
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); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1547
1524 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1550 {
1527 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1552 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1553 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1554 CLEAR_SELECTION ();
1531 else 1555 else
1532 { 1556 {
1533 /* shift selection */ 1557 /* shift selection */
1534 selection.beg.col -= count; 1558 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1559 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1560 selection.end.col -= count;
1537 } 1561 }
1538 }
1539 } 1562 }
1540 1563
1541 break; 1564 break;
1542 } 1565 }
1543} 1566}
… …
1818 for (i = PART_BEG; i < RC_COUNT; i++) 1841 for (i = PART_BEG; i < RC_COUNT; i++)
1819 { 1842 {
1820 min_it (rc[i].col, ncol - 1); 1843 min_it (rc[i].col, ncol - 1);
1821 min_it (rc[i].row, nrow - 1); 1844 min_it (rc[i].row, nrow - 1);
1822 } 1845 }
1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1846
1824 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++)
1825 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);
1826 1849
1827 num_scr_allow = 0; 1850 num_scr_allow = 0;
1828 1851
… …
1919 1942
1920 bell_ev.start (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1921 } 1944 }
1922 else 1945 else
1923 XBell (dpy, 0); 1946 XBell (dpy, 0);
1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1924#endif 1948#endif
1925} 1949}
1926 1950
1927/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1928/* ARGSUSED */ 1952/* ARGSUSED */
… …
1947 row_start = view_start; 1971 row_start = view_start;
1948 } 1972 }
1949 1973
1950 wctomb (0, 0); 1974 wctomb (0, 0);
1951 1975
1952 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1953 { 1977 {
1954 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1955 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1956 1980
1957 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
… …
1986 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2011 */
1988void 2012void
1989rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1990{ 2014{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2017 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2030 /*
2009 * A: set up vars 2031 * A: set up vars
2010 */ 2032 */
2011 refresh_count = 0; 2033 refresh_count = 0;
2012 2034
2035 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2036 char have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bgPixmap.pixmap != None;
2016#endif 2039#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2041
2019 /* 2042 /*
2020 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
2021 */ 2044 */
2022 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;
2023 2053
2024 /* 2054 /*
2025 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
2026 */ 2056 */
2027 { 2057 {
2028 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2029 2059
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2061 if (hidden_cursor)
2033 showcursor = 0; 2062 showcursor = 0;
2034#endif 2063#endif
2035 2064
… …
2063 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2064#else 2093#else
2065 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2066#endif 2095#endif
2067 2096
2068 if (showcursor && focus) 2097 if (focus)
2069 { 2098 {
2070 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2071 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2072 else 2101 else
2073 { 2102 {
… …
2108 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2109 } 2138 }
2110 } 2139 }
2111 } 2140 }
2112 2141
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 2142#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2143 /*
2120 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2122 */ 2146 */
… …
2214 2238
2215 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2216 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2217 --col; 2241 --col;
2218 2242
2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2220 text_t *text = stp + col; 2244 text_t *text = stp + col;
2221 int count = 1; 2245 int count = 1;
2222 2246
2223 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2224 drp[col] = rend; 2248 drp[col] = rend;
… …
2228 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2229 { 2253 {
2230 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2231 { 2255 {
2232 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2233 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2234 count++; 2259 count++;
2235 i++; 2260 i++;
2236 2261
2237 continue; 2262 continue;
2238 } 2263 }
… …
2268 */ 2293 */
2269 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2270 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2271 2296
2272 // 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
2273 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)))
2274 { 2299 {
2275 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2276 2301
2277#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2278 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2297 2322
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2324 fore = Color_UL;
2300#endif 2325#endif
2301 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
2302 if (invert) 2347 if (invert)
2303 { 2348 {
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); 2349 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2350
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#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) 2352 if (fore == back)
2322 { 2353 {
2323 fore = Color_bg; 2354 fore = Color_bg;
2324 back = Color_fg; 2355 back = Color_fg;
2325 } 2356 }
… …
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2426 }
2396 } /* for (col....) */ 2427 } /* for (col....) */
2397 } /* for (row....) */ 2428 } /* for (row....) */
2398 2429
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403
2404 /* 2430 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2432 */
2407 if (showcursor) 2433 if (showcursor)
2408 { 2434 {
… …
2446 } 2472 }
2447 2473
2448 /* 2474 /*
2449 * H: cleanup selection 2475 * H: cleanup selection
2450 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2451 scr_reverse_selection (); 2482 scr_reverse_selection ();
2452 2483
2484 screen.flags = old_screen_flags;
2453 num_scr = 0; 2485 num_scr = 0;
2454 num_scr_allow = 1; 2486 num_scr_allow = 1;
2455} 2487}
2456 2488
2457void 2489void
… …
2577 { 2609 {
2578#if !ENABLE_MINIMAL 2610#if !ENABLE_MINIMAL
2579 if (selection.rect) 2611 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col, 2612 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col, 2613 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline); 2614 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2583 else 2615 else
2584#endif 2616#endif
2585 scr_xor_span (selection.beg.row, selection.beg.col, 2617 scr_xor_span (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2618 selection.end.row, selection.end.col,
2587 RS_RVid); 2619 RS_Sel | RS_RVid);
2588 } 2620 }
2589} 2621}
2590 2622
2591/* ------------------------------------------------------------------------- */ 2623/* ------------------------------------------------------------------------- */
2592/* 2624/*
… …
2653/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2654/* 2686/*
2655 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2656 */ 2688 */
2657void 2689void
2658rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2659{ 2691{
2660 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2661 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2662 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2663 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2667 2699
2668 tt_write (data, len); 2700 tt_write (data, len);
2669 2701
2670 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2671 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);
2672} 2713}
2673 2714
2674/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2675/* 2716/*
2676 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2885 selection_wait = Sel_normal; 2926 selection_wait = Sel_normal;
2886 2927
2887#if X_HAVE_UTF8_STRING 2928#if X_HAVE_UTF8_STRING
2888 selection_type = Sel_UTF8String; 2929 selection_type = Sel_UTF8String;
2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2890 return; 2931 return;
2891#else 2932#else
2892 selection_type = Sel_CompoundText; 2933 selection_type = Sel_CompoundText;
2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2894 return; 2935 return;
2895#endif 2936#endif
2896 } 2937 }
2897 2938
2898 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2899 selection_paste (display->root, XA_CUT_BUFFER0, false); 2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2927/* 2968/*
2928 * Clear all selected text 2969 * Clear all selected text
2929 * EXT: SelectionClear 2970 * EXT: SelectionClear
2930 */ 2971 */
2931void 2972void
2932rxvt_term::selection_clear () NOTHROW 2973rxvt_term::selection_clear (bool clipboard) NOTHROW
2933{ 2974{
2975 if (!clipboard)
2976 {
2934 want_refresh = 1; 2977 want_refresh = 1;
2935 free (selection.text); 2978 free (selection.text);
2936 selection.text = NULL; 2979 selection.text = NULL;
2937 selection.len = 0; 2980 selection.len = 0;
2938 CLEAR_SELECTION (); 2981 CLEAR_SELECTION ();
2939 2982
2940 if (display->selection_owner == this) 2983 if (display->selection_owner == this)
2941 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 }
2942} 2995}
2943 2996
2944/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2945/* 2998/*
2946 * Copy a selection into the cut buffer 2999 * Copy a selection into the cut buffer
… …
3072 3125
3073 selection_grab (tm); 3126 selection_grab (tm);
3074} 3127}
3075 3128
3076bool 3129bool
3077rxvt_term::selection_grab (Time tm) NOTHROW 3130rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3078{ 3131{
3132 Atom sel;
3133
3134 if (!clipboard)
3135 {
3079 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 }
3080 3144
3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3145 XSetSelectionOwner (dpy, sel, vt, tm);
3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3146 if (XGetSelectionOwner (dpy, sel) == vt)
3083 { 3147 {
3084 display->set_selection_owner (this); 3148 display->set_selection_owner (this, clipboard);
3085 return true; 3149 return true;
3086 } 3150 }
3087 else 3151 else
3088 { 3152 {
3089 selection_clear (); 3153 selection_clear (clipboard);
3090 return false; 3154 return false;
3091 } 3155 }
3092 3156
3093#if 0 3157#if 0
3094 XTextProperty ct; 3158 XTextProperty ct;
… …
3589 else if (rq.target == xa[XA_MULTIPLE]) 3653 else if (rq.target == xa[XA_MULTIPLE])
3590 { 3654 {
3591 /* TODO: Handle MULTIPLE */ 3655 /* TODO: Handle MULTIPLE */
3592 } 3656 }
3593#endif 3657#endif
3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3595 { 3659 {
3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3597 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);
3598 ev.property = rq.property; 3668 ev.property = rq.property;
3599 } 3669 }
3600 else if (rq.target == XA_STRING 3670 else if (rq.target == XA_STRING
3601 || rq.target == xa[XA_TEXT] 3671 || rq.target == xa[XA_TEXT]
3602 || rq.target == xa[XA_COMPOUND_TEXT] 3672 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3635 { 3705 {
3636 target = xa[XA_COMPOUND_TEXT]; 3706 target = xa[XA_COMPOUND_TEXT];
3637 style = enc_compound_text; 3707 style = enc_compound_text;
3638 } 3708 }
3639 3709
3640 if (selection.text) 3710 if (rq.selection == XA_PRIMARY && selection.text)
3641 { 3711 {
3642 cl = selection.text; 3712 cl = selection.text;
3643 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;
3644 } 3719 }
3645 else 3720 else
3646 { 3721 {
3647 cl = L""; 3722 cl = L"";
3648 selectlen = 0; 3723 selectlen = 0;
… …
3716 h += 2; min_it (h, nrow); 3791 h += 2; min_it (h, nrow);
3717 3792
3718 x -= 1; clamp_it (x, 0, ncol - w); 3793 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3794 y -= 1; clamp_it (y, 0, nrow - h);
3720 3795
3721 ov_x = x; ov_y = y; 3796 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3797 ov.w = w; ov.h = h;
3723 3798
3724 ov_text = new text_t *[h]; 3799 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3800 ov.rend = new rend_t *[h];
3726 3801
3727 for (y = 0; y < h; y++) 3802 for (y = 0; y < h; y++)
3728 { 3803 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3804 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3805 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3806
3732 text_t t0, t1, t2; 3807 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3808 rend_t r = OVERLAY_RSTYLE;
3734 3809
3735 if (y == 0) 3810 if (y == 0)
… …
3754} 3829}
3755 3830
3756void 3831void
3757rxvt_term::scr_overlay_off () NOTHROW 3832rxvt_term::scr_overlay_off () NOTHROW
3758{ 3833{
3759 if (!ov_text) 3834 if (!ov.text)
3760 return; 3835 return;
3761 3836
3762 want_refresh = 1; 3837 want_refresh = 1;
3763 3838
3764 for (int y = 0; y < ov_h; y++) 3839 for (int y = 0; y < ov.h; y++)
3765 { 3840 {
3766 delete [] ov_text[y]; 3841 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3842 delete [] ov.rend[y];
3768 } 3843 }
3769 3844
3770 delete [] ov_text; ov_text = 0; 3845 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3846 delete [] ov.rend; ov.rend = 0;
3772} 3847}
3773 3848
3774void 3849void
3775rxvt_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
3776{ 3851{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3852 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3853 return;
3779 3854
3780 x++, y++; 3855 x++, y++;
3781 3856
3782 ov_text[y][x] = text; 3857 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3858 ov.rend[y][x] = rend;
3784} 3859}
3785 3860
3786void 3861void
3787rxvt_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
3788{ 3863{
… …
3807} 3882}
3808 3883
3809void 3884void
3810rxvt_term::scr_swap_overlay () NOTHROW 3885rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3886{
3812 if (!ov_text) 3887 if (!ov.text)
3813 return; 3888 return;
3814 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
3815 // swap screen mem with overlay 3895 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3896 for (int y = ov.h; y--; )
3817 { 3897 {
3818 text_t *t1 = ov_text[y]; 3898 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3899 rend_t *r1 = ov.rend[y];
3820 3900
3821 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;
3822 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;
3823 3903
3824 for (int x = ov_w; x--; ) 3904 for (int x = ov.w; x--; )
3825 { 3905 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3906 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 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));
3828 } 3908 }
3829 } 3909 }

Diff Legend

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