From dbf97387fec55692882cf093ddaf4037ca018da1 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 30 Apr 2016 03:24:45 -0400 Subject: split some more things out of runes.h --- src/config.h | 2 ++ src/display.h | 4 ++++ src/loop.h | 2 ++ src/runes.h | 7 ------- src/term.h | 2 ++ src/util.h | 2 ++ src/window-xlib.h | 1 + 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/config.h b/src/config.h index 58b781b..b718f8b 100644 --- a/src/config.h +++ b/src/config.h @@ -1,6 +1,8 @@ #ifndef _RUNES_CONFIG_H #define _RUNES_CONFIG_H +#include + struct runes_config { cairo_pattern_t *mousecursorcolor; cairo_pattern_t *cursorcolor; diff --git a/src/display.h b/src/display.h index 1491cb9..cbd65e5 100644 --- a/src/display.h +++ b/src/display.h @@ -1,6 +1,10 @@ #ifndef _RUNES_DISPLAY_H #define _RUNES_DISPLAY_H +#include +#include +#include + struct runes_display { cairo_t *cr; PangoLayout *layout; diff --git a/src/loop.h b/src/loop.h index 4f06cd7..215b56c 100644 --- a/src/loop.h +++ b/src/loop.h @@ -1,6 +1,8 @@ #ifndef _RUNES_LOOP_H #define _RUNES_LOOP_H +#include + struct runes_loop { uv_loop_t *loop; }; diff --git a/src/runes.h b/src/runes.h index 5bc91d4..62f4536 100644 --- a/src/runes.h +++ b/src/runes.h @@ -1,11 +1,6 @@ #ifndef _RUNES_H #define _RUNES_H -#include -#include -#include -#include - #define RUNES_READ_BUFFER_LENGTH 4096 struct runes_term; @@ -36,6 +31,4 @@ typedef struct runes_loop_data RunesLoopData; #include "term.h" -#define UNUSED(x) ((void)x) - #endif diff --git a/src/term.h b/src/term.h index 7393b0a..be3ae99 100644 --- a/src/term.h +++ b/src/term.h @@ -1,6 +1,8 @@ #ifndef _RUNES_TERM_H #define _RUNES_TERM_H +#include + struct runes_term { RunesWindowBackend w; RunesPtyBackend pty; diff --git a/src/util.h b/src/util.h index f542261..183f8c5 100644 --- a/src/util.h +++ b/src/util.h @@ -1,6 +1,8 @@ #ifndef _RUNES_UTIL_H #define _RUNES_UTIL_H +#define UNUSED(x) ((void)x) + void runes_warn(const char *fmt, ...); #endif diff --git a/src/window-xlib.h b/src/window-xlib.h index e376f91..5431244 100644 --- a/src/window-xlib.h +++ b/src/window-xlib.h @@ -1,6 +1,7 @@ #ifndef _RUNES_WINDOW_XLIB_H #define _RUNES_XLIB_H +#include #include enum runes_atoms { -- cgit v1.2.3-54-g00ecf