Debug compilation fix

config.mk

@@ -12,13 +12,13 @@ MANPREFIX = ${PREFIX}/share/man
 # grep -r xcb
 
 # fallback
-XCB_INCS_PKG = `pkg-config --cflags --libs xcb xcb-util xcb-aux xcb-xinerama xcb-event xcb-keysyms` 
-XCB_INCS = -Ixcb -Ixcb-util -Ixcb-aux -Ixcb-xinerama -Ixcb-event -Ixcb-keysyms
+XCB_INCS_PKG = `pkg-config --cflags --libs xcb xcb-util xcb-aux xcb-xinerama xcb-event xcb-keysyms xcb-xinput xcb-image`
+XCB_INCS = -Ixcb -Ixcb-util -Ixcb-aux -Ixcb-xinerama -Ixcb-event -Ixcb-keysyms -Ixcb-xinput -Ixcb-image
 TOOLS = -Itools
 INCLUDE_INCS = -Iinclude
 INCS = ${XCB_INCS} ${INCLUDE_INCS} ${TOOLS}
 #-lxcb-util -lxcb-icccm -lxcb-keysyms
-LIBS = ${XCB_INCS_PKG}
+LIBS = ${XCB_INCS_PKG} -lX11
 
 CCVERSION = -std=c99
 XNATIVE = -march=native -mtune=native

include/client.h

@@ -477,7 +477,7 @@ void updatemotifhints(Client *c, XCBWindowProperty *motifprop);
  */
 void updatesizehints(Client *c, XCBSizeHints *size);
 /* Updates Client tile if we find one;
- * if none found default to dwm.h BROKEN
+ * if none found default to main.h BROKEN
  */
 void updatetitle(Client *c, char *netwmname, char *wmname);
 /* Updates Our own window protocol status (dont have to query every time) */

include/keybinds.h

@@ -2,7 +2,7 @@
 #define KEYBINDS_H_
 
 #include "toggle.h"
-#include "dwm.h"
+#include "main.h"
 #include <X11/keysym.h>
 #include <X11/XF86keysym.h> 
 

include/toggle.h

@@ -1,7 +1,7 @@
 #ifndef TOGGLE_H_
 #define TOGGLE_H_
 
-#include "dwm.h"
+#include "main.h"
 
 
 /* Mostly a testing function */
@@ -14,15 +14,15 @@ void KillWindow(const Arg *arg);
 void TerminateWindow(const Arg *arg);
 /* keybind to move the current window where the mouse cursor is */
 void DragWindow(const Arg *arg);
-/* restarts dwm */
+/* restarts wm */
 void Restart(const Arg *arg);
-/* quits dwm */
+/* quits wm */
 void Quit(const Arg *arg);
 /* resizes the current window based on mouse position */
 void ResizeWindow(const Arg *arg);
 /* resizes the current window based on mouse position no restrictions */
 void ResizeWindowAlt(const Arg *arg);
-/* sets the window layout based on a enum in dwm.h -> Grid, Floating, Monocle, Tiled */
+/* sets the window layout based on a enum in main.h -> Grid, Floating, Monocle, Tiled */
 void SetWindowLayout(const Arg *arg);
 /* Sets the size of the master window 0.0 -> 1.0 for the Tiled Layout
  * where 1 is just monocle with extra steps */

src/bar.c

@@ -14,7 +14,7 @@
 #include <string.h>
 
 
-#include "dwm.h"
+#include "main.h"
 extern WM _wm;
 
 #include "bar.h"

src/client.c

@@ -4,7 +4,7 @@
 
 #include "desktop.h"
 
-#include "dwm.h"
+#include "main.h"
 #include "keybinds.h"
 #include "util.h"
 #include "hashing.h"

src/desktop.c

@@ -2,7 +2,7 @@
 #include "client.h"
 #include "monitor.h"
 #include "desktop.h"
-#include "dwm.h"
+#include "main.h"
 
 
 

src/events.c

@@ -3,7 +3,7 @@
 #include "events.h"
 #include "util.h"
 #include "keybinds.h"
-#include "dwm.h"
+#include "main.h"
 #include "monitor.h"
 #include "client.h"
 #include "desktop.h"

src/getprop.c

@@ -9,7 +9,7 @@
 #include "XCB-TRL/xcb_winutil.h"
 #include "queue.h"
 #include "getprop.h"
-#include "dwm.h"
+#include "main.h"
 
 #define QUEUE_SIZE 1024
 /* realistically you wont ever need more than 64 as most of these threads are just waiting for data. */

src/dwm.c → src/main.c

@@ -23,7 +23,7 @@
 #include <X11/keysym.h>
 
 #include "util.h"
-#include "dwm.h"
+#include "main.h"
 #include "hashing.h"
 #include "getprop.h"
 #include "keybinds.h"

src/monitor.c

@@ -3,7 +3,7 @@
 #include <X11/keysym.h>
 #include "monitor.h"
 
-#include "dwm.h"
+#include "main.h"
 
 #include <string.h>
 

src/toggle.c

@@ -16,7 +16,7 @@
 #include "XCB-TRL/xcb_image.h"
 #include "XCB-TRL/xcb_imgutil.h"
 #include "util.h"
-#include "dwm.h"
+#include "main.h"
 #include "toggle.h"
 #include "keybinds.h"