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.358 by sf-exg, Tue Jan 4 18:22:11 2011 UTC vs.
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 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;
… …
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 (bgPixmap.pixmap != None)
2517#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.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, bgPixmap.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
… …
2772 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success) 2797 &ct2.value) != Success)
2774 goto bailout; 2798 goto bailout;
2775 2799
2776 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2780 2804
2781 XFree (ct2.value); 2805 XFree (ct2.value);
2782 } 2806 }
… …
2831 incr_ev.start (10); 2855 incr_ev.start (10);
2832 2856
2833 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 { 2858 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2837 } 2861 }
2838 2862
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2841 2865
… …
3041 { 3065 {
3042#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
3043 if (selection.rect) 3067 if (selection.rect)
3044 { 3068 {
3045 col = selection.beg.col; 3069 col = selection.beg.col;
3046 end_col = ncol + 1; 3070 end_col = selection.end.col;
3047 } 3071 }
3048 else 3072 else
3049#endif 3073#endif
3050 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
3051 3075
3052 col = max (col, 0); 3076 col = max (col, 0);
3053 3077
3054 if (row == selection.end.row 3078 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
3060 3080
3061 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
3062 3082
3063 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3095 3115
3096 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3097 } 3117 }
3098 else 3118 else
3099#endif 3119#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3101 && (row != selection.beg.row || selection.beg.col < ncol)) 3122 && (row != selection.beg.row || selection.beg.col < ncol))
3102 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3103 } 3124 }
3104
3105 if (end_col != selection.end.col)
3106 new_selection_text[ofs++] = C0_LF;
3107 3125
3108 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3109 3127
3110 if (ofs == 0) 3128 if (ofs == 0)
3111 { 3129 {

Diff Legend

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