Merge branch 'config-refactor'

Merging in the new config system with commands

1 files changed, 7 insertions, 0 deletions

diff --git a/util.h b/util.h
index 666fb40..bdc45d8 100644
--- a/util.h
+++ b/util.h
@@ -2,8 +2,15 @@
 
 #include <vector>
 #include <string>
+#include <X11/Xlib.h>
 
 #define evNames {0, 0, "KeyPress", "KeyRelease", "ButtonPress", "ButtonRelease", "MotionNotify", "EnterNotify", "LeaveNotify", "FocusIn", "FocusOut", "KeymapNotify", "Expose", "GraphicsExpose", "NoExpose", "VisibilityNotify", "CreateNotify", "DestroyNotify", "UnmapNotify", "MapNotify", "MapRequest", "ReparentNotify", "ConfigureNotify", "ConfigureRequest", "GravityNotify", "ResizeRequest", "CirculateNotify", "CirculateRequest", "PropertyNotify", "SelectionClear", "SelectionRequest", "SelectionNotify", "ColormapNotify", "ClientMessage", "MappingNotify", "GenericEvent", "LASTEvent"};
 
 
 std::vector<std::string> split (const std::string &s, char delim);
+
+
+struct Globals {
+	Display*& dpy;
+	Window& root;
+};