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

Diff Legend

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