summaryrefslogtreecommitdiffstats
path: root/sesman/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'sesman/config.h')
-rw-r--r--sesman/config.h54
1 files changed, 45 insertions, 9 deletions
diff --git a/sesman/config.h b/sesman/config.h
index 4281b287..af7b798f 100644
--- a/sesman/config.h
+++ b/sesman/config.h
@@ -22,19 +22,31 @@
#ifndef CONFIG_H
#define CONFIG_H
-#define SESMAN_CFG_FILE "./sesman.ini"
-#define SESMAN_CFG_GLOBALS "Globals"
-#define SESMAN_CFG_DEFWM "DefaultWindowManager"
-#define SESMAN_CFG_PORT "ListenPort"
-#define SESMAN_CFG_ENABLE_USERWM "EnableUserWindowManager"
-#define SESMAN_CFG_USERWM "UserWindowManager"
-
-struct sesman_config
+#include "arch.h"
+#include "list.h"
+#include "log.h"
+
+#define SESMAN_CFG_FILE "./sesman.ini"
+
+#define SESMAN_CFG_GLOBALS "Globals"
+#define SESMAN_CFG_DEFWM "DefaultWindowManager"
+#define SESMAN_CFG_PORT "ListenPort"
+#define SESMAN_CFG_ENABLE_USERWM "EnableUserWindowManager"
+#define SESMAN_CFG_USERWM "UserWindowManager"
+
+#define SESMAN_CFG_LOGGING "Logging"
+#define SESMAN_CFG_LOG_FILE "LogFile"
+#define SESMAN_CFG_LOG_LEVEL "LogLevel"
+#define SESMAN_CFG_LOG_ENABLE_SYSLOG "EnableSyslog"
+#define SESMAN_CFG_LOG_SYSLOG_LEVEL "SyslogLevel"
+
+struct config_sesman
{
char listen_port[16];
int enable_user_wm;
char default_wm[32];
char user_wm[32];
+ struct log_config log;
};
/**
@@ -47,6 +59,30 @@ struct sesman_config
*
*/
int DEFAULT_CC
-config_read(struct sesman_config* cfg);
+config_read(struct config_sesman* cfg);
+
+/**
+ *
+ * Reads sesman configuration
+ *
+ * @param cfg pointer to configuration object to be replaced
+ *
+ * @return 0 on success, 1 on failure
+ *
+ */
+int DEFAULT_CC
+config_read_globals(int file, struct config_sesman* cf, struct list* param_n, struct list* param_v);
+
+/**
+ *
+ * Reads sesman configuration
+ *
+ * @param cfg pointer to configuration object to be replaced
+ *
+ * @return 0 on success, 1 on failure
+ *
+ */
+int DEFAULT_CC
+config_read_logging(int file, struct log_config* lc, struct list* param_n, struct list* param_v);
#endif