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/termhooks.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/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index b49a7bc706..77f98938ed 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -18,7 +18,9 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ - +#ifndef EMACS_TERMHOOKS_H +#define EMACS_TERMHOOKS_H + /* Miscellanea. */ #include "systime.h" /* for Time */ @@ -28,10 +30,6 @@ INLINE_HEADER_BEGIN # define TERMHOOKS_INLINE INLINE #endif -struct glyph; -struct frame; - - enum scroll_bar_part { scroll_bar_above_handle, scroll_bar_handle, @@ -49,7 +47,18 @@ enum scroll_bar_part { may do something OS dependent, like extended window manager hints on X11. */ extern void (*fullscreen_hook) (struct frame *f); - +/* Output method of a terminal (and frames on this terminal, respectively). */ + +enum output_method +{ + output_initial, + output_termcap, + output_x_window, + output_msdos_raw, + output_w32, + output_ns +}; + /* Input queue declarations and hooks. */ enum event_kind @@ -321,11 +330,6 @@ extern void term_mouse_moveto (int, int); extern struct tty_display_info *gpm_tty; #endif - -struct ns_display_info; -struct x_display_info; -struct w32_display_info; - /* Terminal-local parameters. */ struct terminal { @@ -660,3 +664,5 @@ extern void close_gpm (int gpm_fd); #endif INLINE_HEADER_END + +#endif /* EMACS_TERMHOOKS_H */ |