X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fconfig.h;h=6ba88afaaf120b921a6a3e27b2e9575b70cf3db8;hb=3ce8f836749c9f74f6888251f0a7f2ff601830c0;hp=b025413557a76b616d6425b1de03f50f0ce0db02;hpb=e1fd32bcf5a07d8b9ab774d0f690112dec29cc8e;p=chaz%2Fopenbox

diff --git a/openbox/config.h b/openbox/config.h
index b0254135..6ba88afa 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -6,20 +6,15 @@
 
 #include <glib.h>
 
+struct _ObParseInst;
+
 /*! 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;
-/*! Show a popup dialog while cycling desktops */
-extern gboolean config_desktop_popup;
-/*! The number of slits to create 
-  extern int config_slit_number;*/
+/*! Timeout for focusing windows on focus follows mouse, in microseconds */
+extern guint    config_focus_delay;
+
 /*! When true windows' contents are refreshed while they are resized; otherwise
   they are not updated until the resize is complete */
 extern gboolean config_redraw_resize;
@@ -40,27 +35,40 @@ extern gint config_dock_y;
 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 */
+/*! The number of microseconds to wait before hiding the dock */
 extern guint config_dock_hide_timeout;
 
 /* The name of the theme */
-char *config_theme;
+extern char *config_theme;
 
 /* Titlebar button layout */
-gchar *config_title_layout;
+extern gchar *config_title_layout;
 
 /*! The number of desktops */
 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 */
+extern guint config_keyboard_reset_keycode;
+/*! The modifiers of the key combo which resets the keybaord chains */
+extern 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 */
+extern gint config_resist_win;
+/*! Number of pixels to resist while crossing a screen's edge */
+extern gint config_resist_edge;
+
+/*! User-specified menu files */
+extern GSList *config_menu_files;
+
+void config_startup(struct _ObParseInst *i);
 void config_shutdown();
 
 #endif