Merge branch 'master' into laggy-move-resize

1 files changed, 20 insertions, 11 deletions

diff --git a/include/rootston/config.h b/include/rootston/config.h
index 75c04619..71ee61c7 100644
--- a/include/rootston/config.h
+++ b/include/rootston/config.h
@@ -2,12 +2,12 @@
 #define _ROOTSTON_CONFIG_H
 #include <wlr/types/wlr_output_layout.h>
 #include <wlr/types/wlr_input_device.h>
-#include <wlr/types/wlr_cursor.h>
 
-struct output_config {
+struct roots_output_config {
 	char *name;
 	enum wl_output_transform transform;
 	int x, y;
+	int scale;
 	struct wl_list link;
 	struct {
 		int width, height;
@@ -15,14 +15,15 @@ struct output_config {
 	} mode;
 };
 
-struct device_config {
+struct roots_device_config {
 	char *name;
 	char *mapped_output;
 	struct wlr_box *mapped_box;
+	char *seat;
 	struct wl_list link;
 };
 
-struct binding_config {
+struct roots_binding_config {
 	uint32_t modifiers;
 	xkb_keysym_t *keysyms;
 	size_t keysyms_len;
@@ -30,7 +31,7 @@ struct binding_config {
 	struct wl_list link;
 };
 
-struct keyboard_config {
+struct roots_keyboard_config {
 	char *name;
 	uint32_t meta_key;
 	char *rules;
@@ -43,7 +44,7 @@ struct keyboard_config {
 
 struct roots_config {
 	bool xwayland;
-	// TODO: Multiple cursors, multiseat
+
 	struct {
 		char *mapped_output;
 		struct wlr_box *mapped_box;
@@ -57,29 +58,37 @@ struct roots_config {
 	char *startup_cmd;
 };
 
-struct roots_config *parse_args(int argc, char *argv[]);
+/**
+ * Create a roots config from the given command line arguments. Command line
+ * arguments can specify the location of the config file. If it is not
+ * specified, the default location will be used.
+ */
+struct roots_config *roots_config_create_from_args(int argc, char *argv[]);
 
+/**
+ * Destroy the config and free its resources.
+ */
 void roots_config_destroy(struct roots_config *config);
 
 /**
  * Get configuration for the output. If the output is not configured, returns
  * NULL.
  */
-struct output_config *config_get_output(struct roots_config *config,
+struct roots_output_config *roots_config_get_output(struct roots_config *config,
 	struct wlr_output *output);
 
 /**
  * Get configuration for the device. If the device is not configured, returns
  * NULL.
  */
-struct device_config *config_get_device(struct roots_config *config,
+struct roots_device_config *roots_config_get_device(struct roots_config *config,
 	struct wlr_input_device *device);
 
 /**
  * Get configuration for the keyboard. If the keyboard is not configured,
  * returns NULL. A NULL device returns the default config for keyboards.
  */
-struct keyboard_config *config_get_keyboard(struct roots_config *config,
-	struct wlr_input_device *device);
+struct roots_keyboard_config *roots_config_get_keyboard(
+		struct roots_config *config, struct wlr_input_device *device);
 
 #endif