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.315 by root, Tue Nov 4 14:38:29 2008 UTC vs.
Revision 1.343 by sf-exg, Thu Jul 1 21:52:52 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
… …
1464 line_t *line = &ROW(row); 1474 line_t *line = &ROW(row);
1465 1475
1466 line->touch (); 1476 line->touch ();
1467 line->is_longer (0); 1477 line->is_longer (0);
1468 1478
1469 // nuke wide char at beginning 1479 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1480 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1481 scr_kill_char (*line, screen.cur.col);
1472 1482
1473 switch (insdel) 1483 switch (insdel)
1474 { 1484 {
… …
1513 1523
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1525 break;
1516 1526
1517 case DELETE: 1527 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1528 line->l = max (line->l - count, 0);
1520 1529
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 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);
1522 1533
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1535 {
1525 line->t[col] = line->t[col + count]; 1536 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1537 line->r[col] = line->r[col + count];
1527 } 1538 }
1528 1539
1529 // nuke wide char at the end
1530 if (line->t[screen.cur.col] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col);
1532
1533 scr_blank_line (*line, ncol - count, count, tr); 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1541
1535 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1544 {
1538 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1546 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1547 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1548 CLEAR_SELECTION ();
1542 else 1549 else
1543 { 1550 {
1544 /* shift selection */ 1551 /* shift selection */
1545 selection.beg.col -= count; 1552 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1553 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1554 selection.end.col -= count;
1548 } 1555 }
1549 }
1550 } 1556 }
1551 1557
1552 break; 1558 break;
1553 } 1559 }
1554} 1560}
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1836 {
1831 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1833 } 1839 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1840
1835 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++)
1836 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);
1837 1843
1838 num_scr_allow = 0; 1844 num_scr_allow = 0;
1839 1845
… …
1930 1936
1931 bell_ev.start (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1938 }
1933 else 1939 else
1934 XBell (dpy, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1942#endif
1936} 1943}
1937 1944
1938/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1946/* ARGSUSED */
… …
1958 row_start = view_start; 1965 row_start = view_start;
1959 } 1966 }
1960 1967
1961 wctomb (0, 0); 1968 wctomb (0, 0);
1962 1969
1963 for (int r1 = 0; r1 < nrows; r1++) 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1971 {
1965 text_t *tp = ROW(r1).t; 1972 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1973 int len = ROW(r1).l;
1967 1974
1968 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
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2005 */
1999void 2006void
2000rxvt_term::scr_refresh () NOTHROW 2007rxvt_term::scr_refresh () NOTHROW
2001{ 2008{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2011 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2024 /*
2020 * A: set up vars 2025 * A: set up vars
2021 */ 2026 */
2022 refresh_count = 0; 2027 refresh_count = 0;
2023 2028
2029 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2030 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2031#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
2027#endif 2033#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2035
2030 /* 2036 /*
2031 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
2032 */ 2038 */
2033 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;
2034 2047
2035 /* 2048 /*
2036 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
2037 */ 2050 */
2038 { 2051 {
2039 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
2040 2053
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2055 if (hidden_cursor)
2044 showcursor = 0; 2056 showcursor = 0;
2045#endif 2057#endif
2046 2058
… …
2074 ccol2 = bgcolor_of (rstyle); 2086 ccol2 = bgcolor_of (rstyle);
2075#else 2087#else
2076 ccol2 = Color_bg; 2088 ccol2 = Color_bg;
2077#endif 2089#endif
2078 2090
2079 if (showcursor && focus) 2091 if (focus)
2080 { 2092 {
2081 if (option (Opt_cursorUnderline)) 2093 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2094 *crp ^= RS_Uline;
2083 else 2095 else
2084 { 2096 {
… …
2119 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2120 } 2132 }
2121 } 2133 }
2122 } 2134 }
2123 2135
2124 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2125#if ENABLE_OVERLAY
2126 scr_swap_overlay ();
2127#endif
2128
2129#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2137 /*
2131 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2133 */ 2140 */
… …
2225 2232
2226 // seek to the beginning of wide characters 2233 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2228 --col; 2235 --col;
2229 2236
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2238 text_t *text = stp + col;
2232 int count = 1; 2239 int count = 1;
2233 2240
2234 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2235 drp[col] = rend; 2242 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2246 for (i = 0; ++col < ncol; )
2240 { 2247 {
2241 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2242 { 2249 {
2243 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2244 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2245 count++; 2253 count++;
2246 i++; 2254 i++;
2247 2255
2248 continue; 2256 continue;
2249 } 2257 }
… …
2279 */ 2287 */
2280 int fore = fgcolor_of (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2282 2290
2283 // 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
2284 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)))
2285 { 2293 {
2286 bool invert = rend & RS_RVid; 2294 bool invert = rend & RS_RVid;
2287 2295
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2316
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2318 fore = Color_UL;
2311#endif 2319#endif
2312 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
2313 if (invert) 2341 if (invert)
2314 { 2342 {
2315#ifdef OPTION_HC
2316 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2317 || !ISSET_PIXCOLOR (Color_HC))
2318#endif
2319 /* invert the column if no highlightColor is set or it is the
2320 * current cursor column */
2321 ::swap (fore, back); 2343 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2344
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2328# ifndef OPTION_HC
2329 if (ISSET_PIXCOLOR (Color_RV))
2330 back = Color_RV;
2331# endif
2332 if (fore == back) 2346 if (fore == back)
2333 { 2347 {
2334 fore = Color_bg; 2348 fore = Color_bg;
2335 back = Color_fg; 2349 back = Color_fg;
2336 } 2350 }
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2420 }
2407 } /* for (col....) */ 2421 } /* for (col....) */
2408 } /* for (row....) */ 2422 } /* for (row....) */
2409 2423
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2424 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2426 */
2418 if (showcursor) 2427 if (showcursor)
2419 { 2428 {
… …
2457 } 2466 }
2458 2467
2459 /* 2468 /*
2460 * H: cleanup selection 2469 * H: cleanup selection
2461 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2462 scr_reverse_selection (); 2476 scr_reverse_selection ();
2463 2477
2478 screen.flags = old_screen_flags;
2464 num_scr = 0; 2479 num_scr = 0;
2465 num_scr_allow = 1; 2480 num_scr_allow = 1;
2466} 2481}
2467 2482
2468void 2483void
… …
2588 { 2603 {
2589#if !ENABLE_MINIMAL 2604#if !ENABLE_MINIMAL
2590 if (selection.rect) 2605 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2607 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2609 else
2595#endif 2610#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2598 RS_RVid); 2613 RS_Sel | RS_RVid);
2599 } 2614 }
2600} 2615}
2601 2616
2602/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2603/* 2618/*
… …
2896 selection_wait = Sel_normal; 2911 selection_wait = Sel_normal;
2897 2912
2898#if X_HAVE_UTF8_STRING 2913#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String; 2914 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return; 2916 return;
2902#else 2917#else
2903 selection_type = Sel_CompoundText; 2918 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return; 2920 return;
2906#endif 2921#endif
2907 } 2922 }
2908 2923
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false); 2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2938/* 2953/*
2939 * Clear all selected text 2954 * Clear all selected text
2940 * EXT: SelectionClear 2955 * EXT: SelectionClear
2941 */ 2956 */
2942void 2957void
2943rxvt_term::selection_clear () NOTHROW 2958rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2959{
2960 if (!clipboard)
2961 {
2945 want_refresh = 1; 2962 want_refresh = 1;
2946 free (selection.text); 2963 free (selection.text);
2947 selection.text = NULL; 2964 selection.text = NULL;
2948 selection.len = 0; 2965 selection.len = 0;
2949 CLEAR_SELECTION (); 2966 CLEAR_SELECTION ();
2950 2967
2951 if (display->selection_owner == this) 2968 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2969 display->selection_owner = 0;
2970 }
2971 else
2972 {
2973 free (selection.clip_text);
2974 selection.clip_text = NULL;
2975 selection.clip_len = 0;
2976
2977 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0;
2979 }
2980}
2981
2982void
2983rxvt_term::clipboard_copy (Time tm)
2984{
2985 if (selection.len > 0)
2986 {
2987 free (selection.clip_text);
2988 selection.clip_len = selection.len;
2989 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2990 memcpy (selection.clip_text, selection.text,
2991 sizeof (wchar_t) * selection.clip_len);
2992 selection_grab (tm, true);
2993 }
2953} 2994}
2954 2995
2955/* ------------------------------------------------------------------------- */ 2996/* ------------------------------------------------------------------------- */
2956/* 2997/*
2957 * Copy a selection into the cut buffer 2998 * Copy a selection into the cut buffer
… …
3083 3124
3084 selection_grab (tm); 3125 selection_grab (tm);
3085} 3126}
3086 3127
3087bool 3128bool
3088rxvt_term::selection_grab (Time tm) NOTHROW 3129rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3089{ 3130{
3131 Atom sel;
3132
3133 if (!clipboard)
3134 {
3090 selection_time = tm; 3135 selection_time = tm;
3136 sel = XA_PRIMARY;
3137 }
3138 else
3139 {
3140 clipboard_time = tm;
3141 sel = xa[XA_CLIPBOARD];
3142 }
3091 3143
3092 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3144 XSetSelectionOwner (dpy, sel, vt, tm);
3093 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3145 if (XGetSelectionOwner (dpy, sel) == vt)
3094 { 3146 {
3095 display->set_selection_owner (this); 3147 display->set_selection_owner (this, clipboard);
3096 return true; 3148 return true;
3097 } 3149 }
3098 else 3150 else
3099 { 3151 {
3100 selection_clear (); 3152 selection_clear (clipboard);
3101 return false; 3153 return false;
3102 } 3154 }
3103 3155
3104#if 0 3156#if 0
3105 XTextProperty ct; 3157 XTextProperty ct;
… …
3600 else if (rq.target == xa[XA_MULTIPLE]) 3652 else if (rq.target == xa[XA_MULTIPLE])
3601 { 3653 {
3602 /* TODO: Handle MULTIPLE */ 3654 /* TODO: Handle MULTIPLE */
3603 } 3655 }
3604#endif 3656#endif
3605 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3657 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3606 { 3658 {
3607 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3659 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3608 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3660 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3661 ev.property = rq.property;
3662 }
3663 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3664 {
3665 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3666 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3609 ev.property = rq.property; 3667 ev.property = rq.property;
3610 } 3668 }
3611 else if (rq.target == XA_STRING 3669 else if (rq.target == XA_STRING
3612 || rq.target == xa[XA_TEXT] 3670 || rq.target == xa[XA_TEXT]
3613 || rq.target == xa[XA_COMPOUND_TEXT] 3671 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3646 { 3704 {
3647 target = xa[XA_COMPOUND_TEXT]; 3705 target = xa[XA_COMPOUND_TEXT];
3648 style = enc_compound_text; 3706 style = enc_compound_text;
3649 } 3707 }
3650 3708
3651 if (selection.text) 3709 if (rq.selection == XA_PRIMARY && selection.text)
3652 { 3710 {
3653 cl = selection.text; 3711 cl = selection.text;
3654 selectlen = selection.len; 3712 selectlen = selection.len;
3713 }
3714 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3715 {
3716 cl = selection.clip_text;
3717 selectlen = selection.clip_len;
3655 } 3718 }
3656 else 3719 else
3657 { 3720 {
3658 cl = L""; 3721 cl = L"";
3659 selectlen = 0; 3722 selectlen = 0;
… …
3727 h += 2; min_it (h, nrow); 3790 h += 2; min_it (h, nrow);
3728 3791
3729 x -= 1; clamp_it (x, 0, ncol - w); 3792 x -= 1; clamp_it (x, 0, ncol - w);
3730 y -= 1; clamp_it (y, 0, nrow - h); 3793 y -= 1; clamp_it (y, 0, nrow - h);
3731 3794
3732 ov_x = x; ov_y = y; 3795 ov.x = x; ov.y = y;
3733 ov_w = w; ov_h = h; 3796 ov.w = w; ov.h = h;
3734 3797
3735 ov_text = new text_t *[h]; 3798 ov.text = new text_t *[h];
3736 ov_rend = new rend_t *[h]; 3799 ov.rend = new rend_t *[h];
3737 3800
3738 for (y = 0; y < h; y++) 3801 for (y = 0; y < h; y++)
3739 { 3802 {
3740 text_t *tp = ov_text[y] = new text_t[w]; 3803 text_t *tp = ov.text[y] = new text_t[w];
3741 rend_t *rp = ov_rend[y] = new rend_t[w]; 3804 rend_t *rp = ov.rend[y] = new rend_t[w];
3742 3805
3743 text_t t0, t1, t2; 3806 text_t t0, t1, t2;
3744 rend_t r = OVERLAY_RSTYLE; 3807 rend_t r = OVERLAY_RSTYLE;
3745 3808
3746 if (y == 0) 3809 if (y == 0)
… …
3765} 3828}
3766 3829
3767void 3830void
3768rxvt_term::scr_overlay_off () NOTHROW 3831rxvt_term::scr_overlay_off () NOTHROW
3769{ 3832{
3770 if (!ov_text) 3833 if (!ov.text)
3771 return; 3834 return;
3772 3835
3773 want_refresh = 1; 3836 want_refresh = 1;
3774 3837
3775 for (int y = 0; y < ov_h; y++) 3838 for (int y = 0; y < ov.h; y++)
3776 { 3839 {
3777 delete [] ov_text[y]; 3840 delete [] ov.text[y];
3778 delete [] ov_rend[y]; 3841 delete [] ov.rend[y];
3779 } 3842 }
3780 3843
3781 delete [] ov_text; ov_text = 0; 3844 delete [] ov.text; ov.text = 0;
3782 delete [] ov_rend; ov_rend = 0; 3845 delete [] ov.rend; ov.rend = 0;
3783} 3846}
3784 3847
3785void 3848void
3786rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3849rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3787{ 3850{
3788 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3851 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3789 return; 3852 return;
3790 3853
3791 x++, y++; 3854 x++, y++;
3792 3855
3793 ov_text[y][x] = text; 3856 ov.text[y][x] = text;
3794 ov_rend[y][x] = rend; 3857 ov.rend[y][x] = rend;
3795} 3858}
3796 3859
3797void 3860void
3798rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3861rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3799{ 3862{
… …
3818} 3881}
3819 3882
3820void 3883void
3821rxvt_term::scr_swap_overlay () NOTHROW 3884rxvt_term::scr_swap_overlay () NOTHROW
3822{ 3885{
3823 if (!ov_text) 3886 if (!ov.text)
3824 return; 3887 return;
3825 3888
3889 // hide cursor if it is within the overlay area
3890 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3891 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3892 screen.flags &= ~Screen_VisibleCursor;
3893
3826 // swap screen mem with overlay 3894 // swap screen mem with overlay
3827 for (int y = ov_h; y--; ) 3895 for (int y = ov.h; y--; )
3828 { 3896 {
3829 text_t *t1 = ov_text[y]; 3897 text_t *t1 = ov.text[y];
3830 rend_t *r1 = ov_rend[y]; 3898 rend_t *r1 = ov.rend[y];
3831 3899
3832 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3900 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3833 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3901 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3834 3902
3835 for (int x = ov_w; x--; ) 3903 for (int x = ov.w; x--; )
3836 { 3904 {
3837 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3905 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3838 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3906 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3839 } 3907 }
3840 } 3908 }

Diff Legend

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