summaryrefslogtreecommitdiff
path: root/otk
diff options
context:
space:
mode:
Diffstat (limited to 'otk')
-rw-r--r--otk/property.cc2
-rw-r--r--otk/property.hh2
-rw-r--r--otk/renderstyle.cc4
3 files changed, 6 insertions, 2 deletions
diff --git a/otk/property.cc b/otk/property.cc
index b12ff503..a0404f68 100644
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -134,6 +134,8 @@ void Property::initialize()
create("_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR");
atoms.kde_net_wm_window_type_override =
create("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
+
+ atoms.openbox_premax = create("_OPENBOX_PREMAX");
}
void Property::set(Window win, Atom atom, Atom type, unsigned char* data,
diff --git a/otk/property.hh b/otk/property.hh
index 9ff30887..e38bb23a 100644
--- a/otk/property.hh
+++ b/otk/property.hh
@@ -123,6 +123,8 @@ struct Atoms {
Atom kde_net_system_tray_windows;
Atom kde_net_wm_system_tray_window_for;
Atom kde_net_wm_window_type_override;
+
+ Atom openbox_premax;
};
diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc
index 8afb1141..330870c6 100644
--- a/otk/renderstyle.cc
+++ b/otk/renderstyle.cc
@@ -15,8 +15,8 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile)
_file(stylefile)
{
// pick one..
-#define FIERON
-//#define MERRY
+//#define FIERON
+#define MERRY
#ifdef FIERON
_root_color = new RenderColor(_screen, 0x272a2f);