Add .clang-format and clang-format everything

Don't clang-format types.h. It is meant to be a copy of the type definitions in
dwm.c and for some reason dwm.c uses tabs for that.

Also don't format any files not added by the patch to avoid patch compatability
issues.

Author: mihirlad55

.clang-format

@@ -0,0 +1,10 @@
+---
+Language: Cpp
+Standard: Cpp11
+BasedOnStyle: Google
+ColumnLimit: 80
+BreakBeforeBraces: Linux
+IndentWidth: 2
+AlwaysBreakAfterReturnType: AllDefinitions
+AlignEscapedNewlines: Right
+---

IPCClient.c

@@ -1,13 +1,14 @@
-#include <sys/epoll.h>
+#include "IPCClient.h"
+
 #include <string.h>
+#include <sys/epoll.h>
 
-#include "IPCClient.h"
 #include "util.h"
 
-IPCClient*
+IPCClient *
 ipc_client_new(int fd)
 {
-  IPCClient* c = (IPCClient*)malloc(sizeof(IPCClient));
+  IPCClient *c = (IPCClient *)malloc(sizeof(IPCClient));
 
   if (c == NULL) return NULL;
 
@@ -49,15 +50,12 @@ ipc_list_remove_client(IPCClientList *list, IPCClient *c)
   IPCClient *cprev = c->prev;
   IPCClient *cnext = c->next;
 
-  if (cprev != NULL)
-    cprev->next = c->next;
-  if (cnext != NULL)
-    cnext->prev = c->prev;
-  if (c == *list)
-    *list = c->next;
+  if (cprev != NULL) cprev->next = c->next;
+  if (cnext != NULL) cnext->prev = c->prev;
+  if (c == *list) *list = c->next;
 }
 
