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.368 by sf-exg, Tue Feb 1 00:41:01 2011 UTC

… …
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 148
149 l.touch ();
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;
153 col++; 155 col++;
… …
398 } 400 }
399 401
400 free (tabs); 402 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
402 404
403 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
405 407
406 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
407 409
408 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
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/* ------------------------------------------------------------------------- */
… …
1678 { 1685 {
1679 rvideo_state = on; 1686 rvideo_state = on;
1680 1687
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1684#endif 1691#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1693
1687 XGCValues gcvalue; 1694 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
2024 refresh_count = 0; 2031 refresh_count = 0;
2025 2032
2026 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2034 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2030#endif 2037#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2039
2033 /* 2040 /*
2034 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2501 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2502 } 2509 }
2503} 2510}
2504 2511
2505void 2512void
2506rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2514{
2515 bool transparent = false;
2516
2508#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2510#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2512 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
2513 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2515 2543
2516 if (scrollBar.win) 2544 if (scrollBar.win)
2517 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2520 scrollBar.show (0); 2551 scrollBar.show (0);
2521 } 2552 }
2522 2553
2523#endif 2554 if (refresh)
2524 2555 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2556 scr_clear ();
2527 scr_touch (true); 2557 scr_touch (true);
2558 }
2528 want_refresh = 1; 2559 want_refresh = 1;
2529} 2560}
2530 2561
2531/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2532void 2563void
… …
2620void 2651void
2621rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2653{
2623 int row, wrote; 2654 int row, wrote;
2624 unsigned int width, towrite; 2655 unsigned int width, towrite;
2625 char r1[] = "\n"; 2656 const char r1[] = "\n";
2626 2657
2627 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2629 { 2660 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2711void 2742void
2712rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2713{ 2744{
2714 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2715 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2716 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2717 { 2753 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = 0; 2754 selection_type = 0;
2721 if (selnum != Sel_direct)
2722 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2723 } 2756 }
2724 2757
2725 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2726 { 2759 {
2727 int selnum = selection_type & Sel_whereMask;
2728
2729 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2730 if (selnum != Sel_direct)
2731 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2732 else
2733 selection_type = 0;
2734 } 2762 }
2735 2763
2736 return; 2764 return;
2737 } 2765 }
2738 2766
… …
2765 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2766 &ct2.value) != Success) 2794 &ct2.value) != Success)
2767 goto bailout; 2795 goto bailout;
2768 2796
2769 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2770 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2771 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2772 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2773 2801
2774 XFree (ct2.value); 2802 XFree (ct2.value);
2775 } 2803 }
… …
2811 { 2839 {
2812 /* 2840 /*
2813 * pass through again trying CUT_BUFFER0 if we've come from 2841 * pass through again trying CUT_BUFFER0 if we've come from
2814 * XConvertSelection () but nothing was presented 2842 * XConvertSelection () but nothing was presented
2815 */ 2843 */
2816 selection_paste (display->root, XA_CUT_BUFFER0, False); 2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817 } 2845 }
2818 2846
2819 goto bailout; 2847 goto bailout;
2820 } 2848 }
2821 } 2849 }
… …
2824 incr_ev.start (10); 2852 incr_ev.start (10);
2825 2853
2826 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2827 { 2855 {
2828 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2829 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2830 } 2858 }
2831 2859
2832 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2833 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2834 2862
… …
2991 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2992 */ 3020 */
2993void 3021void
2994rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2995{ 3023{
2996 int i; 3024 int size;
2997 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2998 text_t *t; 3026 text_t *t;
2999 3027
3000 switch (selection.op) 3028 switch (selection.op)
3001 { 3029 {
… …
3017 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
3018 3046
3019 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3020 return; 3048 return;
3021 3049
3022 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3023 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3024 3052
3025 int ofs = 0; 3053 int ofs = 0;
3026 int extra = 0; 3054 int extra = 0;
3027 3055
3028 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
3034 { 3062 {
3035#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
3036 if (selection.rect) 3064 if (selection.rect)
3037 { 3065 {
3038 col = selection.beg.col; 3066 col = selection.beg.col;
3039 end_col = ncol + 1; 3067 end_col = selection.end.col;
3040 } 3068 }
3041 else 3069 else
3042#endif 3070#endif
3043 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
3044 3072
3045 col = max (col, 0); 3073 col = max (col, 0);
3046 3074
3047 if (row == selection.end.row 3075 if (row == selection.end.row)
3048#if !ENABLE_MINIMAL
3049 || selection.rect
3050#endif
3051 )
3052 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3053 3077
3054 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3055 3079
3056 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3064 3088
3065 extra -= (len - 1); 3089 extra -= (len - 1);
3066 3090
3067 if (extra < 0) 3091 if (extra < 0)
3068 { 3092 {
3069 extra += i; 3093 extra += size;
3070 i += i; 3094 size += size;
3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3072 } 3096 }
3073 3097
3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3075 } 3099 }
3076#endif 3100#endif
… …
3088 3112
3089 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3090 } 3114 }
3091 else 3115 else
3092#endif 3116#endif
3093 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3094 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3095 } 3121 }
3096
3097 if (end_col != selection.end.col)
3098 new_selection_text[ofs++] = C0_LF;
3099 3122
3100 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3101 3124
3102 if (ofs == 0) 3125 if (ofs == 0)
3103 { 3126 {

Diff Legend

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