aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab1997-11-21 15:12:34 +0000
committerAndreas Schwab1997-11-21 15:12:34 +0000
commitd748a3dbdc6351ca3fc773ef54d3ec86321c94ef (patch)
treead542228118922eee20eab5a27e48bb02b775276
parent0c60dfd7b4834041e0205b4bb45b27c7d1a7732a (diff)
downloademacs-d748a3dbdc6351ca3fc773ef54d3ec86321c94ef.tar.gz
emacs-d748a3dbdc6351ca3fc773ef54d3ec86321c94ef.zip
Add prototypes and more function declarations.
-rw-r--r--src/fontset.h37
-rw-r--r--src/intervals.h53
-rw-r--r--src/keyboard.h41
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
170 int n_fontsets; 170 int n_fontsets;
171}; 171};
172 172
173/* Forward declaration for prototypes. */
174struct frame;
175
173/* The following six are window system dependent functions. 176/* The following six are window system dependent functions.
174 Initialization routine of each window system should set appropriate 177 Initialization routine of each window system should set appropriate
175 functions to these variables. For instance, in case of X window, 178 functions to these variables. For instance, in case of X window,
176 x_term_init does this. */ 179 x_term_init does this. */
177 180
178/* Return a pointer to struct font_info of font FONT_IDX of frame F. */ 181/* Return a pointer to struct font_info of font FONT_IDX of frame F. */
179extern struct font_info *(*get_font_info_func) (/* FRAME_PTR f; 182extern struct font_info *(*get_font_info_func) P_ ((struct frame *f,
180 int font_idx */); 183 int font_idx));
181 184
182/* Return a list of font names which matches PATTERN. See the document of 185/* Return a list of font names which matches PATTERN. See the document of
183 `x-list-fonts' for more detail. */ 186 `x-list-fonts' for more detail. */
184extern Lisp_Object (*list_fonts_func) (/* Lisp_Object pattern, face, frame, 187extern Lisp_Object (*list_fonts_func) P_ ((Lisp_Object pattern,
185 width */); 188 Lisp_Object face,
189 Lisp_Object frame,
190 Lisp_Object width));
186 191
187/* Load a font named NAME for frame F and return a pointer to the 192/* Load a font named NAME for frame F and return a pointer to the
188 information of the loaded font. If loading is failed, return -1. */ 193 information of the loaded font. If loading is failed, return -1. */
189extern struct font_info *(*load_font_func) (/* FRAME_PTR f; char *name */); 194extern struct font_info *(*load_font_func) P_ ((struct frame *f,
195 char *name, int));
190 196
191/* Return a pointer to struct font_info of a font named NAME for frame F. 197/* Return a pointer to struct font_info of a font named NAME for frame F.
192 If no such font is loaded, return NULL. */ 198 If no such font is loaded, return NULL. */
193extern struct font_info *(*query_font_func) (/* FRAME_PTR f; char *name */); 199extern struct font_info *(*query_font_func) P_ ((struct frame *f, char *name));
194 200
195/* Additional function for setting fontset or changing fontset 201/* Additional function for setting fontset or changing fontset
196 contents of frame F. This function may change the coordinate of 202 contents of frame F. This function may change the coordinate of
197 the frame. */ 203 the frame. */
198extern void (*set_frame_fontset_func) (/* FRAME_PTR f; Lisp_Object arg, oldval */); 204extern void (*set_frame_fontset_func) P_ ((struct frame *f, Lisp_Object arg,
205 Lisp_Object oldval));
199 206
200/* Check if any window system is used now. */ 207/* Check if any window system is used now. */
201extern void (*check_window_system_func) (); 208extern void (*check_window_system_func) P_ ((void));
202 209
203extern struct fontset_data *alloc_fontset_data (); 210extern struct fontset_data *alloc_fontset_data P_ ((void));
204extern void free_fontset_data (); 211extern void free_fontset_data P_ ((struct fontset_data *));
205extern struct font_info *fs_load_font (); 212extern struct font_info *fs_load_font P_ ((struct frame *, struct font_info *,
206extern Lisp_Object list_fontsets (); 213 int, char *, int));
214extern int fs_query_fontset P_ ((struct frame *, char *));
215extern int fs_register_fontset P_ ((struct frame *, Lisp_Object));
216EXFUN (Fquery_fontset, 1);
217extern Lisp_Object list_fontsets P_ ((struct frame *, Lisp_Object, int));
207extern Lisp_Object Vglobal_fontset_alist; 218extern Lisp_Object Vglobal_fontset_alist;
208 219
209extern Lisp_Object Qfontset; 220extern 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. */
188 188
189/* Declared in alloc.c */ 189/* Declared in alloc.c */
190 190
191extern INTERVAL make_interval (); 191extern INTERVAL make_interval P_ ((void));
192 192
193/* Declared in intervals.c */ 193/* Declared in intervals.c */
194 194
195extern INTERVAL create_root_interval (); 195extern INTERVAL create_root_interval P_ ((Lisp_Object));
196extern void copy_properties (); 196extern void copy_properties P_ ((INTERVAL, INTERVAL));
197extern int intervals_equal (); 197extern int intervals_equal P_ ((INTERVAL, INTERVAL));
198extern void traverse_intervals (); 198extern void traverse_intervals P_ ((INTERVAL, int, int,
199extern INTERVAL split_interval_right (), split_interval_left (); 199 void (*) (INTERVAL, Lisp_Object),
200extern INLINE INTERVAL find_interval (); 200 Lisp_Object));
201extern INTERVAL next_interval (), previous_interval (); 201extern INTERVAL split_interval_right P_ ((INTERVAL, int));
202extern INTERVAL merge_interval_left (), merge_interval_right (); 202extern INTERVAL split_interval_left P_ ((INTERVAL, int));
203extern void delete_interval (); 203extern INTERVAL find_interval P_ ((INTERVAL, int));
204extern INLINE void offset_intervals (); 204extern INTERVAL next_interval P_ ((INTERVAL));
205extern void graft_intervals_into_buffer (); 205extern INTERVAL previous_interval P_ ((INTERVAL));
206extern void set_point (); 206extern INTERVAL merge_interval_left P_ ((INTERVAL));
207extern INLINE void temp_set_point (); 207extern INTERVAL merge_interval_right P_ ((INTERVAL));
208extern void verify_interval_modification (); 208extern void delete_interval P_ ((INTERVAL));
209extern INTERVAL balance_intervals (); 209extern INLINE void offset_intervals P_ ((struct buffer *, int, int));
210extern INLINE void copy_intervals_to_string (); 210extern void graft_intervals_into_buffer P_ ((INTERVAL, int, int,
211extern INTERVAL copy_intervals (); 211 struct buffer *, int));
212extern Lisp_Object textget (); 212extern void set_point P_ ((int, struct buffer *));
213extern Lisp_Object get_local_map (); 213extern INLINE void temp_set_point P_ ((int, struct buffer *));
214extern INTERVAL update_interval (); 214extern void verify_interval_modification P_ ((struct buffer *, int, int));
215extern INTERVAL balance_intervals P_ ((INTERVAL));
216extern INLINE void copy_intervals_to_string P_ ((Lisp_Object, struct buffer *,
217 int, int));
218extern INTERVAL copy_intervals P_ ((INTERVAL, int, int));
219extern Lisp_Object textget P_ ((Lisp_Object, Lisp_Object));
220extern void move_if_not_intangible P_ ((int));
221extern Lisp_Object get_local_map P_ ((int, struct buffer *));
222extern INTERVAL update_interval P_ ((INTERVAL, int));
223
224/* Defined in xdisp.c */
225extern int invisible_ellipsis_p P_ ((Lisp_Object, Lisp_Object));
215 226
216/* Declared in textprop.c */ 227/* Declared in textprop.c */
217 228
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;
249/* Symbols to use for non-text mouse positions. */ 249/* Symbols to use for non-text mouse positions. */
250extern Lisp_Object Qmode_line, Qvertical_line; 250extern Lisp_Object Qmode_line, Qvertical_line;
251 251
252extern Lisp_Object get_keymap_1 (); 252/* Forward declaration for prototypes. */
253extern Lisp_Object Fkeymapp (); 253struct input_event;
254extern Lisp_Object reorder_modifiers (); 254
255extern Lisp_Object read_char (); 255extern Lisp_Object get_keymap_1 P_ ((Lisp_Object, int, int));
256EXFUN (Fkeymapp, 1);
257extern Lisp_Object reorder_modifiers P_ ((Lisp_Object));
258extern Lisp_Object read_char P_ ((int, int, Lisp_Object *, Lisp_Object, int *));
256/* User-supplied string to translate input characters through. */ 259/* User-supplied string to translate input characters through. */
257extern Lisp_Object Vkeyboard_translate_table; 260extern Lisp_Object Vkeyboard_translate_table;
258 261
259extern Lisp_Object map_prompt (); 262extern Lisp_Object map_prompt P_ ((Lisp_Object));
263
264extern void echo_now P_ ((void));
265extern void init_kboard P_ ((KBOARD *));
266extern void delete_kboard P_ ((KBOARD *));
267extern void single_kboard_state P_ ((void));
268extern void push_frame_kboard P_ ((struct frame *));
269extern void pop_frame_kboard P_ ((void));
270extern void record_asynch_buffer_change P_ ((void));
271extern void clear_waiting_for_input P_ ((void));
272extern SIGTYPE input_poll_signal P_ ((int));
273extern void start_polling P_ ((void));
274extern void stop_polling P_ ((void));
275extern void set_poll_suppress_count P_ ((int));
276extern void gobble_input P_ ((int));
277extern int input_polling_used P_ ((void));
278extern void clear_input_pending P_ ((void));
279extern int requeued_events_pending_p P_ ((void));
280extern void bind_polling_period P_ ((int));
281extern void stuff_buffered_input P_ ((Lisp_Object));
282extern void clear_waiting_for_input P_ ((void));
283extern void swallow_events P_ ((int));
284extern int help_char_p P_ ((Lisp_Object));
285extern void quit_throw_to_read_char P_ ((void));
286extern void cmd_error_internal P_ ((Lisp_Object, char *));
287extern void timer_start_idle P_ ((void));
288extern void timer_stop_idle P_ ((void));
289extern int lucid_event_type_list_p P_ ((Lisp_Object));
290extern void kbd_buffer_store_event P_ ((struct input_event *));