emacs: src/xfns.c comparison

comparison src/xfns.c @ 32536:c198e3edcae6

Revert last change.

author	Miles Bader <miles@gnu.org>
date	Mon, 16 Oct 2000 14:45:44 +0000
parents	d913c96d248f
children	73521ea30674

comparison

equal deleted inserted replaced

-:3c3fa768e7d1
+:c198e3edcae6
 Lisp_Object Quser_size;
 extern Lisp_Object Qdisplay;
 Lisp_Object Qscroll_bar_foreground, Qscroll_bar_background;
 Lisp_Object Qscreen_gamma, Qline_spacing, Qcenter;
 Lisp_Object Qcompound_text;
-extern Lisp_Object Qbackground_tile;
 /* The below are defined in frame.c.  */
 extern Lisp_Object Qheight, Qminibuffer, Qname, Qonly, Qwidth;
 extern Lisp_Object Qunsplittable, Qmenu_bar_lines, Qbuffer_predicate, Qtitle;
 static void x_disable_image P_ ((struct frame *, struct image *));
 static void x_create_im P_ ((struct frame *));
 void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
 static void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_background_tile P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
 static struct x_frame_parm_table x_frame_parms[] =
 {
 "auto-raise",			x_set_autoraise,
 "auto-lower",			x_set_autolower,
 "background-color",		x_set_background_color,
-"background-tile",		x_set_background_tile,
 "border-color",		x_set_border_color,
 "border-width",		x_set_border_width,
 "cursor-color",		x_set_cursor_color,
 "cursor-type",		x_set_cursor_type,
 "font",			x_set_font,
 				f->output_data.x->background_pixel);
 }
 UNBLOCK_INPUT;
 update_face_from_frame_parameter (f, Qbackground_color, arg);
-if (FRAME_VISIBLE_P (f))
-redraw_frame (f);
-}
-}
-void
-x_set_background_tile (f, arg, oldval)
-struct frame *f;
-Lisp_Object arg, oldval;
-{
-int tile_id = lookup_image (f, arg, 0);
-struct image *tile_image = IMAGE_FROM_ID (f, tile_id);
-Pixmap tile_pixmap = tile_image ? tile_image->pixmap : 0;
-f->output_data.x->background_tile = tile_pixmap;
-if (FRAME_X_WINDOW (f) != 0 && tile_pixmap)
-{
-BLOCK_INPUT;
-/* The main frame area.  */
-XSetTile (FRAME_X_DISPLAY (f), f->output_data.x->normal_gc,
-		f->output_data.x->background_tile);
-XSetWindowBackgroundPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
-				  f->output_data.x->background_tile);
-{
-	Lisp_Object bar;
-	for (bar = FRAME_SCROLL_BARS (f); !NILP (bar);
-	     bar = XSCROLL_BAR (bar)->next)
-	  XSetWindowBackgroundPixmap (FRAME_X_DISPLAY (f),
-				      SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar)),
-				      f->output_data.x->background_tile);
-}
-UNBLOCK_INPUT;
-update_face_from_frame_parameter (f, Qbackground_tile, arg);
 if (FRAME_VISIBLE_P (f))
 redraw_frame (f);
 }
 }
 size = Qnil;
 if (valid_image_p (spec))
 {
 struct frame *f = check_x_frame (frame);
-int id = lookup_image (f, spec, 0);
+int id = lookup_image (f, spec);
 struct image *img = IMAGE_FROM_ID (f, id);
 int width = img->width + 2 * img->margin;
 int height = img->height + 2 * img->margin;
 if (NILP (pixels))
 mask = Qnil;
 if (valid_image_p (spec))
 {
 struct frame *f = check_x_frame (frame);
-int id = lookup_image (f, spec, 0);
+int id = lookup_image (f, spec);
 struct image *img = IMAGE_FROM_ID (f, id);
 if (img->mask)
 	mask = Qt;
 }
 else
 struct frame *f;
 int force_p;
 {
 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
-if (c && (c->refcount <= 1) && INTEGERP (Vimage_cache_eviction_delay))
+if (c && INTEGERP (Vimage_cache_eviction_delay))
 {
 EMACS_TIME t;
 unsigned long old;
 int i, nfreed;
 	  FOR_EACH_FRAME (tail, frame)
 	    {
 	      struct frame *f = XFRAME (frame);
 	      if (FRAME_X_P (f)
 		  && FRAME_X_IMAGE_CACHE (f) == c)
-		{
+		clear_current_matrices (f);
-		  clear_current_matrices (f);
-		  free_all_realized_faces (frame);
-		}
 	    }
 	  ++windows_or_buffers_changed;
 	}
 return Qnil;
 }
 /* Return the id of image with Lisp specification SPEC on frame F.
-SPEC must be a valid Lisp image specification (see valid_image_p).
+SPEC must be a valid Lisp image specification (see valid_image_p).  */
-If DELAY_LOAD is true, then the image isn't actually loaded yet (it
-will be loaded when prepare_image_for_display is called).  */
 int
-lookup_image (f, spec, delay_load)
+lookup_image (f, spec)
 struct frame *f;
 Lisp_Object spec;
-int delay_load;
 {
 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
 struct image *img;
 int i;
 unsigned hash;
 if (img == NULL)
 {
 BLOCK_INPUT;
 img = make_image (spec, hash);
 cache_image (f, img);
-if (! delay_load)
+img->load_failed_p = img->type->load (f, img) == 0;
-	img->load_failed_p = img->type->load (f, img) == 0;
-xassert (!interrupt_input_blocked);
 /* If we can't load the image, and we don't have a width and
 	 height, use some arbitrary width and height so that we can
 	 draw a rectangle for it.  */
-if (img->pixmap == 0)
+if (img->load_failed_p)
 	{
 	  Lisp_Object value;
 	  value = image_spec_value (spec, QCwidth, NULL);
 	  img->width = (INTEGERP (value)
 xpm_lookup_color (f, color_name, color)
 struct frame *f;
 char *color_name;
 XColor *color;
 {
-char *s;
 struct xpm_cached_color *p;
-unsigned h = xpm_color_bucket (color_name);
+int h = xpm_color_bucket (color_name);
-for (s = color_name; *s; ++s)
-h = (h << 2) ^ *s;
-h %= XPM_COLOR_CACHE_BUCKETS;
 for (p = xpm_color_cache[h]; p; p = p->next)
 if (strcmp (p->name, color_name) == 0)
 break;

Mercurial > emacs

comparison src/xfns.c @ 32536:c198e3edcae6