Set _NET_FRAME_EXTENTS property.

6 files changed, 28 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 84d91a1..ac3856b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-09-06  Gary Wong  <gtw@gnu.org>
 
+	* frame.c (update_frame_extents): New function.
+	* gwm.c (start_managing_window): Update _NET_FRAME_EXTENTS property.
+	* managed.c (managed_property_change): Likewise.
+
+2009-09-06  Gary Wong  <gtw@gnu.org>
+
 	* gwm.c (setup_display): Add various EWMH properties to the root
 	and fake windows.
 	(shutdown_display): Remove EWMH root properties.
diff --git a/frame.c b/frame.c
index 1627ad1..244d7b9 100644
--- a/frame.c
+++ b/frame.c
@@ -97,6 +97,19 @@ extern int frame_xb( struct gwm_window *window ) {
     return window->u.frame.decoration & DEC_BORDER ? FRAME_X_BORDER : 0;
 }
 
+extern void update_frame_extents( struct gwm_window *window ) {
+
+    uint32_t extents[ 4 ];
+
+    extents[ 0 ] = frame_l( window, TRUE );
+    extents[ 1 ] = frame_r( window, TRUE );
+    extents[ 2 ] = frame_t( window, TRUE );
+    extents[ 3 ] = frame_b( window, TRUE );
+    xcb_change_property( c, XCB_PROP_MODE_REPLACE, window->u.frame.child->w,
+			 atoms[ ATOM__NET_FRAME_EXTENTS ], CARDINAL, 32,
+			 4, extents );
+}
+
 extern void translate_child_to_frame( struct gwm_window *frame,
 				      int *fx, int *fy, int *fwidth,
 				      int *fheight, int cx, int cy,
diff --git a/frame.h b/frame.h
index d7c7bfe..5708ebb 100644
--- a/frame.h
+++ b/frame.h
@@ -10,6 +10,9 @@ extern int frame_l( struct gwm_window *window, int include_x_border );
 extern int frame_r( struct gwm_window *window, int include_x_border );
 extern int frame_xb( struct gwm_window *window );
 
+/* Change the _NET_FRAME_EXTENTS property on the client. */
+extern void update_frame_extents( struct gwm_window *window );
+
 extern void translate_child_to_frame( struct gwm_window *frame,
 				      int *fx, int *fy, int *fwidth,
 				      int *fheight, int cx, int cy,
diff --git a/gwm.c b/gwm.c
index da7a18f..8173e9d 100644
--- a/gwm.c
+++ b/gwm.c
@@ -89,6 +89,7 @@ static const char *const atom_names[ NUM_ATOMS ] = {
     "_NET_CURRENT_DESKTOP",
     "_NET_DESKTOP_GEOMETRY",
     "_NET_DESKTOP_VIEWPORT",
+    "_NET_FRAME_EXTENTS",
     "_NET_NUMBER_OF_DESKTOPS",
     "_NET_SUPPORTED",
     "_NET_SUPPORTING_WM_CHECK",
@@ -1091,6 +1092,8 @@ static void start_managing_window( struct gwm_window *window,
     for( i = 0; i < NUM_PROPS; i++ )
 	managed_property_change( window, i, props[ i ] );
 
+    update_frame_extents( frame );
+
     translate_child_to_frame( frame, &frame->u.frame.x, &frame->u.frame.y,
 			      &frame->u.frame.width, &frame->u.frame.height,
 			      geom->x, geom->y, geom->width, geom->height,
@@ -1673,7 +1676,6 @@ static void setup_display( void ) {
         free( r );
     }
 
-    /* FIXME Also set _NET_FRAME_EXTENTS. */
     prop_atoms[ PROP__MOTIF_WM_HINTS ] = atoms[ ATOM__MOTIF_WM_HINTS ];    
     prop_atoms[ PROP__NET_WM_ICON ] = atoms[ ATOM__NET_WM_ICON ];
     prop_atoms[ PROP__NET_WM_NAME ] = atoms[ ATOM__NET_WM_NAME ];
diff --git a/gwm.h b/gwm.h
index 20f5270..a960312 100644
--- a/gwm.h
+++ b/gwm.h
@@ -71,6 +71,7 @@ enum gwm_atom {
     ATOM__NET_CURRENT_DESKTOP,
     ATOM__NET_DESKTOP_GEOMETRY,
     ATOM__NET_DESKTOP_VIEWPORT,
+    ATOM__NET_FRAME_EXTENTS,
     ATOM__NET_NUMBER_OF_DESKTOPS,
     ATOM__NET_SUPPORTED,
     ATOM__NET_SUPPORTING_WM_CHECK,
diff --git a/managed.c b/managed.c
index 6b88ccc..31d8ba4 100644
--- a/managed.c
+++ b/managed.c
@@ -376,6 +376,8 @@ extern void managed_property_change( struct gwm_window *window, int prop,
 				  XCB_CONFIG_WINDOW_WIDTH |
 				  XCB_CONFIG_WINDOW_HEIGHT |
 				  XCB_CONFIG_WINDOW_BORDER_WIDTH, n );
+
+	    update_frame_extents( window->u.managed.frame );
 	}
 	
 	break;