x_free_cr_resources: Renamed from x_prepare_for_xlibdraw.

[gnu-emacs] / src / xterm.c

diff --git a/src/xterm.c b/src/xterm.c
index 6bd09300c34551cec004e55335f612c54414a2e8..6e7ef366d5f8fc4d97b11337f1075ce84ec3218b 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -329,7 +329,7 @@ record_event (char *locus, int type)
 
 #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);
@@ -574,7 +574,7 @@ x_cr_draw_frame (cairo_t *cr, struct frame *f)
   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);
@@ -662,7 +662,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
       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);
@@ -702,7 +702,7 @@ x_cr_export_frames (Lisp_Object frames, cairo_surface_type_t surface_type)
 #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)
@@ -710,7 +710,7 @@ x_prepare_for_xlibdraw (struct frame *f)
       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
     {
@@ -1038,6 +1038,10 @@ static void
 x_update_begin (struct frame *f)
 {
 #ifdef USE_CAIRO
+  if (! NILP (tip_frame) && XFRAME (tip_frame) == f
+      && ! FRAME_VISIBLE_P (f))
+    return;
+
   if (! FRAME_CR_SURFACE (f))
     {
       int width, height;
@@ -3163,6 +3167,7 @@ x_draw_image_glyph_string (struct glyph_string *s)
     }
 
   /* Draw the foreground.  */
+#ifdef USE_CAIRO
   if (s->img->cr_data)
     {
       cairo_t *cr = x_begin_cr_clip (s->f, s->gc);
@@ -3178,7 +3183,9 @@ x_draw_image_glyph_string (struct glyph_string *s)
       cairo_fill (cr);
       x_end_cr_clip (s->f);
     }
-  else if (pixmap != None)
+  else
+#endif
+    if (pixmap != None)
     {
       x_draw_image_foreground_1 (s, pixmap);
       x_set_glyph_string_clipping (s);
@@ -3657,7 +3664,7 @@ x_draw_glyph_string (struct glyph_string *s)
 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,
@@ -11028,7 +11035,7 @@ x_free_frame_resources (struct frame *f)
        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)
        {