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.364 by sf-exg, Thu Jan 20 17:39:29 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 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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
397 } 400 }
398 401
399 free (tabs); 402 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
401 404
402 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
897# else 900# else
898 c = 0xfffd; 901 c = 0xfffd;
899# endif 902# endif
900#endif 903#endif
901 904
902 // nuke the character at this position, if required
903 if (expect_false (
904 line->t[screen.cur.col] == NOCHAR
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 906
912 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
915 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
916 c = NOCHAR; 913 c = NOCHAR;
917 // and try the same character next loop iteration 914 // and try the same character next loop iteration
918 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
919 } 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);
920 927
921 line->touch (); 928 line->touch ();
922 929
923 do 930 do
924 { 931 {
… …
930 else 937 else
931 { 938 {
932 line->l = ncol; 939 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
935 break; 942
943 goto end_of_line;
936 } 944 }
937 945
938 c = NOCHAR; 946 c = NOCHAR;
939 } 947 }
940 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
941 949
942 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
944 { 952 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 953 line->t[c] = ' ';
950 line->r[c] = rend; 954 line->r[c] = rend;
951 }
952 } 955 }
956
957end_of_line:
958 ;
953 } 959 }
954#if ENABLE_COMBINING 960#if ENABLE_COMBINING
955 else // width == 0 961 else // width == 0
956 { 962 {
957 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1020 1026
1021 want_refresh = 1; 1027 want_refresh = 1;
1022#endif 1028#endif
1023 } 1029 }
1024 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1025 else 1033 else
1026 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1027} 1035}
1028 1036
1029/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1336 return; 1344 return;
1337 1345
1338 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1339 1347
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)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1351 {
1347 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1348 1353
1349 if (mapped && !view_start) 1354 if (mapped)
1350 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1353 } 1358 }
1354 else 1359 else
1355 { 1360 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1362
1358 if (mapped && !view_start) 1363 if (mapped)
1359 { 1364 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1370 1375
1371 for (; num--; row++) 1376 for (; num--; row++)
1372 { 1377 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1374 1379
1375 if (!view_start) 1380 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1382 }
1378} 1383}
1379 1384
1380#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1381void 1386void
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2333 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2334 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2335 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2336 else if (!invert)
2332 fore = back; 2337 fore = back;
2338
2333 back = Color_HC; 2339 back = Color_HC;
2334 invert = 0; 2340 invert = 0;
2335 } 2341 }
2336 } 2342 }
2337#endif 2343#endif
… …
2502 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2503 } 2509 }
2504} 2510}
2505 2511
2506void 2512void
2507rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2514{
2515 bool transparent = false;
2516
2509#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2518 if (bgPixmap.pixmap != None)
2511#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2512 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bgPixmap.pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2514 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2516 2543
2517 if (scrollBar.win) 2544 if (scrollBar.win)
2518 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2551 scrollBar.show (0);
2522 } 2552 }
2523 2553
2524#endif 2554 if (refresh)
2525 2555 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2556 scr_clear ();
2528 scr_touch (true); 2557 scr_touch (true);
2558 }
2529 want_refresh = 1; 2559 want_refresh = 1;
2530} 2560}
2531 2561
2532/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2533void 2563void
… …
2621void 2651void
2622rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2653{
2624 int row, wrote; 2654 int row, wrote;
2625 unsigned int width, towrite; 2655 unsigned int width, towrite;
2626 char r1[] = "\n"; 2656 const char r1[] = "\n";
2627 2657
2628 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2630 { 2660 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2678/* 2708/*
2679 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2680 */ 2710 */
2681void 2711void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2713{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2691 2721
2692 tt_write (data, len); 2722 tt_write (data, len);
2693 2723
2694 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2726}
2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2696} 2735}
2697 2736
2698/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2699/* 2738/*
2700 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
… …
2757 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success) 2797 &ct2.value) != Success)
2759 goto bailout; 2798 goto bailout;
2760 2799
2761 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2765 2804
2766 XFree (ct2.value); 2805 XFree (ct2.value);
2767 } 2806 }
… …
2816 incr_ev.start (10); 2855 incr_ev.start (10);
2817 2856
2818 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 { 2858 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2822 } 2861 }
2823 2862
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2826 2865
… …
2975 if (display->clipboard_owner == this) 3014 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 3015 display->clipboard_owner = 0;
2977 } 3016 }
2978} 3017}
2979 3018
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 }
2992}
2993
2994/* ------------------------------------------------------------------------- */ 3019/* ------------------------------------------------------------------------- */
2995/* 3020/*
2996 * Copy a selection into the cut buffer 3021 * Copy a selection into the cut buffer
2997 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2998 */ 3023 */
2999void 3024void
3000rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
3001{ 3026{
3002 int i; 3027 int size;
3003 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
3004 text_t *t; 3029 text_t *t;
3005 3030
3006 switch (selection.op) 3031 switch (selection.op)
3007 { 3032 {
… …
3023 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
3024 3049
3025 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3026 return; 3051 return;
3027 3052
3028 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3029 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3030 3055
3031 int ofs = 0; 3056 int ofs = 0;
3032 int extra = 0; 3057 int extra = 0;
3033 3058
3034 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
3040 { 3065 {
3041#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
3042 if (selection.rect) 3067 if (selection.rect)
3043 { 3068 {
3044 col = selection.beg.col; 3069 col = selection.beg.col;
3045 end_col = ncol + 1; 3070 end_col = selection.end.col;
3046 } 3071 }
3047 else 3072 else
3048#endif 3073#endif
3049 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
3050 3075
3051 col = max (col, 0); 3076 col = max (col, 0);
3052 3077
3053 if (row == selection.end.row 3078 if (row == selection.end.row)
3054#if !ENABLE_MINIMAL
3055 || selection.rect
3056#endif
3057 )
3058 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
3059 3080
3060 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
3061 3082
3062 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3070 3091
3071 extra -= (len - 1); 3092 extra -= (len - 1);
3072 3093
3073 if (extra < 0) 3094 if (extra < 0)
3074 { 3095 {
3075 extra += i; 3096 extra += size;
3076 i += i; 3097 size += size;
3077 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3078 } 3099 }
3079 3100
3080 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3081 } 3102 }
3082#endif 3103#endif
… …
3094 3115
3095 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3096 } 3117 }
3097 else 3118 else
3098#endif 3119#endif
3099 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3100 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3101 } 3124 }
3102
3103 if (end_col != selection.end.col)
3104 new_selection_text[ofs++] = C0_LF;
3105 3125
3106 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3107 3127
3108 if (ofs == 0) 3128 if (ofs == 0)
3109 { 3129 {

Diff Legend

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