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.405 by sf-exg, Tue Nov 15 20:09:13 2011 UTC vs.
Revision 1.409 by sf-exg, Mon Nov 21 18:35:52 2011 UTC

… …
549 return; 549 return;
550 550
551 want_refresh = 1; 551 want_refresh = 1;
552 view_start = 0; 552 view_start = 0;
553 553
554 selection_check (2); /* check for boundary cross */ 554 /* check for boundary cross */
555 row_col_t pos;
556 pos.row = pos.col = 0;
557 if (ROWCOL_IS_BEFORE (selection.beg, pos)
558 && ROWCOL_IS_AFTER (selection.end, pos))
559 CLEAR_SELECTION ();
555 560
556 current_screen = scrn; 561 current_screen = scrn;
557 562
558#if NSCREENS 563#if NSCREENS
559 if (option (Opt_secondaryScreen)) 564 if (option (Opt_secondaryScreen))
… …
1307 scr_blank_line (line, col, num, rstyle); 1312 scr_blank_line (line, col, num, rstyle);
1308} 1313}
1309 1314
1310/* ------------------------------------------------------------------------- */ 1315/* ------------------------------------------------------------------------- */
1311/* 1316/*
1312 * Erase part of whole of the screen 1317 * Erase part or whole of the screen
1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1318 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1319 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1320 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1316 */ 1321 */
1317void 1322void
… …
1326 ZERO_SCROLLBACK (); 1331 ZERO_SCROLLBACK ();
1327 1332
1328 switch (mode) 1333 switch (mode)
1329 { 1334 {
1330 case 0: /* erase to end of screen */ 1335 case 0: /* erase to end of screen */
1331 selection_check (1);
1332 scr_erase_line (0); 1336 scr_erase_line (0);
1333 row = screen.cur.row + 1; /* possible OOB */ 1337 row = screen.cur.row + 1; /* possible OOB */
1334 num = nrow - row; 1338 num = nrow - row;
1335 break; 1339 break;
1336 case 1: /* erase to beginning of screen */ 1340 case 1: /* erase to beginning of screen */
1337 selection_check (3);
1338 scr_erase_line (1); 1341 scr_erase_line (1);
1339 row = 0; 1342 row = 0;
1340 num = screen.cur.row; 1343 num = screen.cur.row;
1341 break; 1344 break;
1342 case 2: /* erase whole screen */ 1345 case 2: /* erase whole screen */
1343 selection_check (3);
1344 row = 0; 1346 row = 0;
1345 num = nrow; 1347 num = nrow;
1346 break; 1348 break;
1347 default: 1349 default:
1348 return; 1350 return;
… …
1419 1421
1420 want_refresh = 1; 1422 want_refresh = 1;
1421 ZERO_SCROLLBACK (); 1423 ZERO_SCROLLBACK ();
1422 1424
1423 num_scr_allow = 0; 1425 num_scr_allow = 0;
1424 selection_check (3); 1426
1427 row_col_t pos;
1428 pos.row = pos.col = 0;
1429 if (ROWCOL_IS_AFTER (selection.end, pos))
1430 CLEAR_SELECTION ();
1425 1431
1426 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1427 for (int row = nrow; row--; ) 1433 for (int row = nrow; row--; )
1428 { 1434 {
1429 line_t &line = ROW(row); 1435 line_t &line = ROW(row);
… …
2662 */ 2668 */
2663#if 0 2669#if 0
2664void 2670void
2665rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2666{ 2672{
2667 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2668 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2669 const char r1[] = "\n";
2670
2671 for (row = saveLines + top_row;
2672 row < saveLines + nrow - 1; row++)
2673 {
2674 width = row_buf[row].l >= 0 ? row_buf[row].l
2675 : ncol;
2676 for (towrite = width; towrite; towrite -= wrote)
2677 {
2678 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2679 towrite);
2680 if (wrote < 0)
2681 return; /* XXX: death, no report */
2682 }
2683 if (row_buf[row].l >= 0)
2684 if (write (fd, r1, 1) <= 0)
2685 return; /* XXX: death, no report */
2686 }
2687} 2675}
2688#endif 2676#endif
2689 2677
2690/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2691 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
… …
2693void 2681void
2694rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2695{ 2683{
2696 if (!selection.op) 2684 if (!selection.op)
2697 return; 2685 return;
2698
2699 row_col_t pos;
2700 pos.row = pos.col = 0;
2701 2686
2702 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2703 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2704 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2705 || (check_more == 1 2690 || (check_more == 1
2706 && current_screen == selection.screen 2691 && current_screen == selection.screen
2707 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2708 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2709 || (check_more == 2
2710 && ROWCOL_IS_BEFORE (selection.beg, pos)
2711 && ROWCOL_IS_AFTER (selection.end, pos))
2712 || (check_more == 3
2713 && ROWCOL_IS_AFTER (selection.end, pos)))
2714 CLEAR_ALL_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2715} 2695}
2716 2696
2717/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2718/* 2698/*

Diff Legend

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