disobedience state monitoring -> separate source file

[disorder] / disobedience / disobedience.h

diff --git a/disobedience/disobedience.h b/disobedience/disobedience.h
index 3998124d1b044a227064e7f9c99d8ad837797d18..6a68b9ae9eda137bf8c49ac5e9b26216e70a5950 100644 (file)
--- a/disobedience/disobedience.h
+++ b/disobedience/disobedience.h
@@ -89,6 +89,8 @@ extern int volume_l, volume_r;          /* current volume */
 extern double goesupto;                 /* volume upper bound */
 extern int choosealpha;                 /* break up choose by letter */
 
+extern const disorder_eclient_log_callbacks log_callbacks;
+
 /* Functions --------------------------------------------------------------- */
 
 disorder_eclient *gtkclient(void);
@@ -111,6 +113,8 @@ GdkPixbuf *find_image(const char *name);
 void popup_error(const char *msg);
 /* Pop up an error message */
 
+void all_update(void);
+/* Update everything */
 
 /* Main menu */
 
@@ -180,11 +184,22 @@ void choose_update(void);
 #define WT(what) static int current##what, max##what
 #define DW(what) (--current##what)
 #else
-#define NW(what) (0)
-#define DW(what) (0)
+#define NW(what) do { } while(0)
+#define DW(what) do { } while(0)
 #define WT(what) struct neverused
 #endif
 
+#if MTRACK
+extern const char *mtag;
+#define MTAG(x) do { mtag = x; } while(0)
+#define MTAG_PUSH(x) do { const char *save_mtag = mtag; mtag = x; (void)0
+#define MTAG_POP() mtag = save_mtag; } while(0)
+#else
+#define MTAG(x) do { } while(0)
+#define MTAG_PUSH(x) do {} while(0)
+#define MTAG_POP() do {} while(0)
+#endif
+
 #endif /* DISOBEDIENCE_H */
 
 /*