Add documentation for workspace_get()

[i3/i3] / include / util.h

diff --git a/include/util.h b/include/util.h
index bc2dc5e08b7501bac74d06ac9675c2564bd85837..ed85d5397483ee571bc55f64a25190110ab2a5fe 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -9,12 +9,14 @@
  *
  */
 #include <xcb/xcb.h>
+#include <err.h>
 
 #include "data.h"
 
 #ifndef _UTIL_H
 #define _UTIL_H
 
+#define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
 #define exit_if_null(pointer, ...) { if (pointer == NULL) die(__VA_ARGS__); }
 #define STARTS_WITH(string, needle) (strncasecmp(string, needle, strlen(needle)) == 0)
 #define CIRCLEQ_NEXT_OR_NULL(head, elm, field) (CIRCLEQ_NEXT(elm, field) != CIRCLEQ_END(head) ? \
@@ -50,12 +52,6 @@ int max(int a, int b);
  */
 void slog(char *fmt, ...);
 
-/**
- * Prints the message (see printf()) to stderr, then exits the program.
- *
- */
-void die(char *fmt, ...) __attribute__((__noreturn__));
-
 /**
  * Safe-wrapper around malloc which exits if malloc returns NULL (meaning that
  * there is no more memory available)
@@ -134,27 +130,6 @@ char *convert_utf8_to_ucs2(char *input, int *real_strlen);
 Client *get_last_focused_client(xcb_connection_t *conn, Container *container,
                                 Client *exclude);
 
-/**
- * Unmaps all clients (and stack windows) of the given workspace.
- *
- * This needs to be called separately when temporarily rendering a workspace
- * which is not the active workspace to force reconfiguration of all clients,
- * like in src/xinerama.c when re-assigning a workspace to another screen.
- *
- */
-void unmap_workspace(xcb_connection_t *conn, Workspace *u_ws);
-
-/**
- * Unmaps all clients (and stack windows) of the given workspace.
- *
- * This needs to be called separately when temporarily rendering
- * a workspace which is not the active workspace to force
- * reconfiguration of all clients, like in src/xinerama.c when
- * re-assigning a workspace to another screen.
- *
- */
-void unmap_workspace(xcb_connection_t *conn, Workspace *u_ws);
-
 /**
  * Sets the given client as focused by updating the data structures correctly,
  * updating the X input focus and finally re-decorating both windows (to
@@ -186,4 +161,9 @@ void switch_layout_mode(xcb_connection_t *conn, Container *container, int mode);
 Client *get_matching_client(xcb_connection_t *conn,
                             const char *window_classtitle, Client *specific);
 
+#if defined(__OpenBSD__)
+/* OpenBSD does not provide memmem(), so we provide FreeBSD’s implementation */
+void *memmem(const void *l, size_t l_len, const void *s, size_t s_len);
+#endif
+
 #endif