HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
src
/
nsterm.h
diff --git
a/src/nsterm.h
b/src/nsterm.h
index
f419391
..
5bbc532
100644
(file)
--- a/
src/nsterm.h
+++ b/
src/nsterm.h
@@
-416,8
+416,8
@@
struct ns_bitmap_record
/* this to map between emacs color indices and NSColor objects */
struct ns_color_table
{
/* this to map between emacs color indices and NSColor objects */
struct ns_color_table
{
-
unsigned in
t size;
-
unsigned in
t avail;
+
ptrdiff_
t size;
+
ptrdiff_
t avail;
#ifdef __OBJC__
NSColor **colors;
NSMutableSet *empty_indices;
#ifdef __OBJC__
NSColor **colors;
NSMutableSet *empty_indices;
@@
-467,7
+467,6
@@
struct nsfont_info
#endif
char bold, ital; /* convenience flags */
char synthItal;
#endif
char bold, ital; /* convenience flags */
char synthItal;
- float voffset; /* mean of ascender/descender offsets */
XCharStruct max_bounds;
/* we compute glyph codes and metrics on-demand in blocks of 256 indexed
by hibyte, lobyte */
XCharStruct max_bounds;
/* we compute glyph codes and metrics on-demand in blocks of 256 indexed
by hibyte, lobyte */
@@
-825,6
+824,13
@@
extern unsigned long ns_get_rgb_color (struct frame *f,
float r, float g, float b, float a);
extern NSPoint last_mouse_motion_position;
float r, float g, float b, float a);
extern NSPoint last_mouse_motion_position;
+/* From nsterm.m, needed in nsfont.m. */
+#ifdef __OBJC__
+extern void
+ns_draw_text_decoration (struct glyph_string *s, struct face *face,
+ NSColor *defaultCol, CGFloat width, CGFloat x);
+#endif
+
#ifdef NS_IMPL_GNUSTEP
extern char gnustep_base_version[]; /* version tracking */
#endif
#ifdef NS_IMPL_GNUSTEP
extern char gnustep_base_version[]; /* version tracking */
#endif