Mercurial > emacs
changeset 30321:1f4d6c2c8a7a
Add some more prototypes.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Wed, 19 Jul 2000 15:47:10 +0000 |
parents | a1f02a10e391 |
children | 6dd0219378f5 |
files | src/xterm.c src/xterm.h |
diffstat | 2 files changed, 30 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Wed Jul 19 15:46:20 2000 +0000 +++ b/src/xterm.c Wed Jul 19 15:47:10 2000 +0000 @@ -101,8 +101,9 @@ #ifdef USE_X_TOOLKIT -extern void free_frame_menubar (); -extern FRAME_PTR x_menubar_window_to_frame (); +extern void free_frame_menubar P_ ((struct frame *)); +extern struct frame *x_menubar_window_to_frame P_ ((struct x_display_info *, + int)); #if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES) #define HACK_EDITRES @@ -384,8 +385,8 @@ static Lisp_Object Qvendor_specific_keysyms; -extern XrmDatabase x_load_resources (); -extern Lisp_Object x_icon_type (); +extern XrmDatabase x_load_resources P_ ((Display *, char *, char *, char *)); +extern Lisp_Object x_icon_type P_ ((struct frame *)); /* Enumeration for overriding/changing the face to use for drawing @@ -474,7 +475,13 @@ static void x_draw_row_bitmaps P_ ((struct window *, struct glyph_row *)); static void note_overwritten_text_cursor P_ ((struct window *, int, int)); static void x_flush P_ ((struct frame *f)); - +static void x_update_begin P_ ((struct frame *)); +static void x_update_window_begin P_ ((struct window *)); +static void x_draw_vertical_border P_ ((struct window *)); +static void x_after_update_window_line P_ ((struct glyph_row *)); +static INLINE void take_vertical_position_into_account P_ ((struct it *)); +static void x_produce_stretch_glyph P_ ((struct it *)); + /* Flush display of frame F, or of all frames if F is null. */
--- a/src/xterm.h Wed Jul 19 15:46:20 2000 +0000 +++ b/src/xterm.h Wed Jul 19 15:47:10 2000 +0000 @@ -106,17 +106,6 @@ | EnterWindowMask \ | VisibilityChangeMask) -/* This checks to make sure we have a display. */ -extern void check_x (); - -extern struct frame *x_window_to_frame (); - -#ifdef USE_X_TOOLKIT -extern struct frame *x_any_window_to_frame (); -extern struct frame *x_non_menubar_window_to_frame (); -extern struct frame *x_top_window_to_frame (); -#endif - enum text_cursor_kinds { NO_CURSOR = -1, @@ -352,6 +341,17 @@ #endif }; +/* This checks to make sure we have a display. */ +extern void check_x P_ ((void)); + +extern struct frame *x_window_to_frame P_ ((struct x_display_info *, int)); + +#ifdef USE_X_TOOLKIT +extern struct frame *x_any_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_non_menubar_window_to_frame P_ ((struct x_display_info *, int)); +extern struct frame *x_top_window_to_frame P_ ((struct x_display_info *, int)); +#endif + /* This is a chain of structures for all the X displays currently in use. */ extern struct x_display_info *x_display_list; @@ -367,15 +367,17 @@ /* A flag to control how to display unibyte 8-bit character. */ extern int unibyte_display_via_language_environment; -struct x_display_info *x_display_info_for_display P_ ((Display *)); -struct x_display_info *x_display_info_for_name (); +extern struct x_display_info *x_display_info_for_display P_ ((Display *)); +extern struct x_display_info *x_display_info_for_name P_ ((Lisp_Object)); -extern struct x_display_info *x_term_init (); +extern struct x_display_info *x_term_init P_ ((Lisp_Object, char *, char *)); extern Lisp_Object x_list_fonts P_ ((struct frame *, Lisp_Object, int, int)); extern void select_visual P_ ((struct x_display_info *)); -extern struct font_info *x_get_font_info(), *x_load_font (), *x_query_font (); -extern void x_find_ccl_program(); +extern struct font_info *x_get_font_info P_ ((struct frame *f, int)); +extern struct font_info *x_load_font P_ ((struct frame *, char *, int)); +extern struct font_info *x_query_font P_ ((struct frame *, char *)); +extern void x_find_ccl_program P_ ((struct font_info *)); /* Each X frame object points to its own struct x_output object in the output_data.x field. The x_output structure contains