2015-04-12 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO.
+ (x_free_cr_resources): Renamed from x_prepare_for_xlibdraw.
+ (x_cr_draw_frame, x_cr_export_frames, x_shift_glyphs_for_insert)
+ (x_free_frame_resources): Rename x_prepare_for_xlibdraw to
+ x_free_cr_resources.
* image.c (get_spec_bg_or_alpha_as_argb)
(create_cairo_image_surface): New functions when USE_CAIRO.
#endif
-static void x_prepare_for_xlibdraw (struct frame *);
+static void x_free_cr_resources (struct frame *);
static void x_set_clip_rectangles (struct frame *, GC, XRectangle *, int);
static void x_reset_clip_rectangles (struct frame *, GC);
static void x_fill_rectangle (struct frame *, GC, int, int, int, int);
width = FRAME_PIXEL_WIDTH (f);
height = FRAME_PIXEL_HEIGHT (f);
- x_prepare_for_xlibdraw (f);
+ x_free_cr_resources (f);
FRAME_CR_CONTEXT (f) = cr;
x_clear_area (f, 0, 0, width, height);
expose_frame (f, 0, 0, width, height);
QUIT;
block_input ();
- x_prepare_for_xlibdraw (f);
+ x_free_cr_resources (f);
FRAME_CR_CONTEXT (f) = cr;
x_clear_area (f, 0, 0, width, height);
expose_frame (f, 0, 0, width, height);
#endif /* USE_CAIRO */
static void
-x_prepare_for_xlibdraw (struct frame *f)
+x_free_cr_resources (struct frame *f)
{
#ifdef USE_CAIRO
if (f == NULL)
Lisp_Object rest, frame;
FOR_EACH_FRAME (rest, frame)
if (FRAME_X_P (XFRAME (frame)))
- x_prepare_for_xlibdraw (XFRAME (frame));
+ x_free_cr_resources (XFRAME (frame));
}
else
{
static void
x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by)
{
- x_prepare_for_xlibdraw (f);
+ x_free_cr_resources (f);
XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f),
f->output_data.x->normal_gc,
x, y, width, height,
free_frame_xic (f);
#endif
- x_prepare_for_xlibdraw (f);
+ x_free_cr_resources (f);
#ifdef USE_X_TOOLKIT
if (f->output_data.x->widget)
{