Commit a3f1b3d5 authored by Jan D's avatar Jan D
Browse files

x_free_cr_resources: Renamed from x_prepare_for_xlibdraw.

* src/xterm.c (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.
parent c744c8a8
2015-04-12 Jan Djärv <jan.h.d@swipnet.se> 2015-04-12 Jan Djärv <jan.h.d@swipnet.se>
* xterm.c (x_draw_image_glyph_string): Added missing USE_CAIRO. * 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) * image.c (get_spec_bg_or_alpha_as_argb)
(create_cairo_image_surface): New functions when USE_CAIRO. (create_cairo_image_surface): New functions when USE_CAIRO.
......
...@@ -329,7 +329,7 @@ record_event (char *locus, int type) ...@@ -329,7 +329,7 @@ record_event (char *locus, int type)
#endif #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_set_clip_rectangles (struct frame *, GC, XRectangle *, int);
static void x_reset_clip_rectangles (struct frame *, GC); static void x_reset_clip_rectangles (struct frame *, GC);
static void x_fill_rectangle (struct frame *, GC, int, int, int, int); static void x_fill_rectangle (struct frame *, GC, int, int, int, int);
...@@ -574,7 +574,7 @@ x_cr_draw_frame (cairo_t *cr, struct frame *f) ...@@ -574,7 +574,7 @@ x_cr_draw_frame (cairo_t *cr, struct frame *f)
width = FRAME_PIXEL_WIDTH (f); width = FRAME_PIXEL_WIDTH (f);
height = FRAME_PIXEL_HEIGHT (f); height = FRAME_PIXEL_HEIGHT (f);
x_prepare_for_xlibdraw (f); x_free_cr_resources (f);
FRAME_CR_CONTEXT (f) = cr; FRAME_CR_CONTEXT (f) = cr;
x_clear_area (f, 0, 0, width, height); x_clear_area (f, 0, 0, width, height);
expose_frame (f, 0, 0, width, height); expose_frame (f, 0, 0, width, height);
...@@ -662,7 +662,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type) ...@@ -662,7 +662,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
QUIT; QUIT;
block_input (); block_input ();
x_prepare_for_xlibdraw (f); x_free_cr_resources (f);
FRAME_CR_CONTEXT (f) = cr; FRAME_CR_CONTEXT (f) = cr;
x_clear_area (f, 0, 0, width, height); x_clear_area (f, 0, 0, width, height);
expose_frame (f, 0, 0, width, height); expose_frame (f, 0, 0, width, height);
...@@ -702,7 +702,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type) ...@@ -702,7 +702,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
#endif /* USE_CAIRO */ #endif /* USE_CAIRO */
static void static void
x_prepare_for_xlibdraw (struct frame *f) x_free_cr_resources (struct frame *f)
{ {
#ifdef USE_CAIRO #ifdef USE_CAIRO
if (f == NULL) if (f == NULL)
...@@ -710,7 +710,7 @@ x_prepare_for_xlibdraw (struct frame *f) ...@@ -710,7 +710,7 @@ x_prepare_for_xlibdraw (struct frame *f)
Lisp_Object rest, frame; Lisp_Object rest, frame;
FOR_EACH_FRAME (rest, frame) FOR_EACH_FRAME (rest, frame)
if (FRAME_X_P (XFRAME (frame))) if (FRAME_X_P (XFRAME (frame)))
x_prepare_for_xlibdraw (XFRAME (frame)); x_free_cr_resources (XFRAME (frame));
} }
else else
{ {
...@@ -3664,7 +3664,7 @@ x_draw_glyph_string (struct glyph_string *s) ...@@ -3664,7 +3664,7 @@ x_draw_glyph_string (struct glyph_string *s)
static void static void
x_shift_glyphs_for_insert (struct frame *f, int x, int y, int width, int height, int shift_by) 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), XCopyArea (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), FRAME_X_WINDOW (f),
f->output_data.x->normal_gc, f->output_data.x->normal_gc,
x, y, width, height, x, y, width, height,
...@@ -11035,7 +11035,7 @@ x_free_frame_resources (struct frame *f) ...@@ -11035,7 +11035,7 @@ x_free_frame_resources (struct frame *f)
free_frame_xic (f); free_frame_xic (f);
#endif #endif
x_prepare_for_xlibdraw (f); x_free_cr_resources (f);
#ifdef USE_X_TOOLKIT #ifdef USE_X_TOOLKIT
if (f->output_data.x->widget) if (f->output_data.x->widget)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment