M openbox/client.c → openbox/client.c

@@ -1421,7 +1421,6 @@ }
 
 void client_fullscreen(Client *self, gboolean fs, gboolean savearea)
 {
-    static int saved_func, saved_decor;
     int x, y, w, h;
 
     if (!(self->functions & Func_Fullscreen) || /* can't */
@@ -1432,11 +1431,11 @@ client_change_state(self); /* change the state hints on the client */
 
     if (fs) {
 	/* save the functions and remove them */
-	saved_func = self->functions;
+	self->pre_fs_func = self->functions;
 	self->functions &= (Func_Close | Func_Fullscreen |
 			    Func_Iconify);
 	/* save the decorations and remove them */
-	saved_decor = self->decorations;
+	self->pre_fs_decor = self->decorations;
 	self->decorations = 0;
 	if (savearea) {
 	    long dimensions[4];
@@ -1455,8 +1454,8 @@ x = y = w = h = 0;
     } else {
 	long *dimensions;
 
-	self->functions = saved_func;
-	self->decorations = saved_decor;
+	self->functions = self->pre_fs_func;
+	self->decorations = self->pre_fs_decor;
 	  
 	if (PROP_GET32A(self->window, openbox_premax, cardinal,
 			dimensions, 4)) {

M openbox/client.h → openbox/client.h

@@ -269,6 +269,12 @@ to modify this window.
     */
     int functions;
 
+    /*! Saved decorations from before becoming fullscreen */
+    int pre_fs_decor;
+
+    /*! Saved functions from before becoming fullscreen */
+    int pre_fs_func;
+
     /*! Icons for the client as specified on the client window */
     Icon *icons;
     /*! The number of icons in icons */