X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0ff162fccf6ba6f1b8a5f331428091c78c966aa1..535272bb73eff5a5db01301e5b60f6128d6dc788:/src/frame.h diff --git a/src/frame.h b/src/frame.h index 756e121f67..3d2b8208dd 100644 --- a/src/frame.h +++ b/src/frame.h @@ -31,11 +31,6 @@ along with GNU Emacs. If not, see . */ /* Nonzero means there is at least one garbaged frame. */ extern int frame_garbaged; -/* Nonzero means FRAME_MESSAGE_BUF (selected_frame) is being used by - print. */ - -extern int message_buf_print; - /* The structure representing a frame. */ @@ -87,8 +82,7 @@ struct font_driver_list; struct frame { - EMACS_UINT size; - struct Lisp_Vector *next; + struct vectorlike_header header; /* All Lisp_Object components must come first. That ensures they are all aligned normally. */ @@ -198,7 +192,7 @@ struct frame struct face_cache *face_cache; /* Number of elements in `menu_bar_vector' that have meaningful data. */ - EMACS_INT menu_bar_items_used; + int menu_bar_items_used; /* A buffer to hold the frame's name. We can't use the Lisp string's pointer (`name', above) because it might get relocated. */ @@ -264,11 +258,11 @@ struct frame /* Size of this frame, excluding fringes, scroll bars etc., in units of canonical characters. */ - EMACS_INT text_lines, text_cols; + int text_lines, text_cols; /* Total size of this frame (i.e. its native window), in units of canonical characters. */ - EMACS_INT total_lines, total_cols; + int total_lines, total_cols; /* New text height and width for pending size change. 0 if no change pending. */ @@ -328,7 +322,7 @@ struct frame struct x_output *x; /* xterm.h */ struct w32_output *w32; /* w32term.h */ struct ns_output *ns; /* nsterm.h */ - EMACS_INT nothing; + intptr_t nothing; } output_data; @@ -843,7 +837,6 @@ extern struct frame *last_nonminibuf_frame; extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); 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 (void); @@ -851,7 +844,6 @@ extern struct frame *make_frame_without_minibuffer (Lisp_Object, struct kboard *, Lisp_Object); #endif /* HAVE_WINDOW_SYSTEM */ -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); @@ -1047,7 +1039,7 @@ extern Lisp_Object selected_frame; extern Lisp_Object Qauto_raise, Qauto_lower; extern Lisp_Object Qborder_color, Qborder_width; -extern Lisp_Object Qbuffer_predicate, Qbuffer_list, Qburied_buffer_list; +extern Lisp_Object Qbuffer_predicate; extern Lisp_Object Qcursor_color, Qcursor_type; extern Lisp_Object Qfont; extern Lisp_Object Qbackground_color, Qforeground_color; @@ -1076,7 +1068,6 @@ extern Lisp_Object Qminibuffer, Qmodeline; extern Lisp_Object Qx, Qw32, Qmac, Qpc, Qns; extern Lisp_Object Qvisible; extern Lisp_Object Qdisplay_type; -extern Lisp_Object Qbackground_mode; extern Lisp_Object Qx_resource_name; @@ -1101,11 +1092,12 @@ extern Lisp_Object x_new_font (struct frame *, Lisp_Object, int); extern Lisp_Object Qface_set_after_frame_default; +#ifdef WINDOWSNT extern void x_fullscreen_adjust (struct frame *f, int *, int *, int *, int *); +#endif 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);