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.336 by root, Tue Mar 30 23:54:30 2010 UTC vs.
Revision 1.356 by sf-exg, Tue Dec 21 10:37:42 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
… …
142 while (col > 0 && l.t[col] == NOCHAR) 143 while (col > 0 && l.t[col] == NOCHAR)
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 (' '));
148
149 l.touch ();
147 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;
… …
897# else 900# else
898 c = 0xfffd; 901 c = 0xfffd;
899# endif 902# endif
900#endif 903#endif
901 904
902 // nuke the character at this position, if required
903 if (expect_false (
904 line->t[screen.cur.col] == NOCHAR
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 906
912 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
915 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
916 c = NOCHAR; 913 c = NOCHAR;
917 // and try the same character next loop iteration 914 // and try the same character next loop iteration
918 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
920 927
921 line->touch (); 928 line->touch ();
922 929
923 do 930 do
924 { 931 {
… …
930 else 937 else
931 { 938 {
932 line->l = ncol; 939 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
935 break; 942
943 goto end_of_line;
936 } 944 }
937 945
938 c = NOCHAR; 946 c = NOCHAR;
939 } 947 }
940 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
941 949
942 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
944 { 952 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 953 line->t[c] = ' ';
950 line->r[c] = rend; 954 line->r[c] = rend;
951 }
952 } 955 }
956
957end_of_line:
958 ;
953 } 959 }
954#if ENABLE_COMBINING 960#if ENABLE_COMBINING
955 else // width == 0 961 else // width == 0
956 { 962 {
957 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1020 1026
1021 want_refresh = 1; 1027 want_refresh = 1;
1022#endif 1028#endif
1023 } 1029 }
1024 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1025 else 1033 else
1026 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1027} 1035}
1028 1036
1029/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1336 return; 1344 return;
1337 1345
1338 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1339 1347
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1351 {
1347 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1348 1353
1349 if (mapped && !view_start) 1354 if (mapped)
1350 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1353 } 1358 }
1354 else 1359 else
1355 { 1360 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1362
1358 if (mapped && !view_start) 1363 if (mapped)
1359 { 1364 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1370 1375
1371 for (; num--; row++) 1376 for (; num--; row++)
1372 { 1377 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1374 1379
1375 if (!view_start) 1380 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1382 }
1378} 1383}
1379 1384
1380#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1381void 1386void
… …
2085 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2086#else 2091#else
2087 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2088#endif 2093#endif
2089 2094
2090 if (showcursor && focus) 2095 if (focus)
2091 { 2096 {
2092 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2094 else 2099 else
2095 { 2100 {
… …
2231 2236
2232 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2239 --col;
2235 2240
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2242 text_t *text = stp + col;
2238 int count = 1; 2243 int count = 1;
2239 2244
2240 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2241 drp[col] = rend; 2246 drp[col] = rend;
… …
2286 */ 2291 */
2287 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2289 2294
2290 // 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
2291 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)))
2292 { 2297 {
2293 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2294 2299
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2320
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2322 fore = Color_UL;
2318#endif 2323#endif
2319 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
2320 if (invert) 2345 if (invert)
2321 { 2346 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2347 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2348
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2350 if (fore == back)
2340 { 2351 {
2341 fore = Color_bg; 2352 fore = Color_bg;
2342 back = Color_fg; 2353 back = Color_fg;
2343 } 2354 }
… …
2596 { 2607 {
2597#if !ENABLE_MINIMAL 2608#if !ENABLE_MINIMAL
2598 if (selection.rect) 2609 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2610 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2611 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2612 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2613 else
2603#endif 2614#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2615 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2616 selection.end.row, selection.end.col,
2606 RS_RVid); 2617 RS_Sel | RS_RVid);
2607 } 2618 }
2608} 2619}
2609 2620
2610/* ------------------------------------------------------------------------- */ 2621/* ------------------------------------------------------------------------- */
2611/* 2622/*
… …
2616void 2627void
2617rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2629{
2619 int row, wrote; 2630 int row, wrote;
2620 unsigned int width, towrite; 2631 unsigned int width, towrite;
2621 char r1[] = "\n"; 2632 const char r1[] = "\n";
2622 2633
2623 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2625 { 2636 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2672/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2673/* 2684/*
2674 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2675 */ 2686 */
2676void 2687void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2689{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2686 2697
2687 tt_write (data, len); 2698 tt_write (data, len);
2688 2699
2689 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2690 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);
2691} 2711}
2692 2712
2693/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2694/* 2714/*
2695 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2904 selection_wait = Sel_normal; 2924 selection_wait = Sel_normal;
2905 2925
2906#if X_HAVE_UTF8_STRING 2926#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2927 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2929 return;
2910#else 2930#else
2911 selection_type = Sel_CompoundText; 2931 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2933 return;
2914#endif 2934#endif
2915 } 2935 }
2916 2936
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2967 selection.clip_text = NULL; 2987 selection.clip_text = NULL;
2968 selection.clip_len = 0; 2988 selection.clip_len = 0;
2969 2989
2970 if (display->clipboard_owner == this) 2990 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2991 display->clipboard_owner = 0;
2972 }
2973}
2974
2975void
2976rxvt_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 } 2992 }
2987} 2993}
2988 2994
2989/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2990/* 2996/*

Diff Legend

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