ignore NUM values in enums

[chaz/openbox] / otk / property.cc

diff --git a/otk/property.cc b/otk/property.cc
index a51a2353318f994731d99f443d8f21a854fed1ff..a284c17eed4b42c482711d5c1f64600ba2c90560 100644 (file)
--- a/otk/property.cc
+++ b/otk/property.cc
@@ -1,19 +1,16 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef    HAVE_CONFIG_H
-#  include "../config.h"
-#endif // HAVE_CONFIG_H
+#include "config.h"
 
 #include "property.hh"
 #include "display.hh"
 
 extern "C" {
 #include <X11/Xatom.h>
-
-#include <assert.h>
 }
 
 #include <algorithm>
+#include <cassert>
 
 namespace otk {
 
@@ -64,6 +61,8 @@ void Property::initialize()
   atoms.net_workarea = create("_NET_WORKAREA");
   atoms.net_supporting_wm_check = create("_NET_SUPPORTING_WM_CHECK");
 //  atoms.net_virtual_roots = create("_NET_VIRTUAL_ROOTS");
+  atoms.net_desktop_layout = create("_NET_DESKTOP_LAYOUT");
+  atoms.net_showing_desktop = create("_NET_SHOWING_DESKTOP");
 
   atoms.net_close_window = create("_NET_CLOSE_WINDOW");
   atoms.net_wm_moveresize = create("_NET_WM_MOVERESIZE");
@@ -78,7 +77,7 @@ void Property::initialize()
   atoms.net_wm_state = create("_NET_WM_STATE");
   atoms.net_wm_strut = create("_NET_WM_STRUT");
 //  atoms.net_wm_icon_geometry = create("_NET_WM_ICON_GEOMETRY");
-//  atoms.net_wm_icon = create("_NET_WM_ICON");
+  atoms.net_wm_icon = create("_NET_WM_ICON");
 //  atoms.net_wm_pid = create("_NET_WM_PID");
 //  atoms.net_wm_handled_icons = create("_NET_WM_HANDLED_ICONS");
   atoms.net_wm_allowed_actions = create("_NET_WM_ALLOWED_ACTIONS");
@@ -107,9 +106,12 @@ void Property::initialize()
  
   atoms.net_wm_action_move = create("_NET_WM_ACTION_MOVE");
   atoms.net_wm_action_resize = create("_NET_WM_ACTION_RESIZE");
+  atoms.net_wm_action_minimize = create("_NET_WM_ACTION_MINIMIZE");
   atoms.net_wm_action_shade = create("_NET_WM_ACTION_SHADE");
+  atoms.net_wm_action_stick = create("_NET_WM_ACTION_STICK");
   atoms.net_wm_action_maximize_horz = create("_NET_WM_ACTION_MAXIMIZE_HORZ");
   atoms.net_wm_action_maximize_vert = create("_NET_WM_ACTION_MAXIMIZE_VERT");
+  atoms.net_wm_action_fullscreen = create("_NET_WM_ACTION_FULLSCREEN");
   atoms.net_wm_action_change_desktop =
     create("_NET_WM_ACTION_CHANGE_DESKTOP");
   atoms.net_wm_action_close = create("_NET_WM_ACTION_CLOSE");
@@ -126,11 +128,24 @@ void Property::initialize()
   atoms.net_wm_state_above = create("_NET_WM_STATE_ABOVE");
   atoms.net_wm_state_below = create("_NET_WM_STATE_BELOW");
   
+  atoms.net_wm_state_add = 1;
+  atoms.net_wm_state_remove = 0;
+  atoms.net_wm_state_toggle = 2;
+
   atoms.kde_net_system_tray_windows = create("_KDE_NET_SYSTEM_TRAY_WINDOWS");
   atoms.kde_net_wm_system_tray_window_for =
     create("_KDE_NET_WM_SYSTEM_TRAY_WINDOW_FOR");
   atoms.kde_net_wm_window_type_override =
     create("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
+
+  atoms.kwm_win_icon = create("KWM_WIN_ICON");
+  
+  atoms.rootpmapid = create("_XROOTPMAP_ID");
+  atoms.esetrootid = create("ESETROOT_PMAP_ID");
+
+  atoms.openbox_premax = create("_OPENBOX_PREMAX");
+  atoms.openbox_active_window = create("_OPENBOX_ACTIVE_WINDOW");
+  atoms.openbox_restack_window = create("_OPENBOX_RESTACK_WINDOW");
 }
 
 void Property::set(Window win, Atom atom, Atom type, unsigned char* data,