… | |
… | |
231 | selection.text = NULL; |
231 | selection.text = NULL; |
232 | selection.len = 0; |
232 | selection.len = 0; |
233 | selection.op = SELECTION_CLEAR; |
233 | selection.op = SELECTION_CLEAR; |
234 | selection.screen = PRIMARY; |
234 | selection.screen = PRIMARY; |
235 | selection.clicks = 0; |
235 | selection.clicks = 0; |
|
|
236 | selection.clip_text = NULL; |
|
|
237 | selection.clip_len = 0; |
236 | } |
238 | } |
237 | else |
239 | else |
238 | { |
240 | { |
239 | /* |
241 | /* |
240 | * add or delete rows as appropriate |
242 | * add or delete rows as appropriate |
… | |
… | |
286 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
288 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
287 | |
289 | |
288 | do |
290 | do |
289 | { |
291 | { |
290 | p = MOD (p - 1, prev_total_rows); |
292 | p = MOD (p - 1, prev_total_rows); |
291 | #ifdef DEBUG_STRICT |
|
|
292 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | assert (old_buf [MOD (p, prev_total_rows)].t); |
293 | #endif |
|
|
294 | int plines = 1; |
294 | int plines = 1; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
295 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
296 | |
296 | |
297 | 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 ()) |
298 | { |
298 | { |
… | |
… | |
510 | } |
510 | } |
511 | |
511 | |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
512 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
513 | min_it (s->cur.row, nrow - 1); |
513 | min_it (s->cur.row, nrow - 1); |
514 | min_it (s->cur.col, ncol - 1); |
514 | min_it (s->cur.col, ncol - 1); |
515 | #ifdef DEBUG_STRICT |
|
|
516 | assert (s->cur.row >= 0); |
515 | assert (s->cur.row >= 0); |
517 | assert (s->cur.col >= 0); |
516 | assert (s->cur.col >= 0); |
518 | #endif |
|
|
519 | } |
517 | } |
520 | |
518 | |
521 | void |
519 | void |
522 | rxvt_term::scr_swap_screen () |
520 | rxvt_term::scr_swap_screen () |
523 | { |
521 | { |
… | |
… | |
548 | want_refresh = 1; |
546 | want_refresh = 1; |
549 | view_start = 0; |
547 | view_start = 0; |
550 | |
548 | |
551 | selection_check (2); /* check for boundary cross */ |
549 | selection_check (2); /* check for boundary cross */ |
552 | |
550 | |
553 | int i = current_screen; current_screen = scrn; scrn = i; |
551 | current_screen = scrn; |
554 | |
552 | |
555 | #if NSCREENS |
553 | #if NSCREENS |
556 | if (option (Opt_secondaryScreen)) |
554 | if (option (Opt_secondaryScreen)) |
557 | { |
555 | { |
558 | num_scr = 0; |
556 | num_scr = 0; |
… | |
… | |
783 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
781 | scr_scroll_text (screen.tscroll, screen.bscroll, minlines); |
784 | screen.cur.row -= minlines; |
782 | screen.cur.row -= minlines; |
785 | } |
783 | } |
786 | } |
784 | } |
787 | |
785 | |
788 | #ifdef DEBUG_STRICT |
|
|
789 | assert (screen.cur.col < ncol); |
786 | assert (screen.cur.col < ncol); |
790 | assert (screen.cur.row < nrow |
787 | assert (screen.cur.row < nrow |
791 | && screen.cur.row >= top_row); |
788 | && screen.cur.row >= top_row); |
792 | #endif |
|
|
793 | int row = screen.cur.row; |
789 | int row = screen.cur.row; |
794 | |
790 | |
795 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
791 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
796 | |
792 | |
797 | line_t *line = &ROW(row); |
793 | line_t *line = &ROW(row); |
… | |
… | |
1001 | #endif |
997 | #endif |
1002 | } |
998 | } |
1003 | |
999 | |
1004 | max_it (line->l, screen.cur.col); |
1000 | max_it (line->l, screen.cur.col); |
1005 | |
1001 | |
1006 | #ifdef DEBUG_STRICT |
|
|
1007 | assert (screen.cur.row >= 0); |
1002 | assert (screen.cur.row >= 0); |
1008 | #endif |
|
|
1009 | } |
1003 | } |
1010 | |
1004 | |
1011 | /* ------------------------------------------------------------------------- */ |
1005 | /* ------------------------------------------------------------------------- */ |
1012 | /* |
1006 | /* |
1013 | * 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 |
… | |
… | |
1840 | for (i = PART_BEG; i < RC_COUNT; i++) |
1834 | for (i = PART_BEG; i < RC_COUNT; i++) |
1841 | { |
1835 | { |
1842 | min_it (rc[i].col, ncol - 1); |
1836 | min_it (rc[i].col, ncol - 1); |
1843 | min_it (rc[i].row, nrow - 1); |
1837 | min_it (rc[i].row, nrow - 1); |
1844 | } |
1838 | } |
1845 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1839 | |
1846 | 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++) |
1847 | 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); |
1848 | |
1842 | |
1849 | num_scr_allow = 0; |
1843 | num_scr_allow = 0; |
1850 | |
1844 | |
… | |
… | |
1941 | |
1935 | |
1942 | bell_ev.start (VISUAL_BELL_DURATION); |
1936 | bell_ev.start (VISUAL_BELL_DURATION); |
1943 | } |
1937 | } |
1944 | else |
1938 | else |
1945 | XBell (dpy, 0); |
1939 | XBell (dpy, 0); |
|
|
1940 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | #endif |
1941 | #endif |
1947 | } |
1942 | } |
1948 | |
1943 | |
1949 | /* ------------------------------------------------------------------------- */ |
1944 | /* ------------------------------------------------------------------------- */ |
1950 | /* ARGSUSED */ |
1945 | /* ARGSUSED */ |
… | |
… | |
1969 | row_start = view_start; |
1964 | row_start = view_start; |
1970 | } |
1965 | } |
1971 | |
1966 | |
1972 | wctomb (0, 0); |
1967 | wctomb (0, 0); |
1973 | |
1968 | |
1974 | for (int r1 = 0; r1 < nrows; r1++) |
1969 | for (int r1 = row_start; r1 < row_start + nrows; r1++) |
1975 | { |
1970 | { |
1976 | text_t *tp = ROW(r1).t; |
1971 | text_t *tp = ROW(r1).t; |
1977 | int len = ROW(r1).l; |
1972 | int len = ROW(r1).l; |
1978 | |
1973 | |
1979 | 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 |
… | |
… | |
2951 | /* |
2946 | /* |
2952 | * Clear all selected text |
2947 | * Clear all selected text |
2953 | * EXT: SelectionClear |
2948 | * EXT: SelectionClear |
2954 | */ |
2949 | */ |
2955 | void |
2950 | void |
2956 | rxvt_term::selection_clear () NOTHROW |
2951 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2957 | { |
2952 | { |
|
|
2953 | if (!clipboard) |
|
|
2954 | { |
2958 | want_refresh = 1; |
2955 | want_refresh = 1; |
2959 | free (selection.text); |
2956 | free (selection.text); |
2960 | selection.text = NULL; |
2957 | selection.text = NULL; |
2961 | selection.len = 0; |
2958 | selection.len = 0; |
2962 | CLEAR_SELECTION (); |
2959 | CLEAR_SELECTION (); |
2963 | |
2960 | |
2964 | if (display->selection_owner == this) |
2961 | if (display->selection_owner == this) |
2965 | display->selection_owner = 0; |
2962 | display->selection_owner = 0; |
|
|
2963 | } |
|
|
2964 | else |
|
|
2965 | { |
|
|
2966 | free (selection.clip_text); |
|
|
2967 | selection.clip_text = NULL; |
|
|
2968 | selection.clip_len = 0; |
|
|
2969 | |
|
|
2970 | if (display->clipboard_owner == this) |
|
|
2971 | display->clipboard_owner = 0; |
|
|
2972 | } |
|
|
2973 | } |
|
|
2974 | |
|
|
2975 | void |
|
|
2976 | rxvt_term::clipboard_copy (Time tm) |
|
|
2977 | { |
|
|
2978 | if (selection.len > 0) |
|
|
2979 | { |
|
|
2980 | free (selection.clip_text); |
|
|
2981 | selection.clip_len = selection.len; |
|
|
2982 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2983 | memcpy (selection.clip_text, selection.text, |
|
|
2984 | sizeof (wchar_t) * selection.clip_len); |
|
|
2985 | selection_grab (tm, true); |
|
|
2986 | } |
2966 | } |
2987 | } |
2967 | |
2988 | |
2968 | /* ------------------------------------------------------------------------- */ |
2989 | /* ------------------------------------------------------------------------- */ |
2969 | /* |
2990 | /* |
2970 | * Copy a selection into the cut buffer |
2991 | * Copy a selection into the cut buffer |
… | |
… | |
3096 | |
3117 | |
3097 | selection_grab (tm); |
3118 | selection_grab (tm); |
3098 | } |
3119 | } |
3099 | |
3120 | |
3100 | bool |
3121 | bool |
3101 | rxvt_term::selection_grab (Time tm) NOTHROW |
3122 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3102 | { |
3123 | { |
|
|
3124 | Atom sel; |
|
|
3125 | |
|
|
3126 | if (!clipboard) |
|
|
3127 | { |
3103 | selection_time = tm; |
3128 | selection_time = tm; |
|
|
3129 | sel = XA_PRIMARY; |
|
|
3130 | } |
|
|
3131 | else |
|
|
3132 | { |
|
|
3133 | clipboard_time = tm; |
|
|
3134 | sel = xa[XA_CLIPBOARD]; |
|
|
3135 | } |
3104 | |
3136 | |
3105 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3137 | XSetSelectionOwner (dpy, sel, vt, tm); |
3106 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3138 | if (XGetSelectionOwner (dpy, sel) == vt) |
3107 | { |
3139 | { |
3108 | display->set_selection_owner (this); |
3140 | display->set_selection_owner (this, clipboard); |
3109 | return true; |
3141 | return true; |
3110 | } |
3142 | } |
3111 | else |
3143 | else |
3112 | { |
3144 | { |
3113 | selection_clear (); |
3145 | selection_clear (clipboard); |
3114 | return false; |
3146 | return false; |
3115 | } |
3147 | } |
3116 | |
3148 | |
3117 | #if 0 |
3149 | #if 0 |
3118 | XTextProperty ct; |
3150 | XTextProperty ct; |
… | |
… | |
3613 | else if (rq.target == xa[XA_MULTIPLE]) |
3645 | else if (rq.target == xa[XA_MULTIPLE]) |
3614 | { |
3646 | { |
3615 | /* TODO: Handle MULTIPLE */ |
3647 | /* TODO: Handle MULTIPLE */ |
3616 | } |
3648 | } |
3617 | #endif |
3649 | #endif |
3618 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3650 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3619 | { |
3651 | { |
3620 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3652 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3621 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3653 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3654 | ev.property = rq.property; |
|
|
3655 | } |
|
|
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3657 | { |
|
|
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3659 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3622 | ev.property = rq.property; |
3660 | ev.property = rq.property; |
3623 | } |
3661 | } |
3624 | else if (rq.target == XA_STRING |
3662 | else if (rq.target == XA_STRING |
3625 | || rq.target == xa[XA_TEXT] |
3663 | || rq.target == xa[XA_TEXT] |
3626 | || rq.target == xa[XA_COMPOUND_TEXT] |
3664 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3659 | { |
3697 | { |
3660 | target = xa[XA_COMPOUND_TEXT]; |
3698 | target = xa[XA_COMPOUND_TEXT]; |
3661 | style = enc_compound_text; |
3699 | style = enc_compound_text; |
3662 | } |
3700 | } |
3663 | |
3701 | |
3664 | if (selection.text) |
3702 | if (rq.selection == XA_PRIMARY && selection.text) |
3665 | { |
3703 | { |
3666 | cl = selection.text; |
3704 | cl = selection.text; |
3667 | selectlen = selection.len; |
3705 | selectlen = selection.len; |
|
|
3706 | } |
|
|
3707 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3708 | { |
|
|
3709 | cl = selection.clip_text; |
|
|
3710 | selectlen = selection.clip_len; |
3668 | } |
3711 | } |
3669 | else |
3712 | else |
3670 | { |
3713 | { |
3671 | cl = L""; |
3714 | cl = L""; |
3672 | selectlen = 0; |
3715 | selectlen = 0; |