Split monolithic dwm.h into modular headers and group them by it's functionalities

The new plan of refactoring this project is to split entire monolithic codebase into separate, (kind of) independent modules. This will help with understanding the code by turning off modules and deciding which ones require some work.

Signed-off-by: Filip Wandzio <contact@philw.dev>

4 files changed, 182 insertions, 3 deletions

diff --git a/src/core/dwm.c b/src/core/dwm.c
index cd7fdb0..6d4cdcd 100644
--- a/src/core/dwm.c
+++ b/src/core/dwm.c
@@ -851,7 +851,7 @@ Atom getatomprop(Client *c, Atom prop)
         return atom;
 }
 
-unsigned int getsystraywidth()
+unsigned int getsystraywidth(void)
 {
         unsigned int w = 0;
         Client *i;
@@ -1970,7 +1970,7 @@ void updatebarpos(Monitor *m)
                 m->by = -bh;
 }
 
-void updateclientlist()
+void updateclientlist(void)
 {
         Client *c;
         Monitor *m;
diff --git a/src/core/dwm.h b/src/core/dwm.h
index 273645a..d3bdf5a 100644
--- a/src/core/dwm.h
+++ b/src/core/dwm.h
@@ -153,7 +153,7 @@ static void focusin(XEvent *e);
 static Atom getatomprop(Client *c, Atom prop);
 static int getrootptr(int *x, int *y);
 static long getstate(Window w);
-static unsigned int getsystraywidth();
+static unsigned int getsystraywidth(void);
 static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, int focused);
 static void grabkeys(void);
diff --git a/src/core/globals.h b/src/core/globals.h
new file mode 100644
index 0000000..4b800fe
--- /dev/null
+++ b/src/core/globals.h
@@ -0,0 +1,21 @@
+
+#pragma once
+
+#include "types.h"
+
+extern Display *dpy;
+extern Window root, wmcheckwin;
+
+extern Monitor *mons, *selmon;
+
+extern int screen;
+extern int sw, sh;
+extern int bh;
+extern int running;
+extern unsigned int numlockmask;
+
+extern Atom wmatom[WMLast];
+extern Atom netatom[NetLast];
+extern Atom xatom[XLast];
+
+extern Systray *systray;
diff --git a/src/core/types.h b/src/core/types.h
new file mode 100644
index 0000000..dc10fc0
--- /dev/null
+++ b/src/core/types.h
@@ -0,0 +1,158 @@
+
+#pragma once
+
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+#include <sys/types.h>
+
+/* cursors */
+enum { CurNormal, CurResize, CurMove, CurLast };
+
+/* color schemes */
+enum { SchemeNorm, SchemeSel };
+
+/* EWMH atoms */
+enum {
+        NetSupported,
+        NetWMName,
+        NetWMState,
+        NetWMCheck,
+        NetSystemTray,
+        NetSystemTrayOP,
+        NetSystemTrayOrientation,
+        NetSystemTrayOrientationHorz,
+        NetWMFullscreen,
+        NetActiveWindow,
+        NetWMWindowType,
+        NetWMWindowTypeDialog,
+        NetClientList,
+        NetLast
+};
+
+/* XEmbed */
+enum { Manager, Xembed, XembedInfo, XLast };
+
+/* ICCCM */
+enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast };
+
+/* clicks */
+enum {
+        ClkTagBar,
+        ClkLtSymbol,
+        ClkStatusText,
+        ClkWinTitle,
+        ClkClientWin,
+        ClkRootWin,
+        ClkLast
+};
+
+/* generic argument */
+typedef union {
+        int i;
+        unsigned int ui;
+        float f;
+        const void *v;
+} Arg;
+
+/* input */
+typedef struct {
+        unsigned int click;
+        unsigned int mask;
+        unsigned int button;
+        void (*func)(const Arg *arg);
+        const Arg arg;
+} Button;
+
+typedef struct {
+        unsigned int mod;
+        KeySym keysym;
+        void (*func)(const Arg *);
+        const Arg arg;
+} Key;
+
+/* forward decls */
+typedef struct Client Client;
+typedef struct Monitor Monitor;
+
+/* layout */
+typedef struct {
+        const char *symbol;
+        void (*arrange)(Monitor *);
+} Layout;
+
+/* client */
+struct Client {
+        char name[256];
+
+        float mina, maxa;
+        int basew, baseh, incw, inch, maxw, maxh, minw, minh;
+        int hintsvalid;
+
+        int x, y, w, h;
+        int oldx, oldy, oldw, oldh;
+        int bw, oldbw;
+
+        unsigned int tags;
+        int isfixed, isfloating, isurgent, neverfocus;
+        int oldstate, isfullscreen;
+        int isterminal, noswallow;
+
+        pid_t pid;
+
+        Client *next;
+        Client *snext;
+        Client *swallowing;
+
+        Monitor *mon;
+        Window win;
+};
+
+/* monitor */
+struct Monitor {
+        char ltsymbol[16];
+
+        float mfact;
+        int nmaster;
+        int num;
+
+        int mx, my, mw, mh;
+        int wx, wy, ww, wh;
+        int by;
+
+        int gappih, gappiv;
+        int gappoh, gappov;
+
+        unsigned int seltags;
+        unsigned int sellt;
+        unsigned int tagset[2];
+
+        int showbar;
+        int topbar;
+
+        Client *clients;
+        Client *sel;
+        Client *stack;
+
+        Monitor *next;
+        Window barwin;
+
+        const Layout *lt[2];
+};
+
+/* rules */
+typedef struct {
+        const char *class;
+        const char *instance;
+        const char *title;
+        unsigned int tags;
+        int isfloating;
+        int isterminal;
+        int noswallow;
+        int monitor;
+} Rule;
+
+/* systray */
+typedef struct Systray {
+        Window win;
+        Client *icons;
+} Systray;