diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-30 16:17:44 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-08-30 16:17:44 +0400 |
| commit | 9d7693d74c4ec73c01d03d990d552e1480ec2739 (patch) | |
| tree | 9b3862361d8d0ca7ca8456321e8eda3e4ac5c54c /src/frame.h | |
| parent | 112798c18dbbb095a34ace257767ae6f57643468 (diff) | |
Minor cleanup to avoid forward declarations.
* coding.h (struct ccl_spec): Remove forward declaration.
* composite.h (toplevel): Include font.h.
(struct composition_it, struct face, struct font_metrics):
Remove forward declaration.
* dispextern.h (struct image, struct atimer): Likewise.
* emacsgtkfixed.h (struct frame): Likewise.
* emacsgtkfixed.c (toplevel): Reorder headers and drop stdio.h.
* font.h (struct font_driver, struct font, struct glyph_string)
(struct face): Remove forward declaration.
* fontset.h (struct face, struct font): Likewise.
* frame.h (toplevel): Style cleanup.
(enum output_method): Move to...
* termhooks.h (enum output_method): ...here.
(struct glyph, struct frame, struct ns_display_info)
(struct x_display_info, struct w32_display_info):
Remove forward declaration.
* xterm.h (toplevel): Include termhooks.h.
(struct font, struct window, struct glyph_matrix, struct frame)
(struct input_event, struct face, struct image): Remove forward
declaration.
* gtkutil.h (struct _widget_value): Likewise.
* keyboard.h (toplevel): Include termhooks.h.
(struct input_event): Remove forward declaration.
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/src/frame.h b/src/frame.h index 2dcb756252..17b6089120 100644 --- a/src/frame.h +++ b/src/frame.h @@ -24,31 +24,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define EMACS_FRAME_H #include "dispextern.h" +#include "termhooks.h" INLINE_HEADER_BEGIN #ifndef FRAME_INLINE # define FRAME_INLINE INLINE #endif - -/* Miscellanea. */ - -/* Nonzero means there is at least one garbaged frame. */ -extern bool frame_garbaged; - - -/* The structure representing a frame. */ - -enum output_method -{ - output_initial, - output_termcap, - output_x_window, - output_msdos_raw, - output_w32, - output_ns -}; - enum vertical_scroll_bar_type { vertical_scroll_bar_none, @@ -66,10 +48,7 @@ enum fullscreen_type FULLSCREEN_WAIT = 0x100 }; - -#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel) -#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel) - +/* The structure representing a frame. */ struct frame { @@ -884,6 +863,9 @@ default_pixels_per_inch_y (void) #define FRAME_CURSOR_WIDTH(f) ((f)->cursor_width) #define FRAME_BLINK_OFF_CURSOR_WIDTH(f) ((f)->blink_off_cursor_width) +#define FRAME_FOREGROUND_PIXEL(f) ((f)->foreground_pixel) +#define FRAME_BACKGROUND_PIXEL(f) ((f)->background_pixel) + /* Return a pointer to the face cache of frame F. */ #define FRAME_FACE_CACHE(F) (F)->face_cache @@ -950,6 +932,9 @@ extern Lisp_Object Qtty_color_mode; extern Lisp_Object Qterminal; extern Lisp_Object Qnoelisp; +/* Nonzero means there is at least one garbaged frame. */ +extern bool frame_garbaged; + extern struct frame *last_nonminibuf_frame; extern void set_menu_bar_lines (struct frame *, Lisp_Object, Lisp_Object); |