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.313 by root, Tue Nov 4 14:25:10 2008 UTC vs.
Revision 1.345 by sf-exg, Sat Jul 24 10:20:26 2010 UTC

… …
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 seperate 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 // ... artificially enlargen the previous one
912 c = ' '; 917 c = NOCHAR;
913 // and try the same character next loop iteration 918 // and try the same character next loop iteration
914 --str; 919 --str;
915 } 920 }
916 921
917 line->touch (); 922 line->touch ();
… …
993#endif 998#endif
994 } 999 }
995 1000
996 max_it (line->l, screen.cur.col); 1001 max_it (line->l, screen.cur.col);
997 1002
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
1000#endif
1001} 1004}
1002 1005
1003/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
1004/* 1007/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1334 return; 1337 return;
1335 1338
1336 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1337 1340
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1339 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1347 {
1343 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1344 1349
1345 if (mapped) 1350 if (mapped && !view_start)
1346 XClearArea (dpy, vt, 0, 1351 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1352 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1353 (unsigned int)Height2Pixel (num), False);
1349 } 1354 }
1350 else 1355 else
1351 { 1356 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1358
1359 if (mapped && !view_start)
1360 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1363 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1364 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1365 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1366 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1362 } 1370 }
1363 1371
1364 for (; num--; row++) 1372 for (; num--; row++)
1365 { 1373 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1374 scr_blank_screen_mem (ROW(row), rstyle);
1375
1376 if (!view_start)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1368 } 1378 }
1369} 1379}
1370 1380
1371#if !ENABLE_MINIMAL 1381#if !ENABLE_MINIMAL
1372void 1382void
… …
1446 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1447 */ 1457 */
1448void 1458void
1449rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1450{ 1460{
1451 int col, row;
1452 rend_t tr;
1453
1454 want_refresh = 1; 1461 want_refresh = 1;
1455 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1456 1463
1457 if (count <= 0) 1464 if (count <= 0)
1458 return; 1465 return;
… …
1460 scr_do_wrap (); 1467 scr_do_wrap ();
1461 1468
1462 selection_check (1); 1469 selection_check (1);
1463 min_it (count, ncol - screen.cur.col); 1470 min_it (count, ncol - screen.cur.col);
1464 1471
1465 row = screen.cur.row; 1472 int row = screen.cur.row;
1466 1473
1467 line_t *line = &ROW(row); 1474 line_t *line = &ROW(row);
1468 1475
1469 line->touch (); 1476 line->touch ();
1470 line->is_longer (0); 1477 line->is_longer (0);
1471 1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1482
1472 switch (insdel) 1483 switch (insdel)
1473 { 1484 {
1474 case INSERT: 1485 case INSERT:
1475 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1486 line->l = min (line->l + count, ncol);
1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1476 { 1492 {
1477 line->t[col] = line->t[col - count]; 1493 line->t[col] = line->t[col - count];
1478 line->r[col] = line->r[col - count]; 1494 line->r[col] = line->r[col - count];
1479 } 1495 }
1480
1481 line->l = min (line->l + count, ncol);
1482 1496
1483 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1484 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1485 { 1499 {
1486 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
… …
1501 case ERASE: 1515 case ERASE:
1502 screen.cur.col += count; /* don't worry if > ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1503 selection_check (1); 1517 selection_check (1);
1504 screen.cur.col -= count; 1518 screen.cur.col -= count;
1505 1519
1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1506 scr_blank_line (*line, screen.cur.col, count, rstyle); 1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1507 break; 1525 break;
1508 1526
1509 case DELETE: 1527 case DELETE:
1510 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1528 line->l = max (line->l - count, 0);
1511 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1512 for (col = screen.cur.col; (col + count) < ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1535 {
1514 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1516 } 1538 }
1517 1539
1518 line->l = max (line->l - count, 0);
1519 scr_blank_line (*line, ncol - count, count, tr); 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1520 1541
1521 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1522 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1523 { 1544 {
1524 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1814 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1815 { 1836 {
1816 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1817 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1818 } 1839 }
1819// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1820 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1821 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1822 1843
1823 num_scr_allow = 0; 1844 num_scr_allow = 0;
1824 1845
… …
1915 1936
1916 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1917 } 1938 }
1918 else 1939 else
1919 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1920#endif 1942#endif
1921} 1943}
1922 1944
1923/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1946/* ARGSUSED */
… …
1943 row_start = view_start; 1965 row_start = view_start;
1944 } 1966 }
1945 1967
1946 wctomb (0, 0); 1968 wctomb (0, 0);
1947 1969
1948 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1949 { 1971 {
1950 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1951 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1952 1974
1953 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1982 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1983 */ 2005 */
1984void 2006void
1985rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
1986{ 2008{
1987 unsigned char have_bg,
1988 showcursor; /* show the cursor */
1989 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1990 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1991 int i; /* tmp */ 2011 int i; /* tmp */
1992#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1993 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
2004 /* 2024 /*
2005 * A: set up vars 2025 * A: set up vars
2006 */ 2026 */
2007 refresh_count = 0; 2027 refresh_count = 0;
2008 2028
2029 unsigned int old_screen_flags = screen.flags;
2009 have_bg = 0; 2030 char have_bg = 0;
2010#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2011 have_bg = bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2012#endif 2033#endif
2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2014 2035
2015 /* 2036 /*
2016 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2017 */ 2038 */
2018 scr_reverse_selection (); 2039 scr_reverse_selection ();
2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2019 2047
2020 /* 2048 /*
2021 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2022 */ 2050 */
2023 { 2051 {
2024 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2025 2053
2026 showcursor = (screen.flags & Screen_VisibleCursor);
2027#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2028 if (hidden_cursor) 2055 if (hidden_cursor)
2029 showcursor = 0; 2056 showcursor = 0;
2030#endif 2057#endif
2031 2058
… …
2059 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2060#else 2087#else
2061 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2062#endif 2089#endif
2063 2090
2064 if (showcursor && focus) 2091 if (focus)
2065 { 2092 {
2066 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2067 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2068 else 2095 else
2069 { 2096 {
… …
2104 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2105 } 2132 }
2106 } 2133 }
2107 } 2134 }
2108 2135
2109 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2110#if ENABLE_OVERLAY
2111 scr_swap_overlay ();
2112#endif
2113
2114#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2115 /* 2137 /*
2116 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2117 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2118 */ 2140 */
… …
2210 2232
2211 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2212 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2213 --col; 2235 --col;
2214 2236
2215 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2216 text_t *text = stp + col; 2238 text_t *text = stp + col;
2217 int count = 1; 2239 int count = 1;
2218 2240
2219 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2220 drp[col] = rend; 2242 drp[col] = rend;
… …
2224 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2225 { 2247 {
2226 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2227 { 2249 {
2228 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2229 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2230 count++; 2253 count++;
2231 i++; 2254 i++;
2232 2255
2233 continue; 2256 continue;
2234 } 2257 }
… …
2264 */ 2287 */
2265 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2266 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2267 2290
2268 // only do special processing if any attributes are set, which is unlikely 2291 // only do special processing if any attributes are set, which is unlikely
2269 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2270 { 2293 {
2271 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2272 2295
2273#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2274 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2293 2316
2294 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2295 fore = Color_UL; 2318 fore = Color_UL;
2296#endif 2319#endif
2297 2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2298 if (invert) 2341 if (invert)
2299 { 2342 {
2300#ifdef OPTION_HC
2301 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2302 || !ISSET_PIXCOLOR (Color_HC))
2303#endif
2304 /* invert the column if no highlightColor is set or it is the
2305 * current cursor column */
2306 ::swap (fore, back); 2343 ::swap (fore, back);
2307#ifdef OPTION_HC
2308 else if (ISSET_PIXCOLOR (Color_HC))
2309 back = Color_HC;
2310#endif
2311 2344
2312#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2313# ifndef OPTION_HC
2314 if (ISSET_PIXCOLOR (Color_RV))
2315 back = Color_RV;
2316# endif
2317 if (fore == back) 2346 if (fore == back)
2318 { 2347 {
2319 fore = Color_bg; 2348 fore = Color_bg;
2320 back = Color_fg; 2349 back = Color_fg;
2321 } 2350 }
… …
2390 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2391 } 2420 }
2392 } /* for (col....) */ 2421 } /* for (col....) */
2393 } /* for (row....) */ 2422 } /* for (row....) */
2394 2423
2395#if ENABLE_OVERLAY
2396 scr_swap_overlay ();
2397#endif
2398 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2399
2400 /* 2424 /*
2401 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2402 */ 2426 */
2403 if (showcursor) 2427 if (showcursor)
2404 { 2428 {
… …
2442 } 2466 }
2443 2467
2444 /* 2468 /*
2445 * H: cleanup selection 2469 * H: cleanup selection
2446 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2447 scr_reverse_selection (); 2476 scr_reverse_selection ();
2448 2477
2478 screen.flags = old_screen_flags;
2449 num_scr = 0; 2479 num_scr = 0;
2450 num_scr_allow = 1; 2480 num_scr_allow = 1;
2451} 2481}
2452 2482
2453void 2483void
… …
2573 { 2603 {
2574#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2575 if (selection.rect) 2605 if (selection.rect)
2576 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2577 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2578 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2579 else 2609 else
2580#endif 2610#endif
2581 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2582 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2583 RS_RVid); 2613 RS_Sel | RS_RVid);
2584 } 2614 }
2585} 2615}
2586 2616
2587/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2588/* 2618/*
… …
2649/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2650/* 2680/*
2651 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2652 */ 2682 */
2653void 2683void
2654rxvt_term::paste (char *data, unsigned int len) NOTHROW 2684rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2655{ 2685{
2656 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2657 for (unsigned int i = 0; i < len; i++) 2687 for (unsigned int i = 0; i < len; i++)
2658 if (data[i] == C0_LF) 2688 if (data[i] == C0_LF)
2659 data[i] = C0_CR; 2689 data[i] = C0_CR;
… …
2663 2693
2664 tt_write (data, len); 2694 tt_write (data, len);
2665 2695
2666 if (priv_modes & PrivMode_BracketPaste) 2696 if (priv_modes & PrivMode_BracketPaste)
2667 tt_printf ("\e[201~"); 2697 tt_printf ("\e[201~");
2698}
2699
2700void
2701rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{
2703 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 return;
2705
2706 tt_paste (data, len);
2668} 2707}
2669 2708
2670/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2671/* 2710/*
2672 * Respond to a notification that a primary selection has been sent 2711 * Respond to a notification that a primary selection has been sent
… …
2881 selection_wait = Sel_normal; 2920 selection_wait = Sel_normal;
2882 2921
2883#if X_HAVE_UTF8_STRING 2922#if X_HAVE_UTF8_STRING
2884 selection_type = Sel_UTF8String; 2923 selection_type = Sel_UTF8String;
2885 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2886 return; 2925 return;
2887#else 2926#else
2888 selection_type = Sel_CompoundText; 2927 selection_type = Sel_CompoundText;
2889 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2890 return; 2929 return;
2891#endif 2930#endif
2892 } 2931 }
2893 2932
2894 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2895 selection_paste (display->root, XA_CUT_BUFFER0, false); 2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2923/* 2962/*
2924 * Clear all selected text 2963 * Clear all selected text
2925 * EXT: SelectionClear 2964 * EXT: SelectionClear
2926 */ 2965 */
2927void 2966void
2928rxvt_term::selection_clear () NOTHROW 2967rxvt_term::selection_clear (bool clipboard) NOTHROW
2929{ 2968{
2969 if (!clipboard)
2970 {
2930 want_refresh = 1; 2971 want_refresh = 1;
2931 free (selection.text); 2972 free (selection.text);
2932 selection.text = NULL; 2973 selection.text = NULL;
2933 selection.len = 0; 2974 selection.len = 0;
2934 CLEAR_SELECTION (); 2975 CLEAR_SELECTION ();
2935 2976
2936 if (display->selection_owner == this) 2977 if (display->selection_owner == this)
2937 display->selection_owner = 0; 2978 display->selection_owner = 0;
2979 }
2980 else
2981 {
2982 free (selection.clip_text);
2983 selection.clip_text = NULL;
2984 selection.clip_len = 0;
2985
2986 if (display->clipboard_owner == this)
2987 display->clipboard_owner = 0;
2988 }
2938} 2989}
2939 2990
2940/* ------------------------------------------------------------------------- */ 2991/* ------------------------------------------------------------------------- */
2941/* 2992/*
2942 * Copy a selection into the cut buffer 2993 * Copy a selection into the cut buffer
… …
3068 3119
3069 selection_grab (tm); 3120 selection_grab (tm);
3070} 3121}
3071 3122
3072bool 3123bool
3073rxvt_term::selection_grab (Time tm) NOTHROW 3124rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3074{ 3125{
3126 Atom sel;
3127
3128 if (!clipboard)
3129 {
3075 selection_time = tm; 3130 selection_time = tm;
3131 sel = XA_PRIMARY;
3132 }
3133 else
3134 {
3135 clipboard_time = tm;
3136 sel = xa[XA_CLIPBOARD];
3137 }
3076 3138
3077 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3139 XSetSelectionOwner (dpy, sel, vt, tm);
3078 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3140 if (XGetSelectionOwner (dpy, sel) == vt)
3079 { 3141 {
3080 display->set_selection_owner (this); 3142 display->set_selection_owner (this, clipboard);
3081 return true; 3143 return true;
3082 } 3144 }
3083 else 3145 else
3084 { 3146 {
3085 selection_clear (); 3147 selection_clear (clipboard);
3086 return false; 3148 return false;
3087 } 3149 }
3088 3150
3089#if 0 3151#if 0
3090 XTextProperty ct; 3152 XTextProperty ct;
… …
3585 else if (rq.target == xa[XA_MULTIPLE]) 3647 else if (rq.target == xa[XA_MULTIPLE])
3586 { 3648 {
3587 /* TODO: Handle MULTIPLE */ 3649 /* TODO: Handle MULTIPLE */
3588 } 3650 }
3589#endif 3651#endif
3590 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3591 { 3653 {
3592 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3593 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3655 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property;
3657 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3594 ev.property = rq.property; 3662 ev.property = rq.property;
3595 } 3663 }
3596 else if (rq.target == XA_STRING 3664 else if (rq.target == XA_STRING
3597 || rq.target == xa[XA_TEXT] 3665 || rq.target == xa[XA_TEXT]
3598 || rq.target == xa[XA_COMPOUND_TEXT] 3666 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3631 { 3699 {
3632 target = xa[XA_COMPOUND_TEXT]; 3700 target = xa[XA_COMPOUND_TEXT];
3633 style = enc_compound_text; 3701 style = enc_compound_text;
3634 } 3702 }
3635 3703
3636 if (selection.text) 3704 if (rq.selection == XA_PRIMARY && selection.text)
3637 { 3705 {
3638 cl = selection.text; 3706 cl = selection.text;
3639 selectlen = selection.len; 3707 selectlen = selection.len;
3708 }
3709 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3710 {
3711 cl = selection.clip_text;
3712 selectlen = selection.clip_len;
3640 } 3713 }
3641 else 3714 else
3642 { 3715 {
3643 cl = L""; 3716 cl = L"";
3644 selectlen = 0; 3717 selectlen = 0;
… …
3712 h += 2; min_it (h, nrow); 3785 h += 2; min_it (h, nrow);
3713 3786
3714 x -= 1; clamp_it (x, 0, ncol - w); 3787 x -= 1; clamp_it (x, 0, ncol - w);
3715 y -= 1; clamp_it (y, 0, nrow - h); 3788 y -= 1; clamp_it (y, 0, nrow - h);
3716 3789
3717 ov_x = x; ov_y = y; 3790 ov.x = x; ov.y = y;
3718 ov_w = w; ov_h = h; 3791 ov.w = w; ov.h = h;
3719 3792
3720 ov_text = new text_t *[h]; 3793 ov.text = new text_t *[h];
3721 ov_rend = new rend_t *[h]; 3794 ov.rend = new rend_t *[h];
3722 3795
3723 for (y = 0; y < h; y++) 3796 for (y = 0; y < h; y++)
3724 { 3797 {
3725 text_t *tp = ov_text[y] = new text_t[w]; 3798 text_t *tp = ov.text[y] = new text_t[w];
3726 rend_t *rp = ov_rend[y] = new rend_t[w]; 3799 rend_t *rp = ov.rend[y] = new rend_t[w];
3727 3800
3728 text_t t0, t1, t2; 3801 text_t t0, t1, t2;
3729 rend_t r = OVERLAY_RSTYLE; 3802 rend_t r = OVERLAY_RSTYLE;
3730 3803
3731 if (y == 0) 3804 if (y == 0)
… …
3750} 3823}
3751 3824
3752void 3825void
3753rxvt_term::scr_overlay_off () NOTHROW 3826rxvt_term::scr_overlay_off () NOTHROW
3754{ 3827{
3755 if (!ov_text) 3828 if (!ov.text)
3756 return; 3829 return;
3757 3830
3758 want_refresh = 1; 3831 want_refresh = 1;
3759 3832
3760 for (int y = 0; y < ov_h; y++) 3833 for (int y = 0; y < ov.h; y++)
3761 { 3834 {
3762 delete [] ov_text[y]; 3835 delete [] ov.text[y];
3763 delete [] ov_rend[y]; 3836 delete [] ov.rend[y];
3764 } 3837 }
3765 3838
3766 delete [] ov_text; ov_text = 0; 3839 delete [] ov.text; ov.text = 0;
3767 delete [] ov_rend; ov_rend = 0; 3840 delete [] ov.rend; ov.rend = 0;
3768} 3841}
3769 3842
3770void 3843void
3771rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3844rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3772{ 3845{
3773 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3846 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3774 return; 3847 return;
3775 3848
3776 x++, y++; 3849 x++, y++;
3777 3850
3778 ov_text[y][x] = text; 3851 ov.text[y][x] = text;
3779 ov_rend[y][x] = rend; 3852 ov.rend[y][x] = rend;
3780} 3853}
3781 3854
3782void 3855void
3783rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3856rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3784{ 3857{
… …
3803} 3876}
3804 3877
3805void 3878void
3806rxvt_term::scr_swap_overlay () NOTHROW 3879rxvt_term::scr_swap_overlay () NOTHROW
3807{ 3880{
3808 if (!ov_text) 3881 if (!ov.text)
3809 return; 3882 return;
3810 3883
3884 // hide cursor if it is within the overlay area
3885 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3886 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3887 screen.flags &= ~Screen_VisibleCursor;
3888
3811 // swap screen mem with overlay 3889 // swap screen mem with overlay
3812 for (int y = ov_h; y--; ) 3890 for (int y = ov.h; y--; )
3813 { 3891 {
3814 text_t *t1 = ov_text[y]; 3892 text_t *t1 = ov.text[y];
3815 rend_t *r1 = ov_rend[y]; 3893 rend_t *r1 = ov.rend[y];
3816 3894
3817 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3895 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3818 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3896 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3819 3897
3820 for (int x = ov_w; x--; ) 3898 for (int x = ov.w; x--; )
3821 { 3899 {
3822 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3900 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3823 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3901 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3824 } 3902 }
3825 } 3903 }

Diff Legend

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