Merge branch 'master' into chaz

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index 1802179d3f6774d67bc96b3a60e00d16bbfb888d..75bbf84180df20fc998bb393e7ccafe2bc411347 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -33,18 +33,13 @@
 
 typedef struct _ObAppSettings ObAppSettings;
 
-typedef enum {
-    OB_APP_SETTINGS_MONITOR_FIXED,
-    OB_APP_SETTINGS_MONITOR_PRIMARY,
-    OB_APP_SETTINGS_MONITOR_ACTIVE,
-    OB_APP_SETTINGS_MONITOR_MOUSE
-} ObAppSettingsMonitor;
-
 struct _ObAppSettings
 {
     GPatternSpec *class;
     GPatternSpec *name;
     GPatternSpec *role;
+    GPatternSpec *group_class;
+    GPatternSpec *group_name;
     GPatternSpec *title;
     ObClientType  type;
 
@@ -52,11 +47,16 @@ struct _ObAppSettings
     gboolean pos_given;
     gboolean pos_force;
 
+    gint width_num;
+    gint width_denom;
+    gint height_num;
+    gint height_denom;
+
     guint desktop;
     gint shade;
     gint decor;
     gint focus;
-    ObAppSettingsMonitor monitor_type;
+    ObPlaceMonitor monitor_type;
     gint monitor;
     gint iconic;
     gint skip_pager;
@@ -64,8 +64,9 @@ struct _ObAppSettings
     gint max_horz;
     gint max_vert;
     gint fullscreen;
-
     gint layer;
+
+    guint8 opacity;
 };
 
 /*! Should new windows be focused */
@@ -152,6 +153,10 @@ extern gchar *config_title_layout;
 extern gboolean config_animate_iconify;
 /*! Size of icons in focus switching dialogs */
 extern guint config_theme_window_list_icon_size;
+/*! Amount of time between flashes (0 to disable flashing) */
+extern guint config_frame_flash_delay;
+/*! How long (ms) to flash the window's frame (0 to flash forever) */
+extern guint config_frame_flash_duration;
 
 /*! The font for the active window's title */
 extern RrFont *config_font_activewindow;