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.349 by root, Thu Oct 14 23:12:11 2010 UTC vs.
Revision 1.369 by sf-exg, Sun Feb 6 11:42:03 2011 UTC

… …
38 while (len--) 38 while (len--)
39 *start++ = value; 39 *start++ = value;
40} 40}
41 41
42/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
46 44
47/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
144 col--; 142 col--;
145 143
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 146
147 l.touch ();
148
149 // found start, nuke 149 // found start, nuke
150 do { 150 do {
151 l.t[col] = ' '; 151 l.t[col] = ' ';
152 l.r[col] = rend; 152 l.r[col] = rend;
153 col++; 153 col++;
… …
398 } 398 }
399 399
400 free (tabs); 400 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
402 402
403 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
405 405
406 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
407 407
408 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
898# else 898# else
899 c = 0xfffd; 899 c = 0xfffd;
900# endif 900# endif
901#endif 901#endif
902 902
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)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 904
913 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 907 {
… …
922 } 914 }
923 else 915 else
924 screen.cur.col = ncol - width; 916 screen.cur.col = ncol - width;
925 } 917 }
926 918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
925
927 line->touch (); 926 line->touch ();
928 927
929 do 928 do
930 { 929 {
931 line->t[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
… …
936 else 935 else
937 { 936 {
938 line->l = ncol; 937 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
941 break; 940
941 goto end_of_line;
942 } 942 }
943 943
944 c = NOCHAR; 944 c = NOCHAR;
945 } 945 }
946 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
947 947
948 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
950 { 950 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 951 line->t[c] = ' ';
956 line->r[c] = rend; 952 line->r[c] = rend;
957 }
958 } 953 }
954
955end_of_line:
956 ;
959 } 957 }
960#if ENABLE_COMBINING 958#if ENABLE_COMBINING
961 else // width == 0 959 else // width == 0
962 { 960 {
963 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1026 1024
1027 want_refresh = 1; 1025 want_refresh = 1;
1028#endif 1026#endif
1029 } 1027 }
1030 } 1028 }
1031#ifdef TERMCAP_HAS_BW
1032 else if (screen.flags & Screen_WrapNext) 1029 else if (screen.flags & Screen_WrapNext)
1033 screen.flags &= ~Screen_WrapNext; 1030 screen.flags &= ~Screen_WrapNext;
1034#endif
1035 else 1031 else
1036 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1037} 1033}
1038 1034
1039/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1687 { 1683 {
1688 rvideo_state = on; 1684 rvideo_state = on;
1689 1685
1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1691#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1692 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1693#endif 1689#endif
1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1695 1691
1696 XGCValues gcvalue; 1692 XGCValues gcvalue;
1697 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2033 refresh_count = 0; 2029 refresh_count = 0;
2034 2030
2035 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2036 char have_bg = 0; 2032 char have_bg = 0;
2037#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2038 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2039#endif 2035#endif
2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2041 2037
2042 /* 2038 /*
2043 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2510 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2511 } 2507 }
2512} 2508}
2513 2509
2514void 2510void
2515rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2516{ 2512{
2513 bool transparent = false;
2514
2517#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2518 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2519#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2520 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2521 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2522 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2523 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2524 2541
2525 if (scrollBar.win) 2542 if (scrollBar.win)
2526 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2527 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2528 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2529 scrollBar.show (0); 2549 scrollBar.show (0);
2530 } 2550 }
2531 2551
2532#endif 2552 if (refresh)
2533 2553 {
2534 /* bgPixmap.apply () does not do the following : */
2535 scr_clear (); 2554 scr_clear ();
2536 scr_touch (true); 2555 scr_touch (true);
2556 }
2537 want_refresh = 1; 2557 want_refresh = 1;
2538} 2558}
2539 2559
2540/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2541void 2561void
… …
2629void 2649void
2630rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2631{ 2651{
2632 int row, wrote; 2652 int row, wrote;
2633 unsigned int width, towrite; 2653 unsigned int width, towrite;
2634 char r1[] = "\n"; 2654 const char r1[] = "\n";
2635 2655
2636 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2637 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2638 { 2658 {
2639 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2720void 2740void
2721rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2722{ 2742{
2723 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2724 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2747 if (selnum == Sel_direct)
2748 selection_type = 0;
2749
2725 if ((selection_type & Sel_CompoundText)) 2750 if ((selection_type & Sel_CompoundText))
2726 { 2751 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = 0; 2752 selection_type = 0;
2730 if (selnum != Sel_direct)
2731 selection_request_other (XA_STRING, selnum); 2753 selection_request_other (XA_STRING, selnum);
2732 } 2754 }
2733 2755
2734 if ((selection_type & Sel_UTF8String)) 2756 if ((selection_type & Sel_UTF8String))
2735 { 2757 {
2736 int selnum = selection_type & Sel_whereMask;
2737
2738 selection_type = Sel_CompoundText; 2758 selection_type = Sel_CompoundText;
2739 if (selnum != Sel_direct)
2740 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2759 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2741 else
2742 selection_type = 0;
2743 } 2760 }
2744 2761
2745 return; 2762 return;
2746 } 2763 }
2747 2764
2748 unsigned long bytes_after; 2765 unsigned long bytes_after;
2749 XTextProperty ct; 2766 XTextProperty ct;
2750 2767
2768 // length == (2^31 - 1) / 4, as gdk
2751 if (XGetWindowProperty (dpy, win, prop, 2769 if (XGetWindowProperty (dpy, win, prop,
2752 0, PROP_SIZE / 4, 2770 0, 0x1fffffff,
2753 delete_prop, AnyPropertyType, 2771 delete_prop, AnyPropertyType,
2754 &ct.encoding, &ct.format, 2772 &ct.encoding, &ct.format,
2755 &ct.nitems, &bytes_after, 2773 &ct.nitems, &bytes_after,
2756 &ct.value) != Success) 2774 &ct.value) != Success)
2757 { 2775 {
… …
2759 goto bailout; 2777 goto bailout;
2760 } 2778 }
2761 2779
2762 if (ct.encoding == None) 2780 if (ct.encoding == None)
2763 goto bailout; 2781 goto bailout;
2764
2765 if (bytes_after)
2766 {
2767 // fetch and append remaining data
2768 XTextProperty ct2;
2769
2770 if (XGetWindowProperty (dpy, win, prop,
2771 ct.nitems / 4, (bytes_after + 3) / 4,
2772 delete_prop, AnyPropertyType,
2773 &ct2.encoding, &ct2.format,
2774 &ct2.nitems, &bytes_after,
2775 &ct2.value) != Success)
2776 goto bailout;
2777
2778 // realloc should be compatible to XFree, here, and elsewhere, too
2779 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2780 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2781 ct.nitems += ct2.nitems;
2782
2783 XFree (ct2.value);
2784 }
2785 2782
2786 if (ct.value == 0) 2783 if (ct.value == 0)
2787 goto bailout; 2784 goto bailout;
2788 2785
2789 if (ct.encoding == xa[XA_INCR]) 2786 if (ct.encoding == xa[XA_INCR])
… …
2820 { 2817 {
2821 /* 2818 /*
2822 * pass through again trying CUT_BUFFER0 if we've come from 2819 * pass through again trying CUT_BUFFER0 if we've come from
2823 * XConvertSelection () but nothing was presented 2820 * XConvertSelection () but nothing was presented
2824 */ 2821 */
2825 selection_paste (display->root, XA_CUT_BUFFER0, False); 2822 selection_paste (display->root, XA_CUT_BUFFER0, false);
2826 } 2823 }
2827 2824
2828 goto bailout; 2825 goto bailout;
2829 } 2826 }
2830 } 2827 }
… …
2833 incr_ev.start (10); 2830 incr_ev.start (10);
2834 2831
2835 while (incr_buf_fill + ct.nitems > incr_buf_size) 2832 while (incr_buf_fill + ct.nitems > incr_buf_size)
2836 { 2833 {
2837 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2834 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2838 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2835 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2839 } 2836 }
2840 2837
2841 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2838 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2842 incr_buf_fill += ct.nitems; 2839 incr_buf_fill += ct.nitems;
2843 2840
… …
3000 * EXT: button 1 or 3 release 2997 * EXT: button 1 or 3 release
3001 */ 2998 */
3002void 2999void
3003rxvt_term::selection_make (Time tm) 3000rxvt_term::selection_make (Time tm)
3004{ 3001{
3005 int i; 3002 int size;
3006 wchar_t *new_selection_text; 3003 wchar_t *new_selection_text;
3007 text_t *t; 3004 text_t *t;
3008 3005
3009 switch (selection.op) 3006 switch (selection.op)
3010 { 3007 {
… …
3026 return; /* nothing selected, go away */ 3023 return; /* nothing selected, go away */
3027 3024
3028 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3025 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3029 return; 3026 return;
3030 3027
3031 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3028 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3032 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3029 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3033 3030
3034 int ofs = 0; 3031 int ofs = 0;
3035 int extra = 0; 3032 int extra = 0;
3036 3033
3037 int col = selection.beg.col; 3034 int col = selection.beg.col;
… …
3043 { 3040 {
3044#if !ENABLE_MINIMAL 3041#if !ENABLE_MINIMAL
3045 if (selection.rect) 3042 if (selection.rect)
3046 { 3043 {
3047 col = selection.beg.col; 3044 col = selection.beg.col;
3048 end_col = ncol + 1; 3045 end_col = selection.end.col;
3049 } 3046 }
3050 else 3047 else
3051#endif 3048#endif
3052 end_col = ROW(row).l; 3049 end_col = ROW(row).l;
3053 3050
3054 col = max (col, 0); 3051 col = max (col, 0);
3055 3052
3056 if (row == selection.end.row 3053 if (row == selection.end.row)
3057#if !ENABLE_MINIMAL
3058 || selection.rect
3059#endif
3060 )
3061 min_it (end_col, selection.end.col); 3054 min_it (end_col, selection.end.col);
3062 3055
3063 t = ROW(row).t + col; 3056 t = ROW(row).t + col;
3064 3057
3065 for (; col < end_col; col++) 3058 for (; col < end_col; col++)
… …
3073 3066
3074 extra -= (len - 1); 3067 extra -= (len - 1);
3075 3068
3076 if (extra < 0) 3069 if (extra < 0)
3077 { 3070 {
3078 extra += i; 3071 extra += size;
3079 i += i; 3072 size += size;
3080 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3073 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3081 } 3074 }
3082 3075
3083 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3076 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3084 } 3077 }
3085#endif 3078#endif
… …
3097 3090
3098 new_selection_text[ofs++] = C0_LF; 3091 new_selection_text[ofs++] = C0_LF;
3099 } 3092 }
3100 else 3093 else
3101#endif 3094#endif
3102 if (!ROW(row).is_longer () && row != selection.end.row) 3095 if (!ROW(row).is_longer ()
3096 && (row != selection.end.row || end_col != selection.end.col)
3097 && (row != selection.beg.row || selection.beg.col < ncol))
3103 new_selection_text[ofs++] = C0_LF; 3098 new_selection_text[ofs++] = C0_LF;
3104 } 3099 }
3105
3106 if (end_col != selection.end.col)
3107 new_selection_text[ofs++] = C0_LF;
3108 3100
3109 new_selection_text[ofs] = 0; 3101 new_selection_text[ofs] = 0;
3110 3102
3111 if (ofs == 0) 3103 if (ofs == 0)
3112 { 3104 {

Diff Legend

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