… | |
… | |
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 seperate compile! |
34 | |
34 | |
35 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
36 | { |
36 | { |
37 | while (len--) |
37 | while (len--) |
38 | *start++ = value; |
38 | *start++ = value; |
39 | } |
39 | } |
40 | |
40 | |
… | |
… | |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
275 | } |
276 | |
276 | |
277 | line_t *old_buf = row_buf; |
277 | line_t *old_buf = row_buf; |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
279 | |
279 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
282 | int q = total_rows; // rewrapped row |
283 | |
283 | |
284 | if (top_row) |
284 | if (top_row) |
… | |
… | |
328 | int qcol = 0; |
328 | int qcol = 0; |
329 | |
329 | |
330 | // see below for cursor adjustment rationale |
330 | // see below for cursor adjustment rationale |
331 | if (p == ocur.row) |
331 | if (p == ocur.row) |
332 | screen.cur.row = q - (total_rows - nrow); |
332 | screen.cur.row = q - (total_rows - nrow); |
333 | |
333 | |
334 | // fill a single destination line |
334 | // fill a single destination line |
335 | while (lofs < llen && qcol < ncol) |
335 | while (lofs < llen && qcol < ncol) |
336 | { |
336 | { |
337 | int prow = lofs / prev_ncol; |
337 | int prow = lofs / prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
338 | int pcol = lofs % prev_ncol; |
… | |
… | |
364 | } |
364 | } |
365 | while (p != pend && q > 0); |
365 | while (p != pend && q > 0); |
366 | |
366 | |
367 | term_start = total_rows - nrow; |
367 | term_start = total_rows - nrow; |
368 | top_row = q - term_start; |
368 | top_row = q - term_start; |
369 | |
369 | |
370 | // make sure all terminal lines exist |
370 | // make sure all terminal lines exist |
371 | while (top_row > 0) |
371 | while (top_row > 0) |
372 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
372 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
373 | } |
373 | } |
374 | else |
374 | else |
375 | { |
375 | { |
376 | // if no scrollback exists (yet), wing, instead of wrap |
376 | // if no scrollback exists (yet), wing, instead of wrap |
377 | |
377 | |
378 | for (int row = min (nrow, prev_nrow); row--; ) |
378 | for (int row = min (nrow, prev_nrow); row--; ) |
379 | { |
379 | { |
380 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
380 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
381 | line_t &qline = row_buf [row]; |
381 | line_t &qline = row_buf [row]; |
382 | |
382 | |
… | |
… | |
405 | CLEAR_ALL_SELECTION (); |
405 | CLEAR_ALL_SELECTION (); |
406 | |
406 | |
407 | prev_nrow = nrow; |
407 | prev_nrow = nrow; |
408 | prev_ncol = ncol; |
408 | prev_ncol = ncol; |
409 | |
409 | |
410 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
410 | tabs = (char *)rxvt_malloc (ncol); |
411 | |
411 | |
412 | for (int col = ncol; --col; ) |
412 | for (int col = ncol; --col; ) |
413 | tabs [col] = col % TABSIZE == 0; |
413 | tabs [col] = col % TABSIZE == 0; |
414 | |
414 | |
415 | if (current_screen != PRIMARY) |
415 | if (current_screen != PRIMARY) |
… | |
… | |
664 | line_t &l2 = ROW(i); |
664 | line_t &l2 = ROW(i); |
665 | |
665 | |
666 | ::swap (l1, l2); |
666 | ::swap (l1, l2); |
667 | l2.touch (); |
667 | l2.touch (); |
668 | } |
668 | } |
669 | |
669 | |
670 | // move and/or clear selection, if any |
670 | // move and/or clear selection, if any |
671 | if (selection.op && current_screen == selection.screen) |
671 | if (selection.op && current_screen == selection.screen) |
672 | { |
672 | { |
673 | selection.beg.row -= count; |
673 | selection.beg.row -= count; |
674 | selection.end.row -= count; |
674 | selection.end.row -= count; |
… | |
… | |
710 | { |
710 | { |
711 | /* move selected region too */ |
711 | /* move selected region too */ |
712 | selection.beg.row -= count; |
712 | selection.beg.row -= count; |
713 | selection.end.row -= count; |
713 | selection.end.row -= count; |
714 | selection.mark.row -= count; |
714 | selection.mark.row -= count; |
715 | |
715 | |
716 | selection_check (0); |
716 | selection_check (0); |
717 | } |
717 | } |
718 | } |
718 | } |
719 | |
719 | |
720 | // use a simple and robust scrolling algorithm, this |
720 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
832 | } |
832 | } |
833 | |
833 | |
834 | if (screen.flags & Screen_WrapNext) |
834 | if (screen.flags & Screen_WrapNext) |
835 | { |
835 | { |
836 | scr_do_wrap (); |
836 | scr_do_wrap (); |
837 | |
837 | |
838 | line->l = ncol; |
838 | line->l = ncol; |
839 | line->is_longer (1); |
839 | line->is_longer (1); |
840 | |
840 | |
841 | row = screen.cur.row; |
841 | row = screen.cur.row; |
842 | line = &ROW(row); /* _must_ refresh */ |
842 | line = &ROW(row); /* _must_ refresh */ |
… | |
… | |
1060 | x = i; |
1060 | x = i; |
1061 | |
1061 | |
1062 | if (!--count) |
1062 | if (!--count) |
1063 | break; |
1063 | break; |
1064 | } |
1064 | } |
1065 | else |
1065 | else |
1066 | ht &= l.t[i] == ' ' |
1066 | ht &= l.t[i] == ' ' |
1067 | && RS_SAME (l.r[i], base_rend); |
1067 | && RS_SAME (l.r[i], base_rend); |
1068 | |
1068 | |
1069 | if (count) |
1069 | if (count) |
1070 | x = ncol - 1; |
1070 | x = ncol - 1; |
… | |
… | |
1621 | */ |
1621 | */ |
1622 | void |
1622 | void |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1623 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1624 | { |
1624 | { |
1625 | if (mode < 0) |
1625 | if (mode < 0) |
1626 | memset (tabs, 0, ncol * sizeof (char)); |
1626 | memset (tabs, 0, ncol); |
1627 | else if (screen.cur.col < ncol) |
1627 | else if (screen.cur.col < ncol) |
1628 | tabs [screen.cur.col] = !!mode; |
1628 | tabs [screen.cur.col] = !!mode; |
1629 | } |
1629 | } |
1630 | |
1630 | |
1631 | /* ------------------------------------------------------------------------- */ |
1631 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1801 | for (i = PART_BEG; i < RC_COUNT; i++) |
1802 | { |
1802 | { |
1803 | min_it (rc[i].col, ncol - 1); |
1803 | min_it (rc[i].col, ncol - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1804 | min_it (rc[i].row, nrow - 1); |
1805 | } |
1805 | } |
1806 | |
1806 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1807 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1808 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1809 | |
1809 | |
1810 | num_scr_allow = 0; |
1810 | num_scr_allow = 0; |
1811 | |
1811 | |
… | |
… | |
1885 | # ifdef MAPALERT_OPTION |
1885 | # ifdef MAPALERT_OPTION |
1886 | if (option (Opt_mapAlert)) |
1886 | if (option (Opt_mapAlert)) |
1887 | # endif |
1887 | # endif |
1888 | XMapWindow (dpy, parent[0]); |
1888 | XMapWindow (dpy, parent[0]); |
1889 | # endif |
1889 | # endif |
|
|
1890 | |
1890 | # if ENABLE_FRILLS |
1891 | # if ENABLE_FRILLS |
1891 | if (option (Opt_urgentOnBell)) |
1892 | if (option (Opt_urgentOnBell)) |
1892 | { |
1893 | { |
1893 | XWMHints *h; |
|
|
1894 | |
|
|
1895 | h = XGetWMHints(dpy, parent[0]); |
1894 | if (XWMHints *h = XGetWMHints(dpy, parent[0])) |
1896 | if (h != NULL) |
|
|
1897 | { |
1895 | { |
1898 | h->flags |= XUrgencyHint; |
1896 | h->flags |= XUrgencyHint; |
1899 | XSetWMHints(dpy, parent[0], h); |
1897 | XSetWMHints (dpy, parent[0], h); |
1900 | } |
1898 | } |
1901 | } |
1899 | } |
1902 | # endif |
1900 | # endif |
1903 | |
1901 | |
1904 | if (option (Opt_visualBell)) |
1902 | if (option (Opt_visualBell)) |
… | |
… | |
2486 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2484 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2487 | scrollBar.setIdle (); |
2485 | scrollBar.setIdle (); |
2488 | scrollbar_show (0); |
2486 | scrollbar_show (0); |
2489 | } |
2487 | } |
2490 | # endif |
2488 | # endif |
2491 | #endif |
|
|
2492 | |
|
|
2493 | scr_clear (); |
2489 | scr_clear (); |
2494 | scr_touch (true); |
2490 | scr_touch (true); |
2495 | want_refresh = 1; |
2491 | want_refresh = 1; |
|
|
2492 | #endif |
|
|
2493 | |
2496 | } |
2494 | } |
2497 | |
2495 | |
2498 | /* ------------------------------------------------------------------------- */ |
2496 | /* ------------------------------------------------------------------------- */ |
2499 | void |
2497 | void |
2500 | rxvt_term::scr_clear (bool really) NOTHROW |
2498 | rxvt_term::scr_clear (bool really) NOTHROW |
… | |
… | |
2754 | ct.nitems = incr_buf_fill; |
2752 | ct.nitems = incr_buf_fill; |
2755 | incr_buf = 0; |
2753 | incr_buf = 0; |
2756 | incr_buf_size = 0; |
2754 | incr_buf_size = 0; |
2757 | incr_ev.stop (); |
2755 | incr_ev.stop (); |
2758 | } |
2756 | } |
2759 | else |
2757 | else |
2760 | { |
2758 | { |
2761 | if (selection_wait == Sel_normal |
2759 | if (selection_wait == Sel_normal |
2762 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2760 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2763 | { |
2761 | { |
2764 | /* |
2762 | /* |
… | |
… | |
2842 | selection_paste (win, prop, true); |
2840 | selection_paste (win, prop, true); |
2843 | } |
2841 | } |
2844 | |
2842 | |
2845 | /* ------------------------------------------------------------------------- */ |
2843 | /* ------------------------------------------------------------------------- */ |
2846 | /* |
2844 | /* |
2847 | * Request the current selection: |
2845 | * Request the current selection: |
2848 | * Order: > internal selection if available |
2846 | * Order: > internal selection if available |
2849 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2847 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2850 | * > CUT_BUFFER0 |
2848 | * > CUT_BUFFER0 |
2851 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2849 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2852 | * will auto fallback to CUT_BUFFER0 |
2850 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
3130 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3128 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3131 | |
3129 | |
3132 | while (selection.mark.col > 0 |
3130 | while (selection.mark.col > 0 |
3133 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3131 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3134 | --selection.mark.col; |
3132 | --selection.mark.col; |
3135 | |
3133 | |
3136 | if (selection.op) |
3134 | if (selection.op) |
3137 | { /* clear the old selection */ |
3135 | { /* clear the old selection */ |
3138 | selection.beg.row = selection.end.row = selection.mark.row; |
3136 | selection.beg.row = selection.end.row = selection.mark.row; |
3139 | selection.beg.col = selection.end.col = selection.mark.col; |
3137 | selection.beg.col = selection.end.col = selection.mark.col; |
3140 | } |
3138 | } |
… | |
… | |
3659 | XFree (ct.value); |
3657 | XFree (ct.value); |
3660 | } |
3658 | } |
3661 | |
3659 | |
3662 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3660 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3663 | } |
3661 | } |
3664 | |
|
|
3665 | /* ------------------------------------------------------------------------- * |
|
|
3666 | * MOUSE ROUTINES * |
|
|
3667 | * ------------------------------------------------------------------------- */ |
|
|
3668 | |
|
|
3669 | /* |
|
|
3670 | * return col/row values corresponding to x/y pixel values |
|
|
3671 | */ |
|
|
3672 | void |
|
|
3673 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3674 | { |
|
|
3675 | *x = Pixel2Col (*x); |
|
|
3676 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3677 | *y = Pixel2Row (*y); |
|
|
3678 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3679 | } |
|
|
3680 | |
3662 | |
3681 | /* ------------------------------------------------------------------------- */ |
3663 | /* ------------------------------------------------------------------------- */ |
3682 | #ifdef USE_XIM |
3664 | #ifdef USE_XIM |
3683 | void |
3665 | void |
3684 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3666 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |