emacs: src/dispextern.h comparison

comparison src/dispextern.h @ 89943:4c90ffeb71c5

Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15 Merge from emacs--cvs-trunk--0 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221 Restore deleted tagline in etc/TUTORIAL.ru * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229 Remove TeX output files from the archive * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248 src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264 Update from CVS: lispref/display.texi: emacs -> Emacs. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275 Update from CVS: man/makefile.w32-in: Revert last change * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296 Allow restarting an existing debugger session that's exited * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328 Update from CVS: src/.gdbinit (xsymbol): Fix last change. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345 Tweak source regexps so that building in place won't cause problems * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352 Update from CVS: lisp/flymake.el: New file. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362 Support " [...]" style defaults in minibuffer-electric-default-mode * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363 (read-number): Use canonical format for default in prompt. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368 Improve display-supports-face-attributes-p on non-ttys * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369 Rewrite face-differs-from-default-p * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370 Move `display-supports-face-attributes-p' entirely into C code * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372 Simplify face-differs-from-default-p; don't consider :stipple. * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374 (tty_supports_face_attributes_p): Ensure attributes differ from default * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377 (Fdisplay_supports_face_attributes_p): Work around bootstrapping problem * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381 Face merging cleanups * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385 src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396 Tweak arch tagging to make build/install-in-place less annoying * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397 Work around vc-arch problems when building eshell * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398 Tweak permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399 Tweak directory permissions * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401 More build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403 Yet more build-in-place tweaking of arch tagging * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS

author	Miles Bader <miles@gnu.org>
date	Mon, 28 Jun 2004 07:56:49 +0000
parents	68c22ea6027c 5407da499273
children	c08afac24467

comparison

equal deleted inserted replaced

-:9cb747ae49af
+:4c90ffeb71c5
 /* Interface definitions for display code.
-Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+Copyright (C) 1985,93,94,97,98,99, 2000,01,02,03, 2004
 Free Software Foundation, Inc.
 This file is part of GNU Emacs.
 GNU Emacs is free software; you can redistribute it and/or modify
 /* Glyph is a space of fractional width and/or height.  */
 STRETCH_GLYPH
 };
+/* Structure describing how to use partial glyphs (images slicing) */
+struct glyph_slice
+{
+unsigned x : 16;
+unsigned y : 16;
+unsigned width : 16;
+unsigned height : 16;
+};
 /* Glyphs.
 Be extra careful when changing this structure!  Esp. make sure that
 functions producing glyphs, like append_glyph, fill ALL of the
 glyph structure, and that GLYPH_EQUAL_P compares all
 determine which set of functions to use to obtain font metrics
 for the glyph.  On W32, value should be an enumerator of the type
 w32_char_font_type.  Otherwise it equals FONT_TYPE_UNKNOWN.  */
 unsigned font_type : 3;
+struct glyph_slice slice;
 /* A union of sub-structures for different glyph types.  */
 union
 {
 /* Character code for character glyphs (type == CHAR_GLYPH).  */
 unsigned ch;
 /* Is GLYPH a space?  */
 #define CHAR_GLYPH_SPACE_P(GLYPH) \
 (GLYPH_FROM_CHAR_GLYPH ((GLYPH)) == SPACEGLYPH)
+/* Are glyph slices of glyphs *X and *Y equal */
+#define GLYPH_SLICE_EQUAL_P(X, Y)		\
+((X)->slice.x == (Y)->slice.x			\
+&& (X)->slice.y == (Y)->slice.y		\
+&& (X)->slice.width == (Y)->slice.width	\
+&& (X)->slice.height == (Y)->slice.height)
 /* Are glyphs *X and *Y displayed equal?  */
 #define GLYPH_EQUAL_P(X, Y)					\
 ((X)->type == (Y)->type					\
 && (X)->u.val == (Y)->u.val				\
+&& GLYPH_SLICE_EQUAL_P (X, Y)				\
 && (X)->face_id == (Y)->face_id				\
 && (X)->padding_p == (Y)->padding_p			\
 && (X)->left_box_line_p == (Y)->left_box_line_p		\
 && (X)->right_box_line_p == (Y)->right_box_line_p		\
 && (X)->voffset == (Y)->voffset				\
 font_not_found_p is 1.  */
 struct glyph *first_glyph;
 /* Image, if any.  */
 struct image *img;
+/* Slice */
+struct glyph_slice slice;
 struct glyph_string *next, *prev;
 };
 #endif /* HAVE_WINDOW_SYSTEM */
 /* Structure used to describe where and how to draw a fringe bitmap.
 WHICH is the fringe bitmap to draw.  WD and H is the (adjusted)
 width and height of the bitmap, DH is the height adjustment (if
 bitmap is periodic).  X and Y are frame coordinates of the area to
 display the bitmap, DY is relative offset of the bitmap into that
 area.  BX, NX, BY, NY specifies the area to clear if the bitmap
 does not fill the entire area.  FACE is the fringe face.  */
 struct draw_fringe_bitmap_params
 {
 int which;  /* enum fringe_bitmap_type */
 /* Not a property.  Used to indicate changes in overlays.  */
 OVERLAY_PROP_IDX,
 /* Sentinel.  */
 LAST_PROP_IDX
+};
+struct it_slice
+{
+Lisp_Object x;
+Lisp_Object y;
+Lisp_Object width;
+Lisp_Object height;
 };
 struct it
 {
 int string_nchars;
 enum glyph_row_area area;
 unsigned multibyte_p : 1;
 unsigned string_from_display_prop_p : 1;
 unsigned display_ellipsis_p : 1;
+struct it_slice slice;
 Lisp_Object space_width;
 short voffset;
 Lisp_Object font_height;
 }
 stack[2];
 /* If 1, saved_face_id contains the id of the face in front of text
 skipped due to selective display.  */
 unsigned face_before_selective_p : 1;
+/* If 1, adjust current glyph so it does not increase current row
+descent/ascent (line-height property).  Reset after this glyph.  */
+unsigned constrain_row_ascent_descent_p : 1;
 /* The ID of the default face to use.  One of DEFAULT_FACE_ID,
 MODE_LINE_FACE_ID, etc, depending on what we are displaying.  */
 int base_face_id;
 /* If what == IT_CHARACTER, character and length in bytes.  This is
 is set after produce_glyphs has been called.  */
 int char_to_display;
 /* If what == IT_IMAGE, the id of the image to display.  */
 int image_id;
+/* Values from `slice' property.  */
+struct it_slice slice;
 /* Value of the `space-width' property, if any; nil if none.  */
 Lisp_Object space_width;
 /* Computed from the value of the `raise' property.  */
 int last_visible_y;
 /* Additional space in pixels between lines (for window systems
 only.)  */
 int extra_line_spacing;
+/* Override font height information for this glyph.
+Used if override_ascent >= 0.  Cleared after this glyph.  */
+int override_ascent, override_descent, override_boff;
 /* If non-null, glyphs are produced in glyph_row with each call to
 produce_glyphs.  */
 struct glyph_row *glyph_row;
 int (*encode_char) P_ ((int c, XChar2b *char2b,
 			  struct font_info *font_into,
 			  struct charset *charset,
 			  int *two_byte_p));
 /* Compute left and right overhang of glyph string S.
 A NULL pointer if platform does not support this. */
 void (*compute_glyph_string_overhangs) P_ ((struct glyph_string *s));
 /* Draw a glyph string S.  */
 void (*draw_glyph_string) P_ ((struct glyph_string *s));
 /* Draw vertical border for window W from (X,Y0) to (X,Y1).  */
 void (*draw_vertical_window_border) P_ ((struct window *w,
 					   int x, int y0, int y1));
 /* Shift display of frame F to make room for inserted glyphs.
 The area at pixel (X,Y) of width WIDTH and height HEIGHT is
 shifted right by SHIFT_BY pixels.  */
 void (*shift_glyphs_for_insert) P_ ((struct frame *f,
 				       int x, int y, int width,
 				       int height, int shift_by));
 void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *));
 extern Lisp_Object Qtool_bar;
 extern Lisp_Object Vshow_trailing_whitespace;
 extern int mode_line_in_non_selected_windows;
 extern int redisplaying_p;
-extern Lisp_Object Vimage_types;
 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
 extern int help_echo_showing_p;
 extern int current_mode_line_height, current_header_line_height;
 extern Lisp_Object help_echo_string, help_echo_window;
 extern Lisp_Object help_echo_object, previous_help_echo_string;
 extern int help_echo_pos;
 extern struct frame *last_mouse_frame;
 extern int last_tool_bar_item;
 extern int mouse_autoselect_window;
 unsigned long image_background P_ ((struct image *, struct frame *,
 				    XImagePtr_or_DC ximg));
 int image_background_transparent P_ ((struct image *, struct frame *,
 				      XImagePtr_or_DC mask));
+int image_ascent P_ ((struct image *, struct face *, struct glyph_slice *));
 #endif
 /* Defined in sysdep.c */
 extern int required_matrix_width P_ ((struct window *));
 extern int required_matrix_height P_ ((struct window *));
 extern Lisp_Object buffer_posn_from_coords P_ ((struct window *,
 						int *, int *,
 						struct display_pos *,
 						Lisp_Object *,
 						int *, int *, int *, int *));
 extern Lisp_Object mode_line_string P_ ((struct window *, enum window_part,
 					 int *, int *, int *,
 					 Lisp_Object *,
 					 int *, int *, int *, int *));

Mercurial > emacs

comparison src/dispextern.h @ 89943:4c90ffeb71c5