See the COPYING file for a copy of the GNU General Public License.
*/
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
#include "render.h"
#include "gradient.h"
#include "font.h"
#include "theme.h"
#include <glib.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xft/Xft.h>
#ifdef HAVE_STDLIB_H
# include <stdlib.h>
Pixmap RrPaintPixmap(RrAppearance *a, gint w, gint h)
{
- gint i, transferred = 0, sw, sh, partial_w, partial_h;
+ gint i, transferred = 0, sw, sh, partial_w, partial_h, force_transfer = 0;
RrPixel32 *source, *dest;
- Pixmap oldp;
+ Pixmap oldp = None;
RrRect tarea; /* area in which to draw textures */
gboolean resized;
RrVisual(a->inst), RrColormap(a->inst));
g_assert(a->xftdraw != NULL);
- g_free(a->surface.pixel_data);
- a->surface.pixel_data = g_new(RrPixel32, w * h);
+ if (resized) {
+ g_free(a->surface.pixel_data);
+ a->surface.pixel_data = g_new(RrPixel32, w * h);
+ }
if (a->surface.grad == RR_SURFACE_PARENTREL) {
g_assert (a->surface.parent);
&a->texture[i].data.rgba,
a->w, a->h,
&tarea);
+ force_transfer = 1;
break;
}
}
if (!transferred) {
transferred = 1;
- if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced))
+ if ((a->surface.grad != RR_SURFACE_SOLID) || (a->surface.interlaced) ||
+ force_transfer)
+ {
pixel_data_to_pixmap(a, 0, 0, w, h);
+ }
}
return oldp;
return out;
}
+void RrAppearanceAddTextures(RrAppearance *a, gint numtex)
+{
+ g_assert(a->textures == 0);
+
+ a->textures = numtex;
+ if (numtex) a->texture = g_new0(RrTexture, numtex);
+}
+
RrAppearance *RrAppearanceCopy(RrAppearance *orig)
{
RrSurface *spo, *spc;