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.343 by sf-exg, Thu Jul 1 21:52:52 2010 UTC vs.
Revision 1.348 by sf-exg, Sat Oct 9 22:33:45 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
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
38 while (len--) 38 while (len--)
… …
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 912
913 // if the character doesn't fit into the remaining columns... 913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 915 {
916 if (screen.flags & Screen_Autowrap)
917 {
916 // ... artificially enlargen the previous one 918 // ... artificially enlargen the previous one
917 c = NOCHAR; 919 c = NOCHAR;
918 // and try the same character next loop iteration 920 // and try the same character next loop iteration
919 --str; 921 --str;
922 }
923 else
924 screen.cur.col = ncol - width;
920 } 925 }
921 926
922 line->touch (); 927 line->touch ();
923 928
924 do 929 do
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1337 return; 1342 return;
1338 1343
1339 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1340 1345
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1349 {
1348 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1349 1351
1350 if (mapped && !view_start) 1352 if (mapped)
1351 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1354 } 1356 }
1355 else 1357 else
1356 { 1358 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1360
1359 if (mapped && !view_start) 1361 if (mapped)
1360 { 1362 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1371 1373
1372 for (; num--; row++) 1374 for (; num--; row++)
1373 { 1375 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1375 1377
1376 if (!view_start) 1378 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1380 }
1379} 1381}
1380 1382
1381#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1382void 1384void
… …
2679/* ------------------------------------------------------------------------- */ 2681/* ------------------------------------------------------------------------- */
2680/* 2682/*
2681 * Paste a selection direct to the command fd 2683 * Paste a selection direct to the command fd
2682 */ 2684 */
2683void 2685void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2686rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2687{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2688 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2689 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2690 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2691 data[i] = C0_CR;
… …
2693 2695
2694 tt_write (data, len); 2696 tt_write (data, len);
2695 2697
2696 if (priv_modes & PrivMode_BracketPaste) 2698 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2699 tt_printf ("\e[201~");
2700}
2701
2702void
2703rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{
2705 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 return;
2707
2708 tt_paste (data, len);
2698} 2709}
2699 2710
2700/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2701/* 2712/*
2702 * Respond to a notification that a primary selection has been sent 2713 * Respond to a notification that a primary selection has been sent
… …
2974 selection.clip_text = NULL; 2985 selection.clip_text = NULL;
2975 selection.clip_len = 0; 2986 selection.clip_len = 0;
2976 2987
2977 if (display->clipboard_owner == this) 2988 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0; 2989 display->clipboard_owner = 0;
2979 }
2980}
2981
2982void
2983rxvt_term::clipboard_copy (Time tm)
2984{
2985 if (selection.len > 0)
2986 {
2987 free (selection.clip_text);
2988 selection.clip_len = selection.len;
2989 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2990 memcpy (selection.clip_text, selection.text,
2991 sizeof (wchar_t) * selection.clip_len);
2992 selection_grab (tm, true);
2993 } 2990 }
2994} 2991}
2995 2992
2996/* ------------------------------------------------------------------------- */ 2993/* ------------------------------------------------------------------------- */
2997/* 2994/*

Diff Legend

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