X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.h;h=f83976a4a604ad741bcee615ce49b7b9b74172ff;hb=02045b14d62bca513bd81d11ca1ae8623edda105;hp=413ff184408c0e081912e902c906311482a670dc;hpb=c90da6da781932c2d178bfb7e39ec1d5003543b7;p=chaz%2Fopenbox

diff --git a/openbox/config.h b/openbox/config.h
index 413ff184..f83976a4 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -6,6 +6,8 @@
 
 #include <glib.h>
 
+struct _ObParseInst;
+
 /*! Should new windows be focused */
 extern gboolean config_focus_new;
 /*! Focus windows when the mouse enters them */
@@ -14,8 +16,6 @@ extern gboolean config_focus_follow;
 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' contents are refreshed while they are resized; otherwise
@@ -52,13 +52,26 @@ extern int config_desktops_num;
 /*! Names for the desktops */
 extern GSList *config_desktops_names;
 
+/*! The keycode of the key combo which resets the keybaord chains */
+guint config_keyboard_reset_keycode;
+/*! The modifiers of the key combo which resets the keybaord chains */
+guint config_keyboard_reset_state;
+
 /*! Number of pixels a drag must go before being considered a drag */
 extern gint config_mouse_threshold;
 /*! Number of milliseconds within which 2 clicks must occur to be a
   double-click */
 extern gint config_mouse_dclicktime;
 
-void config_startup();
+/*! Number of pixels to resist while crossing another window's edge */
+gint config_resist_win;
+/*! Number of pixels to resist while crossing a screen's edge */
+gint config_resist_edge;
+
+/*! User-specified menu files */
+extern GSList *config_menu_files;
+
+void config_startup(struct _ObParseInst *i);
 void config_shutdown();
 
 #endif