… | |
… | |
351 | lofs += len; |
351 | lofs += len; |
352 | qcol += len; |
352 | qcol += len; |
353 | } |
353 | } |
354 | } |
354 | } |
355 | |
355 | |
356 | qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; |
356 | qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; |
|
|
357 | #ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY |
|
|
358 | if (qline->l < 0) |
|
|
359 | { |
|
|
360 | fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D |
|
|
361 | qline->l = 0; |
|
|
362 | } |
|
|
363 | #endif |
357 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
364 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
358 | } |
365 | } |
359 | while (p != pend && q > 0); |
366 | while (p != pend && q > 0); |
360 | |
367 | |
361 | term_start = total_rows - nrow; |
368 | term_start = total_rows - nrow; |
… | |
… | |
620 | { |
627 | { |
621 | selection.beg.row -= count; |
628 | selection.beg.row -= count; |
622 | selection.end.row -= count; |
629 | selection.end.row -= count; |
623 | selection.mark.row -= count; |
630 | selection.mark.row -= count; |
624 | |
631 | |
625 | selection_check (0); |
632 | if (selection.beg.row < -nsaved |
|
|
633 | || selection.end.row < -nsaved |
|
|
634 | || selection.mark.row < -nsaved) |
|
|
635 | { |
|
|
636 | CLEAR_ALL_SELECTION (); |
|
|
637 | selection.op = SELECTION_CLEAR; |
|
|
638 | } |
626 | } |
639 | } |
627 | |
640 | |
628 | for (int i = count; i--; ) |
641 | for (int i = count; i--; ) |
|
|
642 | { |
|
|
643 | ROW(row2 - i).l = 0; |
629 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
644 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
645 | } |
630 | |
646 | |
631 | if ((options & Opt_scrollWithBuffer) |
647 | if ((options & Opt_scrollWithBuffer) |
632 | && view_start != 0 |
648 | && view_start != 0 |
633 | && view_start != saveLines) |
649 | && view_start != saveLines) |
634 | scr_page (UP, count); |
650 | scr_page (UP, count); |
635 | } |
651 | } |
636 | else |
652 | else |
637 | { |
653 | { |
638 | if (selection.op && current_screen == selection.screen) |
654 | if (selection.op && current_screen == selection.screen) |
639 | { |
655 | { |
640 | int i = selection.beg.row; |
656 | if ((selection.beg.row < row1 && selection.end.row > row1) |
641 | int j = selection.end.row; |
657 | || (selection.beg.row < row2 && selection.end.row > row2) |
642 | |
|
|
643 | if ((i < row1 && j > row1) |
|
|
644 | || (i < row2 && j > row2) |
|
|
645 | || (i - count < row1 && i >= row1) |
658 | || (selection.beg.row - count < row1 && selection.beg.row >= row1) |
646 | || (i - count > row2 && i <= row2) |
659 | || (selection.beg.row - count > row2 && selection.beg.row <= row2) |
647 | || (j - count < row1 && j >= row1) |
660 | || (selection.end.row - count < row1 && selection.end.row >= row1) |
648 | || (j - count > row2 && j <= row2)) |
661 | || (selection.end.row - count > row2 && selection.end.row <= row2)) |
649 | { |
662 | { |
650 | CLEAR_ALL_SELECTION (); |
663 | CLEAR_ALL_SELECTION (); |
651 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
664 | selection.op = SELECTION_CLEAR; |
652 | } |
665 | } |
653 | else if (j >= row1 && j <= row2) |
666 | else if (selection.end.row >= row1 && selection.end.row <= row2) |
654 | { |
667 | { |
655 | /* move selected region too */ |
668 | /* move selected region too */ |
656 | selection.beg.row -= count; |
669 | selection.beg.row -= count; |
657 | selection.end.row -= count; |
670 | selection.end.row -= count; |
658 | selection.mark.row -= count; |
671 | selection.mark.row -= count; |
… | |
… | |
730 | { |
743 | { |
731 | c = *str++; |
744 | c = *str++; |
732 | |
745 | |
733 | if (c < 0x20) |
746 | if (c < 0x20) |
734 | if (c == C0_LF) |
747 | if (c == C0_LF) |
735 | { |
748 | { |
736 | if (!line->is_longer ()) /* XXX: think about this */ |
749 | if (!line->is_longer ()) /* XXX: think about this */ |
737 | max_it (line->l, screen.cur.col); |
750 | max_it (line->l, screen.cur.col); |
738 | |
751 | |
739 | screen.flags &= ~Screen_WrapNext; |
752 | screen.flags &= ~Screen_WrapNext; |
740 | |
753 | |
… | |
… | |
1280 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1293 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1281 | } |
1294 | } |
1282 | |
1295 | |
1283 | for (; num--; row++) |
1296 | for (; num--; row++) |
1284 | { |
1297 | { |
|
|
1298 | ROW (row).l = 0; |
1285 | scr_blank_screen_mem (ROW (row), rstyle); |
1299 | scr_blank_screen_mem (ROW (row), rstyle); |
1286 | ROW (row).l = 0; |
|
|
1287 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1300 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1288 | } |
1301 | } |
1289 | } |
1302 | } |
1290 | |
1303 | |
1291 | #if ENABLE_FRILLS |
1304 | #if ENABLE_FRILLS |
… | |
… | |
2449 | row = selection.beg.row; |
2462 | row = selection.beg.row; |
2450 | } |
2463 | } |
2451 | else |
2464 | else |
2452 | { |
2465 | { |
2453 | col = 0; |
2466 | col = 0; |
2454 | row = view_start; |
2467 | row = -view_start; |
2455 | } |
2468 | } |
2456 | |
2469 | |
2457 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2470 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
2458 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2471 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
2459 | srp[col] ^= RS_RVid; |
2472 | srp[col] ^= RS_RVid; |