feat: Refactor dwm.c for modularity, add dwm.h header file, switch compiler to tcc

Refactored dwm.c to improve code organization and maintainability

Added dwm.h header file for better modularity and to define common declarations

Changed the compiler to TCC for faster compilation during development.

Signed-off-by: philw <dscr@duck.com>

1 files changed, 144 insertions, 428 deletions

diff --git a/src/core/dwm.c b/src/core/dwm.c
index 6082987..d3782cb 100644
--- a/src/core/dwm.c
+++ b/src/core/dwm.c
@@ -51,6 +51,8 @@
 #include "../util/util.h"
 #include <X11/XF86keysym.h>
 
+#include "dwm.h"
+
 /* macros */
 #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
 #define CLEANMASK(mask)                                                        \
@@ -81,292 +83,6 @@
 #define VERSION_MINOR 0
 #define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
 
-/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { SchemeNorm, SchemeSel };                  /* color schemes */
-enum {
-  NetSupported,
-  NetWMName,
-  NetWMState,
-  NetWMCheck,
-  NetSystemTray,
-  NetSystemTrayOP,
-  NetSystemTrayOrientation,
-  NetSystemTrayOrientationHorz,
-  NetWMFullscreen,
-  NetActiveWindow,
-  NetWMWindowType,
-  NetWMWindowTypeDialog,
-  NetClientList,
-  NetLast
-}; /* EWMH atoms */
-enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */
-enum {
-  WMProtocols,
-  WMDelete,
-  WMState,
-  WMTakeFocus,
-  WMLast
-}; /* default atoms */
-enum {
-  ClkTagBar,
-  ClkLtSymbol,
-  ClkStatusText,
-  ClkWinTitle,
-  ClkClientWin,
-  ClkRootWin,
-  ClkLast
-}; /* clicks */
-
-typedef union {
-  int i;
-  unsigned int ui;
-  float f;
-  const void *v;
-} Arg;
-
-typedef struct {
-  unsigned int click;
-  unsigned int mask;
-  unsigned int button;
-  void (*func)(const Arg *arg);
-  const Arg arg;
-} Button;
-
-typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
-  char name[256];
-  float mina, maxa;
-  int x, y, w, h;
-  int oldx, oldy, oldw, oldh;
-  int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
-  int bw, oldbw;
-  unsigned int tags;
-  int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen,
-      isterminal, noswallow;
-  pid_t pid;
-  Client *next;
-  Client *snext;
-  Client *swallowing;
-  Monitor *mon;
-  Window win;
-};
-
-typedef struct {
-  unsigned int mod;
-  KeySym keysym;
-  void (*func)(const Arg *);
-  const Arg arg;
-} Key;
-
-typedef struct {
-  const char *symbol;
-  void (*arrange)(Monitor *);
-} Layout;
-
-struct Monitor {
-  char ltsymbol[16];
-  float mfact;
-  int nmaster;
-  int num;
-  int by;             /* bar geometry */
-  int mx, my, mw, mh; /* screen size */
-  int wx, wy, ww, wh; /* window area  */
-  int gappih;         /* horizontal gap between windows */
-  int gappiv;         /* vertical gap between windows */
-  int gappoh;         /* horizontal outer gaps */
-  int gappov;         /* vertical outer gaps */
-  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];
-};
-
-typedef struct {
-  const char *class;
-  const char *instance;
-  const char *title;
-  unsigned int tags;
-  int isfloating;
-  int isterminal;
-  int noswallow;
-  int monitor;
-} Rule;
-
-typedef struct Systray Systray;
-struct Systray {
-  Window win;
-  Client *icons;
-};
-
-/* function declarations */
-static void applyrules(Client *c);
-static int applysizehints(Client *c, int *x, int *y, int *w, int *h,
-                          int interact);
-static void arrange(Monitor *m);
-static void arrangemon(Monitor *m);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void buttonpress(XEvent *e);
-static void checkotherwm(void);
-static void cleanup(void);
-static void cleanupmon(Monitor *mon);
-static void clientmessage(XEvent *e);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static Monitor *createmon(void);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static Monitor *dirtomon(int dir);
-static void drawbar(Monitor *m);
-static void drawbars(void);
-static void enternotify(XEvent *e);
-static void expose(XEvent *e);
-static void focus(Client *c);
-static void focusin(XEvent *e);
-static void focusmon(const Arg *arg);
-static void focusstack(const Arg *arg);
-static Atom getatomprop(Client *c, Atom prop);
-static int getrootptr(int *x, int *y);
-static long getstate(Window w);
-static unsigned int getsystraywidth();
-static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, int focused);
-static void grabkeys(void);
-static void incnmaster(const Arg *arg);
-static void keypress(XEvent *e);
-static void killclient(const Arg *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void monocle(Monitor *m);
-static void motionnotify(XEvent *e);
-static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
-static void pop(Client *c);
-static void propertynotify(XEvent *e);
-static void quit(const Arg *arg);
-static Monitor *recttomon(int x, int y, int w, int h);
-static void removesystrayicon(Client *i);
-static void resize(Client *c, int x, int y, int w, int h, int interact);
-static void resizebarwin(Monitor *m);
-static void resizeclient(Client *c, int x, int y, int w, int h);
-static void resizemouse(const Arg *arg);
-static void resizerequest(XEvent *e);
-static void restack(Monitor *m);
-static void run(void);
-static void scan(void);
-static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2,
-                     long d3, long d4);
-static void sendmon(Client *c, Monitor *m);
-static void setclientstate(Client *c, long state);
-static void setfocus(Client *c);
-static void setfullscreen(Client *c, int fullscreen);
-static void setgaps(int oh, int ov, int ih, int iv);
-static void incrgaps(const Arg *arg);
-static void incrigaps(const Arg *arg);
-static void incrogaps(const Arg *arg);
-static void incrohgaps(const Arg *arg);
-static void incrovgaps(const Arg *arg);
-static void incrihgaps(const Arg *arg);
-static void incrivgaps(const Arg *arg);
-static void togglegaps(const Arg *arg);
-static void defaultgaps(const Arg *arg);
-static void setlayout(const Arg *arg);
-static void setmfact(const Arg *arg);
-static void setup(void);
-static void seturgent(Client *c, int urg);
-static void showhide(Client *c);
-static void spawn(const Arg *arg);
-static Monitor *systraytomon(Monitor *m);
-static void tag(const Arg *arg);
-static void tagmon(const Arg *arg);
-static void tile(Monitor *m);
-static void togglebar(const Arg *arg);
-static void togglefloating(const Arg *arg);
-static void togglefullscr(const Arg *arg);
-static void toggletag(const Arg *arg);
-static void toggleview(const Arg *arg);
-static void unfocus(Client *c, int setfocus);
-static void unmanage(Client *c, int destroyed);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(Monitor *m);
-static void updatebars(void);
-static void updateclientlist(void);
-static int updategeom(void);
-static void updatenumlockmask(void);
-static void updatesystray(void);
-static void updatesystrayicongeom(Client *i, int w, int h);
-static void updatesystrayiconstate(Client *i, XPropertyEvent *ev);
-static void updatesizehints(Client *c);
-static void updatestatus(void);
-static void updatetitle(Client *c);
-static void updatewindowtype(Client *c);
-static void updatewmhints(Client *c);
-static void view(const Arg *arg);
-static Client *wintoclient(Window w);
-static Monitor *wintomon(Window w);
-static Client *wintosystrayicon(Window w);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dpy, XErrorEvent *ee);
-static int xerrorstart(Display *dpy, XErrorEvent *ee);
-static void zoom(const Arg *arg);
-
-static pid_t getparentprocess(pid_t p);
-static int isdescprocess(pid_t p, pid_t c);
-static Client *swallowingclient(Window w);
-static Client *termforwin(const Client *c);
-static pid_t winpid(Window w);
-
-/* variables */
-static Systray *systray = NULL;
-static const char broken[] = "broken";
-static char stext[256];
-static int screen;
-static int sw, sh;         /* X display screen geometry width, height */
-static int bh;             /* bar height */
-static int enablegaps = 1; /* enables gaps, used by togglegaps */
-static int lrpad;          /* sum of left and right padding for text */
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent])(XEvent *) = {
-    [ButtonPress] = buttonpress,
-    [ClientMessage] = clientmessage,
-    [ConfigureRequest] = configurerequest,
-    [ConfigureNotify] = configurenotify,
-    [DestroyNotify] = destroynotify,
-    [EnterNotify] = enternotify,
-    [Expose] = expose,
-    [FocusIn] = focusin,
-    [KeyPress] = keypress,
-    [MappingNotify] = mappingnotify,
-    [MapRequest] = maprequest,
-    [MotionNotify] = motionnotify,
-    [PropertyNotify] = propertynotify,
-    [ResizeRequest] = resizerequest,
-    [UnmapNotify] = unmapnotify};
-
-static Atom wmatom[WMLast], netatom[NetLast], xatom[XLast];
-static int running = 1;
-static Cur *cursor[CurLast];
-static Clr **scheme;
-static Display *dpy;
-static Drw *drw;
-static Monitor *mons, *selmon;
-static Window root, wmcheckwin;
-
-static xcb_connection_t *xcon;
-
 /* configuration, allows nested code to access above variables */
 #include "../config/config.h"
 
