From: Paul Eggert Date: Wed, 13 Apr 2011 22:19:27 +0000 (-0700) Subject: * xterm.c: Make symbols static if they're not exported. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~332 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b532497da492ad9fef912bdf41d7f57c6f5bd833;p=emacs.git * xterm.c: Make symbols static if they're not exported. (x_raise_frame, x_lower_frame, x_wm_set_window_state): (x_wm_set_icon_pixmap, x_initialize, XTread_socket_fake_io_error): (x_destroy_window, x_delete_display): Now static. (x_dispatch_event): Now static if ! (USE_MOTIF || USE_X_TOOLKIT). (x_mouse_leave): Remove; unused. * xterm.h (x_display_info_for_name, x_raise_frame, x_lower_frame): (x_destroy_window, x_wm_set_window_state, x_wm_set_icon_pixmap): (x_delete_display, x_initialize, x_set_border_pixel, x_screen_planes): Remove decls. (x_mouse_leave): Declare only if WINDOWSNT. (x_dispatch_event): Declare only if USE_MOTIF or USE_X_TOOLKIT. (xic_create_fontsetname): Declare only if HAVE_X_WINDOWS && USE_X_TOOLKIT. --- diff --git a/src/ChangeLog b/src/ChangeLog index 1498d267775..94712577e87 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,21 @@ +2011-04-13 Paul Eggert + + * xterm.c: Make symbols static if they're not exported. + (x_raise_frame, x_lower_frame, x_wm_set_window_state): + (x_wm_set_icon_pixmap, x_initialize, XTread_socket_fake_io_error): + (x_destroy_window, x_delete_display): + Now static. + (x_dispatch_event): Now static if ! (USE_MOTIF || USE_X_TOOLKIT). + (x_mouse_leave): Remove; unused. + * xterm.h (x_display_info_for_name, x_raise_frame, x_lower_frame): + (x_destroy_window, x_wm_set_window_state, x_wm_set_icon_pixmap): + (x_delete_display, x_initialize, x_set_border_pixel, x_screen_planes): + Remove decls. + (x_mouse_leave): Declare only if WINDOWSNT. + (x_dispatch_event): Declare only if USE_MOTIF or USE_X_TOOLKIT. + (xic_create_fontsetname): Declare only if HAVE_X_WINDOWS && + USE_X_TOOLKIT. + 2011-04-12 Paul Eggert * ftxfont.c: Make symbols static if they're not exported. diff --git a/src/xterm.c b/src/xterm.c index b3e33b7c0bb..bc847388756 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -306,6 +306,8 @@ enum xembed_message static int x_alloc_nearest_color_1 (Display *, Colormap, XColor *); static void x_set_window_size_1 (struct frame *, int, int, int); +static void x_raise_frame (struct frame *); +static void x_lower_frame (struct frame *); static const XColor *x_color_cells (Display *, int *); static void x_update_window_end (struct window *, int, int); @@ -347,9 +349,15 @@ static void x_check_expected_move (struct frame *, int, int); static void x_sync_with_move (struct frame *, int, int, int); static int handle_one_xevent (struct x_display_info *, XEvent *, int *, struct input_event *); +#if ! (defined USE_MOTIF || defined USE_X_TOOLKIT) +static int x_dispatch_event (XEvent *, Display *); +#endif /* Don't declare this NO_RETURN because we want no interference with debugging failing X calls. */ static void x_connection_closed (Display *, const char *); +static void x_wm_set_window_state (struct frame *, int); +static void x_wm_set_icon_pixmap (struct frame *, int); +static void x_initialize (void); /* Flush display of frame F, or of all frames if F is null. */ @@ -3451,14 +3459,6 @@ x_detect_focus_change (struct x_display_info *dpyinfo, XEvent *event, struct inp } -/* Handle an event saying the mouse has moved out of an Emacs frame. */ - -void -x_mouse_leave (struct x_display_info *dpyinfo) -{ - x_new_focus_frame (dpyinfo, dpyinfo->x_focus_event_frame); -} - /* The focus has changed, or we have redirected a frame's focus to another frame (this happens when a frame uses a surrogate mini-buffer frame). Shift the highlight as appropriate. @@ -5659,7 +5659,7 @@ static short temp_buffer[100]; /* Set this to nonzero to fake an "X I/O error" on a particular display. */ -struct x_display_info *XTread_socket_fake_io_error; +static struct x_display_info *XTread_socket_fake_io_error; /* When we find no input here, we occasionally do a no-op command to verify that the X server is still running and we can still talk with it. @@ -6984,6 +6984,9 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, i.e. looping while a popup menu or a dialog is posted. Returns the value handle_one_xevent sets in the finish argument. */ +#if ! (defined USE_MOTIF || defined USE_X_TOOLKIT) +static +#endif int x_dispatch_event (XEvent *event, Display *display) { @@ -8870,7 +8873,7 @@ x_raise_frame (struct frame *f) /* Lower frame F. */ -void +static void x_lower_frame (struct frame *f) { if (f->async_visible) @@ -9432,7 +9435,7 @@ x_free_frame_resources (struct frame *f) /* Destroy the X window of frame F. */ -void +static void x_destroy_window (struct frame *f) { struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); @@ -9556,7 +9559,7 @@ x_wm_set_size_hint (struct frame *f, long flags, int user_position) /* Used for IconicState or NormalState */ -void +static void x_wm_set_window_state (struct frame *f, int state) { #ifdef USE_X_TOOLKIT @@ -9574,7 +9577,7 @@ x_wm_set_window_state (struct frame *f, int state) #endif /* not USE_X_TOOLKIT */ } -void +static void x_wm_set_icon_pixmap (struct frame *f, int pixmap_id) { Pixmap icon_pixmap, icon_mask; @@ -10338,7 +10341,7 @@ x_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name) /* Get rid of display DPYINFO, deleting all frames on it, and without sending any more commands to the X server. */ -void +static void x_delete_display (struct x_display_info *dpyinfo) { struct terminal *t; diff --git a/src/xterm.h b/src/xterm.h index f44c71fab59..5c17e24bf23 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -388,7 +388,6 @@ extern struct x_display_info *x_display_list; extern Lisp_Object x_display_name_list; extern struct x_display_info *x_display_info_for_display (Display *); -extern struct x_display_info *x_display_info_for_name (Lisp_Object); extern void x_set_frame_alpha (struct frame *); extern struct x_display_info *x_term_init (Lisp_Object, char *, char *); @@ -965,19 +964,12 @@ extern void x_set_window_size (struct frame *, int, int, int); extern void x_set_mouse_position (struct frame *, int, int); extern void x_set_mouse_pixel_position (struct frame *, int, int); extern void x_ewmh_activate_frame (struct frame *); -extern void x_raise_frame (struct frame *); -extern void x_lower_frame (struct frame *); extern void x_make_frame_visible (struct frame *); extern void x_make_frame_invisible (struct frame *); extern void x_iconify_frame (struct frame *); extern void x_free_frame_resources (struct frame *); -extern void x_destroy_window (struct frame *); extern void x_wm_set_size_hint (struct frame *, long, int); -extern void x_wm_set_window_state (struct frame *, int); -extern void x_wm_set_icon_pixmap (struct frame *, int); -extern void x_delete_display (struct x_display_info *); extern void x_delete_terminal (struct terminal *terminal); -extern void x_initialize (void); extern unsigned long x_copy_color (struct frame *, unsigned long); #ifdef USE_X_TOOLKIT extern XtAppContext Xt_app_con; @@ -990,9 +982,13 @@ extern int x_alloc_nearest_color (struct frame *, Colormap, XColor *); extern void x_query_colors (struct frame *f, XColor *, int); extern void x_query_color (struct frame *f, XColor *); extern void x_clear_area (Display *, Window, int, int, int, int, int); +#ifdef WINDOWSNT extern void x_mouse_leave (struct x_display_info *); +#endif +#if defined USE_MOTIF || defined USE_X_TOOLKIT extern int x_dispatch_event (XEvent *, Display *); +#endif extern unsigned int x_x_to_emacs_modifiers (struct x_display_info *, unsigned); extern int x_display_pixel_height (struct x_display_info *); @@ -1041,7 +1037,6 @@ extern int xg_set_icon_from_xpm_data (struct frame *, const char**); #endif /* USE_GTK */ extern void x_real_positions (struct frame *, int *, int *); -extern void x_set_border_pixel (struct frame *, int); extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); extern void xic_free_xfontset (struct frame *); @@ -1054,12 +1049,13 @@ extern int x_pixel_width (struct frame *); extern int x_pixel_height (struct frame *); extern int x_char_width (struct frame *); extern int x_char_height (struct frame *); -extern int x_screen_planes (struct frame *); extern void x_sync (struct frame *); extern int x_defined_color (struct frame *, const char *, XColor *, int); #ifdef HAVE_X_I18N extern void free_frame_xic (struct frame *); +# if defined HAVE_X_WINDOWS && defined USE_X_TOOLKIT extern char * xic_create_fontsetname (const char *base_fontname, int motif); +# endif #endif extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);