ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.331 by sf-exg, Wed Jan 6 17:52:43 2010 UTC vs.
Revision 1.351 by sf-exg, Fri Oct 15 11:07:45 2010 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
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 separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
… …
231 selection.text = NULL; 232 selection.text = NULL;
232 selection.len = 0; 233 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
235 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
236 } 239 }
237 else 240 else
238 { 241 {
239 /* 242 /*
240 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
544 want_refresh = 1; 547 want_refresh = 1;
545 view_start = 0; 548 view_start = 0;
546 549
547 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
548 551
549 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
550 553
551#if NSCREENS 554#if NSCREENS
552 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
553 { 556 {
554 num_scr = 0; 557 num_scr = 0;
… …
895# else 898# else
896 c = 0xfffd; 899 c = 0xfffd;
897# endif 900# endif
898#endif 901#endif
899 902
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
900 // nuke the character at this position, if required 919 // nuke the character at this position, if required
901 if (expect_false ( 920 if (expect_false (
902 line->t[screen.cur.col] == NOCHAR 921 line->t[screen.cur.col] == NOCHAR
903 || (screen.cur.col < ncol - 1 922 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR) 923 && line->t[screen.cur.col + 1] == NOCHAR)
905 )) 924 ))
906 scr_kill_char (*line, screen.cur.col); 925 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 926
919 line->touch (); 927 line->touch ();
920 928
921 do 929 do
922 { 930 {
… …
1018 1026
1019 want_refresh = 1; 1027 want_refresh = 1;
1020#endif 1028#endif
1021 } 1029 }
1022 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1023 else 1033 else
1024 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1025} 1035}
1026 1036
1027/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1334 return; 1344 return;
1335 1345
1336 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1337 1347
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1351 {
1345 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1346 1353
1347 if (mapped && !view_start) 1354 if (mapped)
1348 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1351 } 1358 }
1352 else 1359 else
1353 { 1360 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1362
1356 if (mapped && !view_start) 1363 if (mapped)
1357 { 1364 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1368 1375
1369 for (; num--; row++) 1376 for (; num--; row++)
1370 { 1377 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1372 1379
1373 if (!view_start) 1380 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1382 }
1376} 1383}
1377 1384
1378#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1379void 1386void
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1840 {
1834 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1836 } 1843 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1847
1841 num_scr_allow = 0; 1848 num_scr_allow = 0;
1842 1849
… …
2083 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2084#else 2091#else
2085 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2086#endif 2093#endif
2087 2094
2088 if (showcursor && focus) 2095 if (focus)
2089 { 2096 {
2090 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2092 else 2099 else
2093 { 2100 {
… …
2229 2236
2230 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2239 --col;
2233 2240
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2242 text_t *text = stp + col;
2236 int count = 1; 2243 int count = 1;
2237 2244
2238 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2239 drp[col] = rend; 2246 drp[col] = rend;
… …
2284 */ 2291 */
2285 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2287 2294
2288 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2297 {
2291 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2292 2299
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2320
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2322 fore = Color_UL;
2316#endif 2323#endif
2317 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2318 if (invert) 2345 if (invert)
2319 { 2346 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2347 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2348
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2350 if (fore == back)
2338 { 2351 {
2339 fore = Color_bg; 2352 fore = Color_bg;
2340 back = Color_fg; 2353 back = Color_fg;
2341 } 2354 }
… …
2594 { 2607 {
2595#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2596 if (selection.rect) 2609 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2613 else
2601#endif 2614#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2604 RS_RVid); 2617 RS_Sel | RS_RVid);
2605 } 2618 }
2606} 2619}
2607 2620
2608/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2609/* 2622/*
… …
2670/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2671/* 2684/*
2672 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2673 */ 2686 */
2674void 2687void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2689{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2684 2697
2685 tt_write (data, len); 2698 tt_write (data, len);
2686 2699
2687 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2701 tt_printf ("\e[201~");
2702}
2703
2704void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{
2707 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2708 return;
2709
2710 tt_paste (data, len);
2689} 2711}
2690 2712
2691/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2692/* 2714/*
2693 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2902 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2903 2925
2904#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2929 return;
2908#else 2930#else
2909 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2933 return;
2912#endif 2934#endif
2913 } 2935 }
2914 2936
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2966/*
2945 * Clear all selected text 2967 * Clear all selected text
2946 * EXT: SelectionClear 2968 * EXT: SelectionClear
2947 */ 2969 */
2948void 2970void
2949rxvt_term::selection_clear () NOTHROW 2971rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2972{
2973 if (!clipboard)
2974 {
2951 want_refresh = 1; 2975 want_refresh = 1;
2952 free (selection.text); 2976 free (selection.text);
2953 selection.text = NULL; 2977 selection.text = NULL;
2954 selection.len = 0; 2978 selection.len = 0;
2955 CLEAR_SELECTION (); 2979 CLEAR_SELECTION ();
2956 2980
2957 if (display->selection_owner == this) 2981 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2982 display->selection_owner = 0;
2983 }
2984 else
2985 {
2986 free (selection.clip_text);
2987 selection.clip_text = NULL;
2988 selection.clip_len = 0;
2989
2990 if (display->clipboard_owner == this)
2991 display->clipboard_owner = 0;
2992 }
2959} 2993}
2960 2994
2961/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2962/* 2996/*
2963 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
… …
3089 3123
3090 selection_grab (tm); 3124 selection_grab (tm);
3091} 3125}
3092 3126
3093bool 3127bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3128rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3129{
3130 Atom sel;
3131
3132 if (!clipboard)
3133 {
3096 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 }
3097 3142
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3143 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3144 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3145 {
3101 display->set_selection_owner (this); 3146 display->set_selection_owner (this, clipboard);
3102 return true; 3147 return true;
3103 } 3148 }
3104 else 3149 else
3105 { 3150 {
3106 selection_clear (); 3151 selection_clear (clipboard);
3107 return false; 3152 return false;
3108 } 3153 }
3109 3154
3110#if 0 3155#if 0
3111 XTextProperty ct; 3156 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3651 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3652 {
3608 /* TODO: Handle MULTIPLE */ 3653 /* TODO: Handle MULTIPLE */
3609 } 3654 }
3610#endif 3655#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3657 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 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);
3615 ev.property = rq.property; 3666 ev.property = rq.property;
3616 } 3667 }
3617 else if (rq.target == XA_STRING 3668 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3669 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3670 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3703 {
3653 target = xa[XA_COMPOUND_TEXT]; 3704 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3705 style = enc_compound_text;
3655 } 3706 }
3656 3707
3657 if (selection.text) 3708 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3709 {
3659 cl = selection.text; 3710 cl = selection.text;
3660 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;
3661 } 3717 }
3662 else 3718 else
3663 { 3719 {
3664 cl = L""; 3720 cl = L"";
3665 selectlen = 0; 3721 selectlen = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines