Merge branch 'master' into chaz

[chaz/openbox] / openbox / config.h

diff --git a/openbox/config.h b/openbox/config.h
index a111a06f5293dc406f4479124b790603fe721fab..c09a1f4f1cfb5335add5a71c4a6cef14eb5a06f6 100644 (file)
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -47,6 +47,12 @@ struct _ObAppSettings
     gboolean pos_given;
     gboolean pos_force;
 
+    gint width_num;
+    gint width_denom;
+    gint height_num;
+    gint height_denom;
+    gboolean size_given;
+
     guint desktop;
     gint shade;
     gint decor;
@@ -59,8 +65,9 @@ struct _ObAppSettings
     gint max_horz;
     gint max_vert;
     gint fullscreen;
-
     gint layer;
+
+    guint8 opacity;
 };
 
 /*! Should new windows be focused */
@@ -145,6 +152,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;