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.350 by root, Thu Oct 14 23:21:40 2010 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 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
… …
1685 { 1683 {
1686 rvideo_state = on; 1684 rvideo_state = on;
1687 1685
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1691#endif 1689#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1691
1694 XGCValues gcvalue; 1692 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2031 refresh_count = 0; 2029 refresh_count = 0;
2032 2030
2033 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2032 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2037#endif 2035#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2037
2040 /* 2038 /*
2041 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2508 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2509 } 2507 }
2510} 2508}
2511 2509
2512void 2510void
2513rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2512{
2513 bool transparent = false;
2514
2515#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2517#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);
2518 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 {
2519 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
2520 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2522 2541
2523 if (scrollBar.win) 2542 if (scrollBar.win)
2524 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2527 scrollBar.show (0); 2549 scrollBar.show (0);
2528 } 2550 }
2529 2551
2530#endif 2552 if (refresh)
2531 2553 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2554 scr_clear ();
2534 scr_touch (true); 2555 scr_touch (true);
2556 }
2535 want_refresh = 1; 2557 want_refresh = 1;
2536} 2558}
2537 2559
2538/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2539void 2561void
… …
2627void 2649void
2628rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2651{
2630 int row, wrote; 2652 int row, wrote;
2631 unsigned int width, towrite; 2653 unsigned int width, towrite;
2632 char r1[] = "\n"; 2654 const char r1[] = "\n";
2633 2655
2634 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2636 { 2658 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2718void 2740void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{ 2742{
2721 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2722 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2723 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2724 { 2748 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0; 2749 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2730 } 2751 }
2731 2752
2732 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2733 { 2754 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 } 2757 }
2742 2758
2743 return; 2759 return;
2744 } 2760 }
2745 2761
2746 unsigned long bytes_after; 2762 unsigned long bytes_after;
2747 XTextProperty ct; 2763 XTextProperty ct;
2748 2764
2765 // length == (2^31 - 1) / 4, as gdk
2749 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2751 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2754 &ct.value) != Success) 2771 &ct.value) != Success)
2755 { 2772 {
… …
2757 goto bailout; 2774 goto bailout;
2758 } 2775 }
2759 2776
2760 if (ct.encoding == None) 2777 if (ct.encoding == None)
2761 goto bailout; 2778 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783 2779
2784 if (ct.value == 0) 2780 if (ct.value == 0)
2785 goto bailout; 2781 goto bailout;
2786 2782
2787 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2818 { 2814 {
2819 /* 2815 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2822 */ 2818 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2824 } 2820 }
2825 2821
2826 goto bailout; 2822 goto bailout;
2827 } 2823 }
2828 } 2824 }
… …
2831 incr_ev.start (10); 2827 incr_ev.start (10);
2832 2828
2833 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 { 2830 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2837 } 2833 }
2838 2834
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2841 2837
… …
2882{ 2878{
2883 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2884 2880
2885 incr_buf_size = 0; 2881 incr_buf_size = 0;
2886 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2887 2884
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889} 2886}
2890 2887
2891void 2888void
… …
2998 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2999 */ 2996 */
3000void 2997void
3001rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
3002{ 2999{
3003 int i; 3000 int size;
3004 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
3005 text_t *t; 3002 text_t *t;
3006 3003
3007 switch (selection.op) 3004 switch (selection.op)
3008 { 3005 {
… …
3024 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
3025 3022
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3023 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 3024 return;
3028 3025
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3027 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 3028
3032 int ofs = 0; 3029 int ofs = 0;
3033 int extra = 0; 3030 int extra = 0;
3034 3031
3035 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
3041 { 3038 {
3042#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
3043 if (selection.rect) 3040 if (selection.rect)
3044 { 3041 {
3045 col = selection.beg.col; 3042 col = selection.beg.col;
3046 end_col = ncol + 1; 3043 end_col = selection.end.col;
3047 } 3044 }
3048 else 3045 else
3049#endif 3046#endif
3050 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3051 3048
3052 col = max (col, 0); 3049 col = max (col, 0);
3053 3050
3054 if (row == selection.end.row 3051 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3060 3053
3061 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3062 3055
3063 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3071 3064
3072 extra -= (len - 1); 3065 extra -= (len - 1);
3073 3066
3074 if (extra < 0) 3067 if (extra < 0)
3075 { 3068 {
3076 extra += i; 3069 extra += size;
3077 i += i; 3070 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 3072 }
3080 3073
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 3075 }
3083#endif 3076#endif
… …
3095 3088
3096 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3097 } 3090 }
3098 else 3091 else
3099#endif 3092#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 3093 if (!ROW(row).is_longer ()
3094 && (row != selection.end.row || end_col != selection.end.col)
3095 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3102 } 3097 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 3098
3107 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3108 3100
3109 if (ofs == 0) 3101 if (ofs == 0)
3110 { 3102 {

Diff Legend

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