diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-29 20:09:37 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-29 20:13:40 -0700 |
commit | 3c2c50260e19deff2a0a054882eaea4049f25a2f (patch) | |
tree | 09b502d87a2ef0440bedd7ce676be26ea5730f14 /src/nsterm.h | |
parent | cbb2e845187bfbcc62e2accc9df7891a2326608a (diff) | |
download | emacs-3c2c50260e19deff2a0a054882eaea4049f25a2f.tar.gz |
Fix problems found by static checking --with-ns
This is for Fedora 24 when configured with --enable-gcc-warnings.
Although it does not fix all the problems, it fixes many of them.
* src/frame.c (XParseGeometry):
* src/nsterm.m (mouseDown:):
Mark locals with UNINIT to pacify --enable-gcc-warnings.
* src/image.c (PIX_MASK_DRAW, DefaultDepthOfScreen):
Remove unused macros.
(slurp_file xbm_scan, xbm_read_bitmap_data, xbm_load_image)
(xbm_file_p, xbm_load, xpm_scan, xpm_make_color_table_v)
(xpm_put_color_table_v, xpm_get_color_table_v)
(xpm_make_color_table_h, xpm_put_color_table_h)
(xpm_get_color_table_h, xpm_load_image, xpm_load)
(pbm_next_char, pbm_scan_number, pbm_load, svg_load)
(svg_load_image):
* src/nsfns.m (x_get_string_resource):
* src/nsimage.m (ns_image_from_XBM):
Fix pointer signedness problems.
* src/image.c (xpm_load_image, x_build_heuristic_mask, pbm_load)
(imagemagick_load_image): Omit unused locals.
* src/nsfns.m (ns_send_types, ns_return_types, ns_drag_types)
(Fx_open_connection):
* src/nsfont.m (ns_antialias_threshold):
Move extern decl to nsterm.h so it can be checked.
* src/nsmenu.m (svcsMenu, dockMenu):
Move to the only file that uses them, so they can be static.
* src/nsterm.h (find_and_call_menu_selection):
* src/nsterm.m (x_set_frame_alpha):
Omit duplicate decls.
* src/nsterm.h (ns_dump_glyphstring): Mark as EXTERNALLY_VISIBLE.
* src/nsfns.m (ns_tooltip, ns_display_info_for_name)
(ns_set_name_as_filename, x_set_menu_bar_lines)
(x_set_tool_bar_lines, x_set_internal_border_width):
* src/nsterm.m (ns_drag_types, ns_draw_text_decoration):
Now static.
* src/nsfns.m (ns_lisp_to_cursor_type, ns_cursor_type_to_lisp):
* src/nsterm.m (ns_free_indexed_color, ns_color_to_lisp):
Remove; unused.
* src/nsfont.m (ns_dump_glyphstring):
* src/nsterm.m (hide_bell, ns_get_color, ns_color_to_lisp)
(ns_clear_frame, keyDown:):
Fix signedness problem with printf arg.
* src/nsterm.h (ns_input_events, ns_finish_events):
* src/nsterm.m (ns_finish_events, hide_bell):
Prototype the decls.
* src/nsterm.m (NSMenuDidBeginTrackingNotification):
Omit unnecessary decl.
(dockMenu):
(mainMenu) [NS_IMPL_COCOA]: Now static, and in this file.
(ns_dumpglyphs_box_or_relief, changeFont:, initFrameFromEmacs:)
(toggleFullScreen:): Use FACE_FROM_ID instead of
FACE_FROM_ID_OR_NULL in contexts where the caller expects the
result to be non-null.
(applicationShouldTerminate:): Fix misleading indentation.
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); |