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.312 by root, Tue Nov 4 13:30:41 2008 UTC vs.
Revision 1.341 by root, Sat Apr 17 23:05:48 2010 UTC

… …
132 132
133 l.l = 0; 133 l.l = 0;
134 l.f = 0; 134 l.f = 0;
135} 135}
136 136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
154}
155
137/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
138 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
139 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
140 159
141void 160void
142rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
143{ 162{
144#if ENABLE_OVERLAY
145 scr_overlay_off ();
146#endif
147
148 rvideo_mode = false;
149 view_start = 0; 163 view_start = 0;
150 num_scr = 0; 164 num_scr = 0;
151 165
152 if (ncol == 0) 166 if (ncol == 0)
153 ncol = 80; 167 ncol = 80;
… …
155 if (nrow == 0) 169 if (nrow == 0)
156 nrow = 24; 170 nrow = 24;
157 171
158 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
159 return; 173 return;
160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163 174
164 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
165 while (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
166 { 177 {
167 //TODO//FIXME 178 //TODO//FIXME
… …
220 selection.text = NULL; 231 selection.text = NULL;
221 selection.len = 0; 232 selection.len = 0;
222 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
223 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
224 selection.clicks = 0; 235 selection.clicks = 0;
236 selection.clip_text = NULL;
237 selection.clip_len = 0;
225 } 238 }
226 else 239 else
227 { 240 {
228 /* 241 /*
229 * add or delete rows as appropriate 242 * add or delete rows as appropriate
… …
267 280
268 if (top_row) 281 if (top_row)
269 { 282 {
270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
271 // to come up with a lean and mean algorithm. 284 // to come up with a lean and mean algorithm.
285 // TODO: maybe optimise when width didn't change
272 286
273 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
274 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
275 289
276 do 290 do
277 { 291 {
278 p = MOD (p - 1, prev_total_rows); 292 p = MOD (p - 1, prev_total_rows);
279#ifdef DEBUG_STRICT
280 assert (old_buf [MOD (p, prev_total_rows)].t); 293 assert (old_buf [MOD (p, prev_total_rows)].t);
281#endif
282 int plines = 1; 294 int plines = 1;
283 int llen = old_buf [MOD (p, prev_total_rows)].l; 295 int llen = old_buf [MOD (p, prev_total_rows)].l;
284 296
285 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
286 { 298 {
… …
380 delete old_ta; 392 delete old_ta;
381 delete old_ra; 393 delete old_ra;
382 394
383 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
384 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
385 398
386 free (tabs); 399 free (tabs);
387 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
388 404
389 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
390 406
391 prev_nrow = nrow; 407 prev_nrow = nrow;
392 prev_ncol = ncol; 408 prev_ncol = ncol;
393
394 tabs = (char *)rxvt_malloc (ncol);
395
396 for (int col = ncol; --col; )
397 tabs [col] = col % TABSIZE == 0;
398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401 409
402 tt_winch (); 410 tt_winch ();
403 411
404 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
405} 413}
… …
417 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
418 426
419 free (row_buf); 427 free (row_buf);
420 free (swap_buf); 428 free (swap_buf);
421 free (drawn_buf); 429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
422 free (tabs); 432 free (tabs);
423 433 tabs = 0;
424 row_buf = 0; // signal that we freed all the arrays
425 } 434 }
426} 435}
427 436
428/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
429/* 438/*
430 * Hard reset 439 * Hard/Soft reset
431 */ 440 */
432void 441void
433rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
434{ 443{
435 scr_release (); 444 scr_release ();
436 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
437 scr_reset (); 448 scr_reset ();
438 449
439 scr_clear (true); 450 scr_clear (true);
440 scr_refresh (); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
441} 468}
442 469
443/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
444 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
445 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
483 } 510 }
484 511
485 /* boundary check in case screen size changed between SAVE and RESTORE */ 512 /* boundary check in case screen size changed between SAVE and RESTORE */
486 min_it (s->cur.row, nrow - 1); 513 min_it (s->cur.row, nrow - 1);
487 min_it (s->cur.col, ncol - 1); 514 min_it (s->cur.col, ncol - 1);
488#ifdef DEBUG_STRICT
489 assert (s->cur.row >= 0); 515 assert (s->cur.row >= 0);
490 assert (s->cur.col >= 0); 516 assert (s->cur.col >= 0);
491#endif
492} 517}
493 518
494void 519void
495rxvt_term::scr_swap_screen () 520rxvt_term::scr_swap_screen ()
496{ 521{
… …
521 want_refresh = 1; 546 want_refresh = 1;
522 view_start = 0; 547 view_start = 0;
523 548
524 selection_check (2); /* check for boundary cross */ 549 selection_check (2); /* check for boundary cross */
525 550
526 int i = current_screen; current_screen = scrn; scrn = i; 551 current_screen = scrn;
527 552
528#if NSCREENS 553#if NSCREENS
529 if (option (Opt_secondaryScreen)) 554 if (option (Opt_secondaryScreen))
530 { 555 {
531 num_scr = 0; 556 num_scr = 0;
… …
756 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 781 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
757 screen.cur.row -= minlines; 782 screen.cur.row -= minlines;
758 } 783 }
759 } 784 }
760 785
761#ifdef DEBUG_STRICT
762 assert (screen.cur.col < ncol); 786 assert (screen.cur.col < ncol);
763 assert (screen.cur.row < nrow 787 assert (screen.cur.row < nrow
764 && screen.cur.row >= top_row); 788 && screen.cur.row >= top_row);
765#endif
766 int row = screen.cur.row; 789 int row = screen.cur.row;
767 790
768 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 791 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
769 792
770 line_t *line = &ROW(row); 793 line_t *line = &ROW(row);
… …
880 if (expect_false ( 903 if (expect_false (
881 line->t[screen.cur.col] == NOCHAR 904 line->t[screen.cur.col] == NOCHAR
882 || (screen.cur.col < ncol - 1 905 || (screen.cur.col < ncol - 1
883 && line->t[screen.cur.col + 1] == NOCHAR) 906 && line->t[screen.cur.col + 1] == NOCHAR)
884 )) 907 ))
885 { 908 scr_kill_char (*line, screen.cur.col);
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901 909
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903 911
904 // if the character doesn't fit into the remaining columns... 912 // if the character doesn't fit into the remaining columns...
905 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
906 { 914 {
907 // ...output spaces 915 // ... artificially enlargen the previous one
908 c = ' '; 916 c = NOCHAR;
909 // and try the same character next loop iteration 917 // and try the same character next loop iteration
910 --str; 918 --str;
911 } 919 }
912 920
913 line->touch (); 921 line->touch ();
… …
989#endif 997#endif
990 } 998 }
991 999
992 max_it (line->l, screen.cur.col); 1000 max_it (line->l, screen.cur.col);
993 1001
994#ifdef DEBUG_STRICT
995 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
996#endif
997} 1003}
998 1004
999/* ------------------------------------------------------------------------- */ 1005/* ------------------------------------------------------------------------- */
1000/* 1006/*
1001 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1329 if (row >= nrow) /* Out Of Bounds */ 1335 if (row >= nrow) /* Out Of Bounds */
1330 return; 1336 return;
1331 1337
1332 min_it (num, nrow - row); 1338 min_it (num, nrow - row);
1333 1339
1334 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ 1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1335 if (rstyle & (RS_RVid | RS_Uline)) 1343 if (rstyle & (RS_RVid | RS_Uline))
1336 ren = (rend_t) ~RS_None; 1344 ren = (rend_t) ~RS_None;
1337 else if (GET_BASEBG (rstyle) == Color_bg) 1345 else if (GET_BASEBG (rstyle) == Color_bg)
1338 { 1346 {
1339 ren = DEFAULT_RSTYLE; 1347 ren = DEFAULT_RSTYLE;
1340 1348
1341 if (mapped) 1349 if (mapped && !view_start)
1342 XClearArea (dpy, vt, 0, 1350 XClearArea (dpy, vt, 0,
1343 Row2Pixel (row), (unsigned int)width, 1351 Row2Pixel (row - view_start), (unsigned int)width,
1344 (unsigned int)Height2Pixel (num), False); 1352 (unsigned int)Height2Pixel (num), False);
1345 } 1353 }
1346 else 1354 else
1347 { 1355 {
1348 ren = rstyle & (RS_fgMask | RS_bgMask); 1356 ren = rstyle & (RS_fgMask | RS_bgMask);
1349 1357
1358 if (mapped && !view_start)
1359 {
1350 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1351 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1361 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1352 XFillRectangle (dpy, vt, gc, 1362 XFillRectangle (dpy, vt, gc,
1353 0, Row2Pixel (row), 1363 0, Row2Pixel (row - view_start),
1354 (unsigned int)width, 1364 (unsigned int)width,
1355 (unsigned int)Height2Pixel (num)); 1365 (unsigned int)Height2Pixel (num));
1356 gcvalue.foreground = pix_colors[Color_fg]; 1366 gcvalue.foreground = pix_colors[Color_fg];
1357 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 }
1358 } 1369 }
1359 1370
1360 for (; num--; row++) 1371 for (; num--; row++)
1361 { 1372 {
1362 scr_blank_screen_mem (ROW(row), rstyle); 1373 scr_blank_screen_mem (ROW(row), rstyle);
1374
1375 if (!view_start)
1363 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1364 } 1377 }
1365} 1378}
1366 1379
1367#if !ENABLE_MINIMAL 1380#if !ENABLE_MINIMAL
1368void 1381void
… …
1442 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1443 */ 1456 */
1444void 1457void
1445rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1446{ 1459{
1447 int col, row;
1448 rend_t tr;
1449
1450 want_refresh = 1; 1460 want_refresh = 1;
1451 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1452 1462
1453 if (count <= 0) 1463 if (count <= 0)
1454 return; 1464 return;
… …
1456 scr_do_wrap (); 1466 scr_do_wrap ();
1457 1467
1458 selection_check (1); 1468 selection_check (1);
1459 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1460 1470
1461 row = screen.cur.row; 1471 int row = screen.cur.row;
1462 1472
1463 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1464 1474
1465 line->touch (); 1475 line->touch ();
1466 line->is_longer (0); 1476 line->is_longer (0);
1467 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1468 switch (insdel) 1482 switch (insdel)
1469 { 1483 {
1470 case INSERT: 1484 case INSERT:
1471 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1472 { 1491 {
1473 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1474 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1475 } 1494 }
1476
1477 line->l = min (line->l + count, ncol);
1478 1495
1479 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1480 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1481 { 1498 {
1482 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1497 case ERASE: 1514 case ERASE:
1498 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1499 selection_check (1); 1516 selection_check (1);
1500 screen.cur.col -= count; 1517 screen.cur.col -= count;
1501 1518
1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1502 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1503 break; 1524 break;
1504 1525
1505 case DELETE: 1526 case DELETE:
1506 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1507 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1508 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1509 { 1534 {
1510 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1511 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1512 } 1537 }
1513 1538
1514 line->l = max (line->l - count, 0);
1515 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count, rstyle);
1516 1540
1517 if (selection.op && current_screen == selection.screen 1541 if (selection.op && current_screen == selection.screen
1518 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1542 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1519 { 1543 {
1520 if (selection.end.row != screen.cur.row 1544 if (selection.end.row != screen.cur.row
… …
1810 for (i = PART_BEG; i < RC_COUNT; i++) 1834 for (i = PART_BEG; i < RC_COUNT; i++)
1811 { 1835 {
1812 min_it (rc[i].col, ncol - 1); 1836 min_it (rc[i].col, ncol - 1);
1813 min_it (rc[i].row, nrow - 1); 1837 min_it (rc[i].row, nrow - 1);
1814 } 1838 }
1815// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1839
1816 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1817 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1818 1842
1819 num_scr_allow = 0; 1843 num_scr_allow = 0;
1820 1844
… …
1911 1935
1912 bell_ev.start (VISUAL_BELL_DURATION); 1936 bell_ev.start (VISUAL_BELL_DURATION);
1913 } 1937 }
1914 else 1938 else
1915 XBell (dpy, 0); 1939 XBell (dpy, 0);
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1916#endif 1941#endif
1917} 1942}
1918 1943
1919/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1920/* ARGSUSED */ 1945/* ARGSUSED */
… …
1939 row_start = view_start; 1964 row_start = view_start;
1940 } 1965 }
1941 1966
1942 wctomb (0, 0); 1967 wctomb (0, 0);
1943 1968
1944 for (int r1 = 0; r1 < nrows; r1++) 1969 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1945 { 1970 {
1946 text_t *tp = ROW(r1).t; 1971 text_t *tp = ROW(r1).t;
1947 int len = ROW(r1).l; 1972 int len = ROW(r1).l;
1948 1973
1949 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1978 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1979 */ 2004 */
1980void 2005void
1981rxvt_term::scr_refresh () NOTHROW 2006rxvt_term::scr_refresh () NOTHROW
1982{ 2007{
1983 unsigned char have_bg,
1984 showcursor; /* show the cursor */
1985 int16_t col, row, /* column/row we're processing */ 2008 int16_t col, row, /* column/row we're processing */
1986 ocrow; /* old cursor row */ 2009 ocrow; /* old cursor row */
1987 int i; /* tmp */ 2010 int i; /* tmp */
1988#ifndef NO_CURSORCOLOR 2011#ifndef NO_CURSORCOLOR
1989 rend_t cc1; /* store colours at cursor position (s) */ 2012 rend_t cc1; /* store colours at cursor position (s) */
… …
2000 /* 2023 /*
2001 * A: set up vars 2024 * A: set up vars
2002 */ 2025 */
2003 refresh_count = 0; 2026 refresh_count = 0;
2004 2027
2028 unsigned int old_screen_flags = screen.flags;
2005 have_bg = 0; 2029 char have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP 2030#ifdef HAVE_BG_PIXMAP
2007 have_bg = bgPixmap.pixmap != None; 2031 have_bg = bgPixmap.pixmap != None;
2008#endif 2032#endif
2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2010 2034
2011 /* 2035 /*
2012 * B: reverse any characters which are selected 2036 * B: reverse any characters which are selected
2013 */ 2037 */
2014 scr_reverse_selection (); 2038 scr_reverse_selection ();
2039
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY
2042 scr_swap_overlay ();
2043#endif
2044
2045 char showcursor = screen.flags & Screen_VisibleCursor;
2015 2046
2016 /* 2047 /*
2017 * C: set the cursor character (s) 2048 * C: set the cursor character (s)
2018 */ 2049 */
2019 { 2050 {
2020 unsigned char setoldcursor; 2051 unsigned char setoldcursor;
2021 2052
2022 showcursor = (screen.flags & Screen_VisibleCursor);
2023#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
2024 if (hidden_cursor) 2054 if (hidden_cursor)
2025 showcursor = 0; 2055 showcursor = 0;
2026#endif 2056#endif
2027 2057
… …
2055 ccol2 = bgcolor_of (rstyle); 2085 ccol2 = bgcolor_of (rstyle);
2056#else 2086#else
2057 ccol2 = Color_bg; 2087 ccol2 = Color_bg;
2058#endif 2088#endif
2059 2089
2060 if (showcursor && focus) 2090 if (focus)
2061 { 2091 {
2062 if (option (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2063 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2064 else 2094 else
2065 { 2095 {
… …
2100 oldcursor.col = screen.cur.col; 2130 oldcursor.col = screen.cur.col;
2101 } 2131 }
2102 } 2132 }
2103 } 2133 }
2104 2134
2105 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2106#if ENABLE_OVERLAY
2107 scr_swap_overlay ();
2108#endif
2109
2110#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2111 /* 2136 /*
2112 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2113 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2114 */ 2139 */
… …
2206 2231
2207 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2208 while (expect_false (stp[col] == NOCHAR && col > 0)) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2209 --col; 2234 --col;
2210 2235
2211 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2212 text_t *text = stp + col; 2237 text_t *text = stp + col;
2213 int count = 1; 2238 int count = 1;
2214 2239
2215 dtp[col] = stp[col]; 2240 dtp[col] = stp[col];
2216 drp[col] = rend; 2241 drp[col] = rend;
… …
2220 for (i = 0; ++col < ncol; ) 2245 for (i = 0; ++col < ncol; )
2221 { 2246 {
2222 if (stp[col] == NOCHAR) 2247 if (stp[col] == NOCHAR)
2223 { 2248 {
2224 dtp[col] = stp[col]; 2249 dtp[col] = stp[col];
2225 drp[col] = rend; 2250 drp[col] = srp[col];
2251
2226 count++; 2252 count++;
2227 i++; 2253 i++;
2228 2254
2229 continue; 2255 continue;
2230 } 2256 }
… …
2260 */ 2286 */
2261 int fore = fgcolor_of (rend); // desired foreground 2287 int fore = fgcolor_of (rend); // desired foreground
2262 int back = bgcolor_of (rend); // desired background 2288 int back = bgcolor_of (rend); // desired background
2263 2289
2264 // only do special processing if any attributes are set, which is unlikely 2290 // only do special processing if any attributes are set, which is unlikely
2265 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2266 { 2292 {
2267 bool invert = rend & RS_RVid; 2293 bool invert = rend & RS_RVid;
2268 2294
2269#ifndef NO_BOLD_UNDERLINE_REVERSE 2295#ifndef NO_BOLD_UNDERLINE_REVERSE
2270 if (rend & RS_Bold && fore == Color_fg) 2296 if (rend & RS_Bold && fore == Color_fg)
… …
2289 2315
2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2291 fore = Color_UL; 2317 fore = Color_UL;
2292#endif 2318#endif
2293 2319
2320#ifdef OPTION_HC
2321 if (rend & RS_Sel)
2322 {
2323 /* invert the column if no highlightColor is set or it is the
2324 * current cursor column */
2325 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2326 && ISSET_PIXCOLOR (Color_HC))
2327 {
2328 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert)
2332 fore = back;
2333
2334 back = Color_HC;
2335 invert = 0;
2336 }
2337 }
2338#endif
2339
2294 if (invert) 2340 if (invert)
2295 { 2341 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2302 ::swap (fore, back); 2342 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2307 2343
2308#ifndef NO_BOLD_UNDERLINE_REVERSE 2344#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2310 if (ISSET_PIXCOLOR (Color_RV))
2311 back = Color_RV;
2312# endif
2313 if (fore == back) 2345 if (fore == back)
2314 { 2346 {
2315 fore = Color_bg; 2347 fore = Color_bg;
2316 back = Color_fg; 2348 back = Color_fg;
2317 } 2349 }
… …
2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2418 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2387 } 2419 }
2388 } /* for (col....) */ 2420 } /* for (col....) */
2389 } /* for (row....) */ 2421 } /* for (row....) */
2390 2422
2391#if ENABLE_OVERLAY
2392 scr_swap_overlay ();
2393#endif
2394 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2395
2396 /* 2423 /*
2397 * G: cleanup cursor and display outline cursor if necessary 2424 * G: cleanup cursor and display outline cursor if necessary
2398 */ 2425 */
2399 if (showcursor) 2426 if (showcursor)
2400 { 2427 {
… …
2438 } 2465 }
2439 2466
2440 /* 2467 /*
2441 * H: cleanup selection 2468 * H: cleanup selection
2442 */ 2469 */
2470#if ENABLE_OVERLAY
2471 scr_swap_overlay ();
2472#endif
2473 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2474
2443 scr_reverse_selection (); 2475 scr_reverse_selection ();
2444 2476
2477 screen.flags = old_screen_flags;
2445 num_scr = 0; 2478 num_scr = 0;
2446 num_scr_allow = 1; 2479 num_scr_allow = 1;
2447} 2480}
2448 2481
2449void 2482void
… …
2569 { 2602 {
2570#if !ENABLE_MINIMAL 2603#if !ENABLE_MINIMAL
2571 if (selection.rect) 2604 if (selection.rect)
2572 scr_xor_rect (selection.beg.row, selection.beg.col, 2605 scr_xor_rect (selection.beg.row, selection.beg.col,
2573 selection.end.row, selection.end.col, 2606 selection.end.row, selection.end.col,
2574 RS_RVid, RS_RVid | RS_Uline); 2607 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2575 else 2608 else
2576#endif 2609#endif
2577 scr_xor_span (selection.beg.row, selection.beg.col, 2610 scr_xor_span (selection.beg.row, selection.beg.col,
2578 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2579 RS_RVid); 2612 RS_Sel | RS_RVid);
2580 } 2613 }
2581} 2614}
2582 2615
2583/* ------------------------------------------------------------------------- */ 2616/* ------------------------------------------------------------------------- */
2584/* 2617/*
… …
2877 selection_wait = Sel_normal; 2910 selection_wait = Sel_normal;
2878 2911
2879#if X_HAVE_UTF8_STRING 2912#if X_HAVE_UTF8_STRING
2880 selection_type = Sel_UTF8String; 2913 selection_type = Sel_UTF8String;
2881 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2914 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2882 return; 2915 return;
2883#else 2916#else
2884 selection_type = Sel_CompoundText; 2917 selection_type = Sel_CompoundText;
2885 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2918 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2886 return; 2919 return;
2887#endif 2920#endif
2888 } 2921 }
2889 2922
2890 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2923 selection_wait = Sel_none; /* don't loop in selection_paste () */
2891 selection_paste (display->root, XA_CUT_BUFFER0, false); 2924 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2919/* 2952/*
2920 * Clear all selected text 2953 * Clear all selected text
2921 * EXT: SelectionClear 2954 * EXT: SelectionClear
2922 */ 2955 */
2923void 2956void
2924rxvt_term::selection_clear () NOTHROW 2957rxvt_term::selection_clear (bool clipboard) NOTHROW
2925{ 2958{
2959 if (!clipboard)
2960 {
2926 want_refresh = 1; 2961 want_refresh = 1;
2927 free (selection.text); 2962 free (selection.text);
2928 selection.text = NULL; 2963 selection.text = NULL;
2929 selection.len = 0; 2964 selection.len = 0;
2930 CLEAR_SELECTION (); 2965 CLEAR_SELECTION ();
2931 2966
2932 if (display->selection_owner == this) 2967 if (display->selection_owner == this)
2933 display->selection_owner = 0; 2968 display->selection_owner = 0;
2969 }
2970 else
2971 {
2972 free (selection.clip_text);
2973 selection.clip_text = NULL;
2974 selection.clip_len = 0;
2975
2976 if (display->clipboard_owner == this)
2977 display->clipboard_owner = 0;
2978 }
2979}
2980
2981void
2982rxvt_term::clipboard_copy (Time tm)
2983{
2984 if (selection.len > 0)
2985 {
2986 free (selection.clip_text);
2987 selection.clip_len = selection.len;
2988 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2989 memcpy (selection.clip_text, selection.text,
2990 sizeof (wchar_t) * selection.clip_len);
2991 selection_grab (tm, true);
2992 }
2934} 2993}
2935 2994
2936/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2937/* 2996/*
2938 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3064 3123
3065 selection_grab (tm); 3124 selection_grab (tm);
3066} 3125}
3067 3126
3068bool 3127bool
3069rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3070{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3071 selection_time = tm; 3134 selection_time = tm;
3135 sel = XA_PRIMARY;
3136 }
3137 else
3138 {
3139 clipboard_time = tm;
3140 sel = xa[XA_CLIPBOARD];
3141 }
3072 3142
3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3075 { 3145 {
3076 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3077 return true; 3147 return true;
3078 } 3148 }
3079 else 3149 else
3080 { 3150 {
3081 selection_clear (); 3151 selection_clear (clipboard);
3082 return false; 3152 return false;
3083 } 3153 }
3084 3154
3085#if 0 3155#if 0
3086 XTextProperty ct; 3156 XTextProperty ct;
… …
3581 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3582 { 3652 {
3583 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3584 } 3654 }
3585#endif 3655#endif
3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3587 { 3657 {
3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3589 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3659 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property;
3661 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3590 ev.property = rq.property; 3666 ev.property = rq.property;
3591 } 3667 }
3592 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3593 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3594 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3627 { 3703 {
3628 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3629 style = enc_compound_text; 3705 style = enc_compound_text;
3630 } 3706 }
3631 3707
3632 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3633 { 3709 {
3634 cl = selection.text; 3710 cl = selection.text;
3635 selectlen = selection.len; 3711 selectlen = selection.len;
3712 }
3713 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3714 {
3715 cl = selection.clip_text;
3716 selectlen = selection.clip_len;
3636 } 3717 }
3637 else 3718 else
3638 { 3719 {
3639 cl = L""; 3720 cl = L"";
3640 selectlen = 0; 3721 selectlen = 0;
… …
3708 h += 2; min_it (h, nrow); 3789 h += 2; min_it (h, nrow);
3709 3790
3710 x -= 1; clamp_it (x, 0, ncol - w); 3791 x -= 1; clamp_it (x, 0, ncol - w);
3711 y -= 1; clamp_it (y, 0, nrow - h); 3792 y -= 1; clamp_it (y, 0, nrow - h);
3712 3793
3713 ov_x = x; ov_y = y; 3794 ov.x = x; ov.y = y;
3714 ov_w = w; ov_h = h; 3795 ov.w = w; ov.h = h;
3715 3796
3716 ov_text = new text_t *[h]; 3797 ov.text = new text_t *[h];
3717 ov_rend = new rend_t *[h]; 3798 ov.rend = new rend_t *[h];
3718 3799
3719 for (y = 0; y < h; y++) 3800 for (y = 0; y < h; y++)
3720 { 3801 {
3721 text_t *tp = ov_text[y] = new text_t[w]; 3802 text_t *tp = ov.text[y] = new text_t[w];
3722 rend_t *rp = ov_rend[y] = new rend_t[w]; 3803 rend_t *rp = ov.rend[y] = new rend_t[w];
3723 3804
3724 text_t t0, t1, t2; 3805 text_t t0, t1, t2;
3725 rend_t r = OVERLAY_RSTYLE; 3806 rend_t r = OVERLAY_RSTYLE;
3726 3807
3727 if (y == 0) 3808 if (y == 0)
… …
3746} 3827}
3747 3828
3748void 3829void
3749rxvt_term::scr_overlay_off () NOTHROW 3830rxvt_term::scr_overlay_off () NOTHROW
3750{ 3831{
3751 if (!ov_text) 3832 if (!ov.text)
3752 return; 3833 return;
3753 3834
3754 want_refresh = 1; 3835 want_refresh = 1;
3755 3836
3756 for (int y = 0; y < ov_h; y++) 3837 for (int y = 0; y < ov.h; y++)
3757 { 3838 {
3758 delete [] ov_text[y]; 3839 delete [] ov.text[y];
3759 delete [] ov_rend[y]; 3840 delete [] ov.rend[y];
3760 } 3841 }
3761 3842
3762 delete [] ov_text; ov_text = 0; 3843 delete [] ov.text; ov.text = 0;
3763 delete [] ov_rend; ov_rend = 0; 3844 delete [] ov.rend; ov.rend = 0;
3764} 3845}
3765 3846
3766void 3847void
3767rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3848rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3768{ 3849{
3769 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3850 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3770 return; 3851 return;
3771 3852
3772 x++, y++; 3853 x++, y++;
3773 3854
3774 ov_text[y][x] = text; 3855 ov.text[y][x] = text;
3775 ov_rend[y][x] = rend; 3856 ov.rend[y][x] = rend;
3776} 3857}
3777 3858
3778void 3859void
3779rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3860rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3780{ 3861{
… …
3799} 3880}
3800 3881
3801void 3882void
3802rxvt_term::scr_swap_overlay () NOTHROW 3883rxvt_term::scr_swap_overlay () NOTHROW
3803{ 3884{
3804 if (!ov_text) 3885 if (!ov.text)
3805 return; 3886 return;
3806 3887
3888 // hide cursor if it is within the overlay area
3889 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3890 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3891 screen.flags &= ~Screen_VisibleCursor;
3892
3807 // swap screen mem with overlay 3893 // swap screen mem with overlay
3808 for (int y = ov_h; y--; ) 3894 for (int y = ov.h; y--; )
3809 { 3895 {
3810 text_t *t1 = ov_text[y]; 3896 text_t *t1 = ov.text[y];
3811 rend_t *r1 = ov_rend[y]; 3897 rend_t *r1 = ov.rend[y];
3812 3898
3813 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3899 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3814 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3900 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3815 3901
3816 for (int x = ov_w; x--; ) 3902 for (int x = ov.w; x--; )
3817 { 3903 {
3818 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3904 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3819 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3905 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3820 } 3906 }
3821 } 3907 }

Diff Legend

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