… | |
… | |
234 | selection.text = NULL; |
234 | selection.text = NULL; |
235 | selection.len = 0; |
235 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
236 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
237 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
238 | selection.clicks = 0; |
239 | CLEAR_ALL_SELECTION (); |
|
|
240 | rvideo = 0; |
239 | rvideo = 0; |
241 | } |
240 | } |
242 | else |
241 | else |
243 | { |
242 | { |
244 | /* |
243 | /* |
… | |
… | |
325 | qline->l = ncol; |
324 | qline->l = ncol; |
326 | qline->is_longer (1); |
325 | qline->is_longer (1); |
327 | |
326 | |
328 | int qcol = 0; |
327 | int qcol = 0; |
329 | |
328 | |
|
|
329 | // see below for cursor adjustment rationale |
|
|
330 | if (p == ocur.row) |
|
|
331 | screen.cur.row = q - (total_rows - nrow); |
|
|
332 | |
330 | // fill a single destination line |
333 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
334 | while (lofs < llen && qcol < ncol) |
332 | { |
335 | { |
333 | int prow = lofs / prev_ncol; |
336 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
337 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
347 | |
345 | line_t &pline = old_buf [prow]; |
348 | line_t &pline = old_buf [prow]; |
346 | |
349 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
351 | |
|
|
352 | #if DEBUG_STRICT |
349 | assert (len); |
353 | assert (len); |
350 | assert (pline.t); |
354 | assert (pline.t); |
|
|
355 | #endif |
351 | |
356 | |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
359 | |
355 | lofs += len; |
360 | lofs += len; |
… | |
… | |
389 | } |
394 | } |
390 | |
395 | |
391 | term_start = 0; |
396 | term_start = 0; |
392 | } |
397 | } |
393 | |
398 | |
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = top_row; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
|
|
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
399 | free (old_buf); |
400 | delete old_ta; |
400 | delete old_ta; |
401 | delete old_ra; |
401 | delete old_ra; |
402 | |
402 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
405 | |
406 | if (tabs) |
406 | if (tabs) |
407 | free (tabs); |
407 | free (tabs); |
408 | } |
408 | } |
|
|
409 | |
|
|
410 | CLEAR_ALL_SELECTION (); |
409 | |
411 | |
410 | prev_nrow = nrow; |
412 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
413 | prev_ncol = ncol; |
412 | |
414 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
… | |
… | |
448 | scr_release (); |
450 | scr_release (); |
449 | prev_nrow = prev_ncol = 0; |
451 | prev_nrow = prev_ncol = 0; |
450 | scr_reset (); |
452 | scr_reset (); |
451 | |
453 | |
452 | scr_clear (true); |
454 | scr_clear (true); |
453 | scr_refresh (SLOW_REFRESH); |
455 | scr_refresh (); |
454 | } |
456 | } |
455 | |
457 | |
456 | /* ------------------------------------------------------------------------- * |
458 | /* ------------------------------------------------------------------------- * |
457 | * PROCESS SCREEN COMMANDS * |
459 | * PROCESS SCREEN COMMANDS * |
458 | * ------------------------------------------------------------------------- */ |
460 | * ------------------------------------------------------------------------- */ |
… | |
… | |
620 | top_row = max (top_row - count, -saveLines); |
622 | top_row = max (top_row - count, -saveLines); |
621 | |
623 | |
622 | // scroll everything up 'count' lines |
624 | // scroll everything up 'count' lines |
623 | term_start = (term_start + count) % total_rows; |
625 | term_start = (term_start + count) % total_rows; |
624 | |
626 | |
|
|
627 | // sever bottommost line |
625 | { |
628 | { |
626 | // severe bottommost scrolled line |
|
|
627 | line_t &l = ROW(row2 - count); |
629 | line_t &l = ROW(row2 - count); |
|
|
630 | l.is_longer (0); |
628 | l.touch (); |
631 | l.touch (); |
629 | l.is_longer (0); |
|
|
630 | } |
632 | } |
631 | |
633 | |
632 | // erase newly scorlled-in lines |
634 | // erase newly scrolled-in lines |
633 | for (int i = count; i; --i ) |
635 | for (int i = count; i--; ) |
634 | { |
636 | { |
635 | // basically this is a slightly optimized scr_blank_screen_mem |
637 | // basically this is a slightly optimized scr_blank_screen_mem |
636 | // it is worth the effort on slower machines |
638 | // it is worth the effort on slower machines |
637 | line_t &l = ROW(nrow - i); |
639 | line_t &l = ROW(nrow - 1 - i); |
638 | |
640 | |
639 | scr_blank_line (l, 0, l.l, rstyle); |
641 | scr_blank_line (l, 0, l.l, rstyle); |
640 | |
642 | |
641 | l.l = 0; |
643 | l.l = 0; |
642 | l.f = 0; |
644 | l.f = 0; |
… | |
… | |
817 | CLEAR_SELECTION (); |
819 | CLEAR_SELECTION (); |
818 | } |
820 | } |
819 | |
821 | |
820 | if (screen.flags & Screen_WrapNext) |
822 | if (screen.flags & Screen_WrapNext) |
821 | { |
823 | { |
822 | max_it (line->l, ncol); |
|
|
823 | line->is_longer (1); |
|
|
824 | |
|
|
825 | scr_do_wrap (); |
824 | scr_do_wrap (); |
826 | |
825 | |
|
|
826 | line->l = ncol; |
|
|
827 | line->is_longer (1); |
|
|
828 | |
827 | row = screen.cur.row; |
829 | row = screen.cur.row; |
828 | line = &ROW(row); /* _must_ refresh */ |
830 | line = &ROW(row); /* _must_ refresh */ |
829 | } |
831 | } |
830 | |
832 | |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
… | |
… | |
1790 | } |
1792 | } |
1791 | |
1793 | |
1792 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1794 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1793 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1795 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1794 | |
1796 | |
|
|
1797 | num_scr_allow = 0; |
|
|
1798 | |
1795 | if (refresh) |
1799 | if (refresh) |
1796 | scr_refresh (SLOW_REFRESH); |
1800 | scr_refresh (); |
1797 | } |
1801 | } |
1798 | |
1802 | |
1799 | /* ------------------------------------------------------------------------- */ |
1803 | /* ------------------------------------------------------------------------- */ |
1800 | /* |
1804 | /* |
1801 | * Refresh the entire screen |
1805 | * Refresh the entire screen |
… | |
… | |
1935 | * Refresh the screen |
1939 | * Refresh the screen |
1936 | * drawn_text/drawn_rend contain the screen information before the update. |
1940 | * drawn_text/drawn_rend contain the screen information before the update. |
1937 | * screen.text/screen.rend contain what the screen will change to. |
1941 | * screen.text/screen.rend contain what the screen will change to. |
1938 | */ |
1942 | */ |
1939 | void |
1943 | void |
1940 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1944 | rxvt_term::scr_refresh () |
1941 | { |
1945 | { |
1942 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1946 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1943 | showcursor; /* show the cursor */ |
1947 | showcursor; /* show the cursor */ |
1944 | int16_t col, row, /* column/row we're processing */ |
1948 | int16_t col, row, /* column/row we're processing */ |
1945 | ocrow; /* old cursor row */ |
1949 | ocrow; /* old cursor row */ |
… | |
… | |
2069 | #ifndef NO_SLOW_LINK_SUPPORT |
2073 | #ifndef NO_SLOW_LINK_SUPPORT |
2070 | /* |
2074 | /* |
2071 | * D: CopyArea pass - very useful for slower links |
2075 | * D: CopyArea pass - very useful for slower links |
2072 | * This has been deliberately kept simple. |
2076 | * This has been deliberately kept simple. |
2073 | */ |
2077 | */ |
2074 | i = num_scr; |
|
|
2075 | if (!display->is_local |
2078 | if (!display->is_local |
2076 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2079 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2077 | && abs (num_scr) < nrow && !must_clear) |
2080 | && abs (num_scr) < nrow && !must_clear) |
2078 | { |
2081 | { |
2079 | int16_t nits; |
2082 | int16_t nits; |
2080 | int j; |
2083 | int j; |
2081 | int len, wlen; |
2084 | int len, wlen; |
|
|
2085 | dLocal (int, num_scr); |
2082 | |
2086 | |
2083 | j = nrow; |
2087 | j = nrow; |
2084 | wlen = len = -1; |
2088 | wlen = len = -1; |
2085 | row = i > 0 ? 0 : j - 1; |
2089 | row = i > 0 ? 0 : j - 1; |
2086 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2090 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
… | |
… | |
2798 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2802 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2799 | * will auto fallback to CUT_BUFFER0 |
2803 | * will auto fallback to CUT_BUFFER0 |
2800 | * EXT: button 2 release |
2804 | * EXT: button 2 release |
2801 | */ |
2805 | */ |
2802 | void |
2806 | void |
2803 | rxvt_term::selection_request (Time tm, int x, int y) |
2807 | rxvt_term::selection_request (Time tm) |
2804 | { |
2808 | { |
2805 | if (x < 0 || x >= width || y < 0 || y >= height) |
|
|
2806 | return; /* outside window */ |
|
|
2807 | |
|
|
2808 | if (selection.text) |
2809 | if (selection.text) |
2809 | { /* internal selection */ |
2810 | { /* internal selection */ |
2810 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2811 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2811 | paste (str, strlen (str)); |
2812 | paste (str, strlen (str)); |
2812 | free (str); |
2813 | free (str); |