Mercurial > emacs

comparison src/xterm.h @ 109555:05e7e7c46ff0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use const, move declarations to header files. * src/buffer.c (Fset_buffer_multibyte): Remove local extern declaration. * src/character.c (strwidth, parse_str_to_multibyte): Add const. * src/character.h (strwidth, parse_str_to_multibyte): Likewise. * src/charset.c (add_to_log): Remove declaration. * src/composite.c (syms_of_composite): Remove local extern declarations. * src/data.c (Finteractive_form): Use const. * src/dired.c (scmp): Add const. (directory_files_internal): Remove local extern declaration. * src/dispextern.h (add_to_log): Remove declaration. (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_frame_get_and_record_arg, x_default_parameter): Add const. * src/dispnew.c: Remove duplicate #include <unistd.h>. (update_window, update_frame_1, init_display): Remove local extern declarations. * src/editfns.c (region_limit, syms_of_editfns): Remove local extern declarations. * src/emacs.c (main): Remove local extern declaration. * src/font.c (Qnormal, QCtype, QCfamily, QCweight, QCslant, QCwidth) (QCheight, QCsize, QCname): Remove declarations. * src/frame.c (x_get_resource_string, x_get_string_resource) (x_get_arg, x_frame_get_arg, x_frame_get_and_record_arg) (x_default_parameter): Use const. * src/image.c (QCwidth, QCheight, QCforeground, QCbackground, QCfile) (QCdata, QCtype, Qcenter): Remove declarations. * src/keyboard.h (do_mouse_tracking): Add declaration. * src/minibuf.c (Qmouse_face): Remove declaration. * src/msdos.c (IT_note_mouse_highlight): Remove local extern declaration. * src/xdisp.c (do_mouse_tracking): Remove declaration. (add_to_log): Use const. * src/xfaces.c (Qmouse_face): Remove declaration. (face_color_gray_p, tty_defined_color, defined_color) (face_color_gray_p, face_color_supported_p). Add const. * src/xfns.c: Include xlwmenu.h when USE_LUCID. (x_defined_color, xic_set_xfontset): Use const. (Fx_hide_tip): Remove local extern declaration. * src/xselect.c (selection_data_to_lisp_data) (x_property_data_to_lisp): * src/xrdb.c (x_get_string_resource, file_p) (x_get_customization_string, magic_file_p, search_magic_path) (get_system_app, get_user_app, x_load_resources, x_get_resource) (x_get_string_resource): Use const. * src/xterm.c (xlwmenu_window_p, xlwmenu_redisplay): Remove declarations. (x_text_icon, x_check_errors, x_connection_closed): Use const. * src/xterm.h (x_get_customization_string, x_load_resources) (x_get_resource, x_text_icon, x_text_icon, x_check_errors) (x_check_errors, x_property_data_to_lisp, defined_color) (xic_set_xfontset, x_defined_color): Use const.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 26 Jul 2010 20:52:35 -0700
parents 051595eb9b58
children 228a5fa4eda0
comparison
equal deleted inserted replaced
109554:b22b609d1fa7 109555:05e7e7c46ff0
934 EXFUN (Fx_display_grayscale_p, 1); 934 EXFUN (Fx_display_grayscale_p, 1);
935 extern void x_free_gcs (struct frame *); 935 extern void x_free_gcs (struct frame *);
936 936
937 /* From xrdb.c. */ 937 /* From xrdb.c. */
938 938
939 char *x_get_customization_string (XrmDatabase, char *, char *); 939 char *x_get_customization_string (XrmDatabase, const char *, const char *);
940 XrmDatabase x_load_resources (Display *, char *, char *, char *); 940 XrmDatabase x_load_resources (Display *, const char *, const char *,
941 int x_get_resource (XrmDatabase, char *, char *, 941 const char *);
942 int x_get_resource (XrmDatabase, const char *, const char *,
942 XrmRepresentation, XrmValue *); 943 XrmRepresentation, XrmValue *);
943 void x_delete_display (struct x_display_info *); 944 void x_delete_display (struct x_display_info *);
944 void x_make_frame_visible (struct frame *); 945 void x_make_frame_visible (struct frame *);
945 void x_iconify_frame (struct frame *); 946 void x_iconify_frame (struct frame *);
946 void x_wm_set_size_hint (struct frame *, long, int); 947 void x_wm_set_size_hint (struct frame *, long, int);
947 int x_text_icon (struct frame *, char *); 948 int x_text_icon (struct frame *, const char *);
948 int x_bitmap_icon (struct frame *, Lisp_Object); 949 int x_bitmap_icon (struct frame *, Lisp_Object);
949 void x_set_window_size (struct frame *, int, int, int); 950 void x_set_window_size (struct frame *, int, int, int);
950 void x_wm_set_window_state (struct frame *, int); 951 void x_wm_set_window_state (struct frame *, int);
951 int x_alloc_nearest_color (struct frame *, Colormap, XColor *); 952 int x_alloc_nearest_color (struct frame *, Colormap, XColor *);
952 953
953 /* Defined in xterm.c */ 954 /* Defined in xterm.c */
954 955
955 extern void cancel_mouse_face (struct frame *); 956 extern void cancel_mouse_face (struct frame *);
956 extern void x_scroll_bar_clear (struct frame *); 957 extern void x_scroll_bar_clear (struct frame *);
957 extern int x_text_icon (struct frame *, char *); 958 extern int x_text_icon (struct frame *, const char *);
958 extern int x_bitmap_icon (struct frame *, Lisp_Object); 959 extern int x_bitmap_icon (struct frame *, Lisp_Object);
959 extern void x_catch_errors (Display *); 960 extern void x_catch_errors (Display *);
960 extern void x_check_errors (Display *, char *); 961 extern void x_check_errors (Display *, const char *);
961 extern int x_had_errors_p (Display *); 962 extern int x_had_errors_p (Display *);
962 extern int x_catching_errors (void); 963 extern int x_catching_errors (void);
963 extern void x_uncatch_errors (void); 964 extern void x_uncatch_errors (void);
964 extern void x_clear_errors (Display *); 965 extern void x_clear_errors (Display *);
965 extern void x_set_window_size (struct frame *, int, int, int); 966 extern void x_set_window_size (struct frame *, int, int, int);
1016 extern void x_fill_property_data (Display *, 1017 extern void x_fill_property_data (Display *,
1017 Lisp_Object, 1018 Lisp_Object,
1018 void *, 1019 void *,
1019 int); 1020 int);
1020 extern Lisp_Object x_property_data_to_lisp (struct frame *, 1021 extern Lisp_Object x_property_data_to_lisp (struct frame *,
1021 unsigned char *, 1022 const unsigned char *,
1022 Atom, 1023 Atom,
1023 int, 1024 int,
1024 unsigned long); 1025 unsigned long);
1025 1026
1026 /* Defined in xfns.c */ 1027 /* Defined in xfns.c */
1031 extern int xg_set_icon (struct frame *, Lisp_Object); 1032 extern int xg_set_icon (struct frame *, Lisp_Object);
1032 extern int xg_set_icon_from_xpm_data (struct frame *, char**); 1033 extern int xg_set_icon_from_xpm_data (struct frame *, char**);
1033 #endif /* USE_GTK */ 1034 #endif /* USE_GTK */
1034 1035
1035 extern void x_real_positions (struct frame *, int *, int *); 1036 extern void x_real_positions (struct frame *, int *, int *);
1036 extern int defined_color (struct frame *, char *, XColor *, int); 1037 extern int defined_color (struct frame *, const char *, XColor *, int);
1037 extern void x_set_border_pixel (struct frame *, int); 1038 extern void x_set_border_pixel (struct frame *, int);
1038 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); 1039 extern void x_set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
1039 extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object); 1040 extern void x_implicitly_set_name (struct frame *, Lisp_Object, Lisp_Object);
1040 extern void xic_free_xfontset (struct frame *); 1041 extern void xic_free_xfontset (struct frame *);
1041 extern void create_frame_xic (struct frame *); 1042 extern void create_frame_xic (struct frame *);
1042 extern void destroy_frame_xic (struct frame *); 1043 extern void destroy_frame_xic (struct frame *);
1043 extern void xic_set_preeditarea (struct window *, int, int); 1044 extern void xic_set_preeditarea (struct window *, int, int);
1044 extern void xic_set_statusarea (struct frame *); 1045 extern void xic_set_statusarea (struct frame *);
1045 extern void xic_set_xfontset (struct frame *, char *); 1046 extern void xic_set_xfontset (struct frame *, const char *);
1046 extern int x_pixel_width (struct frame *); 1047 extern int x_pixel_width (struct frame *);
1047 extern int x_pixel_height (struct frame *); 1048 extern int x_pixel_height (struct frame *);
1048 extern int x_char_width (struct frame *); 1049 extern int x_char_width (struct frame *);
1049 extern int x_char_height (struct frame *); 1050 extern int x_char_height (struct frame *);
1050 extern int x_screen_planes (struct frame *); 1051 extern int x_screen_planes (struct frame *);
1051 extern void x_sync (struct frame *); 1052 extern void x_sync (struct frame *);
1052 extern int x_defined_color (struct frame *, char *, XColor *, int); 1053 extern int x_defined_color (struct frame *, const char *, XColor *, int);
1053 #ifdef HAVE_X_I18N 1054 #ifdef HAVE_X_I18N
1054 extern void free_frame_xic (struct frame *); 1055 extern void free_frame_xic (struct frame *);
1055 #endif 1056 #endif
1056 extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object); 1057 extern void x_set_tool_bar_lines (struct frame *, Lisp_Object, Lisp_Object);
1057 1058