@@ -882,20 +598,20 @@ void detachstack(Client *c) {
   }
 }
 
-Monitor *dirtomon(int dir) {
-  Monitor *m = NULL;
-
-  if (dir > 0) {
-    if (!(m = selmon->next))
-      m = mons;
-  } else if (selmon == mons)
-    for (m = mons; m->next; m = m->next)
-      ;
-  else
-    for (m = mons; m->next != selmon; m = m->next)
-      ;
-  return m;
-}
+// Monitor *dirtomon(int dir) {
+//   Monitor *m = NULL;
+//
+//   if (dir > 0) {
+//     if (!(m = selmon->next))
+//       m = mons;
+//   } else if (selmon == mons)
+//     for (m = mons; m->next; m = m->next)
+//       ;
+//   else
+//     for (m = mons; m->next != selmon; m = m->next)
+//       ;
+//   return m;
+// }
 
 void drawbar(Monitor *m) {
   int x, w, tw = 0, stw = 0;
@@ -1024,43 +740,43 @@ void focusin(XEvent *e) {
     setfocus(selmon->sel);
 }
 
-void focusmon(const Arg *arg) {
-  Monitor *m;
-
-  if (!mons->next)
-    return;
-  if ((m = dirtomon(arg->i)) == selmon)
-    return;
-  unfocus(selmon->sel, 0);
-  selmon = m;
-  focus(NULL);
-}
-
-void focusstack(const Arg *arg) {
-  Client *c = NULL, *i;
-
-  if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
-    return;
-  if (arg->i > 0) {
-    for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next)
-      ;
-    if (!c)
-      for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next)
-        ;
-  } else {
-    for (i = selmon->clients; i != selmon->sel; i = i->next)
-      if (ISVISIBLE(i))
-        c = i;
-    if (!c)
-      for (; i; i = i->next)
-        if (ISVISIBLE(i))
-          c = i;
-  }
-  if (c) {
-    focus(c);
-    restack(selmon);
-  }
-}
+// void focusmon(const Arg *arg) {
+//   Monitor *m;
+//
+//   if (!mons->next)
+//     return;
+//   if ((m = dirtomon(arg->i)) == selmon)
+//     return;
+//   unfocus(selmon->sel, 0);
+//   selmon = m;
+//   focus(NULL);
+// }
+
+// void focusstack(const Arg *arg) {
+//   Client *c = NULL, *i;
+//
+//   if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
+//     return;
+//   if (arg->i > 0) {
+//     for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next)
+//       ;
+//     if (!c)
+//       for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next)
+//         ;
+//   } else {
+//     for (i = selmon->clients; i != selmon->sel; i = i->next)
+//       if (ISVISIBLE(i))
+//         c = i;
+//     if (!c)
+//       for (; i; i = i->next)
+//         if (ISVISIBLE(i))
+//           c = i;
+//   }
+//   if (c) {
+//     focus(c);
+//     restack(selmon);
+//   }
+// }
 
 Atom getatomprop(Client *c, Atom prop) {
   int di;
@@ -1185,10 +901,10 @@ void grabkeys(void) {
   }
 }
 
