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.358 by sf-exg, Tue Jan 4 18:22:11 2011 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--)
… …
143 while (col > 0 && l.t[col] == NOCHAR) 143 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 144 col--;
145 145
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 l.touch ();
148 150
149 // found start, nuke 151 // found start, nuke
150 do { 152 do {
151 l.t[col] = ' '; 153 l.t[col] = ' ';
152 l.r[col] = rend; 154 l.r[col] = rend;
… …
898# else 900# else
899 c = 0xfffd; 901 c = 0xfffd;
900# endif 902# endif
901#endif 903#endif
902 904
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 906
913 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
916 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
917 c = NOCHAR; 913 c = NOCHAR;
918 // and try the same character next loop iteration 914 // and try the same character next loop iteration
919 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
920 } 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);
921 927
922 line->touch (); 928 line->touch ();
923 929
924 do 930 do
925 { 931 {
… …
931 else 937 else
932 { 938 {
933 line->l = ncol; 939 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
936 break; 942
943 goto end_of_line;
937 } 944 }
938 945
939 c = NOCHAR; 946 c = NOCHAR;
940 } 947 }
941 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
942 949
943 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 952 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 953 line->t[c] = ' ';
951 line->r[c] = rend; 954 line->r[c] = rend;
952 }
953 } 955 }
956
957end_of_line:
958 ;
954 } 959 }
955#if ENABLE_COMBINING 960#if ENABLE_COMBINING
956 else // width == 0 961 else // width == 0
957 { 962 {
958 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1021 1026
1022 want_refresh = 1; 1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1026 else 1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028} 1035}
1029 1036
1030/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1337 return; 1344 return;
1338 1345
1339 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1340 1347
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)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1351 {
1348 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1349 1353
1350 if (mapped && !view_start) 1354 if (mapped)
1351 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1354 } 1358 }
1355 else 1359 else
1356 { 1360 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1362
1359 if (mapped && !view_start) 1363 if (mapped)
1360 { 1364 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1371 1375
1372 for (; num--; row++) 1376 for (; num--; row++)
1373 { 1377 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1375 1379
1376 if (!view_start) 1380 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1382 }
1379} 1383}
1380 1384
1381#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1382void 1386void
… …
2623void 2627void
2624rxvt_term::scr_dump (int fd) NOTHROW 2628rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2629{
2626 int row, wrote; 2630 int row, wrote;
2627 unsigned int width, towrite; 2631 unsigned int width, towrite;
2628 char r1[] = "\n"; 2632 const char r1[] = "\n";
2629 2633
2630 for (row = saveLines + top_row; 2634 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2635 row < saveLines + nrow - 1; row++)
2632 { 2636 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2637 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2679/* ------------------------------------------------------------------------- */ 2683/* ------------------------------------------------------------------------- */
2680/* 2684/*
2681 * Paste a selection direct to the command fd 2685 * Paste a selection direct to the command fd
2682 */ 2686 */
2683void 2687void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2688rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2689{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2690 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2691 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2692 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2693 data[i] = C0_CR;
… …
2693 2697
2694 tt_write (data, len); 2698 tt_write (data, len);
2695 2699
2696 if (priv_modes & PrivMode_BracketPaste) 2700 if (priv_modes & PrivMode_BracketPaste)
2697 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);
2698} 2711}
2699 2712
2700/* ------------------------------------------------------------------------- */ 2713/* ------------------------------------------------------------------------- */
2701/* 2714/*
2702 * Respond to a notification that a primary selection has been sent 2715 * Respond to a notification that a primary selection has been sent
… …
2977 if (display->clipboard_owner == this) 2990 if (display->clipboard_owner == this)
2978 display->clipboard_owner = 0; 2991 display->clipboard_owner = 0;
2979 } 2992 }
2980} 2993}
2981 2994
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 }
2994}
2995
2996/* ------------------------------------------------------------------------- */ 2995/* ------------------------------------------------------------------------- */
2997/* 2996/*
2998 * Copy a selection into the cut buffer 2997 * Copy a selection into the cut buffer
2999 * EXT: button 1 or 3 release 2998 * EXT: button 1 or 3 release
3000 */ 2999 */
3001void 3000void
3002rxvt_term::selection_make (Time tm) 3001rxvt_term::selection_make (Time tm)
3003{ 3002{
3004 int i; 3003 int size;
3005 wchar_t *new_selection_text; 3004 wchar_t *new_selection_text;
3006 text_t *t; 3005 text_t *t;
3007 3006
3008 switch (selection.op) 3007 switch (selection.op)
3009 { 3008 {
… …
3025 return; /* nothing selected, go away */ 3024 return; /* nothing selected, go away */
3026 3025
3027 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3028 return; 3027 return;
3029 3028
3030 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3029 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3031 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3030 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3032 3031
3033 int ofs = 0; 3032 int ofs = 0;
3034 int extra = 0; 3033 int extra = 0;
3035 3034
3036 int col = selection.beg.col; 3035 int col = selection.beg.col;
… …
3072 3071
3073 extra -= (len - 1); 3072 extra -= (len - 1);
3074 3073
3075 if (extra < 0) 3074 if (extra < 0)
3076 { 3075 {
3077 extra += i; 3076 extra += size;
3078 i += i; 3077 size += size;
3079 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3080 } 3079 }
3081 3080
3082 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3083 } 3082 }
3084#endif 3083#endif
… …
3096 3095
3097 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3098 } 3097 }
3099 else 3098 else
3100#endif 3099#endif
3101 if (!ROW(row).is_longer () && row != selection.end.row) 3100 if (!ROW(row).is_longer () && row != selection.end.row
3101 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 3102 new_selection_text[ofs++] = C0_LF;
3103 } 3103 }
3104 3104
3105 if (end_col != selection.end.col) 3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF; 3106 new_selection_text[ofs++] = C0_LF;

Diff Legend

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