diff options
Diffstat (limited to 'src/nsterm.h')
| -rw-r--r-- | src/nsterm.h | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/nsterm.h b/src/nsterm.h index c12c791c635..35c6e1a4cbc 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -731,7 +731,7 @@ char const * nstrace_fullscreen_type_name (int); extern NSArray *ns_send_types, *ns_return_types; extern NSString *ns_app_name; -extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu; +extern EmacsMenu *svcsMenu; /* Apple removed the declaration, but kept the implementation */ #if defined (NS_IMPL_COCOA) @@ -924,8 +924,6 @@ struct ns_display_info /* This is a chain of structures for all the NS displays currently in use. */ extern struct ns_display_info *x_display_list; -extern struct ns_display_info *ns_display_info_for_name (Lisp_Object name); - struct ns_output { #ifdef __OBJC__ @@ -1099,7 +1097,7 @@ extern void nsfont_make_fontset_for_font (Lisp_Object name, /* In nsfont, for debugging */ struct glyph_string; -void ns_dump_glyphstring (struct glyph_string *s); +void ns_dump_glyphstring (struct glyph_string *s) EXTERNALLY_VISIBLE; /* Implemented in nsterm, published in or needed from nsfns. */ extern Lisp_Object ns_list_fonts (struct frame *f, Lisp_Object pattern, @@ -1116,9 +1114,6 @@ extern void ns_string_to_pasteboard (id pb, Lisp_Object str); extern Lisp_Object ns_get_local_selection (Lisp_Object selection_name, Lisp_Object target_type); extern void nxatoms_of_nsselect (void); -extern int ns_lisp_to_cursor_type (Lisp_Object arg); -extern Lisp_Object ns_cursor_type_to_lisp (int arg); -extern void ns_set_name_as_filename (struct frame *f); extern void ns_set_doc_edited (void); extern bool @@ -1130,11 +1125,9 @@ extern void ns_query_color (void *col, XColor *color_def, int setPixel); #ifdef __OBJC__ -extern Lisp_Object ns_color_to_lisp (NSColor *col); extern int ns_lisp_to_color (Lisp_Object color, NSColor **col); extern NSColor *ns_lookup_indexed_color (unsigned long idx, struct frame *f); extern unsigned long ns_index_color (NSColor *color, struct frame *f); -extern void ns_free_indexed_color (unsigned long idx, struct frame *f); extern const char *ns_get_pending_menu_title (void); extern void ns_check_menu_open (NSMenu *menu); extern void ns_check_pending_open_menu (void); @@ -1152,8 +1145,6 @@ extern void ns_init_locale (void); /* in nsmenu */ extern void update_frame_tool_bar (struct frame *f); extern void free_frame_tool_bar (struct frame *f); -extern void find_and_call_menu_selection (struct frame *f, - int menu_bar_items_used, Lisp_Object vector, void *client_data); extern Lisp_Object find_and_return_menu_selection (struct frame *f, bool keymaps, void *client_data); @@ -1176,7 +1167,7 @@ extern void syms_of_nsselect (void); /* From nsimage.m, needed in image.c */ struct image; -extern void *ns_image_from_XBM (unsigned char *bits, int width, int height, +extern void *ns_image_from_XBM (char *bits, int width, int height, unsigned long fg, unsigned long bg); extern void *ns_image_for_XPM (int width, int height, int depth); extern void *ns_image_from_file (Lisp_Object file); @@ -1192,6 +1183,7 @@ extern int x_display_pixel_height (struct ns_display_info *); extern int x_display_pixel_width (struct ns_display_info *); /* This in nsterm.m */ +extern float ns_antialias_threshold; extern void x_destroy_window (struct frame *f); extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timespec const *timeout, @@ -1199,14 +1191,11 @@ extern int ns_select (int nfds, fd_set *readfds, fd_set *writefds, extern unsigned long ns_get_rgb_color (struct frame *f, float r, float g, float b, float a); -extern void ns_init_events (); -extern void ns_finish_events (); +struct input_event; +extern void ns_init_events (struct input_event *); +extern void ns_finish_events (void); #ifdef __OBJC__ -/* From nsterm.m, needed in nsfont.m. */ -extern void -ns_draw_text_decoration (struct glyph_string *s, struct face *face, - NSColor *defaultCol, CGFloat width, CGFloat x); /* Needed in nsfns.m. */ extern void ns_set_represented_filename (NSString* fstr, struct frame *f); |