Move data around, constness, etc.

4 files changed, 21 insertions, 5 deletions

diff --git a/include/helper.h b/include/helper.h
index a4429e8b..909ecb3f 100644
--- a/include/helper.h
+++ b/include/helper.h
@@ -145,4 +145,20 @@ int execute_generator ( char * cmd ) __attribute__( ( nonnull ) );
  * Calls exit (1) when failed.
  */
 void create_pid_file ( const char *pidfile );
+
+/**
+ * @param argc Number of arguments.
+ * @param argv Array of arguments.
+ *
+ * Parse commandline options.
+ */
+void config_parse_cmd_options ( int argc, char ** argv );
+
+/**
+ * Do some input validation, especially the first few could break things.
+ * It is good to catch them beforehand.
+ *
+ * This functions exits the program with 1 when it finds an invalid configuration.
+ */
+void config_sanity_check ( void );
 #endif // __HELPER_H__
diff --git a/include/rofi.h b/include/rofi.h
index 49cc4305..d600cbd5 100644
--- a/include/rofi.h
+++ b/include/rofi.h
@@ -217,7 +217,7 @@ extern Settings config;
  *
  * The error message to show.
  */
-void error_dialog ( char *msg );
+void error_dialog ( const char *msg );
 
 /**
  * @param w The Window to read property from.
diff --git a/include/textbox.h b/include/textbox.h
index 457e629e..a9358dc5 100644
--- a/include/textbox.h
+++ b/include/textbox.h
@@ -47,7 +47,7 @@ textbox* textbox_create ( Window parent,
                           TextboxFlags flags,
                           short x, short y, short w, short h,
                           TextBoxFontType tbft,
-                          char *text );
+                          const char *text );
 /**
  * @param tb  Handle to the textbox
  *
@@ -69,7 +69,7 @@ void textbox_font ( textbox *tb, TextBoxFontType tbft );
  *
  * Set the text to show. Cursor is moved to end (if visible)
  */
-void textbox_text ( textbox *tb, char *text );
+void textbox_text ( textbox *tb, const char *text );
 
 /**
  * @param tb  Handle to the textbox
diff --git a/include/xrmoptions.h b/include/xrmoptions.h
index 3d15b6ed..3b9a3e31 100644
--- a/include/xrmoptions.h
+++ b/include/xrmoptions.h
@@ -7,12 +7,12 @@
  * Parse the rofi related X resource options of the
  * connected X server.
  */
-void parse_xresource_options ( Display *display );
+void config_parse_xresource_options ( Display *display );
 
 /**
  * Free any allocated memory.
  */
-void parse_xresource_free ( void );
+void config_xresource_free ( void );
 
 /**
  * Dump the settings in a Xresources compatible way to