prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 45ef015dad2576be2e3aa20436abfacdf31017d9..79f8432c0c498ec69521d6ce760f1ddd7ff21477 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -1,54 +1,59 @@
 #ifndef __config_h
 #define __config_h
 
+#include "misc.h"
+#include "stacking.h"
+
 #include <glib.h>
 
-typedef enum {
-    Config_String,
-    Config_Integer
-} ConfigValueType;
-
-typedef union {
-    char *string;
-    int integer;
-} ConfigValue;
-
-typedef struct {
-    char *name;
-    ConfigValueType type;
-    ConfigValue value;
-} ConfigEntry;
-
-typedef struct {
-    char *name;
-    ConfigValueType type;
-    /* if it is a string type optionally provide a list of valid strings */
-    gboolean hasList;
-    GSList *values;
-} ConfigDefEntry;
+/*! 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 number of slits to create 
+  extern int config_slit_number;*/
+/*! When true windows are moved opaquely, when false just an outline is shown
+  while they are moved */
+extern gboolean config_opaque_move;
+/*! When true windows are resize opaquely, when false just an outline is shown
+  while they are resize */
+extern gboolean config_opaque_resize;
+
+/*! The stacking layer the dock will reside in */
+extern ObStackingLayer config_dock_layer;
+/*! Is the dock floating */
+extern gboolean config_dock_floating;
+/*! Where to place the dock if not floating */
+extern ObDirection config_dock_pos;
+/*! If config_dock_floating, this is the top-left corner's
+  position */
+extern gint config_dock_x;
+/*! If config_dock_floating, this is the top-left corner's
+  position */
+extern gint config_dock_y;
+/*! Whether the dock places the dockapps in it horizontally or vertically */
+extern ObOrientation config_dock_orient;
+/*! Whether to auto-hide the dock when the pointer is not over it */
+extern gboolean config_dock_hide;
+/*! The number of milliseconds to wait before hiding the dock */
+extern guint config_dock_hide_timeout;
+
+/* 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;
+
 
 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);
-
-/* 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);
-
-void config_parse();
-
 #endif