all my changes while i was offline.

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 3d82090ba391f39e3198ee6afd463960e0ae4867..081561cb05d322c98874f94bb9b5b49f8af9342c 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -3,55 +3,27 @@
 
 #include <glib.h>
 
-typedef enum {
-    Config_String,
-    Config_Integer,
-    Config_Bool
-} ConfigValueType;
+/*! Should new windows be focused */
+extern gboolean config_focus_new;
+/*! Focus windows when the mouse enters them */
+extern gboolean config_focus_follow;
+/*! Focus the last focused window as a fallback */
+extern gboolean config_focus_last;
+/*! Focus the last focused window as a fallback when switching desktops */
+extern gboolean config_focus_last_on_desktop;
+/*! Show a popup dialog while cycling focus */
+extern gboolean config_focus_popup;
+
+/* The name of the theme */
+char *config_theme;
+
+/*! The number of desktops */
+extern int config_desktops_num;
+/*! Names for the desktops */
+extern GSList *config_desktops_names;
 
-typedef union {
-    char *string;
-    int integer;
-    gboolean bool;
-} ConfigValue;
-
-typedef struct {
-    char *name;
-    ConfigValueType type;
-    ConfigValue value;
-} ConfigEntry;
-
-typedef struct {
-    char *name;
-    char *descriptive_name; /* user friendly name */
-    char *long_description; /* text description of option */
-    ConfigValueType type;
-    /* if it is a string type optionally provide a list of valid strings */
-    gboolean hasList;
-    GSList *values;
-} ConfigDefEntry;
 
 void config_startup();
 void config_shutdown();
 
-/* Set a config variable's value. The variable must have already been defined
-   with a call to config_def_set */
-gboolean config_set(char *name, ConfigValueType type, ConfigValue value);
-
-/* Get a config variable's value. Returns FALSE if the value has not been
-   set. */
-gboolean config_get(char *name, ConfigValueType type, ConfigValue *value);
-
-/* Create a new config definition to add to the config system */
-ConfigDefEntry *config_def_new(char *name, ConfigValueType type,
-                               char *descriptive_name, char *long_description);
-
-/* Add a value to a String type config definition */
-gboolean config_def_add_value(ConfigDefEntry *entry, char *value);
-
-/* Sets up the definition in the config system, Don't free or touch the entry
-   after setting it with this. It is invalidated even if the function returns
-   FALSE. */
-gboolean config_def_set(ConfigDefEntry *entry);
-
 #endif