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.340 by sf-exg, Sat Apr 17 23:00:45 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
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2335 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2336 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2337 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2338 else if (!invert)
2332 fore = back; 2339 fore = back;
2340
2333 back = Color_HC; 2341 back = Color_HC;
2334 invert = 0; 2342 invert = 0;
2335 } 2343 }
2336 } 2344 }
2337#endif 2345#endif
… …
2677/* ------------------------------------------------------------------------- */ 2685/* ------------------------------------------------------------------------- */
2678/* 2686/*
2679 * Paste a selection direct to the command fd 2687 * Paste a selection direct to the command fd
2680 */ 2688 */
2681void 2689void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2690rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2691{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2692 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2693 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2694 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2695 data[i] = C0_CR;
… …
2691 2699
2692 tt_write (data, len); 2700 tt_write (data, len);
2693 2701
2694 if (priv_modes & PrivMode_BracketPaste) 2702 if (priv_modes & PrivMode_BracketPaste)
2695 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);
2696} 2713}
2697 2714
2698/* ------------------------------------------------------------------------- */ 2715/* ------------------------------------------------------------------------- */
2699/* 2716/*
2700 * Respond to a notification that a primary selection has been sent 2717 * Respond to a notification that a primary selection has been sent
… …
2972 selection.clip_text = NULL; 2989 selection.clip_text = NULL;
2973 selection.clip_len = 0; 2990 selection.clip_len = 0;
2974 2991
2975 if (display->clipboard_owner == this) 2992 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 2993 display->clipboard_owner = 0;
2977 }
2978}
2979
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 } 2994 }
2992} 2995}
2993 2996
2994/* ------------------------------------------------------------------------- */ 2997/* ------------------------------------------------------------------------- */
2995/* 2998/*

Diff Legend

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