Merge branch 'backport' into work

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 1a60ee0f75b8e604d5c23f3027ee337752218cb4..1f4ae326d3e1d0f41670ab9b30bf6605c1a5ddaa 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -23,6 +23,7 @@
 #include "misc.h"
 #include "stacking.h"
 #include "place.h"
+#include "client.h"
 #include "geom.h"
 #include "moveresize.h"
 #include "render/render.h"
@@ -37,9 +38,11 @@ struct _ObAppSettings
     GPatternSpec *class;
     GPatternSpec *name;
     GPatternSpec *role;
+    ObClientType  type;
 
     GravityPoint position;
     gboolean pos_given;
+    gboolean pos_force;
 
     guint desktop;
     gint shade;
@@ -175,8 +178,10 @@ 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 */
+/*! Show icons in client_list_menu */
 extern gboolean config_menu_client_list_icons;
+/*! Show manage desktops in client_list_menu */
+extern gboolean config_menu_manage_desktops;
 /*! User-specified menu files */
 extern GSList *config_menu_files;
 /*! Per app settings */