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.367 by sf-exg, Mon Jan 31 15:40:22 2011 UTC

… …
400 } 400 }
401 401
402 free (tabs); 402 free (tabs);
403 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
404 404
405 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
406 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
407 407
408 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
409 409
410 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
1685 { 1685 {
1686 rvideo_state = on; 1686 rvideo_state = on;
1687 1687
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1690 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1691#endif 1691#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1693
1694 XGCValues gcvalue; 1694 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
2031 refresh_count = 0; 2031 refresh_count = 0;
2032 2032
2033 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2034 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2037#endif 2037#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2039
2040 /* 2040 /*
2041 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2508 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2509 } 2509 }
2510} 2510}
2511 2511
2512void 2512void
2513rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2514{
2515 bool transparent = false;
2516
2515#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2516 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2517#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);
2518 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 {
2519 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
2520 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2522 2543
2523 if (scrollBar.win) 2544 if (scrollBar.win)
2524 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2526 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2527 scrollBar.show (0); 2551 scrollBar.show (0);
2528 } 2552 }
2529 2553
2530#endif 2554 if (refresh)
2531 2555 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2556 scr_clear ();
2534 scr_touch (true); 2557 scr_touch (true);
2558 }
2535 want_refresh = 1; 2559 want_refresh = 1;
2536} 2560}
2537 2561
2538/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2539void 2563void
… …
2718void 2742void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{ 2744{
2721 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2722 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2723 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2724 { 2753 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0; 2754 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2730 } 2756 }
2731 2757
2732 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2733 { 2759 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 } 2762 }
2742 2763
2743 return; 2764 return;
2744 } 2765 }
2745 2766
… …
2772 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success) 2794 &ct2.value) != Success)
2774 goto bailout; 2795 goto bailout;
2775 2796
2776 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2777 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);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2780 2801
2781 XFree (ct2.value); 2802 XFree (ct2.value);
2782 } 2803 }
… …
2831 incr_ev.start (10); 2852 incr_ev.start (10);
2832 2853
2833 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 { 2855 {
2835 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;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2837 } 2858 }
2838 2859
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2841 2862
… …
3091 3112
3092 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3093 } 3114 }
3094 else 3115 else
3095#endif 3116#endif
3096 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)
3097 && (row != selection.beg.row || selection.beg.col < ncol)) 3119 && (row != selection.beg.row || selection.beg.col < ncol))
3098 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3099 } 3121 }
3100
3101 if (end_col != selection.end.col)
3102 new_selection_text[ofs++] = C0_LF;
3103 3122
3104 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3105 3124
3106 if (ofs == 0) 3125 if (ofs == 0)
3107 { 3126 {

Diff Legend

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