(Fread_file_name): Check type of DEFAULT_FILENAME.

[bpt/emacs.git] / src / xterm.h

diff --git a/src/xterm.h b/src/xterm.h
index 73eae16..b6803aa 100644 (file)
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -311,6 +311,9 @@ extern Lisp_Object x_display_name_list;
 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.  */
 extern Lisp_Object Vx_pixel_size_width_font_regexp;
 
+/* A flag to control how to display unibyte 8-bit character.  */
+extern int unibyte_display_via_language_environment;
+
 extern struct x_display_info *x_display_info_for_display ();
 extern struct x_display_info *x_display_info_for_name ();
 
@@ -318,6 +321,7 @@ extern struct x_display_info *x_term_init ();
 
 extern Lisp_Object x_list_fonts ();
 extern struct font_info *x_get_font_info(), *x_load_font (), *x_query_font ();
+extern void x_find_ccl_program();
 \f
 /* Each X frame object points to its own struct x_output object
    in the output_data.x field.  The x_output structure contains
@@ -507,9 +511,16 @@ struct x_output
 #define FRAME_DEFAULT_FACE(f) ((f)->output_data.x->computed_faces[0])
 #define FRAME_MODE_LINE_FACE(f) ((f)->output_data.x->computed_faces[1])
 
-/* Return the window associated with the frame F.  */
+/* Return the X window used for displaying data in frame F.  */
 #define FRAME_X_WINDOW(f) ((f)->output_data.x->window_desc)
 
+/* Return the outermost X window associated with the frame F.  */
+#ifdef USE_X_TOOLKIT
+#define FRAME_OUTER_WINDOW(f) (XtWindow ((f)->output_data.x->widget))
+#else
+#define FRAME_OUTER_WINDOW(f) (FRAME_X_WINDOW (f))
+#endif
+
 #define FRAME_FOREGROUND_PIXEL(f) ((f)->output_data.x->foreground_pixel)
 #define FRAME_BACKGROUND_PIXEL(f) ((f)->output_data.x->background_pixel)
 #define FRAME_FONT(f) ((f)->output_data.x->font)
@@ -885,4 +896,6 @@ extern int popup_activated P_ ((void));
 extern void initialize_frame_menubar P_ ((struct frame *));
 
 /* Defined in widget.c */
+#ifdef USE_X_TOOLKIT
 extern void widget_store_internal_border P_ ((Widget));
+#endif