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.334 by sf-exg, Sun Feb 14 11:04:11 2010 UTC vs.
Revision 1.349 by root, Thu Oct 14 23:12:11 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
… …
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 912
912 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
915 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
916 c = NOCHAR; 919 c = NOCHAR;
917 // and try the same character next loop iteration 920 // and try the same character next loop iteration
918 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
919 } 925 }
920 926
921 line->touch (); 927 line->touch ();
922 928
923 do 929 do
… …
1020 1026
1021 want_refresh = 1; 1027 want_refresh = 1;
1022#endif 1028#endif
1023 } 1029 }
1024 } 1030 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext;
1034#endif
1025 else 1035 else
1026 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1027} 1037}
1028 1038
1029/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1336 return; 1346 return;
1337 1347
1338 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1339 1349
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)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1353 {
1347 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1348 1355
1349 if (mapped && !view_start) 1356 if (mapped)
1350 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1353 } 1360 }
1354 else 1361 else
1355 { 1362 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1364
1358 if (mapped && !view_start) 1365 if (mapped)
1359 { 1366 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1370 1377
1371 for (; num--; row++) 1378 for (; num--; row++)
1372 { 1379 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1374 1381
1375 if (!view_start) 1382 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1384 }
1378} 1385}
1379 1386
1380#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1381void 1388void
… …
2085 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2086#else 2093#else
2087 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2088#endif 2095#endif
2089 2096
2090 if (showcursor && focus) 2097 if (focus)
2091 { 2098 {
2092 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2094 else 2101 else
2095 { 2102 {
… …
2231 2238
2232 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2241 --col;
2235 2242
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2244 text_t *text = stp + col;
2238 int count = 1; 2245 int count = 1;
2239 2246
2240 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2241 drp[col] = rend; 2248 drp[col] = rend;
… …
2286 */ 2293 */
2287 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2289 2296
2290 // only do special processing if any attributes are set, which is unlikely 2297 // 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))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2299 {
2293 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2294 2301
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2322
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2324 fore = Color_UL;
2318#endif 2325#endif
2319 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2320 if (invert) 2347 if (invert)
2321 { 2348 {
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); 2349 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2350
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#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) 2352 if (fore == back)
2340 { 2353 {
2341 fore = Color_bg; 2354 fore = Color_bg;
2342 back = Color_fg; 2355 back = Color_fg;
2343 } 2356 }
… …
2596 { 2609 {
2597#if !ENABLE_MINIMAL 2610#if !ENABLE_MINIMAL
2598 if (selection.rect) 2611 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2612 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2613 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2614 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2615 else
2603#endif 2616#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2617 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2618 selection.end.row, selection.end.col,
2606 RS_RVid); 2619 RS_Sel | RS_RVid);
2607 } 2620 }
2608} 2621}
2609 2622
2610/* ------------------------------------------------------------------------- */ 2623/* ------------------------------------------------------------------------- */
2611/* 2624/*
… …
2672/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2673/* 2686/*
2674 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2675 */ 2688 */
2676void 2689void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2691{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2686 2699
2687 tt_write (data, len); 2700 tt_write (data, len);
2688 2701
2689 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2703 tt_printf ("\e[201~");
2704}
2705
2706void
2707rxvt_term::paste (char *data, unsigned int len) NOTHROW
2708{
2709 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2710 return;
2711
2712 tt_paste (data, len);
2691} 2713}
2692 2714
2693/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2694/* 2716/*
2695 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2904 selection_wait = Sel_normal; 2926 selection_wait = Sel_normal;
2905 2927
2906#if X_HAVE_UTF8_STRING 2928#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2929 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2930 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2931 return;
2910#else 2932#else
2911 selection_type = Sel_CompoundText; 2933 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2934 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2935 return;
2914#endif 2936#endif
2915 } 2937 }
2916 2938
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2939 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2940 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2967 selection.clip_text = NULL; 2989 selection.clip_text = NULL;
2968 selection.clip_len = 0; 2990 selection.clip_len = 0;
2969 2991
2970 if (display->clipboard_owner == this) 2992 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2993 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 } 2994 }
2987} 2995}
2988 2996
2989/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2990/* 2998/*

Diff Legend

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