diff options
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 105 |
1 files changed, 58 insertions, 47 deletions
diff --git a/src/frame.h b/src/frame.h index 8f5e47c40a5..e66fd9341c7 100644 --- a/src/frame.h +++ b/src/frame.h @@ -191,6 +191,10 @@ struct frame /* Desired and current tool-bar items. */ Lisp_Object tool_bar_items; + /* Where tool bar is, can be left, right, top or bottom. The native + tool bar only supports top. */ + Lisp_Object tool_bar_position; + /* Desired and current contents displayed in tool_bar_window. */ Lisp_Object desired_tool_bar_string, current_tool_bar_string; @@ -823,24 +827,25 @@ typedef struct frame *FRAME_PTR; extern Lisp_Object Qframep, Qframe_live_p; extern Lisp_Object Qtty, Qtty_type; +extern Lisp_Object Qtty_color_mode; extern Lisp_Object Qterminal, Qterminal_live_p; extern Lisp_Object Qnoelisp; extern struct frame *last_nonminibuf_frame; -extern struct frame *make_initial_frame P_ ((void)); -extern struct frame *make_terminal_frame P_ ((struct terminal *)); -extern struct frame *make_frame P_ ((int)); +extern struct frame *make_initial_frame (void); +extern struct frame *make_terminal_frame (struct terminal *); +extern struct frame *make_frame (int); #ifdef HAVE_WINDOW_SYSTEM -extern struct frame *make_minibuffer_frame P_ ((void)); -extern struct frame *make_frame_without_minibuffer P_ ((Lisp_Object, - struct kboard *, - Lisp_Object)); +extern struct frame *make_minibuffer_frame (void); +extern struct frame *make_frame_without_minibuffer (Lisp_Object, + struct kboard *, + Lisp_Object); #endif /* HAVE_WINDOW_SYSTEM */ -extern int other_visible_frames P_ ((struct frame *)); -extern void frame_make_pointer_invisible P_ ((void)); -extern void frame_make_pointer_visible P_ ((void)); -extern Lisp_Object delete_frame P_ ((Lisp_Object, Lisp_Object)); +extern int other_visible_frames (struct frame *); +extern void frame_make_pointer_invisible (void); +extern void frame_make_pointer_visible (void); +extern Lisp_Object delete_frame (Lisp_Object, Lisp_Object); extern Lisp_Object Vframe_list; extern Lisp_Object Vdefault_frame_alist; @@ -1044,7 +1049,8 @@ extern Lisp_Object Qfont; extern Lisp_Object Qbackground_color, Qforeground_color; extern Lisp_Object Qicon, Qicon_name, Qicon_type, Qicon_left, Qicon_top; extern Lisp_Object Qinternal_border_width; -extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines; +extern Lisp_Object Qtooltip; +extern Lisp_Object Qmenu_bar_lines, Qtool_bar_lines, Qtool_bar_position; extern Lisp_Object Qmouse_color; extern Lisp_Object Qname, Qtitle; extern Lisp_Object Qparent_id; @@ -1063,7 +1069,6 @@ extern Lisp_Object Qalpha; extern Lisp_Object Qleft_fringe, Qright_fringe; extern Lisp_Object Qheight, Qwidth; extern Lisp_Object Qminibuffer, Qmodeline; -extern Lisp_Object Qonly; extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; extern Lisp_Object Qvisible; extern Lisp_Object Qdisplay_type; @@ -1071,9 +1076,11 @@ extern Lisp_Object Qbackground_mode; extern Lisp_Object Qx_resource_name; -extern Lisp_Object Qleft, Qright, Qtop, Qbox; +extern Lisp_Object Qleft, Qright, Qtop, Qbox, Qbottom; extern Lisp_Object Qdisplay; +extern Lisp_Object Qrun_hook_with_args; + #ifdef HAVE_WINDOW_SYSTEM /* The class of this X application. */ @@ -1081,52 +1088,53 @@ extern Lisp_Object Qdisplay; /* These are in xterm.c, w32term.c, etc. */ -extern void x_set_scroll_bar_default_width P_ ((struct frame *)); -extern void x_set_offset P_ ((struct frame *, int, int, int)); -extern void x_wm_set_icon_position P_ ((struct frame *, int, int)); +extern void x_set_scroll_bar_default_width (struct frame *); +extern void x_set_offset (struct frame *, int, int, int); +extern void x_wm_set_icon_position (struct frame *, int, int); -extern Lisp_Object x_new_font P_ ((struct frame *, Lisp_Object, int)); +extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); /* These are in frame.c */ extern Lisp_Object Vx_resource_name; extern Lisp_Object Vx_resource_class; +extern Lisp_Object Vmenu_bar_mode, Vtool_bar_mode; extern Lisp_Object Qface_set_after_frame_default; -extern void x_fullscreen_adjust P_ ((struct frame *f, int *, int *, - int *, int *)); - -extern void x_set_frame_parameters P_ ((struct frame *, Lisp_Object)); -extern void x_report_frame_params P_ ((struct frame *, Lisp_Object *)); - -extern void x_set_fullscreen P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_line_spacing P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_screen_gamma P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_font P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_font_backend P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_fringe_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_border_width P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_internal_border_width P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -extern void x_set_visibility P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_autoraise P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_autolower P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_unsplittable P_ ((struct frame *, Lisp_Object, Lisp_Object)); -extern void x_set_vertical_scroll_bars P_ ((struct frame *, Lisp_Object, - Lisp_Object)); -extern void x_set_scroll_bar_width P_ ((struct frame *, Lisp_Object, - Lisp_Object)); - -extern Lisp_Object x_icon_type P_ ((struct frame *)); - -extern int x_figure_window_size P_ ((struct frame *, Lisp_Object, int)); +extern void x_fullscreen_adjust (struct frame *f, int *, int *, + int *, int *); + +extern void x_set_frame_parameters (struct frame *, Lisp_Object); +extern void x_report_frame_params (struct frame *, Lisp_Object *); + +extern void x_set_fullscreen (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_line_spacing (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_screen_gamma (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_font (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_font_backend (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_fringe_width (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_border_width (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_internal_border_width (struct frame *, Lisp_Object, + Lisp_Object); +extern void x_set_visibility (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_autoraise (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_autolower (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_unsplittable (struct frame *, Lisp_Object, Lisp_Object); +extern void x_set_vertical_scroll_bars (struct frame *, Lisp_Object, + Lisp_Object); +extern void x_set_scroll_bar_width (struct frame *, Lisp_Object, + Lisp_Object); + +extern Lisp_Object x_icon_type (struct frame *); + +extern int x_figure_window_size (struct frame *, Lisp_Object, int); extern Lisp_Object Vframe_alpha_lower_limit; -extern void x_set_alpha P_ ((struct frame *, Lisp_Object, Lisp_Object)); +extern void x_set_alpha (struct frame *, Lisp_Object, Lisp_Object); -extern void validate_x_resource_name P_ ((void)); +extern void validate_x_resource_name (void); extern Lisp_Object display_x_get_resource (Display_Info *, Lisp_Object attribute, @@ -1134,6 +1142,9 @@ extern Lisp_Object display_x_get_resource (Display_Info *, Lisp_Object component, Lisp_Object subclass); +/* In xmenu.c */ +extern void set_frame_menubar (FRAME_PTR, int, int); + #endif /* HAVE_WINDOW_SYSTEM */ #endif /* not EMACS_FRAME_H */ |