X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.h;h=818dcc760ea3e1deee9ef4e2013787a31e8e6833;hb=6cf3357036561134383198cc8b853abb3fe5a982;hp=18c97ede30a5be215ad74931bc9fe542567ea845;hpb=ad812e6299223efb0cb4faee03ce99870e5c7ce5;p=chaz%2Fopenbox

diff --git a/openbox/config.h b/openbox/config.h
index 18c97ede..818dcc76 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -26,8 +26,8 @@
 #include "client.h"
 #include "geom.h"
 #include "moveresize.h"
-#include "render/render.h"
-#include "obt/parse.h"
+#include "obrender/render.h"
+#include "obt/xml.h"
 
 #include <glib.h>
 
@@ -38,6 +38,7 @@ struct _ObAppSettings
     GPatternSpec *class;
     GPatternSpec *name;
     GPatternSpec *role;
+    GPatternSpec *title;
     ObClientType  type;
 
     GravityPoint position;
@@ -152,8 +153,10 @@ extern RrFont *config_font_inactivewindow;
 extern RrFont *config_font_menutitle;
 /*! The font for menu items */
 extern RrFont *config_font_menuitem;
-/*! The font for on-screen-displays/popups */
-extern RrFont *config_font_osd;
+/*! The font for on-screen-displays/popups' active text */
+extern RrFont *config_font_activeosd;
+/*! The font for on-screen-displays/popups' inactive text */
+extern RrFont *config_font_inactiveosd;
 
 /*! The number of desktops */
 extern guint config_desktops_num;
@@ -189,16 +192,18 @@ extern guint    config_menu_hide_delay;
 extern gboolean config_menu_middle;
 /*! Delay before opening a submenu in milliseconds */
 extern guint    config_submenu_show_delay;
-/*! Show icons in client_list_menu */
-extern gboolean config_menu_client_list_icons;
+/*! Delay before closing a submenu in milliseconds */
+extern guint    config_submenu_hide_delay;
 /*! Show manage desktops in client_list_menu */
 extern gboolean config_menu_manage_desktops;
+/*! Load & show icons in user-defined menus */
+extern gboolean config_menu_show_icons;
 /*! User-specified menu files */
 extern GSList *config_menu_files;
 /*! Per app settings */
 extern GSList *config_per_app_settings;
 
-void config_startup(ObtParseInst *i);
+void config_startup(ObtXmlInst *i);
 void config_shutdown(void);
 
 /*! Create an ObAppSettings structure with the default values */