remove the kde frame extents property, add the _NET_FRAME_EXTENTS property in its...

diff --git a/openbox/frame.c b/openbox/frame.c
index 953ed07d1e5c889037a13c7ba249ce2e8708094d..183260e1accfd01ccfe9a66fac18e75baaabeb05 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -474,7 +474,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             vals[1] = self->size.right;
             vals[2] = self->size.top;
             vals[3] = self->size.bottom;
-            PROP_SETA32(self->client->window, kde_net_wm_frame_strut,
+            PROP_SETA32(self->client->window, net_frame_extents,
                         cardinal, vals, 4);
         }
 

diff --git a/openbox/prop.c b/openbox/prop.c
index a52c91669510bd54ab7fbf6787df0354d4320936..5d64202dd592775e6ba8c41238037c7d9142ef3a 100644 (file)
--- a/openbox/prop.c
+++ b/openbox/prop.c
@@ -84,6 +84,7 @@ void prop_startup()
     CREATE(net_wm_icon, "_NET_WM_ICON");
 /*   CREATE(net_wm_pid, "_NET_WM_PID"); */
     CREATE(net_wm_allowed_actions, "_NET_WM_ALLOWED_ACTIONS");
+    CREATE(net_frame_extents, "_NET_FRAME_EXTENTS");
 
 /*   CREATE(net_wm_ping, "_NET_WM_PING"); */
   
@@ -142,7 +143,6 @@ void prop_startup()
     prop_atoms.net_wm_bottomright = 2;
     prop_atoms.net_wm_bottomleft = 3;
 
-    CREATE(kde_net_wm_frame_strut, "_KDE_NET_WM_FRAME_STRUT");
     CREATE(kde_wm_change_state, "_KDE_WM_CHANGE_STATE");
     CREATE(kde_net_wm_window_type_override,"_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
 

diff --git a/openbox/prop.h b/openbox/prop.h
index 051168a50b142486912d45ac555446d033809e51..681b804e348c52def66a94a269175c4aae173e7f 100644 (file)
--- a/openbox/prop.h
+++ b/openbox/prop.h
@@ -92,6 +92,8 @@ typedef struct Atoms {
     Atom net_wm_icon;
 /*  Atom net_wm_pid; */
     Atom net_wm_allowed_actions;
+    Atom net_frame_extents;
+
     /* application protocols */
 /*  Atom   Atom net_wm_ping; */
 
@@ -153,7 +155,6 @@ typedef struct Atoms {
 
     /* Extra atoms */
 
-    Atom kde_net_wm_frame_strut;
     Atom kde_wm_change_state;
     Atom kde_net_wm_window_type_override;
 

diff --git a/openbox/screen.c b/openbox/screen.c
index 179ec478c13337e13b6977f000594e8c8bbc9962..c1c61ed5b7ce476501ffce3136d2c8deadb50c49 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -204,7 +204,7 @@ gboolean screen_annex()
                window, screen_support_win);
 
     /* set the _NET_SUPPORTED_ATOMS hint */
-    num_support = 52;
+    num_support = 53;
     i = 0;
     supported = g_new(gulong, num_support);
     supported[i++] = prop_atoms.net_current_desktop;
@@ -258,6 +258,7 @@ gboolean screen_annex()
     supported[i++] = prop_atoms.net_wm_state_demands_attention;
     supported[i++] = prop_atoms.net_moveresize_window;
     supported[i++] = prop_atoms.net_wm_moveresize;
+    supported[i++] = prop_atoms.net_frame_extents;
     supported[i++] = prop_atoms.ob_wm_state_undecorated;
     g_assert(i == num_support);
 /*