… | |
… | |
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 |
… | |
… | |
2090 | ccol2 = bgcolor_of (rstyle); |
2085 | ccol2 = bgcolor_of (rstyle); |
2091 | #else |
2086 | #else |
2092 | ccol2 = Color_bg; |
2087 | ccol2 = Color_bg; |
2093 | #endif |
2088 | #endif |
2094 | |
2089 | |
2095 | if (showcursor && focus) |
2090 | if (focus) |
2096 | { |
2091 | { |
2097 | if (option (Opt_cursorUnderline)) |
2092 | if (option (Opt_cursorUnderline)) |
2098 | *crp ^= RS_Uline; |
2093 | *crp ^= RS_Uline; |
2099 | else |
2094 | else |
2100 | { |
2095 | { |
… | |
… | |
2236 | |
2231 | |
2237 | // seek to the beginning of wide characters |
2232 | // seek to the beginning of wide characters |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2233 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2239 | --col; |
2234 | --col; |
2240 | |
2235 | |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2236 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | text_t *text = stp + col; |
2237 | text_t *text = stp + col; |
2243 | int count = 1; |
2238 | int count = 1; |
2244 | |
2239 | |
2245 | dtp[col] = stp[col]; |
2240 | dtp[col] = stp[col]; |
2246 | drp[col] = rend; |
2241 | drp[col] = rend; |
… | |
… | |
2250 | for (i = 0; ++col < ncol; ) |
2245 | for (i = 0; ++col < ncol; ) |
2251 | { |
2246 | { |
2252 | if (stp[col] == NOCHAR) |
2247 | if (stp[col] == NOCHAR) |
2253 | { |
2248 | { |
2254 | dtp[col] = stp[col]; |
2249 | dtp[col] = stp[col]; |
2255 | drp[col] = rend; |
2250 | drp[col] = srp[col]; |
|
|
2251 | |
2256 | count++; |
2252 | count++; |
2257 | i++; |
2253 | i++; |
2258 | |
2254 | |
2259 | continue; |
2255 | continue; |
2260 | } |
2256 | } |
… | |
… | |
2290 | */ |
2286 | */ |
2291 | int fore = fgcolor_of (rend); // desired foreground |
2287 | int fore = fgcolor_of (rend); // desired foreground |
2292 | int back = bgcolor_of (rend); // desired background |
2288 | int back = bgcolor_of (rend); // desired background |
2293 | |
2289 | |
2294 | // only do special processing if any attributes are set, which is unlikely |
2290 | // only do special processing if any attributes are set, which is unlikely |
2295 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2291 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2296 | { |
2292 | { |
2297 | bool invert = rend & RS_RVid; |
2293 | bool invert = rend & RS_RVid; |
2298 | |
2294 | |
2299 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2295 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2300 | if (rend & RS_Bold && fore == Color_fg) |
2296 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2319 | |
2315 | |
2320 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2316 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2321 | fore = Color_UL; |
2317 | fore = Color_UL; |
2322 | #endif |
2318 | #endif |
2323 | |
2319 | |
|
|
2320 | #ifdef OPTION_HC |
|
|
2321 | if (rend & RS_Sel) |
|
|
2322 | { |
|
|
2323 | /* invert the column if no highlightColor is set or it is the |
|
|
2324 | * current cursor column */ |
|
|
2325 | if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2326 | && ISSET_PIXCOLOR (Color_HC)) |
|
|
2327 | { |
|
|
2328 | if (ISSET_PIXCOLOR (Color_HTC)) |
|
|
2329 | fore = Color_HTC; |
|
|
2330 | // if invert is 0 reverse video is set so we use bg color as fg color |
|
|
2331 | else if (!invert) |
|
|
2332 | fore = back; |
|
|
2333 | |
|
|
2334 | back = Color_HC; |
|
|
2335 | invert = 0; |
|
|
2336 | } |
|
|
2337 | } |
|
|
2338 | #endif |
|
|
2339 | |
2324 | if (invert) |
2340 | if (invert) |
2325 | { |
2341 | { |
2326 | #ifdef OPTION_HC |
|
|
2327 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2328 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2329 | #endif |
|
|
2330 | /* invert the column if no highlightColor is set or it is the |
|
|
2331 | * current cursor column */ |
|
|
2332 | ::swap (fore, back); |
2342 | ::swap (fore, back); |
2333 | #ifdef OPTION_HC |
|
|
2334 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2335 | back = Color_HC; |
|
|
2336 | #endif |
|
|
2337 | |
2343 | |
2338 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2344 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2339 | # ifndef OPTION_HC |
|
|
2340 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2341 | back = Color_RV; |
|
|
2342 | # endif |
|
|
2343 | if (fore == back) |
2345 | if (fore == back) |
2344 | { |
2346 | { |
2345 | fore = Color_bg; |
2347 | fore = Color_bg; |
2346 | back = Color_fg; |
2348 | back = Color_fg; |
2347 | } |
2349 | } |
… | |
… | |
2600 | { |
2602 | { |
2601 | #if !ENABLE_MINIMAL |
2603 | #if !ENABLE_MINIMAL |
2602 | if (selection.rect) |
2604 | if (selection.rect) |
2603 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2605 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2604 | selection.end.row, selection.end.col, |
2606 | selection.end.row, selection.end.col, |
2605 | RS_RVid, RS_RVid | RS_Uline); |
2607 | RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline); |
2606 | else |
2608 | else |
2607 | #endif |
2609 | #endif |
2608 | scr_xor_span (selection.beg.row, selection.beg.col, |
2610 | scr_xor_span (selection.beg.row, selection.beg.col, |
2609 | selection.end.row, selection.end.col, |
2611 | selection.end.row, selection.end.col, |
2610 | RS_RVid); |
2612 | RS_Sel | RS_RVid); |
2611 | } |
2613 | } |
2612 | } |
2614 | } |
2613 | |
2615 | |
2614 | /* ------------------------------------------------------------------------- */ |
2616 | /* ------------------------------------------------------------------------- */ |
2615 | /* |
2617 | /* |
… | |
… | |
2908 | selection_wait = Sel_normal; |
2910 | selection_wait = Sel_normal; |
2909 | |
2911 | |
2910 | #if X_HAVE_UTF8_STRING |
2912 | #if X_HAVE_UTF8_STRING |
2911 | selection_type = Sel_UTF8String; |
2913 | selection_type = Sel_UTF8String; |
2912 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2914 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2913 | return; |
2915 | return; |
2914 | #else |
2916 | #else |
2915 | selection_type = Sel_CompoundText; |
2917 | selection_type = Sel_CompoundText; |
2916 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2918 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2917 | return; |
2919 | return; |
2918 | #endif |
2920 | #endif |
2919 | } |
2921 | } |
2920 | |
2922 | |
2921 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2923 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2922 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2924 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
… | |
… | |
2950 | /* |
2952 | /* |
2951 | * Clear all selected text |
2953 | * Clear all selected text |
2952 | * EXT: SelectionClear |
2954 | * EXT: SelectionClear |
2953 | */ |
2955 | */ |
2954 | void |
2956 | void |
2955 | rxvt_term::selection_clear () NOTHROW |
2957 | rxvt_term::selection_clear (bool clipboard) NOTHROW |
2956 | { |
2958 | { |
|
|
2959 | if (!clipboard) |
|
|
2960 | { |
2957 | want_refresh = 1; |
2961 | want_refresh = 1; |
2958 | free (selection.text); |
2962 | free (selection.text); |
2959 | selection.text = NULL; |
2963 | selection.text = NULL; |
2960 | selection.len = 0; |
2964 | selection.len = 0; |
2961 | CLEAR_SELECTION (); |
2965 | CLEAR_SELECTION (); |
2962 | |
2966 | |
2963 | if (display->selection_owner == this) |
2967 | if (display->selection_owner == this) |
2964 | display->selection_owner = 0; |
2968 | display->selection_owner = 0; |
|
|
2969 | } |
|
|
2970 | else |
|
|
2971 | { |
|
|
2972 | free (selection.clip_text); |
|
|
2973 | selection.clip_text = NULL; |
|
|
2974 | selection.clip_len = 0; |
|
|
2975 | |
|
|
2976 | if (display->clipboard_owner == this) |
|
|
2977 | display->clipboard_owner = 0; |
|
|
2978 | } |
|
|
2979 | } |
|
|
2980 | |
|
|
2981 | void |
|
|
2982 | rxvt_term::clipboard_copy (Time tm) |
|
|
2983 | { |
|
|
2984 | if (selection.len > 0) |
|
|
2985 | { |
|
|
2986 | free (selection.clip_text); |
|
|
2987 | selection.clip_len = selection.len; |
|
|
2988 | selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len); |
|
|
2989 | memcpy (selection.clip_text, selection.text, |
|
|
2990 | sizeof (wchar_t) * selection.clip_len); |
|
|
2991 | selection_grab (tm, true); |
|
|
2992 | } |
2965 | } |
2993 | } |
2966 | |
2994 | |
2967 | /* ------------------------------------------------------------------------- */ |
2995 | /* ------------------------------------------------------------------------- */ |
2968 | /* |
2996 | /* |
2969 | * Copy a selection into the cut buffer |
2997 | * Copy a selection into the cut buffer |
… | |
… | |
3095 | |
3123 | |
3096 | selection_grab (tm); |
3124 | selection_grab (tm); |
3097 | } |
3125 | } |
3098 | |
3126 | |
3099 | bool |
3127 | bool |
3100 | rxvt_term::selection_grab (Time tm) NOTHROW |
3128 | rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW |
3101 | { |
3129 | { |
|
|
3130 | Atom sel; |
|
|
3131 | |
|
|
3132 | if (!clipboard) |
|
|
3133 | { |
3102 | selection_time = tm; |
3134 | selection_time = tm; |
|
|
3135 | sel = XA_PRIMARY; |
|
|
3136 | } |
|
|
3137 | else |
|
|
3138 | { |
|
|
3139 | clipboard_time = tm; |
|
|
3140 | sel = xa[XA_CLIPBOARD]; |
|
|
3141 | } |
3103 | |
3142 | |
3104 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3143 | XSetSelectionOwner (dpy, sel, vt, tm); |
3105 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3144 | if (XGetSelectionOwner (dpy, sel) == vt) |
3106 | { |
3145 | { |
3107 | display->set_selection_owner (this); |
3146 | display->set_selection_owner (this, clipboard); |
3108 | return true; |
3147 | return true; |
3109 | } |
3148 | } |
3110 | else |
3149 | else |
3111 | { |
3150 | { |
3112 | selection_clear (); |
3151 | selection_clear (clipboard); |
3113 | return false; |
3152 | return false; |
3114 | } |
3153 | } |
3115 | |
3154 | |
3116 | #if 0 |
3155 | #if 0 |
3117 | XTextProperty ct; |
3156 | XTextProperty ct; |
… | |
… | |
3612 | else if (rq.target == xa[XA_MULTIPLE]) |
3651 | else if (rq.target == xa[XA_MULTIPLE]) |
3613 | { |
3652 | { |
3614 | /* TODO: Handle MULTIPLE */ |
3653 | /* TODO: Handle MULTIPLE */ |
3615 | } |
3654 | } |
3616 | #endif |
3655 | #endif |
3617 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3618 | { |
3657 | { |
3619 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3620 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3659 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
|
|
3660 | ev.property = rq.property; |
|
|
3661 | } |
|
|
3662 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3663 | { |
|
|
3664 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
|
|
3665 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3621 | ev.property = rq.property; |
3666 | ev.property = rq.property; |
3622 | } |
3667 | } |
3623 | else if (rq.target == XA_STRING |
3668 | else if (rq.target == XA_STRING |
3624 | || rq.target == xa[XA_TEXT] |
3669 | || rq.target == xa[XA_TEXT] |
3625 | || rq.target == xa[XA_COMPOUND_TEXT] |
3670 | || rq.target == xa[XA_COMPOUND_TEXT] |
… | |
… | |
3658 | { |
3703 | { |
3659 | target = xa[XA_COMPOUND_TEXT]; |
3704 | target = xa[XA_COMPOUND_TEXT]; |
3660 | style = enc_compound_text; |
3705 | style = enc_compound_text; |
3661 | } |
3706 | } |
3662 | |
3707 | |
3663 | if (selection.text) |
3708 | if (rq.selection == XA_PRIMARY && selection.text) |
3664 | { |
3709 | { |
3665 | cl = selection.text; |
3710 | cl = selection.text; |
3666 | selectlen = selection.len; |
3711 | selectlen = selection.len; |
|
|
3712 | } |
|
|
3713 | else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
|
|
3714 | { |
|
|
3715 | cl = selection.clip_text; |
|
|
3716 | selectlen = selection.clip_len; |
3667 | } |
3717 | } |
3668 | else |
3718 | else |
3669 | { |
3719 | { |
3670 | cl = L""; |
3720 | cl = L""; |
3671 | selectlen = 0; |
3721 | selectlen = 0; |