-IPCClient*
+IPCClient *
 ipc_list_get_client(IPCClientList list, int fd)
 {
   for (IPCClient *c = list; c; c = c->next) {

IPCClient.h

@@ -1,14 +1,14 @@
 #ifndef IPC_CLIENT_H_
 #define IPC_CLIENT_H_
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <sys/epoll.h>
-#include <stdio.h>
 
 typedef struct IPCClient IPCClient;
 /**
- * This structure contains the details of an IPC Client and pointers for a linked
- * list
+ * This structure contains the details of an IPC Client and pointers for a
+ * linked list
  */
 struct IPCClient {
   int fd;
@@ -22,7 +22,7 @@ struct IPCClient {
   IPCClient *prev;
 };
 
-typedef IPCClient* IPCClientList;
+typedef IPCClient *IPCClientList;
 
 /**
  * Allocate memory for new IPCClient with the specified file descriptor and
@@ -32,7 +32,7 @@ typedef IPCClient* IPCClientList;
  *
  * @return Address to allocated IPCClient struct
  */
-IPCClient* ipc_client_new(int fd);
+IPCClient *ipc_client_new(int fd);
 
 /**
  * Add an IPC Client to the specified list
@@ -56,7 +56,6 @@ void ipc_list_remove_client(IPCClientList *list, IPCClient *c);
  * @param list List to remove the client from
  * @param fd File descriptor of the IPCClient
  */
-IPCClient* ipc_list_get_client(IPCClientList list, int fd);
-
-#endif // IPC_CLIENT_H_
+IPCClient *ipc_list_get_client(IPCClientList list, int fd);
 
+#endif  // IPC_CLIENT_H_

dwm-msg.c

@@ -1,20 +1,21 @@
+#include <ctype.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdarg.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
 #include <string.h>
-#include <unistd.h>
-#include <errno.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <unistd.h>
 #include <yajl/yajl_gen.h>
-#include <ctype.h>
-#include <stdarg.h>
 
 #define IPC_MAGIC "DWM-IPC"
-#define IPC_MAGIC_ARR                                                          \
-  { 'D', 'W', 'M', '-', 'I', 'P', 'C' }
-#define IPC_MAGIC_LEN 7 // Not including null char
+// clang-format off
+#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C' }
+// clang-format on
+#define IPC_MAGIC_LEN 7  // Not including null char
 
 #define IPC_EVENT_TAG_CHANGE "tag_change_event"
 #define IPC_EVENT_CLIENT_FOCUS_CHANGE "client_focus_change_event"
@@ -123,8 +124,7 @@ recv_message(uint8_t *msg_type, uint32_t *reply_size, uint8_t **reply)
       free(*reply);
       return -2;
     } else if (n == -1) {
-      if (errno == EINTR || errno == EAGAIN)
-        continue;
+      if (errno == EINTR || errno == EAGAIN) continue;
       free(*reply);
       return -1;
     }
@@ -145,8 +145,7 @@ read_socket(IPCMessageType *msg_type, uint32_t *msg_size, char **msg)
 
     if (ret < 0) {
       // Try again (non-fatal error)
-      if (ret == -1 && (errno == EINTR || errno == EAGAIN))
-        continue;
+      if (ret == -1 && (errno == EINTR || errno == EAGAIN)) continue;
 
       fprintf(stderr, "Error receiving response from socket. ");
       fprintf(stderr, "The connection might have been lost.\n");
@@ -198,10 +197,7 @@ static int
 send_message(IPCMessageType msg_type, uint32_t msg_size, uint8_t *msg)
 {
   dwm_ipc_header_t header = {
-    .magic = IPC_MAGIC_ARR,
-    .size = msg_size,
-    .type = msg_type
-  };
+      .magic = IPC_MAGIC_ARR, .size = msg_size, .type = msg_type};
 
   size_t header_size = sizeof(dwm_ipc_header_t);
   size_t total_size = header_size + msg_size;
@@ -298,6 +294,7 @@ run_command(const char *name, char *args[], int argc)
   //   "command": "<name>",
   //   "args": [ ... ]
   // }
+  // clang-format off
   YMAP(
     YSTR("command"); YSTR(name);
     YSTR("args"); YARR(
@@ -314,6 +311,7 @@ run_command(const char *name, char *args[], int argc)
       }
     )
   )
+  // clang-format on
 
   yajl_gen_get_buf(gen, &msg, &msg_size);
 
@@ -364,9 +362,11 @@ get_dwm_client(Window win)
   // {
   //   "client_window_id": "<win>"
   // }
+  // clang-format off
   YMAP(
     YSTR("client_window_id"); YINT(win);
   )
+  // clang-format on
 
   yajl_gen_get_buf(gen, &msg, &msg_size);
 
@@ -392,10 +392,12 @@ subscribe(const char *event)
   //   "event": "<event>",
   //   "action": "subscribe"
   // }
+  // clang-format off
   YMAP(
     YSTR("event"); YSTR(event);
     YSTR("action"); YSTR("subscribe");
   )
+  // clang-format on
 
   yajl_gen_get_buf(gen, &msg, &msg_size);
 
@@ -409,7 +411,7 @@ subscribe(const char *event)
 }
 
 static void
-usage_error(const char *prog_name, const char* format, ...)
+usage_error(const char *prog_name, const char *format, ...)
 {
   va_list args;
   va_start(args, format);
@@ -440,10 +442,10 @@ print_usage(const char *name)
   puts("  get_dwm_client <window_id>      Get dwm client proprties");
   puts("");
   puts("  subscribe [events...]           Subscribe to specified events");
-  puts("                                  Options: "IPC_EVENT_TAG_CHANGE",");
-  puts("                                  "IPC_EVENT_LAYOUT_CHANGE",");
-  puts("                                  "IPC_EVENT_CLIENT_FOCUS_CHANGE",");
-  puts("                                  "IPC_EVENT_MONITOR_FOCUS_CHANGE);
+  puts("                                  Options: " IPC_EVENT_TAG_CHANGE ",");
+  puts("                                  " IPC_EVENT_LAYOUT_CHANGE ",");
+  puts("                                  " IPC_EVENT_CLIENT_FOCUS_CHANGE ",");
+  puts("                                  " IPC_EVENT_MONITOR_FOCUS_CHANGE);
   puts("");
   puts("  help                            Display this message");
   puts("");
@@ -452,10 +454,9 @@ print_usage(const char *name)
 int
 main(int argc, char *argv[])
 {
-  const char* prog_name = argv[0];
+  const char *prog_name = argv[0];
   // Need at least command argument
-  if (argc < 2)
-    usage_error(prog_name, "Expected an argument, got none");
+  if (argc < 2) usage_error(prog_name, "Expected an argument, got none");
 
   connect_to_socket();
   if (sock_fd == -1) {
@@ -468,8 +469,7 @@ main(int argc, char *argv[])
       print_usage(prog_name);
       return 0;
     } else if (strcmp(argv[i], "run_command") == 0) {
-      if (++i >= argc)
-        usage_error(prog_name, "No command specified");
+      if (++i >= argc) usage_error(prog_name, "No command specified");
       // Command name
       char *command = argv[i];
       // Command arguments are everything after command name
@@ -499,8 +499,7 @@ main(int argc, char *argv[])
       return 0;
     } else if (strcmp(argv[i], "subscribe") == 0) {
       if (++i < argc) {
-        for (int j = i; j < argc; j++)
-          subscribe(argv[j]);
+        for (int j = i; j < argc; j++) subscribe(argv[j]);
       } else
         usage_error(prog_name, "Expected event name");
       // Keep listening for events forever

ipc-client.c

@@ -9,9 +9,10 @@
 #include <unistd.h>
 
 #define IPC_MAGIC "DWM-IPC"
-#define IPC_MAGIC_ARR                                                          \
-  { 'D', 'W', 'M', '-', 'I', 'P', 'C' }
-#define IPC_MAGIC_LEN 7 // Not including null char
+// clang-format off
+#define IPC_MAGIC_ARR { 'D', 'W', 'M', '-', 'I', 'P', 'C' }
+// clang-format on
+#define IPC_MAGIC_LEN 7  // Not including null char
 
 typedef enum IPCMessageType {
   IPC_TYPE_RUN_COMMAND = 0,
@@ -40,9 +41,10 @@ typedef struct dwm_ipc_header {
   uint8_t type;
 } __attribute((packed)) dwm_ipc_header_t;
 
-
-static int ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size,
-                            uint8_t **reply) {
+static int
+ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size,
+                 uint8_t **reply)
+{
   uint32_t read_bytes = 0;
   const int32_t to_read = sizeof(dwm_ipc_header_t);
   char header[to_read];
@@ -103,8 +105,7 @@ static int ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size,
     } else if (n == -1) {
       // TODO: Should we return and wait for another epoll event?
       // This would require saving the partial read in some way.
-      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
-        continue;
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) continue;
       free(*reply);
       return -1;
     }
@@ -115,7 +116,9 @@ static int ipc_recv_message(int fd, uint8_t *msg_type, uint32_t *reply_size,
   return 0;
 }
 
-int main(int argc, char *argv[]) {
+int
+main(int argc, char *argv[])
+{
   struct sockaddr_un addr;
 
   int sock = socket(AF_UNIX, SOCK_STREAM, 0);
@@ -138,16 +141,14 @@ int main(int argc, char *argv[]) {
     "  \"args\": [ 1 ]\n"
     "}";*/
   char *msg =
-    "{\n"
-    "  \"event\": \"layout_change_event\",\n"
-    "  \"action\": \"subscribe\"\n"
-    "}";
+      "{\n"
+      "  \"event\": \"layout_change_event\",\n"
+      "  \"action\": \"subscribe\"\n"
+      "}";
 
-  dwm_ipc_header_t msg_header = {
-    .magic = IPC_MAGIC_ARR,
-    .type = IPC_TYPE_SUBSCRIBE,
-    .size = strlen(msg) + 1
-  };
+  dwm_ipc_header_t msg_header = {.magic = IPC_MAGIC_ARR,
+                                 .type = IPC_TYPE_SUBSCRIBE,
+                                 .size = strlen(msg) + 1};
 
   uint8_t buffer[sizeof(dwm_ipc_header_t) + msg_header.size];
   memcpy(buffer, &msg_header, sizeof(dwm_ipc_header_t));
@@ -167,4 +168,3 @@ int main(int argc, char *argv[]) {
     printf("%s\n", reply);
   }
 }
-