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.359 by sf-exg, Tue Jan 4 23:06:10 2011 UTC vs.
Revision 1.370 by sf-exg, Sun Feb 6 11:42:28 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 * ------------------------------------------------------------------------- */
… …
400 } 398 }
401 399
402 free (tabs); 400 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
404 402
405 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
407 405
408 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
409 407
410 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
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
… …
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
… …
3091 3087
3092 new_selection_text[ofs++] = C0_LF; 3088 new_selection_text[ofs++] = C0_LF;
3093 } 3089 }
3094 else 3090 else
3095#endif 3091#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row 3092 if (!ROW(row).is_longer ()
3093 && (row != selection.end.row || end_col != selection.end.col)
3097 && (row != selection.beg.row || selection.beg.col < ncol)) 3094 && (row != selection.beg.row || selection.beg.col < ncol))
3098 new_selection_text[ofs++] = C0_LF; 3095 new_selection_text[ofs++] = C0_LF;
3099 } 3096 }
3100
3101 if (end_col != selection.end.col)
3102 new_selection_text[ofs++] = C0_LF;
3103 3097
3104 new_selection_text[ofs] = 0; 3098 new_selection_text[ofs] = 0;
3105 3099
3106 if (ofs == 0) 3100 if (ofs == 0)
3107 { 3101 {

Diff Legend

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