diff options
| -rw-r--r-- | src/fontset.h | 37 | ||||
| -rw-r--r-- | src/intervals.h | 53 | ||||
| -rw-r--r-- | src/keyboard.h | 41 |
3 files changed, 92 insertions, 39 deletions
diff --git a/src/fontset.h b/src/fontset.h index bb7c8e8ffcd..b99d7de576a 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -170,40 +170,51 @@ struct fontset_data int n_fontsets; }; +/* Forward declaration for prototypes. */ +struct frame; + /* The following six are window system dependent functions. Initialization routine of each window system should set appropriate functions to these variables. For instance, in case of X window, x_term_init does this. */ /* Return a pointer to struct font_info of font FONT_IDX of frame F. */ -extern struct font_info *(*get_font_info_func) (/* FRAME_PTR f; - int font_idx */); +extern struct font_info *(*get_font_info_func) P_ ((struct frame *f, + int font_idx)); /* Return a list of font names which matches PATTERN. See the document of `x-list-fonts' for more detail. */ -extern Lisp_Object (*list_fonts_func) (/* Lisp_Object pattern, face, frame, - width */); +extern Lisp_Object (*list_fonts_func) P_ ((Lisp_Object pattern, + Lisp_Object face, + Lisp_Object frame, + Lisp_Object width)); /* Load a font named NAME for frame F and return a pointer to the information of the loaded font. If loading is failed, return -1. */ -extern struct font_info *(*load_font_func) (/* FRAME_PTR f; char *name */); +extern struct font_info *(*load_font_func) P_ ((struct frame *f, + char *name, int)); /* Return a pointer to struct font_info of a font named NAME for frame F. If no such font is loaded, return NULL. */ -extern struct font_info *(*query_font_func) (/* FRAME_PTR f; char *name */); +extern struct font_info *(*query_font_func) P_ ((struct frame *f, char *name)); /* Additional function for setting fontset or changing fontset contents of frame F. This function may change the coordinate of the frame. */ -extern void (*set_frame_fontset_func) (/* FRAME_PTR f; Lisp_Object arg, oldval */); +extern void (*set_frame_fontset_func) P_ ((struct frame *f, Lisp_Object arg, + Lisp_Object oldval)); /* Check if any window system is used now. */ -extern void (*check_window_system_func) (); - -extern struct fontset_data *alloc_fontset_data (); -extern void free_fontset_data (); -extern struct font_info *fs_load_font (); -extern Lisp_Object list_fontsets (); +extern void (*check_window_system_func) P_ ((void)); + +extern struct fontset_data *alloc_fontset_data P_ ((void)); +extern void free_fontset_data P_ ((struct fontset_data *)); +extern struct font_info *fs_load_font P_ ((struct frame *, struct font_info *, + int, char *, int)); +extern int fs_query_fontset P_ ((struct frame *, char *)); +extern int fs_register_fontset P_ ((struct frame *, Lisp_Object)); +EXFUN (Fquery_fontset, 1); +extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int)); extern Lisp_Object Vglobal_fontset_alist; extern Lisp_Object Qfontset; diff --git a/src/intervals.h b/src/intervals.h index aa914ceff98..491bd14d8fa 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -188,30 +188,41 @@ Boston, MA 02111-1307, USA. */ /* Declared in alloc.c */ -extern INTERVAL make_interval (); +extern INTERVAL make_interval P_ ((void)); /* Declared in intervals.c */ -extern INTERVAL create_root_interval (); -extern void copy_properties (); -extern int intervals_equal (); -extern void traverse_intervals (); -extern INTERVAL split_interval_right (), split_interval_left (); -extern INLINE INTERVAL find_interval (); -extern INTERVAL next_interval (), previous_interval (); -extern INTERVAL merge_interval_left (), merge_interval_right (); -extern void delete_interval (); -extern INLINE void offset_intervals (); -extern void graft_intervals_into_buffer (); -extern void set_point (); -extern INLINE void temp_set_point (); -extern void verify_interval_modification (); -extern INTERVAL balance_intervals (); -extern INLINE void copy_intervals_to_string (); -extern INTERVAL copy_intervals (); -extern Lisp_Object textget (); -extern Lisp_Object get_local_map (); -extern INTERVAL update_interval (); +extern INTERVAL create_root_interval P_ ((Lisp_Object)); +extern void copy_properties P_ ((INTERVAL, INTERVAL)); +extern int intervals_equal P_ ((INTERVAL, INTERVAL)); +extern void traverse_intervals P_ ((INTERVAL, int, int, + void (*) (INTERVAL, Lisp_Object), + Lisp_Object)); +extern INTERVAL split_interval_right P_ ((INTERVAL, int)); +extern INTERVAL split_interval_left P_ ((INTERVAL, int)); +extern INTERVAL find_interval P_ ((INTERVAL, int)); +extern INTERVAL next_interval P_ ((INTERVAL)); +extern INTERVAL previous_interval P_ ((INTERVAL)); +extern INTERVAL merge_interval_left P_ ((INTERVAL)); +extern INTERVAL merge_interval_right P_ ((INTERVAL)); +extern void delete_interval P_ ((INTERVAL)); +extern INLINE void offset_intervals P_ ((struct buffer *, int, int)); +extern void graft_intervals_into_buffer P_ ((INTERVAL, int, int, + struct buffer *, int)); +extern void set_point P_ ((int, struct buffer *)); +extern INLINE void temp_set_point P_ ((int, struct buffer *)); +extern void verify_interval_modification P_ ((struct buffer *, int, int)); +extern INTERVAL balance_intervals P_ ((INTERVAL)); +extern INLINE void copy_intervals_to_string P_ ((Lisp_Object, struct buffer *, + int, int)); +extern INTERVAL copy_intervals P_ ((INTERVAL, int, int)); +extern Lisp_Object textget P_ ((Lisp_Object, Lisp_Object)); +extern void move_if_not_intangible P_ ((int)); +extern Lisp_Object get_local_map P_ ((int, struct buffer *)); +extern INTERVAL update_interval P_ ((INTERVAL, int)); + +/* Defined in xdisp.c */ +extern int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object)); /* Declared in textprop.c */ diff --git a/src/keyboard.h b/src/keyboard.h index 325ff4565ce..73aec908e2c 100644 --- a/src/keyboard.h +++ b/src/keyboard.h @@ -249,11 +249,42 @@ extern Lisp_Object Qscroll_bar_movement; /* Symbols to use for non-text mouse positions. */ extern Lisp_Object Qmode_line, Qvertical_line; -extern Lisp_Object get_keymap_1 (); -extern Lisp_Object Fkeymapp (); -extern Lisp_Object reorder_modifiers (); -extern Lisp_Object read_char (); +/* Forward declaration for prototypes. */ +struct input_event; + +extern Lisp_Object get_keymap_1 P_ ((Lisp_Object, int, int)); +EXFUN (Fkeymapp, 1); +extern Lisp_Object reorder_modifiers P_ ((Lisp_Object)); +extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *)); /* User-supplied string to translate input characters through. */ extern Lisp_Object Vkeyboard_translate_table; -extern Lisp_Object map_prompt (); +extern Lisp_Object map_prompt P_ ((Lisp_Object)); + +extern void echo_now P_ ((void)); +extern void init_kboard P_ ((KBOARD *)); +extern void delete_kboard P_ ((KBOARD *)); +extern void single_kboard_state P_ ((void)); +extern void push_frame_kboard P_ ((struct frame *)); +extern void pop_frame_kboard P_ ((void)); +extern void record_asynch_buffer_change P_ ((void)); +extern void clear_waiting_for_input P_ ((void)); +extern SIGTYPE input_poll_signal P_ ((int)); +extern void start_polling P_ ((void)); +extern void stop_polling P_ ((void)); +extern void set_poll_suppress_count P_ ((int)); +extern void gobble_input P_ ((int)); +extern int input_polling_used P_ ((void)); +extern void clear_input_pending P_ ((void)); +extern int requeued_events_pending_p P_ ((void)); +extern void bind_polling_period P_ ((int)); +extern void stuff_buffered_input P_ ((Lisp_Object)); +extern void clear_waiting_for_input P_ ((void)); +extern void swallow_events P_ ((int)); +extern int help_char_p P_ ((Lisp_Object)); +extern void quit_throw_to_read_char P_ ((void)); +extern void cmd_error_internal P_ ((Lisp_Object, char *)); +extern void timer_start_idle P_ ((void)); +extern void timer_stop_idle P_ ((void)); +extern int lucid_event_type_list_p P_ ((Lisp_Object)); +extern void kbd_buffer_store_event P_ ((struct input_event *)); |