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.352 by root, Fri Oct 15 20:52:15 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
149 l.touch ();
150
148 // found begin, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 156 } while (col < ncol && l.t[col] == NOCHAR);
… …
158 * ------------------------------------------------------------------------- */ 161 * ------------------------------------------------------------------------- */
159 162
160void 163void
161rxvt_term::scr_reset () 164rxvt_term::scr_reset ()
162{ 165{
163#if ENABLE_OVERLAY
164 scr_overlay_off ();
165#endif
166
167 rvideo_mode = false;
168 view_start = 0; 166 view_start = 0;
169 num_scr = 0; 167 num_scr = 0;
170 168
171 if (ncol == 0) 169 if (ncol == 0)
172 ncol = 80; 170 ncol = 80;
… …
174 if (nrow == 0) 172 if (nrow == 0)
175 nrow = 24; 173 nrow = 24;
176 174
177 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 176 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 177
183 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
185 { 180 {
186 //TODO//FIXME 181 //TODO//FIXME
… …
239 selection.text = NULL; 234 selection.text = NULL;
240 selection.len = 0; 235 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
243 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
244 } 241 }
245 else 242 else
246 { 243 {
247 /* 244 /*
248 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
286 283
287 if (top_row) 284 if (top_row)
288 { 285 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 // TODO: maybe optimise when width didn't change
291 289
292 row_col_t ocur = screen.cur; 290 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 292
295 do 293 do
296 { 294 {
297 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 297 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
303 299
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 301 {
… …
399 delete old_ta; 395 delete old_ta;
400 delete old_ra; 396 delete old_ra;
401 397
402 clamp_it (screen.cur.row, 0, nrow - 1); 398 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 399 clamp_it (screen.cur.col, 0, ncol - 1);
400 }
404 401
405 free (tabs); 402 free (tabs);
406 } 403 tabs = (char *)rxvt_malloc (ncol);
404
405 for (int col = ncol; --col; )
406 tabs [col] = col % TABSIZE == 0;
407 407
408 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
409 409
410 prev_nrow = nrow; 410 prev_nrow = nrow;
411 prev_ncol = ncol; 411 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 412
421 tt_winch (); 413 tt_winch ();
422 414
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 415 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
424} 416}
… …
436 delete ralloc; ralloc = 0; 428 delete ralloc; ralloc = 0;
437 429
438 free (row_buf); 430 free (row_buf);
439 free (swap_buf); 431 free (swap_buf);
440 free (drawn_buf); 432 free (drawn_buf);
433 row_buf = 0; // signal that we freed all the arrays above
434
441 free (tabs); 435 free (tabs);
442 436 tabs = 0;
443 row_buf = 0; // signal that we freed all the arrays
444 } 437 }
445} 438}
446 439
447/* ------------------------------------------------------------------------- */ 440/* ------------------------------------------------------------------------- */
448/* 441/*
449 * Hard reset 442 * Hard/Soft reset
450 */ 443 */
451void 444void
452rxvt_term::scr_poweron () 445rxvt_term::scr_poweron ()
453{ 446{
454 scr_release (); 447 scr_release ();
455 prev_nrow = prev_ncol = 0; 448 prev_nrow = prev_ncol = 0;
449 rvideo_mode = false;
450 scr_soft_reset ();
456 scr_reset (); 451 scr_reset ();
457 452
458 scr_clear (true); 453 scr_clear (true);
459 scr_refresh (); 454 scr_refresh ();
455}
456
457void
458rxvt_term::scr_soft_reset ()
459{
460 /* only affects modes, nothing drastic such as clearing the screen */
461#if ENABLE_OVERLAY
462 scr_overlay_off ();
463#endif
464
465 if (current_screen != PRIMARY)
466 scr_swap_screen ();
467
468 scr_scroll_region (0, MAX_ROWS - 1);
469 scr_rendition (0, ~RS_None);
470 scr_insert_mode (0);
460} 471}
461 472
462/* ------------------------------------------------------------------------- * 473/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 474 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 475 * ------------------------------------------------------------------------- */
… …
502 } 513 }
503 514
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
510#endif
511} 520}
512 521
513void 522void
514rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
515{ 524{
… …
540 want_refresh = 1; 549 want_refresh = 1;
541 view_start = 0; 550 view_start = 0;
542 551
543 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
544 553
545 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
546 555
547#if NSCREENS 556#if NSCREENS
548 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
549 { 558 {
550 num_scr = 0; 559 num_scr = 0;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
777 } 786 }
778 } 787 }
779 788
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 792 int row = screen.cur.row;
786 793
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 795
789 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
893# else 900# else
894 c = 0xfffd; 901 c = 0xfffd;
895# endif 902# endif
896#endif 903#endif
897 904
905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
906
907 // if the character doesn't fit into the remaining columns...
908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
909 {
910 if (screen.flags & Screen_Autowrap)
911 {
912 // ... artificially enlargen the previous one
913 c = NOCHAR;
914 // and try the same character next loop iteration
915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 }
920
898 // nuke the character at this position, if required 921 // nuke the character at this position, if required
899 if (expect_false ( 922 if (expect_false (
900 line->t[screen.cur.col] == NOCHAR 923 line->t[screen.cur.col] == NOCHAR
901 || (screen.cur.col < ncol - 1 924 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR) 925 && line->t[screen.cur.col + 1] == NOCHAR)
903 )) 926 ))
904 scr_kill_char (*line, screen.cur.col); 927 scr_kill_char (*line, screen.cur.col);
905 928
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916
917 line->touch (); 929 line->touch ();
918 930
919 do 931 do
920 { 932 {
921 line->t[screen.cur.col] = c; 933 line->t[screen.cur.col] = c;
… …
926 else 938 else
927 { 939 {
928 line->l = ncol; 940 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 941 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 942 screen.flags |= Screen_WrapNext;
931 break; 943
944 goto end_of_line;
932 } 945 }
933 946
934 c = NOCHAR; 947 c = NOCHAR;
935 } 948 }
936 while (expect_false (--width > 0)); 949 while (expect_false (--width > 0));
937 950
938 // pad with spaces when overwriting wide character with smaller one 951 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 952 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
940 { 953 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 954 line->t[c] = ' ';
946 line->r[c] = rend; 955 line->r[c] = rend;
947 }
948 } 956 }
957
958end_of_line:
959 ;
949 } 960 }
950#if ENABLE_COMBINING 961#if ENABLE_COMBINING
951 else // width == 0 962 else // width == 0
952 { 963 {
953 if (c != 0xfeff) // ignore BOM 964 if (c != 0xfeff) // ignore BOM
… …
993#endif 1004#endif
994 } 1005 }
995 1006
996 max_it (line->l, screen.cur.col); 1007 max_it (line->l, screen.cur.col);
997 1008
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1009 assert (screen.cur.row >= 0);
1000#endif
1001} 1010}
1002 1011
1003/* ------------------------------------------------------------------------- */ 1012/* ------------------------------------------------------------------------- */
1004/* 1013/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1014 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1027
1019 want_refresh = 1; 1028 want_refresh = 1;
1020#endif 1029#endif
1021 } 1030 }
1022 } 1031 }
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1023 else 1034 else
1024 scr_gotorc (0, -1, RELATIVE); 1035 scr_gotorc (0, -1, RELATIVE);
1025} 1036}
1026 1037
1027/* ------------------------------------------------------------------------- */ 1038/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1344 if (row >= nrow) /* Out Of Bounds */
1334 return; 1345 return;
1335 1346
1336 min_it (num, nrow - row); 1347 min_it (num, nrow - row);
1337 1348
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1352 {
1343 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1344 1354
1345 if (mapped) 1355 if (mapped)
1346 XClearArea (dpy, vt, 0, 1356 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1357 Row2Pixel (row - view_start), (unsigned int)width,
1348 (unsigned int)Height2Pixel (num), False); 1358 (unsigned int)Height2Pixel (num), False);
1349 } 1359 }
1350 else 1360 else
1351 { 1361 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1363
1364 if (mapped)
1365 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1368 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1369 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1370 (unsigned int)width,
1359 (unsigned int)Height2Pixel (num)); 1371 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1362 } 1375 }
1363 1376
1364 for (; num--; row++) 1377 for (; num--; row++)
1365 { 1378 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1383 }
1369} 1384}
1370 1385
1371#if !ENABLE_MINIMAL 1386#if !ENABLE_MINIMAL
1372void 1387void
… …
1464 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1465 1480
1466 line->touch (); 1481 line->touch ();
1467 line->is_longer (0); 1482 line->is_longer (0);
1468 1483
1469 // nuke wide char at beginning 1484 // nuke wide spanning the start
1470 if (line->t[screen.cur.col] == NOCHAR) 1485 if (line->t[screen.cur.col] == NOCHAR)
1471 scr_kill_char (*line, screen.cur.col); 1486 scr_kill_char (*line, screen.cur.col);
1472 1487
1473 switch (insdel) 1488 switch (insdel)
1474 { 1489 {
… …
1513 1528
1514 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1515 break; 1530 break;
1516 1531
1517 case DELETE: 1532 case DELETE:
1518 {
1519 line->l = max (line->l - count, 0); 1533 line->l = max (line->l - count, 0);
1520 1534
1521 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1522 1538
1523 for (int col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1524 { 1540 {
1525 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1526 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1527 } 1543 }
1528 1544
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); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1534 1546
1535 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1536 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1537 { 1549 {
1538 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
1539 || (screen.cur.col >= selection.beg.col - count) 1551 || (screen.cur.col >= selection.beg.col - count)
1540 || selection.end.col >= ncol) 1552 || selection.end.col >= ncol)
1541 CLEAR_SELECTION (); 1553 CLEAR_SELECTION ();
1542 else 1554 else
1543 { 1555 {
1544 /* shift selection */ 1556 /* shift selection */
1545 selection.beg.col -= count; 1557 selection.beg.col -= count;
1546 selection.mark.col -= count; /* XXX: yes? */ 1558 selection.mark.col -= count; /* XXX: yes? */
1547 selection.end.col -= count; 1559 selection.end.col -= count;
1548 } 1560 }
1549 }
1550 } 1561 }
1551 1562
1552 break; 1563 break;
1553 } 1564 }
1554} 1565}
… …
1829 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1830 { 1841 {
1831 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1832 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1833 } 1844 }
1834// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1845
1835 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 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); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1837 1848
1838 num_scr_allow = 0; 1849 num_scr_allow = 0;
1839 1850
… …
1930 1941
1931 bell_ev.start (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1932 } 1943 }
1933 else 1944 else
1934 XBell (dpy, 0); 1945 XBell (dpy, 0);
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1935#endif 1947#endif
1936} 1948}
1937 1949
1938/* ------------------------------------------------------------------------- */ 1950/* ------------------------------------------------------------------------- */
1939/* ARGSUSED */ 1951/* ARGSUSED */
… …
1958 row_start = view_start; 1970 row_start = view_start;
1959 } 1971 }
1960 1972
1961 wctomb (0, 0); 1973 wctomb (0, 0);
1962 1974
1963 for (int r1 = 0; r1 < nrows; r1++) 1975 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1964 { 1976 {
1965 text_t *tp = ROW(r1).t; 1977 text_t *tp = ROW(r1).t;
1966 int len = ROW(r1).l; 1978 int len = ROW(r1).l;
1967 1979
1968 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1980 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1997 * screen.text/screen.rend contain what the screen will change to. 2009 * screen.text/screen.rend contain what the screen will change to.
1998 */ 2010 */
1999void 2011void
2000rxvt_term::scr_refresh () NOTHROW 2012rxvt_term::scr_refresh () NOTHROW
2001{ 2013{
2002 unsigned char have_bg,
2003 showcursor; /* show the cursor */
2004 int16_t col, row, /* column/row we're processing */ 2014 int16_t col, row, /* column/row we're processing */
2005 ocrow; /* old cursor row */ 2015 ocrow; /* old cursor row */
2006 int i; /* tmp */ 2016 int i; /* tmp */
2007#ifndef NO_CURSORCOLOR 2017#ifndef NO_CURSORCOLOR
2008 rend_t cc1; /* store colours at cursor position (s) */ 2018 rend_t cc1; /* store colours at cursor position (s) */
… …
2019 /* 2029 /*
2020 * A: set up vars 2030 * A: set up vars
2021 */ 2031 */
2022 refresh_count = 0; 2032 refresh_count = 0;
2023 2033
2034 unsigned int old_screen_flags = screen.flags;
2024 have_bg = 0; 2035 char have_bg = 0;
2025#ifdef HAVE_BG_PIXMAP 2036#ifdef HAVE_BG_PIXMAP
2026 have_bg = bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
2027#endif 2038#endif
2028 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2029 2040
2030 /* 2041 /*
2031 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
2032 */ 2043 */
2033 scr_reverse_selection (); 2044 scr_reverse_selection ();
2045
2046 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2047#if ENABLE_OVERLAY
2048 scr_swap_overlay ();
2049#endif
2050
2051 char showcursor = screen.flags & Screen_VisibleCursor;
2034 2052
2035 /* 2053 /*
2036 * C: set the cursor character (s) 2054 * C: set the cursor character (s)
2037 */ 2055 */
2038 { 2056 {
2039 unsigned char setoldcursor; 2057 unsigned char setoldcursor;
2040 2058
2041 showcursor = (screen.flags & Screen_VisibleCursor);
2042#ifdef CURSOR_BLINK 2059#ifdef CURSOR_BLINK
2043 if (hidden_cursor) 2060 if (hidden_cursor)
2044 showcursor = 0; 2061 showcursor = 0;
2045#endif 2062#endif
2046 2063
… …
2074 ccol2 = bgcolor_of (rstyle); 2091 ccol2 = bgcolor_of (rstyle);
2075#else 2092#else
2076 ccol2 = Color_bg; 2093 ccol2 = Color_bg;
2077#endif 2094#endif
2078 2095
2079 if (showcursor && focus) 2096 if (focus)
2080 { 2097 {
2081 if (option (Opt_cursorUnderline)) 2098 if (option (Opt_cursorUnderline))
2082 *crp ^= RS_Uline; 2099 *crp ^= RS_Uline;
2083 else 2100 else
2084 { 2101 {
… …
2119 oldcursor.col = screen.cur.col; 2136 oldcursor.col = screen.cur.col;
2120 } 2137 }
2121 } 2138 }
2122 } 2139 }
2123 2140
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 2141#ifndef NO_SLOW_LINK_SUPPORT
2130 /* 2142 /*
2131 * D: CopyArea pass - very useful for slower links 2143 * D: CopyArea pass - very useful for slower links
2132 * This has been deliberately kept simple. 2144 * This has been deliberately kept simple.
2133 */ 2145 */
… …
2225 2237
2226 // seek to the beginning of wide characters 2238 // seek to the beginning of wide characters
2227 while (expect_false (stp[col] == NOCHAR && col > 0)) 2239 while (expect_false (stp[col] == NOCHAR && col > 0))
2228 --col; 2240 --col;
2229 2241
2230 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2242 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2231 text_t *text = stp + col; 2243 text_t *text = stp + col;
2232 int count = 1; 2244 int count = 1;
2233 2245
2234 dtp[col] = stp[col]; 2246 dtp[col] = stp[col];
2235 drp[col] = rend; 2247 drp[col] = rend;
… …
2239 for (i = 0; ++col < ncol; ) 2251 for (i = 0; ++col < ncol; )
2240 { 2252 {
2241 if (stp[col] == NOCHAR) 2253 if (stp[col] == NOCHAR)
2242 { 2254 {
2243 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2244 drp[col] = rend; 2256 drp[col] = srp[col];
2257
2245 count++; 2258 count++;
2246 i++; 2259 i++;
2247 2260
2248 continue; 2261 continue;
2249 } 2262 }
… …
2279 */ 2292 */
2280 int fore = fgcolor_of (rend); // desired foreground 2293 int fore = fgcolor_of (rend); // desired foreground
2281 int back = bgcolor_of (rend); // desired background 2294 int back = bgcolor_of (rend); // desired background
2282 2295
2283 // only do special processing if any attributes are set, which is unlikely 2296 // 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))) 2297 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2285 { 2298 {
2286 bool invert = rend & RS_RVid; 2299 bool invert = rend & RS_RVid;
2287 2300
2288#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2289 if (rend & RS_Bold && fore == Color_fg) 2302 if (rend & RS_Bold && fore == Color_fg)
… …
2308 2321
2309 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2322 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2310 fore = Color_UL; 2323 fore = Color_UL;
2311#endif 2324#endif
2312 2325
2326#ifdef OPTION_HC
2327 if (rend & RS_Sel)
2328 {
2329 /* invert the column if no highlightColor is set or it is the
2330 * current cursor column */
2331 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2332 && ISSET_PIXCOLOR (Color_HC))
2333 {
2334 if (ISSET_PIXCOLOR (Color_HTC))
2335 fore = Color_HTC;
2336 // if invert is 0 reverse video is set so we use bg color as fg color
2337 else if (!invert)
2338 fore = back;
2339
2340 back = Color_HC;
2341 invert = 0;
2342 }
2343 }
2344#endif
2345
2313 if (invert) 2346 if (invert)
2314 { 2347 {
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); 2348 ::swap (fore, back);
2322#ifdef OPTION_HC
2323 else if (ISSET_PIXCOLOR (Color_HC))
2324 back = Color_HC;
2325#endif
2326 2349
2327#ifndef NO_BOLD_UNDERLINE_REVERSE 2350#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) 2351 if (fore == back)
2333 { 2352 {
2334 fore = Color_bg; 2353 fore = Color_bg;
2335 back = Color_fg; 2354 back = Color_fg;
2336 } 2355 }
… …
2405 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2424 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2406 } 2425 }
2407 } /* for (col....) */ 2426 } /* for (col....) */
2408 } /* for (row....) */ 2427 } /* for (row....) */
2409 2428
2410#if ENABLE_OVERLAY
2411 scr_swap_overlay ();
2412#endif
2413 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2414
2415 /* 2429 /*
2416 * G: cleanup cursor and display outline cursor if necessary 2430 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2431 */
2418 if (showcursor) 2432 if (showcursor)
2419 { 2433 {
… …
2457 } 2471 }
2458 2472
2459 /* 2473 /*
2460 * H: cleanup selection 2474 * H: cleanup selection
2461 */ 2475 */
2476#if ENABLE_OVERLAY
2477 scr_swap_overlay ();
2478#endif
2479 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2480
2462 scr_reverse_selection (); 2481 scr_reverse_selection ();
2463 2482
2483 screen.flags = old_screen_flags;
2464 num_scr = 0; 2484 num_scr = 0;
2465 num_scr_allow = 1; 2485 num_scr_allow = 1;
2466} 2486}
2467 2487
2468void 2488void
… …
2588 { 2608 {
2589#if !ENABLE_MINIMAL 2609#if !ENABLE_MINIMAL
2590 if (selection.rect) 2610 if (selection.rect)
2591 scr_xor_rect (selection.beg.row, selection.beg.col, 2611 scr_xor_rect (selection.beg.row, selection.beg.col,
2592 selection.end.row, selection.end.col, 2612 selection.end.row, selection.end.col,
2593 RS_RVid, RS_RVid | RS_Uline); 2613 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2594 else 2614 else
2595#endif 2615#endif
2596 scr_xor_span (selection.beg.row, selection.beg.col, 2616 scr_xor_span (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2617 selection.end.row, selection.end.col,
2598 RS_RVid); 2618 RS_Sel | RS_RVid);
2599 } 2619 }
2600} 2620}
2601 2621
2602/* ------------------------------------------------------------------------- */ 2622/* ------------------------------------------------------------------------- */
2603/* 2623/*
… …
2664/* ------------------------------------------------------------------------- */ 2684/* ------------------------------------------------------------------------- */
2665/* 2685/*
2666 * Paste a selection direct to the command fd 2686 * Paste a selection direct to the command fd
2667 */ 2687 */
2668void 2688void
2669rxvt_term::paste (char *data, unsigned int len) NOTHROW 2689rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2670{ 2690{
2671 /* convert normal newline chars into common keyboard Return key sequence */ 2691 /* convert normal newline chars into common keyboard Return key sequence */
2672 for (unsigned int i = 0; i < len; i++) 2692 for (unsigned int i = 0; i < len; i++)
2673 if (data[i] == C0_LF) 2693 if (data[i] == C0_LF)
2674 data[i] = C0_CR; 2694 data[i] = C0_CR;
… …
2678 2698
2679 tt_write (data, len); 2699 tt_write (data, len);
2680 2700
2681 if (priv_modes & PrivMode_BracketPaste) 2701 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[201~"); 2702 tt_printf ("\e[201~");
2703}
2704
2705void
2706rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{
2708 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 return;
2710
2711 tt_paste (data, len);
2683} 2712}
2684 2713
2685/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2686/* 2715/*
2687 * Respond to a notification that a primary selection has been sent 2716 * Respond to a notification that a primary selection has been sent
… …
2896 selection_wait = Sel_normal; 2925 selection_wait = Sel_normal;
2897 2926
2898#if X_HAVE_UTF8_STRING 2927#if X_HAVE_UTF8_STRING
2899 selection_type = Sel_UTF8String; 2928 selection_type = Sel_UTF8String;
2900 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2929 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2901 return; 2930 return;
2902#else 2931#else
2903 selection_type = Sel_CompoundText; 2932 selection_type = Sel_CompoundText;
2904 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2933 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2905 return; 2934 return;
2906#endif 2935#endif
2907 } 2936 }
2908 2937
2909 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2938 selection_wait = Sel_none; /* don't loop in selection_paste () */
2910 selection_paste (display->root, XA_CUT_BUFFER0, false); 2939 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2938/* 2967/*
2939 * Clear all selected text 2968 * Clear all selected text
2940 * EXT: SelectionClear 2969 * EXT: SelectionClear
2941 */ 2970 */
2942void 2971void
2943rxvt_term::selection_clear () NOTHROW 2972rxvt_term::selection_clear (bool clipboard) NOTHROW
2944{ 2973{
2974 if (!clipboard)
2975 {
2945 want_refresh = 1; 2976 want_refresh = 1;
2946 free (selection.text); 2977 free (selection.text);
2947 selection.text = NULL; 2978 selection.text = NULL;
2948 selection.len = 0; 2979 selection.len = 0;
2949 CLEAR_SELECTION (); 2980 CLEAR_SELECTION ();
2950 2981
2951 if (display->selection_owner == this) 2982 if (display->selection_owner == this)
2952 display->selection_owner = 0; 2983 display->selection_owner = 0;
2984 }
2985 else
2986 {
2987 free (selection.clip_text);
2988 selection.clip_text = NULL;
2989 selection.clip_len = 0;
2990
2991 if (display->clipboard_owner == this)
2992 display->clipboard_owner = 0;
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