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.333 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.347 by sf-exg, Sat Aug 28 11:03:04 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
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1336 return; 1337 return;
1337 1338
1338 min_it (num, nrow - row); 1339 min_it (num, nrow - row);
1339 1340
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)) 1341 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1342 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1343 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1344 {
1347 ren = DEFAULT_RSTYLE; 1345 ren = DEFAULT_RSTYLE;
1348 1346
1349 if (mapped && !view_start) 1347 if (mapped)
1350 XClearArea (dpy, vt, 0, 1348 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1349 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1350 (unsigned int)Height2Pixel (num), False);
1353 } 1351 }
1354 else 1352 else
1355 { 1353 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1354 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1355
1358 if (mapped && !view_start) 1356 if (mapped)
1359 { 1357 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1359 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1360 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1361 0, Row2Pixel (row - view_start),
… …
1370 1368
1371 for (; num--; row++) 1369 for (; num--; row++)
1372 { 1370 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1371 scr_blank_screen_mem (ROW(row), rstyle);
1374 1372
1375 if (!view_start) 1373 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1374 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1375 }
1378} 1376}
1379 1377
1380#if !ENABLE_MINIMAL 1378#if !ENABLE_MINIMAL
1381void 1379void
… …
1834 for (i = PART_BEG; i < RC_COUNT; i++) 1832 for (i = PART_BEG; i < RC_COUNT; i++)
1835 { 1833 {
1836 min_it (rc[i].col, ncol - 1); 1834 min_it (rc[i].col, ncol - 1);
1837 min_it (rc[i].row, nrow - 1); 1835 min_it (rc[i].row, nrow - 1);
1838 } 1836 }
1839// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1837
1840 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1841 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1842 1840
1843 num_scr_allow = 0; 1841 num_scr_allow = 0;
1844 1842
… …
2085 ccol2 = bgcolor_of (rstyle); 2083 ccol2 = bgcolor_of (rstyle);
2086#else 2084#else
2087 ccol2 = Color_bg; 2085 ccol2 = Color_bg;
2088#endif 2086#endif
2089 2087
2090 if (showcursor && focus) 2088 if (focus)
2091 { 2089 {
2092 if (option (Opt_cursorUnderline)) 2090 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2091 *crp ^= RS_Uline;
2094 else 2092 else
2095 { 2093 {
… …
2231 2229
2232 // seek to the beginning of wide characters 2230 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2231 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2232 --col;
2235 2233
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2234 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2235 text_t *text = stp + col;
2238 int count = 1; 2236 int count = 1;
2239 2237
2240 dtp[col] = stp[col]; 2238 dtp[col] = stp[col];
2241 drp[col] = rend; 2239 drp[col] = rend;
… …
2286 */ 2284 */
2287 int fore = fgcolor_of (rend); // desired foreground 2285 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2286 int back = bgcolor_of (rend); // desired background
2289 2287
2290 // only do special processing if any attributes are set, which is unlikely 2288 // 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))) 2289 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2290 {
2293 bool invert = rend & RS_RVid; 2291 bool invert = rend & RS_RVid;
2294 2292
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2293#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2294 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2313
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2315 fore = Color_UL;
2318#endif 2316#endif
2319 2317
2318#ifdef OPTION_HC
2319 if (rend & RS_Sel)
2320 {
2321 /* invert the column if no highlightColor is set or it is the
2322 * current cursor column */
2323 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 && ISSET_PIXCOLOR (Color_HC))
2325 {
2326 if (ISSET_PIXCOLOR (Color_HTC))
2327 fore = Color_HTC;
2328 // if invert is 0 reverse video is set so we use bg color as fg color
2329 else if (!invert)
2330 fore = back;
2331
2332 back = Color_HC;
2333 invert = 0;
2334 }
2335 }
2336#endif
2337
2320 if (invert) 2338 if (invert)
2321 { 2339 {
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); 2340 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2341
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2342#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) 2343 if (fore == back)
2340 { 2344 {
2341 fore = Color_bg; 2345 fore = Color_bg;
2342 back = Color_fg; 2346 back = Color_fg;
2343 } 2347 }
… …
2596 { 2600 {
2597#if !ENABLE_MINIMAL 2601#if !ENABLE_MINIMAL
2598 if (selection.rect) 2602 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2603 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2604 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2605 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2606 else
2603#endif 2607#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2608 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2609 selection.end.row, selection.end.col,
2606 RS_RVid); 2610 RS_Sel | RS_RVid);
2607 } 2611 }
2608} 2612}
2609 2613
2610/* ------------------------------------------------------------------------- */ 2614/* ------------------------------------------------------------------------- */
2611/* 2615/*
… …
2672/* ------------------------------------------------------------------------- */ 2676/* ------------------------------------------------------------------------- */
2673/* 2677/*
2674 * Paste a selection direct to the command fd 2678 * Paste a selection direct to the command fd
2675 */ 2679 */
2676void 2680void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2681rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2682{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2683 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2684 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2685 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2686 data[i] = C0_CR;
… …
2686 2690
2687 tt_write (data, len); 2691 tt_write (data, len);
2688 2692
2689 if (priv_modes & PrivMode_BracketPaste) 2693 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2694 tt_printf ("\e[201~");
2695}
2696
2697void
2698rxvt_term::paste (char *data, unsigned int len) NOTHROW
2699{
2700 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2701 return;
2702
2703 tt_paste (data, len);
2691} 2704}
2692 2705
2693/* ------------------------------------------------------------------------- */ 2706/* ------------------------------------------------------------------------- */
2694/* 2707/*
2695 * Respond to a notification that a primary selection has been sent 2708 * Respond to a notification that a primary selection has been sent
… …
2904 selection_wait = Sel_normal; 2917 selection_wait = Sel_normal;
2905 2918
2906#if X_HAVE_UTF8_STRING 2919#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String; 2920 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2921 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return; 2922 return;
2910#else 2923#else
2911 selection_type = Sel_CompoundText; 2924 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2925 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return; 2926 return;
2914#endif 2927#endif
2915 } 2928 }
2916 2929
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2930 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false); 2931 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2967 selection.clip_text = NULL; 2980 selection.clip_text = NULL;
2968 selection.clip_len = 0; 2981 selection.clip_len = 0;
2969 2982
2970 if (display->clipboard_owner == this) 2983 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2984 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 } 2985 }
2987} 2986}
2988 2987
2989/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2990/* 2989/*

Diff Legend

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