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.347 by sf-exg, Sat Aug 28 11:03:04 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 {
908 if (screen.flags & Screen_Autowrap)
909 {
916 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
917 c = NOCHAR; 911 c = NOCHAR;
918 // and try the same character next loop iteration 912 // and try the same character next loop iteration
919 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
920 } 917 }
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);
921 925
922 line->touch (); 926 line->touch ();
923 927
924 do 928 do
925 { 929 {
… …
931 else 935 else
932 { 936 {
933 line->l = ncol; 937 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
936 break; 940
941 goto end_of_line;
937 } 942 }
938 943
939 c = NOCHAR; 944 c = NOCHAR;
940 } 945 }
941 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
942 947
943 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 950 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 951 line->t[c] = ' ';
951 line->r[c] = rend; 952 line->r[c] = rend;
952 }
953 } 953 }
954
955end_of_line:
956 ;
954 } 957 }
955#if ENABLE_COMBINING 958#if ENABLE_COMBINING
956 else // width == 0 959 else // width == 0
957 { 960 {
958 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1021 1024
1022 want_refresh = 1; 1025 want_refresh = 1;
1023#endif 1026#endif
1024 } 1027 }
1025 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1026 else 1031 else
1027 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1028} 1033}
1029 1034
1030/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1678 { 1683 {
1679 rvideo_state = on; 1684 rvideo_state = on;
1680 1685
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1684#endif 1689#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1691
1687 XGCValues gcvalue; 1692 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
2024 refresh_count = 0; 2029 refresh_count = 0;
2025 2030
2026 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2032 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2030#endif 2035#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2037
2033 /* 2038 /*
2034 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2501 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2502 } 2507 }
2503} 2508}
2504 2509
2505void 2510void
2506rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2512{
2513 bool transparent = false;
2514
2508#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2510#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);
2511 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 {
2512 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
2513 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2515 2541
2516 if (scrollBar.win) 2542 if (scrollBar.win)
2517 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2520 scrollBar.show (0); 2549 scrollBar.show (0);
2521 } 2550 }
2522 2551
2523#endif 2552 if (refresh)
2524 2553 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2554 scr_clear ();
2527 scr_touch (true); 2555 scr_touch (true);
2556 }
2528 want_refresh = 1; 2557 want_refresh = 1;
2529} 2558}
2530 2559
2531/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2532void 2561void
… …
2620void 2649void
2621rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2651{
2623 int row, wrote; 2652 int row, wrote;
2624 unsigned int width, towrite; 2653 unsigned int width, towrite;
2625 char r1[] = "\n"; 2654 const char r1[] = "\n";
2626 2655
2627 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2629 { 2658 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2711void 2740void
2712rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2713{ 2742{
2714 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2715 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2716 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2717 { 2748 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = 0; 2749 selection_type = 0;
2721 if (selnum != Sel_direct)
2722 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2723 } 2751 }
2724 2752
2725 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2726 { 2754 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2730 if (selnum != Sel_direct)
2731 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2732 else
2733 selection_type = 0;
2734 } 2757 }
2735 2758
2736 return; 2759 return;
2737 } 2760 }
2738 2761
2739 unsigned long bytes_after; 2762 unsigned long bytes_after;
2740 XTextProperty ct; 2763 XTextProperty ct;
2741 2764
2765 // length == (2^31 - 1) / 4, as gdk
2742 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2743 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2744 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2745 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2746 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2747 &ct.value) != Success) 2771 &ct.value) != Success)
2748 { 2772 {
… …
2750 goto bailout; 2774 goto bailout;
2751 } 2775 }
2752 2776
2753 if (ct.encoding == None) 2777 if (ct.encoding == None)
2754 goto bailout; 2778 goto bailout;
2755
2756 if (bytes_after)
2757 {
2758 // fetch and append remaining data
2759 XTextProperty ct2;
2760
2761 if (XGetWindowProperty (dpy, win, prop,
2762 ct.nitems / 4, (bytes_after + 3) / 4,
2763 delete_prop, AnyPropertyType,
2764 &ct2.encoding, &ct2.format,
2765 &ct2.nitems, &bytes_after,
2766 &ct2.value) != Success)
2767 goto bailout;
2768
2769 // realloc should be compatible to XFree, here, and elsewhere, too
2770 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772 ct.nitems += ct2.nitems;
2773
2774 XFree (ct2.value);
2775 }
2776 2779
2777 if (ct.value == 0) 2780 if (ct.value == 0)
2778 goto bailout; 2781 goto bailout;
2779 2782
2780 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2811 { 2814 {
2812 /* 2815 /*
2813 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2814 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2815 */ 2818 */
2816 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817 } 2820 }
2818 2821
2819 goto bailout; 2822 goto bailout;
2820 } 2823 }
2821 } 2824 }
… …
2824 incr_ev.start (10); 2827 incr_ev.start (10);
2825 2828
2826 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2827 { 2830 {
2828 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;
2829 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2830 } 2833 }
2831 2834
2832 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2834 2837
… …
2875{ 2878{
2876 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2877 2880
2878 incr_buf_size = 0; 2881 incr_buf_size = 0;
2879 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2880 2884
2881 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2882} 2886}
2883 2887
2884void 2888void
… …
2991 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2992 */ 2996 */
2993void 2997void
2994rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2995{ 2999{
2996 int i; 3000 int size;
2997 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2998 text_t *t; 3002 text_t *t;
2999 3003
3000 switch (selection.op) 3004 switch (selection.op)
3001 { 3005 {
… …
3017 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
3018 3022
3019 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)))
3020 return; 3024 return;
3021 3025
3022 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023 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));
3024 3028
3025 int ofs = 0; 3029 int ofs = 0;
3026 int extra = 0; 3030 int extra = 0;
3027 3031
3028 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
3034 { 3038 {
3035#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
3036 if (selection.rect) 3040 if (selection.rect)
3037 { 3041 {
3038 col = selection.beg.col; 3042 col = selection.beg.col;
3039 end_col = ncol + 1; 3043 end_col = selection.end.col;
3040 } 3044 }
3041 else 3045 else
3042#endif 3046#endif
3043 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3044 3048
3045 col = max (col, 0); 3049 col = max (col, 0);
3046 3050
3047 if (row == selection.end.row 3051 if (row == selection.end.row)
3048#if !ENABLE_MINIMAL
3049 || selection.rect
3050#endif
3051 )
3052 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3053 3053
3054 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3055 3055
3056 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3064 3064
3065 extra -= (len - 1); 3065 extra -= (len - 1);
3066 3066
3067 if (extra < 0) 3067 if (extra < 0)
3068 { 3068 {
3069 extra += i; 3069 extra += size;
3070 i += i; 3070 size += size;
3071 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));
3072 } 3072 }
3073 3073
3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075 } 3075 }
3076#endif 3076#endif
… …
3088 3088
3089 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3090 } 3090 }
3091 else 3091 else
3092#endif 3092#endif
3093 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))
3094 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3095 } 3097 }
3096
3097 if (end_col != selection.end.col)
3098 new_selection_text[ofs++] = C0_LF;
3099 3098
3100 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3101 3100
3102 if (ofs == 0) 3101 if (ofs == 0)
3103 { 3102 {

Diff Legend

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