-void incnmaster(const Arg *arg) {
-  selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-  arrange(selmon);
-}
+// void incnmaster(const Arg *arg) {
+//   selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
+//   arrange(selmon);
+// }
 
 #ifdef XINERAMA
 static int isuniquegeom(XineramaScreenInfo *unique, size_t n,
@@ -1321,18 +1037,18 @@ void maprequest(XEvent *e) {
     manage(ev->window, &wa);
 }
 
-void monocle(Monitor *m) {
-  unsigned int n = 0;
-  Client *c;
-
-  for (c = m->clients; c; c = c->next)
-    if (ISVISIBLE(c))
-      n++;
-  if (n > 0) /* override layout symbol */
-    snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-  for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-    resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
-}
+// void monocle(Monitor *m) {
+//   unsigned int n = 0;
+//   Client *c;
+//
+//   for (c = m->clients; c; c = c->next)
+//     if (ISVISIBLE(c))
+//       n++;
+//   if (n > 0) /* override layout symbol */
+//     snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+//   for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
+//     resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
+// }
 
 void motionnotify(XEvent *e) {
   static Monitor *mon = NULL;
@@ -1742,64 +1458,64 @@ void setfullscreen(Client *c, int fullscreen) {
   }
 }
 
-void setgaps(int oh, int ov, int ih, int iv) {
-  if (oh < 0)
-    oh = 0;
-  if (ov < 0)
-    ov = 0;
-  if (ih < 0)
-    ih = 0;
-  if (iv < 0)
-    iv = 0;
-
-  selmon->gappoh = oh;
-  selmon->gappov = ov;
-  selmon->gappih = ih;
-  selmon->gappiv = iv;
-  arrange(selmon);
-}
-
-void togglegaps(const Arg *arg) {
-  enablegaps = !enablegaps;
-  arrange(selmon);
-}
-
-void defaultgaps(const Arg *arg) { setgaps(gappoh, gappov, gappih, gappiv); }
-
-void incrgaps(const Arg *arg) {
-  setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
-          selmon->gappih + arg->i, selmon->gappiv + arg->i);
-}
-
-void incrigaps(const Arg *arg) {
-  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
-          selmon->gappiv + arg->i);
-}
-
-void incrogaps(const Arg *arg) {
-  setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
-          selmon->gappiv);
-}
-
-void incrohgaps(const Arg *arg) {
-  setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
-          selmon->gappiv);
-}
-
-void incrovgaps(const Arg *arg) {
-  setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
-          selmon->gappiv);
-}
-
-void incrihgaps(const Arg *arg) {
-  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
-          selmon->gappiv);
-}
-
-void incrivgaps(const Arg *arg) {
-  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
-          selmon->gappiv + arg->i);
-}
+// void setgaps(int oh, int ov, int ih, int iv) {
+//   if (oh < 0)
+//     oh = 0;
+//   if (ov < 0)
+//     ov = 0;
+//   if (ih < 0)
+//     ih = 0;
+//   if (iv < 0)
+//     iv = 0;
+//
+//   selmon->gappoh = oh;
+//   selmon->gappov = ov;
+//   selmon->gappih = ih;
+//   selmon->gappiv = iv;
+//   arrange(selmon);
+// }
+
+// void togglegaps(const Arg *arg) {
+//   enablegaps = !enablegaps;
+//   arrange(selmon);
+// }
+
+// void defaultgaps(const Arg *arg) { setgaps(gappoh, gappov, gappih, gappiv); }
+//
+// void incrgaps(const Arg *arg) {
+//   setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
+//           selmon->gappih + arg->i, selmon->gappiv + arg->i);
+// }
+//
+// void incrigaps(const Arg *arg) {
+//   setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
+//           selmon->gappiv + arg->i);
+// }
+//
+// void incrogaps(const Arg *arg) {
+//   setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
+//           selmon->gappiv);
+// }
+
+// void incrohgaps(const Arg *arg) {
+//   setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
+//           selmon->gappiv);
+// }
+//
+// void incrovgaps(const Arg *arg) {
+//   setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
+//           selmon->gappiv);
+// }
+//
+// void incrihgaps(const Arg *arg) {
+//   setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
+//           selmon->gappiv);
+// }
+//
+// void incrivgaps(const Arg *arg) {
+//   setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
+//           selmon->gappiv + arg->i);
+// }
 
 void setlayout(const Arg *arg) {
   if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
@@ -1814,18 +1530,18 @@ void setlayout(const Arg *arg) {
     drawbar(selmon);
 }
 
-/* arg > 1.0 will set mfact absolutely */
-void setmfact(const Arg *arg) {
-  float f;
-
-  if (!arg || !selmon->lt[selmon->sellt]->arrange)
-    return;
-  f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-  if (f < 0.05 || f > 0.95)
-    return;
-  selmon->mfact = f;
-  arrange(selmon);
-}
+// /* arg > 1.0 will set mfact absolutely */
+// void setmfact(const Arg *arg) {
+//   float f;
+//
+//   if (!arg || !selmon->lt[selmon->sellt]->arrange)
+//     return;
+//   f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+//   if (f < 0.05 || f > 0.95)
+//     return;
+//   selmon->mfact = f;
+//   arrange(selmon);
+// }
 
 void setup(void) {
   int i;
@@ -1972,11 +1688,11 @@ void tag(const Arg *arg) {
   }
 }
 
-void tagmon(const Arg *arg) {
-  if (!selmon->sel || !mons->next)
-    return;
-  sendmon(selmon->sel, dirtomon(arg->i));
-}
+// void tagmon(const Arg *arg) {
+//   if (!selmon->sel || !mons->next)
+//     return;
+//   sendmon(selmon->sel, dirtomon(arg->i));
+// }
 
 void tile(Monitor *m) {
   unsigned int i, n, h, r, oe = enablegaps, ie = enablegaps, mw, my, ty;